gcc-3.1.1 snapshot

33 files changed, 101 insertions, 1110 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index f82ae428ae9d..bbd158fdce97 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.23 2002/07/06 15:36:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.24 2002/07/07 00:08:23 azarah Exp $
+
+*gcc-3.1.1 (07 Jul 2002)
+
+  7 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1.1 :
+
+  Add snapshot for gcc-3.1.1.  This fixes the internal compiler
+  errors with "-march=pentium4" for me at least (had with gcc-3.1).
 
 *gcc-3.1-r8 (03 Jul 2002)
 
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-ada-addr2line.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-ada-addr2line.patch.bz2
new file mode 100644
index 000000000000..fe46bdffd295
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-ada-addr2line.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-ada-link.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-ada-link.patch.bz2
new file mode 100644
index 000000000000..1d63ebca847f
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-ada-link.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-attr-visibility2.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-attr-visibility2.patch.bz2
new file mode 100644
index 000000000000..1ff48a75fee0
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-attr-visibility2.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-c++-pretty_function.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-c++-pretty_function.patch.bz2
new file mode 100644
index 000000000000..2372d71862b7
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-c++-pretty_function.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-c++-tsubst-asm.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-c++-tsubst-asm.patch.bz2
new file mode 100644
index 000000000000..4cd00d6ada95
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-c++-tsubst-asm.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-hard-reg-sharing.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-hard-reg-sharing.patch.bz2
new file mode 100644
index 000000000000..b533419739f5
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-hard-reg-sharing.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-i386-default-momit-leaf-frame-pointer.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-i386-default-momit-leaf-frame-pointer.patch.bz2
new file mode 100644
index 000000000000..8531e10b8c7d
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-i386-default-momit-leaf-frame-pointer.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-i386-memtest-test.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-i386-memtest-test.patch.bz2
new file mode 100644
index 000000000000..7033b12d2958
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-i386-memtest-test.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-i386-pic-label-thunk.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-i386-pic-label-thunk.patch.bz2
new file mode 100644
index 000000000000..add70eefe9b9
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-i386-pic-label-thunk.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-i386-profile-olfp.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-i386-profile-olfp.patch.bz2
new file mode 100644
index 000000000000..b8f2f3bb0af3
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-i386-profile-olfp.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-java-no-rpath.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-java-no-rpath.patch.bz2
new file mode 100644
index 000000000000..593f95b2333e
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-java-no-rpath.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-pr6842.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-pr6842.patch.bz2
new file mode 100644
index 000000000000..49523978d023
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-pr6842.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-test-rh65771.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-test-rh65771.patch.bz2
new file mode 100644
index 000000000000..a9cf98a626fe
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-test-rh65771.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-tls.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-tls.patch.bz2
new file mode 100644
index 000000000000..a06739a1fe1c
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-tls.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-tree-code.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-tree-code.patch.bz2
new file mode 100644
index 000000000000..edbe40625d5b
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-tree-code.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-trunc_int_for_mode.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-trunc_int_for_mode.patch.bz2
new file mode 100644
index 000000000000..09c8de4ab489
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-trunc_int_for_mode.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-x86_64-addr-diff.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-addr-diff.patch.bz2
new file mode 100644
index 000000000000..e9a9ee40ce09
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-addr-diff.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-x86_64-biarch.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-biarch.patch.bz2
new file mode 100644
index 000000000000..e8af27867c42
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-biarch.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-x86_64-libiberty-pic.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-libiberty-pic.patch.bz2
new file mode 100644
index 000000000000..dff46c7724e0
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-libiberty-pic.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-x86_64-profile.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-profile.patch.bz2
new file mode 100644
index 000000000000..879aae357a51
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-profile.patch.bz2
diff --git a/sys-devel/gcc/files/3.1.1/gcc311-x86_64-q_regs_operand.patch.bz2 b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-q_regs_operand.patch.bz2
new file mode 100644
index 000000000000..d2bbf83f9d31
--- /dev/null
+++ b/sys-devel/gcc/files/3.1.1/gcc311-x86_64-q_regs_operand.patch.bz2
diff --git a/sys-devel/gcc/files/digest-gcc-2.95.3-r5 b/sys-devel/gcc/files/digest-gcc-2.95.3-r5
deleted file mode 100644
index af4ece6f1f33..000000000000
--- a/sys-devel/gcc/files/digest-gcc-2.95.3-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz 12911721
-MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz 1133487
diff --git a/sys-devel/gcc/files/digest-gcc-2.95.3-r6 b/sys-devel/gcc/files/digest-gcc-2.95.3-r6
deleted file mode 100644
index af4ece6f1f33..000000000000
--- a/sys-devel/gcc/files/digest-gcc-2.95.3-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz 12911721
-MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz 1133487
diff --git a/sys-devel/gcc/files/digest-gcc-3.1-r4 b/sys-devel/gcc/files/digest-gcc-3.1-r4
deleted file mode 100644
index fba8a6ab4cea..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 605adcc9c90f1674043c8c3749f43636 gcc-3.1.tar.bz2 20445209
diff --git a/sys-devel/gcc/files/digest-gcc-3.1-r5 b/sys-devel/gcc/files/digest-gcc-3.1-r5
deleted file mode 100644
index fba8a6ab4cea..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.1-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 605adcc9c90f1674043c8c3749f43636 gcc-3.1.tar.bz2 20445209
diff --git a/sys-devel/gcc/files/digest-gcc-3.1-r6 b/sys-devel/gcc/files/digest-gcc-3.1-r6
deleted file mode 100644
index fba8a6ab4cea..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 605adcc9c90f1674043c8c3749f43636 gcc-3.1.tar.bz2 20445209
diff --git a/sys-devel/gcc/files/digest-gcc-3.1.1 b/sys-devel/gcc/files/digest-gcc-3.1.1
new file mode 100644
index 000000000000..f57ed992884a
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.1.1
@@ -0,0 +1 @@
+MD5 5c5127ab72dd9175aa434b882b08b262 gcc-3.1.1-20020701.tar.bz2 18474756
diff --git a/sys-devel/gcc/gcc-2.95.3-r5.ebuild b/sys-devel/gcc/gcc-2.95.3-r5.ebuild
deleted file mode 100644
index 593d7e3f7191..000000000000
--- a/sys-devel/gcc/gcc-2.95.3-r5.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r5.ebuild,v 1.10 2002/06/24 18:22:20 azarah Exp $
-
-TV=4.0
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
-	ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-${TV}.tar.gz
-	ftp://ftp.ibiblio.org/pub/linux/distributions/gentoo/distfiles/texinfo-${TV}.tar.gz"
-
-S=${WORKDIR}/${P}
-
-LOC=/usr
-
-DESCRIPTION="Modern GCC C/C++ compiler and an included, upgraded version of texinfo to boot"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
-if [ -z "`use build`" ]
-then
-	DEPEND="$DEPEND nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2-r2"
-	RDEPEND="$RDEPEND >=sys-libs/ncurses-5.2-r2"
-fi
-PROVIDE="sys-apps/texinfo"
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	# A patch for the atexit problem occured with glibc-2.2.3
-	patch -l -p0 < ${FILESDIR}/${P}-atexit.diff || die
-	# Now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
-	cd ${S}
-	tar xzf ${DISTDIR}/texinfo-${TV}.tar.gz || die
-	cp -a ${S}/texinfo-4.0/* ${S}/texinfo
-	cd ${S}/texinfo
-	if [ "`use build`" ]
-	then
-		patch -p0 < ${FILESDIR}/texinfo-${TV}-no-ncurses-gentoo.diff || die
- 		touch *
-	fi
-}
-
-src_compile() {
-	local myconf
-	if [ -z "`use build`" ]
-	then
-		myconf="--enable-shared"
-	else
-		myconf="--enable-languages=c"
-	fi
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
-		myconf="$myconf --disable-nls"
-	else
-		myconf="$myconf --enable-nls --without-included-gettext"
-	fi
-
-	# gcc does not like optimization
-
-	export CFLAGS="${CFLAGS/-O?/}"
-	export CXXFLAGS="${CXXFLAGS/-O?/}"
-
-	${S}/configure --prefix=${LOC} --mandir=${LOC}/share/man --infodir=${LOC}/share/info \
-	--enable-version-specific-runtime-libs --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads  \
-	--with-local-prefix=${LOC}/local ${myconf} || die
-
-	if [ -z "`use static`" ]
-	then
-		emake bootstrap-lean || die
-	else
-		emake LDFLAGS=-static bootstrap || die
-	fi
-}
-
-src_install() {
-	make install prefix=${D}${LOC} mandir=${D}${LOC}/share/man infodir=${D}${LOC}/share/info || die
-	[ -e ${D}/usr/bin/gcc ] || die "gcc not found in ${D}"
-    FULLPATH=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	cd ${FULLPATH}
-	dodir /lib
-	dosym /usr/bin/cpp /lib/cpp
-	dosym gcc /usr/bin/cc
-	dodir /etc/env.d
-	echo "LDPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}" > ${D}/etc/env.d/05gcc
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-		#do a full texinfo-${TV} install
-		
-		cd ${S}/texinfo
-	  	make DESTDIR=${D} infodir=${D}/usr/share/info install || die
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/mkinfodir
-
-		cd ${D}/usr/share/info
-		mv texinfo texinfo.info
-		for i in texinfo-*
-		do
-			mv ${i} texinfo.info-${i#texinfo-*}
-		done
-
-		cd ${S}/texinfo
-	   	docinto texinfo
-		dodoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
-		docinto texinfo/info
-		dodoc info/README
-		docinto texinfo/makeinfo
-		dodoc makeinfo/README
-
-		# end texinfo 4.0; begin more gcc stuff
-
-		cd ${S}
-		docinto /	
-		dodoc COPYING COPYING.LIB README* FAQ MAINTAINERS
-		docinto html
-		dodoc faq.html
-		docinto gcc
-		cd ${S}/gcc
-		dodoc BUGS ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS PROBLEMS README* SERVICE TESTS.FLUNK
-	    cd ${S}/libchill
-	    docinto libchill
-	    dodoc ChangeLog
-	    cd ${S}/libf2c
-	    docinto libf2c
-	    dodoc ChangeLog changes.netlib README TODO
-	    cd ${S}/libiberty
-	    docinto libiberty
-	    dodoc ChangeLog COPYING.LIB README
-	    cd ${S}/libio
-	    docinto libio
-	    dodoc ChangeLog NEWS README
-	    cd dbz
-	    docinto libio/dbz
-	    dodoc README
-	    cd ../stdio
-	    docinto libio/stdio
-	    dodoc ChangeLog*
-	    cd ${S}/libobjc
-	    docinto libobjc
-	    dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++
-		docinto libstdc++
-		dodoc ChangeLog NEWS
-    else
-        rm -rf ${D}/usr/share/{man,info}
-		#do a minimal texinfo install (build image)
-		cd ${S}/texinfo
-		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
-	fi
-}
diff --git a/sys-devel/gcc/gcc-2.95.3-r6.ebuild b/sys-devel/gcc/gcc-2.95.3-r6.ebuild
deleted file mode 100644
index b367442a20eb..000000000000
--- a/sys-devel/gcc/gcc-2.95.3-r6.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r6.ebuild,v 1.4 2002/06/24 18:22:20 azarah Exp $
-
-TV=4.0
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
-	ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-${TV}.tar.gz
-	ftp://ftp.ibiblio.org/pub/linux/distributions/gentoo/distfiles/texinfo-${TV}.tar.gz"
-
-S=${WORKDIR}/${P}
-
-LOC=/usr
-
-DESCRIPTION="Modern GCC C/C++ compiler and an included, upgraded version of texinfo to boot"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
-if [ -z "`use build`" ]
-then
-	DEPEND="$DEPEND nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2-r2"
-	RDEPEND="$RDEPEND >=sys-libs/ncurses-5.2-r2"
-fi
-PROVIDE="sys-apps/texinfo"
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	# A patch for the atexit problem occured with glibc-2.2.3
-	patch -l -p0 < ${FILESDIR}/${P}-atexit.diff || die
-	# Now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
-	cd ${S}
-	tar xzf ${DISTDIR}/texinfo-${TV}.tar.gz || die
-	cp -a ${S}/texinfo-4.0/* ${S}/texinfo
-	cd ${S}/texinfo
-	if [ "`use build`" ]
-	then
-		patch -p0 < ${FILESDIR}/texinfo-${TV}-no-ncurses-gentoo.diff || die
- 		touch *
-	fi
-}
-
-src_compile() {
-	local myconf
-	if [ -z "`use build`" ]
-	then
-		myconf="--enable-shared"
-	else
-		myconf="--enable-languages=c"
-	fi
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
-		myconf="$myconf --disable-nls"
-	else
-		myconf="$myconf --enable-nls --without-included-gettext"
-	fi
-
-	# gcc does not like optimization
-
-	export CFLAGS="${CFLAGS/-O?/}"
-	export CXXFLAGS="${CXXFLAGS/-O?/}"
-
-	${S}/configure --prefix=${LOC} --mandir=${LOC}/share/man --infodir=${LOC}/share/info \
-	--enable-version-specific-runtime-libs --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads  \
-	--with-local-prefix=${LOC}/local ${myconf} || die
-
-	if [ -z "`use static`" ]
-	then
-		emake bootstrap-lean || die
-	else
-		emake LDFLAGS=-static bootstrap || die
-	fi
-}
-
-src_install() {
-	make install prefix=${D}${LOC} mandir=${D}${LOC}/share/man infodir=${D}${LOC}/share/info || die
-	[ -e ${D}/usr/bin/gcc ] || die "gcc not found in ${D}"
-    FULLPATH=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	cd ${FULLPATH}
-	dodir /lib
-	dosym /usr/bin/cpp /lib/cpp
-	dosym gcc /usr/bin/cc
-	dodir /etc/env.d
-	echo "LDPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}" > ${D}/etc/env.d/05gcc
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-		#do a full texinfo-${TV} install
-		
-		cd ${S}/texinfo
-	  	make DESTDIR=${D} infodir=${D}/usr/share/info install || die
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/mkinfodir
-
-		cd ${D}/usr/share/info
-		mv texinfo texinfo.info
-		for i in texinfo-*
-		do
-			mv ${i} texinfo.info-${i#texinfo-*}
-		done
-
-		cd ${S}/texinfo
-	   	docinto texinfo
-		dodoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
-		docinto texinfo/info
-		dodoc info/README
-		docinto texinfo/makeinfo
-		dodoc makeinfo/README
-
-		# end texinfo 4.0; begin more gcc stuff
-
-		cd ${S}
-		docinto /	
-		dodoc COPYING COPYING.LIB README* FAQ MAINTAINERS
-		docinto html
-		dodoc faq.html
-		docinto gcc
-		cd ${S}/gcc
-		dodoc BUGS ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS PROBLEMS README* SERVICE TESTS.FLUNK
-	    cd ${S}/libchill
-	    docinto libchill
-	    dodoc ChangeLog
-	    cd ${S}/libf2c
-	    docinto libf2c
-	    dodoc ChangeLog changes.netlib README TODO
-	    cd ${S}/libio
-	    docinto libio
-	    dodoc ChangeLog NEWS README
-	    cd dbz
-	    docinto libio/dbz
-	    dodoc README
-	    cd ../stdio
-	    docinto libio/stdio
-	    dodoc ChangeLog*
-	    cd ${S}/libobjc
-	    docinto libobjc
-	    dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++
-		docinto libstdc++
-		dodoc ChangeLog NEWS
-    else
-        rm -rf ${D}/usr/share/{man,info}
-		#do a minimal texinfo install (build image)
-		cd ${S}/texinfo
-		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
-	fi
-	#binutils libiberty.a and we want to use that version
-	#closes bug 2262
-	rm -f ${D}/usr/lib/libiberty.a
-}
diff --git a/sys-devel/gcc/gcc-3.1-r4.ebuild b/sys-devel/gcc/gcc-3.1-r4.ebuild
deleted file mode 100644
index 4f7a5bd3f24c..000000000000
--- a/sys-devel/gcc/gcc-3.1-r4.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Grant Goodyear <g2boojum@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.ebuild,v 1.1 2002/05/17 15:42:30 prez Exp
-
-# NOTE TO MAINTAINER:  Info pages get nuked for multiple version installs.
-#                      Ill fix it later if i get a chance.
-#
-# IMPORTANT:  The versions of libs installed should be updated
-#             in src_install() ... Ill implement auto-version detection
-#             later on.
-
-GCC_SUFFIX=-3.1
-LOC=/usr
-# dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs
-STDCXX_INCDIR="${LOC}/include/g++-v${PV/\./}"
-SLOT="3.1"
-S=${WORKDIR}/${P}
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
-	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gcc/releases/${P}/${P}.tar.bz2"
-DESCRIPTION="Modern GCC C/C++ compiler and an included, upgraded version of texinfo to boot"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc 
-	>=sys-libs/zlib-1.1.4"
-if [ -z "`use build`" ]
-then
-	DEPEND="$DEPEND 
-		nls? ( sys-devel/gettext ) 
-		>=sys-libs/ncurses-5.2-r2"
-	RDEPEND="$RDEPEND 
-		>=sys-libs/ncurses-5.2-r2"
-fi
-
-build_multiple() {
-	#try to make sure that we should build multiple
-	#versions of gcc (dual install of gcc2 and gcc3)
-	profile="`readlink /etc/make.profile`"
-	if [ -z "`use build`" ] && \
-	   [ -z "`use bootstrap`" ] && \
-	   [ "`gcc --version | cut -f1 -d.`" -ne 3 ] && \
-	   [ "${profile/gcc3}" = "${profile}" ] && \
-	   [ "${GCCBUILD}" != "default" ]
-	then
-		return 0
-	else
-		return 1
-	fi	  
-}
-
-# used to patch Makefiles to install into the build dir
-FAKE_ROOT=""
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	
-	#now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
-	cd ${S}
-	#fixes the build system to properly do the transformation
-	#of the binaries (thanks to Mandrake)
-	#fixup libtool to correctly generate .la files with portage
-	patch <${FILESDIR}/libtool-1.4.1-portage.patch-v3 || die
-
-	# Red Hat patches
-	for x in gcc31-boehm-gc-libs.patch.bz2 \
-		gcc31-fde-merge-compat.patch.bz2 \
-		gcc31-attr-visibility.patch.bz2 \
-		gcc31-attr-visibility2.patch.bz2 \
-		gcc31-trunc_int_for_mode.patch.bz2 \
-		gcc31-dwarf2-pr6381.patch.bz2 \
-		gcc31-dwarf2-pr6436-test.patch.bz2 \
-		gcc31-c++-null-pm-init.patch.bz2 \
-		gcc31-c++-tsubst-asm.patch.bz2 \
-		gcc31-fdata-sections.patch.bz2 \
-		gcc31-fold-const.patch.bz2 \
-		gcc31-fold-const2.patch.bz2 \
-		gcc31-i386-malign-double-doc.patch.bz2 \
-		gcc31-libstdc++-pr6594.patch.bz2 \
-		gcc31-libstdc++-pr6648.patch.bz2 \
-		gcc31-libstdc++-setrlim.patch.bz2 \
-		gcc31-pr6643.patch.bz2 \
-		gcc31-test-rotate.patch.bz2
-	do
-		bzip2 -dc ${FILESDIR}/${PV}/${x} | \
-			patch -p0 || die "failed with patch ${x}"
-	done
-	
-	# SuSE patches
-	bzip2 -dc ${FILESDIR}/${PV}/gcc31-i386-expand-clrstr.patch.bz2 | \
-		patch -p1 || die "failed with patch gcc31-i386-expand-clrstr"
-
-	# Mandrake patches
-	# cp/lex.c (cxx_init_options): By default, don't wrap lines since the
-	# C front-end operates that way, already.
-	bzip2 -dc ${FILESDIR}/${PV}/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 | \
-		patch -p1 || die "failed with patch gcc31-c++-diagnostic-no-line-wrapping"
-
-	# Currently if any path is changed via the configure script, it breaks
-	# installing into ${D}.  We should not patch it in src_install() with
-	# absolute paths, as some modules then gets rebuild with the wrong
-	# paths.  Thus we use $FAKE_ROOT.
-	cd ${S}
-	for x in $(find . -name Makefile.in)
-	do
-#		cp ${x} ${x}.orig
-		# Fix --datadir=
-#		sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \
-#			${x}.orig > ${x}
-		cp ${x} ${x}.orig
-		# Fix --with-gxx-include-dir=
-		sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \
-			-e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \
-			${x}.orig > ${x}
-		rm -f ${x}.orig
-	done
-}
-
-src_compile() {
-	local myconf=""
-	# use the system zlib!!!
-	myconf="--with-system-zlib"
-	if [ -z "`use build`" ]
-	then
-		myconf="${myconf} --enable-shared"
-	else
-		myconf="${myconf} --enable-languages=c"
-	fi
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	#only build with a program suffix if it is not our
-	#default compiler.  Also check $GCCBUILD until we got
-	#compilers sorted out.
-	#
-	#NOTE:  for software to detirmine gcc version, it will be easier
-	#       if we have gcc, gcc-3.0 and gcc-3.1, and NOT gcc-3.0.4.
-	if build_multiple
-	then
-		myconf="${myconf} --program-suffix=${GCC_SUFFIX}"
-	fi
-
-	# gcc does not like optimization
-
-	export CFLAGS="${CFLAGS/-O?/}"
-	export CXXFLAGS="${CXXFLAGS/-O?/}"
-
-	#build in a separate build tree
-	cd ${WORKDIR}
-	mkdir build
-	cd build
-
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--mandir=${LOC}/share/man \
-		--infodir=${LOC}/share/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--enable-cstdio=stdio \
-		--enable-clocale=generic \
-		--disable-checking \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	if [ -z "`use static`" ]
-	then
-		emake bootstrap-lean || die
-	else
-		emake LDFLAGS=-static bootstrap || die
-	fi
-}
-
-#thanks to mandrake for this function
-dispatch_libs() {
-	libname=$1 libversion=$2
-	rm -f $libname.so $libname.a
-
-	if build_multiple
-	then
-	# If we have multiple versions of GCC, leave libraries in $FULLPATH
-		chmod 0755 ../../../$libname.so.$libversion
-		ln -s ../../../$libname.so.$libversion $libname.so
-		rm -f ../../../$libname.so
-		cp -f ../../../$libname.a $libname.a
-		rm -f ../../../$libname.a
-	else
-		ln -sf ../../../$libname.so $libname.so
-		ln -sf ../../../$libname.a $libname.a
-	fi
-}
-
-src_install() {
-	#make install from the build directory
-	cd ${WORKDIR}/build
-	make prefix=${D}${LOC} \
-		mandir=${D}${LOC}/share/man \
-		infodir=${D}${LOC}/share/info \
-		FAKE_ROOT=${D} \
-		install || die
-	
-	if ! build_multiple
-	then
-		GCC_SUFFIX=""
-	fi
-
-	[ -e ${D}${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}"
-	
-	FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	cd ${FULLPATH_D}
-	dodir /lib
-	dodir /etc/env.d
-	echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX}
-	if ! build_multiple
-	then
-		dosym /usr/bin/cpp /lib/cpp
-		dosym gcc /usr/bin/cc
-	fi
-
-	#make sure we dont have stuff lying around that
-	#can nuke multiple versions of gcc
-	if [ -z "`use build`" ]
-	then
-		cd ${FULLPATH_D}
-		#move symlinks to compiler-specific dir
-		dispatch_libs libstdc++  4.0.0
-		mv ../../../libsupc++.a libsupc++.a
-		
-		dispatch_libs libgcj     3.0.0
-		dispatch_libs libgcjgc   1.1.0
-		#do not always get created.
-		[ ! -e libgcjgc.so ] && rm -f libgcjgc.so
-		
-		dispatch_libs libg2c     0.0.0
-		mv ../../../libfrtbegin.a libfrtbegin.a
-		
-		mv libobjc* ../../../
-		dispatch_libs libobjc    1.0.0
-		dispatch_libs libobjc_gc 1.0.0
-		#do not always get created.
-		[ ! -e libobjc_gc.so ] && rm -f libobjc_gc.so
-
-		if build_multiple
-		then
-			#move libtool .la files to $FULLPATH till I figure
-			#what to do with them. This needs to be done with
-			#parallel installs, else gcc-2.95 tries to link with
-			#the wrong libs.
-			mv ${D}${LOC}/lib/*.la ${FULLPATH_D}
-		fi
-
-		#move Java headers to compiler-specific dir
-		mv ${D}${LOC}/include/gc*.h ${FULLPATH_D}/include/
-		mv ${D}${LOC}/include/j*.h ${FULLPATH_D}/include/
-		for x in gcj gnu java javax org
-		do
-			mkdir -p ${FULLPATH_D}/include/${x}
-			mv ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/
-			rm -rf ${D}${LOC}/include/${x}
-		done
-
-		#move libgcj.spec to compiler-specific directories
-		mv ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec
-
-		#there is already one with binutils
-		mv ${D}${LOC}/lib/libiberty.a ${FULLPATH_D}/libiberty.a
-
-		#rename jar because it could clash with Kaffe's jar if this gcc is
-		#primary compiler (aka don't have the -<version> extension)
-		cd ${D}${LOC}/bin
-		mv jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
-
-		#move <cxxabi.h> to compiler-specific directories
-		mv ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/
-
-		#now fix the manpages
-		cd ${D}${LOC}/share/man/man1;
-		mv cpp.1 cpp${GCC_SUFFIX}.1
-		mv gcov.1 gcov${GCC_SUFFIX}.1
-	fi
-
-	#move libgcc_s.so.1 to /lib
-	cd ${D}/lib
-	chmod +x ${D}${LOC}/lib/libgcc_s.so.1
-	mv -f ${D}${LOC}/lib/libgcc_s.so.1 libgcc_s-${PV}.so.1
-	ln -sf libgcc_s-${PV}.so.1 libgcc_s.so.1
-	ln -sf libgcc_s.so.1 libgcc_s.so
-	rm -f ${D}${LOC}/lib/libgcc_s.so*
-
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-		cd ${S}
-		docinto /	
-		dodoc BUGS COPYING COPYING.LIB ChangeLog GNATS README* FAQ MAINTAINERS
-		docinto html
-		dodoc *.html
-		cd ${S}/boehm-gc
-		docinto boehm-gc
-		dodoc ChangeLog README*
-		cd ${S}/gcc
-		docinto gcc
-		dodoc ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS ONEWS \
-			README* SERVICE
-	    cd ${S}/fastjar
-	    docinto fastjar
-	    dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
-		cd ${S}/libf2c
-	    docinto libf2c
-	    dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \
-			permission.netlib readme.netlib
-		cd ${S}/libffi
-	    docinto libffi
-	    dodoc ChangeLog* LICENSE README
-		cd ${S}/libjava
-	    docinto libjava
-	    dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-	    cd ${S}/libiberty
-	    docinto libiberty
-	    dodoc ChangeLog COPYING.LIB README
-	    cd ${S}/libobjc
-	    docinto libobjc
-	    dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++-v3
-		docinto libstdc++-v3
-		dodoc ChangeLog* README
-    else
-        rm -rf ${D}/usr/share/{man,info}
-	fi
-}
-
-pkg_postrm() {
-	if [ ! -L ${ROOT}/lib/cpp ]
-	then
-		ln -sf /usr/bin/cpp ${ROOT}/lib/cpp
-	fi
-	if [ ! -L ${ROOT}/usr/bin/cc ]
-	then
-		ln -sf gcc ${ROOT}/usr/bin/cc
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.1-r5.ebuild b/sys-devel/gcc/gcc-3.1-r5.ebuild
deleted file mode 100644
index cd2829a92fc9..000000000000
--- a/sys-devel/gcc/gcc-3.1-r5.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Grant Goodyear <g2boojum@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.ebuild,v 1.1 2002/05/17 15:42:30 prez Exp
-
-# NOTE TO MAINTAINER:  Info pages get nuked for multiple version installs.
-#                      Ill fix it later if i get a chance.
-#
-# IMPORTANT:  The versions of libs installed should be updated
-#             in src_install() ... Ill implement auto-version detection
-#             later on.
-
-GCC_SUFFIX=-3.1
-LOC=/usr
-# dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs
-STDCXX_INCDIR="${LOC}/include/g++-v${PV/\./}"
-SLOT="3.1"
-S=${WORKDIR}/${P}
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
-	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gcc/releases/${P}/${P}.tar.bz2"
-DESCRIPTION="Modern GCC C/C++ compiler"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc 
-	>=sys-libs/zlib-1.1.4"
-if [ -z "`use build`" ]
-then
-	DEPEND="$DEPEND 
-		nls? ( sys-devel/gettext ) 
-		>=sys-libs/ncurses-5.2-r2"
-	RDEPEND="$RDEPEND 
-		>=sys-libs/ncurses-5.2-r2"
-fi
-
-# necessary because gcc-3.1 does gcc --version different. really
-# different
-gcc_version() {
-	gcc -v 2>&1 |tail -1 |cut -d\  -f3-3
-}
-
-build_multiple() {
-	#try to make sure that we should build multiple
-	#versions of gcc (dual install of gcc2 and gcc3)
-	profile="`readlink /etc/make.profile`"
-	if [ -z "`use build`" ] && \
-	   [ -z "`use bootstrap`" ] && \
-	   [ "`gcc_version | cut -f1 -d.`" -ne 3 ] && \
-	   [ "${profile/gcc3}" = "${profile}" ] && \
-	   [ "${GCCBUILD}" != "default" ]
-	then
-		return 0
-	else
-		return 1
-	fi	  
-}
-
-# used to patch Makefiles to install into the build dir
-FAKE_ROOT=""
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	
-	#now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
-	cd ${S}
-	#fixes the build system to properly do the transformation
-	#of the binaries (thanks to Mandrake)
-	#fixup libtool to correctly generate .la files with portage
-	patch <${FILESDIR}/libtool-1.4.1-portage.patch-v3 || die
-
-	# Red Hat patches
-	for x in gcc31-boehm-gc-libs.patch.bz2 \
-		gcc31-fde-merge-compat.patch.bz2 \
-		gcc31-attr-visibility.patch.bz2 \
-		gcc31-attr-visibility2.patch.bz2 \
-		gcc31-trunc_int_for_mode.patch.bz2 \
-		gcc31-dwarf2-pr6381.patch.bz2 \
-		gcc31-dwarf2-pr6436-test.patch.bz2 \
-		gcc31-c++-null-pm-init.patch.bz2 \
-		gcc31-c++-tsubst-asm.patch.bz2 \
-		gcc31-fdata-sections.patch.bz2 \
-		gcc31-fold-const.patch.bz2 \
-		gcc31-fold-const2.patch.bz2 \
-		gcc31-i386-malign-double-doc.patch.bz2 \
-		gcc31-libstdc++-pr6594.patch.bz2 \
-		gcc31-libstdc++-pr6648.patch.bz2 \
-		gcc31-libstdc++-setrlim.patch.bz2 \
-		gcc31-pr6643.patch.bz2 \
-		gcc31-test-rotate.patch.bz2
-	do
-		bzip2 -dc ${FILESDIR}/${PV}/${x} | \
-			patch -p0 || die "failed with patch ${x}"
-	done
-	
-	# SuSE patches
-	bzip2 -dc ${FILESDIR}/${PV}/gcc31-i386-expand-clrstr.patch.bz2 | \
-		patch -p1 || die "failed with patch gcc31-i386-expand-clrstr"
-
-	# Mandrake patches
-	# cp/lex.c (cxx_init_options): By default, don't wrap lines since the
-	# C front-end operates that way, already.
-	bzip2 -dc ${FILESDIR}/${PV}/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 | \
-		patch -p1 || die "failed with patch gcc31-c++-diagnostic-no-line-wrapping"
-
-	# Currently if any path is changed via the configure script, it breaks
-	# installing into ${D}.  We should not patch it in src_install() with
-	# absolute paths, as some modules then gets rebuild with the wrong
-	# paths.  Thus we use $FAKE_ROOT.
-	cd ${S}
-	for x in $(find . -name Makefile.in)
-	do
-#		cp ${x} ${x}.orig
-		# Fix --datadir=
-#		sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \
-#			${x}.orig > ${x}
-		cp ${x} ${x}.orig
-		# Fix --with-gxx-include-dir=
-		sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \
-			-e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \
-			${x}.orig > ${x}
-		rm -f ${x}.orig
-	done
-}
-
-src_compile() {
-	local myconf=""
-	# use the system zlib!!!
-	myconf="--with-system-zlib"
-	if [ -z "`use build`" ]
-	then
-		myconf="${myconf} --enable-shared"
-	else
-		myconf="${myconf} --enable-languages=c"
-	fi
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	#only build with a program suffix if it is not our
-	#default compiler.  Also check $GCCBUILD until we got
-	#compilers sorted out.
-	#
-	#NOTE:  for software to detirmine gcc version, it will be easier
-	#       if we have gcc, gcc-3.0 and gcc-3.1, and NOT gcc-3.0.4.
-	if build_multiple
-	then
-		myconf="${myconf} --program-suffix=${GCC_SUFFIX}"
-	fi
-
-	# gcc does not like optimization
-
-	export CFLAGS="${CFLAGS/-O?/}"
-	export CXXFLAGS="${CXXFLAGS/-O?/}"
-
-	#build in a separate build tree
-	cd ${WORKDIR}
-	mkdir build
-	cd build
-
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--mandir=${LOC}/share/man \
-		--infodir=${LOC}/share/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--enable-cstdio=stdio \
-		--enable-clocale=generic \
-		--disable-checking \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	if [ -z "`use static`" ]
-	then
-		emake bootstrap-lean || die
-	else
-		emake LDFLAGS=-static bootstrap || die
-	fi
-}
-
-#thanks to mandrake for this function
-dispatch_libs() {
-	libname=$1 libversion=$2
-	rm -f $libname.so $libname.a
-
-	if build_multiple
-	then
-	# If we have multiple versions of GCC, leave libraries in $FULLPATH
-		chmod 0755 ../../../$libname.so.$libversion
-		ln -s ../../../$libname.so.$libversion $libname.so
-		rm -f ../../../$libname.so
-		cp -f ../../../$libname.a $libname.a
-		rm -f ../../../$libname.a
-	else
-		ln -sf ../../../$libname.so $libname.so
-		ln -sf ../../../$libname.a $libname.a
-	fi
-}
-
-src_install() {
-	#make install from the build directory
-	cd ${WORKDIR}/build
-	make prefix=${D}${LOC} \
-		mandir=${D}${LOC}/share/man \
-		infodir=${D}${LOC}/share/info \
-		FAKE_ROOT=${D} \
-		install || die
-	
-	if ! build_multiple
-	then
-		GCC_SUFFIX=""
-	fi
-
-	[ -e ${D}${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}"
-	
-	FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	cd ${FULLPATH_D}
-	dodir /lib
-	dodir /etc/env.d
-	echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX}
-	if ! build_multiple
-	then
-		dosym /usr/bin/cpp /lib/cpp
-		dosym gcc /usr/bin/cc
-	fi
-
-	#make sure we dont have stuff lying around that
-	#can nuke multiple versions of gcc
-	if [ -z "`use build`" ]
-	then
-		cd ${FULLPATH_D}
-		#move symlinks to compiler-specific dir
-		dispatch_libs libstdc++  4.0.0
-		mv ../../../libsupc++.a libsupc++.a
-		
-		dispatch_libs libgcj     3.0.0
-		dispatch_libs libgcjgc   1.1.0
-		#do not always get created.
-		[ ! -e libgcjgc.so ] && rm -f libgcjgc.so
-		
-		dispatch_libs libg2c     0.0.0
-		mv ../../../libfrtbegin.a libfrtbegin.a
-		
-		mv libobjc* ../../../
-		dispatch_libs libobjc    1.0.0
-		dispatch_libs libobjc_gc 1.0.0
-		#do not always get created.
-		[ ! -e libobjc_gc.so ] && rm -f libobjc_gc.so
-
-		if build_multiple
-		then
-			#move libtool .la files to $FULLPATH till I figure
-			#what to do with them. This needs to be done with
-			#parallel installs, else gcc-2.95 tries to link with
-			#the wrong libs.
-			mv ${D}${LOC}/lib/*.la ${FULLPATH_D}
-		fi
-
-		#move Java headers to compiler-specific dir
-		mv ${D}${LOC}/include/gc*.h ${FULLPATH_D}/include/
-		mv ${D}${LOC}/include/j*.h ${FULLPATH_D}/include/
-		for x in gcj gnu java javax org
-		do
-			mkdir -p ${FULLPATH_D}/include/${x}
-			mv ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/
-			rm -rf ${D}${LOC}/include/${x}
-		done
-
-		#move libgcj.spec to compiler-specific directories
-		mv ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec
-
-		#there is already one with binutils
-		mv ${D}${LOC}/lib/libiberty.a ${FULLPATH_D}/libiberty.a
-
-		#rename jar because it could clash with Kaffe's jar if this gcc is
-		#primary compiler (aka don't have the -<version> extension)
-		cd ${D}${LOC}/bin
-		mv jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
-
-		#move <cxxabi.h> to compiler-specific directories
-		mv ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/
-
-		#now fix the manpages
-		cd ${D}${LOC}/share/man/man1;
-		mv cpp.1 cpp${GCC_SUFFIX}.1
-		mv gcov.1 gcov${GCC_SUFFIX}.1
-	fi
-
-	#move libgcc_s.so.1 to /lib
-	cd ${D}/lib
-	chmod +x ${D}${LOC}/lib/libgcc_s.so.1
-	mv -f ${D}${LOC}/lib/libgcc_s.so.1 libgcc_s-${PV}.so.1
-	ln -sf libgcc_s-${PV}.so.1 libgcc_s.so.1
-	ln -sf libgcc_s.so.1 libgcc_s.so
-	rm -f ${D}${LOC}/lib/libgcc_s.so*
-
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-		cd ${S}
-		docinto /	
-		dodoc BUGS COPYING COPYING.LIB ChangeLog GNATS README* FAQ MAINTAINERS
-		docinto html
-		dodoc *.html
-		cd ${S}/boehm-gc
-		docinto boehm-gc
-		dodoc ChangeLog README*
-		cd ${S}/gcc
-		docinto gcc
-		dodoc ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS ONEWS \
-			README* SERVICE
-	    cd ${S}/fastjar
-	    docinto fastjar
-	    dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
-		cd ${S}/libf2c
-	    docinto libf2c
-	    dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \
-			permission.netlib readme.netlib
-		cd ${S}/libffi
-	    docinto libffi
-	    dodoc ChangeLog* LICENSE README
-		cd ${S}/libjava
-	    docinto libjava
-	    dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-	    cd ${S}/libiberty
-	    docinto libiberty
-	    dodoc ChangeLog COPYING.LIB README
-	    cd ${S}/libobjc
-	    docinto libobjc
-	    dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++-v3
-		docinto libstdc++-v3
-		dodoc ChangeLog* README
-    else
-        rm -rf ${D}/usr/share/{man,info}
-	fi
-}
-
-pkg_postrm() {
-	if [ ! -L ${ROOT}/lib/cpp ]
-	then
-		ln -sf /usr/bin/cpp ${ROOT}/lib/cpp
-	fi
-	if [ ! -L ${ROOT}/usr/bin/cc ]
-	then
-		ln -sf gcc ${ROOT}/usr/bin/cc
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.1-r6.ebuild b/sys-devel/gcc/gcc-3.1.1.ebuild
index 927a300a94d5..6defc7abec14 100644
--- a/sys-devel/gcc/gcc-3.1-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.1.1.ebuild
@@ -12,20 +12,23 @@
 
 inherit libtool
 
-GCC_SUFFIX=-3.1
+MY_PV="`echo ${PV} | cut -d. -f1,2`"
+GCC_SUFFIX=-${MY_PV}
 LOC=/usr
 # dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs
-STDCXX_INCDIR="${LOC}/include/g++-v${PV/\./}"
-SLOT="3.1"
+STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}"
+SLOT="${MY_PV}"
 S=${WORKDIR}/${P}
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
-	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gcc/releases/${P}/${P}.tar.bz2"
+#SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
+#	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gcc/releases/${P}/${P}.tar.bz2"
+SRC_URI="http://www.ibiblio.org/gentoo/distfiles/${P}-20020701.tar.bz2"
 DESCRIPTION="Modern GCC C/C++ compiler"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 
 DEPEND="virtual/glibc"
 RDEPEND="virtual/glibc 
-	>=sys-libs/zlib-1.1.4"
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/texinfo-4.2-r4"
 if [ -z "`use build`" ]
 then
 	DEPEND="${DEPEND}
@@ -45,7 +48,7 @@ build_multiple() {
 	# This is done, as compadibility only differ when major and minor differ.
 	if [ -z "`use build`" ] && \
 	   [ -z "`use bootstrap`" ] && \
-	   [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${PV} | cut -d. -f1,2`" ] && \
+	   [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${MY_PV} | cut -d. -f1,2`" ] && \
 	   [ "${profile/gcc3}" = "${profile}" ] && \
 	   [ "${GCCBUILD}" != "default" ]
 	then
@@ -59,45 +62,52 @@ build_multiple() {
 FAKE_ROOT=""
 
 src_unpack() {
-	unpack ${P}.tar.bz2
+	unpack ${P}-20020701.tar.bz2
 	
 	cd ${S}
 	# Fixup libtool to correctly generate .la files with portage
-	# Only apply the portage patch, and only to ltmain.sh in ${S}/
 	elibtoolize --portage --shallow
 
-	# Red Hat patches
-	for x in gcc31-boehm-gc-libs.patch.bz2 \
-		gcc31-fde-merge-compat.patch.bz2 \
-		gcc31-attr-visibility.patch.bz2 \
-		gcc31-attr-visibility2.patch.bz2 \
-		gcc31-trunc_int_for_mode.patch.bz2 \
-		gcc31-dwarf2-pr6381.patch.bz2 \
-		gcc31-dwarf2-pr6436-test.patch.bz2 \
-		gcc31-c++-null-pm-init.patch.bz2 \
-		gcc31-c++-tsubst-asm.patch.bz2 \
-		gcc31-fdata-sections.patch.bz2 \
-		gcc31-fold-const.patch.bz2 \
-		gcc31-fold-const2.patch.bz2 \
-		gcc31-i386-malign-double-doc.patch.bz2 \
-		gcc31-libstdc++-pr6594.patch.bz2 \
-		gcc31-libstdc++-pr6648.patch.bz2 \
-		gcc31-libstdc++-setrlim.patch.bz2 \
-		gcc31-pr6643.patch.bz2 \
-		gcc31-test-rotate.patch.bz2
+	# Red Hat and Suse patches
+	for x in ${MY_PV}/gcc31-boehm-gc-libs.patch.bz2 \
+	         ${MY_PV}/gcc31-fde-merge-compat.patch.bz2 \
+	         ${MY_PV}/gcc31-attr-visibility.patch.bz2 \
+	         ${PV}/gcc311-attr-visibility2.patch.bz2 \
+	         ${PV}/gcc311-trunc_int_for_mode.patch.bz2 \
+	         ${PV}/gcc311-x86_64-q_regs_operand.patch.bz2 \
+	         ${MY_PV}/gcc31-dwarf2-pr6436-test.patch.bz2 \
+	         ${PV}/gcc311-c++-pretty_function.patch.bz2 \
+	         ${PV}/gcc311-c++-tsubst-asm.patch.bz2 \
+	         ${PV}/gcc311-i386-memtest-test.patch.bz2 \
+	         ${MY_PV}/gcc31-fold-const2.patch.bz2 \
+	         ${PV}/gcc311-ada-addr2line.patch.bz2 \
+	         ${PV}/gcc311-ada-link.patch.bz2 \
+	         ${PV}/gcc311-java-no-rpath.patch.bz2 \
+	         ${MY_PV}/gcc31-test-rotate.patch.bz2 \
+	         ${PV}/gcc311-x86_64-libiberty-pic.patch.bz2 \
+	         ${PV}/gcc311-test-rh65771.patch.bz2 \
+	         ${PV}/gcc311-i386-default-momit-leaf-frame-pointer.patch.bz2 \
+	         ${PV}/gcc311-i386-profile-olfp.patch.bz2 \
+	         ${PV}/gcc311-i386-pic-label-thunk.patch.bz2 \
+	         ${PV}/gcc311-pr6842.patch.bz2 \
+			 ${PV}/gcc311-tree-code.patch.bz2 \
+			 ${PV}/gcc311-hard-reg-sharing.patch.bz2 \
+	         ${PV}/gcc311-x86_64-addr-diff.patch.bz2 \
+	         ${PV}/gcc311-x86_64-profile.patch.bz2 \
+	         ${PV}/gcc311-x86_64-biarch.patch.bz2
 	do
-		bzip2 -dc ${FILESDIR}/${PV}/${x} | \
+		bzip2 -dc ${FILESDIR}/${x} | \
 			patch -p0 || die "failed with patch ${x}"
+		echo &>${T}/foo
 	done
-	
-	# SuSE patches
-	bzip2 -dc ${FILESDIR}/${PV}/gcc31-i386-expand-clrstr.patch.bz2 | \
-		patch -p1 || die "failed with patch gcc31-i386-expand-clrstr"
+# Missing patches, should be after gcc31-pr6842.patch.bz2
+#
+#            gcc31-tls.patch.bz2 \
 
 	# Mandrake patches
 	# cp/lex.c (cxx_init_options): By default, don't wrap lines since the
 	# C front-end operates that way, already.
-	bzip2 -dc ${FILESDIR}/${PV}/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 | \
+	bzip2 -dc ${FILESDIR}/${MY_PV}/gcc31-c++-diagnostic-no-line-wrapping.patch.bz2 | \
 		patch -p1 || die "failed with patch gcc31-c++-diagnostic-no-line-wrapping"
 
 	# Currently if any path is changed via the configure script, it breaks
@@ -122,8 +132,6 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	# use the system zlib!!!
-	myconf="--with-system-zlib"
 	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
@@ -153,9 +161,8 @@ src_compile() {
 	export CXXFLAGS="${CXXFLAGS/-O?/}"
 
 	#build in a separate build tree
-	cd ${WORKDIR}
-	mkdir build
-	cd build
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
 
 	addwrite "/dev/zero"
 	${S}/configure --prefix=${LOC} \
@@ -165,45 +172,34 @@ src_compile() {
 		--host=${CHOST} \
 		--build=${CHOST} \
 		--target=${CHOST} \
+		--with-system-zlib \
 		--enable-threads=posix \
 		--enable-long-long \
+		--disable-checking \
 		--enable-cstdio=stdio \
 		--enable-clocale=generic \
-		--disable-checking \
+		--enable-version-specific-runtime-libs \
 		--with-gxx-include-dir=${STDCXX_INCDIR} \
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
+	touch ${S}/gcc/c-gperf.h
+
 	if [ -z "`use static`" ]
 	then
+		#fix for our libtool-portage.patch
+		S="${WORKDIR}/build" \
 		emake bootstrap-lean || die
 	else
+		S="${WORKDIR}/build" \
 		emake LDFLAGS=-static bootstrap || die
 	fi
 }
 
-#thanks to mandrake for this function
-dispatch_libs() {
-	libname=$1 libversion=$2
-	rm -f $libname.so $libname.a
-
-	if build_multiple
-	then
-	# If we have multiple versions of GCC, leave libraries in $FULLPATH
-		chmod 0755 ../../../$libname.so.$libversion
-		ln -s ../../../$libname.so.$libversion $libname.so
-		rm -f ../../../$libname.so
-		cp -f ../../../$libname.a $libname.a
-		rm -f ../../../$libname.a
-	else
-		ln -sf ../../../$libname.so $libname.so
-		ln -sf ../../../$libname.a $libname.a
-	fi
-}
-
 src_install() {
 	#make install from the build directory
 	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
 	make prefix=${D}${LOC} \
 		mandir=${D}${LOC}/share/man \
 		infodir=${D}${LOC}/share/info \
@@ -229,37 +225,37 @@ src_install() {
 		dosym gcc /usr/bin/cc
 	fi
 
+	# gcc-3.1 have a problem with the ordering of Search Directories.  For
+	# instance, if you have libreadline.so in /lib, and libreadline.a in
+	# /usr/lib, then it will link with libreadline.a instead of .so.  As far
+	# as I can see from the source, /lib should be searched before /usr/lib,
+	# and this also differs from gcc-2.95.3 and possibly 3.0.4, but ill have
+	# to check on 3.0.4.  Thanks to Daniel Robbins for noticing this oddity,
+	# bugzilla bug #4411
+	#
+	# Azarah - 3 Jul 2002
+	#
+	cd ${FULLPATH_D}
+	dosed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" \
+		${FULLPATH}/specs
+
 	#make sure we dont have stuff lying around that
 	#can nuke multiple versions of gcc
 	if [ -z "`use build`" ]
 	then
 		cd ${FULLPATH_D}
-		#move symlinks to compiler-specific dir
-		dispatch_libs libstdc++  4.0.0
-		mv ../../../libsupc++.a libsupc++.a
-		
-		dispatch_libs libgcj     3.0.0
-		dispatch_libs libgcjgc   1.1.0
-		#do not always get created.
-		[ ! -e libgcjgc.so ] && rm -f libgcjgc.so
-		
-		dispatch_libs libg2c     0.0.0
-		mv ../../../libfrtbegin.a libfrtbegin.a
-		
-		mv libobjc* ../../../
-		dispatch_libs libobjc    1.0.0
-		dispatch_libs libobjc_gc 1.0.0
-		#do not always get created.
-		[ ! -e libobjc_gc.so ] && rm -f libobjc_gc.so
-
-		if build_multiple
-		then
-			#move libtool .la files to $FULLPATH till I figure
-			#what to do with them. This needs to be done with
-			#parallel installs, else gcc-2.95 tries to link with
-			#the wrong libs.
-			mv ${D}${LOC}/lib/*.la ${FULLPATH_D}
-		fi
+
+		#Tell libtool files where real libraries are
+		for LA in ${D}${LOC}/lib/*.la ${FULLPATH_D}/../*.la
+		do
+			sed -e "s:/usr/lib:${FULLPATH}:" ${LA} > ${LA}.hacked
+			mv ${LA}.hacked ${LA}
+			mv ${LA} ${FULLPATH_D}
+		done
+
+		#move all the libraries to version specific libdir.
+		mv ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}* \
+			${FULLPATH_D}
 
 		#move Java headers to compiler-specific dir
 		mv ${D}${LOC}/include/gc*.h ${FULLPATH_D}/include/
@@ -274,9 +270,6 @@ src_install() {
 		#move libgcj.spec to compiler-specific directories
 		mv ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec
 
-		#there is already one with binutils
-		mv ${D}${LOC}/lib/libiberty.a ${FULLPATH_D}/libiberty.a
-
 		#rename jar because it could clash with Kaffe's jar if this gcc is
 		#primary compiler (aka don't have the -<version> extension)
 		cd ${D}${LOC}/bin
@@ -291,25 +284,23 @@ src_install() {
 		mv gcov.1 gcov${GCC_SUFFIX}.1
 	fi
 
-	#move libgcc_s.so.1 to /lib
-	cd ${D}/lib
-	chmod +x ${D}${LOC}/lib/libgcc_s.so.1
-	mv -f ${D}${LOC}/lib/libgcc_s.so.1 libgcc_s-${PV}.so.1
-	ln -sf libgcc_s-${PV}.so.1 libgcc_s.so.1
-	ln -sf libgcc_s.so.1 libgcc_s.so
-	rm -f ${D}${LOC}/lib/libgcc_s.so*
-	
+	#this one comes with binutils
+	if [ -f ${D}${LOC}/lib/libiberty.a ]
+	then
+		rm -f ${D}${LOC}/lib/libiberty.a
+	fi
+
 	cd ${S}
     if [ -z "`use build`" ]
     then
 		cd ${S}
 		docinto /	
-		dodoc BUGS COPYING COPYING.LIB ChangeLog GNATS README* FAQ MAINTAINERS
-		docinto html
-		dodoc *.html
+		dodoc COPYING COPYING.LIB ChangeLog LAST_UPDATED README MAINTAINERS
 		cd ${S}/boehm-gc
 		docinto boehm-gc
-		dodoc ChangeLog README*
+		dodoc ChangeLog doc/{README*,barrett_diagram}
+		docinto boehm-gc/html
+		dohtml doc/*.html
 		cd ${S}/gcc
 		docinto gcc
 		dodoc ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS ONEWS \
@@ -355,7 +346,6 @@ pkg_postrm() {
 	fi
 	
 	# Fix ncurses b0rking (if r5 isn't unmerged)
-        find /usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
-
+	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
 }