Don't do the CC setting hack if you've got eselect-compiler as that sets everything up correctly.

Package-Manager: portage-2.0.53_rc3

5 files changed, 20 insertions, 14 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a98a059fa33c..f806d70754a0 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.393 2005/10/07 03:12:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.394 2005/10/07 05:11:11 eradicator Exp $
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050421.ebuild,
+  glibc-2.3.5.20050722.ebuild:
+  Don't do the CC setting hack if you've got eselect-compiler as that sets
+  everything up correctly.
 
   07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c17dd2066c7e..6cb8e74cab7e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 13df09fb7a62a6a09dd8a0c7c264da42 ChangeLog 83702
+MD5 84eb5deb6033f2ca47039bfe358395c4 ChangeLog 83947
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
@@ -129,15 +129,15 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 cdbe2c23324cb303ee28f52927bd64f2 glibc-2.3.4.20050125-r1.ebuild 39566
 MD5 f9ecdb0b89b5b8a0667a86d40dfbc9c9 glibc-2.3.5-r1.ebuild 40292
-MD5 ca573372025b7364c3817232063c2a1f glibc-2.3.5-r2.ebuild 38421
-MD5 65203448f3153faa1943b035e7c18e5f glibc-2.3.5.20050421.ebuild 40178
-MD5 66a7dcd66b72dce0661ca062c32e54ab glibc-2.3.5.20050722.ebuild 39177
+MD5 78d9f5f1108aac4d04aee384374df59a glibc-2.3.5-r2.ebuild 38463
+MD5 5939b81f0fa59cc654755058a684dee7 glibc-2.3.5.20050421.ebuild 40224
+MD5 885bcf76a8b62d59bd9e9590e67d4068 glibc-2.3.5.20050722.ebuild 39219
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDRe7nOpjtAl+gMRURAtgjAJ9SlZYSSDVKx/IraJKpD5b00Hv/wACfc1cU
-K5jAPWFXJRtJgKGmYRw0HsI=
-=3qM+
+iD8DBQFDRgOgOpjtAl+gMRURAmVcAKDH4ZfDvVElZVYNb9UXLmZNwZR0DQCgmltz
+ci/kSL/FuEcbXHrWX0UkOEI=
+=fDvj
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index d535cae48f26..b5b58d27c47c 100644
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.5 2005/10/07 03:43:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.6 2005/10/07 05:11:11 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -913,7 +913,7 @@ glibc_do_configure() {
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
-	export CC="$(tc-getCC ${CTARGET})"
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
 
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index e4b9afa8bd3e..fdc2f8cca032 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.37 2005/09/22 06:10:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.38 2005/10/07 05:11:11 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -904,7 +904,7 @@ glibc_do_configure() {
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
-	export CC="$(tc-getCC ${CTARGET})"
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
 
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index c83f1cb57a7f..df233d424c78 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.21 2005/10/07 03:43:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.22 2005/10/07 05:11:11 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -917,7 +917,7 @@ glibc_do_configure() {
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
-	export CC="$(tc-getCC ${CTARGET})"
+	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
 
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}