diff options
| -rw-r--r-- | media-sound/cdparanoia/ChangeLog | 10 | ||||
| -rw-r--r-- | media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild | 10 | ||||
| -rw-r--r-- | media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-pio.patch | 24 | ||||
| -rw-r--r-- | media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-sgio.patch (renamed from media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags.patch) | 0 |
4 files changed, 40 insertions, 4 deletions
diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog index f103c16d8cd3..3ab3a0a5352b 100644 --- a/media-sound/cdparanoia/ChangeLog +++ b/media-sound/cdparanoia/ChangeLog @@ -1,6 +1,14 @@ # 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.29 2006/03/20 16:41:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.30 2006/04/03 20:58:36 chutzpah Exp $ + + 03 Apr 2006; Patrick McLean <chutzpah@gentoo.org> + -files/cdparanoia-3.9.8-respectflags.patch, + +files/cdparanoia-3.9.8-respectflags-pio.patch, + +files/cdparanoia-3.9.8-respectflags-sgio.patch, + cdparanoia-3.9.8-r3.ebuild: + Added a version of the respectflags patch that applies when the SGIO patches + have been applied (bug #127581) 20 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> +files/cdparanoia-3.9.8-respectflags.patch, cdparanoia-3.9.8-r3.ebuild: diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild index 5bd317fc6977..b3beaae8bd3e 100644 --- a/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild +++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r3.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-r3.ebuild,v 1.5 2006/03/27 19:03:30 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild,v 1.6 2006/04/03 20:58:36 chutzpah Exp $ inherit eutils flag-o-matic gnuconfig linux-info @@ -33,9 +33,13 @@ src_unpack() { epatch ${FILESDIR}/${P}-use-destdir.patch # Apply Red Hat's SG_IO patches see bug #118189 for more info - kernel_is ge 2 6 15 && EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch + 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 - epatch ${FILESDIR}/${P}-respectflags.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-respectflags-pio.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-pio.patch new file mode 100644 index 000000000000..022141f086fc --- /dev/null +++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-pio.patch @@ -0,0 +1,24 @@ +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.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-sgio.patch index d76a4b179e58..d76a4b179e58 100644 --- a/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags.patch +++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-respectflags-sgio.patch |