Add new revision, removing the SG_IO patches, that caused bugs #133145, #133150 and #138894. As upstream is not dead as it could have seemed, better stick as much as possible with upstream sources (although the current ones are also quite a bit patched). When new alpha will be added, patches *have to be* sent upstream.

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 109 insertions, 8 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index c65b43c993a6..cbc4b79972dd 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.47 2006/09/22 22:00:54 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.48 2006/10/21 23:06:09 flameeyes Exp $
+
+*cdparanoia-3.9.8-r5 (21 Oct 2006)
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +cdparanoia-3.9.8-r5.ebuild:
+  Add new revision, removing the SG_IO patches, that caused bugs #133145,
+  #133150 and #138894. As upstream is not dead as it could have seemed, better
+  stick as much as possible with upstream sources (although the current ones
+  are also quite a bit patched). When new alpha will be added, patches *have
+  to be* sent upstream.
 
   22 Sep 2006; <ticho@gentoo.org> cdparanoia-3.9.8-r4.ebuild:
   Fix parallel build, bug #136128.
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index b1d26df93b18..341b1cdb6827 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -42,6 +42,7 @@ MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686
 DIST cdparanoia-3.9.8-SG_IO-patches.tar.gz 18149 RMD160 231a546dbd9d23bec7ebe00b34457b17c0367eb1 SHA1 be4f8ccf54b783cc38b91d92c507c324303dd5ef SHA256 090f84e5e23eaf2a4700c7f69abd2998c578072b1c9b8187dcf6b721d8ac1902
+DIST cdparanoia-3.9.8-fbsd-2.patch.bz2 7345 RMD160 217902fa5f455b2388a3568420aaea2d1fd6e219 SHA1 139d86d9d7cbb87dd7e005bc2b44b91e29e933a8 SHA256 a3e09610ddb5630e9f4a951eb0d96f84fb80e320c8f9cc71fe312f839c7f198c
 DIST cdparanoia-3.9.8-fbsd.patch.bz2 7161 RMD160 6a0c3ed77ce00e602b93055893b0d22062fca330 SHA1 35c37ebcfa7b8d7b1caa701923e0f21c93da2c78 SHA256 3e79470a1453f3c53111dd2297d1ed0a3cace2267cf65d2efe34e2684cabd0c0
 DIST cdparanoia-III-alpha9.8.src.tgz 116591 RMD160 d9225165f83b5386c58db263d6918a7006df1481 SHA1 04cc33a7d22d6255f6239e3e74195506b3bdde06 SHA256 1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008
 EBUILD cdparanoia-3.9.8-r1.ebuild 1275 RMD160 1682814411088e8d8f07584572555ec4fc6ff11a SHA1 6ad5e137c42313544ab93b59486fe3a0819d735d SHA256 629dcd66c0c8d2be279c49d54f924aa1f68d2ceb6440e240930ebf2ee1b02c0a
@@ -60,10 +61,14 @@ EBUILD cdparanoia-3.9.8-r4.ebuild 2588 RMD160 4b443d3bc66371b31c31fb1a9a5857502b
 MD5 5803af8ae5874fa75394e46fb11f1bff cdparanoia-3.9.8-r4.ebuild 2588
 RMD160 4b443d3bc66371b31c31fb1a9a5857502bca4ab2 cdparanoia-3.9.8-r4.ebuild 2588
 SHA256 2bebeef231b8982a67ae4cac096eb13bd628d1c938af1154d13843784fa10b09 cdparanoia-3.9.8-r4.ebuild 2588
-MISC ChangeLog 7074 RMD160 f86aaa0a77cbe5e71519081c4555c927e8e3fcc3 SHA1 dbee4ee2f34b2fa0625e178780b9757229377c4d SHA256 c7b3361cff6c84e6afacd24dd6994159b9d37923eda24e2069b94ab657dfcc92
-MD5 b53236c52e930062d0538ae617c7326d ChangeLog 7074
-RMD160 f86aaa0a77cbe5e71519081c4555c927e8e3fcc3 ChangeLog 7074
-SHA256 c7b3361cff6c84e6afacd24dd6994159b9d37923eda24e2069b94ab657dfcc92 ChangeLog 7074
+EBUILD cdparanoia-3.9.8-r5.ebuild 2300 RMD160 5b8eec6b13096bcc3502a0dd948e39856b4d5b54 SHA1 509ea28b40ad4bb5bf3cb65a2bf14129f5416f8c SHA256 884d2d4f15102c775b1dd7949c0837d6c576f0d73b3e130ec98a4a015d2a5d98
+MD5 52849f82aa163eb70e141f5cb29458b4 cdparanoia-3.9.8-r5.ebuild 2300
+RMD160 5b8eec6b13096bcc3502a0dd948e39856b4d5b54 cdparanoia-3.9.8-r5.ebuild 2300
+SHA256 884d2d4f15102c775b1dd7949c0837d6c576f0d73b3e130ec98a4a015d2a5d98 cdparanoia-3.9.8-r5.ebuild 2300
+MISC ChangeLog 7530 RMD160 e5dd4a9d4262a6559980746c4718838818d1acae SHA1 b32802787b3182ebb806ae7551fb8deb26d146c4 SHA256 cc532f7822619308ea3cf9bca7bad9acc946af0b2193581eb24e356d0022e302
+MD5 a7866b8890cc1763eadacd74d126a241 ChangeLog 7530
+RMD160 e5dd4a9d4262a6559980746c4718838818d1acae ChangeLog 7530
+SHA256 cc532f7822619308ea3cf9bca7bad9acc946af0b2193581eb24e356d0022e302 ChangeLog 7530
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -80,10 +85,13 @@ SHA256 774c16fe16f991623a0941ce4cba1169471103a20588644da693aaacfbd5e941 files/di
 MD5 491f149a82246a993a6f9eb5489e3d6c files/digest-cdparanoia-3.9.8-r4 831
 RMD160 44526bcae805e66eccbd56087cddcec60d82ff80 files/digest-cdparanoia-3.9.8-r4 831
 SHA256 14aea7cfb9d556dd5ba867340198476dca95432fc79891fe72798059eb8a2ee9 files/digest-cdparanoia-3.9.8-r4 831
