Correct some huge QA problems with this ebuild: the .bz2 patch should not be in $FILESDIR, and shouldn't be applied conditionally to ppc at all! Add an -r1 that applies the patch unconditionally, and move the patch to mirrors.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 46 insertions, 7 deletions

diff --git a/app-cdr/cuetools/ChangeLog b/app-cdr/cuetools/ChangeLog
index 9126a257a390..a6059a87f80c 100644
--- a/app-cdr/cuetools/ChangeLog
+++ b/app-cdr/cuetools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/cuetools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/ChangeLog,v 1.14 2008/06/06 21:14:19 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/ChangeLog,v 1.15 2009/06/20 22:10:05 flameeyes Exp $
+
+*cuetools-1.3.1-r1 (20 Jun 2009)
+
+  20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  cuetools-1.3.1.ebuild, +cuetools-1.3.1-r1.ebuild, -files/ppc.patch.bz2:
+  Correct some huge QA problems with this ebuild: the .bz2 patch should not
+  be in $FILESDIR, and shouldn't be applied conditionally to ppc at all! Add
+  an -r1 that applies the patch unconditionally, and move the patch to
+  mirrors.
 
   06 Jun 2008; Samuli Suominen <drac@gentoo.org> cuetools-1.3.1.ebuild:
   Use mirrors:// for berlios.
diff --git a/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild b/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..baa496d1584f
--- /dev/null
+++ b/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild,v 1.1 2009/06/20 22:10:05 flameeyes Exp $
+
+inherit eutils
+
+DESCRIPTION="Utilities to manipulate and convert cue and toc files"
+HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-debian.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}/${P}-debian.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS README TODO || die
+	docinto extras
+	dodoc extras/{cue{convert.cgi,tag.sh},*.txt} || die
+}
diff --git a/app-cdr/cuetools/cuetools-1.3.1.ebuild b/app-cdr/cuetools/cuetools-1.3.1.ebuild
index 9841e71c6fa0..8bdfddaf3e13 100644
--- a/app-cdr/cuetools/cuetools-1.3.1.ebuild
+++ b/app-cdr/cuetools/cuetools-1.3.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/cuetools-1.3.1.ebuild,v 1.5 2008/06/06 21:14:19 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/cuetools-1.3.1.ebuild,v 1.6 2009/06/20 22:10:05 flameeyes Exp $
 
 inherit eutils
 
 DESCRIPTION="Utilities to manipulate and convert cue and toc files"
 HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-debian.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,8 +17,8 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# What in earth is bzip2 archive doing in tree?
-	use ppc && epatch "${FILESDIR}"/ppc.patch.bz2
+
+	use ppc && epatch "${WORKDIR}/${P}-debian.patch"
 }
 
 src_install() {
diff --git a/app-cdr/cuetools/files/ppc.patch.bz2 b/app-cdr/cuetools/files/ppc.patch.bz2
deleted file mode 100644
index 8bdca3103126..000000000000
--- a/app-cdr/cuetools/files/ppc.patch.bz2
+++ /dev/null