Version bump... bump to stable x86... removing old ebuilds... Closes bug #45345.

11 files changed, 32 insertions, 163 deletions

diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index 0412d73953b0..e6ad3aa432e9 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/abcde
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.9 2003/12/01 19:38:41 rphillips Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.10 2004/03/22 16:57:40 eradicator Exp $
+
+*abcde-2.1.15 (22 Mar 2004)
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> abcde-2.1.15.ebuild,
+  abcde-2.1.4.ebuild, abcde-2.1.6.ebuild, abcde-2.1.9.ebuild,
+  files/abcde-1.9.9-r1-gentoo.diff, files/abcde-2.1.4-gentoo.diff,
+  files/abcde-2.1.6-gentoo.diff:
+  Version bump... bump to stable x86... removing old ebuilds... Closes bug
+  #45345.
 
 *abcde-2.1.9 (01 Dec 2003)
 
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index c006fdef84f2..cd95b43ceb46 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,15 +1,17 @@
+MD5 52f5ff17e170df1ad6221764e7ea3f40 abcde-2.1.15.ebuild 903
+MD5 31d5ccdab55e61c98a55c5ac59e8eedb abcde-2.1.9.ebuild 871
+MD5 544b0448091f002e54641f50f83091aa abcde-2.1.4.ebuild 865
+MD5 4201772ce7c6a57bd3652a3e6025ad46 abcde-2.0.3.ebuild 821
 MD5 7e78908c3f75aba11f6bc92491961468 ChangeLog 1846
-MD5 58a33f0934a35896d27e906a28dd8a30 abcde-2.0.3.ebuild 818
-MD5 4b3aec9e5ecb099d75e82006b65e12a8 abcde-2.1.4.ebuild 863
-MD5 658806f11ca0306818b933d16a5dfe7d abcde-2.1.6.ebuild 864
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 e4030b9073cf8110cf6e26e3e193eeb7 abcde-2.1.9.ebuild 870
-MD5 135a250a0b4dc2301346c2725d78b58f files/abcde-1.9.9-r1-gentoo.diff 1640
+MD5 9a8664b3d2614c63150376b95c480a73 abcde-2.1.6.ebuild 865
+MD5 a8608c6bd4de67c16516536ebe9a49c5 files/abcde-2.1.6-gentoo.diff 706
 MD5 a2f0e2962b108c01df109e8123f0a290 files/abcde-2.0.3-gentoo.diff 1125
+MD5 f2594cb41ae11004b7fb8d6e010b605b files/digest-abcde-2.1.15 68
+MD5 135a250a0b4dc2301346c2725d78b58f files/abcde-1.9.9-r1-gentoo.diff 1640
 MD5 a9e57541d62c6a9baac4d3a9499cf0c2 files/abcde-2.1.4-gentoo.diff 747
-MD5 a8608c6bd4de67c16516536ebe9a49c5 files/abcde-2.1.6-gentoo.diff 706
 MD5 60d60afd57309ef7488531c447e6b2ae files/digest-abcde-2.0.3 67
 MD5 9e878360a0394ec596c61934a3d876cf files/digest-abcde-2.1.4 67
 MD5 6cc3c1a5c3d553cb63fecb8b19288e26 files/digest-abcde-2.1.6 67
-MD5 2694d89dcc4dbec5b5c26687f260c483 files/abcde-2.1.9-gentoo.diff 903
 MD5 25b33b09dc6ed31413a1082a5350e872 files/digest-abcde-2.1.9 67
+MD5 2694d89dcc4dbec5b5c26687f260c483 files/abcde-2.1.9-gentoo.diff 903
diff --git a/media-sound/abcde/abcde-2.1.4.ebuild b/media-sound/abcde/abcde-2.1.15.ebuild
index e63312b1ccf2..393eb30beb93 100644
--- a/media-sound/abcde/abcde-2.1.4.ebuild
+++ b/media-sound/abcde/abcde-2.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.4.ebuild,v 1.4 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.15.ebuild,v 1.1 2004/03/22 16:57:40 eradicator Exp $
 
 DESCRIPTION="a better cd encoder"
 SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
@@ -8,9 +8,9 @@ HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 
-DEPEND=">=media-sound/id3-0.12
+RDEPEND=">=media-sound/id3-0.12
 	>=media-sound/cd-discid-0.6
 	>=media-sound/cdparanoia-3.9.7
 	>=media-sound/vorbis-tools-1.0_rc3
