Fix deps to match those from the gcc-4.0 ebuilds

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index f12d90dd9dde926c0dc546b6082d725d983a8a04..4a9f88849ce579d6c7669a3d584e7178182140b1 100644 (file)
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.463 2005/11/05 19:47:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.464 2005/11/05 20:00:14 halcy0n Exp $
+
+  05 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+  gcc-4.1.0_beta20051105.ebuild:
+  Fix deps to match those from the gcc-4.0 ebuilds
 
 *gcc-4.1.0_beta20051105 (05 Nov 2005)
 

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7ab9bbb8e22b75f407e239b8528b3c4fe83c2a6e..4cd1dafade6cb7cb16c7b9566c764ecd6e40f040 100644 (file)
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 37ff173ae1f0f4327346c32a7b0a02d0 ChangeLog 95491
+MD5 33e798413f065bd0a376fc277fb3b296 ChangeLog 95624
 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
 MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
 MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
@@ -98,12 +98,12 @@ MD5 769273e24a52732ce892d08ebeb4bbeb gcc-3.4.3.20050110-r2.ebuild 5240
 MD5 cc5f85a9c8cf186ea7e30e88aecedbcd gcc-3.4.4-r1.ebuild 5083
 MD5 24ef46cf2fa60049781de7bf424fc466 gcc-4.0.1.ebuild 1915
 MD5 0ebe025755060ea5e2e52ca3864d523c gcc-4.0.2-r1.ebuild 2173
-MD5 5811265c4e01ba5d78d1042dd34642b9 gcc-4.1.0_beta20051105.ebuild 1932
+MD5 77f381cc55d62a713bd4f9ad24cdf369 gcc-4.1.0_beta20051105.ebuild 2023
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDbRqjCRZPokWLroQRAjYBAKCRkB99R6N6Hg9JkBTnJWGdbKQ8dACfdBEQ
-OjbWo98eRFzuko8CYHRirwc=
-=0T4o
+iD8DBQFDbQ95CRZPokWLroQRAiyDAJ9On6Vg2GPEXc4r8UuUp2ISnsqRiQCggswb
+maYgT0ma5FBaWzl3s7y50WE=
+=Qli6
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051105.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051105.ebuild
index 05655778924a5803b7901487392b574d430b1a11..69611233f9a66ea3ba8589cdc68e311922e233eb 100644 (file)
--- a/sys-devel/gcc/gcc-4.1.0_beta20051105.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051105.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_beta20051105.ebuild,v 1.1 2005/11/05 19:47:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051105.ebuild,v 1.2 2005/11/05 20:00:14 halcy0n Exp $
 
 ETYPE="gcc-compiler"
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-*"
 
 RDEPEND="virtual/libc
-       >=sys-devel/gcc-config-1.3.1
+       || ( 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.5 )
@@ -38,8 +38,8 @@ DEPEND="${RDEPEND}
        >=sys-devel/bison-1.875
        >=sys-devel/binutils-2.15.97"
 
-PDEPEND="sys-devel/gcc-config
-       !nocxx? ( !n32? ( !n64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
+       x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
 
 pkg_setup() {
        if [ -z $I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS ] ; then