Moved pic flag to src_compile

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 17 insertions, 15 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 65aa0eee52d7..94ff745f1fc3 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.36 2008/12/05 11:38:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.37 2008/12/11 23:43:53 bicatali Exp $
+
+  11 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  scipy-0.6.0-r5.ebuild, scipy-0.7.0_beta1.ebuild:
+  Moved pic flag to src_compile
 
 *scipy-0.7.0_beta1 (05 Dec 2008)
 *scipy-0.6.0-r5 (05 Dec 2008)
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index e74371f36281..d9055cc57c08 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -12,14 +12,14 @@ AUX scipy-0.7.0_beta1-implicit.patch 905 RMD160 a22d5b5c7a67b3a806b63d7708654562
 DIST scipy-0.6.0.tar.gz 6572954 RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b SHA1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 SHA256 5f70390963fb4e3ae8cf5effa301c160ef68c791098e2ea95b99380e298eac4f
 DIST scipy-0.7.0b1.tar.gz 4473284 RMD160 2cb2197830c2655f91420668ae90913a06e28bea SHA1 8ae07883105c0966022b414643dff138de71d079 SHA256 d720ccd5045e75761b3b1d695ba28b23f696892756072a1af85a6f1ec91d5467
 EBUILD scipy-0.6.0-r4.ebuild 4339 RMD160 8c7a9d9cf7c245452ca62e8aed9dfc9e62d200eb SHA1 f752488c2b74f17da3b25e4aec92c247a7560710 SHA256 d30c515cbf47ace06ef251c8735ea89b2b181cf511549cbd354353202cfe0290
-EBUILD scipy-0.6.0-r5.ebuild 4429 RMD160 73d76ce24809a54ea96db61dafffcc03aaeb1565 SHA1 bc81a4ca6051903845c30ec3a4e1a93748aa8818 SHA256 40c90bf3ec68cf3cc26b7d14ed91a63be83a06a2ce3aa9c87e0fb69c0bbf6731
-EBUILD scipy-0.7.0_beta1.ebuild 3756 RMD160 379779f44e55ce33f0108108b8c53280e8618c07 SHA1 dadeee2179d355f6bcfa545814f979f727ae1faa SHA256 ef8ffd2a0700c9914b5d7b61de4e5919b0b5cd68ca8f4a7f7f5ea234ba613577
-MISC ChangeLog 8360 RMD160 2757ec238a6046f5088d4f1933086da5092ca47c SHA1 f5be66981470cf05d71eb6e61b6973df9a2ad2a8 SHA256 e0016084262302ef8472ba914d946981aa4d727ae417f49971e5ef24a88ceaca
+EBUILD scipy-0.6.0-r5.ebuild 4428 RMD160 d7bc77e986c4403aabd81ea08e1bb5ae3506327b SHA1 ca91bcd8895e2ccba05ae1998ed7467e9d73e270 SHA256 9e00b97ed7405411ebd9fa0ab2ebcd216876bfd155ab54b283d3cba950685e25
+EBUILD scipy-0.7.0_beta1.ebuild 3755 RMD160 0eef9e6abc93e7debdb866febfbf3a7f6d29eb74 SHA1 3ef639f3077764a7a6720e9c143524fb8660b2bc SHA256 b6c31e4c92ea33caa763c53dfdf0f828e2f02e34b8005ea07db5698ee35366ef
+MISC ChangeLog 8499 RMD160 508440733ff7e2e1709e38ed1020c6e5ce30428e SHA1 ef61061424da10c44e2b8e906b631a7a1c0098d2 SHA256 741342b08d85aa2226668cb0c04408f5314fe70e6e764e9e9c075c766a3781b9
 MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk5EqQACgkQ1ycZbhPLE2AQcwCgrvParenJXrdGBQbi1WMIzZo1
-hiMAn3ZxKgiC1bM7MSvhrH0cbvd4DSb0
-=HS2b
+iEYEARECAAYFAklBpcMACgkQ1ycZbhPLE2Ae/wCcDqoFONVUizrEBIcZZtJMmogG
+p78An0togA0WeMqdO6wniBpf4D69LWqx
+=GcBg
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.6.0-r5.ebuild b/sci-libs/scipy/scipy-0.6.0-r5.ebuild
index a765bf24e4b8..6de06a7dca78 100644
--- a/sci-libs/scipy/scipy-0.6.0-r5.ebuild
+++ b/sci-libs/scipy/scipy-0.6.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r5.ebuild,v 1.1 2008/12/05 11:38:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r5.ebuild,v 1.2 2008/12/11 23:43:53 bicatali Exp $
 
 EAPI=1
 NEED_PYTHON=2.3
@@ -57,9 +57,6 @@ scipy_fortran_setup() {
 		*)	eerror "Unknown fortran compiler: ${FORTRANC}"
 			die "scipy_fortran_setup failed" ;;
 	esac
-
-	# when fortran flags are set, pic is removed.
-	use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
 	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
 }
 
@@ -128,6 +125,8 @@ src_unpack() {
 }
 
 src_compile() {
+	# when fortran flags are set, pic is removed.
+	use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
 	distutils_src_compile ${SCIPY_FCONFIG}
 }
 
diff --git a/sci-libs/scipy/scipy-0.7.0_beta1.ebuild b/sci-libs/scipy/scipy-0.7.0_beta1.ebuild
index 39a912f7425e..b6f7c8c9694f 100644
--- a/sci-libs/scipy/scipy-0.7.0_beta1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.0_beta1.ebuild,v 1.1 2008/12/05 11:38:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.0_beta1.ebuild,v 1.2 2008/12/11 23:43:53 bicatali Exp $
 
 EAPI=1
 NEED_PYTHON=2.4
@@ -55,9 +55,6 @@ scipy_fortran_setup() {
 		*)	eerror "Unknown fortran compiler: ${FORTRANC}"
 			die "scipy_fortran_setup failed" ;;
 	esac
-
-	# when fortran flags are set, pic is removed.
-	use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
 	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
 }
 
@@ -111,6 +108,8 @@ src_unpack() {
 }
 
 src_compile() {
+	# when fortran flags are set, pic is removed.
+	use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
 	distutils_src_compile ${SCIPY_FCONFIG}
 }