Fix cross-compilation RDEPENDs

Package-Manager: portage-2.0.51.22-r2

6 files changed, 20 insertions, 65 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 782876a650ea..d502e58fa3dc 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.373 2005/07/29 16:26:13 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.374 2005/07/29 22:28:41 eradicator Exp $
+
+  29 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild, glibc-2.3.5.20050421.ebuild,
+  glibc-2.3.5.20050722.ebuild:
+  Fix cross-compilation RDEPENDs
 
   29 Jul 2005; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r12.ebuild,
   glibc-2.3.3.20040420-r2.ebuild, glibc-2.3.4.20040619-r2.ebuild,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e2353dd74c62..c323605e189e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 b40b64d87bcc7f7315dc567cea98efa1 ChangeLog 80390
 MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
 MD5 6726c272dd0883b0c6f06a920c7ef30a glibc-2.3.3.20040420-r2.ebuild 21726
@@ -129,3 +132,10 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 MD5 b80890f83185acef8aeff622a1574e0b files/2.3.4/glibc-2.3.4-fix-_dl_next_tls_modid-assert.patch 9140
 MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
 MD5 76185820806d5641f0314281ceb4790b files/2.3.4/hppa-no-pie.patch 1265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC6q2tArHZZzCEUG0RAvgbAJ0S/9csJfxcU6dO4D78AdqiDAuDNACfT4rJ
+TlRzj/ohe7+WWumYO6kTKgo=
+=SgsQ
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index 2adc2e347625..9258a1719b46 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r1.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-r1.ebuild,v 1.9 2005/07/26 23:17:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.10 2005/07/29 22:28:41 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1093,21 +1093,6 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
 pkg_setup() {
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index 23590cbdd406..f07ace6b4917 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.25 2005/07/26 22:20:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.26 2005/07/29 22:28:41 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1094,21 +1094,6 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
 pkg_setup() {
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index e676e3f90e4f..dc3bb500f7d1 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.3 2005/07/26 23:25:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.4 2005/07/29 22:28:41 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1099,21 +1099,6 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
 pkg_setup() {
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index 99e6f51251e9..ec61a0029aac 100644
--- a/sys-libs/glibc/glibc-2.3.5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.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.ebuild,v 1.38 2005/07/26 22:20:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.39 2005/07/29 22:28:41 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1119,21 +1119,6 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 		fi
 	fi
-
-	case ${CTARGET} in
-		x86_64-pc-linux-gnu)
-			[[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}"
-		;;
-		sparc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}"
-		;;
-		powerpc64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}"
-		;;
-		mips64-unknown-linux-gnu)
-			[[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}"
-		;;
-	esac
 fi
 
 # until amd64's 2004.3 is purged out of existence