Run check-reqs_pkg_setup

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 27 insertions, 17 deletions

diff --git a/dev-lang/ifc/ChangeLog b/dev-lang/ifc/ChangeLog
index 5a4a607e6d73..1accaa0dd76c 100644
--- a/dev-lang/ifc/ChangeLog
+++ b/dev-lang/ifc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ifc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.62 2011/11/03 16:14:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.63 2011/12/29 12:44:32 jlec Exp $
+
+  29 Dec 2011; Justin Lecher <jlec@gentoo.org> ifc-10.0.026-r1.ebuild,
+  ifc-11.1.072.ebuild:
+  Run check-reqs_pkg_setup
 
   03 Nov 2011; Justin Lecher <jlec@gentoo.org> ifc-11.1.072.ebuild:
   Fixed again the usage of check-reqs.eclass at EAPI=4, #389401
diff --git a/dev-lang/ifc/ifc-10.0.026-r1.ebuild b/dev-lang/ifc/ifc-10.0.026-r1.ebuild
index 5418b2e56f23..86a411b8da77 100644
--- a/dev-lang/ifc/ifc-10.0.026-r1.ebuild
+++ b/dev-lang/ifc/ifc-10.0.026-r1.ebuild
@@ -1,34 +1,33 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-10.0.026-r1.ebuild,v 1.16 2011/10/17 20:40:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-10.0.026-r1.ebuild,v 1.17 2011/12/29 12:44:32 jlec Exp $
 
 inherit rpm eutils
 
 PID=787
 PB=fc
 PEXEC=ifort
+PACKAGEID="l_${PB}_c_${PV}"
+
 DESCRIPTION="Intel FORTRAN 77/95 optimized compiler for Linux"
 HOMEPAGE="http://software.intel.com/en-us/articles/fortran-compilers/"
-
-###
-# everything below common to ifc and icc
-# no eclass: very likely to change for next versions
-###
-PACKAGEID="l_${PB}_c_${PV}"
-KEYWORDS="~amd64 ~ia64 ~x86"
-SRC_URI="amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_intel64.tar.gz )
+SRC_URI="
+	amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_intel64.tar.gz )
 	ia64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia64.tar.gz )
 	x86?  ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia32.tar.gz )"
 
 LICENSE="Intel-SDP"
 SLOT="0"
-
-RESTRICT="test strip mirror"
+KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE=""
+
 DEPEND=""
-RDEPEND="~virtual/libstdc++-3.3
+RDEPEND="
+	~virtual/libstdc++-3.3
 	amd64? ( app-emulation/emul-linux-x86-compat )"
 
+RESTRICT="test strip mirror"
+
 pkg_setup() {
 	if has_version "<dev-lang/${P}"; then
 		ewarn "${PN}-9.x detected, probably with slotting."
@@ -52,7 +51,7 @@ src_unpack() {
 
 	for x in data/intel*.rpm; do
 		einfo "Extracting $(basename ${x})..."
-		rpm_unpack "${S}/${x}" || die "rpm_unpack ${x} failed"
+		rpm_unpack "${x}" || die "rpm_unpack ${x} failed"
 	done
 
 	einfo "Fixing paths and tagging"
diff --git a/dev-lang/ifc/ifc-11.1.072.ebuild b/dev-lang/ifc/ifc-11.1.072.ebuild
index 079fcf82436a..3ff0d90b0afe 100644
--- a/dev-lang/ifc/ifc-11.1.072.ebuild
+++ b/dev-lang/ifc/ifc-11.1.072.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.072.ebuild,v 1.5 2011/11/03 16:14:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.072.ebuild,v 1.6 2011/12/29 12:44:32 jlec Exp $
 
 EAPI=4
 
@@ -45,17 +45,24 @@ QA_DT_HASH="
 	${EDESTINATION}/mkl/benchmarks/mp_linpack/bin_intel/*/.*
 	${EDESTINATION}/idb/*/*/.*"
 
+CHECKREQS_MEMORY=1024M
+CHECKREQS_DISK_BUILD=1536M
+
 pkg_pretend() {
-	CHECKREQS_MEMORY=1024M
-	CHECKREQS_DISK_BUILD=1536M
 	use idb && use mkl && CHECKREQS_DISK_BUILD=2048M
 	check-reqs_pkg_pretend
 }
 
+pkg_setup() {
+	use idb && use mkl && CHECKREQS_DISK_BUILD=2048M
+	check-reqs_pkg_setup
+}
+
 src_prepare() {
 	IARCH=ia32
 	use amd64 && IARCH=intel64
 	use ia64 && IARCH=ia64
+	check-reqs_pkg_pretend
 }
 
 src_unpack() {