Push out some fixes.

Package-Manager: portage-2.1.1_rc1-r2

6 files changed, 120 insertions, 30 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index bb9bc49b0d7a..d7ba07950037 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.567 2006/08/30 19:49:03 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.568 2006/09/03 22:53:46 vapier Exp $
+
+*gcc-4.1.1-r1 (03 Sep 2006)
+
+  03 Sep 2006; Mike Frysinger <vapier@gentoo.org> gcc-4.1.1.ebuild,
+  +gcc-4.1.1-r1.ebuild:
+  Push out some fixes.
+
+*gcc-4.2.0_alpha20060902 (03 Sep 2006)
+
+  03 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +gcc-4.2.0_alpha20060902.ebuild:
+  Bump weekly 4.2 snapshot.
 
   30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> gcc-4.1.1.ebuild:
   Stable x86; its about time for us to get this stable
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 00589e337885..0331124641fa 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -351,9 +351,10 @@ DIST gcc-4.1.0-patches-1.7.tar.bz2 29483 RMD160 dda856227c853ce725015ea779f1c6c9
 DIST gcc-4.1.0-uclibc-patches-1.1.tar.bz2 20238 RMD160 173d2bf08183a8808ba253da69abeaae0127b88f SHA1 7c930086699113f6cf845539fa276e681b1ae676 SHA256 7b35927cb87f73ca98b810c1d70f9de8405c4b024c8932aabd99a0e87ed880b4
 DIST gcc-4.1.0.tar.bz2 38639061 RMD160 a0640c52a53b69b0edcf66d9dc9a95d2112e8b41 SHA1 ad6d56ddc419d464bf8ee28f5a7ac730b97ab59c SHA256 1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606
 DIST gcc-4.1.1-patches-1.6.tar.bz2 29117 RMD160 deda1cc8917bb63e446048dff15eca32530aa56e SHA1 6aa1511e25a36d3ce693c839742772737bf8a2f5 SHA256 b587a9328f359162645601a7f43a2da079df05b85ed3b613b7055023e32f560b
-DIST gcc-4.1.1-uclibc-patches-1.0.tar.bz2 20978 RMD160 06c9526d44a43284a4a4205635ea6c7b9084f726 SHA1 634f4d182d7ccac6a748a0dd1861b087a19f68cd SHA256 1bf9f0a4f0bdcc0d75e2736f5ea3024dcc9cfc7ebc70712c4aef68eabac4bd5f
+DIST gcc-4.1.1-patches-1.7.tar.bz2 46341 RMD160 ddf156fb6d48047ab725881ba835709fd1cab6f7 SHA1 a1f835d6a5bbee7cee64543ca43a8c3a219338f2 SHA256 0c4df9552b168ed50cc1ffcadd6369fe76b2bd16355a24969692a9503bd0a005
+DIST gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981 RMD160 ca12459f3ec8ee8a9dc5c260bea4bb20d6a80a65 SHA1 c004fbace98a1159115a81f0b733a4a248b2d096 SHA256 f97cf0f9fe52a529b41a78bb5d0d57899805fae00c3e7b2dff87c8192195b6f3
 DIST gcc-4.1.1.tar.bz2 39172003 RMD160 0edeac242d900b075a7e36796380492b5b3c8564 SHA1 a398b95d38b6e35f4c4e02c34c0a3bff79811f8f SHA256 985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7
