fix retarded cross-compile depends

(Portage version: 2.0.51.22-r2)

6 files changed, 48 insertions, 59 deletions

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
index 3d7042ed795f..de9e0c28055f 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-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.4.20041102-r2.ebuild,v 1.1 2005/07/13 15:16:04 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.2 2005/07/26 22:20:42 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1126,21 +1126,19 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index d37e0f39372e..1d9563e9ce9c 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-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.4.20050125-r1.ebuild,v 1.55 2005/07/15 20:54:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.56 2005/07/26 22:20:42 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1074,15 +1074,14 @@ RDEPEND="virtual/os-headers
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index a3c2657ad4db..dd9635a86c94 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.7 2005/07/24 20:01:56 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.8 2005/07/26 22:20:42 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1079,21 +1079,19 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index 3a0896c5cba3..23590cbdd406 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.24 2005/07/23 20:01:18 eradicator Exp $
+# $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 $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1080,21 +1080,19 @@ DEPEND=">=sys-devel/gcc-3.4
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.4"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index 39e6a2b33774..dbd515c4ffdd 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.1 2005/07/24 19:58:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.2 2005/07/26 22:20:42 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1091,21 +1091,19 @@ DEPEND=">=sys-devel/gcc-3.4
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.4"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index 2fd75185bc54..99e6f51251e9 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.37 2005/07/23 20:07:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.38 2005/07/26 22:20:42 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1105,21 +1105,19 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
-
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 
 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND}
-	        >=${CATEGORY}/gcc-3.3.5-r1"
+	DEPEND="${DEPEND} ${CATEGORY}/gcc"
 
-	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/mips-headers-2.6.10"
-	else
-		DEPEND="${DEPEND}
-		        >=${CATEGORY}/linux-headers-2.6.8"
+	if [[ ${CATEGORY} == *-linux* ]] ; then
+		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
+		else
+			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+		fi
 	fi
 
 	case ${CTARGET} in