Fixed -fPIC, sanitised some CFLAGS in the Makefile, added to ~amd64, changed insinto -> dolib.so in the ebuild.

4 files changed, 33 insertions, 9 deletions

diff --git a/media-plugins/caps-plugins/ChangeLog b/media-plugins/caps-plugins/ChangeLog
index c7cbdaf7b476..69a7ec7cd2fe 100644
--- a/media-plugins/caps-plugins/ChangeLog
+++ b/media-plugins/caps-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/caps-plugins
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/caps-plugins/ChangeLog,v 1.5 2004/06/24 23:27:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/caps-plugins/ChangeLog,v 1.6 2004/07/06 18:36:25 slarti Exp $
+
+  06 Jul 2004; Tom Martin <slarti@gentoo.org> caps-plugins-0.1.10.ebuild,
+  +files/caps-plugins-0.1.10-fpic.patch:
+  Added ~amd64 keyword and fixed Makefile to use fPIC, closing bug 51670, thanks
+  to Stefan Briesenick <sbriesen@gmx.de> for reporting. Edited ebuild to use
+  dolib.so rather than insinto. Weird CFLAGS also filtered out from Makefile.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   caps-plugins-0.1.10.ebuild, caps-plugins-0.1.5.ebuild:
diff --git a/media-plugins/caps-plugins/Manifest b/media-plugins/caps-plugins/Manifest
index a4a05028e78c..258947dc89f3 100644
--- a/media-plugins/caps-plugins/Manifest
+++ b/media-plugins/caps-plugins/Manifest
@@ -1,6 +1,7 @@
 MD5 4e1fed8daf558f604145b0d8dfb8bb0a caps-plugins-0.1.5.ebuild 617
-MD5 c944df069673593ac6598b062cd08f63 caps-plugins-0.1.10.ebuild 618
-MD5 b867620e49c6b8945b53e9bf85d06b67 ChangeLog 654
+MD5 f4b19e31f91aed612ba7ad3b0af71861 caps-plugins-0.1.10.ebuild 719
+MD5 36f6efdd9ce0a1b2430894f4a0c48104 ChangeLog 1004
 MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
 MD5 e3bed48f33adc69fe401b245dca8a2a2 files/digest-caps-plugins-0.1.10 63
+MD5 e6f951f4aa31c9482b8cafafa280cde6 files/caps-plugins-0.1.10-fpic.patch 293
 MD5 3ce9657a31ddfb46eb62af12277639c3 files/digest-caps-plugins-0.1.5 62
diff --git a/media-plugins/caps-plugins/caps-plugins-0.1.10.ebuild b/media-plugins/caps-plugins/caps-plugins-0.1.10.ebuild
index 67d1aeac455d..cb6621e74dc4 100644
--- a/media-plugins/caps-plugins/caps-plugins-0.1.10.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.1.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/caps-plugins/caps-plugins-0.1.10.ebuild,v 1.4 2004/06/24 23:27:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/caps-plugins/caps-plugins-0.1.10.ebuild,v 1.5 2004/07/06 18:36:25 slarti Exp $
+
+inherit eutils
 
 IUSE=""
 #
@@ -11,19 +13,23 @@ HOMEPAGE="http://quitte.de/dsp/caps.html"
 SRC_URI="http://quitte.de/dsp/caps_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="media-libs/ladspa-sdk"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/caps-plugins-0.1.10-fpic.patch || die
+}
+
 src_compile() {
-	make || die
+	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
 	dodoc AUTHORS COPYING README
-	insinto /usr/lib/ladspa
-	insopts -m0755
-	doins *.so
+	dolib.so *.so
 }
diff --git a/media-plugins/caps-plugins/files/caps-plugins-0.1.10-fpic.patch b/media-plugins/caps-plugins/files/caps-plugins-0.1.10-fpic.patch
new file mode 100644
index 000000000000..458ca26f8927
--- /dev/null
+++ b/media-plugins/caps-plugins/files/caps-plugins-0.1.10-fpic.patch
@@ -0,0 +1,11 @@
+--- Makefile	2004-07-06 19:06:46.606228168 +0100
++++ /home/slarti/Makefile.new	2004-07-06 19:07:42.008805696 +0100
+@@ -38,7 +38,7 @@
+ 	$(CC) $(CFLAGS) -S $<
+ 
+ .cc.o:
+-	$(CC) $(CFLAGS) -I/usr/local/include -c $<
++	$(CC) $(CFLAGS) -fPIC -c $<
+ 
+ tags: $(SOURCES) $(HEADERS)
+ 	@echo making tags