-DIST gcc-4.2-20060715.tar.bz2 39949045 RMD160 5160b3f61598cc5fae57982b3869eaf218a027f3 SHA1 a7478a82088af390aa586dc87eca371658970583 SHA256 3c633c403eb3315ca840e2fd3a57fe5e5ea626d37756e82849781c7d2a90548e
+DIST gcc-4.2-20060902.tar.bz2 40398068 RMD160 bc817494b878b80e87fa38d27bbba73bdbb49deb SHA1 7037ee9fd601874b671e0adfe47f9f8ab97f7a49 SHA256 5ed40ee13e83e9ada6edffb89363cb62bb836b93edc188314e9aa7ab1818a086
 DIST protector-3.2.2-10.tar.gz 24556 RMD160 905b1ef473435230f7f4519ecf0f8a3d4c66e4e5 SHA1 c3a45f3fc450f1bd282af88a94d4b3d427d23072 SHA256 ad8401650ee0f7162e844cea492aa6151de77e8d0236cacc999aada69d511bab
 DIST protector-3.3-7.tar.gz 25068 RMD160 6e01b53477aec0c0b7a958827a38fcc8bee61c56 SHA1 a82aecdfb41e40b583ad93e6b23a5b558ebbc7a1 SHA256 cd285bd6f79b794bbb5e0c7f06c6c9317a0c72cb065d5c7d4283c51f06edeade
 DIST protector-3.3.2-3.tar.gz 28195 RMD160 6e6c98ab3d1ff0d16405df8dfdded0ff1f098eb2 SHA1 80826beb60747a6fb7ec7fdd1a5c1f93d625abba SHA256 e89ce49af8a088ffa790985e57bb5c2dd59328676342ddce93ae3166c2d3b9d9
@@ -435,18 +436,22 @@ EBUILD gcc-4.1.0-r1.ebuild 1755 RMD160 0161a0f7c8bbe291659a7a816e4064d3ee68264c
 MD5 b2b0afc49a79eb7c1b8f08b15908a99c gcc-4.1.0-r1.ebuild 1755
 RMD160 0161a0f7c8bbe291659a7a816e4064d3ee68264c gcc-4.1.0-r1.ebuild 1755
 SHA256 a2177f1c5b6afd094fa2d7dbc5add355e1a6e67033133e7e1e31fff6f5e931d8 gcc-4.1.0-r1.ebuild 1755
