summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-06-23 15:11:53 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-06-23 15:11:53 +0000
commitccffecddbf6417286f8d5d4b907c6f3f8c39745e (patch)
treece6f4b156e052cca4b7eb6739568ec1f337abd0f /sci-libs/scipy
parentAdd new flags to IUSE. (diff)
downloadhistorical-ccffecddbf6417286f8d5d4b907c6f3f8c39745e.tar.gz
historical-ccffecddbf6417286f8d5d4b907c6f3f8c39745e.tar.bz2
historical-ccffecddbf6417286f8d5d4b907c6f3f8c39745e.zip
Added a few configuration options for lapack and atlas
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sci-libs/scipy')
-rw-r--r--sci-libs/scipy/ChangeLog6
-rw-r--r--sci-libs/scipy/Manifest12
-rw-r--r--sci-libs/scipy/scipy-0.6.0-r4.ebuild19
3 files changed, 23 insertions, 14 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index cf4a1a5fa8f4..bfea9950546b 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.30 2008/04/21 16:06:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.31 2008/06/23 15:11:53 bicatali Exp $
+
+ 23 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ scipy-0.6.0-r4.ebuild:
+ Added a few configuration options for lapack and atlas
21 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
-files/scipy-0.6.0-clapack-symbol-fix.patch, -scipy-0.5.2.ebuild,
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 857b6ed8860a..512b0e305b93 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -6,13 +6,13 @@ AUX scipy-0.6.0-fftw-fix.patch 535 RMD160 3a42973062b6b5834596ffd16ffccedb4ddc08
AUX scipy-0.6.0-ndimage.patch 782 RMD160 6f8fe88b8229d56340d8ff24d90e311ab1a934ea SHA1 7ccf18c48bad2a6489c8c5ae03bdb2667af19a0f SHA256 ec98e4ca10f1fe569833aa1f87ea05c71d7c43ea19563626f010c113fd24b30f
AUX scipy-0.6.0-randomkit.patch 15283 RMD160 d59f0cfc56aa80c516ee48c82392c0e3db4b03f0 SHA1 90b4b64a4ecf28dfc418ad318c175221aa9aa8ab SHA256 6bf246b9393acf1183a0702dc0e752cbc8905ac1b94d5823cc4c76d6ae4b9a85
DIST scipy-0.6.0.tar.gz 6572954 RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b SHA1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 SHA256 5f70390963fb4e3ae8cf5effa301c160ef68c791098e2ea95b99380e298eac4f
-EBUILD scipy-0.6.0-r4.ebuild 3321 RMD160 9dc821430e264571d9577fd599433c6962e2f8b0 SHA1 28bb767de99bf21c12bf21043cebca7483f29a34 SHA256 4cad658900f8481f8ab60c45d6e8bbe3b712d0b406da3d451d892c0277ef89e0
-MISC ChangeLog 6951 RMD160 f397698820437f37f051a8d3dfe1c23aa6fdbc4a SHA1 c0ae02f8d3755a6c5b307deb00e70317fd8c7ca9 SHA256 c00af45a5bc2bd7655b0b90e3a9c3aec944a3cdfbdeddc5a51d14b79a898c60a
+EBUILD scipy-0.6.0-r4.ebuild 3626 RMD160 92bd8f24529491cb87008aacc62734c8965b7b72 SHA1 1629fc4152f17be6502eb609db7b3f8152027bda SHA256 b51c656228776a68597c32a5930b6d6d76686cb0334c976bc6a7689beac5e7c0
+MISC ChangeLog 7089 RMD160 d6aca01afda0b426093019d54466ccca1617614b SHA1 fdb59c42e67af15e7c848158c1f0fdd8635f4ec9 SHA256 7c118fcda68a0e682c47f1a6e3303c3748f779b3a37969356550e34b336a8c44
MISC metadata.xml 577 RMD160 c9ddccf05c22b5460372ef1c47a91e3441ec6480 SHA1 fb55340f9fbf7877f5874cabcfbac9ea19f849bd SHA256 768246bd968275941fcf6cb3b9d084fdc45a2ab10d257709f644fe87c69c3b88
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
-iD8DBQFIDLuY1ycZbhPLE2ARAo9gAJ0QQxQE8JDVtJdwfqOC7ZzLA1lizwCfU4d3
-h19w826mGZbWQS9i9YLMGT0=
-=n4FZ
+iEYEARECAAYFAkhfvUMACgkQ1ycZbhPLE2AkpQCgqXjQF5DAOUtkm5q5qxqLMi6P
+lOoAoJSBjSb5Ceovw1fLAp7EdLAaFClr
+=8dkE
-----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.6.0-r4.ebuild b/sci-libs/scipy/scipy-0.6.0-r4.ebuild
index fbfefe0c5b1b..c507365af7f6 100644
--- a/sci-libs/scipy/scipy-0.6.0-r4.ebuild
+++ b/sci-libs/scipy/scipy-0.6.0-r4.ebuild
@@ -1,9 +1,9 @@
# 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-r4.ebuild,v 1.3 2008/04/17 00:43:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r4.ebuild,v 1.4 2008/06/23 15:11:53 bicatali Exp $
+EAPI=1
NEED_PYTHON=2.3
-
inherit eutils distutils fortran flag-o-matic
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -17,9 +17,9 @@ IUSE="fftw umfpack sandbox"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-CDEPEND=">=dev-python/numpy-1.0.4-r1
+CDEPEND="dev-python/numpy
virtual/lapack
- fftw? ( =sci-libs/fftw-2.1* )
+ fftw? ( sci-libs/fftw:2.1 )
umfpack? ( sci-libs/umfpack )
sandbox? ( >=sci-libs/netcdf-3.6 x11-libs/libX11 )"
@@ -89,9 +89,14 @@ src_unpack() {
library_dirs = /usr/$(get_libdir)
include_dirs = /usr/include
[atlas]
- atlas_libs = $(pkg-config --libs-only-l lapack \
- | sed -e 's/^-l//' -e 's/ -l/,/g')
-
+ include_dirs = $(pkg-config --cflags-only-I lapack \
+ | sed -e 's/^-I//' -e 's/ -I/:/g')
+ library_dirs = $(pkg-config --libs-only-L lapack \
+ | sed -e 's/^-L//' -e 's/ -L/:/g')
+ atlas_libs = $(pkg-config --libs-only-l blas \
+ | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+ lapack_libs = $(pkg-config --libs-only-l lapack \
+ | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
EOF
if use sandbox; then
cd scipy/sandbox