Fix ldscript symlink generation #171486 by Alan Hourihane.

Package-Manager: portage-2.1.2.5

5 files changed, 49 insertions, 24 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 754b1890b0b4..ad19c39068b1 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.34 2006/11/26 13:40:14 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.35 2007/05/06 09:04:01 vapier Exp $
+
+*binutils-config-1.9-r4 (06 May 2007)
+
+  06 May 2007; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.9,
+  +binutils-config-1.9-r4.ebuild:
+  Fix ldscript symlink generation #171486 by Alan Hourihane.
 
 *binutils-config-1.9-r3 (26 Nov 2006)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 0c18cee88203..81ac3f5e54ec 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 11056 RMD160 6b4cb424024d44b2ceffad2a5645ad6a05a40738 SHA1 88f28e3be04e3f74caf6f73be8d80cb6d983d733 SHA256 f3ee3e2899db9a408619b8ed2f6fdee869cdd4ecd75b541d600713fdddfc46be
-MD5 64ea09129ed254e8d54b8e977cc183fe files/binutils-config-1.9 11056
-RMD160 6b4cb424024d44b2ceffad2a5645ad6a05a40738 files/binutils-config-1.9 11056
-SHA256 f3ee3e2899db9a408619b8ed2f6fdee869cdd4ecd75b541d600713fdddfc46be files/binutils-config-1.9 11056
+AUX binutils-config-1.9 11043 RMD160 6f7f95d0c4719d747acb939441e9247e9705d98d SHA1 2f801cb2f4bf167207407d0a3e6481e01a1317b8 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373
+MD5 e53d6aa826802d2387e350c26eb94c65 files/binutils-config-1.9 11043
+RMD160 6f7f95d0c4719d747acb939441e9247e9705d98d files/binutils-config-1.9 11043
+SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373 files/binutils-config-1.9 11043
 AUX binutils-config.8 3250 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb SHA1 5ed2e6cd13b5b6a83fd26eec570fd02399495a2a SHA256 8e6dd458d03413ca7907db03413cb7002397ed3a853d1728713eebe5b126ea13
 MD5 8b530626d0afc0ca9b0f685a3f640377 files/binutils-config.8 3250
 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb files/binutils-config.8 3250
@@ -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-r3.ebuild 627 RMD160 2f1aabd66fe03cbab9ea8a5415a54a018b45fa1c SHA1 ff73eacbbcbbce53685a7dd042631e9556942414 SHA256 318abdbec46fff635a742cd8ad826607f91c2edda7935cd3f3be3efa6b9732dc
-MD5 4cfb73cc3d3081b91f3281ef47bea0d2 binutils-config-1.9-r3.ebuild 627
-RMD160 2f1aabd66fe03cbab9ea8a5415a54a018b45fa1c binutils-config-1.9-r3.ebuild 627
-SHA256 318abdbec46fff635a742cd8ad826607f91c2edda7935cd3f3be3efa6b9732dc binutils-config-1.9-r3.ebuild 627
-MISC ChangeLog 5978 RMD160 7c622682085764f7bf4fa62da77f21b1d6ce61f6 SHA1 e3efbda65ae9d66a777c19d6bd78c3bbaede35fc SHA256 78c5eb23c2e6699637cc373c7f888bc1809d90ab86cc6aa1c55404da9175f9a7
-MD5 bd75600f6f56d463ab6220b7bbcfdf6d ChangeLog 5978
-RMD160 7c622682085764f7bf4fa62da77f21b1d6ce61f6 ChangeLog 5978
-SHA256 78c5eb23c2e6699637cc373c7f888bc1809d90ab86cc6aa1c55404da9175f9a7 ChangeLog 5978
+EBUILD binutils-config-1.9-r4.ebuild 627 RMD160 67915f8a2a1b493bce1aad19d0736ab9a5e46e29 SHA1 388878cccc685aba761d8b2f0f16d07777c14d88 SHA256 223f317ef9a345bc80aa4365aaf0ab257868cc4a2a06f140e2dfc43d2f799ec9
+MD5 798ee0fd9adc157d2d9cc10b2af7b9ce binutils-config-1.9-r4.ebuild 627
+RMD160 67915f8a2a1b493bce1aad19d0736ab9a5e46e29 binutils-config-1.9-r4.ebuild 627
+SHA256 223f317ef9a345bc80aa4365aaf0ab257868cc4a2a06f140e2dfc43d2f799ec9 binutils-config-1.9-r4.ebuild 627
+MISC ChangeLog 6190 RMD160 7b4a1ebf1e7d6c51dd3f642e02264d1b0da4876c SHA1 45564b1181b019e0087762e555fafce15380702b SHA256 6be4e3bd375be6595786edbb2f11977e7565da3a0169e17a46b0e9cef825b984
+MD5 9ef6549163e17455fa7d9155ada2c731 ChangeLog 6190
+RMD160 7b4a1ebf1e7d6c51dd3f642e02264d1b0da4876c ChangeLog 6190
+SHA256 6be4e3bd375be6595786edbb2f11977e7565da3a0169e17a46b0e9cef825b984 ChangeLog 6190
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -32,13 +32,13 @@ SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r7 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.8-r7 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.8-r7 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.9-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.9-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.9-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.9-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.9-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.9-r4 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF50Y58bi6rjpTunYRAvl8AJ9PF/utpuMJfNmOZnja8kU2kzHN1ACfceFC
-sQbRBnza8YgXHfdFchZtXwU=
-=20Ek
+iD8DBQFGPZog8bi6rjpTunYRAjmbAKDcue/Md48MIeoP7zovIygH5ofuXgCfegj4
+48Oy67HJ8BmPRf2Tvb0HfCU=
+=ilbA
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild b/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild
new file mode 100644
index 000000000000..99855e0247eb
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/05/06 09:04:01 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 ~sparc-fbsd x86 ~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-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9
index 9eebfe722c5a..f7e03a7b0a60 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-2007 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.9 2007/03/01 21:30:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.10 2007/05/06 09:04:01 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -130,8 +130,8 @@ switch_profile() {
 	fi
 	# When upgrading, we need to clean up ldscripts and libs
 	rm -rf "${dstlib}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
-	ln -sf "${LIBPATH}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
 	mkdir -p "${dstlib}"
+	ln -sf "${LIBPATH}/ldscripts" "${dstlib}"/ldscripts
 	find -L "${dstlib}" -type l -exec rm {} \;
 	for x in lib* ; do
 		ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
@@ -334,7 +334,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.9 2007/03/01 21:30:00 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.10 2007/05/06 09:04:01 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.9-r4 b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r4