Let's extract for non-Linux 2.6 systems.

Package-Manager: portage-2.1.1_rc1-r4

4 files changed, 112 insertions, 13 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 91978fac78a8..afa6fc67c6e6 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.45 2006/09/04 05:12:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.46 2006/09/05 20:52:50 flameeyes Exp $
+
+  05 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch,
+  cdparanoia-3.9.8-r4.ebuild:
+  Let's extract for non-Linux 2.6 systems.
 
   04 Sep 2006; Joshua Kinard <kumba@gentoo.org> cdparanoia-3.9.8-r3.ebuild:
   Marked stable on mips.
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 117af1159001..245b63a524c7 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.9.8-gcc34.patch 772 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 SHA1 8bb7aafc54a70b558b97c88ac4a54f7535039851 SHA256 ffe735303a300d358ba99fc85f6d28c4bc7bc7ce90bf42b9838803fcc99cf150
 MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772
 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 files/3.9.8-gcc34.patch 772
@@ -10,6 +13,10 @@ AUX cdparanoia-3.9.8-include-cdda_interface_h.patch 452 RMD160 59d9a6ccddd2b36ce
 MD5 532963b39bb2da5b1961bcf17fb11e68 files/cdparanoia-3.9.8-include-cdda_interface_h.patch 452
 RMD160 59d9a6ccddd2b36ceb263843358823cd89b10152 files/cdparanoia-3.9.8-include-cdda_interface_h.patch 452
 SHA256 2da26873793dc28ce64a674b26486bdf9612f48234cbf034914797721ec21517 files/cdparanoia-3.9.8-include-cdda_interface_h.patch 452
+AUX cdparanoia-3.9.8-parallel-fpic-fbsd.patch 2881 RMD160 f2d26da891164928cdb9639db667bd2c385b89c0 SHA1 2096fa9779edbcbd35779f9899da0b70b1717092 SHA256 0d46ab95e5227ad5ce0eacc4422dbba519ff87b92566a1e6b6449df5c3e22fb5
+MD5 4deae57216160e5c4160c95e68f6014d files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch 2881
+RMD160 f2d26da891164928cdb9639db667bd2c385b89c0 files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch 2881
+SHA256 0d46ab95e5227ad5ce0eacc4422dbba519ff87b92566a1e6b6449df5c3e22fb5 files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch 2881
 AUX cdparanoia-3.9.8-parallel-fpic.patch 2939 RMD160 a21774ce38a527f8ac2676607f4d119811592d79 SHA1 dbc4124707ffa6bb8f784bd23bec180cc9ce8587 SHA256 349cc192eee2b8793311cf2a6fb40b05a9623c0c7dcc0ba1f870626505fc83e2
 MD5 00957c4c1f94b184439e6f073222ca6b files/cdparanoia-3.9.8-parallel-fpic.patch 2939
 RMD160 a21774ce38a527f8ac2676607f4d119811592d79 files/cdparanoia-3.9.8-parallel-fpic.patch 2939
@@ -49,14 +56,14 @@ EBUILD cdparanoia-3.9.8-r3.ebuild 1954 RMD160 27aadfefc7553fb72119e8d86f2893b6c0
 MD5 d1277e4c6099235a7f084354c87bc106 cdparanoia-3.9.8-r3.ebuild 1954
 RMD160 27aadfefc7553fb72119e8d86f2893b6c0ccb212 cdparanoia-3.9.8-r3.ebuild 1954
 SHA256 849b9d70177c1acc6fc140a404783ef3b7084f3290e0752fafe57b526f82ae10 cdparanoia-3.9.8-r3.ebuild 1954
-EBUILD cdparanoia-3.9.8-r4.ebuild 2287 RMD160 702dcbadffa505151a51fba27d74369311c9e06f SHA1 2edfae9648478108d556460daab94f9214debf97 SHA256 479b009624cdaab8b6d2c33dcec9b0cf07c9111eec11182517c7850169ae3810
-MD5 c27b9a0fe617b34f8c81c6e377c7cb8c cdparanoia-3.9.8-r4.ebuild 2287
-RMD160 702dcbadffa505151a51fba27d74369311c9e06f cdparanoia-3.9.8-r4.ebuild 2287
-SHA256 479b009624cdaab8b6d2c33dcec9b0cf07c9111eec11182517c7850169ae3810 cdparanoia-3.9.8-r4.ebuild 2287
-MISC ChangeLog 6797 RMD160 a30b296054f94e3df2263e9a05dafd8a2990bd3b SHA1 e6a5f544b7cb29c8e9242dfcfbf8c8072b5952e3 SHA256 991678d5e375d2ef92d82ccf546a5f016cb57880427ac8ed309175afe55dd83a
-MD5 5be480a2faf6cffa67879347c4ff8fab ChangeLog 6797
-RMD160 a30b296054f94e3df2263e9a05dafd8a2990bd3b ChangeLog 6797
-SHA256 991678d5e375d2ef92d82ccf546a5f016cb57880427ac8ed309175afe55dd83a ChangeLog 6797
+EBUILD cdparanoia-3.9.8-r4.ebuild 2377 RMD160 74c88352a7cadfafb2c8f14054e3ad583f131529 SHA1 fd24bac5bc9d55140b53665616ae023028c5e9c8 SHA256 a9facfd08df8fff1c812a67614491db64052892561aa10366bd9e3b3231ee024
+MD5 5f2f99f242ab002e1793857feb2e17cb cdparanoia-3.9.8-r4.ebuild 2377
+RMD160 74c88352a7cadfafb2c8f14054e3ad583f131529 cdparanoia-3.9.8-r4.ebuild 2377
+SHA256 a9facfd08df8fff1c812a67614491db64052892561aa10366bd9e3b3231ee024 cdparanoia-3.9.8-r4.ebuild 2377
+MISC ChangeLog 6980 RMD160 6b485e0be277ba005a30cb1c1ae9f85d708dcfab SHA1 b55eb4251ec034ba885f5ec5b06c2a2a0af6d726 SHA256 ae5af932e4770e41d5e56d80d555afc3728d9dde4890c0c32419c861eca65469
+MD5 def89c29d4dab32d2c1d72c207f4d2d1 ChangeLog 6980
+RMD160 6b485e0be277ba005a30cb1c1ae9f85d708dcfab ChangeLog 6980
+SHA256 ae5af932e4770e41d5e56d80d555afc3728d9dde4890c0c32419c861eca65469 ChangeLog 6980
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -73,3 +80,10 @@ 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE/eOqAiZjviIA2XgRAgeTAKCtfNwmnjWO+F3c5x47BbNykAbY/QCg1Ljl
++0yaSRb0X++8AfqQKw0RPEw=
+=JSDk
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild
index cdee2a053c99..c733c34bb15a 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.4 2006/06/16 21:26:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild,v 1.5 2006/09/05 20:52:50 flameeyes Exp $
 
 inherit eutils flag-o-matic linux-info libtool toolchain-funcs
 
@@ -41,17 +41,18 @@ src_unpack() {
 	if use kernel_linux && kernel_is ge 2 6 15; then
 		EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
 		epatch "${FILESDIR}/${P}-respectflags-sgio.patch"
+		# Fix makefiles for parallel make
+		epatch "${FILESDIR}/${P}-parallel-fpic.patch"
 	else
 		epatch "${FILESDIR}/${P}-respectflags-pio.patch"
 		epatch "${DISTDIR}/${P}-fbsd.patch.bz2"
+		# Fix makefiles for parallel make
+		epatch "${FILESDIR}/${P}-parallel-fpic-fbsd.patch"
 	fi
 
 	# Use directly the same exact patch as flex as it works
 	epatch "${FILESDIR}/flex-configure-LANG.patch"
 
-	# Fix makefiles for parallel make
-	epatch "${FILESDIR}/${P}-parallel-fpic.patch"
-
 	# Let portage handle the stripping of binaries
 	sed -i -e "/strip cdparanoia/d" Makefile.in
 
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
new file mode 100644
index 000000000000..96ed642eb965
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic-fbsd.patch
@@ -0,0 +1,79 @@
+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)