Fix --as-needed. Bug #132155

Package-Manager: portage-2.1_pre10-r3

4 files changed, 40 insertions, 21 deletions

diff --git a/gnome-base/libgtop/ChangeLog b/gnome-base/libgtop/ChangeLog
index 8ff5ff44a882..5e28eafea995 100644
--- a/gnome-base/libgtop/ChangeLog
+++ b/gnome-base/libgtop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgtop
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/ChangeLog,v 1.119 2006/05/02 15:45:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/ChangeLog,v 1.120 2006/05/08 01:54:22 dang Exp $
+
+  08 May 2006; <dang@gentoo.org> +files/libgtop-2.14.1-as-needed.patch,
+  libgtop-2.14.1.ebuild:
+  Fix --as-needed.  Bug #132155
 
 *libgtop-2.14.1 (02 May 2006)
 
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 1d8218453c09..642c9eaaeb6a 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.13-remote_buffer_overflow.diff 543 RMD160 be633a8f2e75d38f99cf192e52ec122492bf9d46 SHA1 c30ae1c805093ecec85060f82dc58349d743d953 SHA256 2e6d417cd38f6ab58fc5867ae8ff2d213f3c6d17202a62b6ff88871342e75e3c size 543
 MD5 b1a2be73a4e3ecb6d70da68624080ba9 files/1.0.13-remote_buffer_overflow.diff 543
 RMD160 be633a8f2e75d38f99cf192e52ec122492bf9d46 files/1.0.13-remote_buffer_overflow.diff 543
@@ -13,6 +10,10 @@ AUX libgtop-2.10.0-siglist.patch 3316 RMD160 11147b42798033dafbd7e6dcd66ff320bad
 MD5 06320038fe8840bedb3b08496982320f files/libgtop-2.10.0-siglist.patch 3316
 RMD160 11147b42798033dafbd7e6dcd66ff320bad6690d files/libgtop-2.10.0-siglist.patch 3316
 SHA256 ba55a1532ffe722c579aa3b050da12b0a041b65e21d27f8715b4dd647635b9b9 files/libgtop-2.10.0-siglist.patch 3316
+AUX libgtop-2.14.1-as-needed.patch 705 RMD160 0df41f02013b2ca07ab90d6461b86a522cee6fb7 SHA1 37b716cb96862abe5a62923d61aca1575acf3d16 SHA256 ac39d2acb746142ab0ef531ffed36418fe0793a66292928e8c4a844098011260 size 705
+MD5 12bb5c0623e3fe87144ef9f0a487aca1 files/libgtop-2.14.1-as-needed.patch 705
+RMD160 0df41f02013b2ca07ab90d6461b86a522cee6fb7 files/libgtop-2.14.1-as-needed.patch 705
+SHA256 ac39d2acb746142ab0ef531ffed36418fe0793a66292928e8c4a844098011260 files/libgtop-2.14.1-as-needed.patch 705
 AUX libgtop.info.diff 449 RMD160 9e35e1bbdb57fc9332c83cdf613924f163243ce9 SHA1 fefca73f429935a86927c1e848e2d89d6bec53f0 SHA256 5b1501621af4d243013dbdca23fe279284555d534364e40ca6f0c97b96ad93e0 size 449
 MD5 01e1743af5e23d9fa6430e0a92c57861 files/libgtop.info.diff 449
 RMD160 9e35e1bbdb57fc9332c83cdf613924f163243ce9 files/libgtop.info.diff 449
@@ -53,14 +54,14 @@ EBUILD libgtop-2.14.0.ebuild 731 RMD160 1c28fb9774d0f8225f35fc113ab5161723833892
 MD5 4568ff28f46ed57581f17948af3ad8f0 libgtop-2.14.0.ebuild 731
 RMD160 1c28fb9774d0f8225f35fc113ab5161723833892 libgtop-2.14.0.ebuild 731
 SHA256 f201bd22233aeff8e6d52bf67b94e60bedcbccc31ec40a56613f92efdb330a39 libgtop-2.14.0.ebuild 731
