Include --log-summary option from r12112 by Torbjörn Svensson wrt #200537, clean up

Package-Manager: portage-2.1.4.4

18 files changed, 208 insertions, 562 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index dd76609a40c2..e4e3176bf744 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.67 2008/01/19 19:10:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.68 2008/02/20 21:03:11 drac Exp $
+
+*cdparanoia-3.10_pre0-r1 (20 Feb 2008)
+
+  20 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -files/cdparanoia-3.9.8-include-cdda_interface_h.patch,
+  -files/3.9.8-gcc34.patch, -files/cdparanoia-3.9.8-asneeded.patch,
+  -files/cdparanoia-3.9.8-identify_crash.patch,
+  -files/cdparanoia-3.9.8-parallel-fpic.patch,
+  -files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch,
+  -files/cdparanoia-3.9.8-respectflags-pio.patch,
+  -files/cdparanoia-3.9.8-respectflags-sgio.patch,
+  -files/cdparanoia-3.9.8-toc.patch,
+  -files/cdparanoia-3.9.8-use-destdir.patch,
+  +files/cdparanoia-3.10_pre0-log-summary.patch,
+  -files/flex-configure-LANG.patch, -cdparanoia-3.9.8-r3.ebuild,
+  -cdparanoia-3.9.8-r5.ebuild, cdparanoia-3.10_pre0.ebuild,
+  +cdparanoia-3.10_pre0-r1.ebuild:
+  Include --log-summary option from r12112 by Torbjörn Svensson wrt #200537
 
   19 Jan 2008; Alexis Ballier <aballier@gentoo.org>
   cdparanoia-3.10_pre0.ebuild:
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 2baaea156ccc..8bb9727741b5 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,24 +1,10 @@
-AUX 3.9.8-gcc34.patch 772 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 SHA1 8bb7aafc54a70b558b97c88ac4a54f7535039851 SHA256 ffe735303a300d358ba99fc85f6d28c4bc7bc7ce90bf42b9838803fcc99cf150
 AUX cdparanoia-3.10_pre0-Makefile.in.patch 3584 RMD160 10ac6ad1a8527fc5da86884cecbd7b7cd92c4900 SHA1 fc42f969bb256693608e4fe3722aedeb5073dc5a SHA256 7dd769f0aca16d6b7d83a07e3d76b64f2294b6ed0a6aeaa84fd0b7348369ffcb
 AUX cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556 RMD160 42832206bf52a3629559d8090f57b3e74d64a421 SHA1 677c0c96de896277a2cf2ce811889e67c195af12 SHA256 c3dabd747091f2d3f2335f523b44a1ef5ab4b9c908fbd76b9d9feb5f40dd95f8
+AUX cdparanoia-3.10_pre0-log-summary.patch 3298 RMD160 8448ec99c118e4a1df0d0b1dc2b2160b676d7eb0 SHA1 dc469de93f8d74c5c6831a5d3c79d8abf4ee5b86 SHA256 96eb2701ab42149c95c33728335dbb59a1baaf39abb23970234bfef0d1003da6
 AUX cdparanoia-3.10_pre0-use-destdir.patch 2642 RMD160 e51cb050ba0fbdab19d37b39e2de1e9ff76d7afc SHA1 76fc4e94413692b3adfc2dfd1fb5f4f9d393be00 SHA256 5e163cf20db04a6c495fd103c0248ab578b3ea167267d908d5d5c86daaa813c3
-AUX cdparanoia-3.9.8-asneeded.patch 946 RMD160 34b1a9d7c55388f75dd7d8c912a84191a4e0ec0d SHA1 5e34bc070b183816f096bed5bca2c667e34af078 SHA256 09714eb0a36f09438effe17afcba1149e88ab4a0b63362759121cec7a2656851
-AUX cdparanoia-3.9.8-identify_crash.patch 536 RMD160 aca91588013401c6ea25acfbd2b387fad913c4b6 SHA1 d952adc91c73168d309de7371e8c21055b4a0113 SHA256 d273a272f0d4b75da510aa548760dc41f92b2f60ac4adcda501ee78113141638
-AUX cdparanoia-3.9.8-include-cdda_interface_h.patch 452 RMD160 59d9a6ccddd2b36ceb263843358823cd89b10152 SHA1 f62abd49f47038d6ac2b6dace3b6a0eadba25a01 SHA256 2da26873793dc28ce64a674b26486bdf9612f48234cbf034914797721ec21517
-AUX cdparanoia-3.9.8-parallel-fpic-fbsd.patch 2881 RMD160 f2d26da891164928cdb9639db667bd2c385b89c0 SHA1 2096fa9779edbcbd35779f9899da0b70b1717092 SHA256 0d46ab95e5227ad5ce0eacc4422dbba519ff87b92566a1e6b6449df5c3e22fb5
-AUX cdparanoia-3.9.8-parallel-fpic.patch 2939 RMD160 a21774ce38a527f8ac2676607f4d119811592d79 SHA1 dbc4124707ffa6bb8f784bd23bec180cc9ce8587 SHA256 349cc192eee2b8793311cf2a6fb40b05a9623c0c7dcc0ba1f870626505fc83e2
-AUX cdparanoia-3.9.8-respectflags-pio.patch 1566 RMD160 720921e78de47adb480372362d4ef92416858ce3 SHA1 dcf504a747ac1c06bce602051f4a901266841f97 SHA256 f47e241dbb795602590f57e1478f7ee34146e67f73ee6249d56c81a1141a5f22
-AUX cdparanoia-3.9.8-respectflags-sgio.patch 1592 RMD160 54d4bd9ef765c5ad9f43f8f6d306d6c6ccadc9be SHA1 ff9b442a541f48a0ccb739ee2ea263367b389035 SHA256 00c1ac8d74e8f870e38b3eb84a23d207c523e7f0675afae25a98966c7e215149
-AUX cdparanoia-3.9.8-toc.patch 778 RMD160 8ae82ca62be7fbc22eb72070d604ca89a71658e5 SHA1 4a1bc83a26d297684b5ab8746033fae95325669a SHA256 bfea90816d1b04c8f538515524c419103df0c09b01dd6360cf15e1615a39a0d3
-AUX cdparanoia-3.9.8-use-destdir.patch 2468 RMD160 d75ef2585f1a801c79f91566e25b1aec7b51c543 SHA1 fa159e020c3e3e3263022637979ae2412916665b SHA256 791bd78ddf3db85ef7404239806ca20638a4994fb10463b514e31ab16fde455f
-AUX flex-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST cdparanoia-3.10_pre0-fbsd.patch.bz2 12161 RMD160 ff4b67a0f30bcf62c5d0d26e681a7014cf39cabe SHA1 0ccadcbd26e501de511c39d8cf51cb138934fde3 SHA256 8f168b799367029279ee04d64720ec2d1bc1baa1b03856f1e1ef834f77a6ffb7
-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-III-10pre0.src.tgz 138783 RMD160 e06c86b74501326daab1210dfcef17e6a0449254 SHA1 e82fd5c2ba683b5788f7e13c6a1ed15c62d7bb30 SHA256 49bc647c0a255c654c6f175bcc50fde006b402c5372ab71be7bb7dcdc57b1e62
-DIST cdparanoia-III-alpha9.8.src.tgz 116591 RMD160 d9225165f83b5386c58db263d6918a7006df1481 SHA1 04cc33a7d22d6255f6239e3e74195506b3bdde06 SHA256 1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008
-EBUILD cdparanoia-3.10_pre0.ebuild 1352 RMD160 b2a41b6336f9f8a0d21a3c920c6b97154d1734a7 SHA1 3383ce68f4fe4e7f06d0d3867e77e8c6a5db0616 SHA256 425b62d25b5a71283c8b8717dc96e7cfb76e5443888bf0e45783cf382ec38f73
-EBUILD cdparanoia-3.9.8-r3.ebuild 1954 RMD160 2f103a50a51cde9d3ecb5bc406ce2c8c464a6b23 SHA1 e4903dfee719468fd33ac782ab2363b42407e742 SHA256 21a9a4236ffde35c42860320207787eec26bcf7dde123bf2f5d531c901dd2e1e
-EBUILD cdparanoia-3.9.8-r5.ebuild 2441 RMD160 fab2a0ac3611aa927365845b44649e208358d456 SHA1 72ca04a763f708064a1a0218c8c76036a50857a4 SHA256 423c423ff813bfab20f549a30c1f7bba9643ab12a70a86f89b19d4baabf7db36
-MISC ChangeLog 10158 RMD160 7c23bb376992e4e9eb901c0008dcc1b7e5923709 SHA1 88ba7193d1c0af52fd078fd86fb4f866259842fe SHA256 ecd780640afc3528a648f440a7fc2ea36200ddc18a01bd269de8f55c240b4781
+EBUILD cdparanoia-3.10_pre0-r1.ebuild 1402 RMD160 ed0d16047112e842d9770bf2dec3a0b08b26415a SHA1 9d9eaae75e8cc64bb20f0a593b582f970261e74c SHA256 a63b9e358eedfca70007a02c40425316f4792940beb3ff5763487c6d83b116b4
+EBUILD cdparanoia-3.10_pre0.ebuild 1346 RMD160 3fcfc6b75ad6a15c004b6faba67dd30c7721236f SHA1 b43edf2abae3119388b75328eb59d3bbf14f6857 SHA256 1bca537ed0c43aa4cad373ff81882ff344c04518a38c319795add81e2d5b6b10
+MISC ChangeLog 10986 RMD160 c5a210a9a1a97afcd8a0c2f9ac2fef2106fe4933 SHA1 b3a8cedeca66a7dc4aa0775da7c7e49443d1c446 SHA256 d4a37061508af20e7f1a50ebd5ae801e57347d30ab3ece5368676d811ae07798
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/cdparanoia/cdparanoia-3.10_pre0-r1.ebuild b/media-sound/cdparanoia/cdparanoia-3.10_pre0-r1.ebuild
new file mode 100644
index 000000000000..d577e4241659
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.10_pre0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10_pre0-r1.ebuild,v 1.1 2008/02/20 21:03:11 drac Exp $
+
+WANT_AUTOCONF=2.1
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator
+
+MY_P=${PN}-III-$(get_version_component_range 2)$(get_version_component_range 3)
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="http://www.xiph.org/paranoia"
+SRC_URI="http://downloads.xiph.org/releases/cdparanoia/${MY_P}.src.tgz
+	mirror://gentoo/${P}-fbsd.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-include-cdda_interface_h.patch
+	epatch "${FILESDIR}"/${P}-use-destdir.patch
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+	epatch "${FILESDIR}"/${P}-log-summary.patch
+	epatch "${WORKDIR}/${P}-fbsd.patch"
+
+	mv configure.guess config.guess
+	mv configure.sub config.sub
+	sed -i -e '/configure.\(guess\|sub\)/d' configure.in
+
+	eautoconf
+	elibtoolize
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+	append-flags -I"${S}/interface"
+	econf
+	emake OPT="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc FAQ.txt README
+}
diff --git a/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild b/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
index f634440da33e..419703487fa4 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild,v 1.14 2008/01/19 19:10:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild,v 1.15 2008/02/20 21:03:11 drac Exp $
 
 WANT_AUTOCONF=2.1
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild
deleted file mode 100644
index 12507d3102a6..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-r3.ebuild,v 1.19 2006/11/12 04:08:13 vapier Exp $
-
-inherit eutils flag-o-matic linux-info libtool
-
-MY_P=${PN}-III-alpha9.8
-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}-SG_IO-patches.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-
-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
-
-	# Apply Red Hat's SG_IO patches see bug #118189 for more info
-	if kernel_is ge 2 6 15; then
-		EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
-		epatch ${FILESDIR}/${P}-respectflags-sgio.patch
-	else
-		epatch ${FILESDIR}/${P}-respectflags-pio.patch
-	fi
-
-	# 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
-
-	ln -s configure.guess config.guess
-	ln -s configure.sub config.sub
-	rm config.{guess,sub}
-
-	elibtoolize
-}
-
-src_compile() {
-	append-flags -I${S}/interface
-	econf || die
-	make OPT="${CFLAGS}" || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,include} /usr/share/man/man1
-	make DESTDIR=${D} install || die
-	dodoc FAQ.txt README
-}
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild
deleted file mode 100644
index 9dd3c674e09c..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 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.9 2007/02/12 15:34:56 kloeri 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kernel_linux"
-
-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
-	# this waits for autoepatch to be removed
-	epatch "${FILESDIR}/flex-configure-LANG.patch"
-
-	# Let portage handle the stripping of binaries
-	sed -i -e "/strip cdparanoia/d" Makefile.in
-
-	# Fix --as-needed linking, bug #160547
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-
-	# 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
-
-	# You don't want to know.
-	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/3.9.8-gcc34.patch b/media-sound/cdparanoia/files/3.9.8-gcc34.patch
deleted file mode 100644
index cc960baad589..000000000000
--- a/media-sound/cdparanoia/files/3.9.8-gcc34.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- cdparanoia-III-alpha9.8/interface/utils.h	2000-04-19 18:41:04.000000000 -0400
-+++ cdparanoia-III-alpha9.8/interface/utils_.h	2004-04-14 21:14:14.880147264 -0400
-@@ -111,7 +111,7 @@
-       d->errorbuf=catstring(d->errorbuf,s);
-       break;
-     case CDDA_MESSAGE_FORGETIT:
--    default:
-+    default: ;
-     }
-   }
- }
-@@ -126,7 +126,7 @@
-       d->messagebuf=catstring(d->messagebuf,s);
-       break;
-     case CDDA_MESSAGE_FORGETIT:
--    default:
-+    default: ;
-     }
-   }
- }
-@@ -168,7 +168,7 @@
-       }
-       break;
-     case CDDA_MESSAGE_FORGETIT:
--    default:
-+    default: ;
-     }
-   }
-   if(malloced)free(buffer);
-@@ -204,7 +204,7 @@
- 	}
-       break;
-     case CDDA_MESSAGE_FORGETIT:
--    default:
-+    default: ;
-     }
-   }
-   if(malloced)free(buffer);
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-log-summary.patch b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-log-summary.patch
new file mode 100644
index 000000000000..8c4b165cdb3c
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-log-summary.patch
@@ -0,0 +1,132 @@
+--- main.c	2006-08-30 00:23:55.000000000 +0200
++++ ../main.c	2006-11-15 03:26:17.000000000 +0100
+@@ -211,6 +218,7 @@
+ "  -q --quiet                      : quiet operation\n"
+ "  -e --stderr-progress            : force output of progress information to\n"
+ "                                    stderr (for wrapper scripts)\n"
++"  -l --log-summary         <file> : save result summary to file\n"
+ "  -V --version                    : print version info and quit\n"
+ "  -Q --query                      : autosense drive, query disc and quit\n"
+ "  -B --batch                      : 'batch' mode (saves each track to a\n"
+@@ -342,6 +350,7 @@
+ 
+ static int skipped_flag=0;
+ static int abort_on_skip=0;
++FILE *logfile = NULL;
+ static void callback(long inpos, int function){
+   /*
+ 
+@@ -552,16 +561,22 @@
+ 	}
+    
+ 	fprintf(stderr,buffer);
++       
++	if (logfile != NULL && function==-1) {
++	  fprintf(logfile,buffer+1);
++	  fprintf(logfile,"\n\n");
++	  fflush(logfile);
++	}
+       }
+     }
+   }
+-
++  
+   /* clear the indicator for next batch */
+   if(function==-1)
+     memset(dispcache,' ',graph);
+ }
+ 
+-const char *optstring = "escCn:o:O:d:g:S:prRwafvqVQhZz::YXWBi:Tt:";
++const char *optstring = "escCn:o:O:d:g:S:prRwafvqVQhZz::YXWBi:Tt:l:";
+ 
+ struct option options [] = {
+ 	{"stderr-progress",no_argument,NULL,'e'},
+@@ -594,6 +609,7 @@
+ 	{"disable-fragmentation",no_argument,NULL,'F'},
+ 	{"output-info",required_argument,NULL,'i'},
+ 	{"never-skip",optional_argument,NULL,'z'},
++	{"log-summary",required_argument,NULL,'l'},
+ 
+ 	{NULL,0,NULL,0}
+ };
+@@ -763,6 +779,20 @@
+     case 't':
+       toc_offset=atoi(optarg);
+       break;
++    case 'l':
++      if(logfile && logfile != stdout)fclose(logfile);
++      if(!strcmp(optarg,"-"))
++	logfile=stdout;
++      else{
++	logfile=fopen(optarg,"w");
++	if(logfile==NULL){
++	  report3("Cannot open log summary file %s: %s",(char*)optarg,
++		  strerror(errno));
++	  exit(1);
++	}
++      }
++
++      break;
+     case 'O':
+       sample_offset=atoi(optarg);
+       break;
+@@ -772,6 +802,18 @@
+     }
+   }
+ 
++  if(logfile){
++    /* log command line and version */
++    int i;
++    for (i = 0; i < argc; i++) 
++      fprintf(logfile,"%s ",argv[i]);
++    fprintf(logfile,"\n",argv[i]);
++    
++    fprintf(logfile,VERSION);
++    fprintf(logfile,"\n");
++    fflush(logfile);
++  }
++
+   if(optind>=argc && !query_only){
+     if(batch)
+       span=NULL;
+@@ -1052,6 +1094,10 @@
+ 	    if(batch)report("Are you sure you wanted 'batch' "
+ 			    "(-B) output with stdout?");
+ 	    report("outputting to stdout\n");
++	    if(logfile){
++	      fprintf(logfile,"outputting to stdout\n");
++	      fflush(logfile);
++	    }
+ 	    outfile_name[0]='\0';
+ 	  }else{
+ 	    char path[256];
+@@ -1096,6 +1142,10 @@
+ 	      exit(1);
+ 	    }
+ 	    report2("outputting to %s\n",outfile_name);
++	    if(logfile){
++	      fprintf(logfile,"outputting to %s\n",outfile_name);
++	      fflush(logfile);
++	    }
+ 	  }
+ 	}else{
+ 	  /* default */
+@@ -1128,6 +1178,10 @@
+ 	    exit(1);
+ 	  }
+ 	  report2("outputting to %s\n",outfile_name);
++	  if(logfile){
++	    fprintf(logfile,"outputting to %s\n",outfile_name);
++	    fflush(logfile);
++	  }
+ 	}
+ 	
+ 	switch(output_type){
+@@ -1270,5 +1324,7 @@
+   
+   cdda_close(d);
+   d=NULL;
++  if(logfile && logfile != stdout)
++    fclose(logfile);
+   return 0;
+ }
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch
deleted file mode 100644
index c24c15168216..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cdparanoia-III-alpha9.8/paranoia/Makefile.in.old	2007-01-06 19:54:23.632598436 +0100
-+++ cdparanoia-III-alpha9.8/paranoia/Makefile.in	2007-01-06 19:55:15.038341210 +0100
-@@ -22,7 +22,7 @@
- OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
- #TFILES = isort.t gap.t p_block.t paranoia.t
- 
--LIBS = ../interface/libcdda_interface.a -lm
-+LIBS = ../interface/libcdda_interface.so -lm
- export VERSION
- 
- all: lib slib
-@@ -44,7 +44,7 @@
- 	$(RANLIB) libcdda_paranoia.a
- 
- libcdda_paranoia.so: 	$(OFILES)	
--	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
-+	$(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) $(LIBS)
- 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
- 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
- 
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch
deleted file mode 100644
index 3e3634009c1e..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-identify_crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr cdparanoia-III-alpha9.8/interface/scan_devices.c cdparanoia-III-alpha9.8-new/interface/scan_devices.c
---- cdparanoia-III-alpha9.8/interface/scan_devices.c	Mon Mar 26 07:44:01 2001
-+++ cdparanoia-III-alpha9.8-new/interface/scan_devices.c	Thu Sep 19 16:47:56 2002
-@@ -617,7 +617,7 @@
- 
-   /* It would seem some TOSHIBA CDROMs gets things wrong */
-  
--  if (!strncmp (p + 8, "TOSHIBA", 7) &&
-+  if (p && !strncmp (p + 8, "TOSHIBA", 7) &&
-       !strncmp (p + 16, "CD-ROM", 6) &&
-       p[0] == TYPE_DISK) {
-     p[0] = TYPE_ROM;
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-include-cdda_interface_h.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-include-cdda_interface_h.patch
deleted file mode 100644
index b06e2ba2ef2d..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-include-cdda_interface_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdparanoia-III-alpha9.8/paranoia/cdda_paranoia.h.orig	2004-04-01 12:08:37.671108864 +0200
-+++ cdparanoia-III-alpha9.8/paranoia/cdda_paranoia.h	2004-04-01 12:08:46.779724144 +0200
-@@ -37,6 +37,8 @@
- typedef void cdrom_paranoia;
- #endif
- 
-+#include <cdda_interface.h>
-+
- extern cdrom_paranoia *paranoia_init(cdrom_drive *d);
- extern void paranoia_modeset(cdrom_paranoia *p,int mode);
- extern long paranoia_seek(cdrom_paranoia *p,long seek,int mode);
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch
deleted file mode 100644
index 96ed642eb965..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur cdparanoia-III-alpha9.8.orig/interface/Makefile.in cdparanoia-III-alpha9.8/interface/Makefile.in
---- cdparanoia-III-alpha9.8.orig/interface/Makefile.in	2006-06-12 16:31:46.000000000 -0400
-+++ cdparanoia-III-alpha9.8/interface/Makefile.in	2006-06-12 16:32:55.000000000 -0400
-@@ -10,6 +10,7 @@
- FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
- OPT=@OPT@ $(FLAGS)
- DEBUG=@DEBUG@ $(FLAGS) -DCDDA_TEST
-+LIBFLAGS=-fPIC
- CC=@CC@
- LD=@CC@
- LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -18,7 +19,7 @@
- LIBS = -lm
- CPPFLAGS+=-D_REENTRANT
- 
--OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
-+OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o \
- 	scsi_interface.o smallft.o toc.o test_interface.o
- 
- export VERSION
-@@ -33,7 +34,7 @@
- 
- slib:	
- 	$(MAKE) lessmessy
--	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_interface.so CFLAGS="$(OPT)" 
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
- 
- test:	
-@@ -46,12 +47,12 @@
- 	$(RANLIB) libcdda_interface.a
- 
- libcdda_interface.so: 	$(OFILES)	
--	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
-+	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
- 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(LIBFLAGS) -c $<
- 
- lessmessy:
- 	-rm  -f *.o core *~ *.out
-diff -ur cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in cdparanoia-III-alpha9.8/paranoia/Makefile.in
---- cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in	2006-06-12 16:31:46.000000000 -0400
-+++ cdparanoia-III-alpha9.8/paranoia/Makefile.in	2006-06-12 16:33:36.000000000 -0400
-@@ -11,6 +11,7 @@
- FLAGS=@TYPESIZES@ @CFLAGS@
- OPT=@OPT@ $(FLAGS)
- DEBUG=@DEBUG@ $(FLAGS)
-+LIBFLAGS=-fPIC
- CC=@CC@
- LD=@CC@
- LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -34,7 +35,7 @@
- 
- slib:	
- 	$(MAKE) lessmessy
--	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" 
- 
- #test:	$(TFILES)
- #
-@@ -44,12 +45,12 @@
- 	$(RANLIB) libcdda_paranoia.a
- 
- libcdda_paranoia.so: 	$(OFILES)	
--	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
-+	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
- 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
- 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(LIBFLAGS) -c $<
- 
- .c.t:
- 	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic.patch
deleted file mode 100644
index ef5c40ea7338..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur cdparanoia-III-alpha9.8.orig/interface/Makefile.in cdparanoia-III-alpha9.8/interface/Makefile.in
---- cdparanoia-III-alpha9.8.orig/interface/Makefile.in	2006-06-12 16:31:46.000000000 -0400
-+++ cdparanoia-III-alpha9.8/interface/Makefile.in	2006-06-12 16:32:55.000000000 -0400
-@@ -10,6 +10,7 @@
- FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
- OPT=@OPT@ $(FLAGS)
- DEBUG=@DEBUG@ $(FLAGS) -DCDDA_TEST
-+LIBFLAGS=-fPIC
- CC=@CC@
- LD=@CC@
- LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -18,7 +19,7 @@
- LIBS = -lm
- CPPFLAGS+=-D_REENTRANT
- 
--OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
-+OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o \
- 	scsi_interface.o smallft.o toc.o test_interface.o
- 
- export VERSION
-@@ -33,7 +34,7 @@
- 
- slib:	
- 	$(MAKE) lessmessy
--	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_interface.so CFLAGS="$(OPT)" 
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
- 
- test:	
-@@ -46,12 +47,12 @@
- 	$(RANLIB) libcdda_interface.a
- 
- libcdda_interface.so: 	$(OFILES)	
--	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm
-+	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
- 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(LIBFLAGS) -c $<
- 
- lessmessy:
- 	-rm  -f *.o core *~ *.out
-diff -ur cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in cdparanoia-III-alpha9.8/paranoia/Makefile.in
---- cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in	2006-06-12 16:31:46.000000000 -0400
-+++ cdparanoia-III-alpha9.8/paranoia/Makefile.in	2006-06-12 16:33:36.000000000 -0400
-@@ -11,6 +11,7 @@
- FLAGS=@TYPESIZES@ @CFLAGS@
- OPT=@OPT@ $(FLAGS)
- DEBUG=@DEBUG@ $(FLAGS)
-+LIBFLAGS=-fPIC
- CC=@CC@
- LD=@CC@
- LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -34,7 +35,7 @@
- 
- slib:	
- 	$(MAKE) lessmessy
--	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" 
- 
- #test:	$(TFILES)
- #
-@@ -44,12 +45,12 @@
- 	$(RANLIB) libcdda_paranoia.a
- 
- libcdda_paranoia.so: 	$(OFILES)	
--	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
-+	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
- 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
- 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(LIBFLAGS) -c $<
- 
- .c.t:
- 	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-pio.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-pio.patch
deleted file mode 100644
index 022141f086fc..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-pio.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur cdparanoia-III-alpha9.8-orig/interface/Makefile.in cdparanoia-III-alpha9.8/interface/Makefile.in
---- cdparanoia-III-alpha9.8-orig/interface/Makefile.in	1999-12-13 23:27:59.000000000 -0500
-+++ cdparanoia-III-alpha9.8/interface/Makefile.in	2006-04-03 16:51:11.000000000 -0400
-@@ -46,7 +46,7 @@
- 	$(RANLIB) libcdda_interface.a
- 
- libcdda_interface.so: 	$(OFILES)	
--	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES)
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES)
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
- 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
- 
-diff -ur cdparanoia-III-alpha9.8-orig/paranoia/Makefile.in cdparanoia-III-alpha9.8/paranoia/Makefile.in
---- cdparanoia-III-alpha9.8-orig/paranoia/Makefile.in	1999-12-13 23:28:04.000000000 -0500
-+++ cdparanoia-III-alpha9.8/paranoia/Makefile.in	2006-04-03 16:51:13.000000000 -0400
-@@ -44,7 +44,7 @@
- 	$(RANLIB) libcdda_paranoia.a
- 
- libcdda_paranoia.so: 	$(OFILES)	
--	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
- 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
- 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
- 
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-sgio.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-sgio.patch
deleted file mode 100644
index d76a4b179e58..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-sgio.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: cdparanoia-III-alpha9.8/interface/Makefile.in
-===================================================================
---- cdparanoia-III-alpha9.8.orig/interface/Makefile.in
-+++ cdparanoia-III-alpha9.8/interface/Makefile.in
-@@ -46,7 +46,7 @@ libcdda_interface.a: 	$(OFILES)	
- 	$(RANLIB) libcdda_interface.a
- 
- libcdda_interface.so: 	$(OFILES)	
--	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm
- 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
- 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
- 
-Index: cdparanoia-III-alpha9.8/paranoia/Makefile.in
-===================================================================
---- cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in
-+++ cdparanoia-III-alpha9.8/paranoia/Makefile.in
-@@ -44,7 +44,7 @@ libcdda_paranoia.a: 	$(OFILES)	
- 	$(RANLIB) libcdda_paranoia.a
- 
- libcdda_paranoia.so: 	$(OFILES)	
--	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
- 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
- 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
- 
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch
deleted file mode 100644
index 8fafb1eb79ea..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-toc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN cdparanoia-III-alpha9.8/interface/common_interface.c cdparanoia-III-alpha9.8.new/interface/common_interface.c
---- cdparanoia-III-alpha9.8/interface/common_interface.c	2000-04-20 00:40:42.000000000 +0200
-+++ cdparanoia-III-alpha9.8.new/interface/common_interface.c	2002-11-06 23:06:03.000000000 +0100
-@@ -223,7 +223,8 @@
-       /* adjust end of last audio track to be in the first session */
-       for (j = tracks-1; j >= 0; j--) {
- 	if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) {
--	  if (d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) 
-+	  if ((d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) &&
-+            (ms_str.addr.lba - 11400 > d->disc_toc[j-1].dwStartSector))
- 	    d->disc_toc[j].dwStartSector = ms_str.addr.lba - 11400;
- 	  break;
- 	}
-
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-use-destdir.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-use-destdir.patch
deleted file mode 100644
index a159f65603d3..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-use-destdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.in.orig	2004-09-21 21:34:31.921768944 +0000
-+++ Makefile.in	2004-09-21 21:38:22.395731576 +0000
-@@ -64,28 +64,28 @@
- 	cd paranoia && $(MAKE) slib
- 
- install:
--	$(INSTALL) -d -m 0755 $(BINDIR)
--	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
--	$(INSTALL) -d -m 0755 $(MANDIR)
--	$(INSTALL) -d -m 0755 $(MANDIR)/man1
--	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
--	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
--	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
--	$(INSTALL) -d -m 0755 $(LIBDIR)
--	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
--	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
--	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
--	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
--	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
--	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
- 	ln -fs libcdda_interface.so.0.$(VERSION) \
--		$(LIBDIR)/libcdda_interface.so.0
-+		$(DESTDIR)$(LIBDIR)/libcdda_interface.so.0
- 	ln -fs libcdda_interface.so.0.$(VERSION) \
--		$(LIBDIR)/libcdda_interface.so
-+		$(DESTDIR)$(LIBDIR)/libcdda_interface.so
- 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
--		$(LIBDIR)/libcdda_paranoia.so.0
-+		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
- 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
--		$(LIBDIR)/libcdda_paranoia.so
-+		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
- 
- cdparanoia:	$(OFILES) $(LIBDEP)
- 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
diff --git a/media-sound/cdparanoia/files/flex-configure-LANG.patch b/media-sound/cdparanoia/files/flex-configure-LANG.patch
deleted file mode 100644
index 3ef76ef911c0..000000000000
--- a/media-sound/cdparanoia/files/flex-configure-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.