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

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

4 files changed, 30 insertions, 9 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 6388def15e5b..0cc4ffbf9302 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.35 2010/04/28 22:27:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.36 2010/06/29 16:08:39 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  irda-utils-0.9.18-r3.ebuild, +files/irda-utils-0.9.18-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #318135 by Kacper Kowalik.
 
   28 Apr 2010; Jeroen Roovers <jer@gentoo.org> irda-utils-0.9.18-r3.ebuild,
   +files/irda-utils-0.9.18-dofail.patch:
diff --git a/net-wireless/irda-utils/Manifest b/net-wireless/irda-utils/Manifest
index 9e16449f6dfe..a1b0098b3bd5 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -1,5 +1,6 @@
 AUX irda-setup.sh 1638 RMD160 5077d15ac4f9145e62f409d828894c58da353794 SHA1 42617a7f696d13102569804bc6547989acefed78 SHA256 378deb51b9a6321013b57d243ff7b8301078dc7fde2959820bd2d50ef5478076
 AUX irda-usb.sh 1287 RMD160 3296f936476b79819c3d98b57b31518545a394ed SHA1 3e5018aa908bfb6d38979baf7c254241f79a9acd SHA256 3a7189528975249d1701e833f68f301d011150b3b7c0ff1e795bbffc0cf5fecf
+AUX irda-utils-0.9.18-asneeded.patch 415 RMD160 5f0bba27e531149208de76d69f771e8d30b07745 SHA1 0ce5d0bd9f7ce655262f1f2bc27a9d2756f2fa12 SHA256 28ba1a4d0c5cffde05dc82d9fc55a8366756dfd1f35686cffd133a184e5d8025
 AUX irda-utils-0.9.18-dofail.patch 770 RMD160 2ce3f073b2fe7edc6e1e3167f3863a25cd092ae4 SHA1 45f5db713f7fad1b3ad5489e4462e0cbe333c2f8 SHA256 206deac43962b8240a1d1b898aac91418204c5deec8bd2a11c778bed01926b75
 AUX irda-utils-0.9.18-io.h.diff 1604 RMD160 51a71ec4a5388cceb76aeeb24709a39f62e2cb91 SHA1 416b0229a2cc53ef2f030eba1089aac6dd786fec SHA256 41ad319946969d3ef3951894433420203666924d97c50acf571f89bd79adde99
 AUX irda-utils-0.9.18-makefile.diff 298 RMD160 daa1b92b0e1db4afd844944dcf6574e677382a07 SHA1 3fe858ead185931a73db6c37f70e98f3061c4b40 SHA256 1ed15399f8b1b8bb92b0c7b7e263030382a8b9b743bcfcaf86e5babdb31c0174
@@ -10,6 +11,6 @@ AUX irda.initd 2001 RMD160 df6b88504d3994164521badb15286ced408b9b85 SHA1 b087793
 AUX irda.modsd 1976 RMD160 9d07a7b21a56e2174d19a7cb038ce7b08feed76f SHA1 9a1902f56f7176ee9fb604588f498fc547d9cd39 SHA256 60043436833312f0756ea901cd18469015c793f208708be5fb1b9e012cacc8ef
 AUX irda.rules 683 RMD160 df3346e3b5daaa5cc4722f226afbc4d4ee359842 SHA1 16a67ccfeeeeeadd6d1e2bc96df6f62114c1c2f1 SHA256 bdd65537e3cf460d750d595aeee06f52ca292ea6ac68e74784f8defb64dc9202
 DIST irda-utils-0.9.18.tar.gz 168390 RMD160 440e5b1e013a639431bc247f0005699edabd3607 SHA1 00cd918e373a1f7735dbf8af3a29ade4564ff763 SHA256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6
-EBUILD irda-utils-0.9.18-r3.ebuild 2796 RMD160 7be2044ce9b84a22c12c8a5c843904506efb0c06 SHA1 6593945f144040787e851b933673a16a0a9a8763 SHA256 25bde4724a7f6be814bee1d69193dec6c3bfc9467a6c972af085e8c5f15bf7ff
-MISC ChangeLog 7506 RMD160 cac2440916343bc7d3753cb51ca5140a85b6901e SHA1 fde44a6e47c605a40e85e98de1cbecb12abcfbc9 SHA256 222752884225cad75871fc0bfbf6c6625a860661ce8a9919fc358a496e06f4b8
+EBUILD irda-utils-0.9.18-r3.ebuild 2824 RMD160 8695b3246e7935fc7de17be9869c2c5131d559a7 SHA1 7b782edcfea73d940f2ab642a9a295125f36f7ad SHA256 f14930ddeb9912b99a7cd3abec519456e59cf5679b55525ba485ec903c675906
+MISC ChangeLog 7706 RMD160 49c22769d1b893eb1c114f9a73c60700e3e15a3f SHA1 8d51cd15de46221f9c0b8235ad4ed465aa440fd0 SHA256 a7960e4a84b7a717eda3538b1901a0c176baf03a95791864accf20671d5c8310
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
new file mode 100644
index 000000000000..26937a042c2b
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
@@ -0,0 +1,15 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/show_bug.cgi?id=318135
+
+--- irdadump/Makefile
++++ irdadump/Makefile
+@@ -40,7 +40,7 @@
+ 
+ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
++	$(ECMD)$(CC) $(CFLAGS) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0`
+ 
+ 
+ .c.o:
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
index 0a9c5d3207c6..f6153cafb5b1 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.6 2010/04/28 22:27:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.7 2010/06/29 16:08:39 ssuominen Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -27,11 +27,12 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}/irda-utils-rh1.patch"
-	epatch "${FILESDIR}/${P}-makefile.diff"
-	epatch "${FILESDIR}/${P}-smcinit.diff"
-	epatch "${FILESDIR}/${P}-io.h.diff"
-	epatch "${FILESDIR}/${P}-dofail.patch"
+	epatch "${FILESDIR}"/irda-utils-rh1.patch \
+		"${FILESDIR}"/${P}-makefile.diff \
+		"${FILESDIR}"/${P}-smcinit.diff \
+		"${FILESDIR}"/${P}-io.h.diff \
+		"${FILESDIR}"/${P}-dofail.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
 
 	# fix crosscompile, respect CFLAGS (Bug 200295)
 	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \