aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/numpy/ChangeLog8
-rw-r--r--dev-python/numpy/Manifest16
-rw-r--r--dev-python/numpy/numpy-1.0.ebuild9
3 files changed, 22 insertions, 11 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 0f1b906a2..2f72a47be 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -3,6 +3,14 @@
# $Header: $
+ 21 Nov 2006; Sebastien Fabbro <seb@ist.utl.pt>; +numpy-1.0.ebuild:
+ Fixes again the USE=-lapack.
+ Thanks to Toon Verstraelen <toon.verstraelen@ugent.be>.
+
+
+
+
+
*numpy-1.0 (02 Nov 2006)
O2 Nov 2006; Sebastien Fabbro <seb@ist.utl.pt>; +numpy-1.0.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 8907759aa..68c6ce0b5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,12 +1,12 @@
DIST numpy-1.0.tar.gz 1217867 RMD160 86f78b4f83da8f173fb4794b3853d9203311b2c6 SHA1 2ee8aab3bef62e9791ab2671193787c3855c2222 SHA256 dcd46eb5f3c09018912f590fa7fbf92f2c85421314c12b8fcd2e19d74757d5c7
-EBUILD numpy-1.0.ebuild 1494 RMD160 20d3a251ca0a34d65ade8a2d839a406da6aeb048 SHA1 a4af535d924a7f9852bd745aa9e25be6d428e29c SHA256 c457d3f0e1af05940fb5c5c16c5e609f554e6b686167884c605d1bcac8819da3
-MD5 50fd3a8cd1ab111faf5fa2a5e0db0060 numpy-1.0.ebuild 1494
-RMD160 20d3a251ca0a34d65ade8a2d839a406da6aeb048 numpy-1.0.ebuild 1494
-SHA256 c457d3f0e1af05940fb5c5c16c5e609f554e6b686167884c605d1bcac8819da3 numpy-1.0.ebuild 1494
-MISC ChangeLog 260 RMD160 fcc4095562a8bc310b3894c6954bc6346aa2b16c SHA1 dde2e57cd7135285d3fff097c2a46283e9db3f61 SHA256 d9cd4cfe2b61b35ee0f47c5f69c6447b30d609766fd7be22d8acd338a231472a
-MD5 d241ad0c9878be1a2a1ad92bf3d820fd ChangeLog 260
-RMD160 fcc4095562a8bc310b3894c6954bc6346aa2b16c ChangeLog 260
-SHA256 d9cd4cfe2b61b35ee0f47c5f69c6447b30d609766fd7be22d8acd338a231472a ChangeLog 260
+EBUILD numpy-1.0.ebuild 1556 RMD160 5c2c73bfe2f99835f894e4c76ed616b2e8254d8a SHA1 befed94a5be0098021444380e82b97302091d4a4 SHA256 e0ed9228a63138045c53005b198612ed39ef4ecd20a783872e372e0354196aea
+MD5 17b5e24c5abb393c2aa84f90d57e2bdd numpy-1.0.ebuild 1556
+RMD160 5c2c73bfe2f99835f894e4c76ed616b2e8254d8a numpy-1.0.ebuild 1556
+SHA256 e0ed9228a63138045c53005b198612ed39ef4ecd20a783872e372e0354196aea numpy-1.0.ebuild 1556
+MISC ChangeLog 424 RMD160 740a8ec3144188c2442c9b8efd4f1613a98c523b SHA1 87a48127e0c09916240fc4743b1a231e7ed0f981 SHA256 e3374e6494bdc52fd4f8c3cbbd43c0b5fe6013b0c150a8139f0456ff38994779
+MD5 edc7d131b84a222b369a50037fce2cfc ChangeLog 424
+RMD160 740a8ec3144188c2442c9b8efd4f1613a98c523b ChangeLog 424
+SHA256 e3374e6494bdc52fd4f8c3cbbd43c0b5fe6013b0c150a8139f0456ff38994779 ChangeLog 424
MISC metadata.xml 617 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 SHA1 5e056fcc834226a96a9a7197ba2f2c0c076634d5 SHA256 eda38840db709ec1460753d542150351bcd8eaf235fcd58252e45712d64cad6a
MD5 9251edbaa605d72f2c04cc0a5b4f9a84 metadata.xml 617
RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 metadata.xml 617
diff --git a/dev-python/numpy/numpy-1.0.ebuild b/dev-python/numpy/numpy-1.0.ebuild
index 489f7ab50..93686ee90 100644
--- a/dev-python/numpy/numpy-1.0.ebuild
+++ b/dev-python/numpy/numpy-1.0.ebuild
@@ -43,9 +43,6 @@ src_unpack() {
else
echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg
fi
- else
- rm -f site.cfg
- export ATLAS=None
fi
}
@@ -53,6 +50,12 @@ src_compile() {
# http://projects.scipy.org/scipy/numpy/ticket/182
# Can't set LDFLAGS
unset LDFLAGS
+ if !(use lapack); then
+ rm -f site.cfg
+ export BLAS=None
+ export LAPACK=None
+ export ATLAS=None
+ fi
distutils_src_compile
}