dont screw with SLOTs that dont need it

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2daa6611fb0d2c4861c9eaab7eb880e98a07cd55..38c4cf4448e450035a0c92284778bf615f4ff16c 100644 (file)
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5371f9df6e973106e58e4cbc03959161 ChangeLog 75661
-MD5 c61398cd7a69bfd81d4708a134e84d29 gcc-2.95.3-r8.ebuild 8358
-MD5 7f9b754a51cab0f81a6372216f30e627 gcc-3.2.3-r4.ebuild 19705
-MD5 ab00b3f80328847eeb4ba8daa2e790a8 gcc-3.3.2-r2.ebuild 17834
-MD5 fc4d81ee4878245213a530ba55ca97b5 gcc-3.3.2-r5.ebuild 21158
-MD5 478fe83382de9735ede634cffa8bb798 gcc-3.3.2-r7.ebuild 21563
-MD5 0512bd1cfdbc2ff49d2bb43ed49e744a gcc-3.3.2.ebuild 16668
-MD5 458c46eb5a0f457e5e4f2e6bda089d27 gcc-3.3.3-r3.ebuild 23378
-MD5 4426b7a203c03bbebfd3ba411502aba4 gcc-3.3.3-r6.ebuild 24768
-MD5 07ec34c762eefc190df1bc777c59a4ad gcc-3.3.4-r1.ebuild 24659
-MD5 523f6433e3ff2f8ff9619f1b36dcbf7a gcc-3.3.4-r2.ebuild 24463
+MD5 40f450ed72bcc7f9118f2672005c614b gcc-2.95.3-r8.ebuild 8337
+MD5 fca75b940d8cf8b905941bb946b41948 gcc-3.2.3-r4.ebuild 19684
+MD5 9a179b9dedbc66ea4c6b9626a7d98cc0 gcc-3.3.2-r2.ebuild 17813
+MD5 a7c30a0cb5cb93b578391c3c09715794 gcc-3.3.2-r5.ebuild 21137
+MD5 32427e27fd51e370ab660bb081192a47 gcc-3.3.2-r7.ebuild 21542
+MD5 c460647d0a50c44501593aa25f2d9b3c gcc-3.3.2.ebuild 16647
+MD5 877fb8710dc5f028eaa8fb758584d357 gcc-3.3.3-r3.ebuild 23357
+MD5 f6ada092ddd839a6f5fbeb869e2b5840 gcc-3.3.3-r6.ebuild 24747
+MD5 059372688567373b356e45980f8d24d9 gcc-3.3.4-r1.ebuild 24638
+MD5 55b350f5c3f53c2aaf6b5907cdb7a55c gcc-3.3.4-r2.ebuild 24442
 MD5 cc2341f3a38875b9cd63c500dba7467e gcc-3.3.5-r1.ebuild 12280
-MD5 565ed94c99f2013271ada4c30e6ea954 gcc-3.4.1-r3.ebuild 31243
+MD5 db2b0922e4fc141e976c6b1712c26fd2 gcc-3.4.1-r3.ebuild 31223
 MD5 9241e3b0a55a6e6bde420c99a3d7ca38 gcc-3.4.2-r2.ebuild 13482
 MD5 a6994f9f4d6a6c212dabee49d0bed80c gcc-3.4.3-r1.ebuild 14416
 MD5 605d72bfc5aca7748ab63170c2707392 gcc-3.4.3.ebuild 13250
@@ -107,3 +110,10 @@ MD5 c919e0a2cd429d0121b6133c1b4e41a6 files/3.4.0/gcc34-ice-hack.patch 8605
 MD5 bae93db3186aa0fc25d659b7799ef499 files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch 825
 MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563
 MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBtPX9roRuSHgZdywRAgSiAJ4pouQvY9SGPytk+YwrTlHPLVu0UgCfY0rr
+VqdRMabvDdbswS8GOFKe6do=
+=elkx
+-----END PGP SIGNATURE-----

diff --git a/sys-devel/gcc/gcc-2.95.3-r8.ebuild b/sys-devel/gcc/gcc-2.95.3-r8.ebuild
index e9befdcce5da11b91d3fabfaedaeff736291fae2..b08bf2c14671bba64d1d54cd2d4aacee05df9f54 100644 (file)
--- a/sys-devel/gcc/gcc-2.95.3-r8.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r8.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-devel/gcc/gcc-2.95.3-r8.ebuild,v 1.34 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r8.ebuild,v 1.35 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -49,7 +49,7 @@ IUSE="static nls bootstrap java build"
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-${MY_PV}"
+SLOT="${MY_PV}"
 
 DEPEND="virtual/libc
        >=sys-devel/gcc-config-1.2

diff --git a/sys-devel/gcc/gcc-3.2.3-r4.ebuild b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
index 03e9d4176bec7504073257a0193fc7f803dba5f3..81c7ce6130ad7f4fcfb940551c671b707742b255 100644 (file)
--- a/sys-devel/gcc/gcc-3.2.3-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r4.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-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.12 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.13 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic libtool versionator
 
@@ -105,7 +105,7 @@ IUSE="static nls bootstrap java build"
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-${MY_PV}"
+SLOT="${MY_PV}"
 
 DEPEND=">=sys-libs/glibc-2.3.2-r3
        mips? ( >=sys-devel/binutils-2.13.90.0.16 )

