Force newer findutils and use portable options #150352.

Package-Manager: portage-2.1.2_pre3-r4

4 files changed, 26 insertions, 22 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 9a8570d19ef4..1657f3af00db 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.31 2006/10/18 07:10:42 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.32 2006/10/19 03:45:52 vapier Exp $
+
+  19 Oct 2006; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.9,
+  binutils-config-1.9-r2.ebuild:
+  Force newer findutils and use portable options #150352.
 
   18 Oct 2006; Roy Marples <uberlord@gentoo.org>
   binutils-config-1.9-r2.ebuild:
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 4a281bd30fbb..d79a6ede7b39 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -5,10 +5,10 @@ AUX binutils-config-1.8 10258 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 SH
 MD5 1ee464741f34882a1c46c188af729bc1 files/binutils-config-1.8 10258
 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 files/binutils-config-1.8 10258
 SHA256 4b39cd5ca2fce451a2abd13e03ed516db21981bb82d15fe29f6a0cb415f07a25 files/binutils-config-1.8 10258
-AUX binutils-config-1.9 10971 RMD160 84634a79f093ec8cd2b57d747ff04a900aa5c7b3 SHA1 84bef1434ce41e670c69a0f1bdacc91df69b197a SHA256 617989b95256f3f22510817c4ebe7ab598dfe90c257e67c4f336ca1a72a36f17
-MD5 272d945d21ef0f1548d5ca66ce11bc6d files/binutils-config-1.9 10971
-RMD160 84634a79f093ec8cd2b57d747ff04a900aa5c7b3 files/binutils-config-1.9 10971
-SHA256 617989b95256f3f22510817c4ebe7ab598dfe90c257e67c4f336ca1a72a36f17 files/binutils-config-1.9 10971
+AUX binutils-config-1.9 10975 RMD160 90ccfc58f4f7d14a37192071d07f111354cab287 SHA1 ce004e8dfc97f84798cfffca5099a76cd485cd37 SHA256 d5332236fb5f3154bc9608f655929909d52910997e8f9cd6602535c8d3f5f51c
+MD5 2d46c243c05f8bf445e692983f92e080 files/binutils-config-1.9 10975
+RMD160 90ccfc58f4f7d14a37192071d07f111354cab287 files/binutils-config-1.9 10975
+SHA256 d5332236fb5f3154bc9608f655929909d52910997e8f9cd6602535c8d3f5f51c files/binutils-config-1.9 10975
 AUX binutils-config.8 2989 RMD160 afb26717c9466456bbbdf6a3d6b93aeb63ff9416 SHA1 ea27aae69a152491c9e96f756b6265f68aac6849 SHA256 ffc462de3eaa865f77f00e36275a0a9b0b51782d9d4d5fcfad18583a13adf6e5
 MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
 RMD160 afb26717c9466456bbbdf6a3d6b93aeb63ff9416 files/binutils-config.8 2989
@@ -17,14 +17,14 @@ EBUILD binutils-config-1.8-r7.ebuild 572 RMD160 ad5b5a729de7841ff268e1e88a945440
 MD5 5c065fbfad62f4fa969c3ade59bea58a binutils-config-1.8-r7.ebuild 572
 RMD160 ad5b5a729de7841ff268e1e88a945440ccbe3b71 binutils-config-1.8-r7.ebuild 572
 SHA256 cf8484c6f46b796de428dd5ce081aa14f1babf6247430517e5d796c0c26382b3 binutils-config-1.8-r7.ebuild 572