-EBUILD gcc-4.1.1.ebuild 1772 RMD160 69e324a7255a25840f20502025a86a3b0e5e9c35 SHA1 705acf7ff4e879e7ea38a5759b490d24b795c01c SHA256 70177eacd478b4e5a864470a3de938fce5cc04a5965f2106cb3417cb9042db04
-MD5 9d4cfdc249af59513572a1886f281665 gcc-4.1.1.ebuild 1772
-RMD160 69e324a7255a25840f20502025a86a3b0e5e9c35 gcc-4.1.1.ebuild 1772
-SHA256 70177eacd478b4e5a864470a3de938fce5cc04a5965f2106cb3417cb9042db04 gcc-4.1.1.ebuild 1772
-EBUILD gcc-4.2.0_alpha20060715.ebuild 1960 RMD160 8da12c53b1b903fa529b4fab1ad6b8a2a3ded7af SHA1 c01478ed2c39400ca74ef46dece6c4af10140c65 SHA256 c2550a335d7cedb8aa64f840c9a397eebaa802eab86273dd340b9c729412b619
-MD5 dec825a5acaefe6931af342c07f23c5c gcc-4.2.0_alpha20060715.ebuild 1960
-RMD160 8da12c53b1b903fa529b4fab1ad6b8a2a3ded7af gcc-4.2.0_alpha20060715.ebuild 1960
-SHA256 c2550a335d7cedb8aa64f840c9a397eebaa802eab86273dd340b9c729412b619 gcc-4.2.0_alpha20060715.ebuild 1960
-MISC ChangeLog 112781 RMD160 8f3929610b86e23ada026d268198e5eafa7d0e2c SHA1 ed32d0f9b2907f35cdf73f8167e8b21fba230ffd SHA256 9a5cfafb30609a2b706cb07f658433ed0b84bd2bee42d453363b54de39fb538a
-MD5 d912df0238fcd47a4cad17fbf42ae749 ChangeLog 112781
-RMD160 8f3929610b86e23ada026d268198e5eafa7d0e2c ChangeLog 112781
-SHA256 9a5cfafb30609a2b706cb07f658433ed0b84bd2bee42d453363b54de39fb538a ChangeLog 112781
+EBUILD gcc-4.1.1-r1.ebuild 1778 RMD160 e4ecaf91a65bcf97fb13fd68d336f500ece94126 SHA1 400b61413721df256c8423ba5e85a5e3b3da162c SHA256 e499c05f61c9af29d8ec5c9dcdabaa294f6b9306401357c13fcb992b3c60f04e
+MD5 395bb1980b6222e5e586be43c23899fc gcc-4.1.1-r1.ebuild 1778
+RMD160 e4ecaf91a65bcf97fb13fd68d336f500ece94126 gcc-4.1.1-r1.ebuild 1778
+SHA256 e499c05f61c9af29d8ec5c9dcdabaa294f6b9306401357c13fcb992b3c60f04e gcc-4.1.1-r1.ebuild 1778
+EBUILD gcc-4.1.1.ebuild 1772 RMD160 ca2278f3f6770334377a821cc43c268d03f14286 SHA1 6df0ed0757cd1a96c84165d754b0ae3a4734f8c3 SHA256 2d17d3808c9f3e111efdde039d1c9759f6062479dc96bc3eda185535203756d4
+MD5 535d36b045e8cc7ed122338dfd237b83 gcc-4.1.1.ebuild 1772
+RMD160 ca2278f3f6770334377a821cc43c268d03f14286 gcc-4.1.1.ebuild 1772
+SHA256 2d17d3808c9f3e111efdde039d1c9759f6062479dc96bc3eda185535203756d4 gcc-4.1.1.ebuild 1772
+EBUILD gcc-4.2.0_alpha20060902.ebuild 1961 RMD160 6e05c2a3cef6325e2b8cd15dde9de1c6083bb85b SHA1 d4dc975d5c1fccf81919fb77d0b7ebf34f4932de SHA256 a92919913b846a8433fb16b2b43dccc882694b2f393fd103c6a0515eb03b57cb
+MD5 6f4e83fa623c9cf3aad73b62b8a4cb64 gcc-4.2.0_alpha20060902.ebuild 1961
+RMD160 6e05c2a3cef6325e2b8cd15dde9de1c6083bb85b gcc-4.2.0_alpha20060902.ebuild 1961
+SHA256 a92919913b846a8433fb16b2b43dccc882694b2f393fd103c6a0515eb03b57cb gcc-4.2.0_alpha20060902.ebuild 1961
+MISC ChangeLog 113080 RMD160 4aea36c869e2a3be0631d2f02bbc1180a48ac20c SHA1 510b2ae481ba11a2e86fb33c8b049a061bf0045e SHA256 b3f304e544d30dce2d8b2f1b8ea270d88333ee2bc61582978a452ab531e3ec34
+MD5 4e0439e110b71a7b586c8e5527758e4e ChangeLog 113080
+RMD160 4aea36c869e2a3be0631d2f02bbc1180a48ac20c ChangeLog 113080
+SHA256 b3f304e544d30dce2d8b2f1b8ea270d88333ee2bc61582978a452ab531e3ec34 ChangeLog 113080
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -508,16 +513,19 @@ SHA256 6d920f64c4a6949a047f6da14638df614455738aa08687870973cbb9b6052b77 files/di
 MD5 99b67fb212dea998995389ea861e9020 files/digest-gcc-4.1.0-r1 789
 RMD160 d116ba253df56c49f7c38337cb3c897ee6a45991 files/digest-gcc-4.1.0-r1 789
 SHA256 9254e7d582b114e5b560065442baa8f8030106293cc26ab5bd642834697283b9 files/digest-gcc-4.1.0-r1 789
