To be continued..

(Portage version: 2.1.3.15)

3 files changed, 31 insertions, 12 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 2db953543edc..da3b22de573b 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.56 2007/10/20 16:39:59 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.57 2007/10/20 17:36:51 drac Exp $
 
 *cdparanoia-3.10_pre0 (20 Oct 2007)
 
   20 Oct 2007; Samuli Suominen <drac@gentoo.org>
-  +files/cdparanoia-3.10_pre0-asneeded.patch,
   +files/cdparanoia-3.10_pre0-include-cdda_interface_h.patch,
+  +files/cdparanoia-3.10_pre0-Makefile.in.patch,
   +files/cdparanoia-3.10_pre0-use-destdir.patch,
   +cdparanoia-3.10_pre0.ebuild:
   Version bump wrt #153823.
diff --git a/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild b/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
index 274a43e6f871..d1a20b5586e2 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
@@ -1,10 +1,10 @@
 # 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.10_pre0.ebuild,v 1.2 2007/10/20 16:55:25 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild,v 1.3 2007/10/20 17:36:51 drac Exp $
 
 WANT_AUTOCONF=2.1
 
-inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator
+inherit autotools eutils libtool toolchain-funcs versionator
 
 MY_P=${PN}-III-$(get_version_component_range 2)$(get_version_component_range 3)
 
@@ -25,7 +25,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-include-cdda_interface_h.patch
 	epatch "${FILESDIR}"/${P}-use-destdir.patch
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
 
 	mv configure.guess config.guess
 	mv configure.sub config.sub
@@ -37,7 +37,6 @@ src_unpack() {
 
 src_compile() {
 	tc-export CC AR RANLIB
-	append-flags -I"${S}"/interface
 	econf
 	emake OPT="${CFLAGS}" || die "emake failed."
 }
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-asneeded.patch b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
index 392333eb279c..e9bbec259982 100644
--- a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-asneeded.patch
+++ b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
@@ -1,18 +1,28 @@
 diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/interface/Makefile.in
 --- cdparanoia-III-10pre0.orig/interface/Makefile.in	2006-08-30 01:14:08.000000000 +0300
-+++ cdparanoia-III-10pre0/interface/Makefile.in	2007-10-20 19:24:37.000000000 +0300
-@@ -46,7 +46,7 @@
++++ cdparanoia-III-10pre0/interface/Makefile.in	2007-10-20 20:33:09.000000000 +0300
+@@ -32,8 +32,7 @@
+ 	$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" 
+ 
+ slib:	
+-	$(MAKE) lessmessy
+-	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fPIC"
+ 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
+ 
+ test:	
+@@ -46,7 +45,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) $(LIBS)
-+	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++	$(CC) $(OFILES) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LDFLAGS) $(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
  
 diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/paranoia/Makefile.in
 --- cdparanoia-III-10pre0.orig/paranoia/Makefile.in	2006-08-29 22:06:04.000000000 +0300
-+++ cdparanoia-III-10pre0/paranoia/Makefile.in	2007-10-20 19:31:15.000000000 +0300
++++ cdparanoia-III-10pre0/paranoia/Makefile.in	2007-10-20 20:33:31.000000000 +0300
 @@ -21,7 +21,7 @@
  OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
  #TFILES = isort.t gap.t p_block.t paranoia.t
@@ -22,12 +32,22 @@ diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/p
  export VERSION
  
  all: lib slib
-@@ -44,7 +44,7 @@
+@@ -33,8 +33,7 @@
+ 	$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" 
+ 
+ slib:	
+-	$(MAKE) lessmessy
+-	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fPIC" 
+ 
+ #test:	$(TFILES)
+ #
+@@ -44,7 +43,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) -L ../interface -lcdda_interface
-+	$(CC) $(OFILES) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBS) -L ../interface -lcdda_interface
++	$(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) -L ../interface -lcdda_interface -fPIC $(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