@@ -18,15 +18,16 @@ DEPEND=">=media-sound/id3-0.12
 	>=media-libs/flac-1*
 	>=media-sound/normalize-0.7.4"
 
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
 src_unpack() {
 	unpack ${PN}_${PV}.orig.tar.gz
-	cd ${S}
-	cp Makefile Makefile.orig
-	epatch ${FILESDIR}/${PF}-gentoo.diff
+
+	sed -i 's:/etc/abcde.conf:/etc/abcde/abcde.conf:g' ${S}/abcde
 }
 
 src_install() {
-	dodir /etc/abcde
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} etcdir=${D}/etc/abcde install || die
 	dodoc COPYING README TODO changelog
 }
diff --git a/media-sound/abcde/abcde-2.1.6.ebuild b/media-sound/abcde/abcde-2.1.6.ebuild
deleted file mode 100644
index 4be64ec8d2fa..000000000000
--- a/media-sound/abcde/abcde-2.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.6.ebuild,v 1.2 2004/03/01 05:37:12 eradicator Exp $
-
-DESCRIPTION="a better cd encoder"
-SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=media-sound/id3-0.12
-	>=media-sound/cd-discid-0.6
-	>=media-sound/cdparanoia-3.9.7
-	>=media-sound/vorbis-tools-1.0_rc3
-	media-sound/id3v2
-	>=media-libs/flac-1*
-	>=media-sound/normalize-0.7.4"
-
-src_unpack() {
-	unpack ${PN}_${PV}.orig.tar.gz
-	cd ${S}
-	cp Makefile Makefile.orig
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_install() {
-	dodir /etc/abcde
-	make DESTDIR=${D} install || die
-	dodoc COPYING README TODO changelog
-}
diff --git a/media-sound/abcde/abcde-2.1.9.ebuild b/media-sound/abcde/abcde-2.1.9.ebuild
index e894621c36c6..862eefda0e28 100644
--- a/media-sound/abcde/abcde-2.1.9.ebuild
+++ b/media-sound/abcde/abcde-2.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.9.ebuild,v 1.3 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.9.ebuild,v 1.4 2004/03/22 16:57:40 eradicator Exp $
 
 DESCRIPTION="a better cd encoder"
 SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND=">=media-sound/id3-0.12
 	>=media-sound/cd-discid-0.6
diff --git a/media-sound/abcde/files/abcde-1.9.9-r1-gentoo.diff b/media-sound/abcde/files/abcde-1.9.9-r1-gentoo.diff
deleted file mode 100644
index e1a00609d056..000000000000
--- a/media-sound/abcde/files/abcde-1.9.9-r1-gentoo.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur abcde-1.9.9.orig/abcde abcde-1.9.9/abcde
---- abcde-1.9.9.orig/abcde	Tue Mar 13 10:49:24 2001
-+++ abcde-1.9.9/abcde	Mon Apr 16 21:14:26 2001
-@@ -263,6 +263,7 @@
- 	ALBUMFILE=$(mungefilename "$DALBUM")
- 	ARTISTFILE=$(mungefilename "$TRACKARTIST")
- 	TRACKFILE=$(mungefilename "$TRACKNAME")
-+	TRACKNUM=$(printf %0.${TRACKNUMPADDING}d ${UTRACKNUM})
- 	# Supported variables for OUTPUTFORMAT are ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
- 	if [ "$VARIOUSARTISTS" = "y" ]; then
- 		OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
-@@ -307,7 +308,11 @@
- 		TRACKFILE=$(mungefilename "$TRACKNAME")
- 		ARTISTFILE=$(mungefilename "$TRACKARTIST")
- 		TRACKNUM=$(printf %0.${TRACKNUMPADDING}d ${UTRACKNUM})
--		OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
-+		if [ "$VARIOUSARTISTS" = "y" ]; then
-+			OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
-+		else
-+			OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
-+		fi
- 		if [ "$PLAYLISTDATAPREFIX" != "" ]; then
- 			echo -n $PLAYLISTDATAPREFIX >> "$OUTPUTDIR/$PLAYLISTFILE"
- 		fi
-@@ -873,8 +878,8 @@
- fi
- 
- # Load system defaults
--if [ -r /etc/abcde.conf ]; then
--	. /etc/abcde.conf
-+if [ -r /etc/abcde/abcde.conf ]; then
-+	. /etc/abcde/abcde.conf
- fi
- # Load user preference defaults
- if [ -r $HOME/.abcde.conf ]; then
---- abcde-1.9.9/Makefile.orig	Sun May 27 14:36:26 2001
-+++ abcde-1.9.9/Makefile	Sun May 27 14:36:38 2001
-@@ -1,12 +1,12 @@
- VERSION = 1.9.9
--INSTALL = /usr/bin/install -c
-+INSTALL = /usr/bin/install -c
- 
- # Installation directories
- prefix = ${DESTDIR}/usr
- exec_prefix = ${prefix}
- mandir = ${prefix}/share/man/man1
- bindir = ${exec_prefix}/bin
--etcdir = ${DESTDIR}/etc
-+etcdir = ${DESTDIR}/etc/abcde
- 
- all:
- 
diff --git a/media-sound/abcde/files/abcde-2.1.4-gentoo.diff b/media-sound/abcde/files/abcde-2.1.4-gentoo.diff
deleted file mode 100644
index e631df37246c..000000000000
--- a/media-sound/abcde/files/abcde-2.1.4-gentoo.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- abcde.orig	2002-05-26 19:29:44.000000000 -0700
-+++ abcde	2002-05-26 19:43:14.000000000 -0700
-@@ -973,8 +974,8 @@
- fi
- 
- # Load system defaults
--if [ -r /etc/abcde.conf ]; then
--	. /etc/abcde.conf
-+if [ -r /etc/abcde/abcde.conf ]; then
-+	. /etc/abcde/abcde.conf
- fi
- # Load user preference defaults
- if [ -r $HOME/.abcde.conf ]; then
---- Makefile.orig	2002-05-26 19:28:40.000000000 -0700
-+++ Makefile	2002-05-26 19:29:09.000000000 -0700
-@@ -1,12 +1,12 @@
- VERSION = 2.1.4
--INSTALL = /usr/bin/install -c
-+INSTALL = /usr/bin/install -c
- 
- # Installation directories
- prefix = ${DESTDIR}/usr
- exec_prefix = ${prefix}
- mandir = ${prefix}/share/man/man1
- bindir = ${exec_prefix}/bin
--etcdir = ${DESTDIR}/etc
-+etcdir = ${DESTDIR}/etc/abcde
- 
- all:
- 
diff --git a/media-sound/abcde/files/abcde-2.1.6-gentoo.diff b/media-sound/abcde/files/abcde-2.1.6-gentoo.diff
deleted file mode 100644
index 17178d49c210..000000000000
--- a/media-sound/abcde/files/abcde-2.1.6-gentoo.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- abcde.orig	2003-10-06 11:45:16.000000000 -0700
-+++ abcde	2003-10-06 11:46:02.000000000 -0700
-@@ -1263,7 +1263,7 @@
- 
- # Load system defaults
- if [ -r /etc/abcde.conf ]; then
--	. /etc/abcde.conf
-+	. /etc/abcde/abcde.conf
- fi
- # Load user preference defaults
- if [ -r $HOME/.abcde.conf ]; then
---- Makefile.orig	2003-10-06 11:46:13.000000000 -0700
-+++ Makefile	2003-10-06 11:46:43.000000000 -0700
-@@ -1,12 +1,12 @@
- VERSION = 2.1.6
--INSTALL = /usr/bin/install -c
-+INSTALL = /usr/bin/install -c
- 
- # Installation directories
- prefix = ${DESTDIR}/usr
- exec_prefix = ${prefix}
- mandir = ${prefix}/share/man/man1
- bindir = ${exec_prefix}/bin
--etcdir = ${DESTDIR}/etc
-+etcdir = ${DESTDIR}/etc/abcde
- 
- all:
- 
diff --git a/media-sound/abcde/files/digest-abcde-2.1.15 b/media-sound/abcde/files/digest-abcde-2.1.15
new file mode 100644
index 000000000000..9c04bd578a14
--- /dev/null
+++ b/media-sound/abcde/files/digest-abcde-2.1.15
@@ -0,0 +1 @@
+MD5 068f85c348abe901cdcb03ddde540da5 abcde_2.1.15.orig.tar.gz 51427
diff --git a/media-sound/abcde/files/digest-abcde-2.1.4 b/media-sound/abcde/files/digest-abcde-2.1.4
deleted file mode 100644
index fcd3d464230b..000000000000
--- a/media-sound/abcde/files/digest-abcde-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bfc554c403d6cff332ffd4e9ce965404 abcde_2.1.4.orig.tar.gz 42945
diff --git a/media-sound/abcde/files/digest-abcde-2.1.6 b/media-sound/abcde/files/digest-abcde-2.1.6
deleted file mode 100644
index ecf06eaa6a8a..000000000000
--- a/media-sound/abcde/files/digest-abcde-2.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a33069aa841ad01aef123d34bfe42376 abcde_2.1.6.orig.tar.gz 44573