Fix for --as-needed: libXsettings-client needs to link against libX11.

Package-Manager: portage-2.1.2_pre3-r8

4 files changed, 31 insertions, 21 deletions

diff --git a/x11-libs/libxsettings-client/ChangeLog b/x11-libs/libxsettings-client/ChangeLog
index 84a49ad040af..878e32f6d609 100644
--- a/x11-libs/libxsettings-client/ChangeLog
+++ b/x11-libs/libxsettings-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxsettings-client
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/ChangeLog,v 1.11 2006/08/07 16:59:30 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/ChangeLog,v 1.12 2006/10/25 05:04:20 dberkholz Exp $
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.10-as-needed.patch, libxsettings-client-0.10.ebuild:
+  Fix for --as-needed: libXsettings-client needs to link against libX11.
 
   07 Aug 2006; <yvasilev@gentoo.org> libxsettings-client-0.10.ebuild:
   Added ~arm keyword.
diff --git a/x11-libs/libxsettings-client/Manifest b/x11-libs/libxsettings-client/Manifest
index 16058a410b31..ef309377f0c3 100644
--- a/x11-libs/libxsettings-client/Manifest
+++ b/x11-libs/libxsettings-client/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 0.10-as-needed.patch 441 RMD160 367c7df1004c7437df22468141518995a0ec4953 SHA1 458e176f6dbdc0303f3a15497980a07755f59d73 SHA256 5f2da91ffbf8ab03914f2f1de84ff2ea25a249d8fc73e60dc6799c0c456b9f99
+MD5 be581ca5f85e47817e105717c07dd8f8 files/0.10-as-needed.patch 441
+RMD160 367c7df1004c7437df22468141518995a0ec4953 files/0.10-as-needed.patch 441
+SHA256 5f2da91ffbf8ab03914f2f1de84ff2ea25a249d8fc73e60dc6799c0c456b9f99 files/0.10-as-needed.patch 441
 DIST Xsettings-client-0.10.tar.gz 181131 RMD160 63e8ed1e4084d035949ea1bee35cf5bc64c7fa26 SHA1 8a9427efc24c3117d00952d2ba446f2edbae3de1 SHA256 f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43
-EBUILD libxsettings-client-0.10.ebuild 887 RMD160 6cf6ea87603cf0dfef41c14328db81ec07b7b3f8 SHA1 3ba22664636a0b97af22521bcec8a2a0983484e8 SHA256 9b830d9944976dfe553a5ea8e01342d8d699746db17ec034981598e74ac3b927
-MD5 fe361f515bb3b6134b8892b934e26f49 libxsettings-client-0.10.ebuild 887
-RMD160 6cf6ea87603cf0dfef41c14328db81ec07b7b3f8 libxsettings-client-0.10.ebuild 887
-SHA256 9b830d9944976dfe553a5ea8e01342d8d699746db17ec034981598e74ac3b927 libxsettings-client-0.10.ebuild 887
-MISC ChangeLog 1208 RMD160 900fb386f838188ba2ddb5e66c7b71a0af20816e SHA1 352260a4eabc278c809ac013b0b69f47ce8745d1 SHA256 27e2a97e75d3dd8c0af083f53564897bf03201a74a40a00a2af937df10fa59eb
-MD5 1a258325def15fc0377d1dcf5cc55c05 ChangeLog 1208
-RMD160 900fb386f838188ba2ddb5e66c7b71a0af20816e ChangeLog 1208
-SHA256 27e2a97e75d3dd8c0af083f53564897bf03201a74a40a00a2af937df10fa59eb ChangeLog 1208
+EBUILD libxsettings-client-0.10.ebuild 956 RMD160 22c4dbe28bbe7c5bd631ca0315d3dc75f2681f60 SHA1 4083f3ee4a06e3689001c97b41262f222243b736 SHA256 8dc080ed0bf2da701f3f18f1abec40811f8f829d404e39c87f76610ef5ed97de
+MD5 22e0956ca821930b4e741efcdc805d81 libxsettings-client-0.10.ebuild 956
+RMD160 22c4dbe28bbe7c5bd631ca0315d3dc75f2681f60 libxsettings-client-0.10.ebuild 956
+SHA256 8dc080ed0bf2da701f3f18f1abec40811f8f829d404e39c87f76610ef5ed97de libxsettings-client-0.10.ebuild 956
+MISC ChangeLog 1402 RMD160 4e9e6bd67946193f73ac7b32ff50b26d49934a45 SHA1 1eefe4ce8ecc8a4584a2d6a1a4d28642b16374ef SHA256 67c340d54a3d17a639865b16ab5ef58e1fd66e9b9abdb8d282c19cefc679831f
+MD5 700310da2609c1a72ec5481b948b8ce3 ChangeLog 1402
+RMD160 4e9e6bd67946193f73ac7b32ff50b26d49934a45 ChangeLog 1402
+SHA256 67c340d54a3d17a639865b16ab5ef58e1fd66e9b9abdb8d282c19cefc679831f ChangeLog 1402
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
@@ -17,10 +18,3 @@ SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata
 MD5 558ab73c63a70b07b38e0f7eda64d398 files/digest-libxsettings-client-0.10 265
 RMD160 859e0a0787cf9774b2c2b8b4dca519589eb9677d files/digest-libxsettings-client-0.10 265
 SHA256 7722cfd8894bf5c6b95063be7caad0ec723e7297aeb15aa10b754ff0c01453e4 files/digest-libxsettings-client-0.10 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE13DvyZl4piiTjjYRAtzLAJ4z58uwEZGqSQu7zSXY2HwD35uRhwCfcu7R
-PifiSZSvHHfPVKmudGsm/3E=
-=LGst
------END PGP SIGNATURE-----
diff --git a/x11-libs/libxsettings-client/files/0.10-as-needed.patch b/x11-libs/libxsettings-client/files/0.10-as-needed.patch
new file mode 100644
index 000000000000..c66630dbf315
--- /dev/null
+++ b/x11-libs/libxsettings-client/files/0.10-as-needed.patch
@@ -0,0 +1,10 @@
+diff -urN Xsettings-client-0.10.orig/Makefile.am Xsettings-client-0.10/Makefile.am
+--- Xsettings-client-0.10.orig/Makefile.am	2006-10-24 21:21:19.000000000 -0700
++++ Xsettings-client-0.10/Makefile.am	2006-10-24 21:39:34.000000000 -0700
+@@ -9,4 +9,4 @@
+ 
+ libXsettings_client_la_SOURCES= $(source_c) $(source_h)
+ 
+-libXsettings_client_la_LIBADD      = @X_LIBS@
+\ No newline at end of file
++libXsettings_client_la_LIBADD      = @X_LIBS@ -lX11
diff --git a/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild b/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild
index 30f6876b9c13..2bbe278dea30 100644
--- a/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild
+++ b/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild,v 1.9 2006/08/07 16:59:30 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxsettings-client/libxsettings-client-0.10.ebuild,v 1.10 2006/10/25 05:04:20 dberkholz Exp $
 
-inherit libtool
+inherit libtool autotools
 
 IUSE=""
 
@@ -25,8 +25,10 @@ S=${WORKDIR}/Xsettings-client-${PV}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch "${FILESDIR}"/${PV}-as-needed.patch
 
 	elibtoolize
+	eautoreconf
 }
 
 src_compile() {