Fix building with -Wl,--as-needed (#132477)

(Portage version: 2.0.54)

4 files changed, 38 insertions, 34 deletions

diff --git a/dev-libs/xplc/ChangeLog b/dev-libs/xplc/ChangeLog
index 99fd11ed1c66..2d3d052f7033 100644
--- a/dev-libs/xplc/ChangeLog
+++ b/dev-libs/xplc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xplc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/ChangeLog,v 1.33 2006/04/24 02:36:33 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/ChangeLog,v 1.34 2006/05/07 10:10:15 mrness Exp $
+
+  07 May 2006; Alin Nastac <mrness@gentoo.org>
+  +files/xplc-0.3.13-as-needed.patch, xplc-0.3.13-r1.ebuild:
+  Fix building with -Wl,--as-needed. Credits goes to TGL
+  <degrenier@easyconnect.fr> (#132477).
 
   24 Apr 2006; Luis Medinas <metalgod@gentoo.org> xplc-0.3.13-r1.ebuild:
   Stable on amd64.
diff --git a/dev-libs/xplc/Manifest b/dev-libs/xplc/Manifest
index ce967f7f492f..570fc0015319 100644
--- a/dev-libs/xplc/Manifest
+++ b/dev-libs/xplc/Manifest
@@ -1,34 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST xplc-0.3.12.tar.gz 147557 size 147557
-DIST xplc-0.3.13.tar.gz 175431 size 175431
-EBUILD xplc-0.3.12.ebuild 731 RMD160 1aed19ed36bb49be154ad53e2f78c5338570ed13 SHA1 b7b725a837d8f20d489e81d8e79267b40cb8c668 SHA256 069dc4c2f8e38144f0d8d08b23512160feef3090b8c116fbf1928f06b91b2814 size 731
-MD5 8d308f759d900a00afeacbc8abef5203 xplc-0.3.12.ebuild 731
-RMD160 1aed19ed36bb49be154ad53e2f78c5338570ed13 xplc-0.3.12.ebuild 731
-SHA256 069dc4c2f8e38144f0d8d08b23512160feef3090b8c116fbf1928f06b91b2814 xplc-0.3.12.ebuild 731
-EBUILD xplc-0.3.13-r1.ebuild 1132 RMD160 f45e48b692124722ffa4022914aaef8f81ee1de7 SHA1 2c7cb81a6999a24d9fb2f5e1a9f647949e420379 SHA256 4c52acb2bb558bddfb1111427e0cab27e07a68973211cdd33631dd40d5879b51 size 1132
-MD5 3210b00b76b5333e8024479a5da6bf01 xplc-0.3.13-r1.ebuild 1132
-RMD160 f45e48b692124722ffa4022914aaef8f81ee1de7 xplc-0.3.13-r1.ebuild 1132
-SHA256 4c52acb2bb558bddfb1111427e0cab27e07a68973211cdd33631dd40d5879b51 xplc-0.3.13-r1.ebuild 1132
-MISC ChangeLog 3589 RMD160 24ff48f537d7cecbff655b010dfcb0019c5207d9 SHA1 ca3c2891db3e1d289943845c05ef63356cd7743f SHA256 ab259f49d8bc96d40ac29eb0abf9b4947f03e3ab4e1fbe4ea565102975811a79 size 3589
 MD5 3f72238068b3f5512cf10dfd7cb2e205 ChangeLog 3589
-RMD160 24ff48f537d7cecbff655b010dfcb0019c5207d9 ChangeLog 3589
-SHA256 ab259f49d8bc96d40ac29eb0abf9b4947f03e3ab4e1fbe4ea565102975811a79 ChangeLog 3589
-MISC metadata.xml 334 RMD160 40e274bad3a293c869e4675d793ccb0c226d0a22 SHA1 c1fa4e203823910b01cd691f33c4f7aa405d3f8b SHA256 ff26810f545f7988eb31638f86ec02fffc89856a5f0a0812fccf4da77d59c275 size 334
-MD5 3a2a14e0cc76899541c876d92d3be23a metadata.xml 334
-RMD160 40e274bad3a293c869e4675d793ccb0c226d0a22 metadata.xml 334
-SHA256 ff26810f545f7988eb31638f86ec02fffc89856a5f0a0812fccf4da77d59c275 metadata.xml 334
 MD5 09827bbe7062e63b20f540e649164c98 files/digest-xplc-0.3.12 63
-RMD160 30cae37f6145e7fc14e4f595f52a8693649a3aa9 files/digest-xplc-0.3.12 63
-SHA256 1b2064ea83472ae4082cc246b66c1f455cc3790bbbbba8c7cd2539684ebe6eb7 files/digest-xplc-0.3.12 63
 MD5 13fe34fdab0bbf6f71f095db20c7c390 files/digest-xplc-0.3.13-r1 63
-RMD160 7bedb6e7e0eda8f0bed904bf16610da536e454f2 files/digest-xplc-0.3.13-r1 63
-SHA256 d9bc72842f33cff225d25961794291e13a2456cafbbbbe3fcb094ec5d32fdcac files/digest-xplc-0.3.13-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFETDmswUpWvClEHQoRAjveAKCICHd8nMCDQbcWQLdo1r8eYmnEOQCeMTpQ
-RpoCFqOdOWZEvcCj6Tgpxmc=
-=fwBF
------END PGP SIGNATURE-----
+MD5 308e3b8f7d7f6a7df05699bdcaed9b18 files/xplc-0.3.13-as-needed.patch 561
+MD5 3a2a14e0cc76899541c876d92d3be23a metadata.xml 334
+MD5 8d308f759d900a00afeacbc8abef5203 xplc-0.3.12.ebuild 731
+MD5 303bccdc58b10f719e760747198f834d xplc-0.3.13-r1.ebuild 1192
diff --git a/dev-libs/xplc/files/xplc-0.3.13-as-needed.patch b/dev-libs/xplc/files/xplc-0.3.13-as-needed.patch
new file mode 100644
index 000000000000..3e002db2ad00
--- /dev/null
+++ b/dev-libs/xplc/files/xplc-0.3.13-as-needed.patch
@@ -0,0 +1,22 @@
+--- config/rules.mk.orig	2006-05-06 19:28:46.000000000 +0200
++++ config/rules.mk	2006-05-06 19:28:53.000000000 +0200
+@@ -44,7 +44,7 @@
+ 	$(RANLIB) $@
+ 
+ %.so:
+-	$(LINK.cc) $(SHARED) $^ -o $@
++	$(LINK.cc) $(SHARED) $^ $(LDLIBS) -o $@
+ 
+ %.dll:
+ 	$(LINK.cc) $(SHARED) $^ -o $@
+--- xplc/vars.mk.orig	2006-05-06 19:32:06.000000000 +0200
++++ xplc/vars.mk	2006-05-06 19:32:12.000000000 +0200
+@@ -32,7 +32,7 @@
+ 
+ ifneq ("$(enable_loader)", "no")
+ ifneq ("$(with_dlopen)", "no")
+-libxplc.so: LDFLAGS+=$(with_dlopen)
++libxplc.so: LDLIBS+=$(with_dlopen)
+ endif
+ endif
+ 
diff --git a/dev-libs/xplc/xplc-0.3.13-r1.ebuild b/dev-libs/xplc/xplc-0.3.13-r1.ebuild
index 453ef35ef005..360e29c0aad5 100644
--- a/dev-libs/xplc/xplc-0.3.13-r1.ebuild
+++ b/dev-libs/xplc/xplc-0.3.13-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/xplc-0.3.13-r1.ebuild,v 1.5 2006/04/24 02:36:33 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/xplc-0.3.13-r1.ebuild,v 1.6 2006/05/07 10:10:15 mrness Exp $
+
+inherit eutils
 
 DESCRIPTION="cross platform lightweight components library for C++"
 HOMEPAGE="http://xplc.sourceforge.net"
@@ -15,9 +17,11 @@ DEPEND="dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 
 	#solve conflict with uuidgen utility installed by sys-fs/e2fsprogs (#116699)
-	cd "${S}"
 	sed -i -e "s/uuidgen/xplc-uuidgen/g" -e "s/uuidcdef/xplc-uuidcdef/g" \
 		uuid/{rules.mk,vars.mk} config/rules.mk \
 		uuid/bin/*.1 include/xplc/*.h && \