From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 16 Dec 2006 19:36:27 +0000 (+0000)
Subject: some more tweaks/fixups from Kevin F. Quinn #125805
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d49c81bd0bcab8b31de4f4eca4c4368443b58004;p=gentoo.git

some more tweaks/fixups from Kevin F. Quinn #125805
Package-Manager: portage-2.1.2_rc3
---

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 74df0e52a4f7..0b050eca1ab4 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gcc-config-1.3.13 18593 RMD160 6c9040b76a2a39b901a9b31c6fe9e8113cfd60b9 SHA1 d1e652d925600d58c8703a4e1d7c32447ed038ce SHA256 7cd8c4faeedad2ffdddc0f1ebec9a38217b4c090c013e5a045e78aa47ee061dd
 MD5 67217235dcd86563f7a1a0a7f51f5349 files/gcc-config-1.3.13 18593
 RMD160 6c9040b76a2a39b901a9b31c6fe9e8113cfd60b9 files/gcc-config-1.3.13 18593
@@ -6,10 +9,10 @@ AUX gcc-config-1.3.14 18828 RMD160 4f8b5962947dde209ffca5135a252e77c6e746d1 SHA1
 MD5 907258acebe67aa2ec71577dfa67da9b files/gcc-config-1.3.14 18828
 RMD160 4f8b5962947dde209ffca5135a252e77c6e746d1 files/gcc-config-1.3.14 18828
 SHA256 92ceadfe1e2799cd98b8b05503340337502e8d8a45a86d7efc96f63bd8b57678 files/gcc-config-1.3.14 18828
-AUX gcc-config-1.3.15 19348 RMD160 0916c09327b945892b0cd571faea6da32ed56299 SHA1 6d321179f5c111fa7ef423e7463dc6494d0167a5 SHA256 d0bf16eb630efebafe5ee32295f9d5534a1a228157e272290ef764912e642cc2
-MD5 0e514196c3b5e14aa7a83201e3cdd51e files/gcc-config-1.3.15 19348
-RMD160 0916c09327b945892b0cd571faea6da32ed56299 files/gcc-config-1.3.15 19348
-SHA256 d0bf16eb630efebafe5ee32295f9d5534a1a228157e272290ef764912e642cc2 files/gcc-config-1.3.15 19348
+AUX gcc-config-1.3.15 19669 RMD160 aa280a4651f1e761241b50d7b7bb572f66035a71 SHA1 292f4d68ac8c93016d1e2b45c7ed3f61fa094134 SHA256 1b9400bf1c91af8f2d2ab496be9f5f72ec5e6566e769a48abc2fb8b58ba50c7e
+MD5 5ce5569ce843c4b62054af020ac8ef32 files/gcc-config-1.3.15 19669
+RMD160 aa280a4651f1e761241b50d7b7bb572f66035a71 files/gcc-config-1.3.15 19669
+SHA256 1b9400bf1c91af8f2d2ab496be9f5f72ec5e6566e769a48abc2fb8b58ba50c7e files/gcc-config-1.3.15 19669
 AUX wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 SHA1 4aee9df408a84b22b4007bc9b74543dd8a6f4fc8 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744
 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 files/wrapper-1.4.7.c 9837
@@ -39,15 +42,22 @@ MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b49
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.13-r4 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.13-r4 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.13-r4 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.14 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.14 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.14 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.15 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.15 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.15 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.13-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.13-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.13-r4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.14 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.14 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.14 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.15 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.15 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.15 0
 MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-gcc-config-2.0.0_rc1 277
 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-gcc-config-2.0.0_rc1 277
 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-gcc-config-2.0.0_rc1 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFhEsFK9sYciBdMQMRAjgTAKCL77KK0oRLtWf8QLuHXD9jIGCzcgCeJJjN
+jtHbZPux7RDFLtgZXc1/UZU=
+=YY6/
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4
index 8b137891791f..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4
@@ -1 +0,0 @@
-
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.14 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.14
index 8b137891791f..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.14
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.14
@@ -1 +0,0 @@
-
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.15 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.15
index 8b137891791f..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.15
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.15
@@ -1 +0,0 @@
-
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.15 b/sys-devel/gcc-config/files/gcc-config-1.3.15
index 7380a09eefe8..f470948c99d0 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.15
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.15
@@ -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/gcc-config/files/gcc-config-1.3.15,v 1.1 2006/12/09 07:33:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.15,v 1.2 2006/12/16 19:36:27 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -163,13 +163,20 @@ files_exist() {
 		if [[ ${f} == /* ]] ; then
 			[[ ! -f ${f} ]] && ret=1 && break
 		else
+			# make sure the file exists in at least
+			# one of the specified paths
+			ret=1
 			for p in ${paths} ; do
-				[[ ! -f ${p}/${f} ]] && ret=1 && break 2
+				[[ -f ${p}/${f} ]] && ret=0 && break
 			done
+			[[ ${ret} == 1 ]] && break
 		fi
 	done
 
 	export IFS=${old_IFS}
+	if [[ ${ret} == 1 ]] ; then
+		ewarn "Could not locate '${f}' in '${paths}'"
+	fi
 	return ${ret}
 }
 
@@ -245,8 +252,15 @@ switch_profile() {
 		${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS)=/ {print $0}' \
 			"${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc"
 		echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc"
-		if [[ -n ${GCC_SPECS} ]] && files_exist ${MY_LDPATH} ${GCC_SPECS} ; then
-			echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc"
+		if [[ -n ${GCC_SPECS} ]] ; then
+			if files_exist ${MY_LDPATH} ${GCC_SPECS} ; then
+				echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc"
+			else
+				echo
+				ewarn "Your GCC spec configurations are broken."
+				ewarn "Please re-emerge gcc."
+				echo
+			fi
 		else
 			# People need to rebuild their gcc or setting GCC_SPECS to
 			# "" will cause issues again :(