--- gcc-4.7.3.ebuild.orig	2013-06-16 17:43:10.000000000 -0700
+++ gcc-4.7.3.ebuild	2013-06-16 17:43:09.000000000 -0700
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.3.ebuild,v 1.2 2013/05/20 10:56:06 aballier Exp $
 
+EAPI="5"
+
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
 
@@ -18,7 +20,7 @@
 SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 #end Hardened stuff
 
-inherit toolchain
+inherit toolchain-r1
 
 DESCRIPTION="The GNU Compiler Collection"
 
@@ -35,7 +37,7 @@
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
 
-src_unpack() {
+src_prepare() {
 	if has_version '<sys-libs/glibc-2.12' ; then
 		ewarn "Your host glibc is too old; disabling automatic fortify."
 		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
@@ -47,15 +49,15 @@
 		EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
 	fi
 
-	toolchain_src_unpack
+	toolchain-r1_src_prepare
 
 	use vanilla && return 0
 
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 }
 
-pkg_setup() {
-	toolchain_pkg_setup
+pkg_pretend() {
+	toolchain-r1_pkg_pretend
 
 	if use lto ; then
 		ewarn