EAPI bump (maybe bug #474358).

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

20 files changed, 83 insertions, 259 deletions

diff --git a/sys-devel/kgcc64/ChangeLog b/sys-devel/kgcc64/ChangeLog
index c148058c6af9..c4d219d7505f 100644
--- a/sys-devel/kgcc64/ChangeLog
+++ b/sys-devel/kgcc64/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/kgcc64
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/ChangeLog,v 1.55 2014/06/25 12:37:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/ChangeLog,v 1.56 2014/09/17 08:20:33 jer Exp $
+
+  17 Sep 2014; Jeroen Roovers <jer@gentoo.org> kgcc64-3.4.6.ebuild,
+  kgcc64-4.1.2.ebuild, kgcc64-4.2.4.ebuild, -kgcc64-4.3.3.ebuild,
+  kgcc64-4.3.5.ebuild, -kgcc64-4.4.4.ebuild, kgcc64-4.4.5.ebuild,
+  kgcc64-4.4.6.ebuild, -kgcc64-4.5.2.ebuild, kgcc64-4.5.3.ebuild,
+  kgcc64-4.5.4.ebuild, kgcc64-4.6.3.ebuild, kgcc64-4.6.4.ebuild,
+  -kgcc64-4.7.2.ebuild, kgcc64-4.7.3.ebuild, kgcc64-4.7.4.ebuild,
+  kgcc64-4.8.1.ebuild, kgcc64-4.8.2.ebuild, kgcc64-4.8.3.ebuild:
+  EAPI bump (maybe bug #474358).
 
   25 Jun 2014; Jeroen Roovers <jer@gentoo.org> kgcc64-4.7.4.ebuild:
   Drop patches that do not make sense (or fail to apply).
diff --git a/sys-devel/kgcc64/kgcc64-3.4.6.ebuild b/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
index 6781af949187..6274765f3be6 100644
--- a/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
+++ b/sys-devel/kgcc64/kgcc64-3.4.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-3.4.6.ebuild,v 1.11 2011/12/03 20:46:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-3.4.6.ebuild,v 1.12 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.2"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
@@ -31,9 +33,8 @@ DEPEND="hppa? ( sys-devel/binutils-hppa64 )
 	!sys-devel/gcc-powerpc64
 	!sys-devel/gcc-sparc64"
 
-src_unpack() {
-	toolchain_src_unpack
-
+src_prepare() {
+	toolchain_src_prepare
 	epatch "${GCC_FILESDIR}"/3.4.4/gcc-3.4.4-cross-compile.patch
 
 	# Arch stuff
diff --git a/sys-devel/kgcc64/kgcc64-4.1.2.ebuild b/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
index 318f28dd716e..6b20528f46b7 100644
--- a/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.1.2.ebuild,v 1.10 2011/12/03 20:46:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.1.2.ebuild,v 1.11 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.0.1"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
@@ -31,9 +33,8 @@ DEPEND="hppa? ( sys-devel/binutils-hppa64 )
 	!sys-devel/gcc-powerpc64
 	!sys-devel/gcc-sparc64"
 
-src_unpack() {
-	toolchain_src_unpack
-
+src_prepare() {
+	toolchain_src_prepare
 	# Fix cross-compiling
 	epatch "${GCC_FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
 }
diff --git a/sys-devel/kgcc64/kgcc64-4.2.4.ebuild b/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
index d8cbd0ad22f2..334c84da8175 100644
--- a/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.2.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.2.4.ebuild,v 1.7 2012/11/14 17:03:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.2.4.ebuild,v 1.8 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.0"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.3.3.ebuild b/sys-devel/kgcc64/kgcc64-4.3.3.ebuild
deleted file mode 100644
index 217672f847e5..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.3.3.ebuild,v 1.6 2011/12/03 20:46:58 vapier Exp $
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-GCC_FILESDIR=${FILESDIR/${PN}/gcc}
-
-inherit toolchain eutils
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="-hppa ~mips sparc"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )
-	!sys-devel/gcc-hppa64
-	!sys-devel/gcc-mips64
-	!sys-devel/gcc-powerpc64
-	!sys-devel/gcc-sparc64"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.3.5.ebuild b/sys-devel/kgcc64/kgcc64-4.3.5.ebuild
index 6a798b797378..9e34532082ab 100644
--- a/sys-devel/kgcc64/kgcc64-4.3.5.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.3.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.3.5.ebuild,v 1.2 2011/12/03 20:46:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.3.5.ebuild,v 1.3 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.1"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.4.4.ebuild b/sys-devel/kgcc64/kgcc64-4.4.4.ebuild
deleted file mode 100644
index 096c817e48d6..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.4.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.4.4.ebuild,v 1.5 2011/12/03 20:46:58 vapier Exp $
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-GCC_FILESDIR=${FILESDIR/${PN}/gcc}
-
-inherit toolchain eutils
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa sparc"
-
-RDEPEND=">=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	>=sys-devel/gcc-config-1.4"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	!sys-devel/gcc-hppa64
-	!sys-devel/gcc-mips64
-	!sys-devel/gcc-powerpc64
-	!sys-devel/gcc-sparc64
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.4.5.ebuild b/sys-devel/kgcc64/kgcc64-4.4.5.ebuild
index 04fa366fc7f7..4059112fd027 100644
--- a/sys-devel/kgcc64/kgcc64-4.4.5.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.4.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.4.5.ebuild,v 1.5 2011/12/03 20:46:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.4.5.ebuild,v 1.6 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.2"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.4.6.ebuild b/sys-devel/kgcc64/kgcc64-4.4.6.ebuild
index 180cc49aa7f0..7c495029ecdf 100644
--- a/sys-devel/kgcc64/kgcc64-4.4.6.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.4.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.4.6.ebuild,v 1.2 2011/12/03 20:46:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.4.6.ebuild,v 1.3 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.0"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.5.2.ebuild b/sys-devel/kgcc64/kgcc64-4.5.2.ebuild
deleted file mode 100644
index 45b076f7f9b5..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.5.2.ebuild,v 1.5 2011/12/03 20:46:58 vapier Exp $
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.1"
-GCC_FILESDIR=${FILESDIR/${PN}/gcc}
-
-inherit toolchain eutils
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="hppa sparc"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	!sys-devel/gcc-hppa64
-	!sys-devel/gcc-mips64
-	!sys-devel/gcc-powerpc64
-	!sys-devel/gcc-sparc64
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.5.3.ebuild b/sys-devel/kgcc64/kgcc64-4.5.3.ebuild
index dd3afb5ea33e..b921d91642ee 100644
--- a/sys-devel/kgcc64/kgcc64-4.5.3.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.5.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.5.3.ebuild,v 1.4 2012/07/08 14:48:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.5.3.ebuild,v 1.5 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.4"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.5.4.ebuild b/sys-devel/kgcc64/kgcc64-4.5.4.ebuild
index 18e4ad6cd04b..d3d3246b558c 100644
--- a/sys-devel/kgcc64/kgcc64-4.5.4.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.5.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.5.4.ebuild,v 1.1 2013/07/17 14:58:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.5.4.ebuild,v 1.2 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.2"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.6.3.ebuild b/sys-devel/kgcc64/kgcc64-4.6.3.ebuild
index 530d915fc405..e95d5f72c43f 100644
--- a/sys-devel/kgcc64/kgcc64-4.6.3.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.6.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.6.3.ebuild,v 1.3 2013/01/09 13:33:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.6.3.ebuild,v 1.4 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.9"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.6.4.ebuild b/sys-devel/kgcc64/kgcc64-4.6.4.ebuild
index 5b7bf91fb579..3cd1f36cf781 100644
--- a/sys-devel/kgcc64/kgcc64-4.6.4.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.6.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.6.4.ebuild,v 1.1 2013/07/17 14:58:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.6.4.ebuild,v 1.2 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.0"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.7.2.ebuild b/sys-devel/kgcc64/kgcc64-4.7.2.ebuild
deleted file mode 100644
index 16a4bfd9d763..000000000000
--- a/sys-devel/kgcc64/kgcc64-4.7.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.7.2.ebuild,v 1.2 2013/03/02 01:17:39 dirtyepic Exp $
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.5"
-GCC_FILESDIR=${FILESDIR/${PN}/gcc}
-
-inherit toolchain eutils
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~sparc"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	!sys-devel/gcc-hppa64
-	!sys-devel/gcc-mips64
-	!sys-devel/gcc-powerpc64
-	!sys-devel/gcc-sparc64
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-4.7.3.ebuild b/sys-devel/kgcc64/kgcc64-4.7.3.ebuild
index 11983f6cbc4f..99a98b415c6d 100644
--- a/sys-devel/kgcc64/kgcc64-4.7.3.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.7.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.7.3.ebuild,v 1.3 2013/09/25 14:28:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.7.3.ebuild,v 1.4 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.3"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.7.4.ebuild b/sys-devel/kgcc64/kgcc64-4.7.4.ebuild
index 36da1b238d82..a08c93087e20 100644
--- a/sys-devel/kgcc64/kgcc64-4.7.4.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.7.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.7.4.ebuild,v 1.2 2014/06/25 12:37:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.7.4.ebuild,v 1.3 2014/09/17 08:20:33 jer Exp $
 
-EAPI=2
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
diff --git a/sys-devel/kgcc64/kgcc64-4.8.1.ebuild b/sys-devel/kgcc64/kgcc64-4.8.1.ebuild
index 08d5a54976e3..7d374bd7c918 100644
--- a/sys-devel/kgcc64/kgcc64-4.8.1.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.8.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.8.1.ebuild,v 1.1 2013/10/09 23:08:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.8.1.ebuild,v 1.2 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.2"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.8.2.ebuild b/sys-devel/kgcc64/kgcc64-4.8.2.ebuild
index a75d8837dacb..f82e3146544b 100644
--- a/sys-devel/kgcc64/kgcc64-4.8.2.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.8.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.8.2.ebuild,v 1.1 2013/11/16 14:41:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.8.2.ebuild,v 1.2 2014/09/17 08:20:33 jer Exp $
+
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;
@@ -17,7 +19,7 @@ GCC_TARGET_NO_MULTILIB=true
 PATCH_VER="1.0"
 GCC_FILESDIR=${FILESDIR/${PN}/gcc}
 
-inherit toolchain eutils
+inherit eutils toolchain
 
 DESCRIPTION="64bit kernel compiler"
 
diff --git a/sys-devel/kgcc64/kgcc64-4.8.3.ebuild b/sys-devel/kgcc64/kgcc64-4.8.3.ebuild
index 2b951628fe5d..95eff600e703 100644
--- a/sys-devel/kgcc64/kgcc64-4.8.3.ebuild
+++ b/sys-devel/kgcc64/kgcc64-4.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.8.3.ebuild,v 1.1 2014/06/17 13:37:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/kgcc64/kgcc64-4.8.3.ebuild,v 1.2 2014/09/17 08:20:33 jer Exp $
 
-EAPI=2
+EAPI=4
 
 case ${CHOST} in
 	hppa*)    CTARGET=hppa64-${CHOST#*-};;