+MD5 19602787f2923ce3f7f374ba22e686d0 files/digest-cdparanoia-3.9.8-r5 548
+RMD160 491601913ac0118f561bcb45bc8ede53f6645f9e files/digest-cdparanoia-3.9.8-r5 548
+SHA256 8e489eed670d3494db158053dafec572f7f2acb344c74578b2acded7a66af01e files/digest-cdparanoia-3.9.8-r5 548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFFF+C10xuJSrg3/sRAtLcAJ9CD8Ttle/wf2HPpuRmaOOTTqQNNQCbByDi
-AdDNVztg4ZYpAFWpyqEcYwo=
-=5ENA
+iD8DBQFFOqfoAiZjviIA2XgRAm0xAJ42EhI3941JYV9wwxI8KjcPKhAwxACdFaGF
+XBD6x4kuO2lUrjHENh60rQo=
+=69v4
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild
new file mode 100644
index 000000000000..5c3ca8445911
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild,v 1.1 2006/10/21 23:06:09 flameeyes Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="2.1"
+
+inherit eutils flag-o-matic libtool toolchain-funcs versionator autotools
+
+MY_P=${PN}-III-alpha$(get_version_component_range 2-3)
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="http://www.xiph.org/paranoia/"
+SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz
+	mirror://gentoo/${P}-fbsd-2.patch.bz2"
+
+IUSE="kernel_linux"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# cdda_paranoia.h should include cdda_interface_h, else most configure
+	# scripts testing for support fails (gnome-vfs, etc).
+	epatch "${FILESDIR}/${P}-include-cdda_interface_h.patch"
+	epatch "${FILESDIR}/${P}-toc.patch"
+	epatch "${FILESDIR}/${P}-identify_crash.patch"
+	epatch "${FILESDIR}/${PV}-gcc34.patch"
+
+	# if libdir is specified, cdparanoia causes sandbox violations, and using
+	# einstall doesnt work around it. so lets patch in DESTDIR support
+	epatch "${FILESDIR}/${P}-use-destdir.patch"
+
+	epatch "${FILESDIR}/${P}-respectflags-pio.patch"
+
+	epatch "${DISTDIR}/${P}-fbsd-2.patch.bz2"
+	# Fix makefiles for parallel make
+	epatch "${FILESDIR}/${P}-parallel-fpic-fbsd.patch"
+
+	# Use directly the same exact patch as flex as it works
+	epatch "${FILESDIR}/flex-configure-LANG.patch"
+
+	# Let portage handle the stripping of binaries
+	sed -i -e "/strip cdparanoia/d" Makefile.in
+
+	# Fix Makefiles for parallel building. Bug #136128.
+	sed -i \
+		-e "s/^lib:	$/lib:	\$(OFILES)/" \
+		-e "s/^slib:	$/slib:	\$(OFILES)/" \
+		-e "/\$(MAKE) lessmessy$/d" \
+		interface/Makefile.in paranoia/Makefile.in
+
+	mv configure.guess config.guess
+	mv configure.sub config.sub
+	sed -i -e '/configure.\(guess\|sub\)/d' "${S}"/configure.in
+
+	eautoconf
+	elibtoolize
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+	append-flags -I"${S}/interface"
+
+	econf || die
+	emake OPT="${CFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/{bin,lib,include} /usr/share/man/man1
+	emake DESTDIR="${D}" install || die
+	dodoc FAQ.txt README
+}
diff --git a/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r5 b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r5
new file mode 100644
index 000000000000..f0a0b9affdc0
--- /dev/null
+++ b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r5
@@ -0,0 +1,6 @@
+MD5 cf4ed5a2123a323b20d7442d17f00009 cdparanoia-3.9.8-fbsd-2.patch.bz2 7345
+RMD160 217902fa5f455b2388a3568420aaea2d1fd6e219 cdparanoia-3.9.8-fbsd-2.patch.bz2 7345
+SHA256 a3e09610ddb5630e9f4a951eb0d96f84fb80e320c8f9cc71fe312f839c7f198c cdparanoia-3.9.8-fbsd-2.patch.bz2 7345
+MD5 7218e778b5970a86c958e597f952f193 cdparanoia-III-alpha9.8.src.tgz 116591
+RMD160 d9225165f83b5386c58db263d6918a7006df1481 cdparanoia-III-alpha9.8.src.tgz 116591
+SHA256 1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008 cdparanoia-III-alpha9.8.src.tgz 116591