Fix incorrect header deletion when switching profiles #330299 by Pinky.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 13 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 28f9f1af0b0c..74cbdbb1a4ee 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.36 2009/12/20 19:56:56 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.37 2010/08/15 05:14:35 vapier Exp $
+
+*binutils-config-2-r1 (15 Aug 2010)
+
+  15 Aug 2010; Mike Frysinger <vapier@gentoo.org> files/binutils-config-2,
+  +binutils-config-2-r1.ebuild:
+  Fix incorrect header deletion when switching profiles #330299 by Pinky.
 
 *binutils-config-2 (20 Dec 2009)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index ea02e9a0db17..8ea4a5517626 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA256
 
 AUX binutils-config-1.9 11043 RMD160 6f7f95d0c4719d747acb939441e9247e9705d98d SHA1 2f801cb2f4bf167207407d0a3e6481e01a1317b8 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373
-AUX binutils-config-2 11405 RMD160 587623ffdcfa316c2d9e7acb02dff2cf8c795e9d SHA1 7e5f0bfd27fe2fd32af8c060b600a10fd7e3deb9 SHA256 d10f17304b5849bd845923f2ce80ef8c257a5337f37bde13482bf7df9f34bb5a
+AUX binutils-config-2 11445 RMD160 59edf365a73597bb25baf87402b9743a71f8e148 SHA1 f0a86d38593d4c98b680b7bb560bdb67a2f6210f SHA256 56f2e01779b6f818986164b4850fc2694c1b79ccf51d8efa291f10b21750722c
 AUX binutils-config.8 3250 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb SHA1 5ed2e6cd13b5b6a83fd26eec570fd02399495a2a SHA256 8e6dd458d03413ca7907db03413cb7002397ed3a853d1728713eebe5b126ea13
 EBUILD binutils-config-1.9-r4.ebuild 627 RMD160 67915f8a2a1b493bce1aad19d0736ab9a5e46e29 SHA1 388878cccc685aba761d8b2f0f16d07777c14d88 SHA256 223f317ef9a345bc80aa4365aaf0ab257868cc4a2a06f140e2dfc43d2f799ec9
-EBUILD binutils-config-2.ebuild 635 RMD160 6434ac93df4cdbdc9ea8572caa9abe8aa42ec0c0 SHA1 43e3b0ec8824f398ed609a6963bbf1290269d764 SHA256 e99081c6114006ad98cd08284aca66080b1aac7bf5e863051c8060837f68b7de
-MISC ChangeLog 6392 RMD160 36b2b1118735df80b3955e969b434107ec86e367 SHA1 2585eaf65813b3a769f9137ea1eb4b4a1a616e0f SHA256 930d8387b346257df737e018b9ce16b1496b5c205631d5086e5e19263dc0af5c
+EBUILD binutils-config-2-r1.ebuild 638 RMD160 ce5712fecccea17403a66bc9a0c1f00edee17220 SHA1 7d87f576e53d561f4414a77e0102ac0b9a3877c6 SHA256 6ab93b38d4a05068fc8d8a9322b6b3c3dc36bf060c969bd3bd5d5a5397ea33ab
+MISC ChangeLog 6611 RMD160 d155d6aefc9d091a5b3557634d46dcb2b8c1bef0 SHA1 4a629e245705dd5cbfbe3dd60c9eb8c44fed613d SHA256 4d2ae18514d9776714c08db2724c9284d045f9931f787e3deb56c12e97c95613
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAksugcQACgkQTwhj9JtAlp6zIgD+NoVEXG3KGdBZKRi8En1uwc9T
-pDXYHlFp5sTakgIHVowBAJPDJBkGDEIhipIsVfLYVxbPSTr0f0vqZsX4tUXw5sGA
-=VS7R
+iF4EAREIAAYFAkxneEEACgkQTwhj9JtAlp6gsQD/epKtZCfjab+T40PBZNFhoqwv
+X9FNxyVxotjZIBdRZWIA/28thV1UwALCvuX7sTUC9J4dAj2Ann5853NCekXThDqm
+=EEDV
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-2-r1.ebuild b/sys-devel/binutils-config/binutils-config-2-r1.ebuild
new file mode 100644
index 000000000000..f8f68a30d06d
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-2-r1.ebuild,v 1.1 2010/08/15 05:14:35 vapier Exp $
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="userland_GNU? ( >=sys-apps/findutils-4.2 )"
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
+	doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-2 b/sys-devel/binutils-config/files/binutils-config-2
index 6b172dbc6f8a..e5a36d0c7ec8 100755
--- a/sys-devel/binutils-config/files/binutils-config-2
+++ b/sys-devel/binutils-config/files/binutils-config-2
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2009 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-2,v 1.1 2009/12/20 19:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.2 2010/08/15 05:14:35 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -159,8 +159,8 @@ switch_profile() {
 				ln -sf "${INCPATH}/${x}" "${ROOT}/usr/include/${x}"
 			done
 		else
-			# Clean out old path
-			find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" +
+			# Clean out old path -- cannot use '-exec {} +' syntax here
+			find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \;
 			rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
 			rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
 			rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
@@ -358,7 +358,7 @@ while [[ $# -gt 0 ]] ; do
 			;;
 		-V|--version)
 			unset Header
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.1 2009/12/20 19:56:57 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.2 2010/08/15 05:14:35 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }