Fix building with -Wl,--as-needed wrt #294358 by Kacper Kowalik.

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

4 files changed, 46 insertions, 24 deletions

diff --git a/app-misc/iguanaIR/ChangeLog b/app-misc/iguanaIR/ChangeLog
index cfffd2a3bbfd..61205869531b 100644
--- a/app-misc/iguanaIR/ChangeLog
+++ b/app-misc/iguanaIR/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/iguanaIR
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/iguanaIR/ChangeLog,v 1.1 2008/03/26 17:04:17 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/iguanaIR/ChangeLog,v 1.2 2009/12/21 14:13:13 ssuominen Exp $
+
+  21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> iguanaIR-0.93.ebuild,
+  +files/iguanaIR-0.93-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #294358 by Kacper Kowalik.
 
 *iguanaIR-0.93 (26 Mar 2008)
 
diff --git a/app-misc/iguanaIR/Manifest b/app-misc/iguanaIR/Manifest
index ce827b53412d..30d1e55170ea 100644
--- a/app-misc/iguanaIR/Manifest
+++ b/app-misc/iguanaIR/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 40-iguanaIR.rules 238 RMD160 9e6bc96fda260a0994ac4aae499451ab7882d46c SHA1 c87f33a1ade427d03e3cd683b5c8b825ebfc6a23 SHA256 55f1d2a8bba79a6b5ce0cca2c473e5c0e28e9ef8eae0f5fd4e27560dc970dfaa
+AUX iguanaIR-0.93-asneeded.patch 1240 RMD160 129cffaf17166076a29a82fa3a09d19cc2f62d17 SHA1 2aac65f191b499b8e11b1845352d4ac50f90d45d SHA256 76a8dd0ebb95273c982e0196c54566930af6364d44ae0f75b7dac877a573df4f
 AUX iguanaIR-0.93-gentoo.diff 1820 RMD160 dc0b2516816686388b65a91e824c6ace33f9b2cd SHA1 0e96b5e4495fdc1386cf6b405ba928195314517d SHA256 c7756a9929eab61c5e37ca20f582944970c5623bd9969590ee4238862936451a
 DIST iguanaIR-0.93.tar.bz2 1006655 RMD160 b73014d09b35778eec94326c23ab1fc26cb0cf4b SHA1 97fb0e0082fe0ec260667f57b7c8376dd37c85b6 SHA256 4a2f546eb0f99a3617efe20676633f06e2b74f8b352be939acff30d226cabca8
-EBUILD iguanaIR-0.93.ebuild 775 RMD160 585cc4b0f9902ffdf7e4ddfa71b887ee081e6d0f SHA1 cb8c3bb8b329b4221f165e7b73703daf8bcc355e SHA256 19f856e88590418393d5b3ce807661d80ff24825129e81e1074e898c8dc8c653
-MISC ChangeLog 435 RMD160 2c17dc490808947b029a86fa260e4cfe0adab7e7 SHA1 5c256fec5ca50177b8e568865f2b964e35f3c41b SHA256 f769c0774469aeedd5bd9254536a06b7ec21b631b146b12f91366308eced2357
+EBUILD iguanaIR-0.93.ebuild 796 RMD160 2b4ab960d8ee23c27e295e4adefc9c6351a6d0f5 SHA1 79058a601e4f91ebc11eb1fac39e5e1d4f10bc3b SHA256 594ae00b13b8d80ca65928ab44a63ae156ce40ed5d05b0975f936d2f4067ebf3
+MISC ChangeLog 618 RMD160 3726930c5100f55d9520012b9810778e70eb3558 SHA1 bb07387208aa1fdccd172ca47ef48542735cace7 SHA256 ae2fbb2f9abe4fac69db05f616355567e7ca90259d12c9170bf3b1f419e72712
 MISC metadata.xml 255 RMD160 fc4a979a55ca459464e8bc2b6959a088fa4be15f SHA1 5818389b8e3d0b4f2d59afc1c5118a2751ebf02a SHA256 757dc0cac83321dea2752f2d82626ff3bc7ec640f528afd559f9e68edc54582d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFH6oJGdn07HTTCgIoRAqaNAJ99Usdzrm993lGDFTrJCcVAtwdHUACdHp40
-cd4PIltZky73S+SmggCgnog=
-=eYEG
------END PGP SIGNATURE-----
diff --git a/app-misc/iguanaIR/files/iguanaIR-0.93-asneeded.patch b/app-misc/iguanaIR/files/iguanaIR-0.93-asneeded.patch
new file mode 100644
index 000000000000..099b1a4ee4f0
--- /dev/null
+++ b/app-misc/iguanaIR/files/iguanaIR-0.93-asneeded.patch
@@ -0,0 +1,29 @@
+--- iguanaIR-0.93.orig/Makefile.in	2009-12-13 15:27:50.942734390 +0100
++++ iguanaIR-0.93/Makefile.in	2009-12-13 15:29:58.580486676 +0100
+@@ -48,14 +48,14 @@
+ igclient igdaemon: libiguanaIR.so
+ 
+ libiguanaIR.so: iguanaIR.o support.o dataPackets.o pipes.o base.o
+-	$(CC) -shared $(CPPFLAGS) $^ -lpopt -lrt -o $@
++	$(CC) -shared $(CPPFLAGS) $^ -o $@ -lpopt -lrt
+ 
+ igdaemon: daemon.o client-interface.o device-interface.o usbclient.o \
+           list.o compatibility.o
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LIBS) -lusb -L. -liguanaIR -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ -L. -liguanaIR -lusb -lpopt
+ 
+ igclient: client.o list.o
+-	$(CC) $(CPPFLAGS) $^ -lpopt -L. -liguanaIR -o $@
++	$(CC) $(CPPFLAGS) $^ -o $@ -L. -liguanaIR -lpopt
+ 
+ %.o: %.c Makefile iguanaIR.h
+ 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+@@ -71,7 +71,7 @@
+ 	swig $(CPPFLAGS) -python $<
+ 
+ _iguanaIR.so: iguanaIR_wrap.c
+-	$(CC) $(CPPFLAGS) -shared $(CFLAGS) -Wno-strict-aliasing -Wno-unused -Wno-implicit-function-declaration -Wno-long-long @PYTHON_CPPFLAGS@ $^ -L. -liguanaIR -o $@
++	$(CC) $(CPPFLAGS) -shared $(CFLAGS) -Wno-strict-aliasing -Wno-unused -Wno-implicit-function-declaration -Wno-long-long @PYTHON_CPPFLAGS@ $^ -o $@ -L. -liguanaIR
+ endif
+ 
+ .PHONY: install
diff --git a/app-misc/iguanaIR/iguanaIR-0.93.ebuild b/app-misc/iguanaIR/iguanaIR-0.93.ebuild
index 89036766a3da..1e4ca47934e1 100644
--- a/app-misc/iguanaIR/iguanaIR-0.93.ebuild
+++ b/app-misc/iguanaIR/iguanaIR-0.93.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/iguanaIR/iguanaIR-0.93.ebuild,v 1.1 2008/03/26 17:04:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/iguanaIR/iguanaIR-0.93.ebuild,v 1.2 2009/12/21 14:13:13 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="library for Irman control of Unix software"
-SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
 HOMEPAGE="http://iguanaworks.net/index.php"
+SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 pkg_setup() {
@@ -18,18 +18,17 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack ${A}
 	cd "${S}"
 
 	sed -e "s:CFLAGS =:CFLAGS ?=:" -i Makefile.in
 
-	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_install() {
-
-	emake install DESTDIR="${D}" || die "emake failed"
+	emake DESTDIR="${D}" install || die
 
 	insinto /etc/udev/rules.d/
 	doins "${FILESDIR}"/40-iguanaIR.rules