encode CTARGET into CATEGORY until portage can give us a proper SLOT solution

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 62fc8b5877cfa4e199de9ae3eddc9b0e149d0ee5..422bc97f196a650ca5479851933589ea9382ce14 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -7,8 +7,8 @@ MD5 e4f211c5762191a6fce67b15caf38c31 glibc-2.3.2-r12.ebuild 20537
 MD5 d59fdfb3aca88476d792b71922c765a5 glibc-2.3.3.20040420-r2.ebuild 21630
 MD5 48dcbf88afd15efb62b4313337261968 glibc-2.3.4.20040619-r2.ebuild 21077
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 73c74d55ecb0e4ed84da233070fffeaf glibc-2.3.4.20040808-r1.ebuild 23381
-MD5 66dead0a34e63d4cd3e34832962cbcd0 glibc-2.3.4.20041102.ebuild 28147
+MD5 3628073e660979062c2b09010a36d5d1 glibc-2.3.4.20040808-r1.ebuild 23515
+MD5 43263ca5f0742351fbb0c8aaf3723897 glibc-2.3.4.20041102.ebuild 28281
 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
@@ -137,7 +137,7 @@ MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBtPh7roRuSHgZdywRAvnxAJ9MNv0BALwN4N8bocwf8EGmwwapIwCfbIGh
-Gdhxdl4KzX3XYRT72HvhvxM=
-=ASYH
+iD8DBQFBtQr0roRuSHgZdywRAtURAJ9lDdSKC+e2PJ9n+J1YH+90nQs4bACfUUHS
+JjdxstfVi5Cb+hUhUTXm/gs=
+=O6bc
 -----END PGP SIGNATURE-----

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 85bf140a8e9547a0816eaaca432ac0f28ea559be..93c9ec117b5b523f5ff409c2b552acc382aad357 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-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-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.19 2004/12/07 00:25:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.20 2004/12/07 01:44:14 vapier Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -16,6 +16,11 @@ MIN_KERNEL_VERSION="2.6.5"
 
 # (very) Theoretical cross-compiler support
 export CTARGET="${CTARGET:-${CHOST}}"
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+       if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+               export CTARGET="${CATEGORY/cross-}"
+       fi
+fi
 
 
 if [ -z "${BRANCH_UPDATE}" ]; then

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index a128cdd22131092fac60067371d4be5383220435..cf404608eebc66c7854c99d284aeb955d930d926 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.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-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.12 2004/12/07 00:25:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.13 2004/12/07 01:44:14 vapier Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -16,6 +16,11 @@ MIN_KERNEL_VERSION="2.6.5"
 
 # (very) Theoretical cross-compiler support
 export CTARGET="${CTARGET:-${CHOST}}"
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+       if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+               export CTARGET="${CATEGORY/cross-}"
+       fi
+fi
 
 
 if [ -z "${BRANCH_UPDATE}" ]; then