[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

[Fabian Groffen]

commit:     9f23086e359dff075c17452007379dfd53a1f030
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 19:30:56 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 19:32:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f23086e

sys-devel/gcc-apple: drop old versions, fix missing bootstrap from IUSE, bug #608348

Package-Manager: portage-2.3.3

 sys-devel/gcc-apple/Manifest                       |   2 -
 sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild   | 255 ----------------
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild   | 325 --------------------
 .../gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild      | 337 ---------------------
 .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild      |   4 +-
 5 files changed, 2 insertions(+), 921 deletions(-)

diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index cffe6c8..77bc3be 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,5 +1,3 @@
-DIST gcc-5493.tar.gz 40601890 SHA256 acdb2cc0abf049bfda433806fc82e235c6b6c5f86a0e8fd54f62ed3a8606452f SHA512 a874134e9fb11131d958c475a8d9ffeb659b30509e11b47d80b2d1bf6d1f9ec0dbbd338ff5754dc8dece7af8b486d554860469d240eb37dd480ede9fd6afc8fc WHIRLPOOL 327c554ebdd8b23392264fc4d5b00ad5eec4b4888c952051ef84d11f18bee463ff4b87711ddd8ce14708aa0fcb57209043d6d27973dda4f8dcb7ba14590b70a3
-DIST gcc-5664.tar.gz 24688506 SHA256 9e1533b6a894e8cf90b0d56c353fc1175d0f14ec19e03c307726af4de883c987 SHA512 7676de5f8eece8b9ae3a119379df0ad9e5b53ea37ce6fc60fa12fcaaa903188b116b35d997e0baff2b7cac4bd3a8462bc52d6955d05de0ab399c6c11c87ff6d5 WHIRLPOOL e663055409299ba8d0cf57694dc7b8e665ffef7c79f37bd27d6f855c6264e5815f09654f75f8a9495e5a582fb360215939ee7a84abfd4bc6e8aa777edd892790
 DIST gcc-5666.3.tar.gz 19367320 SHA256 6c46f4376d11ada5be0cfc3894b9296edf574af3c616ab71803ea78edfd7015b SHA512 31cf52a00f31bcd7c47382888152cfe9851688c8fb7b1f236197b06b8acdd96b1943d327f8fab0fd305531c99a8fbf4865b2214dc2d1a236bb8ad39f710ce931 WHIRLPOOL 03711b56d38b2cb3b5af735802a82ef435cf42c3aa4fa74fa754b016edea447d011e626115fe59449def14ac34422788340165faab567b6fb992d1fe1684f93d
 DIST gcc-fortran-4.2.4.tar.bz2 905688 SHA256 6fc2056cd62921b2859381749710af765a46877bd46f9fe5ef6fab0671c47e04 SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa WHIRLPOOL 5db1f448b3c08985ee2d0b1a9101e72733f4859184892da67268650c1010c26487b5ff15670151e67fdde5e4bd9053ed2e98b1582d1f4f99375b1bcdaf94351a
 DIST libstdcxx-16.tar.gz 64695692 SHA256 a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05 WHIRLPOOL fb90a1df90e60717906d227fb1dc2b8639fd063dbf6eec39d3a840dc8025c5384bd2c8b0a86158f8c072a1008ac2561e8e9f512ef4a4f84c081903154bb9d378

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
deleted file mode 100644
index fb49629..00000000
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="https://gcc.gnu.org"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz"
-LICENSE="APSL-2 GPL-2"
-
-SLOT="40"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls objc objc++ +cxx"
-
-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}}
-
-src_unpack() {
-	# override toolchain.eclass func
-	unpack ${A}
-}
-
-src_prepare() {
-	# 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_configure() {
-	local langs="c"
-	use cxx && langs="${langs},c++"
-	use objc && langs="${langs},objc"
-	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
-
-	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/\.*/}
-
-	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}
-
-	# https://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"
-}
-
-src_compile() {
-	cd "${WORKDIR}"/build || die
-	emake bootstrap || die "emake failed"
-}
-
-src_install() {
-	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@g.o>
-	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() {
-	# 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_p5664.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
deleted file mode 100644
index aaf9307..00000000
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain flag-o-matic autotools prefix
-
-GCC_VERS=${PV/_p*/}
-APPLE_VERS="${PV/*_p/}"
-DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 3.2.3"
-HOMEPAGE="https://gcc.gnu.org"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz
-		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz
-		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz
-		fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )"
-LICENSE="GPL-2 GPL-3"
-
-SLOT="42"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fortran nls +openmp objc objc++ +cxx"
-
-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-${APPLE_VERS}
-
-# TPREFIX is the prefix of the CTARGET installation
-export TPREFIX=${TPREFIX:-${EPREFIX}}
-
-src_unpack() {
-	# override toolchain.eclass func
-	unpack ${A}
-}
-
-src_prepare() {
-	# Support for fortran
-	if use fortran ; then
-		mv "${WORKDIR}"/gcc-4.2.4/gcc/fortran gcc/ || die
-		mv "${WORKDIR}"/gcc-4.2.4/libgfortran . || die
-		# from: substracted from http://r.research.att.com/tools/
-		epatch "${FILESDIR}"/${PN}-4.2.1_p5646-gfortran.patch
-	fi
-
-	# move in libstdc++
-	case ${CHOST} in
-		*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
-			LIBSTDCXX_APPLE_VERSION=39
-		;;
-		*)
-			# pre Leopard has no dtrace, which is required by 37.11 and above
-			# Leopard only has 32-bits version of dtrace
-			LIBSTDCXX_APPLE_VERSION=16
-		;;
-	esac
-	mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
-	if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
-		epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
-		sed -i -e 's/__block\([^_]\)/__blk\1/g' \
-			libstdc++-v3/include/ext/mt_allocator.h \
-			libstdc++-v3/src/mt_allocator.cc || die "conflict fix failed"
-	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
-
-	# 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
-
-	if use !bootstrap ; then
-		# this only occurs with up-to-date tools from the Prefix, and actually
-		# breaks the bootstrap since the autoconf needs a very recent automake
-		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
-		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
-		cd "${S}"/gcc && eautoconf
-		cd "${S}"/libgomp && eautoconf
-	fi
-
-	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
-	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
-	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
-
-	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
-		"${S}"/gcc/version.c || die "failed to update VERSUFFIX with Gentoo branding"
-	sed -i -e 's~developer\.apple\.com\/bugreporter~bugs\.gentoo\.org\/~' \
-		"${S}"/gcc/version.c || die "Failed to change the bug URL"
-}
-
-src_configure() {
-	local langs="c"
-	use cxx && 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"
-
-	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/\.*/}
-
-	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"
-
-	myconf="${myconf} --enable-languages=${langs} $(use_enable openmp libgomp)"
-
-	# 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}
-
-	# https://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"
-}
-
-src_compile() {
-	cd "${WORKDIR}"/build || die
-	emake bootstrap || die "emake failed"
-}
-
-src_install() {
-	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@g.o>
-	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() {
-	# 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_p5666-r1.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
deleted file mode 100644
index a180a2d..00000000
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain flag-o-matic autotools prefix
-
-GCC_VERS=${PV/_p*/}
-APPLE_VERS="${PV/*_p/}.3"
-DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 4.0"
-HOMEPAGE="https://gcc.gnu.org"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz
-		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz
-		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz
-		fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )"
-LICENSE="GPL-2 GPL-3"
-
-SLOT="42"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fortran nls +openmp objc objc++ +cxx"
-
-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
-	sys-libs/csu
-	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-${APPLE_VERS}
-
-# TPREFIX is the prefix of the CTARGET installation
-export TPREFIX=${TPREFIX:-${EPREFIX}}
-
-src_unpack() {
-	# override toolchain.eclass func
-	unpack ${A}
-}
-
-src_prepare() {
-	# Support for fortran
-	if use fortran ; then
-		mv "${WORKDIR}"/gcc-4.2.4/gcc/fortran gcc/ || die
-		mv "${WORKDIR}"/gcc-4.2.4/libgfortran . || die
-		# from: substracted from http://r.research.att.com/tools/
-		epatch "${FILESDIR}"/${PN}-4.2.1_p5646-gfortran.patch
-	fi
-
-	# move in libstdc++
-	case ${CHOST} in
-		*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
-			LIBSTDCXX_APPLE_VERSION=39
-		;;
-		*)
-			# pre Leopard has no dtrace, which is required by 37.11 and above
-			# Leopard only has 32-bits version of dtrace
-			LIBSTDCXX_APPLE_VERSION=16
-		;;
-	esac
-	mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
-	if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
-		epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
-		sed -i -e 's/__block\([^_]\)/__blk\1/g' \
-			libstdc++-v3/include/ext/mt_allocator.h \
-			libstdc++-v3/src/mt_allocator.cc || die "conflict fix failed"
-	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."
-
-	# default to AltiVec on PPC, like for older releases
-	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
-
-	# support -arch XXX if XXX is actually what the toolchain targets because
-	# some upstreams insist on setting it
-	epatch "${FILESDIR}"/${PN}-4.2.1-arch-option.patch
-
-	# dsymutil stuff breaks on 10.4/x86, revert it
-	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
-		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch
-
-	# Pseudo-support OS X 10.10
-	[[ ${CHOST} == *-darwin14 ]] && \
-		epatch "${FILESDIR}"/${P}-darwin14.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}"/${P}-perl-5.18.patch
-
-	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
-	eprefixify "${S}"/gcc/gcc.c
-
-	if use !bootstrap ; then
-		# this only occurs with up-to-date tools from the Prefix, and actually
-		# breaks the bootstrap since the autoconf needs a very recent automake
-		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
-		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
-		cd "${S}"/gcc && eautoconf
-		cd "${S}"/libgomp && eautoconf
-	fi
-
-	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
-	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
-	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
-
-	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
-		"${S}"/gcc/version.c || die "failed to update VERSUFFIX with Gentoo branding"
-	sed -i -e 's~developer\.apple\.com\/bugreporter~bugs\.gentoo\.org\/~' \
-		"${S}"/gcc/version.c || die "Failed to change the bug URL"
-}
-
-src_configure() {
-	local langs="c"
-	use cxx && 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"
-
-	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/\.*/}
-
-	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"
-
-	myconf="${myconf} --enable-languages=${langs} $(use_enable openmp libgomp)"
-
-	# 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}
-
-	# https://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="${CC:-$(tc-getCC)} -m64"
-
-	mkdir -p "${WORKDIR}"/build
-	cd "${WORKDIR}"/build
-	einfo "Configuring GCC with: ${myconf//--/\n\t--}"
-	"${S}"/configure ${myconf} || die "conf failed"
-}
-
-src_compile() {
-	cd "${WORKDIR}"/build || die
-	emake bootstrap || die "emake failed"
-}
-
-src_install() {
-	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@g.o>
-	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() {
-	# 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_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index 3540664..7230faf 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2 GPL-3"
 
 SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fortran nls +openmp objc objc++ +cxx"
+IUSE="bootstrap fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2