Make sure all the profile specs still work after previous rework.

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

3 files changed, 27 insertions, 18 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index d7c7079499cb..58e5d0b03297 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,9 @@
 # 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.47 2011/08/12 20:34:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.48 2011/08/23 16:09:21 vapier Exp $
+
+  23 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
+  Make sure all the profile specs still work after previous rework.
 
   12 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3,
   files/binutils-config.8:
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 971e30e09b88..faf48d2c52ec 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 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 13010 RMD160 d1153b24ee2c856caf8aef7fea8bb86835c8f503 SHA1 97a3ff738e01a4fd65daec0859f9e6ac38e94bcc SHA256 64f74a24bb4a808f79b53353c7cec1548dd62df28abddd1231521e3314570b1c
+AUX binutils-config-3 13114 RMD160 5c44a385eca8446eecedfb2cd38590e861d07308 SHA1 77a0795c77fa68f2ab6c4cc1876b4e007eb5a451 SHA256 53030f8a4782e6e9c01110767b4b1aae522d228a642773c520f705b5ce910e70
 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.ebuild 636 RMD160 9c8011de431f2b997aa1d4e181d4232b09c1c860 SHA1 bf31e1b75bad413cba7957324d44fab2a22ea157 SHA256 e6b4c164d4b751353321ca257a13017d538bb14c4031e9dc82db4ac87b1f3317
-MISC ChangeLog 8081 RMD160 b894fba22e24407af8e86110ad328b035028271c SHA1 a9468e3d35ca10a8c4f1da6f456710a146c7a4a6 SHA256 3dbf29d272063973760cbc3e7489e7db25333a5a52536956fcaf17ec49c824a8
+MISC ChangeLog 8225 RMD160 a770c23a731885f303438fe1f53e70d88bcda21e SHA1 7a5fa99568c0e8351126c446c799b16a20b4f389 SHA256 086c870c59b5abf01b6a39e0db7947c839923fedefb3b37688237a8faf9e6746
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5Fjj4ACgkQaC/OocHi7JbMtAD/RfzQ3hCiPUyTjW2aWNGaNMfR
-V+h+I23N+SCry8WrqXoA+wR8hVC+8gwpyOQQoCRimFPQRYXeYGGpP6ESvJU1PeWm
-=kMU0
+iF4EAREIAAYFAk5T0LcACgkQaC/OocHi7JZKqwD/Sud/QWL2doNPISSTSGV1+OPv
+jnEMgJE119qL7oZhizcA/RGJNTYpEB8Cdb+SfePTNk7tmLQV0cJFX47lRMGUvNVE
+=bUzc
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index ffa835307c68..734b2d54e14e 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
 # 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.3 2011/08/12 20:34:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.4 2011/08/23 16:09:21 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -389,7 +389,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.3 2011/08/12 20:34:00 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.4 2011/08/23 16:09:21 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
@@ -453,18 +453,24 @@ switch_profile|switch_linker_*)
 	if [[ -z ${PROFILE} ]] ; then
 		# User gave us a full HOST-ver
 		x=${x##*/}
-		if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
-			# Maybe they just gave us a ver ...
-			if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
-				x=${HOST}-${x}
-			else
-				eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!"
-				exit 1
-			fi
+		if [[ -f ${ENV_D}/${x} ]] ; then
+			# Valid HOST-ver yeah!
 			PROFILE=${x}
 		else
-			# Maybe they just gave us a target ... pick active profile
-			PROFILE=$(TARGET=${x} set_current_profile)
+			# Not a valid HOST-ver ...
+			if [[ ! -f ${ENV_D}/config-${x} ]] ; then
+				# Maybe they just gave us a ver ...
+				if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
+					x=${HOST}-${x}
+				else
+					eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!"
+					exit 1
+				fi
+				PROFILE=${x}
+			else
+				# Maybe they just gave us a target ... pick active profile
+				PROFILE=$(TARGET=${x} set_current_profile)
+			fi
 		fi
 	fi
 	;;