Added 3.0.4 and removed all earlier 3.0.x ebuilds. I still need to

add the Mandrake and RH patches, but those can wait for now.  This
package will still be package-masked because, at least for now, it
will clobber the 2.95x series gcc.

12 files changed, 20 insertions, 700 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index abc7458b577c..1dcc6329bfec 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,7 +1,16 @@
 # 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.1 2002/02/01 21:53:38 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.2 2002/03/01 16:15:04 g2boojum Exp $
 
+*gcc-3.0.4 (1 Mar 2002)
+
+  1 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Added 3.0.4.  It looks like using the --disable-checks
+  command fixes most of the sandbox violations that we had
+  with 3.0.3 (or 3.0.4 no longer tries to update system
+  headers; I'm not sure which).
+  
 *gcc-2.95.3-r5 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/sys-devel/gcc/files/digest-gcc-3.0 b/sys-devel/gcc/files/digest-gcc-3.0
deleted file mode 100644
index 2ae815952170..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 145e82e04d286f60f7e55b5dbe567732 gcc-3.0.tar.gz 17921956
-MD5 906124171f15ee1585d840ed7d174009 libg++-2.8.1.3-20000312.diff.gz 541
-MD5 47b93312badd9550ccb7d113bbf0242a libg++-2.8.1.3-20000419.diff.gz 2146
-MD5 9e00e62b8fb7af3e41364b7c6d9f4cf8 libg++-2.8.1.3-20000816.diff.gz 489
-MD5 625dd5a953661b901c876f92c2c5e7a6 libg++-2.8.1.3-20000914.diff.gz 3065
-MD5 2826dbbd081646c459b1774145ffd7bf libg++-2.8.1.3.tar.gz 697961
diff --git a/sys-devel/gcc/files/digest-gcc-3.0.0.20010514 b/sys-devel/gcc/files/digest-gcc-3.0.0.20010514
deleted file mode 100644
index 8b00d9608aba..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.0.0.20010514
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b63cb2ee094d67268edd61ccf1b9f08d gcc-20010514.tar.gz 16469286
-MD5 906124171f15ee1585d840ed7d174009 libg++-2.8.1.3-20000312.diff.gz 541
-MD5 47b93312badd9550ccb7d113bbf0242a libg++-2.8.1.3-20000419.diff.gz 2146
-MD5 9e00e62b8fb7af3e41364b7c6d9f4cf8 libg++-2.8.1.3-20000816.diff.gz 489
-MD5 625dd5a953661b901c876f92c2c5e7a6 libg++-2.8.1.3-20000914.diff.gz 3065
-MD5 2826dbbd081646c459b1774145ffd7bf libg++-2.8.1.3.tar.gz 697961
diff --git a/sys-devel/gcc/files/digest-gcc-3.0.0.20010521 b/sys-devel/gcc/files/digest-gcc-3.0.0.20010521
deleted file mode 100644
index 1b6bfa4b9f16..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.0.0.20010521
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f4a59afcd267d57f442c980836e59837 gcc-20010521.tar.gz 16521999
-MD5 906124171f15ee1585d840ed7d174009 libg++-2.8.1.3-20000312.diff.gz 541
-MD5 47b93312badd9550ccb7d113bbf0242a libg++-2.8.1.3-20000419.diff.gz 2146
-MD5 9e00e62b8fb7af3e41364b7c6d9f4cf8 libg++-2.8.1.3-20000816.diff.gz 489
-MD5 625dd5a953661b901c876f92c2c5e7a6 libg++-2.8.1.3-20000914.diff.gz 3065
-MD5 2826dbbd081646c459b1774145ffd7bf libg++-2.8.1.3.tar.gz 697961
diff --git a/sys-devel/gcc/files/digest-gcc-3.0.2 b/sys-devel/gcc/files/digest-gcc-3.0.2
deleted file mode 100644
index 60b3798139f1..000000000000
--- a/sys-devel/gcc/files/digest-gcc-3.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 129edec1d543d0ca1aeedaf4b49e8d45 gcc-3.0.2.tar.gz 18226089
-MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz 1133487
diff --git a/sys-devel/gcc/files/digest-gcc-3.0.3-r1 b/sys-devel/gcc/files/digest-gcc-3.0.3-r1
new file mode 100644
index 000000000000..6647e65b94bc
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.0.3-r1
@@ -0,0 +1,2 @@
+MD5 074e564d4645a7f8864d8ab084c61d68 gcc-3.0.3.tar.gz 18382848
+MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz 1138688
diff --git a/sys-devel/gcc/files/digest-gcc-3.0.3 b/sys-devel/gcc/files/digest-gcc-3.0.4
index 90005a5b7c20..8ffcce370b4b 100644
--- a/sys-devel/gcc/files/digest-gcc-3.0.3
+++ b/sys-devel/gcc/files/digest-gcc-3.0.4
@@ -1,2 +1,2 @@
-MD5 074e564d4645a7f8864d8ab084c61d68 gcc-3.0.3.tar.gz 18355172
+MD5 1e7ecec7e616d85cdec2d627bac3bf9b gcc-3.0.4.tar.bz2 14154365
 MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz 1133487
diff --git a/sys-devel/gcc/gcc-3.0.0.20010514.ebuild b/sys-devel/gcc/gcc-3.0.0.20010514.ebuild
deleted file mode 100644
index f4a92404725a..000000000000
--- a/sys-devel/gcc/gcc-3.0.0.20010514.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.0.20010514.ebuild,v 1.3 2001/12/07 21:10:04 drobbins Exp $
-
-
-SRC_URI="ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/2001-05-14/gcc-20010514.tar.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3.tar.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000312.diff.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000419.diff.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000816.diff.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000914.diff.gz"
-
-S=${WORKDIR}/${PN}-20010514
-TARG=/usr
-
-DESCRIPTION="Modern GCC C/C++ compiler"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-if [ -z "`use build`" ] ; then
-  if [ "`use bootstrap`" ] ; then
-	DEPEND="nls? ( sys-devel/gettext )"
-  else
-	DEPEND="nls? ( sys-devel/gettext ) sys-apps/texinfo"
-  fi
-fi
-
-
-src_unpack() {
-
-    unpack gcc-20010514.tar.gz
-
-    if [ "`use libg++`" ]
-    then
-      unpack libg++-2.8.1.3.tar.gz
-      cd ${S}/../libg++-2.8.1.3
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000312.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000419.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000816.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000914.diff.gz | patch -p1
-      cd ${S}
-      mv ../libg++-2.8.1.3/* .
-      rmdir ../libg++-2.8.1.3
-    fi
-
-    cd ${S}
-
-    # We do not build the included texinfo stuff
-    if [ -z "`use build`" ]
-    then 
-      rm -rf texinfo
-    fi
-}
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use build`" ]
-    then
-        myconf="--enable-shared --enable-languages=c,c++,f77,java,objc"
-    else
-        myconf="--enable-languages=c"
-    fi
-    if [ "`use nls`" ]
-    then
-	if [ "`use build`" ] ; then
-          myconf="${myconf} --with-included-gettext --enable-nls"
-	else
-          myconf="${myconf} --enable-nls"
-	fi
-    else
-        myconf="${myconf} --disable-nls"
-    fi
-
-    # gcc does not like optimization
-
-    export CFLAGS="${CFLAGS/-O?/}"
-    export CXXFLAGS="${CXXFLAGS/-O?/}"
-    mkdir build
-    cd build
-    try ${S}/configure --prefix=${TARG} --mandir=${TARG}/share/man --infodir=${TARG}/share/info \
-                --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads  \
-                --with-local-prefix=${TARG}/local ${myconf} \
-                --enable-version-specific-runtime-libs 
-	# Parallel build does not work
-    if [ -z "`use static`" ]
-    then
-	    try make bootstrap-lean
-    else
-        try make LDFLAGS=-static bootstrap-lean
-    fi
-#    if [ "`use build`" ]
-#    then
-#        cd ${S}/texinfo/util
-#        make texindex install-info
-#    fi
-}
-
-src_install() {
-    cd build
-	try make install prefix=${D}${TARG} mandir=${D}${TARG}/share/man infodir=${D}${TARG}/share/info
-
-    FULLPATH=${D}${TARG}/lib/gcc-lib/${CHOST}/3.0
-	cd ${FULLPATH}
-	dodir /lib
-	dosym	${TARG}/lib/gcc-lib/${CHOST}/3.0/cpp0 /lib/cpp
-	dosym   /usr/bin/gcc /usr/bin/cc
-	dodir /etc/env.d
-	echo "LDPATH=${TARG}/lib/gcc-lib/${CHOST}/3.0" > ${D}/etc/env.d/05gcc
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-	    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*
-
-        if [ "`use libg++`" ]
-        then
-            cd ${S}/libg++
-	        docinto libg++
-	        dodoc ChangeLog g++FAQ.txt NEWS README* TODO
-        else
-            cd ${S}/libstdc++
-	        docinto libstdc++
-            dodoc ChangeLog NEWS
-        fi
-    else
-        rm -rf ${D}/usr/share/{man,info}
-        #cd texinfo
-        #dobin makeinfo/makeinfo util/texi2dvi util/install-info util/texindex
-    fi
-
-}
-
-
-
-
-
diff --git a/sys-devel/gcc/gcc-3.0.0.20010521.ebuild b/sys-devel/gcc/gcc-3.0.0.20010521.ebuild
deleted file mode 100644
index bfd8aee375b0..000000000000
--- a/sys-devel/gcc/gcc-3.0.0.20010521.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.0.20010521.ebuild,v 1.3 2001/12/07 21:10:04 drobbins Exp $
-
-
-SRC_URI="ftp://egcs.cygnus.com/pub/egcs/snapshots/2001-05-21/gcc-20010521.tar.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3.tar.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000312.diff.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000419.diff.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000816.diff.gz
-    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000914.diff.gz"
-
-S=${WORKDIR}/${PN}-20010521
-TARG=/usr
-
-DESCRIPTION="Modern GCC C/C++ compiler"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-if [ -z "`use build`" ] ; then
-  if [ "`use bootstrap`" ] ; then
-	DEPEND="nls? ( sys-devel/gettext )"
-  else
-	DEPEND="nls? ( sys-devel/gettext ) sys-apps/texinfo"
-  fi
-fi
-
-
-src_unpack() {
-
-    unpack gcc-20010521.tar.gz
-
-    if [ "`use libg++`" ]
-    then
-      unpack libg++-2.8.1.3.tar.gz
-      cd ${S}/../libg++-2.8.1.3
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000312.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000419.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000816.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000914.diff.gz | patch -p1
-      cd ${S}
-      mv ../libg++-2.8.1.3/* .
-      rmdir ../libg++-2.8.1.3
-    fi
-
-    cd ${S}
-
-    # We do not build the included texinfo stuff
-    if [ -z "`use build`" ]
-    then 
-      rm -rf texinfo
-    fi
-}
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use build`" ]
-    then
-        myconf="--enable-languages=c,c++,f77,java,objc"
-    else
-        myconf="--enable-languages=c"
-    fi
-    if [ "`use nls`" ]
-    then
-	if [ "`use build`" ] ; then
-          myconf="${myconf} --with-included-gettext --enable-nls"
-	else
-          myconf="${myconf} --enable-nls"
-	fi
-    else
-        myconf="${myconf} --disable-nls"
-    fi
-
-    # gcc does not like optimization
-
-    export CFLAGS="${CFLAGS/-O?/}"
-    export CXXFLAGS="${CXXFLAGS/-O?/}"
-    mkdir build
-    cd build
-    try ${S}/configure --prefix=${TARG} --mandir=${TARG}/share/man --infodir=${TARG}/share/info \
-                --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads  \
-                --with-local-prefix=${TARG}/local ${myconf} \
-                --enable-version-specific-runtime-libs 
-	# Parallel build does not work
-    if [ -z "`use static`" ]
-    then
-	    try make bootstrap-lean
-    else
-        try make LDFLAGS=-static bootstrap-lean
-    fi
-#    if [ "`use build`" ]
-#    then
-#        cd ${S}/texinfo/util
-#        make texindex install-info
-#    fi
-}
-
-src_install() {
-    cd build
-	try make install prefix=${D}${TARG} mandir=${D}${TARG}/share/man infodir=${D}${TARG}/share/info
-
-    FULLPATH=${D}${TARG}/lib/gcc-lib/${CHOST}/3.0
-	cd ${FULLPATH}
-	dodir /lib
-	dosym	${TARG}/lib/gcc-lib/${CHOST}/3.0/cpp0 /lib/cpp
-	dosym   /usr/bin/gcc /usr/bin/cc
-	dodir /etc/env.d
-	echo "LDPATH=${TARG}/lib/gcc-lib/${CHOST}/3.0" > ${D}/etc/env.d/05gcc
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-	    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*
-
-        if [ "`use libg++`" ]
-        then
-            cd ${S}/libg++
-	        docinto libg++
-	        dodoc ChangeLog g++FAQ.txt NEWS README* TODO
-        else
-            cd ${S}/libstdc++
-	        docinto libstdc++
-            dodoc ChangeLog NEWS
-        fi
-    else
-        rm -rf ${D}/usr/share/{man,info}
-        #cd texinfo
-        #dobin makeinfo/makeinfo util/texi2dvi util/install-info util/texindex
-    fi
-
-}
-
-
-
-
-
diff --git a/sys-devel/gcc/gcc-3.0.2.ebuild b/sys-devel/gcc/gcc-3.0.2.ebuild
deleted file mode 100644
index 83b5fc280519..000000000000
--- a/sys-devel/gcc/gcc-3.0.2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.2.ebuild,v 1.4 2001/11/24 18:40:50 drobbins 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"
-
-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
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	#Looks like the commented-out patch has been incorporated.
-	# 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
-	#hack, because texinfo different in gcc 3.0+
-	mkdir ${S}/texinfo
-	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?/}"
-
-	#build in a separate build tree
-	cd ${WORKDIR}
-	mkdir build
-	cd build
-
-	${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 from the build directory
-	cd ${WORKDIR}/build
-	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 ${WORKDIR}/build/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}/libffi
-	    docinto libffi
-	    dodoc ChangeLog* LICENSE README
-            cd ${S}/libjava
-	    docinto libjava
-	    dodoc ChangeLog* COPYING LIBGJC_LICENSE README THANKS
-	    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 ${WORKDIR}/build/texinfo
-		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
-	fi
-}
diff --git a/sys-devel/gcc/gcc-3.0.3.ebuild b/sys-devel/gcc/gcc-3.0.4.ebuild
index ec29886f01a2..89a76278d6ab 100644
--- a/sys-devel/gcc/gcc-3.0.3.ebuild
+++ b/sys-devel/gcc/gcc-3.0.4.ebuild
@@ -1,10 +1,11 @@
 # 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>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.3.ebuild,v 1.1 2001/12/22 05:10:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.4.ebuild,v 1.1 2002/03/01 16:15:04 g2boojum Exp $
 
 TV=4.0
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
+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
 	ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-${TV}.tar.gz"
 
 S=${WORKDIR}/${P}
@@ -22,7 +23,7 @@ then
 fi
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${P}.tar.bz2
 	cd ${S}
 	# Now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
 	cd ${S}
@@ -62,8 +63,10 @@ src_compile() {
 	mkdir build
 	cd build
 
+	addwrite "/dev/zero"
 	${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  \
+	--enable-shared --host=${CHOST} --build=${CHOST} --target=${CHOST} \
+	--enable-threads=posix --disable-checking  \
 	--with-local-prefix=${LOC}/local ${myconf} || die
 
 	if [ -z "`use static`" ]
diff --git a/sys-devel/gcc/gcc-3.0.ebuild b/sys-devel/gcc/gcc-3.0.ebuild
deleted file mode 100644
index 50837da4a980..000000000000
--- a/sys-devel/gcc/gcc-3.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.ebuild,v 1.6 2001/12/07 21:10:04 drobbins Exp $
-
-
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
-	ftp://ftp.gnu.org/pub/gnu/gcc/${P}/${P}.tar.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3.tar.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000312.diff.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000419.diff.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000816.diff.gz
-	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000914.diff.gz"
-
-S=${WORKDIR}/${P}
-TARG=/usr
-
-DESCRIPTION="Modern GCC C/C++ compiler"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-if [ -z "`use build`" ] ; then
-  if [ "`use bootstrap`" ] ; then
-	DEPEND="nls? ( sys-devel/gettext )"
-  else
-	DEPEND="nls? ( sys-devel/gettext ) sys-apps/texinfo"
-  fi
-fi
-
-src_unpack() {
-
-    unpack ${P}.tar.gz
-
-    if [ "`use libg++`" ]
-    then
-      unpack libg++-2.8.1.3.tar.gz
-      cd ${S}/../libg++-2.8.1.3
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000312.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000419.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000816.diff.gz | patch -p1
-      gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000914.diff.gz | patch -p1
-      cd ${S}
-      mv ../libg++-2.8.1.3/* .
-      rmdir ../libg++-2.8.1.3
-    fi
-
-    cd ${S}
-    # We do not build the included texinfo stuff
-    if [ -z "`use build`" ]
-    then
-      echo "texinfo no longer included"
-    fi
-}
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use build`" ]
-    then
-        myconf="--enable-shared"
-    else
-        myconf="--enable-languages=c"
-    fi
-    if [ "`use nls`" ]
-    then
-	if [ "`use build`" ] ; then
-          myconf="${myconf} --with-included-gettext --enable-nls"
-	else
-          myconf="${myconf} --enable-nls"
-	fi
-    else
-        myconf="${myconf} --disable-nls"
-    fi
-
-    # gcc does not like optimization
-
-    export CFLAGS="${CFLAGS/-O?/}"
-    export CXXFLAGS="${CXXFLAGS/-O?/}"
-
-
-	try ${S}/configure --prefix=${TARG} --mandir=${TARG}/share/man --infodir=${TARG}/share/info \
-                --enable-version-specific-runtime-libs \
-                --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads  \
-                --with-local-prefix=${TARG}/local ${myconf}
-
-	# Parallel build does not work
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS} bootstrap-lean
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static bootstrap
-    fi
-#    if [ "`use build`" ]
-#    then
-#        cd ${S}/texinfo/util
-#        make texindex install-info
-#    fi
-}
-
-src_install() {
-
-    mkdir ${CHOST}
-    cp mkinstalldirs ${CHOST}
-	try make install prefix=${D}${TARG} mandir=${D}${TARG}/share/man infodir=${D}${TARG}/share/info
-    cd ${D}/usr/lib/gcc-lib/${CHOST}
-    mv lib* ${D}/usr/lib
-    mv include/* ${D}/usr/include
-    rm -rf include
-    FULLPATH=${D}${TARG}/lib/gcc-lib/${CHOST}/${PV}
-	cd ${FULLPATH}
-	dodir /lib
-	dosym	/usr/bin/cpp /lib/cpp
-	dosym   /usr/bin/gcc /usr/bin/cc
-	dodir /etc/env.d
-	echo "LDPATH=${TARG}/lib/gcc-lib/${CHOST}/${PV}" > ${D}/etc/env.d/05gcc3
-	cd ${S}
-    if [ -z "`use build`" ]
-    then
-	    dodoc BUGS ChangeLog COPYING COPYING.LIB GNATS README* FAQ MAINTAINERS
-	    docinto html
-	    dodoc *.html
-
-            cd ${S}/boehm-gc
-	    docinto hoehm-gc
-	    dodoc ChangeLog README*
-
-	    docinto gcc
-	    cd ${S}/gcc
-	    dodoc ABOUT-GCC-NLS ChangeLog* COPYING* FSFChangeLog* \
-	        LANGUAGES NEWS PROBLEMS README* \
-	        SERVICE
-
-	    cd ${S}/libf2c
-	    docinto libf2c
-	    dodoc ChangeLog *.netlib README TODO
-
-            cd ${S}/libffi
-	    docinto libffi
-	    dodoc ChangeLog* LICENSE README
-
-	    cd ${S}/libiberty
-	    docinto libiberty
-	    dodoc ChangeLog COPYING.LIB README
-
-            cd ${S}/libjava
-	    docinto libjava
-	    dodoc ChangeLog* COPYING LIBGJC_LICENSE README THANKS
-
-	    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*
-
-        if [ "`use libg++`" ]
-        then
-            cd ${S}/libg++
-	        docinto libg++
-	        dodoc ChangeLog g++FAQ.txt NEWS README* TODO
-        else
-            cd ${S}/libstdc++-v3
-	        docinto libstdc++
-            dodoc ChangeLog* README
-        fi
-    else
-        rm -rf ${D}/usr/share/{man,info}
- #       cd texinfo
- #       dobin makeinfo/makeinfo util/texi2dvi util/install-info util/texindex
-    fi
-
-}
-
-
-
-
-