Sync some --as-needed patches from upstream.

Package-Manager: portage-2.1.3.9

4 files changed, 59 insertions, 10 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index e5ee27e1f503..e0ae6017e8ed 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.54 2007/09/12 00:10:29 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.55 2007/09/14 07:50:40 uberlord Exp $
+
+  14 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-lib-6.2-as-needed.patch, freebsd-lib-6.2-r2.ebuild:
+  Sync some --as-needed patches from upstream.
 
 *freebsd-lib-6.2-r2 (12 Sep 2007)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 3033224e554a..6cb251056d1e 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -22,6 +22,10 @@ AUX freebsd-lib-6.1-csu.patch 655 RMD160 d4fa9ade913ef3ce90351ae368f0944265eae2e
 MD5 bad3a42c7afebf3e0abfb7ddc2fe07dd files/freebsd-lib-6.1-csu.patch 655
 RMD160 d4fa9ade913ef3ce90351ae368f0944265eae2e4 files/freebsd-lib-6.1-csu.patch 655
 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1 files/freebsd-lib-6.1-csu.patch 655
+AUX freebsd-lib-6.2-as-needed.patch 943 RMD160 830e0216750b2cd6537ae926c8d09f71f1b99d2e SHA1 995602f0dbeee421bec88bc92d2a9795403f2d42 SHA256 f70549e091a831ff6026ee010f75dd3ffac85ab77e840fb8a9cb798ecf1af1cb
+MD5 60f2163ad4f86fadfdb34af16b40cf37 files/freebsd-lib-6.2-as-needed.patch 943
+RMD160 830e0216750b2cd6537ae926c8d09f71f1b99d2e files/freebsd-lib-6.2-as-needed.patch 943
+SHA256 f70549e091a831ff6026ee010f75dd3ffac85ab77e840fb8a9cb798ecf1af1cb files/freebsd-lib-6.2-as-needed.patch 943
 AUX freebsd-lib-6.2-bluetooth.patch 243 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 SHA1 6988dfc998b18efd7a91e86a827e921cdabf4997 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658
 MD5 391dd728e59c50a12ee853c6841f7e9f files/freebsd-lib-6.2-bluetooth.patch 243
 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 files/freebsd-lib-6.2-bluetooth.patch 243
@@ -62,18 +66,18 @@ EBUILD freebsd-lib-6.2-r1.ebuild 8471 RMD160 bdd29e8f2f836247fb5c8dbbd89965341aa
 MD5 f58c30167377021178a700c9f0682f9d freebsd-lib-6.2-r1.ebuild 8471
 RMD160 bdd29e8f2f836247fb5c8dbbd89965341aa9091a freebsd-lib-6.2-r1.ebuild 8471
 SHA256 93f8be649860b0ee12967306eb22163b9c712e0b95eb1e87d223ebd9f2894a14 freebsd-lib-6.2-r1.ebuild 8471
-EBUILD freebsd-lib-6.2-r2.ebuild 8516 RMD160 6aacfc1d910de6d363c05bbcb54170edd0628d1a SHA1 9b864aa2355e9d1f4a6f19ebe549f6624bc96c6f SHA256 0edc6a682f1a762044f9c0f83d8382e771cd9da8019ee6fe45d3da0c7f68b289
-MD5 42a1b3190d141c2bbb17e405ae06edb0 freebsd-lib-6.2-r2.ebuild 8516
-RMD160 6aacfc1d910de6d363c05bbcb54170edd0628d1a freebsd-lib-6.2-r2.ebuild 8516
-SHA256 0edc6a682f1a762044f9c0f83d8382e771cd9da8019ee6fe45d3da0c7f68b289 freebsd-lib-6.2-r2.ebuild 8516
+EBUILD freebsd-lib-6.2-r2.ebuild 8555 RMD160 83748672f78b89803bdb787c9e61e3fa10af677f SHA1 b26be71c392f19e792644b2e54cbdabb4b6ce088 SHA256 63d4a8d2b4d2f6ef982dc66661b9b61ddf0737a359c034f24b27828b0c04ff15
+MD5 13d0013e3c63ccede9d89ea4cca0ae58 freebsd-lib-6.2-r2.ebuild 8555
+RMD160 83748672f78b89803bdb787c9e61e3fa10af677f freebsd-lib-6.2-r2.ebuild 8555
+SHA256 63d4a8d2b4d2f6ef982dc66661b9b61ddf0737a359c034f24b27828b0c04ff15 freebsd-lib-6.2-r2.ebuild 8555
 EBUILD freebsd-lib-6.2.ebuild 8023 RMD160 d99dbb3d0ad6db6028e5c528f14e62de29739fe0 SHA1 39994adbc6e6e8e88d76500b12699a941321c181 SHA256 df9157152e8a81299a3bfea4b0f0a47f5e2dd027f72dcebc94b1c60440b7b1d6
 MD5 5f57ebed318903df6e957f7e3231b4ea freebsd-lib-6.2.ebuild 8023
 RMD160 d99dbb3d0ad6db6028e5c528f14e62de29739fe0 freebsd-lib-6.2.ebuild 8023
 SHA256 df9157152e8a81299a3bfea4b0f0a47f5e2dd027f72dcebc94b1c60440b7b1d6 freebsd-lib-6.2.ebuild 8023