-EBUILD libgtop-2.14.1.ebuild 731 RMD160 646da76e1f33efac21417d0a35351c5e1a8d0f9c SHA1 93c431f083bff54c38e2b4fcc6bd915e4d2f9f78 SHA256 2e86eef060095d9a9b7fe892de83944b4450d4cef9a368441f383cb9332b6cfa size 731
-MD5 fe73b94112a905c9be77e051ffb7a773 libgtop-2.14.1.ebuild 731
-RMD160 646da76e1f33efac21417d0a35351c5e1a8d0f9c libgtop-2.14.1.ebuild 731
-SHA256 2e86eef060095d9a9b7fe892de83944b4450d4cef9a368441f383cb9332b6cfa libgtop-2.14.1.ebuild 731
-MISC ChangeLog 13053 RMD160 0191ef8dc7db5aa720dc90a0a81dbe24c5954a9d SHA1 1cdbe131ecc3645dc40bee5f7650a5aefd9b3886 SHA256 cbb70b3b026ac615df32ecd583c97be7953bb62fea45d5b125a76b5b65205ed3 size 13053
-MD5 22315067a765786f8375d3aefd22fd79 ChangeLog 13053
-RMD160 0191ef8dc7db5aa720dc90a0a81dbe24c5954a9d ChangeLog 13053
-SHA256 cbb70b3b026ac615df32ecd583c97be7953bb62fea45d5b125a76b5b65205ed3 ChangeLog 13053
+EBUILD libgtop-2.14.1.ebuild 840 RMD160 3d1a66e9928d35a09cb27ee95a517a830c0ac333 SHA1 a18f312ecb42063dd799b3b296dd9f7a5186f13e SHA256 f4c11087455005fcfbe4653b340fceca49478ca5ee4a56009359414a4e696975 size 840
+MD5 6f1d3f6a8dba8abb0f323db0276151e8 libgtop-2.14.1.ebuild 840
+RMD160 3d1a66e9928d35a09cb27ee95a517a830c0ac333 libgtop-2.14.1.ebuild 840
+SHA256 f4c11087455005fcfbe4653b340fceca49478ca5ee4a56009359414a4e696975 libgtop-2.14.1.ebuild 840
+MISC ChangeLog 13183 RMD160 c0280d5f05d684b39b90668baffa1a049e91b165 SHA1 4a87d0a647fffd957614680337b5af1bfcfc5ddc SHA256 35db8e93a3482a611728c06ad695ae33a020f657fab6b9ede4330b9d1029c7fd size 13183
+MD5 e7a28dff8a7c99f7abd2fb5fa51b9094 ChangeLog 13183
+RMD160 c0280d5f05d684b39b90668baffa1a049e91b165 ChangeLog 13183
+SHA256 35db8e93a3482a611728c06ad695ae33a020f657fab6b9ede4330b9d1029c7fd ChangeLog 13183
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -89,10 +90,3 @@ SHA256 bac5481208821a4fb0cbe92fc8d1905c5da58221af514793dd0bca5c18478378 files/di
 MD5 158cc2840cd5955fbff6905575bee965 files/digest-libgtop-2.14.1 247
 RMD160 17f89045c7509f9c1a8d958ee4f4c85028c8f22e files/digest-libgtop-2.14.1 247
 SHA256 cd7c62e7231da9bf3f126437f1af6e64250c71bd976436e70706dae52dfd28a1 files/digest-libgtop-2.14.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEV36JomPajV0RnrERAsO/AJ0amimITCMFkpHIMVP6hE5GGj9RGQCdGSz6
-hsrpoE/xlqXd+jHbMJpTQNQ=
-=e0eh
------END PGP SIGNATURE-----
diff --git a/gnome-base/libgtop/files/libgtop-2.14.1-as-needed.patch b/gnome-base/libgtop/files/libgtop-2.14.1-as-needed.patch
new file mode 100644
index 000000000000..2949c36dcb50
--- /dev/null
+++ b/gnome-base/libgtop/files/libgtop-2.14.1-as-needed.patch
@@ -0,0 +1,14 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN libgtop-2.14.1.orig/src/inodedb/Makefile.am libgtop-2.14.1/src/inodedb/Makefile.am
+--- libgtop-2.14.1.orig/src/inodedb/Makefile.am	2003-10-20 16:47:58.000000000 -0400
++++ libgtop-2.14.1/src/inodedb/Makefile.am	2006-05-07 21:50:30.000000000 -0400
+@@ -2,8 +2,8 @@
+ 
+ INCLUDES		= @INCLUDES@
+ 
+-mkinodedb2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
++mkinodedb2_LDADD		= $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
++			  $(top_builddir)/lib/libgtop-2.0.la \
+ 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+ 
+ file_by_inode2_LDADD	= $(top_builddir)/lib/libgtop-2.0.la \
diff --git a/gnome-base/libgtop/libgtop-2.14.1.ebuild b/gnome-base/libgtop/libgtop-2.14.1.ebuild
index 3d86c5fa31b5..ffa5b5dca419 100644
--- a/gnome-base/libgtop/libgtop-2.14.1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.14.1.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/gnome-base/libgtop/libgtop-2.14.1.ebuild,v 1.1 2006/05/02 15:45:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.14.1.ebuild,v 1.2 2006/05/08 01:54:22 dang Exp $
 
-inherit gnome2
+inherit gnome2 eutils autotools
 
 DESCRIPTION="A library that provides top functionality to applications"
 HOMEPAGE="http://www.gnome.org/"
@@ -21,6 +21,13 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README copyright.txt"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${P}-as-needed.patch
+	eautoreconf
+}
+
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable static) $(use_with gdbm libgtop-inodedb) \
 		$(use_with X x)"