add sys-devel/gcc-apple from Gentoo Prefix tree

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 1514 insertions, 0 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
new file mode 100644
index 000000000000..ab04dad1576a
--- /dev/null
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -0,0 +1,214 @@
+# ChangeLog for sys-devel/gcc-apple
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.5 2009/06/21 10:27:55 grobian Exp $
+
+*gcc-apple-4.2.1_p5574 (20 Jun 2009)
+*gcc-apple-4.0.1_p5493 (20 Jun 2009)
+
+  20 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.0.1_p5493.ebuild, +gcc-apple-4.2.1_p5574.ebuild:
+  Version bumps to Developer Tools 3.1.3 versions
+
+  01 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.2.1_p5566-r2.ebuild,
+  +files/gcc-apple-4.2.1_p5566-x86_64-defines.patch:
+  Add patch for x86_64-apple-darwin* support
+
+  01 May 2009; Fabian Groffen <grobian@gentoo.org>
+  files/gcc-apple-4.2.1-gfortran.patch:
+  Fix fortran support for powerpc targets
+
+*gcc-apple-4.2.1_p5566-r2 (26 Mar 2009)
+*gcc-apple-4.0.1_p5490-r2 (26 Mar 2009)
+
+  26 Mar 2009; Fabian Groffen <grobian@gentoo.org> metadata.xml,
+  -gcc-apple-4.0.1_p5490-r1.ebuild, +gcc-apple-4.0.1_p5490-r2.ebuild,
+  -gcc-apple-4.2.1_p5566-r1.ebuild, +gcc-apple-4.2.1_p5566-r2.ebuild:
+  Bump for fortran support in gcc-apple-4.2.1 and search path fixes mostly for
+  libtool
+
+  26 Mar 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/gcc-apple-4.2.1-prefix-search-dirs.patch,
+  gcc-apple-4.0.1_p5490-r1.ebuild, gcc-apple-4.2.1_p5566-r1.ebuild:
+  Add prefix search path patch by Heiko Przybyl. No revbump yet, as more
+  changes are pending.
+
+  07 Mar 2009; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5490-r1.ebuild, gcc-apple-4.2.1_p5566-r1.ebuild:
+  Remove libiberty.a, it is not needed and it conflicts with slots
+
+*gcc-apple-4.2.1_p5566-r1 (07 Mar 2009)
+*gcc-apple-4.0.1_p5490-r1 (07 Mar 2009)
+
+  07 Mar 2009; Fabian Groffen <grobian@gentoo.org>
+  -gcc-apple-4.0.1_p5490.ebuild, +gcc-apple-4.0.1_p5490-r1.ebuild,
+  -gcc-apple-4.2.1_p5566.ebuild, +gcc-apple-4.2.1_p5566-r1.ebuild:
+  Revert back to using --enable-version-specific-runtime-libs instead of
+  --libdir to make sure we get a correct include path for g++, bug #255315
+
+  18 Jan 2009; Fabian Groffen <grobian@gentoo.org>
+  -gcc-apple-4.0.1_p5363-r1.ebuild, -gcc-apple-4.0.1_p5465-r1.ebuild,
+  -gcc-apple-4.0.1_p5484.ebuild, -gcc-apple-4.0.1_p5488.ebuild,
+  -gcc-apple-4.2.1_p5564.ebuild:
+  Remove old
+
+  30 Dec 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.2.1_p5564.ebuild, gcc-apple-4.2.1_p5566.ebuild:
+  Fix nasty problem caught by fafhrd in #gentoo-prefix: don't overwrite
+  /dev/null, that truely ain't cool
+
+*gcc-apple-4.2.1_p5566 (21 Dec 2008)
+*gcc-apple-4.0.1_p5490 (21 Dec 2008)
+
+  21 Dec 2008; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.0.1_p5490.ebuild, +gcc-apple-4.2.1_p5566.ebuild:
+  Version bump to Xcode Tools 3.1.2
+
+  16 Nov 2008; Fabian Groffen <grobian@gentoo.org>
+  files/gcc-apple-4.2.1-dsymutil.patch:
+  Remove stray }, according to John Gibson on alt ML
+
+  10 Nov 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.2.1_p5564.ebuild:
+  Add fix from David Hubbard to get around a bootstrapping problem on 10.4/x86
+
+  09 Nov 2008; Fabian Groffen <grobian@gentoo.org>
+  +files/gcc-apple-4.2.1-dsymutil.patch, gcc-apple-4.2.1_p5564.ebuild:
+  Add patch for 10.4/x86 peeps, thanks David Hubbard for the research
+
+  12 Oct 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5465-r1.ebuild, gcc-apple-4.0.1_p5484.ebuild,
+  gcc-apple-4.0.1_p5488.ebuild, gcc-apple-4.2.1_p5564.ebuild:
+  Fix double prefix errors, bad me
+
+  12 Oct 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5465-r1.ebuild, gcc-apple-4.0.1_p5484.ebuild,
+  gcc-apple-4.0.1_p5488.ebuild, gcc-apple-4.2.1_p5564.ebuild:
+  Don't remove install-tools, it causes hickups
+
+*gcc-apple-4.0.1_p5488 (12 Oct 2008)
+
+  12 Oct 2008; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.0.1_p5488.ebuild:
+  Bump 4.0.1 to revision of iPhone 2.1 + SDK
+
+  11 Oct 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5465-r1.ebuild, gcc-apple-4.0.1_p5484.ebuild,
+  gcc-apple-4.2.1_p5564.ebuild:
+  Align with toolchain.eclass, do create versioned links, e.g. gcc-4.2.1
+
+  08 Oct 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-3.5.0_p3506-r1.ebuild, gcc-apple-4.0.1_p5363-r1.ebuild,
+  gcc-apple-4.0.1_p5465-r1.ebuild, gcc-apple-4.0.1_p5484.ebuild,
+  gcc-apple-4.2.1_p5564.ebuild:
+  Change dep from odcctools to binutils-apple
+
+*gcc-apple-4.2.1_p5564 (21 Aug 2008)
+
+  21 Aug 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5484.ebuild, -gcc-apple-4.2.1_p5553.ebuild,
+  +gcc-apple-4.2.1_p5564.ebuild:
+  Version bump to Xcode Tools 3.1
+
+*gcc-apple-4.0.1_p5484 (20 Jun 2008)
+
+  20 Jun 2008; Fabian Groffen <grobian@gentoo.org>
+  -gcc-apple-4.0.1_p5483.ebuild, +gcc-apple-4.0.1_p5484.ebuild:
+  Bump to iPhone SDK Beta 7
+
+*gcc-apple-4.2.1_p5553 (28 Mar 2008)
+*gcc-apple-4.0.1_p5470 (28 Mar 2008)
+
+  28 Mar 2008; Fabian Groffen <grobian@gentoo.org>
+  files/gcc-apple-4.0.1_p5465-default-altivec.patch,
+  +gcc-apple-4.0.1_p5470.ebuild, +gcc-apple-4.2.1_p5553.ebuild:
+  Bump to Xcode Tools 3.1 Beta version
+
+  07 Mar 2008; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5465-r1.ebuild, -gcc-apple-4.0.1_p5465-r2.ebuild,
+  gcc-apple-4.2.1_p5531.ebuild:
+  Cleaned up latest 4.0.1 and 4.2.1 ebuilds. Don't do multilib any more, its
+  broken by (partially our) design and quite useless.  Removed -r2 as it
+  was not a good idea.
+
+*gcc-apple-4.0.1_p5465-r2 (02 Mar 2008)
+
+  02 Mar 2008; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.0.1_p5465-r2.ebuild:
+  Add new revision (masked) that puts the libs by itself in usr/lib, which we
+  move out of the way and gcc-config should move back again.
+
+  20 Jan 2008; Elias Pipping <pipping@gentoo.org>
+  files/gcc-apple-4.2.1-texinfo.patch, gcc-apple-4.2.1_p5531.ebuild,
+  gcc-apple-4.2.1_p5531.ebuild:
+  enable manpages while not breaking libgomp
+
+*gcc-apple-4.0.1_p5465-r1 (12 Jan 2008)
+
+  12 Jan 2008; Fabian Groffen <grobian@gentoo.org>
+  +files/gcc-apple-4.0.1_p5465-default-altivec.patch,
+  -files/gcc-apple-5363-native-64bits.patch, -gcc-apple-4.0.1_p5465.ebuild,
+  +gcc-apple-4.0.1_p5465-r1.ebuild:
+  Add a patch to have 10.5's gcc default to AltiVec like 10.4's gcc did, as it
+  causes too much trouble
+
+  09 Nov 2007; Elias Pipping <pipping@gentoo.org>
+  gcc-apple-4.0.1_p5465.ebuild:
+  re-enable multilib on 64bit systems
+
+  06 Nov 2007; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5465.ebuild:
+  Set odcctools dependency to the 10.5 released one for 4.0.1_p5465, otherwise
+  it won't compile.  Marked ~ppc-macos.
+
+  05 Nov 2007; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5363-r1.ebuild, gcc-apple-4.0.1_p5465.ebuild,
+  gcc-apple-4.2.1_p5531.ebuild:
+  Cleaned up ebuilds, keyworded 4.2.1_p5531 ~ppc-macos, compiles on 10.4 after
+  removing any -m* flags.
+
+*gcc-apple-4.2.0_p5531 (02 Nov 2007)
+*gcc-apple-4.0.1_p5465 (02 Nov 2007)
+
+  02 Nov 2007; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.0.1_p5465.ebuild, +gcc-apple-4.2.0_p5531.ebuild:
+  Adding gcc-apple versions as released in 10.5, both don't compile on 10.4,
+  removed all keywords
+
+  19 Oct 2007; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5363-r1.ebuild:
+  Slight change to make gcc use Darwin libtool also in a cross-compile
+  environment.
+
+  10 Dec 2006; Fabian Groffen <grobian@gentoo.org> +metadata.xml:
+  Add metadata.xml
+
+  24 Nov 2006; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.0.1_p5363-r1.ebuild:
+  Don't install libiberty.a as this prevents installing multiple compilers
+  and isn't stricktly necessary.
+
+*gcc-apple-4.0.1_p5363-r1 (23 Nov 2006)
+*gcc-apple-3.5.0_p3506-r1 (23 Nov 2006)
+
+  23 Nov 2006; Fabian Groffen <grobian@gentoo.org>
+  -gcc-apple-3.3_p1819.ebuild, -gcc-apple-3.5.0_p3506.ebuild,
+  +gcc-apple-3.5.0_p3506-r1.ebuild, -gcc-apple-4.0.1_p5363.ebuild,
+  +gcc-apple-4.0.1_p5363-r1.ebuild:
+  Removed 3.3 as it doesn't compile anyway, fixed 3.5.0 and 4.0.1 to use
+  --enable-version-specific-runtime-libs which installs runtime-libs, such as
+  libstdc++ and libgcc_s into usr/lib/${CHOST}/gcc/${VER}
+
+*gcc-apple-4.0.1_p5363 (10 Nov 2006)
+*gcc-apple-3.5.0_p3506 (10 Nov 2006)
+*gcc-apple-3.3_p1819 (10 Nov 2006)
+
+  10 Nov 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/gcc-apple-5363-native-64bits.patch, +gcc-apple-3.3_p1819.ebuild,
+  +gcc-apple-3.5.0_p3506.ebuild, +gcc-apple-4.0.1_p5363.ebuild,
+  -gcc-apple-5247.ebuild, -gcc-apple-5341.ebuild, -gcc-apple-5341-r2.ebuild,
+  -gcc-apple-5363.ebuild:
+  New organisation of Apple's GCC ebuilds.  Ebuilds now carry the GCC
+  version in their name.  All ebuilds rely on gcc-config, and appropriate
+  slotting is applied.
+
diff --git a/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild b/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild
new file mode 100644
index 000000000000..5a4ff3b2961b
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-3.5.0_p3506-r1.ebuild,v 1.1 2009/06/21 10:27:55 grobian Exp $
+
+inherit eutils
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS=${PV/*_p/}
+DESCRIPTION="Apple branch of the GNU Compiler Collection"
+HOMEPAGE="http://gcc.gnu.org"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_os_35-${APPLE_VERS}.tar.gz"
+
+LICENSE="APSL-2 GPL-2"
+SLOT="35"
+
+KEYWORDS="~ppc-macos"
+
+IUSE="nls fortran objc nocxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
+	>=sys-devel/gcc-config-1.3.12-r4"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	sys-devel/binutils-apple"
+
+S=${WORKDIR}/gcc_os_35-${APPLE_VERS}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# we use our libtool
+	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/libtool:" \
+		gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+	# add prefixed Frameworks to default search paths
+	sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   \"${EPREFIX}/Frameworks\"\, " \
+		gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+	# Workaround deprecated "+Nc" syntax for GNU tail(1)
+	sed -i -e "s:tail +16c:tail -c +16:g" \
+		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+}
+
+src_compile() {
+	local langs="c"
+	use nocxx || langs="${langs},c++"
+	use fortran && langs="${langs},f77"
+	use objc && langs="${langs},objc"
+
+	local myconf="${myconf} \
+		--prefix=${EPREFIX}/usr \
+		--bindir=${EPREFIX}/usr/${CHOST}/gcc-bin/${GCC_VERS} \
+		--includedir=${EPREFIX}/usr/lib/gcc/${CHOST}/${GCC_VERS}/include \
+		--datadir=${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS} \
+		--mandir=${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man \
+		--infodir=${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info \
+		--with-gxx-include-dir=${EPREFIX}/usr/lib/gcc/${CHOST}/${GCC_VERS}/include/g++-v${GCC_VERS/\.*/} \
+		--host=${CHOST} \
+		--enable-version-specific-runtime-libs"
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# Straight from the GCC install doc:
+	# "GCC has code to correctly determine the correct value for target
+	# for nearly all native systems. Therefore, we highly recommend you
+	# not provide a configure target when configuring a native compiler."
+
+	# Native Language Support
+	if use nls ; then
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# reasonably sane globals (hopefully)
+	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
+	myconf="${myconf} \
+		--with-system-zlib \
+		--disable-checking \
+		--disable-werror \
+		--disable-libunwind-exceptions"
+
+	# languages to build
+	myconf="${myconf} --enable-languages=${langs}"
+
+	# ???
+	myconf="${myconf} --enable-shared --enable-threads=posix"
+
+	# make clear we're in an offset
+	use prefix && myconf="${myconf} --with-local-prefix=${EPREFIX}/usr"
+
+	# we don't use a GNU linker, so tell GCC where to find the linker stuff we
+	# want it to use
+	myconf="${myconf} \
+		--with-as=${EPREFIX}/usr/bin/as \
+		--with-ld=${EPREFIX}/usr/bin/ld"
+
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
+	einfo "Configuring GCC with: ${myconf//--/\n\t--}"
+	"${S}"/configure ${myconf} || die "conf failed"
+	make -j1 bootstrap || die "emake failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+
+	cd "${WORKDIR}"/build
+	make DESTDIR="${D}" install || die
+
+	use build && rm -rf "${ED}"/usr/{man,share}
+	find "${ED}" -name libiberty.a -exec rm -f {} \;
+
+	# create gcc-config entry
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CHOST}-${GCC_VERS}"
+
+	gcc_envd_file="${ED}${gcc_envd_base}"
+
+	echo "PATH=\"${EPREFIX}/usr/${CHOST}/gcc-bin/${GCC_VERS}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${EPREFIX}/usr/${CHOST}/gcc-bin/${GCC_VERS}\"" >> ${gcc_envd_file}
+
+	LDPATH="${EPREFIX}/usr/lib/gcc/${CHOST}/${GCC_VERS}"
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+
+	BITS=$(${ED}/usr/${CHOST}/gcc-bin/${GCC_VERS}/gcc -dumpspecs | grep -A1 multilib: | tail -n1 | grep -o 64 | head -n1)
+	[[ -z ${BITS} ]] \
+		&& BITS="32" \
+		|| BITS="32 ${BITS}"
+	echo "GCCBITS=\"${BITS}\"" >> ${gcc_envd_file}
+
+	echo "MANPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
+}
+
+pkg_postinst() {
+	# beware this also switches when it's on another branch version of GCC
+	gcc-config ${CHOST}-${GCC_VERS}
+}
diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild
new file mode 100644
index 000000000000..adce7f7d1536
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.0.1_p5490-r2.ebuild,v 1.1 2009/06/21 10:27:55 grobian Exp $
+
+ETYPE="gcc-compiler"
+
+inherit eutils toolchain prefix
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS=${PV/*_p/}
+DESCRIPTION="Apple branch of the GNU Compiler Collection, Xcode Tools 3.1.2"
+HOMEPAGE="http://gcc.gnu.org"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz"
+LICENSE="APSL-2 GPL-2"
+
+if is_crosscompile; then
+	SLOT="${CTARGET}-40"
+else
+	SLOT="40"
+fi
+
+KEYWORDS="~ppc-macos ~x86-macos"
+
+IUSE="nls objc objc++ nocxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	${CATEGORY}/binutils-apple"
+
+S=${WORKDIR}/gcc-${APPLE_VERS}
+
+# TPREFIX is the prefix of the CTARGET installation
+export TPREFIX=${TPREFIX:-${EPREFIX}}
+
+LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+if is_crosscompile ; then
+	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+else
+	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+fi
+STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# we use our libtool
+	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
+		gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+	# add prefixed Frameworks to default search paths (may want to change this
+	# in a cross-compile)
+	sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   \"${EPREFIX}/Frameworks\"\, " \
+		gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+	# Workaround deprecated "+Nc" syntax for GNU tail(1)
+	sed -i -e "s:tail +16c:tail -c +16:g" \
+		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+
+	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
+
+	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
+	eprefixify "${S}"/gcc/gcc.c
+}
+
+src_compile() {
+	local langs="c"
+	use nocxx || langs="${langs},c++"
+	use objc && langs="${langs},objc"
+	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
+
+	local myconf="${myconf} \
+		--prefix=${EPREFIX}/usr \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS} \
+		--mandir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/man \
+		--infodir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/info \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--host=${CHOST}
+		--enable-version-specific-runtime-libs"
+
+	if is_crosscompile ; then
+		# Straight from the GCC install doc:
+		# "GCC has code to correctly determine the correct value for target
+		# for nearly all native systems. Therefore, we highly recommend you
+		# not provide a configure target when configuring a native compiler."
+		myconf="${myconf} --target=${CTARGET}"
+
+		# Tell compiler where to find what it needs
+		myconf="${myconf} --with-sysroot=${EPREFIX}/usr/${CTARGET}"
+
+		# Set this to something sane for both native and target
+		CFLAGS="-O2 -pipe"
+
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CXXFLAGS=${!VAR}
+	fi
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# Native Language Support
+	if use nls ; then
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# reasonably sane globals (hopefully)
+	myconf="${myconf} \
+		--with-system-zlib \
+		--disable-checking \
+		--disable-werror"
+
+	# languages to build
+	myconf="${myconf} --enable-languages=${langs}"
+
+	# ???
+	myconf="${myconf} --enable-shared --enable-threads=posix"
+
+	# make clear we're in an offset
+	use prefix && myconf="${myconf} --with-local-prefix=${TPREFIX}/usr"
+
+	# we don't use a GNU linker, so tell GCC where to find the linker stuff we
+	# want it to use
+	myconf="${myconf} \
+		--with-as=${EPREFIX}/usr/bin/${CTARGET}-as \
+		--with-ld=${EPREFIX}/usr/bin/${CTARGET}-ld"
+
+	# make sure we never do multilib stuff, for that we need a different Prefix
+	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
+		&& myconf="${myconf} --disable-multilib"
+
+	# The produced libgcc_s.dylib is faulty if using a bit too much
+	# optimisation.  Nail it down to something sane
+	CFLAGS="-O2 -pipe"
+	CXXFLAGS=${CFLAGS}
+
+	# http://gcc.gnu.org/ml/gcc-patches/2006-11/msg00765.html
+	# (won't hurt if already 64-bits, but is essential when coming from a
+	# multilib compiler -- the default)
+	[[ ${CTARGET} == powerpc64-* || ${CTARGET} == x86_64-* ]] && \
+		export CC="gcc -m64"
+
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
+	einfo "Configuring GCC with: ${myconf//--/\n\t--}"
+	"${S}"/configure ${myconf} || die "conf failed"
+	emake bootstrap || die "emake failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+
+	cd "${WORKDIR}"/build
+	# -jX doesn't work
+	emake -j1 DESTDIR="${D}" install || die
+
+	# Punt some tools which are really only useful while building gcc
+	find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
+	# This one comes with binutils
+	find "${ED}" -name libiberty.a -exec rm -f "{}" \;
+
+	# Basic sanity check
+	if ! is_crosscompile ; then
+		local EXEEXT
+		eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
+		[[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}"
+	fi
+
+	# create gcc-config entry
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CHOST}-${GCC_VERS}"
+
+	gcc_envd_file="${ED}${gcc_envd_base}"
+
+	# phase PATH/ROOTPATH out ...
+	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+	echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+
+	# we don't do multilib
+	LDPATH="${LIBPATH}"
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+	echo "MANPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
+	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
+
+	# 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
+	dodir /usr/bin
+	cd "${D}"${BINPATH}
+	for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
+
+		if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then
+			ln -sf ${CTARGET}-${x} ${x}
+
+			# Create version-ed symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${x}-${GCC_VERS}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_VERS} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_VERS}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_VERS}
+		fi
+	done
+
+	# I do not know if this will break gcj stuff, so I'll only do it for
+	#	objc for now; basically "ffi.h" is the correct file to include,
+	#	but it gets installed in .../GCCVER/include and yet it does
+	#	"#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+	#	is installed in .../GCCVER/include/libffi; the following fixes
+	#	ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+	if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then
+		mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die
+		rm -r "${D}"${LIBPATH}/include/libffi || die
+	fi
+
+	# Now do the fun stripping stuff
+	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
+	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
+	# gcc used to install helper binaries in lib/ but then moved to libexec/
+	[[ -d ${ED}/usr/libexec/gcc ]] && \
+		env RESTRICT="" CHOST=${CHOST} prepstrip "${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
+
+	# prune empty dirs left behind
+	find "${ED}" -type d | xargs rmdir >& /dev/null
+}
+
+pkg_postinst() {
+	# beware this also switches when it's on another branch version of GCC
+	gcc-config ${CTARGET}-${GCC_VERS}
+}
+
+pkg_postrm() {
+	local EROOT=${EROOT-${ROOT}}
+
+	# clean up the cruft left behind by cross-compilers
+	if is_crosscompile ; then
+		if [[ -z $(ls "${EROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			rm -f "${EROOT}"/etc/env.d/gcc/config-${CTARGET}
+			rm -f "${EROOT}"/etc/env.d/??gcc-${CTARGET}
+			rm -f "${EROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
+		fi
+		return 0
+	fi
+}
diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
new file mode 100644
index 000000000000..ea6ac062d50f
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild,v 1.1 2009/06/21 10:27:55 grobian Exp $
+
+ETYPE="gcc-compiler"
+
+inherit eutils toolchain prefix
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS=${PV/*_p/}
+DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 3.1.3"
+HOMEPAGE="http://gcc.gnu.org"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz"
+LICENSE="APSL-2 GPL-2"
+
+if is_crosscompile; then
+	SLOT="${CTARGET}-40"
+else
+	SLOT="40"
+fi
+
+KEYWORDS="~ppc-macos ~x86-macos"
+
+IUSE="nls objc objc++ nocxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	${CATEGORY}/binutils-apple"
+
+S=${WORKDIR}/gcc-${APPLE_VERS}
+
+# TPREFIX is the prefix of the CTARGET installation
+export TPREFIX=${TPREFIX:-${EPREFIX}}
+
+LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+if is_crosscompile ; then
+	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+else
+	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+fi
+STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# we use our libtool
+	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
+		gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+	# add prefixed Frameworks to default search paths (may want to change this
+	# in a cross-compile)
+	sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   \"${EPREFIX}/Frameworks\"\, " \
+		gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+	# Workaround deprecated "+Nc" syntax for GNU tail(1)
+	sed -i -e "s:tail +16c:tail -c +16:g" \
+		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+
+	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
+
+	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
+	eprefixify "${S}"/gcc/gcc.c
+}
+
+src_compile() {
+	local langs="c"
+	use nocxx || langs="${langs},c++"
+	use objc && langs="${langs},objc"
+	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
+
+	local myconf="${myconf} \
+		--prefix=${EPREFIX}/usr \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS} \
+		--mandir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/man \
+		--infodir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/info \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--host=${CHOST}
+		--enable-version-specific-runtime-libs"
+
+	if is_crosscompile ; then
+		# Straight from the GCC install doc:
+		# "GCC has code to correctly determine the correct value for target
+		# for nearly all native systems. Therefore, we highly recommend you
+		# not provide a configure target when configuring a native compiler."
+		myconf="${myconf} --target=${CTARGET}"
+
+		# Tell compiler where to find what it needs
+		myconf="${myconf} --with-sysroot=${EPREFIX}/usr/${CTARGET}"
+
+		# Set this to something sane for both native and target
+		CFLAGS="-O2 -pipe"
+
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CXXFLAGS=${!VAR}
+	fi
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# Native Language Support
+	if use nls ; then
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# reasonably sane globals (hopefully)
+	myconf="${myconf} \
+		--with-system-zlib \
+		--disable-checking \
+		--disable-werror"
+
+	# languages to build
+	myconf="${myconf} --enable-languages=${langs}"
+
+	# ???
+	myconf="${myconf} --enable-shared --enable-threads=posix"
+
+	# make clear we're in an offset
+	use prefix && myconf="${myconf} --with-local-prefix=${TPREFIX}/usr"
+
+	# we don't use a GNU linker, so tell GCC where to find the linker stuff we
+	# want it to use
+	myconf="${myconf} \
+		--with-as=${EPREFIX}/usr/bin/${CTARGET}-as \
+		--with-ld=${EPREFIX}/usr/bin/${CTARGET}-ld"
+
+	# make sure we never do multilib stuff, for that we need a different Prefix
+	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
+		&& myconf="${myconf} --disable-multilib"
+
+	# The produced libgcc_s.dylib is faulty if using a bit too much
+	# optimisation.  Nail it down to something sane
+	CFLAGS="-O2 -pipe"
+	CXXFLAGS=${CFLAGS}
+
+	# http://gcc.gnu.org/ml/gcc-patches/2006-11/msg00765.html
+	# (won't hurt if already 64-bits, but is essential when coming from a
+	# multilib compiler -- the default)
+	[[ ${CTARGET} == powerpc64-* || ${CTARGET} == x86_64-* ]] && \
+		export CC="gcc -m64"
+
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
+	einfo "Configuring GCC with: ${myconf//--/\n\t--}"
+	"${S}"/configure ${myconf} || die "conf failed"
+	emake bootstrap || die "emake failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+
+	cd "${WORKDIR}"/build
+	# -jX doesn't work
+	emake -j1 DESTDIR="${D}" install || die
+
+	# Punt some tools which are really only useful while building gcc
+	find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
+	# This one comes with binutils
+	find "${ED}" -name libiberty.a -exec rm -f "{}" \;
+
+	# Basic sanity check
+	if ! is_crosscompile ; then
+		local EXEEXT
+		eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
+		[[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}"
+	fi
+
+	# create gcc-config entry
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CHOST}-${GCC_VERS}"
+
+	gcc_envd_file="${ED}${gcc_envd_base}"
+
+	# phase PATH/ROOTPATH out ...
+	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+	echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+
+	# we don't do multilib
+	LDPATH="${LIBPATH}"
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+	echo "MANPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
+	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
+
+	# 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
+	dodir /usr/bin
+	cd "${D}"${BINPATH}
+	for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
+
+		if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then
+			ln -sf ${CTARGET}-${x} ${x}
+
+			# Create version-ed symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${x}-${GCC_VERS}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_VERS} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_VERS}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_VERS}
+		fi
+	done
+
+	# I do not know if this will break gcj stuff, so I'll only do it for
+	#	objc for now; basically "ffi.h" is the correct file to include,
+	#	but it gets installed in .../GCCVER/include and yet it does
+	#	"#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+	#	is installed in .../GCCVER/include/libffi; the following fixes
+	#	ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+	if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then
+		mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die
+		rm -r "${D}"${LIBPATH}/include/libffi || die
+	fi
+
+	# Now do the fun stripping stuff
+	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
+	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
+	# gcc used to install helper binaries in lib/ but then moved to libexec/
+	[[ -d ${ED}/usr/libexec/gcc ]] && \
+		env RESTRICT="" CHOST=${CHOST} prepstrip "${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
+
+	# prune empty dirs left behind
+	find "${ED}" -type d | xargs rmdir >& /dev/null
+}
+
+pkg_postinst() {
+	# beware this also switches when it's on another branch version of GCC
+	gcc-config ${CTARGET}-${GCC_VERS}
+}
+
+pkg_postrm() {
+	local EROOT=${EROOT-${ROOT}}
+
+	# clean up the cruft left behind by cross-compilers
+	if is_crosscompile ; then
+		if [[ -z $(ls "${EROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			rm -f "${EROOT}"/etc/env.d/gcc/config-${CTARGET}
+			rm -f "${EROOT}"/etc/env.d/??gcc-${CTARGET}
+			rm -f "${EROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
+		fi
+		return 0
+	fi
+}
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
new file mode 100644
index 000000000000..e3156f9b9705
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild,v 1.1 2009/06/21 10:27:55 grobian Exp $
+
+ETYPE="gcc-compiler"
+
+inherit eutils toolchain flag-o-matic autotools prefix
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS=${PV/*_p/}
+LIBSTDCXX_APPLE_VERSION=16
+DESCRIPTION="Apple branch of the GNU Compiler Collection, Xcode Tools 3.1.2"
+HOMEPAGE="http://gcc.gnu.org"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_42-${APPLE_VERS}.tar.gz
+		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-${LIBSTDCXX_APPLE_VERSION}.tar.gz
+		fortran? ( mirror://gnu/gcc/gcc-${GCC_VERS}/gcc-fortran-${GCC_VERS}.tar.bz2 )"
+LICENSE="APSL-2 GPL-2"
+
+if is_crosscompile; then
+	SLOT="${CTARGET}-42"
+else
+	SLOT="42"
+fi
+
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="fortran nls objc objc++ nocxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
+	>=sys-devel/gcc-config-1.3.12-r4
+	fortran? (
+		>=dev-libs/gmp-4.2.1
+		>=dev-libs/mpfr-2.2.0_p10
+	)"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	${CATEGORY}/binutils-apple
+	>=dev-libs/mpfr-2.2.0_p10"
+
+S=${WORKDIR}/gcc_42-${APPLE_VERS}
+
+# TPREFIX is the prefix of the CTARGET installation
+export TPREFIX=${TPREFIX:-${EPREFIX}}
+
+LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+if is_crosscompile ; then
+	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+else
+	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+fi
+STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Support for fortran
+	if use fortran ; then
+		cd "${WORKDIR}"/gcc-${GCC_VERS}
+		# hmmm, just use rsync?
+		tar cf - * | ( cd "${S}" && tar xf - )
+		cd "${S}"
+		# from: http://r.research.att.com/tools/
+		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-gfortran.patch
+	fi
+
+	# we use our libtool
+	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
+		gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+	# add prefixed Frameworks to default search paths (may want to change this
+	# in a cross-compile)
+	sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   \"${EPREFIX}/Frameworks\"\, " \
+		gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+	# Workaround deprecated "+Nc" syntax for GNU tail(1)
+	sed -i -e "s:tail +16c:tail -c +16:g" \
+		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+
+	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
+	epatch "${FILESDIR}"/${P}-x86_64-defines.patch
+
+	# dsymutil stuff breaks on 10.4/x86, revert it
+	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
+		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch
+
+	# bootstrapping might fail with host provided gcc on 10.4/x86
+	if ! is_crosscompile && ! echo "int main(){return 0;}" | gcc -o "${T}"/foo \
+		-mdynamic-no-pic -x c - >/dev/null 2>&1;
+	then
+		einfo "-mdynamic-no-pic doesn't work - disabling..."
+		echo "BOOT_CFLAGS=-g -O2" > config/mh-x86-darwin
+		XD=gcc/config/i386/x-darwin
+		awk 'BEGIN{x=1}{if ($0 ~ "use -mdynamic-no-pic to build x86")
+		{x=1-x} else if (x) print}' $XD > t && mv t $XD \
+			|| die "Failed to rewrite $XD"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
+	eprefixify "${S}"/gcc/gcc.c
+
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	cd "${S}"/gcc && eautoconf
+	cd "${S}"/libgomp && eautoconf
+
+	cd "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx
+	epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch
+}
+
+src_compile() {
+	local langs="c"
+	use nocxx || langs="${langs},c++"
+	use objc && langs="${langs},objc"
+	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
+	use fortran && langs="${langs},fortran"
+
+	local myconf="${myconf} \
+		--prefix=${EPREFIX}/usr \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS} \
+		--mandir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/man \
+		--infodir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/info \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--host=${CHOST}
+		--enable-version-specific-runtime-libs"
+
+	if is_crosscompile ; then
+		# Straight from the GCC install doc:
+		# "GCC has code to correctly determine the correct value for target
+		# for nearly all native systems. Therefore, we highly recommend you
+		# not provide a configure target when configuring a native compiler."
+		myconf="${myconf} --target=${CTARGET}"
+
+		# Tell compiler where to find what it needs
+		myconf="${myconf} --with-sysroot=${EPREFIX}/usr/${CTARGET}"
+
+		# Set this to something sane for both native and target
+		CFLAGS="-O2 -pipe"
+
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CXXFLAGS=${!VAR}
+	fi
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# Native Language Support
+	if use nls ; then
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# reasonably sane globals (hopefully)
+	myconf="${myconf} \
+		--with-system-zlib \
+		--disable-checking \
+		--disable-werror"
+
+	# ???
+	myconf="${myconf} --enable-shared --enable-threads=posix"
+
+	# make clear we're in an offset
+	use prefix && myconf="${myconf} --with-local-prefix=${TPREFIX}/usr"
+
+	# we don't use a GNU linker, so tell GCC where to find the linker stuff we
+	# want it to use
+	myconf="${myconf} \
+		--with-as=${EPREFIX}/usr/bin/${CTARGET}-as \
+		--with-ld=${EPREFIX}/usr/bin/${CTARGET}-ld"
+
+	# make sure we never do multilib stuff, for that we need a different Prefix
+	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
+		&& myconf="${myconf} --disable-multilib"
+
+	#libstdcxx does not support this one
+	local gccconf="${myconf} --enable-languages=${langs}"
+
+	# The produced libgcc_s.dylib is faulty if using a bit too much
+	# optimisation.  Nail it down to something sane
+	CFLAGS="-O2 -pipe"
+	CXXFLAGS=${CFLAGS}
+
+	# http://gcc.gnu.org/ml/gcc-patches/2006-11/msg00765.html
+	# (won't hurt if already 64-bits, but is essential when coming from a
+	# multilib compiler -- the default)
+	[[ ${CTARGET} == powerpc64-* || ${CTARGET} == x86_64-* ]] && \
+		export CC="gcc -m64"
+
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
+	einfo "Configuring GCC with: ${gccconf//--/\n\t--}"
+	"${S}"/configure ${gccconf} || die "conf failed"
+	emake bootstrap || die "emake failed"
+
+	local libstdcxxconf="${myconf} --disable-libstdcxx-debug"
+	mkdir -p "${WORKDIR}"/build_libstdcxx || die
+	cd "${WORKDIR}"/build_libstdcxx
+	#the build requires the gcc built before, so link to it
+	ln -s "${WORKDIR}"/build/gcc "${WORKDIR}"/build_libstdcxx/gcc || die
+	einfo "Configuring libstdcxx with: ${libstdcxxconf//--/\n\t--}"
+	"${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/configure ${libstdcxxconf} || die "conf failed"
+	emake all || die "emake failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+
+	cd "${WORKDIR}"/build
+	# -jX doesn't work
+	emake -j1 DESTDIR="${D}" install || die
+
+	cd "${WORKDIR}"/build_libstdcxx
+	emake -j1 DESTDIR="${D}" install || die
+	cd "${WORKDIR}"/build
+
+	# Punt some tools which are really only useful while building gcc
+	find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
+	# This one comes with binutils
+	find "${ED}" -name libiberty.a -exec rm -f "{}" \;
+
+	# Basic sanity check
+	if ! is_crosscompile ; then
+		local EXEEXT
+		eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
+		[[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}"
+	fi
+
+	# create gcc-config entry
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CHOST}-${GCC_VERS}"
+
+	gcc_envd_file="${ED}${gcc_envd_base}"
+
+	# phase PATH/ROOTPATH out ...
+	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+	echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+
+	# we don't do multilib
+	LDPATH="${LIBPATH}"
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+	echo "MANPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
+	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
+
+	# 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
+	dodir /usr/bin
+	cd "${D}"${BINPATH}
+	for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
+
+		if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then
+			ln -sf ${CTARGET}-${x} ${x}
+
+			# Create version-ed symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${x}-${GCC_VERS}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_VERS} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_VERS}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_VERS}
+		fi
+	done
+
+	# I do not know if this will break gcj stuff, so I'll only do it for
+	#	objc for now; basically "ffi.h" is the correct file to include,
+	#	but it gets installed in .../GCCVER/include and yet it does
+	#	"#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+	#	is installed in .../GCCVER/include/libffi; the following fixes
+	#	ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+	if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then
+		mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die
+		rm -r "${D}"${LIBPATH}/include/libffi || die
+	fi
+
+	# Now do the fun stripping stuff
+	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
+	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
+	# gcc used to install helper binaries in lib/ but then moved to libexec/
+	[[ -d ${ED}/usr/libexec/gcc ]] && \
+		env RESTRICT="" CHOST=${CHOST} prepstrip "${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
+
+	# prune empty dirs left behind
+	find "${ED}" -type d | xargs rmdir >& /dev/null
+}
+
+pkg_postinst() {
+	# beware this also switches when it's on another branch version of GCC
+	gcc-config ${CTARGET}-${GCC_VERS}
+}
+
+pkg_postrm() {
+	local EROOT=${EROOT-${ROOT}}
+
+	# clean up the cruft left behind by cross-compilers
+	if is_crosscompile ; then
+		if [[ -z $(ls "${EROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			rm -f "${EROOT}"/etc/env.d/gcc/config-${CTARGET}
+			rm -f "${EROOT}"/etc/env.d/??gcc-${CTARGET}
+			rm -f "${EROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
+		fi
+		return 0
+	fi
+}
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
new file mode 100644
index 000000000000..e86e28dacbbb
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.1 2009/06/21 10:27:55 grobian Exp $
+
+ETYPE="gcc-compiler"
+
+inherit eutils toolchain flag-o-matic autotools prefix
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS=${PV/*_p/}
+LIBSTDCXX_APPLE_VERSION=16
+DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 3.1.3"
+HOMEPAGE="http://gcc.gnu.org"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_42-${APPLE_VERS}.tar.gz
+		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-${LIBSTDCXX_APPLE_VERSION}.tar.gz
+		fortran? ( mirror://gnu/gcc/gcc-${GCC_VERS}/gcc-fortran-${GCC_VERS}.tar.bz2 )"
+LICENSE="APSL-2 GPL-2"
+
+if is_crosscompile; then
+	SLOT="${CTARGET}-42"
+else
+	SLOT="42"
+fi
+
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="fortran nls objc objc++ nocxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
+	>=sys-devel/gcc-config-1.3.12-r4
+	fortran? (
+		>=dev-libs/gmp-4.2.1
+		>=dev-libs/mpfr-2.2.0_p10
+	)"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	${CATEGORY}/binutils-apple
+	>=dev-libs/mpfr-2.2.0_p10"
+
+S=${WORKDIR}/gcc_42-${APPLE_VERS}
+
+# TPREFIX is the prefix of the CTARGET installation
+export TPREFIX=${TPREFIX:-${EPREFIX}}
+
+LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+if is_crosscompile ; then
+	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+else
+	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+fi
+STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Support for fortran
+	if use fortran ; then
+		cd "${WORKDIR}"/gcc-${GCC_VERS}
+		# hmmm, just use rsync?
+		tar cf - * | ( cd "${S}" && tar xf - )
+		cd "${S}"
+		# from: http://r.research.att.com/tools/
+		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-gfortran.patch
+	fi
+
+	# we use our libtool
+	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
+		gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+	# add prefixed Frameworks to default search paths (may want to change this
+	# in a cross-compile)
+	sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   \"${EPREFIX}/Frameworks\"\, " \
+		gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+	# Workaround deprecated "+Nc" syntax for GNU tail(1)
+	sed -i -e "s:tail +16c:tail -c +16:g" \
+		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+
+	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
+	epatch "${FILESDIR}"/${PN}-4.2.1_p5566-x86_64-defines.patch
+
+	# dsymutil stuff breaks on 10.4/x86, revert it
+	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
+		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch
+
+	# bootstrapping might fail with host provided gcc on 10.4/x86
+	if ! is_crosscompile && ! echo "int main(){return 0;}" | gcc -o "${T}"/foo \
+		-mdynamic-no-pic -x c - >/dev/null 2>&1;
+	then
+		einfo "-mdynamic-no-pic doesn't work - disabling..."
+		echo "BOOT_CFLAGS=-g -O2" > config/mh-x86-darwin
+		XD=gcc/config/i386/x-darwin
+		awk 'BEGIN{x=1}{if ($0 ~ "use -mdynamic-no-pic to build x86")
+		{x=1-x} else if (x) print}' $XD > t && mv t $XD \
+			|| die "Failed to rewrite $XD"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
+	eprefixify "${S}"/gcc/gcc.c
+
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	cd "${S}"/gcc && eautoconf
+	cd "${S}"/libgomp && eautoconf
+
+	cd "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx
+	epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch
+}
+
+src_compile() {
+	local langs="c"
+	use nocxx || langs="${langs},c++"
+	use objc && langs="${langs},objc"
+	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
+	use fortran && langs="${langs},fortran"
+
+	local myconf="${myconf} \
+		--prefix=${EPREFIX}/usr \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS} \
+		--mandir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/man \
+		--infodir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/info \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--host=${CHOST}
+		--enable-version-specific-runtime-libs"
+
+	if is_crosscompile ; then
+		# Straight from the GCC install doc:
+		# "GCC has code to correctly determine the correct value for target
+		# for nearly all native systems. Therefore, we highly recommend you
+		# not provide a configure target when configuring a native compiler."
+		myconf="${myconf} --target=${CTARGET}"
+
+		# Tell compiler where to find what it needs
+		myconf="${myconf} --with-sysroot=${EPREFIX}/usr/${CTARGET}"
+
+		# Set this to something sane for both native and target
+		CFLAGS="-O2 -pipe"
+
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CXXFLAGS=${!VAR}
+	fi
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# Native Language Support
+	if use nls ; then
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# reasonably sane globals (hopefully)
+	myconf="${myconf} \
+		--with-system-zlib \
+		--disable-checking \
+		--disable-werror"
+
+	# ???
+	myconf="${myconf} --enable-shared --enable-threads=posix"
+
+	# make clear we're in an offset
+	use prefix && myconf="${myconf} --with-local-prefix=${TPREFIX}/usr"
+
+	# we don't use a GNU linker, so tell GCC where to find the linker stuff we
+	# want it to use
+	myconf="${myconf} \
+		--with-as=${EPREFIX}/usr/bin/${CTARGET}-as \
+		--with-ld=${EPREFIX}/usr/bin/${CTARGET}-ld"
+
+	# make sure we never do multilib stuff, for that we need a different Prefix
+	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
+		&& myconf="${myconf} --disable-multilib"
+
+	#libstdcxx does not support this one
+	local gccconf="${myconf} --enable-languages=${langs}"
+
+	# The produced libgcc_s.dylib is faulty if using a bit too much
+	# optimisation.  Nail it down to something sane
+	CFLAGS="-O2 -pipe"
+	CXXFLAGS=${CFLAGS}
+
+	# http://gcc.gnu.org/ml/gcc-patches/2006-11/msg00765.html
+	# (won't hurt if already 64-bits, but is essential when coming from a
+	# multilib compiler -- the default)
+	[[ ${CTARGET} == powerpc64-* || ${CTARGET} == x86_64-* ]] && \
+		export CC="gcc -m64"
+
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
+	einfo "Configuring GCC with: ${gccconf//--/\n\t--}"
+	"${S}"/configure ${gccconf} || die "conf failed"
+	emake bootstrap || die "emake failed"
+
+	local libstdcxxconf="${myconf} --disable-libstdcxx-debug"
+	mkdir -p "${WORKDIR}"/build_libstdcxx || die
+	cd "${WORKDIR}"/build_libstdcxx
+	#the build requires the gcc built before, so link to it
+	ln -s "${WORKDIR}"/build/gcc "${WORKDIR}"/build_libstdcxx/gcc || die
+	einfo "Configuring libstdcxx with: ${libstdcxxconf//--/\n\t--}"
+	"${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/configure ${libstdcxxconf} || die "conf failed"
+	emake all || die "emake failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+
+	cd "${WORKDIR}"/build
+	# -jX doesn't work
+	emake -j1 DESTDIR="${D}" install || die
+
+	cd "${WORKDIR}"/build_libstdcxx
+	emake -j1 DESTDIR="${D}" install || die
+	cd "${WORKDIR}"/build
+
+	# Punt some tools which are really only useful while building gcc
+	find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
+	# This one comes with binutils
+	find "${ED}" -name libiberty.a -exec rm -f "{}" \;
+
+	# Basic sanity check
+	if ! is_crosscompile ; then
+		local EXEEXT
+		eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
+		[[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}"
+	fi
+
+	# create gcc-config entry
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CHOST}-${GCC_VERS}"
+
+	gcc_envd_file="${ED}${gcc_envd_base}"
+
+	# phase PATH/ROOTPATH out ...
+	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+	echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+
+	# we don't do multilib
+	LDPATH="${LIBPATH}"
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+	echo "MANPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
+	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
+
+	# 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
+	dodir /usr/bin
+	cd "${D}"${BINPATH}
+	for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
+
+		if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then
+			ln -sf ${CTARGET}-${x} ${x}
+
+			# Create version-ed symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${x}-${GCC_VERS}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_VERS} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_VERS}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_VERS}
+		fi
+	done
+
+	# I do not know if this will break gcj stuff, so I'll only do it for
+	#	objc for now; basically "ffi.h" is the correct file to include,
+	#	but it gets installed in .../GCCVER/include and yet it does
+	#	"#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+	#	is installed in .../GCCVER/include/libffi; the following fixes
+	#	ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+	if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then
+		mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die
+		rm -r "${D}"${LIBPATH}/include/libffi || die
+	fi
+
+	# Now do the fun stripping stuff
+	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
+	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
+	# gcc used to install helper binaries in lib/ but then moved to libexec/
+	[[ -d ${ED}/usr/libexec/gcc ]] && \
+		env RESTRICT="" CHOST=${CHOST} prepstrip "${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
+
+	# prune empty dirs left behind
+	find "${ED}" -type d | xargs rmdir >& /dev/null
+}
+
+pkg_postinst() {
+	# beware this also switches when it's on another branch version of GCC
+	gcc-config ${CTARGET}-${GCC_VERS}
+}
+
+pkg_postrm() {
+	local EROOT=${EROOT-${ROOT}}
+
+	# clean up the cruft left behind by cross-compilers
+	if is_crosscompile ; then
+		if [[ -z $(ls "${EROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			rm -f "${EROOT}"/etc/env.d/gcc/config-${CTARGET}
+			rm -f "${EROOT}"/etc/env.d/??gcc-${CTARGET}
+			rm -f "${EROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
+		fi
+		return 0
+	fi
+}
diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml
new file mode 100644
index 000000000000..2dc2044ae29e
--- /dev/null
+++ b/sys-devel/gcc-apple/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>apple</herd>
+  <use>
+    <flag name="multislot">Allow for SLOTs to include minor version (3.3.4
+      instead of just 3.3)</flag>
+    <flag name="objc">Build support for the Objective C code language</flag>
+    <flag name="objc++">Build support for the Objective C++ language</flag>
+  </use>
+</pkgmetadata>