-MD5 8420b7ecf76710297ea38077498ffda1 files/digest-gcc-4.1.1 789
-RMD160 fb9daee8231c49ddde8e9cac51bc906db7f82958 files/digest-gcc-4.1.1 789
-SHA256 378c59b19eb089a2be32aad6b0fc0e75e5d9d25d85ec6b986963964977fecdf1 files/digest-gcc-4.1.1 789
-MD5 dd804d6d71ea100706eabb9dc87303d3 files/digest-gcc-4.2.0_alpha20060715 259
-RMD160 649d276573607eaa22b66cbfd562e7a930eb3793 files/digest-gcc-4.2.0_alpha20060715 259
-SHA256 c29de493a1f36a07b9ca2d978db2e9b9af4b9192582d958f0e5f7da4dae01e4c files/digest-gcc-4.2.0_alpha20060715 259
+MD5 45f2c3d5b166161fcd4c30e2a342f3cc files/digest-gcc-4.1.1 789
+RMD160 4e9ecc293787720e9e5f13ff932fd2c7cc0bda65 files/digest-gcc-4.1.1 789
+SHA256 a4c88b13a87fa8fd4035e066d0db9ae7b2c6af93cdaf58e66aaf0a03f13fe590 files/digest-gcc-4.1.1 789
+MD5 6f5a6df037552f87b8c60bc8a56530a6 files/digest-gcc-4.1.1-r1 789
+RMD160 900527410587f41caadb208f48dd260b354317f1 files/digest-gcc-4.1.1-r1 789
+SHA256 4cd44f2492b0816fee5211f5dd0734661cc4d28ecbc273a8597858cfe2d69469 files/digest-gcc-4.1.1-r1 789
+MD5 34507b797b7506471cc262bfe6cca8db files/digest-gcc-4.2.0_alpha20060902 259
+RMD160 55d403cda629462577b001ebef8471181df46974 files/digest-gcc-4.2.0_alpha20060902 259
+SHA256 e71f80045444d6cff6d967492f51814187ed135c9eff49808f5295067793dc62 files/digest-gcc-4.2.0_alpha20060902 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE9ewu2ZWR0Jhg/EsRApm+AJwOIAQzf7OsTdpRsAi9eIA564XuDwCePjPR
-bh1MgpHFforyM99Tngk+Kt4=
-=0lcu
+iD8DBQFE+10mamhnQswr0vIRArUOAJ9Ay7VXYN/Ew9j+w+hUQNdgbs80SwCdF9ZZ
+5IdiW807QW4na3lpakVFAvk=
+=CjHG
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.1 b/sys-devel/gcc/files/digest-gcc-4.1.1
index 927674042f3f..0053842fc31e 100644
--- a/sys-devel/gcc/files/digest-gcc-4.1.1
+++ b/sys-devel/gcc/files/digest-gcc-4.1.1
@@ -1,9 +1,9 @@
 MD5 9c9ef7e72a1555998e408b7afead88f0 gcc-4.1.1-patches-1.6.tar.bz2 29117
 RMD160 deda1cc8917bb63e446048dff15eca32530aa56e gcc-4.1.1-patches-1.6.tar.bz2 29117
 SHA256 b587a9328f359162645601a7f43a2da079df05b85ed3b613b7055023e32f560b gcc-4.1.1-patches-1.6.tar.bz2 29117
