old
authorMike Frysinger <vapier@gentoo.org>
Wed, 17 Nov 2004 15:40:20 +0000 (15:40 +0000)
committerMike Frysinger <vapier@gentoo.org>
Wed, 17 Nov 2004 15:40:20 +0000 (15:40 +0000)
sys-devel/gcc/Manifest
sys-devel/gcc/files/digest-gcc-3.3.3_pre20040408-r1 [deleted file]
sys-devel/gcc/files/digest-gcc-3.3.3_pre20040426 [deleted file]
sys-devel/gcc/gcc-3.3.3_pre20040408-r1.ebuild [deleted file]
sys-devel/gcc/gcc-3.3.3_pre20040426.ebuild [deleted file]

index 117ee7dfd286cc3cda397b5ff49bda6fdd11aaee..b4b25a96d4439531f3e512a05e28bbac2251c7d6 100644 (file)
@@ -18,8 +18,6 @@ MD5 7196ef2e21bcde2f5c7de114cfa5dfc2 gcc-3.3.3-r3.ebuild 23582
 MD5 840f9c25e867afe238633c890f8ad71a gcc-3.3.3-r5.ebuild 24366
 MD5 27d17b57206385ba96c3c319960ebfc4 gcc-3.3.3-r6.ebuild 24972
 MD5 66089d59b528c2f119a3b525b68ecbc7 gcc-3.3.3.ebuild 22304
-MD5 559569b1a6d8139511c6a01203c26c6c gcc-3.3.3_pre20040408-r1.ebuild 22613
-MD5 b0f6eef081a1732ab7dfa425897d66e3 gcc-3.3.3_pre20040426.ebuild 22555
 MD5 638023a605f75bd0b58558ea92d8cff9 gcc-3.3.4-r1.ebuild 24863
 MD5 1011668da4153e33c8e69808381d96f4 gcc-3.3.4-r2.ebuild 24671
 MD5 6d3c667669a40fff1625e7517d7e889b gcc-3.3.ebuild 16623
@@ -38,7 +36,6 @@ MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r2 442
 MD5 6ef28a4464e8c9796010b3c7bfe49527 files/digest-gcc-3.3.5 276
 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442
 MD5 d197c7ddd1a614b89bddbc3babb31c3b files/digest-gcc-3.4.3 442
-MD5 8f56750ce25ca30ffebcbdb65de95a1f files/digest-gcc-3.3.3_pre20040426 138
 MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
 MD5 69687aac826654ad375b7eae45a01e0b files/digest-gcc-3.4.2-r2 443
 MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r1 442
@@ -61,7 +58,6 @@ MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
 MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
 MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442
 MD5 35f63854b7b4d5ab1ed1489e517f8e24 files/digest-gcc-3.3.3 361
-MD5 e962c23dd4396850f0e36424ec5596d7 files/digest-gcc-3.3.3_pre20040408-r1 138
 MD5 3a68d40d170427ffbfcf181b5099d693 files/digest-gcc-3.3.3-r5 528
 MD5 b1a242694f56184cbcdd40ba25800d50 files/2.95.3/gcc-2.95.3-alpha.diff 14345
 MD5 523970c128b929fe7c7cf36508ebd1d5 files/2.95.3/gcc-2.95.3-new-atexit.diff 13604
@@ -131,7 +127,7 @@ MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBm24MHTu7gpaalycRAhh4AKD5HeNsWc3NLKaM7hlV7SW6P3+sCQCgs6u5
-pCHfCOfQH+E/opqhWmoEhqM=
-=y8WV
+iD8DBQFBm3EWHTu7gpaalycRAmV4AKCWQcDzBZgcMqpZRlLF0mpPybIh6ACgrGxt
+5RalX9yW1EmUs12VnpolRv0=
+=d5jj
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.3_pre20040408-r1 b/sys-devel/gcc/files/digest-gcc-3.3.3_pre20040408-r1
deleted file mode 100644 (file)
index 4ebf457..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fbe39a35230acb24b32429a1f930f20c gcc-20040408.tar.bz2 22224060
-MD5 cfaa61a61372f486160cdba32081fb3e gcc-3.3.2-manpages.tar.bz2 137196
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.3_pre20040426 b/sys-devel/gcc/files/digest-gcc-3.3.3_pre20040426
deleted file mode 100644 (file)
index 73f0fc4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1dbd53314dc17ae106472252a74e306e gcc-20040426.tar.bz2 22219484
-MD5 cfaa61a61372f486160cdba32081fb3e gcc-3.3.2-manpages.tar.bz2 137196
diff --git a/sys-devel/gcc/gcc-3.3.3_pre20040408-r1.ebuild b/sys-devel/gcc/gcc-3.3.3_pre20040408-r1.ebuild
deleted file mode 100644 (file)
index 64bbef0..0000000
+++ /dev/null
@@ -1,752 +0,0 @@
-# Copyright 1999-2004 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_pre20040408-r1.ebuild,v 1.10 2004/10/06 22:18:48 lv Exp $
-
-IUSE="static nls bootstrap java build X multilib"
-
-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
-
-# 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"
-#MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-MY_PV="$(get_version_component_range 1-2)"
-MY_PV_FULL="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
-# 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${MY_PV/\.*/}"
-
-# ProPolice version
-#PP_VER="3_3"
-PP_FVER="${PP_VER//_/.}-7"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.0"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT="2004-04-08"
-
-# Branch update support ...
-MAIN_BRANCH="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20021208"
-BRANCH_UPDATE=
-
-if [ -z "${SNAPSHOT}" ]
-then
-       S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
-       SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.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}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-       fi
-else
-       S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-       SRC_URI="mirror://gentoo/${PN}-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-       SRC_URI="${SRC_URI}
-               http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-SRC_URI="${SRC_URI}
-       mirror://gentoo/gcc-3.3.2-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"
-
-# this is based on the hammer branch which unless you're a ppc64 type
-# you're probably not interested in it. This branch will only be interesting
-# until alan modra and friends are done with their current 3.3.x efforts
-# for ppc64
-
-#
-# It is working fine on ppc too
-#
-
-KEYWORDS="-* ppc64 ppc"
-#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 ...
-if [ "${CHOST}" == "${CCHOST}" ]
-then
-# GCC-3.3 is supposed to be binary compatible with 3.2..
-#      SLOT="${MY_PV}"
-       SLOT="3.2"
-else
-# GCC-3.3 is supposed to be binary compatible with 3.2..
-#      SLOT="${CCHOST}-${MY_PV}"
-       SLOT="${CCHOST}-3.2"
-fi
-
-# 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.
-DEPEND="virtual/libc
-       !nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-       >=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 )
-       >=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}" != "${MY_PV_FULL}" ]
-       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##*/}
-}
-
-check_glibc_ssp() {
-       # Check for the glibc to have the guard
-       if  [ "$(readelf -s /lib/libc.so.6 2>/dev/null | \
-                grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-           [ "$(readelf -s /lib/libc.so.6 2>/dev/null | \
-                grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-       then
-               if [ -n "${GLIBC_SSP_CHECKED}" ] && \
-                  [ -z "$(readelf -s  "$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
-                          grep GLOBAL | grep OBJECT | grep '__guard')" ]
-               then
-                       sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-                               -i ${S}/gcc/Makefile.in
-
-                       touch ${WORKDIR}/.glibc_ssp_checked
-
-                       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
-                       sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-                               -i ${S}/gcc/Makefile.in
-
-                       touch ${WORKDIR}/.glibc_ssp_checked
-               fi
-       fi
-}
-
-src_unpack() {
-       if [ -z "${SNAPSHOT}" ]
-       then
-               unpack ${PN}-${MAIN_BRANCH}.tar.bz2
-
-               if [ -n "${PATCH_VER}" ]
-               then
-                       unpack ${P}-patches-${PATCH_VER}.tar.bz2
-               fi
-       else
-               unpack gcc-${SNAPSHOT//-}.tar.bz2
-       fi
-
-       if [ "${ARCH}" != "ppc64" ] && [ -n "${PP_VER}" ]
-       then
-               unpack protector-${PP_FVER}.tar.gz
-       fi
-
-       cd ${S}
-       epatch ${FILESDIR}/3.3.3/gcc333_pre20040408-stack-size.patch
-       # Fixup libtool to correctly generate .la files with portage
-       elibtoolize --portage --shallow
-
-       echo
-
-       # Branch update ...
-       if [ "${ARCH}" != "ppc64" ] && [ -n "${BRANCH_UPDATE}" ]
-       then
-               epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
-       fi
-
-       # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-       if [ "${ARCH}" != "ppc64" ] && [ -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.3/gcc333_pre${SNAPSHOT//-}-gentoo-branding.patch \
-                       "${BRANCH_UPDATE} (Gentoo Linux ${PVR})" || die "Failed Branding"
-       fi
-
-       if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "ppc64"]
-       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-${PP_FVER})" \
-                       || die "Failed Branding"
-
-               # Check for the glibc to have the guard
-               check_glibc_ssp
-       fi
-
-       # Install our pre generated manpages if we do not have perl ...
-       if [ ! -x /usr/bin/perl ]
-       then
-               cd ${S}; unpack gcc-3.3.2-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
-}
-
-# ../gcc-20040215/configure --prefix=/usr --enable-shared --host=powerpc64-unknown-linux-gnu --enable-languages=c,c++,f77,objc --enable-threads=posix --enable-long-long --disable-checking --enable-__cxa_atexit --enable-nls
-
-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 linkedi
-       # 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 ...
-       # gcc-3.3.3-hammer sports a _nice_ scheduler that gives you 100% 
-       # certain of miscompiling type punned expressions.
-       # just to play the safe side.
-       export CFLAGS="${CFLAGS/-O?/-O2 -fno-strict-aliasing}"
-       export CXXFLAGS="${CXXFLAGS/-O?/-O2 -fno-strict-aliasing}"
-       export GCJFLAGS="${CFLAGS/-O?/-O2 -fno-strict-aliasing}"
-
-       # Build in a separate build tree
-       mkdir -p ${WORKDIR}/build
-       cd ${WORKDIR}/build
-
-       einfo "Configuring GCC..."
-       addwrite "/dev/zero"
-
-       [ "${ARCH}" != "ppc64" ] && myconf="${myconf} --with-system-zlib  \
-               --enable-cstdio=stdio \
-               --enable-clocale=generic \
-               --enable-version-specific-runtime-libs \
-               --target=${CCHOST} \
-               --bindir=${BINPATH} \
-               --includedir=${LIBPATH}/include \
-               --datadir=${DATAPATH} \
-               --mandir=${DATAPATH}/man \
-               --infodir=${DATAPATH}/info "
-
-       ${S}/configure --prefix=${LOC} \
-               --enable-shared \
-               --host=${CHOST} \
-               --enable-languages=${gcc_lang} \
-               --enable-threads=posix \
-               --enable-long-long \
-               --disable-checking \
-               --enable-__cxa_atexit \
-               --with-gxx-include-dir=${STDCXX_INCDIR} \
-               --with-local-prefix=${LOC}/local \
-               ${myconf} || die
-
-#              --target=${CCHOST} \
-#              --bindir=${BINPATH} \
-#              --includedir=${LIBPATH}/include \
-#              --datadir=${DATAPATH} \
-#              --mandir=${DATAPATH}/man \
-#              --infodir=${DATAPATH}/info \
-
-       if [ "${ARCH}" != "ppc64" ]
-       then
-               touch ${S}/gcc/c-gperf.h
-       fi
-
-       # 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
-               if [ "${ARCH}" != "ppc64" ]
-               then
-                       # Fix for our libtool-portage.patch
-                       S="${WORKDIR}/build" \
-                       emake bootstrap-lean \
-                               LIBPATH="${LIBPATH}" \
-                               BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-               else
-                       emake
-               fi
-
-       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}-${MY_PV_FULL}
-       echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       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}-${MY_PV_FULL}
-       else
-               echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       fi
-       echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       # Also set CC and CXX
-       echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       # Make sure we do not check glibc for ssp again, as we did already
-       if [ -f "${WORKDIR}/.glibc_ssp_checked" -o \
-            -f "${ROOT}/etc/env.d/99glibc_spp" ]
-       then
-               echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_spp
-       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/${MY_PV}
-               [ -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
-
-       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}-${MY_PV_FULL}
-       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="${MY_PV_FULL}"
-               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
-
-       # 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
-
-       ewarn
-       ewarn
-       ewarn
-       ewarn "Make SURE you have -fno-strict-aliasing in your CFLAGS "
-       ewarn "This version of gcc may miscompile certain type-punned "
-       ewarn "expressions. Expect problems if you ignore this warning"
-       ewarn
-       ewarn
-       ewarn
-}
-
diff --git a/sys-devel/gcc/gcc-3.3.3_pre20040426.ebuild b/sys-devel/gcc/gcc-3.3.3_pre20040426.ebuild
deleted file mode 100644 (file)
index c58e883..0000000
+++ /dev/null
@@ -1,751 +0,0 @@
-# Copyright 1999-2004 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_pre20040426.ebuild,v 1.8 2004/10/06 22:18:48 lv Exp $
-
-IUSE="static nls bootstrap java build X multilib debug"
-
-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
-
-# 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"
-#MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-#MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
-MY_PV="$(get_version_component_range 1-2)"
-MY_PV_FULL="$(get_version_component_range 1-3)"
-
-LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
-BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
-DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
-# 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${MY_PV/\.*/}"
-
-# ProPolice version
-#PP_VER="3_3"
-PP_FVER="${PP_VER//_/.}-7"
-
-# Patch tarball support ...
-#PATCH_VER="1.0"
-PATCH_VER="1.0"
-
-# Snapshot support ...
-#SNAPSHOT="2002-08-12"
-SNAPSHOT="2004-04-26"
-
-# Branch update support ...
-MAIN_BRANCH="${PV}"  # Tarball, etc used ...
-
-#BRANCH_UPDATE="20021208"
-BRANCH_UPDATE=
-
-if [ -z "${SNAPSHOT}" ]
-then
-       S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
-       SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.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}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-       fi
-else
-       S="${WORKDIR}/gcc-${SNAPSHOT//-}"
-       SRC_URI="mirror://gentoo/${PN}-${SNAPSHOT//-}.tar.bz2"
-fi
-if [ -n "${PP_VER}" ]
-then
-       SRC_URI="${SRC_URI}
-               http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
-fi
-SRC_URI="${SRC_URI}
-       mirror://gentoo/gcc-3.3.2-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"
-
-# this is based on the hammer branch which unless you're a ppc64 type
-# you're probably not interested in it. This branch will only be interesting
-# until alan modra and friends are done with their current 3.3.x efforts
-# for ppc64
-
-#
-# It is working fine on ppc too
-#
-
-KEYWORDS="-* ~ppc64 ~ppc"
-#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 ...
-if [ "${CHOST}" == "${CCHOST}" ]
-then
-# GCC-3.3 is supposed to be binary compatible with 3.2..
-#      SLOT="${MY_PV}"
-       SLOT="3.2"
-else
-# GCC-3.3 is supposed to be binary compatible with 3.2..
-#      SLOT="${CCHOST}-${MY_PV}"
-       SLOT="${CCHOST}-3.2"
-fi
-
-# 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.
-DEPEND="virtual/libc
-       !nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-       >=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 )
-       >=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}" != "${MY_PV_FULL}" ]
-       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##*/}
-}
-
-check_glibc_ssp() {
-       # Check for the glibc to have the guard
-       if  [ "$(readelf -s /lib/libc.so.6 2>/dev/null | \
-                grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-           [ "$(readelf -s /lib/libc.so.6 2>/dev/null | \
-                grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-       then
-               if [ -n "${GLIBC_SSP_CHECKED}" ] && \
-                  [ -z "$(readelf -s  "$(gcc-config -L)/libgcc_s.so" 2>/dev/null | \
-                          grep GLOBAL | grep OBJECT | grep '__guard')" ]
-               then
-                       sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-                               -i ${S}/gcc/Makefile.in
-
-                       touch ${WORKDIR}/.glibc_ssp_checked
-
-                       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
-                       sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-                               -i ${S}/gcc/Makefile.in
-
-                       touch ${WORKDIR}/.glibc_ssp_checked
-               fi
-       fi
-}
-
-src_unpack() {
-       if [ -z "${SNAPSHOT}" ]
-       then
-               unpack ${PN}-${MAIN_BRANCH}.tar.bz2
-
-               if [ -n "${PATCH_VER}" ]
-               then
-                       unpack ${P}-patches-${PATCH_VER}.tar.bz2
-               fi
-       else
-               unpack gcc-${SNAPSHOT//-}.tar.bz2
-       fi
-
-       if [ "${ARCH}" != "ppc64" ] && [ -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 [ "${ARCH}" != "ppc64" ] && [ -n "${BRANCH_UPDATE}" ]
-       then
-               epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
-       fi
-
-       # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
-       if [ "${ARCH}" != "ppc64" ] && [ -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.3/gcc333_pre${SNAPSHOT//-}-gentoo-branding.patch \
-                       "${BRANCH_UPDATE} (Gentoo Linux ${PVR})" || die "Failed Branding"
-       fi
-
-       if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "ppc64"]
-       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-${PP_FVER})" \
-                       || die "Failed Branding"
-
-               # Check for the glibc to have the guard
-               check_glibc_ssp
-       fi
-
-       # Install our pre generated manpages if we do not have perl ...
-       if [ ! -x /usr/bin/perl ]
-       then
-               cd ${S}; unpack gcc-3.3.2-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
-}
-
-# ../gcc-20040215/configure --prefix=/usr --enable-shared --host=powerpc64-unknown-linux-gnu --enable-languages=c,c++,f77,objc --enable-threads=posix --enable-long-long --disable-checking --enable-__cxa_atexit --enable-nls
-
-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 linkedi
-       # 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 ...
-       # gcc-3.3.3-hammer sports a _nice_ scheduler that gives you 100% 
-       # certain of miscompiling type punned expressions.
-       # just to play the safe side.
-       export CFLAGS="${CFLAGS/-O?/-O2 -fno-strict-aliasing}"
-       export CXXFLAGS="${CXXFLAGS/-O?/-O2 -fno-strict-aliasing}"
-       export GCJFLAGS="${CFLAGS/-O?/-O2 -fno-strict-aliasing}"
-
-       # Build in a separate build tree
-       mkdir -p ${WORKDIR}/build
-       cd ${WORKDIR}/build
-
-       einfo "Configuring GCC..."
-       addwrite "/dev/zero"
-
-       [ "${ARCH}" != "ppc64" ] && myconf="${myconf} --with-system-zlib  \
-               --enable-cstdio=stdio \
-               --enable-clocale=generic \
-               --enable-version-specific-runtime-libs \
-               --target=${CCHOST} \
-               --bindir=${BINPATH} \
-               --includedir=${LIBPATH}/include \
-               --datadir=${DATAPATH} \
-               --mandir=${DATAPATH}/man \
-               --infodir=${DATAPATH}/info "
-
-       ${S}/configure --prefix=${LOC} \
-               --enable-shared \
-               --host=${CHOST} \
-               --enable-languages=${gcc_lang} \
-               --enable-threads=posix \
-               --enable-long-long \
-               --disable-checking \
-               --enable-__cxa_atexit \
-               --with-gxx-include-dir=${STDCXX_INCDIR} \
-               --with-local-prefix=${LOC}/local \
-               ${myconf} || die
-
-#              --target=${CCHOST} \
-#              --bindir=${BINPATH} \
-#              --includedir=${LIBPATH}/include \
-#              --datadir=${DATAPATH} \
-#              --mandir=${DATAPATH}/man \
-#              --infodir=${DATAPATH}/info \
-
-       if [ "${ARCH}" != "ppc64" ]
-       then
-               touch ${S}/gcc/c-gperf.h
-       fi
-
-       # 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
-               if [ "${ARCH}" != "ppc64" ]
-               then
-                       # Fix for our libtool-portage.patch
-                       S="${WORKDIR}/build" \
-                       emake bootstrap-lean \
-                               LIBPATH="${LIBPATH}" \
-                               BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
-               else
-                       emake
-               fi
-
-       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}-${MY_PV_FULL}
-       echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       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}-${MY_PV_FULL}
-       else
-               echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       fi
-       echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       # Also set CC and CXX
-       echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
-       # Make sure we do not check glibc for ssp again, as we did already
-       if [ -f "${WORKDIR}/.glibc_ssp_checked" -o \
-            -f "${ROOT}/etc/env.d/99glibc_spp" ]
-       then
-               echo "GLIBC_SSP_CHECKED=1" > ${D}/etc/env.d/99glibc_spp
-       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/${MY_PV}
-               [ -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
-
-       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}-${MY_PV_FULL}
-       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="${MY_PV_FULL}"
-               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
-
-       # 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
-
-       ewarn
-       ewarn
-       ewarn
-       ewarn "Make SURE you have -fno-strict-aliasing in your CFLAGS "
-       ewarn "This version of gcc may miscompile certain type-punned "
-       ewarn "expressions. Expect problems if you ignore this warning"
-       ewarn
-       ewarn
-       ewarn
-}
-