tighten up depends on glibc when dealing with cross-compilers

Package-Manager: portage-2.0.53_rc7

4 files changed, 21 insertions, 31 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ecc4678fc175..afb6b421c127 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -95,14 +95,14 @@ MD5 307b46ee9b86bb1d182824303c4b01f3 gcc-3.4.1-r3.ebuild 31283
 MD5 71e25d702be3dd13ee277b7383345fad gcc-3.4.3-r1.ebuild 5477
 MD5 769273e24a52732ce892d08ebeb4bbeb gcc-3.4.3.20050110-r2.ebuild 5240
 MD5 cc5f85a9c8cf186ea7e30e88aecedbcd gcc-3.4.4-r1.ebuild 5083
-MD5 4d26e01dc328a4433f8d29bd37914aa1 gcc-4.0.1.ebuild 1937
-MD5 16748da6e63f6c29fae5dddc6417f42d gcc-4.0.2-r1.ebuild 2181
-MD5 985625c7167245252f4681a77b9919cc gcc-4.1.0_beta20051112.ebuild 2044
+MD5 c2611e7e7fdf69e451da52b22ef78815 gcc-4.0.1.ebuild 1889
+MD5 d51271215d0ed197a8cc47d5cf428ad2 gcc-4.0.2-r1.ebuild 2228
+MD5 de2e8bd6e456519fb9fd7ca2bf8c6481 gcc-4.1.0_beta20051112.ebuild 1995
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDd7glCRZPokWLroQRAuACAKCnHf975CmDeNonXhYzdgzicweUewCg5Z4m
-WCXan6z7yq8glDX6b3T+Wpw=
-=RQbG
+iD8DBQFDgR9TgIKl8Uu19MoRApinAJ41ZM6e0K6UBuEJPD+ifcujG+o2EwCeMtBi
+PCjq2Zd6hmQCsEc+6PTYq3c=
+=HB5F
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-4.0.1.ebuild b/sys-devel/gcc/gcc-4.0.1.ebuild
index 9704e2737e84..aa1671be652d 100644
--- a/sys-devel/gcc/gcc-4.0.1.ebuild
+++ b/sys-devel/gcc/gcc-4.0.1.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-devel/gcc/gcc-4.0.1.ebuild,v 1.9 2005/11/13 22:03:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1.ebuild,v 1.10 2005/11/21 01:12:11 vapier Exp $
 
 PATCH_VER="1.0"
 PATCH_GCC_VER="4.0.1"
@@ -25,11 +25,9 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
-RDEPEND="virtual/libc
+RDEPEND="!sys-devel/hardened-gcc
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.6 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	fortran? (
 	  dev-libs/gmp
@@ -43,16 +41,13 @@ RDEPEND="virtual/libc
 		>=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext )
 	)"
-
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
+if [[ ${CATEGORY} != cross-* ]] ; then
+	RDEPEND="${RDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
-
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.15.97"
+	>=${CATEGORY}/binutils-2.16.1"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
 	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
diff --git a/sys-devel/gcc/gcc-4.0.2-r1.ebuild b/sys-devel/gcc/gcc-4.0.2-r1.ebuild
index 2e9936a1436d..801ac8c21220 100644
--- a/sys-devel/gcc/gcc-4.0.2-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.0.2-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-devel/gcc/gcc-4.0.2-r1.ebuild,v 1.10 2005/11/13 22:03:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.2-r1.ebuild,v 1.11 2005/11/21 01:12:11 vapier Exp $
 
 PATCH_VER="1.2"
 PATCH_GCC_VER="4.0.2"
@@ -29,11 +29,9 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
-RDEPEND="virtual/libc
+RDEPEND="!sys-devel/hardened-gcc
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.6 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	fortran? (
 	  dev-libs/gmp
@@ -47,7 +45,9 @@ RDEPEND="virtual/libc
 		>=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext )
 	)"
-
+if [[ ${CATEGORY} != cross-* ]] ; then
+	RDEPEND="${RDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
+fi
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild
index 394c436b20df..4258b3ccb6f6 100644
--- a/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051112.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-devel/gcc/gcc-4.1.0_beta20051112.ebuild,v 1.2 2005/11/13 22:03:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild,v 1.3 2005/11/21 01:12:11 vapier Exp $
 
 ETYPE="gcc-compiler"
 
@@ -12,11 +12,9 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
-RDEPEND="virtual/libc
+RDEPEND="!sys-devel/hardened-gcc
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	elibc_glibc? ( >=sys-libs/glibc-2.3.6 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	fortran? (
 	  dev-libs/gmp
@@ -30,16 +28,13 @@ RDEPEND="virtual/libc
 		>=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext )
 	)"
-
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
+if [[ ${CATEGORY} != cross-* ]] ; then
+	RDEPEND="${RDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
-
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.15.97"
+	>=${CATEGORY}/binutils-2.16.1"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
 	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"