-MISC ChangeLog 14506 RMD160 b0a554f9296b1e7b08bdc872d9f1033c7dd78a1c SHA1 cf2438a1f6e4a6cb8b4c6c82c1f56b23cb95f0aa SHA256 7d2606e94beb47ac3927c25ce9a7d76eb3a7552d09a620300f4939e633e9c47a
-MD5 e84d89cefda9d1922e3cdefb8520a49e ChangeLog 14506
-RMD160 b0a554f9296b1e7b08bdc872d9f1033c7dd78a1c ChangeLog 14506
-SHA256 7d2606e94beb47ac3927c25ce9a7d76eb3a7552d09a620300f4939e633e9c47a ChangeLog 14506
+MISC ChangeLog 14672 RMD160 20c496174c2801658452cefdf408e7053080da98 SHA1 6463e7556256ca09b153bade6386df2f3b2dde71 SHA256 37dbe84003d6e6c538910a8e4eafb5eb8b9e2b8bcad44fd6d48a93b66b9cb11a
+MD5 8b978d1c1cf2f3ca1526de25150d6d25 ChangeLog 14672
+RMD160 20c496174c2801658452cefdf408e7053080da98 ChangeLog 14672
+SHA256 37dbe84003d6e6c538910a8e4eafb5eb8b9e2b8bcad44fd6d48a93b66b9cb11a ChangeLog 14672
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-as-needed.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-as-needed.patch
new file mode 100644
index 000000000000..c46b990d1d68
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-as-needed.patch
@@ -0,0 +1,40 @@
+This enables --as-needed to work fully on FreeBSD.
+This can be pulled for FreeBSD-7.
+
+diff -ur lib.orig/libmp/Makefile lib/libmp/Makefile
+--- lib.orig/libmp/Makefile	2007-09-14 07:40:20 +0100
++++ lib/libmp/Makefile	2007-09-14 07:44:49 +0100
+@@ -2,6 +2,8 @@
+ 
+ LIB=		mp
+ SHLIB_MAJOR=	5
++DPADD=		${LIBCRYPTO}
++LDADD=		-lcrypto
+ MAN=		libmp.3
+ INCS=		mp.h
+ SRCS=		mpasbn.c
+diff -ur lib.orig/libncp/Makefile lib/libncp/Makefile
+--- lib.orig/libncp/Makefile	2007-09-14 07:40:20 +0100
++++ lib/libncp/Makefile	2007-09-14 07:44:49 +0100
+@@ -5,6 +5,8 @@
+ LIB=		ncp
+ 
+ SHLIB_MAJOR=	2
++DPADD=		${LIBIPX}
++LDADD=		-lipx
+ 
+ NO_MAN=
+ 
+diff -ur lib.orig/libsmb/Makefile lib/libsmb/Makefile
+--- lib.orig/libsmb/Makefile	2007-09-14 07:40:20 +0100
++++ lib/libsmb/Makefile	2007-09-14 07:44:49 +0100
+@@ -5,6 +5,8 @@
+
+ LIB=	smb
+ SHLIB_MAJOR=	2
++DPADD=	${LIBKICONV}
++LDADD=	-lkiconv
+ NO_MAN=
+
+ SRCS=	rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
+ 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild
index adee3dad804d..5d3564cd2248 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild,v 1.1 2007/09/12 00:10:29 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild,v 1.2 2007/09/14 07:50:40 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -84,6 +84,7 @@ PATCHES="${FILESDIR}/${PN}-bsdxml.patch
 	${FILESDIR}/${PN}-6.2-bluetooth.patch
 	${FILESDIR}/${PN}-6.2-gcc41.patch
 	${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch
+	${FILESDIR}/${PN}-6.2-as-needed.patch
 	${FILESDIR}/${PN}-6.2-sparc64.patch"
 
 # Here we disable and remove source which we don't need or want