8 files changed, 0 insertions, 4828 deletions
diff --git a/sys-devel/gcc/gcc-3.3.2-r2.ebuild b/sys-devel/gcc/gcc-3.3.2-r2.ebuild
deleted file mode 100644
index 4740d300bd1b..000000000000
--- a/sys-devel/gcc/gcc-3.3.2-r2.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r2.ebuild,v 1.22 2005/01/18 06:15:01 eradicator Exp $
-
-IUSE="static nls bootstrap java build X multilib emul-linux-x86"
-
-inherit eutils flag-o-matic libtool versionator
-
-# Compile problems with these (bug #6641 among others)...
-#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
-
-# Recently there has been a lot of stability problem in Gentoo-land.  Many
-# things can be the cause to this, but I believe that it is due to gcc3
-# still having issues with optimizations, or with it not filtering bad
-# combinations (protecting the user maybe from himeself) yet.
-#
-# This can clearly be seen in large builds like glibc, where too aggressive
-# CFLAGS cause the tests to fail miserbly.
-#
-# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-# knows what he is talking about:
-#
-#   People really shouldn't force code-specific options on... It's a
-#   bad idea. The -march options aren't just to look pretty. They enable
-#   options that are sensible (and include sse,mmx,3dnow when apropriate).
-#
-# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-# you do not like it, comment it, but do not bugreport if you run into
-# problems.
-#
-# <azarah@gentoo.org> (13 Oct 2002)
-strip-flags
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
-
-# ProPolice version
-PP_VER="3_3"
-PP_FVER="${PP_VER//_/.}-5"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.0"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT=
-
-# Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20021208"
-BRANCH_UPDATE="20031022"
-
-if [ -z "${SNAPSHOT}" ]
-then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
-
-	if [ -n "${PATCH_VER}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-else
-	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
-		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-manpages.tar.bz2"
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-* ~x86 ~mips ~sparc amd64 -hppa alpha ia64"
-
-# Ok, this is a hairy one again, but lets assume that we
-# are not cross compiling, than we want SLOT to only contain
-# $PV, as people upgrading to new gcc layout will not have
-# their old gcc unmerged ...
-SLOT="3.3"
-
-# We need the later binutils for support of the new cleanup attribute.
-# 'make check' fails for about 10 tests (if I remember correctly) less
-# if we use later bison.
-DEPEND="virtual/libc
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.1
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-PDEPEND="sys-devel/gcc-config"
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-version_patch() {
-	[ ! -f "$1" ] && return 1
-	[ -z "$2" ] && return 1
-
-	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
-}
-
-src_unpack() {
-	if [ -z "${SNAPSHOT}" ]
-	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
-
-		if [ -n "${PATCH_VER}" ]
-		then
-			unpack ${P}-patches-${PATCH_VER}.tar.bz2
-		fi
-	else
-		unpack gcc-${SNAPSHOT//-}.tar.bz2
-	fi
-
-	if [ -n "${PP_VER}" ]
-	then
-		unpack protector-${PP_FVER}.tar.gz
-	fi
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	echo
-
-	# Branch update ...
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-	if [ -n "${PATCH_VER}" ]
-	then
-		mkdir -p ${WORKDIR}/patch/exclude
-		mv -f ${WORKDIR}/patch/{40,41}* ${WORKDIR}/patch/exclude/
-
-		if use multilib && [ "${ARCH}" = "amd64" ]
-		then
-			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
-			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
-				${WORKDIR}/patch/06_amd64_gcc331-use-multilib.patch.bz2
-		fi
-
-		epatch ${WORKDIR}/patch
-	fi
-
-	if [ -z "${PP_VER}" ]
-	then
-		# Make gcc's version info specific to Gentoo
-	 	version_patch ${FILESDIR}/3.3.2/gcc332-gentoo-branding.patch \
-			"${BRANCH_UPDATE} (Gentoo Linux ${PVR})" || die "Failed Branding"
-	fi
-
-	if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ]
-	then
-		# ProPolice Stack Smashing protection
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
-		epatch ${WORKDIR}/protector.dif
-		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-		version_patch ${FILESDIR}/3.3.2/gcc332-gentoo-branding.patch \
-			"${BRANCH_UPDATE} (Gentoo Linux ${PVR}, propolice)" \
-			|| die "Failed Branding"
-	fi
-
-	# Install our pre generated manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		cd ${S}; unpack ${P}-manpages.tar.bz2
-	fi
-
-	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
-
-src_compile() {
-
-	local myconf=
-	local gcc_lang=
-
-	if ! use build
-	then
-		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++,f77,objc"
-	else
-		gcc_lang="c"
-	fi
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-	if use java && ! use build
-	then
-		gcc_lang="${gcc_lang},java"
-	fi
-
-	# Enable building of the gcj Java AWT & Swing X11 backend
-	# if we have X as a use flag and are not in a build stage.
-	# X11 support is still very experimental but enabling it is
-	# quite innocuous...  [No, gcc is *not* linked to X11...]
-	# <dragon@gentoo.org> (15 May 2003)
-	if use java && use X && ! use build && [ -f /usr/X11R6/include/X11/Xlib.h ]
-	then
-		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
-	fi
-
-	# Multilib not yet supported
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		einfo "WARNING: Multilib support enabled. This is still experimental."
-		myconf="${myconf} --enable-multilib"
-	else
-		if [ "${ARCH}" = "amd64" ]
-		then
-			einfo "WARNING: Multilib not enabled. You will not be able to build 32bit binaries."
-		fi
-		myconf="${myconf} --disable-multilib"
-	fi
-
-	#Fix linking problem with c++ apps which where linked agains a 3.2.2 libgcc
-	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc-3.3 ...
-	export CFLAGS="${CFLAGS/-O?/-O2}"
-	export CXXFLAGS="${CXXFLAGS/-O?/-O2}"
-	export GCJFLAGS="${CFLAGS/-O?/-O2}"
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	einfo "Configuring GCC..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=${gcc_lang} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--enable-cstdio=stdio \
-		--enable-clocale=generic \
-		--enable-__cxa_atexit \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Do not make manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		find ${S} -name '*.[17]' -exec touch {} \; || :
-	fi
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Building GCC..."
-	# Only build it static if we are just building the C frontend, else
-	# a lot of things break because there are not libstdc++.so ....
-	if use static && [ "${gcc_lang}" = "c" ]
-	then
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake LDFLAGS="-static" bootstrap \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-		# Above FLAGS optimize and speedup build, thanks
-		# to Jeff Garzik <jgarzik@mandrakesoft.com>
-	else
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake bootstrap-lean \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-
-	fi
-}
-
-src_install() {
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in cd ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install || die
-
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# amd64 is a bit unique because of multilib.  Add some other paths
-		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	else
-		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	fi
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${LOC}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${LOC}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${LOC}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			rm -f ${CCHOST}-${x}
-			[ -f "${x}" ] && ln -sf ${x} ${CCHOST}-${x}
-
-			if [ -f "${CCHOST}-${x}-${PV}" ]
-			then
-				rm -f ${CCHOST}-${x}-${PV}
-				ln -sf ${x} ${CCHOST}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	if [ -f "${D}${LOC}/lib/libiberty.a" ]
-	then
-		rm -f ${D}${LOC}/lib/libiberty.a
-	fi
-
-	cd ${S}
-	if ! use build
-	then
-		cd ${S}
-		docinto /${CCHOST}
-		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
-		docinto ${CCHOST}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CCHOST}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CCHOST}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CCHOST}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		cd ${S}/libf2c
-		docinto ${CCHOST}/libf2c
-		dodoc ChangeLog* README TODO *.netlib
-		cd ${S}/libffi
-		docinto ${CCHOST}/libffi
-		dodoc ChangeLog* LICENSE README
-		cd ${S}/libiberty
-		docinto ${CCHOST}/libiberty
-		dodoc ChangeLog* COPYING.LIB README
-		cd ${S}/libobjc
-		docinto ${CCHOST}/libobjc
-		dodoc ChangeLog* README* THREADS*
-		cd ${S}/libstdc++-v3
-		docinto ${CCHOST}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CCHOST}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use java
-		then
-			cd ${S}/fastjar
-			docinto ${CCHOST}/fastjar
-			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CCHOST}/libjava
-			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
-	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
-
-	# Fix ncurses b0rking
-	find ${D}/ -name '*curses.h' -exec rm -f {} \;
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# If using multilib, GCC has a bug, where it doesn't know where to find
-		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
-		# it's path though, so ln the 64bit and 32bit versions of -lgcc_s
-		# to that directory.
-		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
-		ln -sf ${LIBPATH}/../lib32/libgcc_s_32.so ${D}/${LIBPATH}/libgcc_s_32.so
-	fi
-}
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
-	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
-	fi
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-
-	# Fix ncurses b0rking (if r5 isn't unmerged)
-	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
-
-	# http://dev.gentoo.org/~pappy/hardened-gcc/docs/etdyn-ssp.html
-	if has_version '>=sys-devel/hardened-gcc-1.2'
-	then
-		[ "${ROOT}" = "/" ] && hardened-gcc -A
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.3.3-r3.ebuild b/sys-devel/gcc/gcc-3.3.3-r3.ebuild
deleted file mode 100644
index 4598301afc62..000000000000
--- a/sys-devel/gcc/gcc-3.3.3-r3.ebuild
+++ /dev/null
@@ -1,786 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.27 2005/01/18 06:15:01 eradicator Exp $
-
-inherit eutils flag-o-matic libtool versionator
-
-# The next command strips most flags from CFLAGS/CXXFLAGS.  If you do 
-# not like it, comment it out, but do not file bugreports if you run into
-# problems.
-do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization ... we'll add -O2 where safe
-	filter-flags -O?
-
-	# Compile problems with these (bug #6641 among others)...
-	#filter-flags -fno-exceptions -fomit-frame-pointer -fforce-addr
-}
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
-
-# PIE support
-PIE_VER="8.5.3"
-
-# ProPolice version
-PP_VER="3_3"
-PP_FVER="${PP_VER//_/.}-7"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.2"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT=
-
-# Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20021208"
-BRANCH_UPDATE="20040412"
-
-if [ -z "${SNAPSHOT}" ]
-then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
-
-	if [ -n "${PATCH_VER}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-else
-	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
-		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-manpages.tar.bz2"
-
-# bug #6148 - the bounds checking patch interferes with gcc.c
-# PaX Team, Peter S. Mazinger, pappy, solar, swtaylor, tseng.
-PIE_BASE_URI="mirror://gentoo/"
-PIE_SSP_PATCH="gcc-3.3.3-v${PIE_VER}-nodefault-pie-ssp.patch"
-PIE_EXCLUSION_PATCH="gcc-3.3.3-v${PIE_VER}-gcc-exclusion.patch"
-SRC_URI="${SRC_URI} ${PIE_BASE_URI}${PIE_SSP_PATCH} ${PIE_BASE_URI}${PIE_EXCLUSION_PATCH}"
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie and ssp extensions"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~mips ~alpha arm -hppa ~amd64 -ia64 ~ppc64 s390"
-IUSE="static nls bootstrap java build X multilib gcj fortran objc hardened uclibc emul-linux-x86"
-
-# Ok, this is a hairy one again, but lets assume that we
-# are not cross compiling, than we want SLOT to only contain
-# $PV, as people upgrading to new gcc layout will not have
-# their old gcc unmerged ...
-SLOT="3.3"
-
-# We need the later binutils for support of the new cleanup attribute.
-# 'make check' fails for about 10 tests (if I remember correctly) less
-# if we use later bison.
-# This one depends on glibc-2.3.2-r3 containing the __guard in glibc
-# we scan for Guard@@libgcc and then apply the function moving patch.
-# If using NPTL, we currently cannot however depend on glibc-2.3.2-r3,
-# else bootstap will break.
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-DEPEND="virtual/libc
-	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	!amd64? ( hardened? ( >=sys-libs/glibc-2.3.3_pre20040207 ) )
-	( !sys-devel/hardened-gcc )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.1
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-RDEPEND="virtual/libc
-	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	hardened? ( !amd64? ( >=sys-libs/glibc-2.3.3_pre20040207 ) )
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-PDEPEND="sys-devel/gcc-config"
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-version_patch() {
-	[ ! -f "$1" ] && return 1
-	[ -z "$2" ] && return 1
-
-	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
-}
-
-glibc_have_ssp() {
-	local my_libc="${ROOT}/lib/libc.so.6"
-
-# Not necessary. lib64 is a symlink to /lib. -- avenj@gentoo.org  3 Apr 04
-#	case "${ARCH}" in
-#		"amd64")
-#			my_libc="${ROOT}/lib64/libc.so.?"
-#			;;
-#	esac
-
-	# Check for the glibc to have the __guard symbols
-	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-	    [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-check_glibc_ssp() {
-	if glibc_have_ssp
-	then
-		if [ -n "${GLIBC_SSP_CHECKED}" ] && \
-		   [ -z "$(readelf -s  "${ROOT}/$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
-		           grep 'GLOBAL' | grep 'OBJECT' | grep '__guard')" ]
-		then
-			# No need to check again ...
-			return 0
-		fi
-
-		echo
-		ewarn "This sys-libs/glibc has __guard object and __stack_smash_handler functions"
-		ewarn "scanning the system for binaries with __guard - this may take 5-10 minutes"
-		ewarn "Please do not press ctrl-C or ctrl-Z during this period - it will continue"
-		echo
-		if ! bash ${FILESDIR}/scan_libgcc_linked_ssp.sh
-		then
-			echo
-			eerror "Found binaries that are dynamically linked to the libgcc with __guard@@GCC"
-			eerror "You need to compile these binaries without CFLAGS -fstack-protector/hcc -r"
-			echo
-			eerror "Also, you have to make sure that using ccache needs the cache to be flushed"
-			eerror "wipe out /var/tmp/ccache or /root/.ccache.  This will remove possible saved"
-			eerror "-fstack-protector arguments that still may reside in such a compiler cache"
-			echo
-			eerror "When such binaries are found, gcc cannot remove libgcc propolice functions"
-			eerror "leading to gcc -static -fstack-protector breaking, see gentoo bug #25299"
-			echo
-			einfo  "To do a full scan on your system, enter this following command in a shell"
-			einfo  "(Please keep running and remerging broken packages until it do not report"
-			einfo  " any breakage anymore!):"
-			echo
-			einfo  " # ${FILESDIR}/scan_libgcc_linked_ssp.sh"
-			echo
-			die "Binaries with libgcc __guard@GCC dependencies detected!"
-		else
-			echo
-			einfo "No binaries with suspicious libgcc __guard@GCC dependencies detected"
-			echo
-		fi
-	fi
-
-	return 0
-}
-
-update_gcc_for_libc_ssp() {
-	if glibc_have_ssp
-	then
-		einfo "Updating gcc to use SSP from glibc..."
-		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-	fi
-}
-
-src_unpack() {
-	local release_version="Gentoo Linux ${PVR}"
-
-	if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ]
-	then
-		# the guard check should be very early in the unpack process
-		check_glibc_ssp
-	fi
-
-	if [ -z "${SNAPSHOT}" ]
-	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
-
-		if [ -n "${PATCH_VER}" ]
-		then
-			unpack ${P}-patches-${PATCH_VER}.tar.bz2
-		fi
-	else
-		unpack gcc-${SNAPSHOT//-}.tar.bz2
-	fi
-
-	if [ -n "${PP_VER}" ]
-	then
-		unpack protector-${PP_FVER}.tar.gz
-	fi
-
-	cd ${S}
-
-	# Branch update ...
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-	if [ -n "${PATCH_VER}" ]
-	then
-		mkdir -p ${WORKDIR}/patch/exclude
-#		mv -f ${WORKDIR}/patch/{40,41}* ${WORKDIR}/patch/exclude/
-		mv -f ${WORKDIR}/patch/41* ${WORKDIR}/patch/exclude/
-
-		#use uclibc || mv -f ${WORKDIR}/patch/8?_* ${WORKDIR}/patch/exclude/
-
-		if use multilib && [ "${ARCH}" = "amd64" ]
-		then
-			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
-			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
-				${WORKDIR}/patch/06_amd64_gcc331-use-multilib.patch.bz2
-		fi
-
-		epatch ${WORKDIR}/patch
-	fi
-
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
-	then
-		epatch ${FILESDIR}/3.3.2/gcc332-altivec-fix.patch
-	fi
-
-	if [ "${ARCH}" = "arm" ]
-	then
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
-	fi
-
-	# non-default SSP and PIE support.
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" -a -n "${PP_VER}" ]
-	then
-		# ProPolice Stack Smashing protection
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
-
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.3/gcc333-ssp-3.3_7-fixup.patch
-
-		epatch ${WORKDIR}/protector.dif
-
-		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-
-		release_version="${release_version}, ssp-${PP_FVER}"
-
-		update_gcc_for_libc_ssp
-	fi
-
-	# This patch enables improved PIE and SSP behaviour but does not
-	# enable it by default ...
-
-	cd ${WORKDIR}/${P}
-	if [ "${ARCH}" != "arm" ]
-	then
-		epatch ${DISTDIR}/${PIE_SSP_PATCH}
-		use uclibc || epatch ${DISTDIR}/${PIE_EXCLUSION_PATCH}
-	fi
-
-	release_version="${release_version}, pie-${PIE_VER}"
-
-	if use hardened && [ "${ARCH}" != "sparc" -a "${ARCH}" != "arm" ]
-	then
-		einfo "Updating gcc to use automatic PIE + SSP building ..."
-		sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP|' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-
-		# rebrand to make bug reports easier
-		release_version="${release_version/Gentoo/Gentoo Hardened}"
-	fi
-
-	version_patch ${FILESDIR}/3.3.3/gcc333-gentoo-branding.patch \
-		"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"
-
-	# TODO: on arches where we lack a Scrt1.o (like parisc) we still need unpack, compile and install logic
-	# TODO: for the crt1Snocsu.o provided by a custom gcc-pie-ssp.tgz which can also be included in SRC_URI
-
-	# Install our pre generated manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		cd ${S}; unpack ${P}-manpages.tar.bz2
-	fi
-
-	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
-
-	# disable --as-needed from being compiled into gcc specs
-	# natively when using >=sys-devel/binutils-2.15.90.0.3 this is
-	# done to keep our gcc backwards compatible with binutils. 
-	# gcc 3.4.1 cvs has patches that need back porting.. 
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
-	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	gnuconfig_update
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
-
-src_compile() {
-	local myconf=
-	local gcc_lang=
-
-	if ! use build
-	then
-		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++"
-		use fortran && gcc_lang="${gcc_lang},f77"
-		use objc && gcc_lang="${gcc_lang},objc"
-		use java && use gcj && gcc_lang="${gcc_lang},java"
-		# We do NOT want 'ADA support' in here!
-		# use ada  && gcc_lang="${gcc_lang},ada"
-	else
-		gcc_lang="c"
-	fi
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	# Enable building of the gcj Java AWT & Swing X11 backend
-	# if we have X as a use flag and are not in a build stage.
-	# X11 support is still very experimental but enabling it is
-	# quite innocuous...  [No, gcc is *not* linked to X11...]
-	# <dragon@gentoo.org> (15 May 2003)
-	if use java && use gcj && use X && ! use build && [ -f /usr/X11R6/include/X11/Xlib.h ]
-	then
-		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
-	fi
-
-	# Multilib not yet supported
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		einfo "WARNING: Multilib support enabled. This is still experimental."
-		myconf="${myconf} --enable-multilib"
-	else
-		if [ "${ARCH}" = "amd64" ]
-		then
-			einfo "WARNING: Multilib not enabled. You will not be able to build 32bit binaries."
-		fi
-		myconf="${myconf} --disable-multilib"
-	fi
-
-	# Fix linking problem with c++ apps which where linked
-	# agains a 3.2.2 libgcc
-	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-
-	use hardened && append-flags -fPIC
-
-	# --with-gnu-ld needed for cross-compiling
-	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
-	# for statically linked apps but not dynamic
-	# so use setjmp/longjmp exceptions by default
-	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
-
-	if ! use uclibc
-	then
-		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
-		myconf="${myconf} --disable-libunwind-exceptions --enable-__cxa_atexit --enable-clocale=generic"
-	else
-		myconf="${myconf} --disable-__cxa_atexit --enable-target-optspace --with-gnu-ld --enable-sjlj-exceptions"
-	fi
-
-	# Make sure we have sane CFLAGS
-	do_filter_flags
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	einfo "Configuring GCC..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=${gcc_lang} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--enable-cstdio=stdio \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Do not make manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		find ${S} -name '*.[17]' -exec touch {} \; || :
-	fi
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Building GCC..."
-	# Only build it static if we are just building the C frontend, else
-	# a lot of things break because there are not libstdc++.so ....
-	if use static && [ "${gcc_lang}" = "c" ]
-	then
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake LDFLAGS="-static" bootstrap \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-		# Above FLAGS optimize and speedup build, thanks
-		# to Jeff Garzik <jgarzik@mandrakesoft.com>
-	else
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake bootstrap-lean \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-
-	fi
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install || die
-
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# amd64 is a bit unique because of multilib.  Add some other paths
-		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> \
-			${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	else
-		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	fi
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Make sure we do not check glibc for SSP again, as we did already
-	if glibc_have_ssp || \
-	   [ -f "${ROOT}/etc/env.d/99glibc_ssp" ]
-	then
-		echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_ssp
-	fi
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${LOC}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${LOC}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${LOC}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			rm -f ${CCHOST}-${x}
-			[ -f "${x}" ] && ln -sf ${x} ${CCHOST}-${x}
-
-			if [ -f "${CCHOST}-${x}-${PV}" ]
-			then
-				rm -f ${CCHOST}-${x}-${PV}
-				ln -sf ${x} ${CCHOST}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	if [ -f "${D}${LOC}/lib/libiberty.a" ]
-	then
-		rm -f ${D}${LOC}/lib/libiberty.a
-	fi
-
-	cd ${S}
-	if ! use build
-	then
-		cd ${S}
-		docinto /${CCHOST}
-		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
-		docinto ${CCHOST}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CCHOST}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CCHOST}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CCHOST}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		if use fortran
-		then
-			cd ${S}/libf2c
-			docinto ${CCHOST}/libf2c
-			dodoc ChangeLog* README TODO *.netlib
-		fi
-		cd ${S}/libffi
-		docinto ${CCHOST}/libffi
-		dodoc ChangeLog* LICENSE README
-		cd ${S}/libiberty
-		docinto ${CCHOST}/libiberty
-		dodoc ChangeLog* COPYING.LIB README
-		if use objc
-		then
-			cd ${S}/libobjc
-			docinto ${CCHOST}/libobjc
-			dodoc ChangeLog* README* THREADS*
-		fi
-		cd ${S}/libstdc++-v3
-		docinto ${CCHOST}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CCHOST}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use java && use gcj
-		then
-			cd ${S}/fastjar
-			docinto ${CCHOST}/fastjar
-			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CCHOST}/libjava
-			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
-	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# If using multilib, GCC has a bug, where it doesn't know where to find
-		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
-		# it's path though, so ln the 64bit and 32bit versions of -lgcc_s
-		# to that directory.
-		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
-		ln -sf ${LIBPATH}/../lib32/libgcc_s_32.so ${D}/${LIBPATH}/libgcc_s_32.so
-	fi
-}
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
-	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
-	fi
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.3.3-r6.ebuild b/sys-devel/gcc/gcc-3.3.3-r6.ebuild
deleted file mode 100644
index c54edea38413..000000000000
--- a/sys-devel/gcc/gcc-3.3.3-r6.ebuild
+++ /dev/null
@@ -1,821 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.28 2005/01/18 06:15:01 eradicator Exp $
-
-inherit eutils flag-o-matic libtool gnuconfig versionator
-
-# The next command strips most flags from CFLAGS/CXXFLAGS.  If you do 
-# not like it, comment it out, but do not file bugreports if you run into
-# problems.
-do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization ... we'll add -O2 where safe
-	filter-flags -O?
-
-	# Compile problems with these (bug #6641 among others)...
-	#filter-flags -fno-exceptions -fomit-frame-pointer -fforce-addr
-}
-
-# gcc produce unstable binaries if compiled with a different CHOST.
-[ "${ARCH}" = "hppa" ] && export CHOST="hppa-unknown-linux-gnu"
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
-
-# PIE support
-PIE_VER="8.7.6"
-
-# ProPolice version
-PP_VER="3_3_2"
-PP_FVER="${PP_VER//_/.}-2"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.3"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT=
-
-# Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20021208"
-BRANCH_UPDATE="20040412"
-
-if [ -z "${SNAPSHOT}" ]
-then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
-
-	if [ -n "${PATCH_VER}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-else
-	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
-		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-manpages.tar.bz2"
-
-# bug #6148 - the bounds checking patch interferes with gcc.c
-PIE_BASE_URI="mirror://gentoo/"
-PIE_CORE="gcc-3.3.3-piepatches-v${PIE_VER}.tar.bz2"
-SRC_URI="${SRC_URI} ${PIE_BASE_URI}${PIE_CORE}"
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie and ssp extensions"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-## SpanKY says hppa is a no go with any 3.3.x
-## desired KEYWORDS="~sparc ~x86"
-## KEYWORDS="-* -hppa arm ~x86 ~sparc ~amd64"
-KEYWORDS="x86 amd64 mips"
-IUSE="static nls bootstrap java build X multilib gcj fortran objc pic hardened uclibc debug emul-linux-x86"
-
-# Ok, this is a hairy one again, but lets assume that we
-# are not cross compiling, than we want SLOT to only contain
-# $PV, as people upgrading to new gcc layout will not have
-# their old gcc unmerged ...
-SLOT="3.3"
-
-# We need the later binutils for support of the new cleanup attribute.
-# 'make check' fails for about 10 tests (if I remember correctly) less
-# if we use later bison.
-# This one depends on glibc-2.3.2-r3 containing the __guard in glibc
-# we scan for Guard@@libgcc and then apply the function moving patch.
-# If using NPTL, we currently cannot however depend on glibc-2.3.2-r3,
-# else bootstap will break.
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-DEPEND="virtual/libc
-	!uclibc? ( !nptl? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	!uclibc? ( hardened? ( >=sys-libs/glibc-2.3.2-r9 ) )
-	( !sys-devel/hardened-gcc )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.1
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-
-RDEPEND="virtual/libc
-	!uclibc? ( !nptl? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	!uclibc? ( hardened? ( >=sys-libs/glibc-2.3.2-r9 ) )
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-PDEPEND="sys-devel/gcc-config"
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-version_patch() {
-	[ ! -f "$1" ] && return 1
-	[ -z "$2" ] && return 1
-
-	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
-}
-
-glibc_have_ssp() {
-	use uclibc \
-		&& local my_libc="${ROOT}/lib/libc.so.0" \
-		|| local my_libc="${ROOT}/lib/libc.so.6"
-
-# Not necessary. lib64 is a symlink to /lib. -- avenj@gentoo.org  3 Apr 04
-#	case "${ARCH}" in
-#		"amd64")
-#			my_libc="${ROOT}/lib64/libc.so.?"
-#			;;
-#	esac
-
-	# Check for the glibc to have the __guard symbols
-	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-	    [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-glibc_have_pie() {
-	if [ ! -f ${ROOT}/usr/lib/Scrt1.o ] ; then
-		echo
-		ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
-		ewarn "Please update your glibc to a proper version or disable hardened"
-		echo
-		return 1
-	fi
-}
-
-check_glibc_ssp() {
-	if glibc_have_ssp
-	then
-		if [ -n "${GLIBC_SSP_CHECKED}" ] && \
-		   [ -z "$(readelf -s  "${ROOT}/$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
-		           grep 'GLOBAL' | grep 'OBJECT' | grep '__guard')" ]
-		then
-			# No need to check again ...
-			return 0
-		fi
-
-		echo
-		ewarn "This sys-libs/glibc has __guard object and __stack_smash_handler functions"
-		ewarn "scanning the system for binaries with __guard - this may take 5-10 minutes"
-		ewarn "Please do not press ctrl-C or ctrl-Z during this period - it will continue"
-		echo
-		if ! bash ${FILESDIR}/scan_libgcc_linked_ssp.sh
-		then
-			echo
-			eerror "Found binaries that are dynamically linked to the libgcc with __guard@@GCC"
-			eerror "You need to compile these binaries without CFLAGS -fstack-protector/hcc -r"
-			echo
-			eerror "Also, you have to make sure that using ccache needs the cache to be flushed"
-			eerror "wipe out /var/tmp/ccache or /root/.ccache.  This will remove possible saved"
-			eerror "-fstack-protector arguments that still may reside in such a compiler cache"
-			echo
-			eerror "When such binaries are found, gcc cannot remove libgcc propolice functions"
-			eerror "leading to gcc -static -fstack-protector breaking, see gentoo bug #25299"
-			echo
-			einfo  "To do a full scan on your system, enter this following command in a shell"
-			einfo  "(Please keep running and remerging broken packages until it do not report"
-			einfo  " any breakage anymore!):"
-			echo
-			einfo  " # ${FILESDIR}/scan_libgcc_linked_ssp.sh"
-			echo
-			die "Binaries with libgcc __guard@GCC dependencies detected!"
-		else
-			echo
-			einfo "No binaries with suspicious libgcc __guard@GCC dependencies detected"
-			echo
-		fi
-	fi
-
-	return 0
-}
-
-update_gcc_for_libc_ssp() {
-	if glibc_have_ssp
-	then
-		einfo "Updating gcc to use SSP from glibc..."
-		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-	fi
-}
-
-src_unpack() {
-	local release_version="Gentoo Linux ${PVR}"
-
-	if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ]
-	then
-		# the guard check should be very early in the unpack process
-		check_glibc_ssp
-	fi
-
-	[ -n "${PIE_VER}" ] && use hardened && glibc_have_pie
-
-	if [ -z "${SNAPSHOT}" ]
-	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
-
-		if [ -n "${PATCH_VER}" ]
-		then
-			unpack ${P}-patches-${PATCH_VER}.tar.bz2
-		fi
-	else
-		unpack gcc-${SNAPSHOT//-}.tar.bz2
-	fi
-
-	if [ -n "${PP_VER}" ]
-	then
-		unpack protector-${PP_FVER}.tar.gz
-	fi
-
-	if [ -n "${PIE_VER}" ]
-	then
-		unpack ${PIE_CORE}
-	fi
-
-	cd ${S}
-
-	# Branch update ...
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-	if [ -n "${PATCH_VER}" ]
-	then
-		mkdir -p ${WORKDIR}/patch/exclude
-#		mv -f ${WORKDIR}/patch/{40,41}* ${WORKDIR}/patch/exclude/
-		mv -f ${WORKDIR}/patch/41* ${WORKDIR}/patch/exclude/
-
-		if use multilib && [ "${ARCH}" = "amd64" ]
-		then
-			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
-			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
-				${WORKDIR}/patch/06_amd64_gcc331-use-multilib.patch.bz2
-		fi
-
-		epatch ${WORKDIR}/patch
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-uclibc-3.3-loop.patch
-	fi
-
-	if [ -n "${PIE_VER}" ]
-	then
-		# corrects startfile/endfile selection and shared/static/pie flag usage
-		epatch ${WORKDIR}/piepatch/upstream
-		# adds non-default pie support (for now only rs6000)
-		epatch ${WORKDIR}/piepatch/nondef
-		# adds default pie support for all archs less rs6000 if DEFAULT_PIE[_SSP] is defined
-		epatch ${WORKDIR}/piepatch/def
-		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
-	fi
-
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
-	then
-		epatch ${FILESDIR}/3.3.2/gcc332-altivec-fix.patch
-	fi
-
-	if [ "${ARCH}" = "arm" ]
-	then
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
-	fi
-
-	# non-default SSP support.
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" -a -n "${PP_VER}" ]
-	then
-		# ProPolice Stack Smashing protection
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
-
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch
-
-		epatch ${WORKDIR}/protector.dif
-
-		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-
-		[ -n "${PATCH_VER}" ] && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch
-
-		# we apply only the needed parts of protectonly.dif
-		sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector-all |' \
-			-i gcc/Makefile.in || die "Failed to update crtstuff!"
-		#sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -fno-stack-protector -fno-stack-protector-all|' \
-		#	-i ${S}/gcc/Makefile.in || die "Failed to update libgcc!"
-
-		release_version="${release_version}, ssp-${PP_FVER}"
-
-		update_gcc_for_libc_ssp
-	fi
-
-	cd ${WORKDIR}/${P}
-
-	release_version="${release_version}, pie-${PIE_VER}"
-	if use hardened && ( use x86 || use sparc || use amd64 )
-	then
-		einfo "Updating gcc to use automatic PIE + SSP building ..."
-		sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP |' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-
-		# rebrand to make bug reports easier
-		release_version="${release_version/Gentoo/Gentoo Hardened}"
-	fi
-
-	# corrects text relocations in libiberty.a
-	(use pic || use hardened) && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-libiberty-pic.patch
-
-	version_patch ${FILESDIR}/3.3.3/gcc333-gentoo-branding.patch \
-		"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"
-
-	# TODO: on arches where we lack a Scrt1.o (like parisc) we still need unpack, compile and install logic
-	# TODO: for the crt1Snocsu.o provided by a custom gcc-pie-ssp.tgz which can also be included in SRC_URI
-
-	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
-
-	# disable --as-needed from being compiled into gcc specs
-	# natively when using >=sys-devel/binutils-2.15.90.0.1 this is
-	# done to keep our gcc backwards compatible with binutils. 
-	# gcc 3.4.1 cvs has patches that need back porting.. 
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
-	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	gnuconfig_update
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
-
-src_compile() {
-	local myconf=
-	local gcc_lang=
-
-	if ! use build
-	then
-		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++"
-		use fortran && gcc_lang="${gcc_lang},f77"
-		use objc && gcc_lang="${gcc_lang},objc"
-		use java && use gcj && gcc_lang="${gcc_lang},java"
-		# We do NOT want 'ADA support' in here!
-		# use ada  && gcc_lang="${gcc_lang},ada"
-	else
-		gcc_lang="c"
-	fi
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	# Enable building of the gcj Java AWT & Swing X11 backend
-	# if we have X as a use flag and are not in a build stage.
-	# X11 support is still very experimental but enabling it is
-	# quite innocuous...  [No, gcc is *not* linked to X11...]
-	# <dragon@gentoo.org> (15 May 2003)
-	if use java && use gcj && use X && ! use build && [ -f /usr/X11R6/include/X11/Xlib.h ]
-	then
-		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
-	fi
-
-	# Multilib not yet supported
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		einfo "WARNING: Multilib support enabled. This is still experimental."
-		myconf="${myconf} --enable-multilib"
-	else
-		if [ "${ARCH}" = "amd64" ]
-		then
-			einfo "WARNING: Multilib not enabled. You will not be able to build 32bit binaries."
-		fi
-		myconf="${myconf} --disable-multilib"
-	fi
-
-	# Fix linking problem with c++ apps which where linked
-	# against a 3.2.2 libgcc
-	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-
-	# --with-gnu-ld needed for cross-compiling
-	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
-	# for statically linked apps but not dynamic
-	# so use setjmp/longjmp exceptions by default
-	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
-
-	if ! use uclibc
-	then
-		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
-		myconf="${myconf} --enable-__cxa_atexit --enable-clocale=generic"
-	else
-		myconf="${myconf} --disable-__cxa_atexit --enable-target-optspace --with-gnu-ld --enable-sjlj-exceptions"
-	fi
-
-	# Make sure we have sane CFLAGS
-	do_filter_flags
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	# Install our pre generated manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		unpack ${P}-manpages.tar.bz2
-	fi
-
-	einfo "Configuring GCC..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=${gcc_lang} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--disable-libunwind-exceptions \
-		--enable-cstdio=stdio \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Do not make manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		find ${WORKDIR}/build -name '*.[17]' -exec touch {} \; || :
-	fi
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Building GCC..."
-	# Only build it static if we are just building the C frontend, else
-	# a lot of things break because there are not libstdc++.so ....
-	if use static && [ "${gcc_lang}" = "c" ]
-	then
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake LDFLAGS="-static" bootstrap \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-		# Above FLAGS optimize and speedup build, thanks
-		# to Jeff Garzik <jgarzik@mandrakesoft.com>
-	else
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake bootstrap-lean \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-
-	fi
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install || die
-
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# amd64 is a bit unique because of multilib.  Add some other paths
-		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> \
-			${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	else
-		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	fi
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Make sure we do not check glibc for SSP again, as we did already
-	if glibc_have_ssp || \
-	   [ -f "${ROOT}/etc/env.d/99glibc_ssp" ]
-	then
-		echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_ssp
-	fi
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${LOC}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${LOC}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${LOC}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			rm -f ${CCHOST}-${x}
-			[ -f "${x}" ] && ln -sf ${x} ${CCHOST}-${x}
-
-			if [ -f "${CCHOST}-${x}-${PV}" ]
-			then
-				rm -f ${CCHOST}-${x}-${PV}
-				ln -sf ${x} ${CCHOST}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	[ -f "${D}${LOC}/lib/libiberty.a" ] && rm -f ${D}${LOC}/lib/libiberty.a
-
-	cd ${S}
-	if ! use build
-	then
-		cd ${S}
-		docinto /${CCHOST}
-		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
-		docinto ${CCHOST}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CCHOST}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CCHOST}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CCHOST}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		if use fortran
-		then
-			cd ${S}/libf2c
-			docinto ${CCHOST}/libf2c
-			dodoc ChangeLog* README TODO *.netlib
-		fi
-		cd ${S}/libffi
-		docinto ${CCHOST}/libffi
-		dodoc ChangeLog* LICENSE README
-		cd ${S}/libiberty
-		docinto ${CCHOST}/libiberty
-		dodoc ChangeLog* COPYING.LIB README
-		if use objc
-		then
-			cd ${S}/libobjc
-			docinto ${CCHOST}/libobjc
-			dodoc ChangeLog* README* THREADS*
-		fi
-		cd ${S}/libstdc++-v3
-		docinto ${CCHOST}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CCHOST}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use java && use gcj
-		then
-			cd ${S}/fastjar
-			docinto ${CCHOST}/fastjar
-			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CCHOST}/libjava
-			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
-	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# If using multilib, GCC has a bug, where it doesn't know where to find
-		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
-		# it's path though, so ln the 64bit and 32bit versions of -lgcc_s
-		# to that directory.
-		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
-		ln -sf ${LIBPATH}/../lib32/libgcc_s_32.so ${D}/${LIBPATH}/libgcc_s_32.so
-	fi
-}
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
-	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
-	fi
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.3.4-r1.ebuild b/sys-devel/gcc/gcc-3.3.4-r1.ebuild
deleted file mode 100644
index 1b3f470f3b82..000000000000
--- a/sys-devel/gcc/gcc-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,825 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.27 2005/01/18 06:15:01 eradicator Exp $
-
-inherit eutils flag-o-matic libtool gnuconfig versionator
-
-# The next command strips most flags from CFLAGS/CXXFLAGS.  If you do 
-# not like it, comment it out, but do not file bugreports if you run into
-# problems.
-do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization ... we'll add -O2 where safe
-	filter-flags -O?
-
-	# -O2 is safe and good for sparc
-	[ "${ARCH}" = "sparc" ] && append-flags -O2
-
-	# Compile problems with these (bug #6641 among others)...
-	#filter-flags -fno-exceptions -fomit-frame-pointer -fforce-addr
-}
-
-# gcc produce unstable binaries if compiled with a different CHOST.
-[ "${ARCH}" = "hppa" ] && export CHOST="hppa-unknown-linux-gnu"
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
-
-# PIE support
-PIE_VER="8.7.6"
-
-# ProPolice version
-PP_VER="3_3_2"
-PP_FVER="${PP_VER//_/.}-2"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.0"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT=
-
-# Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20040412"
-BRANCH_UPDATE="20040623"
-
-if [ -z "${SNAPSHOT}" ]
-then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
-
-	if [ -n "${PATCH_VER}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-else
-	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
-		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-# bug #6148 - the bounds checking patch interferes with gcc.c
-if [ -n "${PIE_VER}" ]
-then
-	PIE_CORE="gcc-3.3.3-piepatches-v${PIE_VER}.tar.bz2"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PIE_CORE}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-manpages.tar.bz2"
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie and ssp extensions"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-## SpanKY says hppa is a no go with any 3.3.x
-
-KEYWORDS="-hppa ~alpha amd64 arm ~mips sparc x86"
-
-IUSE="static nls bootstrap build X multilib gcj fortran objc pic hardened uclibc debug emul-linux-x86"
-
-# Ok, this is a hairy one again, but lets assume that we
-# are not cross compiling, than we want SLOT to only contain
-# $PV, as people upgrading to new gcc layout will not have
-# their old gcc unmerged ...
-SLOT="3.3"
-
-# We need the later binutils for support of the new cleanup attribute.
-# 'make check' fails for about 10 tests (if I remember correctly) less
-# if we use later bison.
-# This one depends on glibc-2.3.2-r3 containing the __guard in glibc
-# we scan for Guard@@libgcc and then apply the function moving patch.
-# If using NPTL, we currently cannot however depend on glibc-2.3.2-r3,
-# else bootstap will break.
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-DEPEND="virtual/libc
-	!uclibc? ( !nptl? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	!uclibc? ( hardened? ( >=sys-libs/glibc-2.3.2-r9 ) )
-	( !sys-devel/hardened-gcc )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	>=sys-devel/gcc-config-1.3.6
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
-	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-
-RDEPEND="virtual/libc
-	!uclibc? ( !nptl? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	!uclibc? ( hardened? ( >=sys-libs/glibc-2.3.2-r9 ) )
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-
-PDEPEND="sys-devel/gcc-config"
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-version_patch() {
-	[ ! -f "$1" ] && return 1
-	[ -z "$2" ] && return 1
-
-	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
-}
-
-glibc_have_ssp() {
-	use uclibc \
-		&& local my_libc="${ROOT}/lib/libc.so.0" \
-		|| local my_libc="${ROOT}/lib/libc.so.6"
-
-# Not necessary. lib64 is a symlink to /lib. -- avenj@gentoo.org  3 Apr 04
-#	case "${ARCH}" in
-#		"amd64")
-#			my_libc="${ROOT}/lib64/libc.so.?"
-#			;;
-#	esac
-
-	# Check for the glibc to have the __guard symbols
-	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-	    [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-glibc_have_pie() {
-	if [ ! -f ${ROOT}/usr/lib/Scrt1.o ] ; then
-		echo
-		ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
-		ewarn "Please update your glibc to a proper version or disable hardened"
-		echo
-		return 1
-	fi
-}
-
-check_glibc_ssp() {
-	if glibc_have_ssp
-	then
-		if [ -n "${GLIBC_SSP_CHECKED}" ] && \
-		   [ -z "$(readelf -s  "${ROOT}/$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
-		           grep 'GLOBAL' | grep 'OBJECT' | grep '__guard')" ]
-		then
-			# No need to check again ...
-			return 0
-		fi
-
-		echo
-		ewarn "This sys-libs/glibc has __guard object and __stack_smash_handler functions"
-		ewarn "scanning the system for binaries with __guard - this may take 5-10 minutes"
-		ewarn "Please do not press ctrl-C or ctrl-Z during this period - it will continue"
-		echo
-		if ! bash ${FILESDIR}/scan_libgcc_linked_ssp.sh
-		then
-			echo
-			eerror "Found binaries that are dynamically linked to the libgcc with __guard@@GCC"
-			eerror "You need to compile these binaries without CFLAGS -fstack-protector/hcc -r"
-			echo
-			eerror "Also, you have to make sure that using ccache needs the cache to be flushed"
-			eerror "wipe out /var/tmp/ccache or /root/.ccache.  This will remove possible saved"
-			eerror "-fstack-protector arguments that still may reside in such a compiler cache"
-			echo
-			eerror "When such binaries are found, gcc cannot remove libgcc propolice functions"
-			eerror "leading to gcc -static -fstack-protector breaking, see gentoo bug #25299"
-			echo
-			einfo  "To do a full scan on your system, enter this following command in a shell"
-			einfo  "(Please keep running and remerging broken packages until it do not report"
-			einfo  " any breakage anymore!):"
-			echo
-			einfo  " # ${FILESDIR}/scan_libgcc_linked_ssp.sh"
-			echo
-			die "Binaries with libgcc __guard@GCC dependencies detected!"
-		else
-			echo
-			einfo "No binaries with suspicious libgcc __guard@GCC dependencies detected"
-			echo
-		fi
-	fi
-
-	return 0
-}
-
-update_gcc_for_libc_ssp() {
-	if glibc_have_ssp
-	then
-		einfo "Updating gcc to use SSP from glibc..."
-		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-	fi
-}
-
-src_unpack() {
-	local release_version="Gentoo Linux ${PVR}"
-
-	if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ]
-	then
-		# the guard check should be very early in the unpack process
-		check_glibc_ssp
-	fi
-
-	[ -n "${PIE_VER}" ] && use hardened && glibc_have_pie
-
-	if [ -z "${SNAPSHOT}" ]
-	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
-
-		if [ -n "${PATCH_VER}" ]
-		then
-			unpack ${P}-patches-${PATCH_VER}.tar.bz2
-		fi
-	else
-		unpack gcc-${SNAPSHOT//-}.tar.bz2
-	fi
-
-	if [ -n "${PP_VER}" ]
-	then
-		unpack protector-${PP_FVER}.tar.gz
-	fi
-
-	if [ -n "${PIE_VER}" ]
-	then
-		unpack ${PIE_CORE}
-	fi
-
-	cd ${S}
-
-	# Branch update ...
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-	if [ -n "${PATCH_VER}" ]
-	then
-		mkdir -p ${WORKDIR}/patch/exclude
-		mv -f ${WORKDIR}/patch/16* ${WORKDIR}/patch/exclude/
-		mv -f ${WORKDIR}/patch/70* ${WORKDIR}/patch/exclude/
-
-		if use multilib && [ "${ARCH}" = "amd64" ]
-		then
-			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
-			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
-				${WORKDIR}/patch/06_amd64_gcc331-use-multilib.patch.bz2
-		fi
-
-		epatch ${WORKDIR}/patch
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-uclibc-3.3-loop.patch
-	fi
-
-	if [ -n "${PIE_VER}" ]
-	then
-		# corrects startfile/endfile selection and shared/static/pie flag usage
-		epatch ${WORKDIR}/piepatch/upstream
-		# adds non-default pie support (for now only rs6000)
-		epatch ${WORKDIR}/piepatch/nondef
-		# adds default pie support for all archs less rs6000 if DEFAULT_PIE[_SSP] is defined
-		epatch ${WORKDIR}/piepatch/def
-		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
-	fi
-
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
-	then
-		epatch ${FILESDIR}/3.3.3/gcc333_pre20040408-stack-size.patch
-	fi
-
-	if [ "${ARCH}" = "arm" ]
-	then
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
-	fi
-
-	# non-default SSP support.
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" -a -n "${PP_VER}" ]
-	then
-		# ProPolice Stack Smashing protection
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
-
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch
-
-		epatch ${WORKDIR}/protector.dif
-		epatch ${FILESDIR}/pro-police-docs.patch
-
-		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-
-		[ -n "${PATCH_VER}" ] && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch
-
-		# we apply only the needed parts of protectonly.dif
-		sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector-all |' \
-			-i gcc/Makefile.in || die "Failed to update crtstuff!"
-		#sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -fno-stack-protector-all|' \
-		#	-i ${S}/gcc/Makefile.in || die "Failed to update libgcc!"
-
-		release_version="${release_version}, ssp-${PP_FVER}"
-
-		update_gcc_for_libc_ssp
-	fi
-
-	cd ${WORKDIR}/${P}
-
-	[ -n "${PIE_VER}" ] && release_version="${release_version}, pie-${PIE_VER}"
-
-	if use hardened && ( use x86 || use amd64 || use sparc || use hppa )
-	then
-		einfo "Updating gcc to use automatic PIE + SSP building ..."
-		sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP |' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-
-		# rebrand to make bug reports easier
-		release_version="${release_version/Gentoo/Gentoo Hardened}"
-	fi
-
-	# corrects text relocations in libiberty.a
-	(use pic || use hardened) && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-libiberty-pic.patch
-
-	version_patch ${FILESDIR}/3.3.4/gcc334-gentoo-branding.patch \
-		"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"
-
-	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
-
-	# disable --as-needed from being compiled into gcc specs
-	# natively when using >=sys-devel/binutils-2.15.90.0.1 this is
-	# done to keep our gcc backwards compatible with binutils. 
-	# gcc 3.4.1 cvs has patches that need back porting.. 
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
-	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	gnuconfig_update
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
-
-src_compile() {
-	local myconf=
-	local gcc_lang=
-
-	if ! use build
-	then
-		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++"
-		use fortran && gcc_lang="${gcc_lang},f77"
-		use objc && gcc_lang="${gcc_lang},objc"
-		use gcj && gcc_lang="${gcc_lang},java"
-		# We do NOT want 'ADA support' in here!
-		# use ada  && gcc_lang="${gcc_lang},ada"
-	else
-		gcc_lang="c"
-	fi
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	# Enable building of the gcj Java AWT & Swing X11 backend
-	# if we have X as a use flag and are not in a build stage.
-	# X11 support is still very experimental but enabling it is
-	# quite innocuous...  [No, gcc is *not* linked to X11...]
-	# <dragon@gentoo.org> (15 May 2003)
-	if ! use build && use gcj && use X && [ -f /usr/X11R6/include/X11/Xlib.h ]
-	then
-		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
-	fi
-
-	# Multilib not yet supported
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		einfo "WARNING: Multilib support enabled. This is still experimental."
-		myconf="${myconf} --enable-multilib"
-	else
-		if [ "${ARCH}" = "amd64" ]
-		then
-			einfo "WARNING: Multilib not enabled. You will not be able to build 32bit binaries."
-		fi
-		myconf="${myconf} --disable-multilib"
-	fi
-
-	# Fix linking problem with c++ apps which where linked
-	# against a 3.2.2 libgcc
-	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-
-	# --with-gnu-ld needed for cross-compiling
-	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
-	# for statically linked apps but not dynamic
-	# so use setjmp/longjmp exceptions by default
-	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
-
-	if ! use uclibc
-	then
-		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
-		myconf="${myconf} --enable-__cxa_atexit --enable-clocale=generic"
-	else
-		myconf="${myconf} --disable-__cxa_atexit --enable-target-optspace --with-gnu-ld --enable-sjlj-exceptions"
-	fi
-
-	# Make sure we have sane CFLAGS
-	do_filter_flags
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	# Install our pre generated manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		unpack ${P}-manpages.tar.bz2
-	fi
-
-	einfo "Configuring GCC..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=${gcc_lang} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--disable-libunwind-exceptions \
-		--enable-cstdio=stdio \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Do not make manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		find ${WORKDIR}/build -name '*.[17]' -exec touch {} \; || :
-	fi
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Building GCC..."
-	# Only build it static if we are just building the C frontend, else
-	# a lot of things break because there are not libstdc++.so ....
-	if use static && [ "${gcc_lang}" = "c" ]
-	then
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake LDFLAGS="-static" bootstrap \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-		# Above FLAGS optimize and speedup build, thanks
-		# to Jeff Garzik <jgarzik@mandrakesoft.com>
-	else
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake bootstrap-lean \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-
-	fi
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install || die
-
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# amd64 is a bit unique because of multilib.  Add some other paths
-		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> \
-			${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	else
-		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	fi
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Make sure we do not check glibc for SSP again, as we did already
-	if glibc_have_ssp || \
-	   [ -f "${ROOT}/etc/env.d/99glibc_ssp" ]
-	then
-		echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_ssp
-	fi
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${LOC}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${LOC}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${LOC}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			rm -f ${CCHOST}-${x}
-			[ -f "${x}" ] && ln -sf ${x} ${CCHOST}-${x}
-
-			if [ -f "${CCHOST}-${x}-${PV}" ]
-			then
-				rm -f ${CCHOST}-${x}-${PV}
-				ln -sf ${x} ${CCHOST}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	[ -f "${D}${LOC}/lib/libiberty.a" ] && rm -f ${D}${LOC}/lib/libiberty.a
-
-	cd ${S}
-	if ! use build
-	then
-		cd ${S}
-		docinto /${CCHOST}
-		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
-		docinto ${CCHOST}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CCHOST}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CCHOST}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CCHOST}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES ONEWS README* SERVICE
-		if use fortran
-		then
-			cd ${S}/libf2c
-			docinto ${CCHOST}/libf2c
-			dodoc ChangeLog* README TODO *.netlib
-		fi
-		cd ${S}/libffi
-		docinto ${CCHOST}/libffi
-		dodoc ChangeLog* LICENSE README
-		cd ${S}/libiberty
-		docinto ${CCHOST}/libiberty
-		dodoc ChangeLog* COPYING.LIB README
-		if use objc
-		then
-			cd ${S}/libobjc
-			docinto ${CCHOST}/libobjc
-			dodoc ChangeLog* README* THREADS*
-		fi
-		cd ${S}/libstdc++-v3
-		docinto ${CCHOST}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CCHOST}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use gcj
-		then
-			cd ${S}/fastjar
-			docinto ${CCHOST}/fastjar
-			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CCHOST}/libjava
-			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
-	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# If using multilib, GCC has a bug, where it doesn't know where to find
-		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
-		# it's path though, so ln the 64bit and 32bit versions of -lgcc_s
-		# to that directory.
-		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
-		ln -sf ${LIBPATH}/../lib32/libgcc_s_32.so ${D}/${LIBPATH}/libgcc_s_32.so
-	fi
-}
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
-	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
-	fi
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.3.4-r2.ebuild b/sys-devel/gcc/gcc-3.3.4-r2.ebuild
deleted file mode 100644
index 4fb44e13dace..000000000000
--- a/sys-devel/gcc/gcc-3.3.4-r2.ebuild
+++ /dev/null
@@ -1,820 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r2.ebuild,v 1.15 2005/01/18 06:15:01 eradicator Exp $
-
-inherit eutils flag-o-matic libtool gnuconfig versionator
-
-# The next command strips most flags from CFLAGS/CXXFLAGS.  If you do 
-# not like it, comment it out, but do not file bugreports if you run into
-# problems.
-do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization ... we'll add -O2 where safe
-	filter-flags -O?
-
-	# -O2 is safe and good for sparc
-	[ "${ARCH}" = "sparc" ] && append-flags -O2
-
-	# Compile problems with these (bug #6641 among others)...
-	#filter-flags -fno-exceptions -fomit-frame-pointer -fforce-addr
-}
-
-# gcc produce unstable binaries if compiled with a different CHOST.
-[ "${ARCH}" = "hppa" ] && export CHOST="hppa-unknown-linux-gnu"
-
-# Theoretical cross compiler support
-[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
-
-LOC="/usr"
-#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_RELEASE_VER="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}"
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}"
-
-# PIE support
-PIE_VER="8.7.6"
-
-# ProPolice version
-PP_VER="3_3_2"
-PP_FVER="${PP_VER//_/.}-2"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.0"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT=
-
-# Branch update support ...
-GCC_RELEASE_VER="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20040412"
-BRANCH_UPDATE="20040623"
-
-if [ -z "${SNAPSHOT}" ]
-then
-	S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}"
-	SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2"
-
-	if [ -n "${PATCH_VER}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		SRC_URI="${SRC_URI}
-		         mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-else
-	S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-	SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/protector-${PP_FVER}.tar.gz
-		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-# bug #6148 - the bounds checking patch interferes with gcc.c
-if [ -n "${PIE_VER}" ]
-then
-	PIE_CORE="gcc-3.3.3-piepatches-v${PIE_VER}.tar.bz2"
-	SRC_URI="${SRC_URI} mirror://gentoo/${PIE_CORE}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-manpages.tar.bz2"
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie and ssp extensions"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-## SpanKY says hppa is a no go with any 3.3.x
-
-KEYWORDS="-hppa ~x86 ~amd64 ~mips ~arm ~sparc sh"
-
-IUSE="static nls bootstrap build X multilib gcj fortran objc pic hardened uclibc debug emul-linux-x86"
-
-# Ok, this is a hairy one again, but lets assume that we
-# are not cross compiling, than we want SLOT to only contain
-# $PV, as people upgrading to new gcc layout will not have
-# their old gcc unmerged ...
-SLOT="3.3"
-
-# We need the later binutils for support of the new cleanup attribute.
-# 'make check' fails for about 10 tests (if I remember correctly) less
-# if we use later bison.
-# This one depends on glibc-2.3.2-r3 containing the __guard in glibc
-# we scan for Guard@@libgcc and then apply the function moving patch.
-# If using NPTL, we currently cannot however depend on glibc-2.3.2-r3,
-# else bootstap will break.
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.6
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) )
-	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4"
-PDEPEND="sys-devel/gcc-config"
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-version_patch() {
-	[ ! -f "$1" ] && return 1
-	[ -z "$2" ] && return 1
-
-	sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
-}
-
-glibc_have_ssp() {
-	use uclibc \
-		&& local my_libc="${ROOT}/lib/libc.so.0" \
-		|| local my_libc="${ROOT}/lib/libc.so.6"
-
-# Not necessary. lib64 is a symlink to /lib. -- avenj@gentoo.org  3 Apr 04
-#	case "${ARCH}" in
-#		"amd64")
-#			my_libc="${ROOT}/lib64/libc.so.?"
-#			;;
-#	esac
-
-	# Check for the glibc to have the __guard symbols
-	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-	    [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-glibc_have_pie() {
-	if [ ! -f ${ROOT}/usr/lib/Scrt1.o ] ; then
-		echo
-		ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
-		ewarn "Please update your glibc to a proper version or disable hardened"
-		echo
-		return 1
-	fi
-}
-
-check_glibc_ssp() {
-	if glibc_have_ssp
-	then
-		if [ -n "${GLIBC_SSP_CHECKED}" ] && \
-		   [ -z "$(readelf -s  "${ROOT}/$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
-		           grep 'GLOBAL' | grep 'OBJECT' | grep '__guard')" ]
-		then
-			# No need to check again ...
-			return 0
-		fi
-
-		echo
-		ewarn "This sys-libs/glibc has __guard object and __stack_smash_handler functions"
-		ewarn "scanning the system for binaries with __guard - this may take 5-10 minutes"
-		ewarn "Please do not press ctrl-C or ctrl-Z during this period - it will continue"
-		echo
-		if ! bash ${FILESDIR}/scan_libgcc_linked_ssp.sh
-		then
-			echo
-			eerror "Found binaries that are dynamically linked to the libgcc with __guard@@GCC"
-			eerror "You need to compile these binaries without CFLAGS -fstack-protector/hcc -r"
-			echo
-			eerror "Also, you have to make sure that using ccache needs the cache to be flushed"
-			eerror "wipe out /var/tmp/ccache or /root/.ccache.  This will remove possible saved"
-			eerror "-fstack-protector arguments that still may reside in such a compiler cache"
-			echo
-			eerror "When such binaries are found, gcc cannot remove libgcc propolice functions"
-			eerror "leading to gcc -static -fstack-protector breaking, see gentoo bug #25299"
-			echo
-			einfo  "To do a full scan on your system, enter this following command in a shell"
-			einfo  "(Please keep running and remerging broken packages until it do not report"
-			einfo  " any breakage anymore!):"
-			echo
-			einfo  " # ${FILESDIR}/scan_libgcc_linked_ssp.sh"
-			echo
-			die "Binaries with libgcc __guard@GCC dependencies detected!"
-		else
-			echo
-			einfo "No binaries with suspicious libgcc __guard@GCC dependencies detected"
-			echo
-		fi
-	fi
-
-	return 0
-}
-
-update_gcc_for_libc_ssp() {
-	if glibc_have_ssp
-	then
-		einfo "Updating gcc to use SSP from glibc..."
-		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-	fi
-}
-
-src_unpack() {
-	local release_version="Gentoo Linux ${PVR}"
-
-	if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ]
-	then
-		# the guard check should be very early in the unpack process
-		check_glibc_ssp
-	fi
-
-	[ -n "${PIE_VER}" ] && use hardened && glibc_have_pie
-
-	if [ -z "${SNAPSHOT}" ]
-	then
-		unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2
-
-		if [ -n "${PATCH_VER}" ]
-		then
-			unpack ${P}-patches-${PATCH_VER}.tar.bz2
-		fi
-	else
-		unpack gcc-${SNAPSHOT//-}.tar.bz2
-	fi
-
-	if [ -n "${PP_VER}" ]
-	then
-		unpack protector-${PP_FVER}.tar.gz
-	fi
-
-	if [ -n "${PIE_VER}" ]
-	then
-		unpack ${PIE_CORE}
-	fi
-
-	cd ${S}
-
-	# Branch update ...
-	if [ -n "${BRANCH_UPDATE}" ]
-	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	fi
-
-	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-	if [ -n "${PATCH_VER}" ]
-	then
-		mkdir -p ${WORKDIR}/patch/exclude
-		mv -f ${WORKDIR}/patch/16* ${WORKDIR}/patch/exclude/
-		mv -f ${WORKDIR}/patch/70* ${WORKDIR}/patch/exclude/
-
-		if use multilib && [ "${ARCH}" = "amd64" ]
-		then
-			mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/
-			bzip2 -c ${FILESDIR}/gcc331_use_multilib.amd64.patch > \
-				${WORKDIR}/patch/06_amd64_gcc331-use-multilib.patch.bz2
-		fi
-
-		epatch ${WORKDIR}/patch
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-uclibc-3.3-loop.patch
-	fi
-
-	if [ -n "${PIE_VER}" ]
-	then
-		# corrects startfile/endfile selection and shared/static/pie flag usage
-		epatch ${WORKDIR}/piepatch/upstream
-		# adds non-default pie support (for now only rs6000)
-		epatch ${WORKDIR}/piepatch/nondef
-		# adds default pie support for all archs less rs6000 if DEFAULT_PIE[_SSP] is defined
-		epatch ${WORKDIR}/piepatch/def
-		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
-	fi
-
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
-	then
-		epatch ${FILESDIR}/3.3.3/gcc333_pre20040408-stack-size.patch
-	fi
-
-	if [ "${ARCH}" = "arm" ]
-	then
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-getoff.patch
-		epatch ${FILESDIR}/3.3.3/gcc333-debian-arm-ldm.patch
-	fi
-
-	# non-default SSP support.
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" -a -n "${PP_VER}" ]
-	then
-		# ProPolice Stack Smashing protection
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.1/gcc331-pp-fixup.patch
-
-		EPATCH_OPTS="${EPATCH_OPTS} ${WORKDIR}/protector.dif" \
-		epatch ${FILESDIR}/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch
-
-		epatch ${WORKDIR}/protector.dif
-		epatch ${FILESDIR}/pro-police-docs.patch
-
-		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-
-		[ -n "${PATCH_VER}" ] && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch
-
-		# we apply only the needed parts of protectonly.dif
-		sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector-all |' \
-			-i gcc/Makefile.in || die "Failed to update crtstuff!"
-		#sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -fno-stack-protector-all|' \
-		#	-i ${S}/gcc/Makefile.in || die "Failed to update libgcc!"
-
-		release_version="${release_version}, ssp-${PP_FVER}"
-
-		update_gcc_for_libc_ssp
-	fi
-
-	cd ${WORKDIR}/${P}
-
-	[ -n "${PIE_VER}" ] && release_version="${release_version}, pie-${PIE_VER}"
-
-	if use hardened && ( use x86 || use amd64 || use sparc || use hppa )
-	then
-		einfo "Updating gcc to use automatic PIE + SSP building ..."
-		sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP |' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
-
-		# rebrand to make bug reports easier
-		release_version="${release_version/Gentoo/Gentoo Hardened}"
-	fi
-
-	# corrects text relocations in libiberty.a
-	(use pic || use hardened) && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-libiberty-pic.patch
-
-	version_patch ${FILESDIR}/3.3.4/gcc334-gentoo-branding.patch \
-		"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"
-
-	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
-
-	# disable --as-needed from being compiled into gcc specs
-	# natively when using >=sys-devel/binutils-2.15.90.0.1 this is
-	# done to keep our gcc backwards compatible with binutils. 
-	# gcc 3.4.1 cvs has patches that need back porting.. 
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
-	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
-
-	epatch ${FILESDIR}/gcc-spec-env.patch
-
-	cd ${S}
-	# Fixup libtool to correctly generate .la files with portage
-	elibtoolize --portage --shallow
-
-	gnuconfig_update
-
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
-
-src_compile() {
-	local myconf=
-	local gcc_lang=
-
-	if ! use build
-	then
-		myconf="${myconf} --enable-shared"
-		gcc_lang="c,c++"
-		use fortran && gcc_lang="${gcc_lang},f77"
-		use objc && gcc_lang="${gcc_lang},objc"
-		use gcj && gcc_lang="${gcc_lang},java"
-		# We do NOT want 'ADA support' in here!
-		# use ada  && gcc_lang="${gcc_lang},ada"
-	else
-		gcc_lang="c"
-	fi
-	if ! use nls || use build
-	then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls --without-included-gettext"
-	fi
-
-	# Enable building of the gcj Java AWT & Swing X11 backend
-	# if we have X as a use flag and are not in a build stage.
-	# X11 support is still very experimental but enabling it is
-	# quite innocuous...  [No, gcc is *not* linked to X11...]
-	# <dragon@gentoo.org> (15 May 2003)
-	if ! use build && use gcj && use X && [ -f /usr/X11R6/include/X11/Xlib.h ]
-	then
-		myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-		myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x"
-	fi
-
-	# Multilib not yet supported
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		einfo "WARNING: Multilib support enabled. This is still experimental."
-		myconf="${myconf} --enable-multilib"
-	else
-		if [ "${ARCH}" = "amd64" ]
-		then
-			einfo "WARNING: Multilib not enabled. You will not be able to build 32bit binaries."
-		fi
-		myconf="${myconf} --disable-multilib"
-	fi
-
-	# Fix linking problem with c++ apps which where linked
-	# against a 3.2.2 libgcc
-	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-
-	# --with-gnu-ld needed for cross-compiling
-	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
-	# for statically linked apps but not dynamic
-	# so use setjmp/longjmp exceptions by default
-	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
-
-	if ! use uclibc
-	then
-		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
-		myconf="${myconf} --enable-__cxa_atexit --enable-clocale=generic"
-	else
-		myconf="${myconf} --disable-__cxa_atexit --enable-target-optspace --with-gnu-ld --enable-sjlj-exceptions"
-	fi
-
-	# Make sure we have sane CFLAGS
-	do_filter_flags
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	# Install our pre generated manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		unpack ${P}-manpages.tar.bz2
-	fi
-
-	einfo "Configuring GCC..."
-	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
-		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
-		--datadir=${DATAPATH} \
-		--mandir=${DATAPATH}/man \
-		--infodir=${DATAPATH}/info \
-		--enable-shared \
-		--host=${CHOST} \
-		--target=${CCHOST} \
-		--with-system-zlib \
-		--enable-languages=${gcc_lang} \
-		--enable-threads=posix \
-		--enable-long-long \
-		--disable-checking \
-		--disable-libunwind-exceptions \
-		--enable-cstdio=stdio \
-		--enable-version-specific-runtime-libs \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local \
-		${myconf} || die
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Do not make manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		find ${WORKDIR}/build -name '*.[17]' -exec touch {} \; || :
-	fi
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Building GCC..."
-	# Only build it static if we are just building the C frontend, else
-	# a lot of things break because there are not libstdc++.so ....
-	if use static && [ "${gcc_lang}" = "c" ]
-	then
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake LDFLAGS="-static" bootstrap \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-		# Above FLAGS optimize and speedup build, thanks
-		# to Jeff Garzik <jgarzik@mandrakesoft.com>
-	else
-		# Fix for our libtool-portage.patch
-		S="${WORKDIR}/build" \
-		emake bootstrap-lean \
-			LIBPATH="${LIBPATH}" \
-			BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-
-	fi
-}
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make prefix=${LOC} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		DESTDIR="${D}" \
-		LIBPATH="${LIBPATH}" \
-		install || die
-
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# amd64 is a bit unique because of multilib.  Add some other paths
-		echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> \
-			${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	else
-		echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	fi
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	# Make sure we do not check glibc for SSP again, as we did already
-	if glibc_have_ssp || \
-	   [ -f "${ROOT}/etc/env.d/99glibc_ssp" ]
-	then
-		echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_ssp
-	fi
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${LOC}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${LOC}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${LOC}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			rm -f ${CCHOST}-${x}
-			[ -f "${x}" ] && ln -sf ${x} ${CCHOST}-${x}
-
-			if [ -f "${CCHOST}-${x}-${PV}" ]
-			then
-				rm -f ${CCHOST}-${x}-${PV}
-				ln -sf ${x} ${CCHOST}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	[ -f "${D}${LOC}/lib/libiberty.a" ] && rm -f ${D}${LOC}/lib/libiberty.a
-
-	cd ${S}
-	if ! use build
-	then
-		cd ${S}
-		docinto /${CCHOST}
-		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
-		docinto ${CCHOST}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CCHOST}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CCHOST}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CCHOST}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES ONEWS README* SERVICE
-		if use fortran
-		then
-			cd ${S}/libf2c
-			docinto ${CCHOST}/libf2c
-			dodoc ChangeLog* README TODO *.netlib
-		fi
-		cd ${S}/libffi
-		docinto ${CCHOST}/libffi
-		dodoc ChangeLog* LICENSE README
-		cd ${S}/libiberty
-		docinto ${CCHOST}/libiberty
-		dodoc ChangeLog* COPYING.LIB README
-		if use objc
-		then
-			cd ${S}/libobjc
-			docinto ${CCHOST}/libobjc
-			dodoc ChangeLog* README* THREADS*
-		fi
-		cd ${S}/libstdc++-v3
-		docinto ${CCHOST}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CCHOST}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use gcj
-		then
-			cd ${S}/fastjar
-			docinto ${CCHOST}/fastjar
-			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CCHOST}/libjava
-			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
-	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# If using multilib, GCC has a bug, where it doesn't know where to find
-		# -lgcc_s when linking while compiling with g++ .  ${LIBPATH} is in
-		# it's path though, so ln the 64bit and 32bit versions of -lgcc_s
-		# to that directory.
-		ln -sf ${LIBPATH}/../lib64/libgcc_s.so ${D}/${LIBPATH}/libgcc_s.so
-		ln -sf ${LIBPATH}/../lib32/libgcc_s_32.so ${D}/${LIBPATH}/libgcc_s_32.so
-	fi
-}
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ]
-	then
-		gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER}
-	fi
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-}
-
diff --git a/sys-devel/gcc/gcc-3.4.2-r2.ebuild b/sys-devel/gcc/gcc-3.4.2-r2.ebuild
deleted file mode 100644
index 530c25abe846..000000000000
--- a/sys-devel/gcc/gcc-3.4.2-r2.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r2.ebuild,v 1.29 2005/03/01 02:32:40 vapier Exp $
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
-
-KEYWORDS="-* amd64 ~mips ~ppc64 ~x86 -hppa -ppc"
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
-# SSP in glibc.
-
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.6-r4
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	!uclibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	)
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.14.90.0.8-r1
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !n32? ( !n64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
-
-MAN_VER="3.4.2"
-PATCH_VER="1.1"
-PIE_VER="8.7.6.5"
-PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
-PP_VER="3_4_1"
-PP_FVER="${PP_VER//_/.}-1"
-HTB_VER="1.00"
-
-ETYPE="gcc-compiler"
-
-#PIEPATCH_EXCLUDE="upstream/04_all_gcc-3.4.0-v8.7.6.1-pie-arm-uclibc.patch.bz2"
-HARDENED_GCC_WORKS="x86 sparc amd64"
-SPLIT_SPECS="${SPLIT_SPECS:="true"}"
-
-inherit eutils flag-o-matic libtool gnuconfig toolchain
-
-# Recently there has been a lot of stability problem in Gentoo-land.  Many
-# things can be the cause to this, but I believe that it is due to gcc3
-# still having issues with optimizations, or with it not filtering bad
-# combinations (protecting the user maybe from himeself) yet.
-#
-# This can clearly be seen in large builds like glibc, where too aggressive
-# CFLAGS cause the tests to fail miserbly.
-#
-# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-# knows what he is talking about:
-#
-#   People really shouldn't force code-specific options on... It's a
-#   bad idea. The -march options aren't just to look pretty. They enable
-#   options that are sensible (and include sse,mmx,3dnow when apropriate).
-#
-# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-# you do not like it, comment it, but do not bugreport if you run into
-# problems.
-#
-# <azarah@gentoo.org> (13 Oct 2002)
-gcc_do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
-
-	# -mcpu is deprecated on these archs, and possibly others
-	if use amd64 || use x86 ; then
-		setting="`get-flag mcpu`"
-		[ ! -z "${setting}" ] && \
-			replace-flags -mcpu="${setting}" -mtune="${setting}" && \
-			ewarn "-mcpu is deprecated on your arch\a\a\a" && \
-			epause 5
-	fi
-
-	strip-unsupported-flags
-
-	# If we use multilib on mips, we shouldn't pass -mabi flag - it breaks
-	# build of non-default-abi libraries.
-	use mips && use multilib && filter-flags "-mabi*"
-
-	# Compile problems with these (bug #6641 among others)...
-	#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
-
-	export GCJFLAGS="${CFLAGS}"
-}
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CTARGET}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-src_unpack() {
-	# if sandbox is enabled, and multilib is enabled, but we dont have a 32bit
-	# sandbox... installing gcc will fail as soon as it starts configuring the
-	# 32bit libstdc++. not fun.
-	if use amd64 && use multilib && hasq sandbox $FEATURES && [ ! -e /lib32/libsandbox.so ] ; then
-		eerror "You need a 32bit sandbox to install 32bit code with sandbox"
-		eerror "enabled. Either add FEATURES=-sandbox or disable multilib."
-		eerror "After installing a multilib gcc, you can re-emerge portage"
-		eerror "to get a 32bit sandbox, and this problem will go away."
-		ebeep
-		die "no 32bit sandbox"
-	fi
-
-	gcc_src_unpack
-
-	# misc patches that havent made it into a patch tarball yet
-	epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch
-	epatch ${FILESDIR}/gcc-spec-env.patch
-
-	# If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64
-	if use mips && use !multilib; then
-		use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
-		use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
-	fi
-
-	# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
-	# -mtune=r10000 support to gcc (Allows the compiler to generate code to
-	# take advantage of R10k's second ALU, perform shifts, etc..
-	# Needs re-porting for DFA in gcc-4.0
-	if use mips; then
-		epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
-	fi
-
-	# hack around some ugly 32bit sse2 wrong-code bugs
-	epatch ${FILESDIR}/3.4.2/gcc34-m32-no-sse2.patch
-	epatch ${FILESDIR}/3.4.2/gcc34-fix-sse2_pinsrw.patch
-
-	if use amd64 && use multilib ; then
-		# this should hack around the GCC_NO_EXECUTABLES bug
-		epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch
-		cd ${S}/libstdc++-v3
-		einfo "running autoreconf..."
-		autoreconf 2> /dev/null
-		cd ${S}
-	fi
-}
-
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make DESTDIR="${D}" install || die
-
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-
-	if [ "${SPLIT_SPECS}" == "true" ] ; then
-		cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH}
-	fi
-
-	# Because GCC 3.4 installs into the gcc directory and not the gcc-lib
-	# directory, we will have to rename it in order to keep compatibility
-	# with our current libtool check and gcc-config (which would be a pain
-	# to fix compared to this simple mv and symlink).
-	mv ${D}/${PREFIX}/lib/gcc ${D}/${PREFIX}/lib/gcc-lib
-	ln -s gcc-lib ${D}/${PREFIX}/lib/gcc
-	LIBPATH=${LIBPATH/lib\/gcc/lib\/gcc-lib}
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	create_gcc_env_entry
-
-	if [ "${SPLIT_SPECS}" == "true" ] ; then
-		if use hardened ; then
-			create_gcc_env_entry vanilla
-		else
-			create_gcc_env_entry hardened
-		fi
-		create_gcc_env_entry hardenednossp
-	fi
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${PREFIX}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${PREFIX}/include/gc*.h ${D}${PREFIX}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${PREFIX}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${PREFIX}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${PREFIX}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${PREFIX}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${PREFIX}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${PREFIX}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${PREFIX}/lib/libgcj.spec" ] && \
-			mv -f ${D}${PREFIX}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}${PREFIX}/${CTARGET}/gcc-bin/${GCC_RELEASE_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			if [ "${CHOST}" == "${CTARGET}" ] && [ -f "${CTARGET}-${x}" ]
-			then
-				[ ! -f "${x}" ] && mv "${CTARGET}-${x}" "${x}"
-				ln -sf ${x} ${CTARGET}-${x}
-			fi
-
-			if [ -f "${CTARGET}-${x}-${PV}" ]
-			then
-				rm -f ${CTARGET}-${x}-${PV}
-				ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	if [ -f "${D}${PREFIX}/lib/libiberty.a" ]
-	then
-		rm -f ${D}${PREFIX}/lib/libiberty.a
-	fi
-	if [ -f "${D}${LIBPATH}/libiberty.a" ]
-	then
-		rm -f ${D}${LIBPATH}/libiberty.a
-	fi
-
-	[ -e ${D}/${PREFIX}/lib/32 ] && rm -rf ${D}/${PREFIX}/lib/32
-
-	cd ${S}
-	if ! use build
-	then
-		cd ${S}
-		docinto /${CTARGET}
-		dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README
-		docinto ${CTARGET}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CTARGET}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CTARGET}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CTARGET}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		if use fortran
-		then
-			cd ${S}/libf2c
-			docinto ${CTARGET}/libf2c
-			dodoc ChangeLog* README TODO *.netlib
-		fi
-		cd ${S}/libffi
-		docinto ${CTARGET}/libffi
-		dodoc ChangeLog* LICENSE README
-		cd ${S}/libiberty
-		docinto ${CTARGET}/libiberty
-		dodoc ChangeLog* COPYING.LIB README
-		if use objc
-		then
-			cd ${S}/libobjc
-			docinto ${CTARGET}/libobjc
-			dodoc ChangeLog* README* THREADS*
-		fi
-		cd ${S}/libstdc++-v3
-		docinto ${CTARGET}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CTARGET}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use gcj
-		then
-			cd ${S}/fastjar
-			docinto ${CTARGET}/fastjar
-			dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CTARGET}/libjava
-			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
-	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
-
-	# we dont want these in freaky non-versioned paths that dont ever get used
-	if [ -d ${D}/${LIBPATH}/../$(get_libdir) ] ; then
-		mv ${D}/${LIBPATH}/../$(get_libdir)/* ${D}/${LIBPATH}/
-		rm -rf ${D}/${LIBPATH}/../$(get_libdir)/
-	fi
-	if [ -d ${D}/${LIBPATH}/../$(get_multilibdir) ] ; then
-		local multilibdir=$(get_multilibdir)
-		mv ${D}/${LIBPATH}/../$(get_multilibdir)/* \
-			${D}/${LIBPATH}/${multilibdir/lib}/
-		rm -rf ${D}/${LIBPATH}/../$(get_multilibdir)/
-	fi
-}
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-
-	should_we_gcc_config && do_gcc_config
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-}
diff --git a/sys-devel/gcc/gcc-3.4.3.ebuild b/sys-devel/gcc/gcc-3.4.3.ebuild
deleted file mode 100644
index 6dd2ed633625..000000000000
--- a/sys-devel/gcc/gcc-3.4.3.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.21 2005/03/01 02:32:40 vapier Exp $
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
-
-KEYWORDS="-* amd64 ~mips ~ppc64 ~x86 -hppa ~ppc ~sparc"
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
-# SSP in glibc.
-
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.6-r4
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	!uclibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	)
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.14.90.0.8-r1
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !mips? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) )"
-
-
-MAN_VER="3.4.3"
-#BRANCH_UPDATE="20041025"
-PATCH_VER="1.0"
-PIE_VER="8.7.6.6"
-PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
-PP_VER="3_4_3"
-PP_FVER="${PP_VER//_/.}-0"
-HTB_VER="1.00"
-HTB_GCC_VER="3.4.2"
-
-ETYPE="gcc-compiler"
-
-#PIEPATCH_EXCLUDE="upstream/04_all_gcc-3.4.0-v8.7.6.1-pie-arm-uclibc.patch.bz2"
-HARDENED_GCC_WORKS="x86 sparc amd64"
-#HARDENED_PIE_WORKS="mips ppc"
-#HARDENED_SSP_WORKS=""
-SPLIT_SPECS=${SPLIT_SPECS:-true}
-
-inherit toolchain
-
-gcc_do_filter_flags() {
-	strip-flags
-
-	# In general gcc does not like optimization, and add -O2 where
-	# it is safe.  This is especially true for gcc 3.3 + 3.4
-	replace-flags -O? -O2
-
-	# -mcpu is deprecated on these archs, and possibly others
-	if use amd64 || use x86 ; then
-		setting="`get-flag mcpu`"
-		[ ! -z "${setting}" ] && \
-			replace-flags -mcpu="${setting}" -mtune="${setting}" && \
-			ewarn "-mcpu is deprecated on your arch\a\a\a" && \
-			epause 5
-	fi
-
-	strip-unsupported-flags
-
-	# If we use multilib on mips, we shouldn't pass -mabi flag - it breaks
-	# build of non-default-abi libraries.
-	use mips && use multilib && filter-flags "-mabi*"
-
-	# Compile problems with these (bug #6641 among others)...
-	#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
-
-	export GCJFLAGS="${CFLAGS}"
-}
-
-
-chk_gcc_version() {
-	# This next bit is for updating libtool linker scripts ...
-	local OLD_GCC_VERSION="`gcc -dumpversion`"
-	local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\
-	                       sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')"
-
-	if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ]
-	then
-		echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion"
-	fi
-
-	if [ -n "${OLD_GCC_CHOST}" ]
-	then
-		if [ "${CHOST}" = "${CTARGET}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ]
-		then
-			echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost"
-		fi
-	fi
-
-	# Did we check the version ?
-	touch "${WORKDIR}/.chkgccversion"
-}
-
-src_unpack() {
-	# if sandbox is enabled, and multilib is enabled, but we dont have a 32bit
-	# sandbox... installing gcc will fail as soon as it starts configuring the
-	# 32bit libstdc++. not fun.
-	if use amd64 && use multilib && hasq sandbox $FEATURES && [ ! -e /lib32/libsandbox.so ] ; then
-		eerror "You need a 32bit sandbox to install 32bit code with sandbox"
-		eerror "enabled. Either add FEATURES=-sandbox or disable multilib."
-		eerror "After installing a multilib gcc, you can re-emerge portage"
-		eerror "to get a 32bit sandbox, and this problem will go away."
-		ebeep
-		die "no 32bit sandbox"
-	fi
-
-	gcc_src_unpack
-
-	# misc patches that havent made it into a patch tarball yet
-	epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch
-	epatch ${FILESDIR}/gcc-spec-env.patch
-	epatch ${FILESDIR}/3.4.2/810-arm-bigendian-uclibc.patch
-
-	# If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64
-	if use mips && use !multilib; then
-		use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
-		use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
-	fi
-
-	# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
-	# -mtune=r10000 support to gcc (Allows the compiler to generate code to
-	# take advantage of R10k's second ALU, perform shifts, etc..
-	# Needs re-porting for DFA in gcc-4.0
-	if use mips; then
-		epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
-	fi
-
-	# hack around some ugly 32bit sse2 wrong-code bugs
-	epatch ${FILESDIR}/3.4.2/gcc34-m32-no-sse2.patch
-	epatch ${FILESDIR}/3.4.2/gcc34-fix-sse2_pinsrw.patch
-
-	if use amd64 && use multilib ; then
-		# this should hack around the GCC_NO_EXECUTABLES bug
-		epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch
-		cd ${S}/libstdc++-v3
-		einfo "running autoreconf..."
-		autoreconf 2> /dev/null
-		cd ${S}
-	fi
-}
-
-
-src_install() {
-	local x=
-
-	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
-	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
-	do
-		if [ -L ${x} ]
-		then
-			rm -f ${x}
-			continue
-		fi
-	done
-	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
-	do
-		if grep -q 'It has been auto-edited by fixincludes from' ${x}
-		then
-			rm -f ${x}
-		fi
-	done
-
-	einfo "Installing GCC..."
-	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
-	make DESTDIR="${D}" install || die
-
-	if [ "${CHOST}" == "${CTARGET}" ] ; then
-		[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
-	fi
-
-	dodir /lib /usr/bin
-	dodir /etc/env.d/gcc
-	create_gcc_env_entry
-
-	if want_split_specs ; then
-		if use hardened ; then
-			create_gcc_env_entry vanilla
-		fi
-		use !hardened && hardened_gcc_works && create_gcc_env_entry hardened
-		if hardened_gcc_works || hardened_gcc_works pie ; then
-			create_gcc_env_entry hardenednossp
-		fi
-		if hardened_gcc_works || hardened_gcc_works ssp ; then
-			create_gcc_env_entry hardenednopie
-		fi
-
-		cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH}
-	fi
-
-	# Make sure we dont have stuff lying around that
-	# can nuke multiple versions of gcc
-	if ! use build
-	then
-		cd ${D}${LIBPATH}
-
-		# Tell libtool files where real libraries are
-		for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
-		do
-			if [ -f "${x}" ]
-			then
-				sed -i -e "s:/usr/lib:${LIBPATH}:" ${x}
-				mv ${x} ${D}${LIBPATH}
-			fi
-		done
-
-		# Move all the libraries to version specific libdir.
-		for x in ${D}${PREFIX}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
-		do
-			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
-		done
-
-		# Move Java headers to compiler-specific dir
-		for x in ${D}${PREFIX}/include/gc*.h ${D}${PREFIX}/include/j*.h
-		do
-			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
-		done
-		for x in gcj gnu java javax org
-		do
-			if [ -d "${D}${PREFIX}/include/${x}" ]
-			then
-				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${PREFIX}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${PREFIX}/include/${x}
-			fi
-		done
-
-		if [ -d "${D}${PREFIX}/lib/security" ]
-		then
-			dodir /${LIBPATH}/security
-			mv -f ${D}${PREFIX}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${PREFIX}/lib/security
-		fi
-
-		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${PREFIX}/lib/libgcj.spec" ] && \
-			mv -f ${D}${PREFIX}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
-
-		# 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}${PREFIX}/${CTARGET}/gcc-bin/${GCC_RELEASE_VER}
-		[ -f jar ] && mv -f jar gcj-jar
-
-		# Move <cxxabi.h> to compiler-specific directories
-		[ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
-
-		# These should be symlinks
-		cd ${D}${BINPATH}
-		for x in gcc g++ c++ g77 gcj
-		do
-			if [ "${CHOST}" == "${CTARGET}" ] && [ -f "${CTARGET}-${x}" ]
-			then
-				[ ! -f "${x}" ] && mv "${CTARGET}-${x}" "${x}"
-				ln -sf ${x} ${CTARGET}-${x}
-			fi
-
-			if [ -f "${CTARGET}-${x}-${PV}" ]
-			then
-				rm -f ${CTARGET}-${x}-${PV}
-				ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${PV}
-			fi
-		done
-	fi
-
-	# This one comes with binutils
-	rm -f ${D}${PREFIX}/lib/libiberty.a
-	rm -f ${D}${LIBPATH}/libiberty.a
-
-	[ -e ${D}/${PREFIX}/lib/32 ] && rm -rf ${D}/${PREFIX}/lib/32
-
-	cd ${S}
-	if ! use build && [ "${CHOST}" == "${CTARGET}" ] ; then
-		cd ${S}
-		docinto ${CTARGET}
-		dodoc ChangeLog* FAQ MAINTAINERS README
-		docinto ${CTARGET}/html
-		dohtml *.html
-		cd ${S}/boehm-gc
-		docinto ${CTARGET}/boehm-gc
-		dodoc ChangeLog doc/{README*,barrett_diagram}
-		docinto ${CTARGET}/boehm-gc/html
-		dohtml doc/*.html
-		cd ${S}/gcc
-		docinto ${CTARGET}/gcc
-		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		if use fortran ; then
-			cd ${S}/libf2c
-			docinto ${CTARGET}/libf2c
-			dodoc ChangeLog* README TODO *.netlib
-		fi
-		cd ${S}/libffi
-		docinto ${CTARGET}/libffi
-		dodoc ChangeLog* README
-		cd ${S}/libiberty
-		docinto ${CTARGET}/libiberty
-		dodoc ChangeLog* README
-		if use objc
-		then
-			cd ${S}/libobjc
-			docinto ${CTARGET}/libobjc
-			dodoc ChangeLog* README* THREADS*
-		fi
-		cd ${S}/libstdc++-v3
-		docinto ${CTARGET}/libstdc++-v3
-		dodoc ChangeLog* README
-		docinto ${CTARGET}/libstdc++-v3/html
-		dohtml -r -a css,diff,html,txt,xml docs/html/*
-		cp -f docs/html/17_intro/[A-Z]* \
-			${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/
-
-		if use gcj
-		then
-			cd ${S}/fastjar
-			docinto ${CTARGET}/fastjar
-			dodoc AUTHORS CHANGES ChangeLog* NEWS README
-			cd ${S}/libjava
-			docinto ${CTARGET}/libjava
-			dodoc ChangeLog* HACKING NEWS README THANKS
-		fi
-
-		prepman ${DATAPATH}
-		prepinfo ${DATAPATH}
-	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
-	fi
-
-	# Rather install the script, else portage with changing $FILESDIR
-	# between binary and source package borks things ....
-	if [ "${CHOST}" == "${CTARGET}" ] ; then
-		insinto /lib/rcscripts/awk
-		doins ${FILESDIR}/awk/fixlafiles.awk
-		exeinto /sbin
-		doexe ${FILESDIR}/fix_libtool_files.sh
-	fi
-
-	# we dont want these in freaky non-versioned paths that dont ever get used
-	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 32
-	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 64
-	# and mips is just freaky in general ;p
-	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used o32
-	# and finally, the non-bitdepth-or-ABI-specific freaky path
-	if [ -d ${D}/${LIBPATH}/../lib ] ; then
-		mv ${D}/${LIBPATH}/../lib/* ${D}/${LIBPATH}/
-		rm -rf ${D}/${LIBPATH}/../lib
-	fi
-}
-
-fix_freaky_non_versioned_library_paths_that_dont_ever_get_used() {
-	# first the multilib case
-	if [ -d ${D}/${LIBPATH}/../$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
-		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/$1/
-		rm -rf ${D}/${LIBPATH}/../$1
-	fi
-	if [ -d ${D}/${LIBPATH}/../lib$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
-		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/$1/
-		rm -rf ${D}/${LIBPATH}/../lib$1
-	fi
-	# and now to fix up the non-multilib case
-	if [ -d ${D}/${LIBPATH}/../$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
-		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/
-		rm -rf ${D}/${LIBPATH}/../$1
-	fi
-	if [ -d ${D}/${LIBPATH}/../lib$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
-		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/
-		rm -rf ${D}/${LIBPATH}/../lib$1
-	fi
-}
-
-
-pkg_preinst() {
-
-	if [ ! -f "${WORKDIR}/.chkgccversion" ]
-	then
-		mkdir -p ${WORKDIR}
-		chk_gcc_version
-	fi
-
-	# Make again sure that the linker "should" be able to locate
-	# libstdc++.so ...
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-	${ROOT}/sbin/ldconfig
-}
-
-pkg_postinst() {
-
-	if use multilib && [ "${ARCH}" = "amd64" ]
-	then
-		# Can't always find libgcc_s.so.1, make it find it
-		export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}"
-	else
-		export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	fi
-
-	should_we_gcc_config && do_gcc_config
-
-	# Update libtool linker scripts to reference new gcc version ...
-	if [ "${ROOT}" = "/" ] && \
-	   [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ]
-	then
-		local OLD_GCC_VERSION=
-		local OLD_GCC_CHOST=
-
-		if [ -f "${WORKDIR}/.oldgccversion" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccversion")" ]
-		then
-			OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")"
-		else
-			OLD_GCC_VERSION="${GCC_RELEASE_VER}"
-		fi
-
-		if [ -f "${WORKDIR}/.oldgccchost" ] && \
-		   [ -n "$(cat "${WORKDIR}/.oldgccchost")" ]
-		then
-			OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")"
-		fi
-
-		/sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST}
-	fi
-}
diff --git a/sys-devel/gcc/gcc-4.0.0_alpha20050213.ebuild b/sys-devel/gcc/gcc-4.0.0_alpha20050213.ebuild
deleted file mode 100644
index 8096757375ca..000000000000
--- a/sys-devel/gcc/gcc-4.0.0_alpha20050213.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.0_alpha20050213.ebuild,v 1.2 2005/03/01 02:32:40 vapier Exp $
-
-ETYPE="gcc-compiler"
-
-inherit toolchain
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-*"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	!uclibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	)
-	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
-	fortran? ( dev-libs/gmp )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
-
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
-fi
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.15.90.0.1.1-r1"
-
-PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !n32? ( !n64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	einfo "This gcc-4 ebuild is provided for your convenience, and the use"
-	einfo "of this compiler is not supported by the Gentoo Developers."
-	einfo "Please file bugs related to gcc-4 with upstream developers."
-	einfo "Compiler bugs should be filed at http://gcc.gnu.org/bugzilla/"
-}