-EBUILD binutils-config-1.9-r2.ebuild 585 RMD160 8c3261a9b8b5bb20054e1bd7a4213f3ed261750b SHA1 b4bd3a7310e41136d15e1a2477473351f3d7b6f5 SHA256 6613ff6fc29a45aa8702e6f87e08a35a6b21890b96aae28f753be943bf7dd31f
-MD5 d315d0b683efdc53a38e6916ce4195c9 binutils-config-1.9-r2.ebuild 585
-RMD160 8c3261a9b8b5bb20054e1bd7a4213f3ed261750b binutils-config-1.9-r2.ebuild 585
-SHA256 6613ff6fc29a45aa8702e6f87e08a35a6b21890b96aae28f753be943bf7dd31f binutils-config-1.9-r2.ebuild 585
-MISC ChangeLog 5450 RMD160 2bb1fa0781ad9398de046dd1922d04141d2882bc SHA1 8c14fab10a9c12f71991cd386e433faff8e8f42e SHA256 42221650519a89e771a21ae503eb78a1793aa05ae4c13279e55fd7cdefff317a
-MD5 0dab5342862ffbce8f77db3da3a05afc ChangeLog 5450
-RMD160 2bb1fa0781ad9398de046dd1922d04141d2882bc ChangeLog 5450
-SHA256 42221650519a89e771a21ae503eb78a1793aa05ae4c13279e55fd7cdefff317a ChangeLog 5450
+EBUILD binutils-config-1.9-r2.ebuild 610 RMD160 51a8bb8a47e96c242415ab41d6c778d4553559ec SHA1 18e33a4ff97597ad1ee81831fc7e4dce9fbcc9f3 SHA256 2b14ffda2fcdb4b4a5ce8c02dacb1301f085fd3af4079592d749331f973ab0c5
+MD5 c07ef879a5f6f3b1ceaabc6f67fc22cf binutils-config-1.9-r2.ebuild 610
+RMD160 51a8bb8a47e96c242415ab41d6c778d4553559ec binutils-config-1.9-r2.ebuild 610
+SHA256 2b14ffda2fcdb4b4a5ce8c02dacb1301f085fd3af4079592d749331f973ab0c5 binutils-config-1.9-r2.ebuild 610
+MISC ChangeLog 5617 RMD160 fd2ab80f388a502132790f1af74e583d9714e3b7 SHA1 7ee694a5bbfc75b245fed360b0750d80883a534e SHA256 b0c60ae71f52c9e6e8fbe8a81860c2a5d988139a2a61c6de7239cdfb86b55319
+MD5 51dce81d978e84c2ef9230d633a44b61 ChangeLog 5617
+RMD160 fd2ab80f388a502132790f1af74e583d9714e3b7 ChangeLog 5617
+SHA256 b0c60ae71f52c9e6e8fbe8a81860c2a5d988139a2a61c6de7239cdfb86b55319 ChangeLog 5617
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -38,7 +38,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNvNfamhnQswr0vIRArW2AKCBQC6wwDsf2IYhidXqTnXBM94KdACeKm8e
-qlkfDhJKCzTE6a31dalazOI=
-=Enzd
+iD8DBQFFNvULamhnQswr0vIRAmJsAJoCH+WhoYGEKqHFRxIHA2dv6TZGvQCgqWlO
+qRp8CmhrKhZbt4wrpPk7mPM=
+=iCZi
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild b/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
index 5263426a77af..3031e4250ba1 100644
--- a/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild,v 1.11 2006/10/19 03:38:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild,v 1.12 2006/10/19 03:45:52 vapier Exp $
 
 DESCRIPTION="Utility to change the binutils version being used"
 HOMEPAGE="http://www.gentoo.org/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=""
+RDEPEND=">=sys-apps/findutils-4.2"
 
 src_install() {
 	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
diff --git a/sys-devel/binutils-config/files/binutils-config-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9
index ddfde6b3f5dd..3894adae441f 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.9
+++ b/sys-devel/binutils-config/files/binutils-config-1.9
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.4 2006/09/17 07:25:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.5 2006/10/19 03:45:52 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -128,7 +128,7 @@ switch_profile() {
 	rm -rf "${dstlib}/ldscripts" "${BINPATH_LINKS}"/ldscripts
 	ln -sf "${LIBPATH}/ldscripts" "${BINPATH_LINKS}/ldscripts"
 	mkdir -p "${dstlib}"
-	find "${dstlib}" -xtype l -exec rm {} \;
+	find -L "${dstlib}" -type l -exec rm {} \;
 	for x in lib* ; do
 		ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
 	done
@@ -221,7 +221,7 @@ uninstall_target() {
 	# Delete broken symlinks
 	local destdir="${ROOT}/usr/${HOST}/${TARGET}"
 	rm -f "${destdir}"/lib/ldscripts
-	find "${destdir}"/lib -xtype l -exec rm {} \;
+	find -L "${destdir}"/lib -type l -exec rm {} \;
 	rmdir "${destdir}"/lib "${destdir}" 2>/dev/null
 	rmdir "${destdir}"/{bin,include,lib,usr} "${destdir}" 2>/dev/null
 	rmdir "${ROOT}"/var/db/pkg/cross-${TARGET} 2>/dev/null
@@ -332,7 +332,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-V|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.4 2006/09/17 07:25:08 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.5 2006/10/19 03:45:52 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }