Push out some fixes.

(Portage version: 2.1.1_rc1-r2)

5 files changed, 88 insertions, 6 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/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"