Use USE=lapack to depend conditionally on fortran support

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 24 insertions, 24 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index fa7d08b82a96..44c438fdc10f 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.146 2011/06/21 16:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.147 2011/06/21 18:05:21 jlec Exp $
+
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
+  numpy-1.6.0.ebuild:
+  Use USE=lapack to depend conditionally on fortran support
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
   numpy-1.6.0.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 69367453e9b7..56af89ab151b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -10,14 +10,14 @@ DIST numpy-1.5-ref.pdf 7112007 RMD160 35901204b7e4c0ffc08ebb43a8a4dfa5b5a79bf1 S
 DIST numpy-1.5-user.pdf 562092 RMD160 20d475d9c5a4abbad0ec5f969fdf9a5eef79c4b3 SHA1 6fafde625a81dd4be22a158cd73c010cb219e855 SHA256 afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d
 DIST numpy-1.5.1.tar.gz 2280220 RMD160 6d8f03e4cd2db48a7c9ac39b441d9e0219b15dcf SHA1 423c6bf74f9ac00697db574ba981547991110896 SHA256 c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
 DIST numpy-1.6.0.tar.gz 2633698 RMD160 29bee854e1436e0baad46150606d7a0d2d80ac61 SHA1 0692acfb5cdc55ca251aa2b950e321a662810c36 SHA256 687dcfb5f6a51f2107ba1dc8bb324fd1a0146ce8b0e2bd01a3ee7bcc453ee3d8
-EBUILD numpy-1.5.1.ebuild 5181 RMD160 00fd921aa0db7791a079f8d8990edf9eb2dca607 SHA1 b301b9a48bbc4c66e4c245e0280934afb1a8fdaf SHA256 dd3875e1c5af52ba3f038b89a8d06574cbe4f188ab394de9f0fb5c1c8e344b7d
-EBUILD numpy-1.6.0.ebuild 4867 RMD160 09df777981f9ed637f44f64c6dbeb907e9725b58 SHA1 4ce995bc60c0f09d7f77e422f6f0a3dc4aa3e06b SHA256 012a87cf075fae11afe79e0bb8f48b764d36e2e794ee8023853a235de6241961
-MISC ChangeLog 20800 RMD160 f555f24c569113ac34795f9305554e6fc1e5ca2d SHA1 98e02c7559a5964f326d3a87bae8b22d8001e7f0 SHA256 cb4ad8f7d066d6d2a9ce886406ed2f564a76ae5a916dca1016bf64aad55842fa
+EBUILD numpy-1.5.1.ebuild 5107 RMD160 b86e103a1f358cc172d24655a4836e19efaea7c2 SHA1 20d1865d2edd1b78dc44de8801d167c4ec140eab SHA256 7559513f731ed9ac96ae60de0e35df84ed8ba3f5f6045cabe18efd6250a709a8
+EBUILD numpy-1.6.0.ebuild 4801 RMD160 0114e1b49a79c9dbc098106b6e297676d10aab8b SHA1 35793af60fc46323f2a7fcc92a2942329ad11d3c SHA256 555edc83a6eed0dc5ef731ca7f27436e468c15b5bfbfe92f8687a43e0495e692
+MISC ChangeLog 20950 RMD160 5343a4540643b565d20ebac8ecb4a244acfa3b59 SHA1 b034cf5ac813b83549940734d3ba37e495a39662 SHA256 cb0881cf0613872b7df1bed9c6eacd6763bb8ad9db2927e8d4549dbb5685594e
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4AwusACgkQgAnW8HDreRZqZQCeNZiChsPXjOuKNihXotpRmu42
-XyYAoKtEbvAmWOGcO1ypq6iMbYrkv9rp
-=ZR/D
+iEYEARECAAYFAk4A3WcACgkQgAnW8HDreRYfwwCggqqGo8ZaygeO3e1+qKADuHtm
+YPwAoI1+uS3CJ6lqjYgBKq8fe6VEzKZU
+=F4yb
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.5.1.ebuild b/dev-python/numpy/numpy-1.5.1.ebuild
index a6346d6b5e7f..b891e950a808 100644
--- a/dev-python/numpy/numpy-1.5.1.ebuild
+++ b/dev-python/numpy/numpy-1.5.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 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.17 2011/06/21 16:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.18 2011/06/21 18:05:21 jlec Exp $
+
+EAPI=3
 
-EAPI="3"
 PYTHON_DEPEND="*"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
@@ -27,8 +28,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	virtual/fortran
-	lapack? ( virtual/cblas virtual/lapack )"
+	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( dev-util/pkgconfig )
@@ -39,7 +39,7 @@ PYTHON_CFLAGS=("* + -fno-strict-aliasing")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use lapack && fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
@@ -53,9 +53,7 @@ pkg_setup() {
 	# linking with cblas and lapack library will force
 	# autodetecting and linking to all available fortran compilers
 	use lapack || return
-	[[ -z ${FC} ]] && FC=$(tc-getFC)
-	# when fortran flags are set, pic is removed.
-	FFLAGS="${FFLAGS} -fPIC"
+	append-fflags -fPIC
 	NUMPY_FCONFIG="config_fc --noopt --noarch"
 	# workaround bug 335908
 	[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG="${NUMPY_FCONFIG} --fcompiler=gnu95"
diff --git a/dev-python/numpy/numpy-1.6.0.ebuild b/dev-python/numpy/numpy-1.6.0.ebuild
index 41cab9c2f73f..fe3e40e88e94 100644
--- a/dev-python/numpy/numpy-1.6.0.ebuild
+++ b/dev-python/numpy/numpy-1.6.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 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.7 2011/06/21 16:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.8 2011/06/21 18:05:21 jlec Exp $
+
+EAPI=3
 
-EAPI="3"
 PYTHON_DEPEND="*"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 
-inherit distutils flag-o-matic toolchain-funcs versionator
+inherit distutils flag-o-matic fortran-2 toolchain-funcs versionator
 
 DOC_P="${PN}-1.5"
 
@@ -27,8 +28,7 @@ IUSE="doc lapack test"
 
 RDEPEND="
 	dev-python/setuptools
-	virtual/fortran
-	lapack? ( virtual/cblas virtual/lapack )"
+	lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	lapack? ( dev-util/pkgconfig )
@@ -42,7 +42,7 @@ PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
 DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use lapack && fortran-2_pkg_setup
 	python_pkg_setup
 
 	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
@@ -56,9 +56,7 @@ pkg_setup() {
 	# linking with cblas and lapack library will force
 	# autodetecting and linking to all available fortran compilers
 	if use lapack; then
-		[[ -z ${FC} ]] && FC=$(tc-getFC)
-		# when fortran flags are set, pic is removed.
-		FFLAGS="${FFLAGS} -fPIC"
+		append-fflags -fPIC
 		NUMPY_FCONFIG="config_fc --noopt --noarch"
 		# workaround bug 335908
 		[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"