Drop old upgrade logic that is only there for systems 4.5+ years old as it is causing issues with newer ones, and 4.5+ upgrade time is plenty #381633 by Tim Harder.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 32 insertions, 17 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index af8487468932..627855c5558c 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.51 2011/12/05 19:50:48 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.52 2012/03/01 21:37:11 vapier Exp $
+
+*binutils-config-3-r2 (01 Mar 2012)
+
+  01 Mar 2012; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3,
+  -binutils-config-3-r1.ebuild, +binutils-config-3-r2.ebuild:
+  Drop old upgrade logic that is only there for systems 4.5+ years old as it is
+  causing issues with newer ones, and 4.5+ upgrade time is plenty #381633 by
+  Tim Harder.
 
   05 Dec 2011; Mike Frysinger <vapier@gentoo.org> binutils-config-3-r1.ebuild:
   Use a blocker dep to avoid pulling in packages we do not need.
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 035c154282de..f922f978460a 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX binutils-config-1.9 11043 RMD160 6f7f95d0c4719d747acb939441e9247e9705d98d SHA1 2f801cb2f4bf167207407d0a3e6481e01a1317b8 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373
 AUX binutils-config-2 11440 RMD160 fdb4906f1a9d0fc3f18d450583ce7a5bd72f6068 SHA1 38d11d772da3aeef242d3c67d8b41e2e71d8544b SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192
-AUX binutils-config-3 13567 RMD160 ba6934e98f2cf3c0acbff390429e85b8b37b4f89 SHA1 03a8e2ae0e9bd6c4c43b7bcbbad44493bacfe940 SHA256 fab5db1cee1b7bf979ddc36bd535d6cc3ef0e1d461817d064e6e5ff858605267
+AUX binutils-config-3 13448 RMD160 fde6fa39ff3359d49d44aaad3e574596998f625e SHA1 61bfe0f540d42cd45b3cd90679e112ba5eff2aaa SHA256 04e15659c6648185f76047ddee403dd57cc64a17eef518319f73ed74a840d48c
 AUX binutils-config.8 4113 RMD160 7eea52f777b889b08b58e6d836de187e9505be8b SHA1 e97d7ca363524bbfb3c8cf8e17c5775dc6236be7 SHA256 ec7cb82331c80e15581e0936a5bf5edb3cde78bec3c3ede647926821086a1e6f
 EBUILD binutils-config-1.9-r4.ebuild 626 RMD160 e3018b7b6f690abddde9e2a25ce8a727dfcf14d0 SHA1 dd3547d1bbe52d600e3f59b9a45e806a327ea070 SHA256 4445f3282acda5b7c96146974adefc47315c437b5eb008daab9ac5f87a18d99d
 EBUILD binutils-config-2-r1.ebuild 627 RMD160 aa041873d7910e368022522fe1281af8cc16d2ad SHA1 2469140bb41e5ba03e85d4326194587e83701644 SHA256 06d97c5306e671ccf55fcad8eec8dcd20e1c6c3bb8e4646771d62af5f1e1754f
