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.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 60 insertions, 10 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/Manifest b/app-cdr/cuetools/Manifest
index 2bd21f2f6a6d..85e9d3135c6b 100644
--- a/app-cdr/cuetools/Manifest
+++ b/app-cdr/cuetools/Manifest
@@ -1,5 +1,16 @@
-AUX ppc.patch.bz2 7622 RMD160 5323799558a305829345a612041ccabfb96a62b0 SHA1 97469cd422af255f12be602eed3f689940ad7058 SHA256 65bd4f3a306618383fb94eb452ecb01ff8c06622db6c6c48133a74bf962c4f2c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST cuetools-1.3.1-debian.patch.bz2 7622 RMD160 5323799558a305829345a612041ccabfb96a62b0 SHA1 97469cd422af255f12be602eed3f689940ad7058 SHA256 65bd4f3a306618383fb94eb452ecb01ff8c06622db6c6c48133a74bf962c4f2c
 DIST cuetools-1.3.1.tar.gz 161483 RMD160 8bad93c40b7d0ba8b1f8ffdc84b9d460113ca2cd SHA1 ad760cdf76d6548471144302f88bf0a66f1d5ea2 SHA256 6eb54fa619e55cb73348b2bfc71262a394cda280f613d3913e8c766d9cb2bdde
-EBUILD cuetools-1.3.1.ebuild 826 RMD160 2d740374e1f4963e741b80e5b7e65b758146e316 SHA1 7cd9ef0a7482f3777f7bfd65f8f154d302489d8c SHA256 e1ced76665d4379b80ad0f655cc3ba5d50bcf3509ac141e1e465c70a2b3b6c55
-MISC ChangeLog 1800 RMD160 da3c8222059b3185655e803b4155d17be41a899f SHA1 42d3e34cc89f81e33a04425eae850c54630be79b SHA256 19c6435b1b9e96efb870774d02c1c6cb4fe8c3bdcd5b98522313bfc304fca70c
+EBUILD cuetools-1.3.1-r1.ebuild 785 RMD160 befa8015e259dcb5726b560c66a97356204761fa SHA1 7c5e6784a40794bc16ccb6ac29667a4e2fe79ac8 SHA256 e8bab98a0ebea5de9bcde612265c9fc12ce09341f28d4385ea8e8f678af37c32
+EBUILD cuetools-1.3.1.ebuild 825 RMD160 9e14a7682a938882c099caaea3c434ea5a8455e0 SHA1 11937965e5cede75e64f01a536685153cd353248 SHA256 6649cb274e79af1503413cd4929c5c2a2f54246d0653a7dbb671734a4dfbad80
+MISC ChangeLog 2205 RMD160 e3e94daf9b5502c6d65228583b8f2aa53a61bfa3 SHA1 fa4c17d574544e8e8d5bea6375d4cfb9a54c964f SHA256 a68b9a5cf8fd03f396576ba21207325ece5016bc367c319b0151ebef100a423c
 MISC metadata.xml 214 RMD160 4120d9f1b831e1e14b793d69fcac8404e240747f SHA1 3852ff2530e5f89eaa57f1e316ba6684fadc2579 SHA256 f246585065033926d43d6fb617cf1c19cca0dd470c7efa44cbf957a9fa9e07b7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko9XkMACgkQAiZjviIA2XhXmQCgtReVdb8PjSZPFrw6RG/LQlyQ
+rEUAoMdG+cLdeRPQt9+Pi9YX5Q5wTgAB
+=Vs3L
+-----END PGP SIGNATURE-----
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