[arch-commits] Commit in abcde/repos (3 files)

[Daniel Griffiths]

    Date: Monday, February 15, 2010 @ 17:12:12
  Author: dgriffiths
Revision: 69012

Merged revisions 69011 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/abcde/trunk

........
  r69011 | dgriffiths | 2010-02-15 16:11:56 -0600 (Mon, 15 Feb 2010) | 1 line
........

Modified:
  abcde/repos/extra-any/	(properties)
  abcde/repos/extra-any/PKGBUILD
  abcde/repos/extra-any/fix-mp3-tagging.patch

-----------------------+
 PKGBUILD              |   42 +++++++++++++++++++++++-------------------
 fix-mp3-tagging.patch |   33 ++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 32 deletions(-)


Property changes on: abcde/repos/extra-any
___________________________________________________________________
Modified: svnmerge-integrated
   - /abcde/trunk:1-62139
   + /abcde/trunk:1-69011

Modified: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2010-02-15 22:11:56 UTC (rev 69011)
+++ extra-any/PKGBUILD	2010-02-15 22:12:12 UTC (rev 69012)
@@ -1,12 +1,15 @@
 # $Id$
-# Maintainer:
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 # Contributor: Kevin Piche <kevin at archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=abcde
-pkgver=2.4.0
-pkgrel=2
+pkgver=2.4.1
+pkgrel=1
 pkgdesc="A frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go."
+arch=('any')
+url="http://code.google.com/p/abcde/"
+license=('GPL')
 depends=('bash' 'cd-discid' 'wget')
 optdepends=('eject: Eject support'
 	'cdparanoia: Paranoia ripping support'
@@ -16,26 +19,27 @@
 	'flac: FLAC encoding support'
 	'id3: ID3 v1/v2 tag support'
 	'id3v2: ID3 v2 tag support')
-backup=(etc/$pkgname.conf)
-arch=('any')
-url="http://code.google.com/p/abcde"
-license=('GPL')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+backup=(etc/${pkgname}.conf)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	'fix-mp3-tagging.patch')
-md5sums=('4a65d9ae97b99d34257e2892cfe6ea41'
-         'bc9be1bc3b4f6dc1f90de67debce94ec')
+md5sums=('5df055a1b6332d9ddbcfc5756369ee3d'
+         'c3975dc8389ff2edba6684bbc378d97d')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+	cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np0 -i ${srcdir}/fix-mp3-tagging.patch || return 1
+	patch -Np0 < ${srcdir}/fix-mp3-tagging.patch || return 1
 
-  sed -e "s:normalize-audio:normalize:g" -i $pkgname
-  sed -e "s:/usr/bin/less:/bin/less:g" -i $pkgname
+	sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
+	sed -e "s:/usr/bin/less:/bin/less:g" -i ${pkgname}
+}
 
-  install -Dm 0755 $pkgname $pkgdir/usr/bin/$pkgname || return 1
-  install -Dm 0755 cddb-tool $pkgdir/usr/bin/cddb-tool || return 1
-  install -Dm 0644 cddb-tool.1 $pkgdir/usr/share/man/man1/cddb-tool.1 || return 1
-  install -Dm 0644 $pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1 || return 1
-  install -Dm 0644 $pkgname.conf $pkgdir/etc/$pkgname.conf || return 1
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	install -Dm 0755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} || return 1
+	install -Dm 0755 cddb-tool ${pkgdir}/usr/bin/cddb-tool || return 1
+	install -Dm 0644 cddb-tool.1 ${pkgdir}/usr/share/man/man1/cddb-tool.1 || return 1
+	install -Dm 0644 ${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 || return 1
+	install -Dm 0644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf || return 1
 }

Modified: extra-any/fix-mp3-tagging.patch
===================================================================
--- extra-any/fix-mp3-tagging.patch	2010-02-15 22:11:56 UTC (rev 69011)
+++ extra-any/fix-mp3-tagging.patch	2010-02-15 22:12:12 UTC (rev 69012)
@@ -1,13 +1,20 @@
-Index: abcde
-===================================================================
---- abcde	(revision 282)
-+++ abcde	(revision 283)
-@@ -835,7 +835,7 @@
- 						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
- 						-y "$CDYEAR" -g "$GENREID" \
- 						-T "${TRACKNUM:-$1}/$TRACKS" \
--						"${TPE2:+--TPE2 \"$TPE2\"}" \
-+						${TPE2:+--TPE2 "$TPE2"} \
- 						"$ABCDETEMPDIR/track$1.$OUTPUT"
- 					;;
- 			esac
+*** abcde	2010-02-15 16:04:40.000000000 -0600
+--- abcde	2010-02-15 14:41:25.000000000 -0600
+***************
+*** 835,841 ****
+  						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
+  						-y "$CDYEAR" -g "$GENREID" \
+  						-T "${TRACKNUM:-$1}/$TRACKS" \
+! 						${TPE2:+--TPE2 "$TPE2"} \
+  						"$ABCDETEMPDIR/track$1.$OUTPUT"
+  					;;
+  			esac
+--- 835,841 ----
+                                                -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
+                                                -y "$CDYEAR" -g "$GENREID" \
+                                                -T "${TRACKNUM:-$1}/$TRACKS" \
+!                                               ${TPE2:+--TPE2 \"$TPE2\"} \
+                                                "$ABCDETEMPDIR/track$1.$OUTPUT"
+                                        ;;
+                        esac
+