-EBUILD binutils-config-3-r1.ebuild 638 RMD160 b54ce22f59d8ed42cf168126e5944aad53f0740b SHA1 6d52c36765303d19edc27ad33c080b54a3daaf84 SHA256 e8d0e812112d8e1439c0f4a158249c561a964193756eb78f8f673a6848a4d9da
-MISC ChangeLog 8726 RMD160 20bf1df69e59b3cdb29a41e78918d73f32c2d938 SHA1 d700bf20d976d2a39c7a5daa980f5ea10b3aabd6 SHA256 b3b9ba9e4e38b24249dcfccb62c855ef35c0d49cab693d40a186292750282988
+EBUILD binutils-config-3-r2.ebuild 638 RMD160 c82d86e4b163fc5d94d2265dcf1a0d1c302c8101 SHA1 a6ae49ce1359674766ef432355f8714d5a3cf490 SHA256 94c445d48fc962e37cdb649053fedbdd19c8081e375bd4d5b2697fe4a75dec04
+MISC ChangeLog 9072 RMD160 5731f11d7c067ae22e6de22e98f9c730ad11ee38 SHA1 272a7ee5cd67bba2d06c71b03260a6ef6a19091d SHA256 fe551cdc0ad097a0c0d203894567e64dac7217a251d9b2ca541871c0037bdc0c
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7dIJ4ACgkQaC/OocHi7JYGDQD/Uy81V8bS5cKpaj9BamkbjNjq
-BxNEMEM8Y2tf5JjdbFEA/ika4kLn8X1InQ0gzi4rLr5KjSOL0N2/N0+kqWWKA7xu
-=ufOE
+iQIcBAEBAgAGBQJPT+wWAAoJELEHsLL7fEFWy5wQAMDllS9JQEht5vyoNWXq2FgS
+lVRsxv1A9OsHlDxjsF5SlHkQwFbYViE/4xfX94ZNg1OgwbJQ3e1d9sUBcaruGwor
+H8hs0EFoL/16Naezfu20jvmydaDRN8s0qDkvG1JgMhWBbYOPD9PjhzYqfcIFNzwa
+B7zCEWcM+S9vdrlA8bF0rP3eCUiGhppf45za7RuupJlbQI4gSf9jxZnhaN4P6Bpq
+9BLmhbB6BHTrgLgt0twYnKRGN2XqSNwbfdNwHJzHvdhyWv6sTQDtg7xMdtgFFmyj
+YxOY8qlF633Gjb/PEkhY4P5cm+CDaT3eMksYMrl8E9YDAH1Pl1Wq6o/0/Xz35U5Q
+EXqsoNhxyseYNLJ797VlZ66OaF2ibErN5hAtcy4RSyr8nfGLc+u+uWqsLv05gEdJ
+wsmzMd9wkPxb8mrArCrzkcTcK0zvYkHLwvtAcng6lVRaw7bTvKEkACoggbFIN2St
+0jtrlycNBnv0LISNlhZlkoW4A8O+Fld//YCTJK1LzPExqhro97h2JvgGEx3Zrkk+
+EIJX9FZJvpISGHR35wiFfPTkJwmvbNyg54Agy2aOVrKOHVp85XyASkfa2z5uIqd5
+MdVa4Q3Md+sYORsQ3tbak4sGKVQdjI79tAKVkdoqzInTiHpM1lGwg+IrlvrpAVWJ
+bVcfY5r3bNM9D1zB5YhJ
+=z4vU
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-3-r1.ebuild b/sys-devel/binutils-config/binutils-config-3-r2.ebuild
index 9a9317fa9a14..b126a0f0b3a1 100644
--- a/sys-devel/binutils-config/binutils-config-3-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-3-r1.ebuild,v 1.2 2011/12/05 19:50:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-3-r2.ebuild,v 1.1 2012/03/01 21:37:11 vapier Exp $
 
 DESCRIPTION="Utility to change the binutils version being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 3705371ef711..a402ef2ab8e6 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-3,v 1.6 2011/09/29 20:26:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.7 2012/03/01 21:37:11 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -162,9 +162,6 @@ switch_profile() {
 		dstlib=${ROOT}/usr/${HOST}/lib
 	else
 		dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
-		# Clean out old path
-		rm -rf "${ROOT}"/usr/${TARGET}/lib/ldscripts
-		rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
 	fi
 	# When upgrading, we need to clean up ldscripts and libs
 	mkdir -p "${dstlib}"
@@ -408,7 +405,7 @@ while [[ $# -gt 0 ]] ; do
 		-h|--help)                 usage 0 ;;
 		-V|--version)
 			unset Header
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.6 2011/09/29 20:26:56 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.7 2012/03/01 21:37:11 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }