sys-devel/gcc: fixup first round of QA issues

Signed-off-by: Sam James <sam@gentoo.org>

86 files changed, 78 insertions, 887 deletions

diff --git a/metadata/md5-cache/sys-devel/binutils-2.14 b/metadata/md5-cache/sys-devel/binutils-2.14
deleted file mode 100644
index 689ac06..0000000
--- a/metadata/md5-cache/sys-devel/binutils-2.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/binutils-config-3 test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc
-DESCRIPTION=Tools necessary to build programs
-EAPI=4
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=cxx multislot multitarget nls static-libs test vanilla
-KEYWORDS=-*
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=>=sys-devel/binutils-config-3
-SLOT=2.14
-SRC_URI=mirror://gnu/binutils/binutils-2.14.tar.bz2 mirror://gentoo/binutils-2.14-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/binutils-2.14-patches-1.0.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnuconfig	3920de1188fc7bfee873515453ed1d10	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-binutils	37e9db7a0f613041818a1ac25e05d769	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4321f4a93fe7ceab8431f96be286698b
diff --git a/metadata/md5-cache/sys-devel/binutils-2.14.90.0.8-r3 b/metadata/md5-cache/sys-devel/binutils-2.14.90.0.8-r3
deleted file mode 100644
index e1fe850..0000000
--- a/metadata/md5-cache/sys-devel/binutils-2.14.90.0.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/binutils-config-3 test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc
-DESCRIPTION=Tools necessary to build programs
-EAPI=4
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=cxx multislot multitarget nls static-libs test vanilla
-KEYWORDS=alpha amd64 hppa ia64 mips ppc ppc64 s390 sh sparc x86
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=>=sys-devel/binutils-config-3
-SLOT=2.14.90.0.8
-SRC_URI=mirror://kernel/linux/devel/binutils/binutils-2.14.90.0.8.tar.bz2 mirror://gentoo/binutils-2.14.90.0.8-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/binutils-2.14.90.0.8-patches-1.6.tar.bz2 mirror://gentoo/binutils-2.14.90.0.8-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/binutils-2.14.90.0.8-uclibc-patches-1.1.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnuconfig	3920de1188fc7bfee873515453ed1d10	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-binutils	37e9db7a0f613041818a1ac25e05d769	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce1c387a9abbcf41105d6d93d0a4e30a
diff --git a/sys-devel/gcc/gcc-4.0.0.ebuild b/sys-devel/gcc/gcc-4.0.0.ebuild
index e491027..788fd36 100644
--- a/sys-devel/gcc/gcc-4.0.0.ebuild
+++ b/sys-devel/gcc/gcc-4.0.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.0.2-r3.ebuild b/sys-devel/gcc/gcc-4.0.2-r3.ebuild
index a0f9121..3289c1a 100644
--- a/sys-devel/gcc/gcc-4.0.2-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.0.2-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.6"
 PATCH_GCC_VER="4.0.2"
@@ -23,5 +23,5 @@ src_prepare() {
 	use vanilla && return 0
 
 	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-cross-compile.patch
+	eapply "${FILESDIR}"/4.0.2/gcc-4.0.2-cross-compile.patch
 }
diff --git a/sys-devel/gcc/gcc-4.0.3.ebuild b/sys-devel/gcc/gcc-4.0.3.ebuild
index bc15d85..95efacb 100644
--- a/sys-devel/gcc/gcc-4.0.3.ebuild
+++ b/sys-devel/gcc/gcc-4.0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -21,5 +21,5 @@ src_prepare() {
 	use vanilla && return 0
 
 	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-cross-compile.patch
+	eapply "${FILESDIR}"/4.0.2/gcc-4.0.2-cross-compile.patch
 }
diff --git a/sys-devel/gcc/gcc-4.1.0-r1.ebuild b/sys-devel/gcc/gcc-4.1.0-r1.ebuild
index 83ab6d0..03a07e8 100644
--- a/sys-devel/gcc/gcc-4.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.8"
 UCLIBC_VER="1.1"
@@ -20,5 +20,5 @@ src_prepare() {
 	use vanilla && return 0
 
 	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
+	eapply "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
 }
diff --git a/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild b/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild
deleted file mode 100644
index 6aa6b7c..0000000
--- a/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.16.1"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-}
diff --git a/sys-devel/gcc/gcc-4.1.1-r3.ebuild b/sys-devel/gcc/gcc-4.1.1-r3.ebuild
index 6971b9e..e4db59a 100644
--- a/sys-devel/gcc/gcc-4.1.1-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.1.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.10"
 UCLIBC_VER="1.1"
@@ -22,7 +22,7 @@ src_prepare() {
 	use vanilla && return 0
 
 	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
+	eapply "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
 
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
+	eapply "${FILESDIR}"/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
 }
diff --git a/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild b/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild
deleted file mode 100644
index 1427ade..0000000
--- a/sys-devel/gcc/gcc-4.10.0_pre9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-gcc_LIVE_BRANCH="master"
-
-inherit toolchain
-
-KEYWORDS=""
-
-SLOT="${GCC_BRANCH_VER}-vcs"
-IUSE="nobootstrap"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
-
-src_unpack() {
-	toolchain_src_unpack
-
-	echo "commit ${EGIT_VERSION}" > "${S}"/gcc/REVISION
-}
-
-src_prepare() {
-	toolchain_src_prepare
-
-	if ! use vanilla ; then
-		# drop-in patches
-		if [[ -e ${FILESDIR}/${GCC_RELEASE_VER} ]]; then
-			EPATCH_SOURCE="${FILESDIR}/${GCC_RELEASE_VER}" \
-			EPATCH_EXCLUDE="${FILESDIR}/${GCC_RELEASE_VER}/exclude" \
-			EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch
-		fi
-	fi
-
-	# single-stage build for quick patch testing
-	if use nobootstrap; then
-		GCC_MAKE_TARGET="all"
-		EXTRA_ECONF+=" --disable-bootstrap"
-	fi
-}
diff --git a/sys-devel/gcc/gcc-4.2.0.ebuild b/sys-devel/gcc/gcc-4.2.0.ebuild
index 60448ce..5ca0d86 100644
--- a/sys-devel/gcc/gcc-4.2.0.ebuild
+++ b/sys-devel/gcc/gcc-4.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.2.0_alpha20090325.ebuild b/sys-devel/gcc/gcc-4.2.0_alpha20090325.ebuild
deleted file mode 100644
index 6aa6b7c..0000000
--- a/sys-devel/gcc/gcc-4.2.0_alpha20090325.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.16.1"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-}
diff --git a/sys-devel/gcc/gcc-4.2.1.ebuild b/sys-devel/gcc/gcc-4.2.1.ebuild
index f85d3ba..db1cc3d 100644
--- a/sys-devel/gcc/gcc-4.2.1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.2.2.ebuild b/sys-devel/gcc/gcc-4.2.2.ebuild
index f85d3ba..db1cc3d 100644
--- a/sys-devel/gcc/gcc-4.2.2.ebuild
+++ b/sys-devel/gcc/gcc-4.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.2.3.ebuild b/sys-devel/gcc/gcc-4.2.3.ebuild
index f85d3ba..db1cc3d 100644
--- a/sys-devel/gcc/gcc-4.2.3.ebuild
+++ b/sys-devel/gcc/gcc-4.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.3.0.ebuild b/sys-devel/gcc/gcc-4.3.0.ebuild
index 052b368..96f9247 100644
--- a/sys-devel/gcc/gcc-4.3.0.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.3.0_alpha20110626.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20110626.ebuild
deleted file mode 100644
index 6aa6b7c..0000000
--- a/sys-devel/gcc/gcc-4.3.0_alpha20110626.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.16.1"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-}
diff --git a/sys-devel/gcc/gcc-4.3.1-r1.ebuild b/sys-devel/gcc/gcc-4.3.1-r1.ebuild
index 52022b7..5408133 100644
--- a/sys-devel/gcc/gcc-4.3.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.3.2-r4.ebuild b/sys-devel/gcc/gcc-4.3.2-r4.ebuild
index 3575dd0..0f60f4d 100644
--- a/sys-devel/gcc/gcc-4.3.2-r4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.2-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.8"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.3.3-r2.ebuild b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
index e3813e5..5da1e7f 100644
--- a/sys-devel/gcc/gcc-4.3.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.4.ebuild b/sys-devel/gcc/gcc-4.3.4.ebuild
index b7cbf88..110450a 100644
--- a/sys-devel/gcc/gcc-4.3.4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm -hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.5.ebuild b/sys-devel/gcc/gcc-4.3.5.ebuild
index 238a87b..d7d242c 100644
--- a/sys-devel/gcc/gcc-4.3.5.ebuild
+++ b/sys-devel/gcc/gcc-4.3.5.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.0-r1.ebuild b/sys-devel/gcc/gcc-4.4.0-r1.ebuild
index 9100ecd..251a0f6 100644
--- a/sys-devel/gcc/gcc-4.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20120306.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20120306.ebuild
deleted file mode 100644
index 8fd4f64..0000000
--- a/sys-devel/gcc/gcc-4.4.0_alpha20120306.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.18"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-}
diff --git a/sys-devel/gcc/gcc-4.4.1.ebuild b/sys-devel/gcc/gcc-4.4.1.ebuild
index 403c43e..883942b 100644
--- a/sys-devel/gcc/gcc-4.4.1.ebuild
+++ b/sys-devel/gcc/gcc-4.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.1"
diff --git a/sys-devel/gcc/gcc-4.4.2.ebuild b/sys-devel/gcc/gcc-4.4.2.ebuild
index f0c93d1..46d2586 100644
--- a/sys-devel/gcc/gcc-4.4.2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 -sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.3-r3.ebuild b/sys-devel/gcc/gcc-4.4.3-r3.ebuild
index a089f0a..45339c9 100644
--- a/sys-devel/gcc/gcc-4.4.3-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.4.3-r3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 arm -hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.4-r2.ebuild b/sys-devel/gcc/gcc-4.4.4-r2.ebuild
index d12b999..d4cca75 100644
--- a/sys-devel/gcc/gcc-4.4.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.4-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.5.ebuild b/sys-devel/gcc/gcc-4.4.5.ebuild
index c7715ff..f852328 100644
--- a/sys-devel/gcc/gcc-4.4.5.ebuild
+++ b/sys-devel/gcc/gcc-4.4.5.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.6-r1.ebuild b/sys-devel/gcc/gcc-4.4.6-r1.ebuild
index ea26ed4..d2667cf 100644
--- a/sys-devel/gcc/gcc-4.4.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.4.6-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.0.ebuild b/sys-devel/gcc/gcc-4.5.0.ebuild
index 93f763f..a0f6254 100644
--- a/sys-devel/gcc/gcc-4.5.0.ebuild
+++ b/sys-devel/gcc/gcc-4.5.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.5"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.5.0_alpha20120628.ebuild b/sys-devel/gcc/gcc-4.5.0_alpha20120628.ebuild
deleted file mode 100644
index aacebd4..0000000
--- a/sys-devel/gcc/gcc-4.5.0_alpha20120628.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-}
diff --git a/sys-devel/gcc/gcc-4.5.1-r1.ebuild b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
index 38b0989..68e7806 100644
--- a/sys-devel/gcc/gcc-4.5.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.5"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.2.ebuild b/sys-devel/gcc/gcc-4.5.2.ebuild
index 858a857..cd4a21a 100644
--- a/sys-devel/gcc/gcc-4.5.2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.3-r2.ebuild b/sys-devel/gcc/gcc-4.5.3-r2.ebuild
index 1283301..0eb59be 100644
--- a/sys-devel/gcc/gcc-4.5.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.3-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.6"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.0.ebuild b/sys-devel/gcc/gcc-4.6.0.ebuild
index c5f6a24..caa14c2 100644
--- a/sys-devel/gcc/gcc-4.6.0.ebuild
+++ b/sys-devel/gcc/gcc-4.6.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
diff --git a/sys-devel/gcc/gcc-4.6.0_alpha20130405.ebuild b/sys-devel/gcc/gcc-4.6.0_alpha20130405.ebuild
deleted file mode 100644
index dfec0c4..0000000
--- a/sys-devel/gcc/gcc-4.6.0_alpha20130405.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.6.1-r1.ebuild b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
index 0101fd2..135eb17 100644
--- a/sys-devel/gcc/gcc-4.6.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild
index cfe93de..7547a05 100644
--- a/sys-devel/gcc/gcc-4.6.2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.5"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.3.ebuild b/sys-devel/gcc/gcc-4.6.3.ebuild
index a677a18..84e9baf 100644
--- a/sys-devel/gcc/gcc-4.6.3.ebuild
+++ b/sys-devel/gcc/gcc-4.6.3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.13"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.0.ebuild b/sys-devel/gcc/gcc-4.7.0.ebuild
index f2aa897..ee6bc4b 100644
--- a/sys-devel/gcc/gcc-4.7.0.ebuild
+++ b/sys-devel/gcc/gcc-4.7.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.0_alpha20140607.ebuild b/sys-devel/gcc/gcc-4.7.0_alpha20140607.ebuild
deleted file mode 100644
index dfec0c4..0000000
--- a/sys-devel/gcc/gcc-4.7.0_alpha20140607.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.7.1.ebuild b/sys-devel/gcc/gcc-4.7.1.ebuild
index 3cae6de..40747e8 100644
--- a/sys-devel/gcc/gcc-4.7.1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.5"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.2-r1.ebuild b/sys-devel/gcc/gcc-4.7.2-r1.ebuild
index 476d988..7a38c16 100644
--- a/sys-devel/gcc/gcc-4.7.2-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.2-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.6"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.3-r1.ebuild b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
index 4193447..e893c12 100644
--- a/sys-devel/gcc/gcc-4.7.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.5"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.0.ebuild b/sys-devel/gcc/gcc-4.8.0.ebuild
index 131ca55..1d675c1 100644
--- a/sys-devel/gcc/gcc-4.8.0.ebuild
+++ b/sys-devel/gcc/gcc-4.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.0_alpha20150611.ebuild b/sys-devel/gcc/gcc-4.8.0_alpha20150611.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.8.0_alpha20150611.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.8.1-r1.ebuild b/sys-devel/gcc/gcc-4.8.1-r1.ebuild
index 4c3d4e3..c6c06e5 100644
--- a/sys-devel/gcc/gcc-4.8.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.8.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.2.ebuild b/sys-devel/gcc/gcc-4.8.2.ebuild
index f2c3cd3..2626a73 100644
--- a/sys-devel/gcc/gcc-4.8.2.ebuild
+++ b/sys-devel/gcc/gcc-4.8.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.3r1"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.3.ebuild b/sys-devel/gcc/gcc-4.8.3.ebuild
index ac69b0e..04ac245 100644
--- a/sys-devel/gcc/gcc-4.8.3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.4.ebuild b/sys-devel/gcc/gcc-4.8.4.ebuild
index ece9b0e..0c80c14 100644
--- a/sys-devel/gcc/gcc-4.8.4.ebuild
+++ b/sys-devel/gcc/gcc-4.8.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.8"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild b/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild
deleted file mode 100644
index b86aae2..0000000
--- a/sys-devel/gcc/gcc-4.8.4_pre9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-SLOT="${GCC_BRANCH_VER}-vcs"
-IUSE="nobootstrap"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
-
-src_unpack() {
-	toolchain_src_unpack
-
-	echo "commit ${EGIT_VERSION}" > "${S}"/gcc/REVISION
-}
-
-src_prepare() {
-	toolchain_src_prepare
-
-	if ! use vanilla ; then
-		# drop-in patches
-		if [[ -e ${FILESDIR}/${GCC_RELEASE_VER} ]]; then
-			EPATCH_SOURCE="${FILESDIR}/${GCC_RELEASE_VER}" \
-			EPATCH_EXCLUDE="${FILESDIR}/${GCC_RELEASE_VER}/exclude" \
-			EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch
-		fi
-	fi
-
-	# single-stage build for quick patch testing
-	if use nobootstrap; then
-		GCC_MAKE_TARGET="all"
-		EXTRA_ECONF+=" --disable-bootstrap"
-	fi
-}
diff --git a/sys-devel/gcc/gcc-4.9.0.ebuild b/sys-devel/gcc/gcc-4.9.0.ebuild
index 496bbb6..6a97200 100644
--- a/sys-devel/gcc/gcc-4.9.0.ebuild
+++ b/sys-devel/gcc/gcc-4.9.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160106.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160106.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160106.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160113.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160113.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160113.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160120.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160120.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160120.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160127.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160127.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160127.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160203.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160203.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160203.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160210.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160210.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160210.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160217.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160217.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160217.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160224.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160224.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160224.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.0_alpha20160302.ebuild b/sys-devel/gcc/gcc-4.9.0_alpha20160302.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-4.9.0_alpha20160302.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-4.9.1.ebuild b/sys-devel/gcc/gcc-4.9.1.ebuild
index 496bbb6..6a97200 100644
--- a/sys-devel/gcc/gcc-4.9.1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
diff --git a/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild b/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild
deleted file mode 100644
index b86aae2..0000000
--- a/sys-devel/gcc/gcc-4.9.1_pre9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-SLOT="${GCC_BRANCH_VER}-vcs"
-IUSE="nobootstrap"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
-
-src_unpack() {
-	toolchain_src_unpack
-
-	echo "commit ${EGIT_VERSION}" > "${S}"/gcc/REVISION
-}
-
-src_prepare() {
-	toolchain_src_prepare
-
-	if ! use vanilla ; then
-		# drop-in patches
-		if [[ -e ${FILESDIR}/${GCC_RELEASE_VER} ]]; then
-			EPATCH_SOURCE="${FILESDIR}/${GCC_RELEASE_VER}" \
-			EPATCH_EXCLUDE="${FILESDIR}/${GCC_RELEASE_VER}/exclude" \
-			EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch
-		fi
-	fi
-
-	# single-stage build for quick patch testing
-	if use nobootstrap; then
-		GCC_MAKE_TARGET="all"
-		EXTRA_ECONF+=" --disable-bootstrap"
-	fi
-}
diff --git a/sys-devel/gcc/gcc-4.9.2.ebuild b/sys-devel/gcc/gcc-4.9.2.ebuild
index 6d286bc..dcbffe7 100644
--- a/sys-devel/gcc/gcc-4.9.2.ebuild
+++ b/sys-devel/gcc/gcc-4.9.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.6"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160105.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160105.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160105.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160112.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160112.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160112.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160119.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160119.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160119.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160126.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160126.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160126.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160202.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160202.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160202.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160209.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160209.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160209.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160216.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160216.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160216.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160223.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160223.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160223.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.0.0_alpha20160301.ebuild b/sys-devel/gcc/gcc-5.0.0_alpha20160301.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-5.0.0_alpha20160301.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-5.1.0.ebuild b/sys-devel/gcc/gcc-5.1.0.ebuild
index 6a2d0a9..4253add 100644
--- a/sys-devel/gcc/gcc-5.1.0.ebuild
+++ b/sys-devel/gcc/gcc-5.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.2.0.ebuild b/sys-devel/gcc/gcc-5.2.0.ebuild
index ed6efaa..9ccbef3 100644
--- a/sys-devel/gcc/gcc-5.2.0.ebuild
+++ b/sys-devel/gcc/gcc-5.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.3.0.ebuild b/sys-devel/gcc/gcc-5.3.0.ebuild
index 5e7c27a..b3cc4d4 100644
--- a/sys-devel/gcc/gcc-5.3.0.ebuild
+++ b/sys-devel/gcc/gcc-5.3.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160103.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160103.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160103.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160110.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160110.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160110.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160117.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160117.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160117.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160124.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160124.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160124.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160131.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160131.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160131.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160207.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160207.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160207.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160214.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160214.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160214.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160221.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160221.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160221.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160228.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160228.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160228.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi
diff --git a/sys-devel/gcc/gcc-6.0.0_alpha20160306.ebuild b/sys-devel/gcc/gcc-6.0.0_alpha20160306.ebuild
deleted file mode 100644
index f9f2012..0000000
--- a/sys-devel/gcc/gcc-6.0.0_alpha20160306.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCC_FILESDIR="${PORTDIR}/sys-devel/gcc/files"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.12 )"
-fi