diff --git a/sys-devel/gcc/gcc-3.3.2-r2.ebuild b/sys-devel/gcc/gcc-3.3.2-r2.ebuild
index 737e8d31a9af24fcd65325fe923b52cc90f82798..8656a193a7ca024bbe27a1d57e1989d1de53f070 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.3.2-r2.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-devel/gcc/gcc-3.3.2-r2.ebuild,v 1.16 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r2.ebuild,v 1.17 2004/12/07 00:14:39 vapier Exp $
 
 IUSE="static nls bootstrap java build X multilib"
 
@@ -103,7 +103,7 @@ KEYWORDS="-* ~x86 ~mips ~sparc amd64 -hppa alpha ia64"
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.2-r5.ebuild b/sys-devel/gcc/gcc-3.3.2-r5.ebuild
index 68ccbdf6792d91932e0b16f54dd184cd4902fedc..e53c062675f88f05f5f05d29763361f9b089cc41 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.2-r5.ebuild
+++ b/sys-devel/gcc/gcc-3.3.2-r5.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-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.23 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.24 2004/12/07 00:14:39 vapier Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj"
 
@@ -107,7 +107,7 @@ KEYWORDS="x86 mips ~sparc ~amd64 -hppa alpha -ia64 ppc64"
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.2-r7.ebuild b/sys-devel/gcc/gcc-3.3.2-r7.ebuild
index c02164b558b2d7d9ac799dadc3346308a7796ee4..bfc5d0c9e563584b48aaec0c83107338a1128de6 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.2-r7.ebuild
+++ b/sys-devel/gcc/gcc-3.3.2-r7.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-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.14 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.15 2004/12/07 00:14:39 vapier Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj"
 
@@ -107,7 +107,7 @@ KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~alpha ~ia64 ~ppc64"
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.2.ebuild b/sys-devel/gcc/gcc-3.3.2.ebuild
index 60929ad079d23228c9f1a9f4219be262ba8a8459..13ced62bc3c5cb5fab20990c949bebfa26592065 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.2.ebuild
+++ b/sys-devel/gcc/gcc-3.3.2.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-devel/gcc/gcc-3.3.2.ebuild,v 1.17 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2.ebuild,v 1.18 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic libtool versionator
 
@@ -90,7 +90,7 @@ IUSE="static nls bootstrap java build X multilib"
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.3-r3.ebuild b/sys-devel/gcc/gcc-3.3.3-r3.ebuild
index 491687c246bfc28bff66f278bcee6f026728701d..3f24ce8140a4abc03d4dc217c857234a43c8fcd0 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.3-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r3.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-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.21 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.22 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic libtool versionator
 
@@ -100,7 +100,7 @@ IUSE="static nls bootstrap java build X multilib gcj fortran objc hardened uclib
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.3-r6.ebuild b/sys-devel/gcc/gcc-3.3.3-r6.ebuild
index a8917d906e0e919c3c46a436ef084adb6d22009e..549474e37e3b947b7d86fbacf154f6074e521e3f 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.3-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r6.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-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.22 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.23 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -104,7 +104,7 @@ IUSE="static nls bootstrap java build X multilib gcj fortran objc pic hardened u
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.4-r1.ebuild b/sys-devel/gcc/gcc-3.3.4-r1.ebuild
index 7695a065b9f5c81d3ae3f4afb11cc8fcde045ecf..15d03b6ede4d5ee81b576b02b7def34e12cb3f0d 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.4-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-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.21 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.22 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -108,7 +108,7 @@ IUSE="static nls bootstrap build X multilib gcj fortran objc pic hardened uclibc
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.3.4-r2.ebuild b/sys-devel/gcc/gcc-3.3.4-r2.ebuild
index 3e3fa8c354936f31e4d8acaf6538d80783b21f02..d2b260aad43cf4affc205b729af49f85aa81b6d8 100644 (file)
--- a/sys-devel/gcc/gcc-3.3.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.3.4-r2.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-devel/gcc/gcc-3.3.4-r2.ebuild,v 1.8 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r2.ebuild,v 1.9 2004/12/07 00:14:39 vapier Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -108,7 +108,7 @@ IUSE="static nls bootstrap build X multilib gcj fortran objc pic hardened uclibc
 # are not cross compiling, than we want SLOT to only contain
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
-SLOT="${CTARGET:-${CHOST}}-3.3"
+SLOT="3.3"
 
 # We need the later binutils for support of the new cleanup attribute.
 # 'make check' fails for about 10 tests (if I remember correctly) less

diff --git a/sys-devel/gcc/gcc-3.4.1-r3.ebuild b/sys-devel/gcc/gcc-3.4.1-r3.ebuild
index 3dd12c466f28a267318dcecd9d48122cbb5ba9c3..a2eb0f72ff4039ab65a2c8b9cd6e8aa698285526 100644 (file)
--- a/sys-devel/gcc/gcc-3.4.1-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1-r3.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-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.9 2004/12/05 20:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.10 2004/12/07 00:14:39 vapier Exp $
 
 IUSE="static nls bootstrap build multilib gcj gtk fortran objc hardened uclibc n32 n64"
 
@@ -194,7 +194,7 @@ STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
 # $PV, as people upgrading to new gcc layout will not have
 # their old gcc unmerged ...
 # GCC 3.4 introduces a new version of libstdc++
-SLOT="${CTARGET:-${CHOST}}-${MY_PV}"
+SLOT="${MY_PV}"
 
 has_lib64() {
        use amd64 && return 0