fix version checking to work with gcc 3.4's /usr/lib/gcc

7 files changed, 18 insertions, 18 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e29f1cc6cc0b..c95ea298bbde 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,5 +1,5 @@
 MD5 abbd279136ef0d17a5de7fd76a287d1d gcc-3.3.2-r3.ebuild 20338
-MD5 2664c5b976d3fed9d1d917cd006e494d gcc-3.3.4.ebuild 25830
+MD5 00a8ab9e53c2d548eb9437b8fa3e5576 gcc-3.3.4.ebuild 25823
 MD5 7585d298ccecd46e16850c17f7f94938 gcc-3.2.3-r4.ebuild 19680
 MD5 307e96865b8f58defcff3933918aa94f gcc-3.3-r1.ebuild 16398
 MD5 514e41750711e5b74f2222b6342ca373 gcc-3.3.3_pre20040130.ebuild 21367
@@ -9,17 +9,17 @@ MD5 9d2f881e949534e2585b5b1e32b8edf9 gcc-3.1.1-r2.ebuild 9274
 MD5 3d48ed2028a3c77ce2c620e873c9e9f6 gcc-3.3.2-r5.ebuild 21291
 MD5 3efcd450e6b21cdebcc16404c47618d2 gcc-3.3.3_pre20040215.ebuild 22044
 MD5 a71b3cde6a33e89c4dce9e59fbccd915 gcc-3.3.3_pre20040322.ebuild 22472
-MD5 cadea82ceb48f1f53adb7d7fb2831014 gcc-3.3.4-r1.ebuild 25882
-MD5 52248412e258424e3b3fee1ee75636dc gcc-3.4.1-r1.ebuild 30183
+MD5 aadbb2b813bedb3a31b82d157322310a gcc-3.3.4-r1.ebuild 25880
+MD5 36f3b46d4fe3195eeae9112e9bc47d69 gcc-3.4.1-r1.ebuild 30184
 MD5 7bc7f613f66433da5ae6f05f641ddf1b gcc-3.3.3-r4.ebuild 25454
 MD5 2163eec872c27427ae3b1f2127d3b232 gcc-3.3.2-r7.ebuild 21696
 MD5 826833b8d56e44b7909cf006a2e83da2 gcc-3.3.2-r2.ebuild 17967
 MD5 6ef5b35338131433b6f43a5e5c57675e gcc-3.3.3.ebuild 22233
 MD5 e3477706aaadd9719a74832cdb137334 gcc-3.3.1-r5.ebuild 17718
-MD5 fe9fe81c2f2320b50e9b33dc2107e68b gcc-3.4.1.ebuild 29886
+MD5 2a1a0febf4cdb9af53dc549619f89c5c gcc-3.4.1.ebuild 29887
 MD5 c2e3682e50306c3e2fad2807fe192e67 gcc-3.0.4-r6.ebuild 8454
-MD5 6694b950bd251cda20b4cfbbe30c394d gcc-3.3.3-r6.ebuild 25970
-MD5 da50b6c3fe74b480dbb11112ce6b5e05 gcc-3.4.0-r6.ebuild 29856
+MD5 9301f9c74c8e64fc6f44553257de2b13 gcc-3.3.3-r6.ebuild 25968
+MD5 2b6b822d147ea8e11fbbe35d12b84788 gcc-3.4.0-r6.ebuild 29857
 MD5 99bbcf285204380fa9d548f91f947c58 gcc-3.3.2-r4.ebuild 20592
 MD5 85a0c8638cea68898c4a50919b13d547 gcc-2.95.3-r8.ebuild 9102
 MD5 4001f2bfb30873af446cc09bcb04aff9 gcc-3.3.3-r3.ebuild 24572
diff --git a/sys-devel/gcc/gcc-3.3.3-r6.ebuild b/sys-devel/gcc/gcc-3.3.3-r6.ebuild
index f4e7fa70e488..77686c9a8db9 100644
--- a/sys-devel/gcc/gcc-3.3.3-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.12 2004/07/07 08:53:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.13 2004/07/14 23:28:59 lv Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj f77 objc pic hardened uclibc debug"
 
@@ -161,7 +161,7 @@ chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
 	local OLD_GCC_VERSION="`gcc -dumpversion`"
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
 	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
diff --git a/sys-devel/gcc/gcc-3.3.4-r1.ebuild b/sys-devel/gcc/gcc-3.3.4-r1.ebuild
index 25a36747f062..c53931757f86 100644
--- a/sys-devel/gcc/gcc-3.3.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.2 2004/07/14 18:34:15 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.3 2004/07/14 23:28:59 lv Exp $
 
 IUSE="static nls bootstrap build X multilib gcj f77 objc pic hardened uclibc debug"
 
@@ -161,7 +161,7 @@ chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
 	local OLD_GCC_VERSION="`gcc -dumpversion`"
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
 	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
diff --git a/sys-devel/gcc/gcc-3.3.4.ebuild b/sys-devel/gcc/gcc-3.3.4.ebuild
index 53b58afa8c03..12452b3f8092 100644
--- a/sys-devel/gcc/gcc-3.3.4.ebuild
+++ b/sys-devel/gcc/gcc-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4.ebuild,v 1.6 2004/07/02 09:32:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4.ebuild,v 1.7 2004/07/14 23:28:59 lv Exp $
 
 IUSE="static nls bootstrap build X multilib gcj f77 objc pic hardened uclibc debug"
 
@@ -161,7 +161,7 @@ chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
 	local OLD_GCC_VERSION="`gcc -dumpversion`"
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
 	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
diff --git a/sys-devel/gcc/gcc-3.4.0-r6.ebuild b/sys-devel/gcc/gcc-3.4.0-r6.ebuild
index b090c3d50eb1..2affe134becc 100644
--- a/sys-devel/gcc/gcc-3.4.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.4.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.18 2004/07/12 17:22:19 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.19 2004/07/14 23:28:59 lv Exp $
 
 IUSE="static nls bootstrap build multilib gcj gtk2 f77 objc hardened uclibc n32 n64"
 
@@ -190,7 +190,7 @@ chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
 	local OLD_GCC_VERSION="`gcc -dumpversion`"
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
 	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
diff --git a/sys-devel/gcc/gcc-3.4.1-r1.ebuild b/sys-devel/gcc/gcc-3.4.1-r1.ebuild
index 162c3a86a99d..a17d71fcdc75 100644
--- a/sys-devel/gcc/gcc-3.4.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r1.ebuild,v 1.2 2004/07/11 20:34:27 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r1.ebuild,v 1.3 2004/07/14 23:28:59 lv Exp $
 
 IUSE="static nls bootstrap build multilib gcj gtk2 f77 objc hardened uclibc n32 n64"
 
@@ -199,7 +199,7 @@ chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
 	local OLD_GCC_VERSION="`gcc -dumpversion`"
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
 	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then
diff --git a/sys-devel/gcc/gcc-3.4.1.ebuild b/sys-devel/gcc/gcc-3.4.1.ebuild
index 64f3875dfbc9..60c7d52bbb02 100644
--- a/sys-devel/gcc/gcc-3.4.1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1.ebuild,v 1.7 2004/07/13 19:44:00 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1.ebuild,v 1.8 2004/07/14 23:28:59 lv Exp $
 
 IUSE="static nls bootstrap build multilib gcj gtk2 f77 objc hardened uclibc n32 n64"
 
@@ -197,7 +197,7 @@ chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
 	local OLD_GCC_VERSION="`gcc -dumpversion`"
 	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
+	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
 
 	if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ]
 	then