new upstream version, fixes #71978

(Portage version: 2.0.51.19)

9 files changed, 85 insertions, 15 deletions

diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index 29fee3c4e357..821190f19898 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/abcde
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.15 2004/08/19 08:00:06 dholm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.16 2005/03/12 16:08:25 luckyduck Exp $
+
+*abcde-2.2.0 (12 Mar 2005)
+
+  12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/abcde-2.2.0-gentoo.diff, +abcde-2.2.0.ebuild:
+  new upstream version, fixes #71978
 
   19 Aug 2004; David Holm <dholm@gentoo.org> abcde-2.1.19.ebuild:
   Added to ~ppc.
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index f00d2ed4d106..c3bfbd89b6b9 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,12 +1,14 @@
-MD5 296862293b36ec18a2d577f7d0ccd04d ChangeLog 2685
-MD5 df820967c20b259c18f06daadfa5d858 abcde-2.0.3.ebuild 819
 MD5 1ae1aef547b4a5b0c78761501c0bb0e8 abcde-2.1.15.ebuild 901
-MD5 1634d66c961d44dfc050a52ff2713513 abcde-2.1.19.ebuild 907
+MD5 f8b04f9492276e932ca5c2f25033418e abcde-2.2.0.ebuild 875
 MD5 f8b04f9492276e932ca5c2f25033418e abcde-2.1.9.ebuild 875
+MD5 1634d66c961d44dfc050a52ff2713513 abcde-2.1.19.ebuild 907
+MD5 df820967c20b259c18f06daadfa5d858 abcde-2.0.3.ebuild 819
+MD5 296862293b36ec18a2d577f7d0ccd04d ChangeLog 2685
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 a2f0e2962b108c01df109e8123f0a290 files/abcde-2.0.3-gentoo.diff 1125
-MD5 2694d89dcc4dbec5b5c26687f260c483 files/abcde-2.1.9-gentoo.diff 903
-MD5 60d60afd57309ef7488531c447e6b2ae files/digest-abcde-2.0.3 67
 MD5 f2594cb41ae11004b7fb8d6e010b605b files/digest-abcde-2.1.15 68
 MD5 ad04d9d2662fcef3056d210c3e5f8cda files/digest-abcde-2.1.19 68
+MD5 60d60afd57309ef7488531c447e6b2ae files/digest-abcde-2.0.3 67
 MD5 25b33b09dc6ed31413a1082a5350e872 files/digest-abcde-2.1.9 67
+MD5 ce58af2601ccb50843238b885aed5a2f files/digest-abcde-2.2.0 67
+MD5 2694d89dcc4dbec5b5c26687f260c483 files/abcde-2.1.9-gentoo.diff 903
diff --git a/media-sound/abcde/abcde-2.0.3.ebuild b/media-sound/abcde/abcde-2.0.3.ebuild
index cbb631326182..813a00bbca68 100644
--- a/media-sound/abcde/abcde-2.0.3.ebuild
+++ b/media-sound/abcde/abcde-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.0.3.ebuild,v 1.12 2004/06/24 23:48:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.0.3.ebuild,v 1.13 2005/03/12 16:08:25 luckyduck Exp $
 
 IUSE=""
 
diff --git a/media-sound/abcde/abcde-2.1.15.ebuild b/media-sound/abcde/abcde-2.1.15.ebuild
index 7b986d977f19..69606c966981 100644
--- a/media-sound/abcde/abcde-2.1.15.ebuild
+++ b/media-sound/abcde/abcde-2.1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.15.ebuild,v 1.3 2004/06/24 23:48:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.15.ebuild,v 1.4 2005/03/12 16:08:25 luckyduck Exp $
 
 IUSE=""
 
diff --git a/media-sound/abcde/abcde-2.1.19.ebuild b/media-sound/abcde/abcde-2.1.19.ebuild
index c3392ec65d1c..b287142ef6ec 100644
--- a/media-sound/abcde/abcde-2.1.19.ebuild
+++ b/media-sound/abcde/abcde-2.1.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.19.ebuild,v 1.5 2004/08/19 08:00:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.19.ebuild,v 1.6 2005/03/12 16:08:25 luckyduck Exp $
 
 IUSE=""
 
diff --git a/media-sound/abcde/abcde-2.1.9.ebuild b/media-sound/abcde/abcde-2.1.9.ebuild
index 3e126b857669..0160b8af9ae3 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 Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.7 2004/06/24 23:48:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.1.9.ebuild,v 1.8 2005/03/12 16:08:25 luckyduck Exp $
 
 inherit eutils
 
diff --git a/media-sound/abcde/abcde-2.2.0.ebuild b/media-sound/abcde/abcde-2.2.0.ebuild
new file mode 100644
index 000000000000..3a6c7ff7d1f8
--- /dev/null
+++ b/media-sound/abcde/abcde-2.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.2.0.ebuild,v 1.1 2005/03/12 16:08:25 luckyduck Exp $
+
+inherit eutils
+
+DESCRIPTION="a better cd encoder"
+HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
+SRC_URI="http://www.hispalinux.es/~data/files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+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 ${A}
+	cd ${S}
+	cp Makefile Makefile.orig
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_install() {
+	dodir /etc/abcde
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README TODO changelog
+}
diff --git a/media-sound/abcde/files/abcde-2.2.0-gentoo.diff b/media-sound/abcde/files/abcde-2.2.0-gentoo.diff
new file mode 100644
index 000000000000..df36df715694
--- /dev/null
+++ b/media-sound/abcde/files/abcde-2.2.0-gentoo.diff
@@ -0,0 +1,26 @@
+diff -uprN abcde-2.2.0.orig/abcde abcde-2.2.0/abcde
+--- abcde-2.2.0.orig/abcde	2005-03-12 16:57:57.888528672 +0100
++++ abcde-2.2.0/abcde	2005-03-12 17:00:09.228561952 +0100
+@@ -1825,8 +1825,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
+ 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
+diff -uprN abcde-2.2.0.orig/Makefile abcde-2.2.0/Makefile
+--- abcde-2.2.0.orig/Makefile	2005-03-12 16:57:57.888528672 +0100
++++ abcde-2.2.0/Makefile	2005-03-12 16:58:09.756724432 +0100
+@@ -6,7 +6,7 @@ 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.2.0 b/media-sound/abcde/files/digest-abcde-2.2.0
new file mode 100644
index 000000000000..acc8fd6a27de
--- /dev/null
+++ b/media-sound/abcde/files/digest-abcde-2.2.0
@@ -0,0 +1 @@
+MD5 e21dd33ab3b4eca6758976120d8a4f22 abcde_2.2.0.orig.tar.gz 62550