dev-python/numpy: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

(Portage version: 2.2.0_alpha138/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

6 files changed, 22 insertions, 16 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b330528fe4b8..8d57154bb63f 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.170 2012/10/14 18:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.171 2012/10/16 18:38:04 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
+  numpy-1.6.0.ebuild, numpy-1.6.1.ebuild, numpy-1.6.1-r1.ebuild,
+  numpy-1.6.2.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   14 Oct 2012; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
   numpy-1.6.0.ebuild, numpy-1.6.1-r1.ebuild, numpy-1.6.1.ebuild,
diff --git a/dev-python/numpy/numpy-1.5.1.ebuild b/dev-python/numpy/numpy-1.5.1.ebuild
index 8a6bcda8e8c7..6c97eff7810a 100644
--- a/dev-python/numpy/numpy-1.5.1.ebuild
+++ b/dev-python/numpy/numpy-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.22 2012/10/14 18:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.23 2012/10/16 18:38:04 jlec Exp $
 
 EAPI=3
 
@@ -30,7 +30,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
+	lapack? ( virtual/cblas virtual/lapack )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( virtual/pkgconfig )
@@ -41,7 +41,7 @@ PYTHON_CFLAGS=("* + -fno-strict-aliasing")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	use lapack && fortran-2_pkg_setup
+	fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
diff --git a/dev-python/numpy/numpy-1.6.0.ebuild b/dev-python/numpy/numpy-1.6.0.ebuild
index 42c84ad2fd85..403d8a353320 100644
--- a/dev-python/numpy/numpy-1.6.0.ebuild
+++ b/dev-python/numpy/numpy-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.15 2012/10/14 18:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.16 2012/10/16 18:38:04 jlec Exp $
 
 EAPI=3
 
@@ -30,7 +30,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
+	lapack? ( virtual/cblas virtual/lapack )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( virtual/pkgconfig )
@@ -44,7 +44,7 @@ PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	use lapack && fortran-2_pkg_setup
+	fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
diff --git a/dev-python/numpy/numpy-1.6.1-r1.ebuild b/dev-python/numpy/numpy-1.6.1-r1.ebuild
index 59e6572c78a2..c81566b1bc6b 100644
--- a/dev-python/numpy/numpy-1.6.1-r1.ebuild
+++ b/dev-python/numpy/numpy-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.14 2012/10/14 18:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.15 2012/10/16 18:38:04 jlec Exp $
 
 EAPI=3
 
@@ -30,7 +30,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
+	lapack? ( virtual/cblas virtual/lapack )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( virtual/pkgconfig )
@@ -44,7 +44,7 @@ PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	use lapack && fortran-2_pkg_setup
+	fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
diff --git a/dev-python/numpy/numpy-1.6.1.ebuild b/dev-python/numpy/numpy-1.6.1.ebuild
index 2c8d4636de66..e9edaab7c80f 100644
--- a/dev-python/numpy/numpy-1.6.1.ebuild
+++ b/dev-python/numpy/numpy-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1.ebuild,v 1.6 2012/10/14 18:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1.ebuild,v 1.7 2012/10/16 18:38:04 jlec Exp $
 
 EAPI=3
 
@@ -30,7 +30,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
+	lapack? ( virtual/cblas virtual/lapack )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( virtual/pkgconfig )
@@ -44,7 +44,7 @@ PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	use lapack && fortran-2_pkg_setup
+	fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
diff --git a/dev-python/numpy/numpy-1.6.2.ebuild b/dev-python/numpy/numpy-1.6.2.ebuild
index 9a3276b2e39e..c1aad5adc1b8 100644
--- a/dev-python/numpy/numpy-1.6.2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.5 2012/10/14 18:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.6 2012/10/16 18:38:04 jlec Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
+	lapack? ( virtual/cblas virtual/lapack )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( virtual/pkgconfig )
@@ -44,7 +44,7 @@ PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	use lapack && fortran-2_pkg_setup
+	fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573