get rid of $ARCH ... use $(tc-arch) since it is cross-compile friendly atm

Package-Manager: portage-2.0.51-r12

4 files changed, 115 insertions, 104 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index a4900e815e0b..3d38f1aa681b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -3,18 +3,17 @@ Hash: SHA1
 
 MD5 1a6f8cfe52c5ab95d7b9ed0fce880466 ChangeLog 64818
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
-MD5 784f2c33dacdca2b3d1042d747cbac90 glibc-2.3.2-r12.ebuild 21830
+MD5 8d955601293f57cd9e61add99ea5db7a glibc-2.3.2-r12.ebuild 21960
 MD5 39ac6b0f30c9c27a5cd04c4e0b6caadb glibc-2.3.3.20040420-r2.ebuild 21634
-MD5 edede2adaa82db373ddfea639f8c6278 glibc-2.3.4.20040808-r1.ebuild 26586
-MD5 325b0012dfc8df1bc2f6777f5af7c862 glibc-2.3.4.20041102.ebuild 31426
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 81769b9adc44c1f34fc8ec4855ddd6db glibc-2.3.4.20040619-r2.ebuild 21072
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 7dc9bee32faf5c439fe2a613a84a4c9b glibc-2.3.4.20040808-r1.ebuild 27020
+MD5 87041ee1169017ba2687416c044b40e3 glibc-2.3.4.20041102.ebuild 31860
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
 MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
-MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102 383
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
@@ -28,6 +27,7 @@ MD5 bedcd868a9462009158714238594173c files/nscd 964
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
+MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102 383
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -98,48 +98,48 @@ MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-fun
 MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
 MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
 MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
-MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/glibc-2.3.3-mips-addabi.diff 1720
-MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/glibc-2.3.3-mips-nolib3264.diff 1166
-MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/glibc-2.3.3-mips-semtimedop.diff 602
-MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/glibc-2.3.3-mips-syscall.h.diff 1199
-MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 2138
 MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
-MD5 ff0a2716aebc6fb8a2e3b3f2c9be8bba files/2.3.3/glibc-2.3.3-tempfile.patch 1787
 MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
 MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
 MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
 MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
 MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
 MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
-MD5 9db90105eb74d75834d25a599cba97ea files/2.3.4/glibc-2.3.3-mdns-resolver2.diff 12272
+MD5 ff0a2716aebc6fb8a2e3b3f2c9be8bba files/2.3.3/glibc-2.3.3-tempfile.patch 1787
+MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/glibc-2.3.3-mips-addabi.diff 1720
+MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/glibc-2.3.3-mips-nolib3264.diff 1166
+MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/glibc-2.3.3-mips-semtimedop.diff 602
+MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/glibc-2.3.3-mips-syscall.h.diff 1199
+MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 2138
+MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
+MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
+MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
+MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
+MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
+MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
 MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
-MD5 d902a9d990ee2970dd55dd805f352fa7 files/2.3.4/glibc-2.3.4-features-header-fix.patch 449
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
+MD5 9db90105eb74d75834d25a599cba97ea files/2.3.4/glibc-2.3.3-mdns-resolver2.diff 12272
+MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
+MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
+MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
 MD5 ad71dc5c3f84f026c6e28865b2e90fbb files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch 2337
 MD5 973e31ce24c9622234c4293b367de6b3 files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch 2288
+MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
+MD5 d902a9d990ee2970dd55dd805f352fa7 files/2.3.4/glibc-2.3.4-features-header-fix.patch 449
 MD5 1974267b1382fb38be7495b12c847f70 files/2.3.4/glibc-2.3.4-fedora-branch-nomalloccheck.patch 372
-MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
-MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
-MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
-MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
 MD5 076484ade8a834efb73190b687196392 files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff 12809
 MD5 41cec3deb89ffdbd670024a2b615b819 files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch 1196
-MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
 MD5 03b2b9cfe46d287c2a28df70e7a9e9a1 files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch 1410
 MD5 8d43dc97fe220048ade220f23e84f006 files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch 1425
 MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff 2402
 MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw.patch 1975
-MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
-MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
-MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
-MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
-MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
-MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
-MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB6D0sArHZZzCEUG0RAqHZAJ9ZgYPSJaPPJn6hkFxAUJTO5M5FiwCfZOun
-J8/mnZJDtUH91ZNqhVnVsTA=
-=vq3a
+iD8DBQFB6InnroRuSHgZdywRAnroAJwK28dev2hYWNFoFpa6iLSHHIhS3wCfcY5c
+QELfc21cz5cLIlLPqcHdg44=
+=FZ9E
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.2-r12.ebuild b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
index 8aaa67fb13c9..16e54478acbc 100644
--- a/sys-libs/glibc/glibc-2.3.2-r12.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
@@ -1,8 +1,8 @@
 # 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.2-r12.ebuild,v 1.6 2005/01/14 02:51:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.7 2005/01/15 03:10:55 vapier Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic toolchain-funcs
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -120,7 +120,7 @@ use_nptl() {
 		# - Or we have 'amd64' in USE
 		# - Or we have 'mips' in USE
 		# - Or we have 'ppc' in USE
-		case ${ARCH} in
+		case $(tc-arch ${CTARGET}) in
 			"x86")
 				if [ "${CHOST/-*}" = "i486" -o \
 				     "${CHOST/-*}" = "i586" -o \
@@ -292,18 +292,15 @@ src_unpack() {
 
 	cd ${S}
 	# Extract our threads package ...
-	if (! use_nptl) && [ -z "${BRANCH_UPDATE}" ]
-	then
+	if (! use_nptl) && [[ -z ${BRANCH_UPDATE} ]] ; then
 		unpack glibc-linuxthreads-${MY_PV}.tar.bz2
 	fi
 
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
+	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		epatch ${DISTDIR}/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
-	if use_nptl
-	then
+	if use_nptl ; then
 		epatch ${FILESDIR}/2.3.2/${P}-redhat-nptl-fixes.patch
 	else
 		epatch ${FILESDIR}/2.3.2/${P}-redhat-linuxthreads-fixes.patch
@@ -313,8 +310,7 @@ src_unpack() {
 	# __guard_setup__stack_smash_handler
 	#
 	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) != "hppa" ]] ; then
 		cd ${S}; epatch ${FILESDIR}/${PV}/${P}-propolice-guard-functions-v2.patch
 	fi
 
@@ -382,8 +378,7 @@ src_unpack() {
 	# do can be found in the patch headers.
 	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
 	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
-	if [ "${ARCH}" = "mips" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "mips" ]] ; then
 		cd ${S}
 		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch
 		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libgcc-compat-mips.patch
@@ -394,8 +389,7 @@ src_unpack() {
 		epatch ${FILESDIR}/2.3.2/${P}-mips-fix-nested-entend-pairs.patch
 	fi
 
-	if [ "${ARCH}" = "alpha" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "alpha" ]] ; then
 		cd ${S}
 		# Fix compatability with compaq compilers by ifdef'ing out some
 		# 2.3.2 additions.
@@ -410,13 +404,11 @@ src_unpack() {
 		epatch ${FILESDIR}/2.3.2/${P}-alpha-sysdeps.patch
 	fi
 
-	if [ "${ARCH}" = "amd64" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "amd64" ]] ; then
 		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-amd64-nomultilib.patch
 	fi
 
-	if [ "${ARCH}" = "ia64" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "ia64" ]] ; then
 		# The basically problem is glibc doesn't store information about
 		# what the kernel interface is so that it can't efficiently set up
 		# parameters for system calls.  This patch from H.J. Lu fixes it:
@@ -426,8 +418,7 @@ src_unpack() {
 		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-ia64-LOAD_ARGS-fixup.patch
 	fi
 
-	if [ "${ARCH}" = "hppa" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "hppa" ]] ; then
 		cd ${WORKDIR}
 		unpack ${P}-hppa-patches-p1.tar.bz2
 		cd ${S}
@@ -445,8 +436,7 @@ src_unpack() {
 		patch -p 1 < ${FILESDIR}/2.3.1/glibc23-07-hppa-atomicity.dpatch
 	fi
 
-	if [ "${ARCH}" = "s390" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "s390" ]] ; then
 		# The deprecated ustat.h causes problems on s390
 		#
 		#   http://sources.redhat.com/ml/bug-glibc/2003-08/msg00020.html
@@ -455,8 +445,7 @@ src_unpack() {
 		cd ${S}/sysdeps/unix/sysv/linux; epatch ${FILESDIR}/2.3.2/${P}-s390-deprecated-ustat-fixup.patch
 	fi
 
-	if [ "${ARCH}" == "arm" ]
-	then
+	if [[ $(tc-arch ${CTARGET}) == "arm" ]] ; then
 		cd ${S}
 		# sjlj exceptions causes undefined frame variables (ported from cvs)
 		epatch ${FILESDIR}/2.3.2/${P}-framestate-USING_SJLJ_EXCEPTIONS.patch
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index baed6425c56d..205ff474861a 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4.20040808-r1.ebuild,v 1.34 2005/01/14 13:35:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.35 2005/01/15 03:10:55 vapier Exp $
 
-inherit eutils multilib flag-o-matic gcc versionator
+inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -349,7 +349,22 @@ pkg_setup() {
 }
 
 
+do_arch_alpha_patches() {
+	[[ $(tc-arch ${CTARGET}) != "alpha" ]] && return 0
+	cd ${S}
+
+	# Fix compatability with compaq compilers by ifdef'ing out some
+	# 2.3.2 additions.
+	# <taviso@gentoo.org> (14 Jun 2003).
+	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
+
+	# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
+#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
+}
+
+
 do_arch_amd64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "amd64" ]] && return 0
 	cd ${S};
 
 	if [ -z "${MULTILIB_ABIS}" ]; then
@@ -365,20 +380,8 @@ do_arch_amd64_patches() {
 }
 
 
-do_arch_alpha_patches() {
-	cd ${S}
-
-	# Fix compatability with compaq compilers by ifdef'ing out some
-	# 2.3.2 additions.
-	# <taviso@gentoo.org> (14 Jun 2003).
-	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
-
-	# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
-#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
-}
-
-
 do_arch_arm_patches() {
+	[[ $(tc-arch ${CTARGET}) != "arm" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for arm go here
@@ -387,6 +390,7 @@ do_arch_arm_patches() {
 
 
 do_arch_hppa_patches() {
+	[[ $(tc-arch ${CTARGET}) != "hppa" ]] && return 0
 	einfo "Applying hppa specific path of ${HPPA_PATCHES} ..."
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
@@ -405,6 +409,7 @@ do_arch_hppa_patches() {
 
 
 do_arch_ia64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ia64" ]] && return 0
 	cd ${S};
 
 	# The basically problem is glibc doesn't store information about
@@ -424,6 +429,7 @@ do_arch_ia64_patches() {
 
 
 do_arch_mips_patches() {
+	[[ $(tc-arch ${CTARGET}) != "mips" ]] && return 0
 	cd ${S}
 
 	# A few patches only for the MIPS platform.  Descriptions of what they
@@ -447,6 +453,7 @@ do_arch_mips_patches() {
 
 
 do_arch_ppc_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ppc" ]] && return 0
 	cd ${S};
 	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-getcontext.patch
 	# Any needed patches for ppc go here
@@ -454,6 +461,7 @@ do_arch_ppc_patches() {
 
 
 do_arch_ppc64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ppc64" ]] && return 0
 	cd ${S};
 	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-getcontext.patch
 	# Any needed patches for ppc64 go here
@@ -461,6 +469,7 @@ do_arch_ppc64_patches() {
 
 
 do_arch_s390_patches() {
+	[[ $(tc-arch ${CTARGET}) != "s390" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for s390 go here
@@ -468,6 +477,7 @@ do_arch_s390_patches() {
 
 
 do_arch_sparc_patches() {
+	[[ $(tc-arch ${CTARGET}) != "sparc" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for sparc go here
@@ -475,6 +485,7 @@ do_arch_sparc_patches() {
 
 
 do_arch_x86_patches() {
+	[[ $(tc-arch ${CTARGET}) != "x86" ]] && return 0
 	cd ${S};
 	# CONF_LIBDIR support
 	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
@@ -581,17 +592,17 @@ src_unpack() {
 	do_hardened_fixes
 
 	# Arch specific patching
-	use amd64	&& do_arch_amd64_patches
-	use alpha	&& do_arch_alpha_patches
-	use arm		&& do_arch_arm_patches
-	use hppa	&& do_arch_hppa_patches
-	use ia64	&& do_arch_ia64_patches
-	use mips	&& do_arch_mips_patches
-	use ppc		&& do_arch_ppc_patches
-	use ppc64	&& do_arch_ppc64_patches
-	use s390	&& do_arch_s390_patches
-	use sparc	&& do_arch_sparc_patches
-	use x86		&& do_arch_x86_patches
+	do_arch_alpha_patches
+	do_arch_amd64_patches
+	do_arch_arm_patches
+	do_arch_hppa_patches
+	do_arch_ia64_patches
+	do_arch_mips_patches
+	do_arch_ppc_patches
+	do_arch_ppc64_patches
+	do_arch_s390_patches
+	do_arch_sparc_patches
+	do_arch_x86_patches
 
 	# Remaining patches
 	cd ${S}
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index afaa9b1bf865..7c7b848d1a9d 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
@@ -1,8 +1,8 @@
 # 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.4.20041102.ebuild,v 1.30 2005/01/14 21:44:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.31 2005/01/15 03:10:56 vapier Exp $
 
-inherit eutils multilib flag-o-matic gcc versionator
+inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -358,18 +358,8 @@ pkg_setup() {
 }
 
 
-do_arch_amd64_patches() {
-	cd ${S}
-
-	if [ -z "${MULTILIB_ABIS}" ]; then
-		# CONF_LIBDIR support
-		epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
-		sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
-	fi
-}
-
-
 do_arch_alpha_patches() {
+	[[ $(tc-arch ${CTARGET}) != "alpha" ]] && return 0
 	cd ${S}
 
 	# Fix compatability with compaq compilers by ifdef'ing out some
@@ -382,7 +372,20 @@ do_arch_alpha_patches() {
 }
 
 
+do_arch_amd64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "amd64" ]] && return 0
+	cd ${S}
+
+	if [ -z "${MULTILIB_ABIS}" ]; then
+		# CONF_LIBDIR support
+		epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+		sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+	fi
+}
+
+
 do_arch_arm_patches() {
+	[[ $(tc-arch ${CTARGET}) != "arm" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for arm go here
@@ -391,6 +394,7 @@ do_arch_arm_patches() {
 
 
 do_arch_hppa_patches() {
+	[[ $(tc-arch ${CTARGET}) != "hppa" ]] && return 0
 	einfo "Applying hppa specific path of ${HPPA_PATCHES} ..."
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
@@ -409,6 +413,7 @@ do_arch_hppa_patches() {
 
 
 do_arch_ia64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ia64" ]] && return 0
 	cd ${S};
 
 	# The basically problem is glibc doesn't store information about
@@ -422,6 +427,7 @@ do_arch_ia64_patches() {
 
 
 do_arch_mips_patches() {
+	[[ $(tc-arch ${CTARGET}) != "mips" ]] && return 0
 	cd ${S}
 
 	# A few patches only for the MIPS platform.  Descriptions of what they
@@ -444,12 +450,14 @@ do_arch_mips_patches() {
 
 
 do_arch_ppc_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ppc" ]] && return 0
 	cd ${S};
 	# Any needed patches for ppc go here
 }
 
 
 do_arch_ppc64_patches() {
+	[[ $(tc-arch ${CTARGET}) != "ppc64" ]] && return 0
 	cd ${S};
 	# Any needed patches for ppc64 go here
 
@@ -459,6 +467,7 @@ do_arch_ppc64_patches() {
 
 
 do_arch_s390_patches() {
+	[[ $(tc-arch ${CTARGET}) != "s390" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for s390 go here
@@ -466,6 +475,7 @@ do_arch_s390_patches() {
 
 
 do_arch_sparc_patches() {
+	[[ $(tc-arch ${CTARGET}) != "sparc" ]] && return 0
 	cd ${S};
 
 	# Any needed patches for sparc go here
@@ -473,6 +483,7 @@ do_arch_sparc_patches() {
 
 
 do_arch_x86_patches() {
+	[[ $(tc-arch ${CTARGET}) != "x86" ]] && return 0
 	cd ${S};
 	# CONF_LIBDIR support
 	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
@@ -606,17 +617,17 @@ src_unpack() {
 
 
 	# Arch specific patching
-	use amd64	&& do_arch_amd64_patches
-	use alpha	&& do_arch_alpha_patches
-	use arm		&& do_arch_arm_patches
-	use hppa	&& do_arch_hppa_patches
-	use ia64	&& do_arch_ia64_patches
-	use mips	&& do_arch_mips_patches
-	use ppc		&& do_arch_ppc_patches
-	use ppc64	&& do_arch_ppc64_patches
-	use s390	&& do_arch_s390_patches
-	use sparc	&& do_arch_sparc_patches
-	use x86		&& do_arch_x86_patches
+	do_arch_alpha_patches
+	do_arch_amd64_patches
+	do_arch_arm_patches
+	do_arch_hppa_patches
+	do_arch_ia64_patches
+	do_arch_mips_patches
+	do_arch_ppc_patches
+	do_arch_ppc64_patches
+	do_arch_s390_patches
+	do_arch_sparc_patches
+	do_arch_x86_patches
 
 
 	# Remaining patches