-MD5 f56ed370a68ff994685fced2d98678d9 gcc-4.1.1-uclibc-patches-1.0.tar.bz2 20978
-RMD160 06c9526d44a43284a4a4205635ea6c7b9084f726 gcc-4.1.1-uclibc-patches-1.0.tar.bz2 20978
-SHA256 1bf9f0a4f0bdcc0d75e2736f5ea3024dcc9cfc7ebc70712c4aef68eabac4bd5f gcc-4.1.1-uclibc-patches-1.0.tar.bz2 20978
+MD5 37396d61f74c49f68848f3e45e5e7d6c gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981
+RMD160 ca12459f3ec8ee8a9dc5c260bea4bb20d6a80a65 gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981
+SHA256 f97cf0f9fe52a529b41a78bb5d0d57899805fae00c3e7b2dff87c8192195b6f3 gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981
 MD5 ad9f97a4d04982ccf4fd67cb464879f3 gcc-4.1.1.tar.bz2 39172003
 RMD160 0edeac242d900b075a7e36796380492b5b3c8564 gcc-4.1.1.tar.bz2 39172003
 SHA256 985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 gcc-4.1.1.tar.bz2 39172003
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.1-r1 b/sys-devel/gcc/files/digest-gcc-4.1.1-r1
new file mode 100644
index 000000000000..cdd3c9ee8ac6
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-4.1.1-r1
@@ -0,0 +1,9 @@
+MD5 9a27bbf9b7f3774fc148a527c194528c gcc-4.1.1-patches-1.7.tar.bz2 46341
+RMD160 ddf156fb6d48047ab725881ba835709fd1cab6f7 gcc-4.1.1-patches-1.7.tar.bz2 46341
+SHA256 0c4df9552b168ed50cc1ffcadd6369fe76b2bd16355a24969692a9503bd0a005 gcc-4.1.1-patches-1.7.tar.bz2 46341
+MD5 37396d61f74c49f68848f3e45e5e7d6c gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981
+RMD160 ca12459f3ec8ee8a9dc5c260bea4bb20d6a80a65 gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981
+SHA256 f97cf0f9fe52a529b41a78bb5d0d57899805fae00c3e7b2dff87c8192195b6f3 gcc-4.1.1-uclibc-patches-1.1.tar.bz2 20981
+MD5 ad9f97a4d04982ccf4fd67cb464879f3 gcc-4.1.1.tar.bz2 39172003
+RMD160 0edeac242d900b075a7e36796380492b5b3c8564 gcc-4.1.1.tar.bz2 39172003
+SHA256 985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 gcc-4.1.1.tar.bz2 39172003
diff --git a/sys-devel/gcc/gcc-4.1.1-r1.ebuild b/sys-devel/gcc/gcc-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..fc143dec1788
--- /dev/null
+++ b/sys-devel/gcc/gcc-4.1.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r1.ebuild,v 1.1 2006/09/03 22:53:47 vapier Exp $
+
+PATCH_VER="1.7"
+UCLIBC_VER="1.1"
+
+ETYPE="gcc-compiler"
+
+# whether we should split out specs files for multiple {PIE,SSP}-by-default
+# and vanilla configurations.
+SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
+
+inherit toolchain
+
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="-* ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	virtual/libiconv
+	fortran? (
+		>=dev-libs/gmp-4.2.1
+		>=dev-libs/mpfr-2.2.0_p10
+	)
+	!build? (
+		gcj? (
+			gtk? (
+				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				>=x11-libs/gtk+-2.2
+				x11-libs/pango
+			)
+			>=media-libs/libart_lgpl-2.1
+		)
+		>=sys-libs/ncurses-5.2-r2
+		nls? ( sys-devel/gettext )
+	)"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/autogen )
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	>=${CATEGORY}/binutils-2.15.94"
+PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
+fi
+
+src_unpack() {
+	gcc_src_unpack
+
+	use vanilla && return 0
+
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+
+	# Fix cross-compiling
+	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
+
+	[[ ${CTARGET} == *-softfloat-* ]] && epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-softfloat.patch
+}
diff --git a/sys-devel/gcc/gcc-4.1.1.ebuild b/sys-devel/gcc/gcc-4.1.1.ebuild
index ec953eeb94d3..be2cf47c63de 100644
--- a/sys-devel/gcc/gcc-4.1.1.ebuild
+++ b/sys-devel/gcc/gcc-4.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1.ebuild,v 1.18 2006/08/30 19:49:03 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1.ebuild,v 1.19 2006/09/03 22:53:46 vapier Exp $
 
 PATCH_VER="1.6"
-UCLIBC_VER="1.0"
+UCLIBC_VER="1.1"
 
 ETYPE="gcc-compiler"