summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2007-05-25 15:52:03 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2007-05-25 15:52:03 +0000
commite8ee3803f1eab8518a43f43aa768e34a4b706902 (patch)
treee3644bf9180b6534716ae295ac79529db2ee0b14 /dev-python
parentThe FreeBSD patches has to be applied before eautoreconf is ran, or they will... (diff)
downloadhistorical-e8ee3803f1eab8518a43f43aa768e34a4b706902.tar.gz
historical-e8ee3803f1eab8518a43f43aa768e34a4b706902.tar.bz2
historical-e8ee3803f1eab8518a43f43aa768e34a4b706902.zip
version bump and removed older version
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/numpy/ChangeLog9
-rw-r--r--dev-python/numpy/Manifest45
-rw-r--r--dev-python/numpy/files/digest-numpy-1.0.13
-rw-r--r--dev-python/numpy/files/digest-numpy-1.0.1-r13
-rw-r--r--dev-python/numpy/files/digest-numpy-1.0.33
-rw-r--r--dev-python/numpy/files/numpy-1.0.1-cpuinfo.patch89
-rw-r--r--dev-python/numpy/numpy-1.0.1.ebuild102
-rw-r--r--dev-python/numpy/numpy-1.0.3.ebuild (renamed from dev-python/numpy/numpy-1.0.1-r1.ebuild)12
8 files changed, 28 insertions, 238 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b7a0b2b5a5db..2078d28a7207 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.22 2007/04/05 10:32:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.23 2007/05/25 15:52:03 bicatali Exp $
+
+*numpy-1.0.3 (25 May 2007)
+
+ 25 May 2007; SĂ©bastien Fabbro <bicatali@gentoo.org>
+ -files/numpy-1.0.1-cpuinfo.patch, -numpy-1.0.1.ebuild,
+ -numpy-1.0.1-r1.ebuild, +numpy-1.0.3.ebuild:
+ version bump and removed older version
*numpy-1.0.2 (05 Apr 2007)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 634bf81a379f..b2fac38be581 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,37 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX numpy-1.0.1-cpuinfo.patch 3547 RMD160 49957fe692d395b57f7028290ea74d81a72e11fe SHA1 89f7e2e9b5712bcd95e4a8783f4436bf65915d52 SHA256 bbb36b534d5db36b85adc2cfc68c71cc65529d2017355effaf5078d531d52cab
-MD5 a346e4eadc562d1ad3624dc68f7559b7 files/numpy-1.0.1-cpuinfo.patch 3547
-RMD160 49957fe692d395b57f7028290ea74d81a72e11fe files/numpy-1.0.1-cpuinfo.patch 3547
-SHA256 bbb36b534d5db36b85adc2cfc68c71cc65529d2017355effaf5078d531d52cab files/numpy-1.0.1-cpuinfo.patch 3547
AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
MD5 69e8b3f89762b836594a61414942aa78 files/numpy-1.0.1-f2py.patch 1403
RMD160 4a02205910231c3b08ae919a45facc21dd2818ae files/numpy-1.0.1-f2py.patch 1403
SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51 files/numpy-1.0.1-f2py.patch 1403
DIST numpy-0.9.8.tar.gz 985088 RMD160 6059d103ae0c89f946da906f0cddcb9cd1f6b59b SHA1 d468f66849f8672a611004a64726fc6ea7195c83 SHA256 1cac3bb08d5a64b9877eb458b7235bf33bdb591136cb08e4561b6210756750c1
-DIST numpy-1.0.1.tar.gz 1249684 RMD160 f3a0c55aa5add8c93f91eee1bb05ff555c0f2485 SHA1 d6d20a32d2386ea32582d497d123211a98441c4e SHA256 c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067
DIST numpy-1.0.2.tar.gz 1400121 RMD160 e41ade8e070357cef5ea65f56ac883e0d3a5cef3 SHA1 969145c2ac910734c261f139884ca8f3084a3ea6 SHA256 1f253c7482895f7ec95cb57f5f412eafcf3be23eaebdb7d1b7bbcc2c8a65c226
+DIST numpy-1.0.3.tar.gz 1501279 RMD160 845e34d2d17c4dbb9cd239ab848493e3c0abd982 SHA1 1a4cf488e0549c9fda1300301ed2961f19742c8b SHA256 78519c924c0ff4ae85a005998e30c8fb02e3fc6485b1ef2e1e7610e77d1d0ffe
EBUILD numpy-0.9.8.ebuild 1557 RMD160 536add2de5a6c0fe7ac2a1ef39788b074bfb0b0b SHA1 2e7e3d8e0160fba6f6bdf273a0a990069559f4dc SHA256 6149347b0833687ffc279ac04eb163ac004363308e047f27fbd10b4a718a4458
MD5 77c55bc35c89e312fd945a4ffdbfaaa0 numpy-0.9.8.ebuild 1557
RMD160 536add2de5a6c0fe7ac2a1ef39788b074bfb0b0b numpy-0.9.8.ebuild 1557
SHA256 6149347b0833687ffc279ac04eb163ac004363308e047f27fbd10b4a718a4458 numpy-0.9.8.ebuild 1557
-EBUILD numpy-1.0.1-r1.ebuild 3927 RMD160 78d12895d75ab59b0bf4a592f76bd68c97aa938d SHA1 2d59302a39b9be9877b143f194b1cd315529b3f1 SHA256 b0b3a483a1066052c215e8bd1d1d96eea020f5c46b0f90afa7fb3151fa9e3a1c
-MD5 b8a2969e1dbd37c1324a1aa662c9837b numpy-1.0.1-r1.ebuild 3927
-RMD160 78d12895d75ab59b0bf4a592f76bd68c97aa938d numpy-1.0.1-r1.ebuild 3927
-SHA256 b0b3a483a1066052c215e8bd1d1d96eea020f5c46b0f90afa7fb3151fa9e3a1c numpy-1.0.1-r1.ebuild 3927
-EBUILD numpy-1.0.1.ebuild 2271 RMD160 fd436cc29e0389f1d2246a9340c23024246f0ecb SHA1 a5b046c89bb968a92c323c5f9dabd6438451f5cd SHA256 067aff264eccb0d9465715a91960c9f070ea04c1b1f1bd4500800aaec56a6af1
-MD5 62f4ec838aed7d95ba701c229ef98964 numpy-1.0.1.ebuild 2271
-RMD160 fd436cc29e0389f1d2246a9340c23024246f0ecb numpy-1.0.1.ebuild 2271
-SHA256 067aff264eccb0d9465715a91960c9f070ea04c1b1f1bd4500800aaec56a6af1 numpy-1.0.1.ebuild 2271
EBUILD numpy-1.0.2.ebuild 3827 RMD160 5a01d822b8b9a8b7800274419d5fd09103a057ee SHA1 13600590172c8728c92cb8c4b30dbfd88da7215e SHA256 cedecaac27ee87f2d27b0254d2309a265d9d6a33b3ddfdb909f234b29056650d
MD5 d7a4bab5fceaf101c9ee91125eb45b5b numpy-1.0.2.ebuild 3827
RMD160 5a01d822b8b9a8b7800274419d5fd09103a057ee numpy-1.0.2.ebuild 3827
SHA256 cedecaac27ee87f2d27b0254d2309a265d9d6a33b3ddfdb909f234b29056650d numpy-1.0.2.ebuild 3827
-MISC ChangeLog 4132 RMD160 2f74fee9e93e69d56e6378f4cf6b3a6ad062d10a SHA1 657dfe48ffa618b4943bf051aad9391faaa8f3dc SHA256 32cd7678a68e77c8a38821fc090ae2f4a7b9a37fd57bd046f0b12382b942b590
-MD5 c090dc45c7ec9bb9f2cc9a92fd32b00b ChangeLog 4132
-RMD160 2f74fee9e93e69d56e6378f4cf6b3a6ad062d10a ChangeLog 4132
-SHA256 32cd7678a68e77c8a38821fc090ae2f4a7b9a37fd57bd046f0b12382b942b590 ChangeLog 4132
+EBUILD numpy-1.0.3.ebuild 3866 RMD160 8df9414f11d89394f2fb89f3e543d983ef177d6d SHA1 6b57aef2b9d5b81305e73831471bdd1924e319a6 SHA256 d6e1ce2d91b1e01600687111e6da9c7a8695218147324a991367a6104ddd0d49
+MD5 d853073845a470a29efafb94a70e19e1 numpy-1.0.3.ebuild 3866
+RMD160 8df9414f11d89394f2fb89f3e543d983ef177d6d numpy-1.0.3.ebuild 3866
+SHA256 d6e1ce2d91b1e01600687111e6da9c7a8695218147324a991367a6104ddd0d49 numpy-1.0.3.ebuild 3866
+MISC ChangeLog 4361 RMD160 5df38753afea7d2d9d265688ece731a0eeab4940 SHA1 861ee7407960ae5e6922686239936cac2f495c0c SHA256 eae1f39206a35a056c9e406d66f4a34a348a7bfa5ed68c57b0cedfb209591b1f
+MD5 f11fde0da76e2d70ebecce99372255f2 ChangeLog 4361
+RMD160 5df38753afea7d2d9d265688ece731a0eeab4940 ChangeLog 4361
+SHA256 eae1f39206a35a056c9e406d66f4a34a348a7bfa5ed68c57b0cedfb209591b1f ChangeLog 4361
MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747
RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747
@@ -39,19 +28,9 @@ SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640 metadata
MD5 a69679bccfb83100a3547c07b19bd72d files/digest-numpy-0.9.8 235
RMD160 8a348d126eee1dffdfcda72fe0e898faeb633801 files/digest-numpy-0.9.8 235
SHA256 5b8e9c649439c0084103ace433c75d26c1e2aa05fefddc972d8716240db48da3 files/digest-numpy-0.9.8 235
-MD5 03507ab77c28afe5e3f47d2f3e5ee2f7 files/digest-numpy-1.0.1 238
-RMD160 ea629f31974cb85325a558a41a3c5f8500cf636e files/digest-numpy-1.0.1 238
-SHA256 683c8162153610de363d0aa90c583e5e83f4bb8fc815d6e0310c43f76cc19faa files/digest-numpy-1.0.1 238
-MD5 03507ab77c28afe5e3f47d2f3e5ee2f7 files/digest-numpy-1.0.1-r1 238
-RMD160 ea629f31974cb85325a558a41a3c5f8500cf636e files/digest-numpy-1.0.1-r1 238
-SHA256 683c8162153610de363d0aa90c583e5e83f4bb8fc815d6e0310c43f76cc19faa files/digest-numpy-1.0.1-r1 238
MD5 535d302508710304443438f779827095 files/digest-numpy-1.0.2 238
RMD160 4349071c6a482a9f909bfafd78e67f70a2267461 files/digest-numpy-1.0.2 238
SHA256 fdf8dbbba130187c2cc9809822827c4bf407b48b9bd0006f1170ada3c399ca28 files/digest-numpy-1.0.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGFNA01ycZbhPLE2ARAo6IAKCQNlEDv32FfsoIjn1Tf7JJ17+8+wCeKD5c
-tn5yb0jVxre8Qo5QfgISISk=
-=AmXp
------END PGP SIGNATURE-----
+MD5 b87e2c07e6c3c3bb706d0433b76fd13f files/digest-numpy-1.0.3 238
+RMD160 e23003195decf499f3b41226e7c03f2ddb94a5d5 files/digest-numpy-1.0.3 238
+SHA256 45949e967e8c46c03368bfb7ad3315ed6f3886ffaf298d1e64685f02c4dc5077 files/digest-numpy-1.0.3 238
diff --git a/dev-python/numpy/files/digest-numpy-1.0.1 b/dev-python/numpy/files/digest-numpy-1.0.1
deleted file mode 100644
index 6bfc0c7d6798..000000000000
--- a/dev-python/numpy/files/digest-numpy-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13a29244cbe03e0d45e56d8d90ecb55d numpy-1.0.1.tar.gz 1249684
-RMD160 f3a0c55aa5add8c93f91eee1bb05ff555c0f2485 numpy-1.0.1.tar.gz 1249684
-SHA256 c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067 numpy-1.0.1.tar.gz 1249684
diff --git a/dev-python/numpy/files/digest-numpy-1.0.1-r1 b/dev-python/numpy/files/digest-numpy-1.0.1-r1
deleted file mode 100644
index 6bfc0c7d6798..000000000000
--- a/dev-python/numpy/files/digest-numpy-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13a29244cbe03e0d45e56d8d90ecb55d numpy-1.0.1.tar.gz 1249684
-RMD160 f3a0c55aa5add8c93f91eee1bb05ff555c0f2485 numpy-1.0.1.tar.gz 1249684
-SHA256 c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067 numpy-1.0.1.tar.gz 1249684
diff --git a/dev-python/numpy/files/digest-numpy-1.0.3 b/dev-python/numpy/files/digest-numpy-1.0.3
new file mode 100644
index 000000000000..58f4adc44883
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-1.0.3
@@ -0,0 +1,3 @@
+MD5 9786f33f1e153163ab81c333dcd57f51 numpy-1.0.3.tar.gz 1501279
+RMD160 845e34d2d17c4dbb9cd239ab848493e3c0abd982 numpy-1.0.3.tar.gz 1501279
+SHA256 78519c924c0ff4ae85a005998e30c8fb02e3fc6485b1ef2e1e7610e77d1d0ffe numpy-1.0.3.tar.gz 1501279
diff --git a/dev-python/numpy/files/numpy-1.0.1-cpuinfo.patch b/dev-python/numpy/files/numpy-1.0.1-cpuinfo.patch
deleted file mode 100644
index fecddfe232cd..000000000000
--- a/dev-python/numpy/files/numpy-1.0.1-cpuinfo.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nur numpy/distutils.orig/cpuinfo.py numpy/distutils/cpuinfo.py
---- numpy/distutils.orig/cpuinfo.py 2006-07-26 21:04:22.000000000 +0100
-+++ numpy/distutils/cpuinfo.py 2007-03-05 10:23:16.000000000 +0000
-@@ -5,7 +5,7 @@
- Copyright 2002 Pearu Peterson all rights reserved,
- Pearu Peterson <pearu@cens.ioc.ee>
- Permission to use, modify, and distribute this software is given under the
--terms of the SciPy (BSD style) license. See LICENSE.txt that came with
-+terms of the NumPy (BSD style) license. See LICENSE.txt that came with
- this distribution for specifics.
-
- Note: This should be merged into proc at some point. Perhaps proc should
-@@ -185,8 +185,13 @@
- return self.is_PentiumIV() and self.has_sse3()
-
- def _is_Nocona(self):
-- return self.is_PentiumIV() and self.is_64bit()
--
-+ return self.is_64bit() and self.is_i686()
-+
-+ def _is_Core2(self):
-+ return self.is_64bit() and self.is_Intel() and \
-+ re.match(r'.*?Core\(TM\)2\b', \
-+ self.info[0]['model name']) is not None
-+
- def _is_Itanium(self):
- return re.match(r'.*?Itanium\b',
- self.info[0]['family']) is not None
-diff -Nur numpy/distutils.orig/fcompiler/gnu.py numpy/distutils/fcompiler/gnu.py
---- numpy/distutils.orig/fcompiler/gnu.py 2006-10-09 08:46:59.000000000 +0100
-+++ numpy/distutils/fcompiler/gnu.py 2007-03-05 10:23:27.000000000 +0000
-@@ -1,4 +1,3 @@
--
- import re
- import os
- import sys
-@@ -62,14 +61,18 @@
- def get_flags_linker_so(self):
- opt = self.linker_so[1:]
- if sys.platform=='darwin':
-+ # MACOSX_DEPLOYMENT_TARGET must be at least 10.3. This is
-+ # a reasonable default value even when building on 10.4 when using
-+ # the official Python distribution and those derived from it (when
-+ # not broken).
- target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', None)
-- if target is None:
-+ if target is None or target == '':
- target = '10.3'
- major, minor = target.split('.')
- if int(minor) < 3:
- minor = '3'
- warnings.warn('Environment variable '
-- 'MACOSX_DEPLOYMENT_TARGET reset to 10.3')
-+ 'MACOSX_DEPLOYMENT_TARGET reset to %s.%s' % (major, minor))
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = '%s.%s' % (major,
- minor)
-
-@@ -193,6 +196,8 @@
- # there's also: athlon-tbird, athlon-4, athlon-xp
- elif cpu.is_Nocona():
- march_opt = '-march=nocona'
-+ elif cpu.is_Core2():
-+ march_opt = '-march=nocona'
- elif cpu.is_Prescott():
- march_opt = '-march=prescott'
- elif cpu.is_PentiumIV():
-@@ -213,7 +218,12 @@
- if gnu_ver >= '3.4.4':
- if cpu.is_PentiumM():
- march_opt = '-march=pentium-m'
--
-+
-+ # Future:
-+ # if gnu_ver >= '4.3':
-+ # if cpu.is_Core2():
-+ # march_opt = '-march=core2'
-+
- # Note: gcc 3.2 on win32 has breakage with -march specified
- if '3.1.1' <= gnu_ver <= '3.4' and sys.platform=='win32':
- march_opt = ''
-@@ -275,7 +285,7 @@
- def get_libraries(self):
- opt = GnuFCompiler.get_libraries(self)
- if sys.platform == 'darwin':
-- opt.remove('cc_dynamic')
-+ opt.remove('cc_dynamic')
- return opt
-
- if __name__ == '__main__':
diff --git a/dev-python/numpy/numpy-1.0.1.ebuild b/dev-python/numpy/numpy-1.0.1.ebuild
deleted file mode 100644
index ffa2dfa1786c..000000000000
--- a/dev-python/numpy/numpy-1.0.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.1.ebuild,v 1.2 2007/02/19 10:15:18 bicatali Exp $
-
-inherit distutils fortran
-
-MY_P=${P/_beta/b}
-MY_P=${MY_P/_}
-DESCRIPTION="Multi-dimensional array object and processing for Python."
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://numeric.scipy.org/"
-
-# numpy provides the latest version of dev-python/f2py
-DEPEND=">=dev-lang/python-2.3
- !dev-python/f2py
- lapack? ( virtual/blas
- virtual/lapack )"
-
-IUSE="lapack"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-RESTRICT="test"
-S="${WORKDIR}/${MY_P}"
-
-FORTRAN="g77 gfortran"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # sed to patch ATLAS libraries names (gentoo specific)
- sed -i \
- -e "s:f77blas:blas:g" \
- -e "s:ptblas:blas:g" \
- -e "s:ptcblas:cblas:g" \
- -e "s:lapack_atlas:lapack:g" \
- numpy/distutils/system_info.py
-
- if use lapack; then
- echo "[atlas]" > site.cfg
- echo "include_dirs = /usr/include/atlas" >> site.cfg
- echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg
- echo -n "library_dirs = /usr/$(get_libdir)/lapack::/usr/$(get_libdir):" \
- >> site.cfg
- if [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ]; then
- echo "/usr/$(get_libdir)/blas/threaded-atlas" >> site.cfg
- else
- echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg
- fi
- fi
-}
-
-src_compile() {
- # Map compilers to what numpy calls them (same as scipy)
- local NUMPY_FC
- case "${FORTRANC}" in
- gfortran)
- NUMPY_FC="gnu95"
- ;;
- g77)
- NUMPY_FC="gnu"
- ;;
- g95)
- NUMPY_FC="g95"
- ;;
- ifc|ifort)
- if use ia64; then
- NUMPY_FC="intele"
- else
- NUMPY_FC="intel"
- fi
- ;;
- *)
- local msg="Invalid Fortran compiler \'${FORTRANC}\'"
- eerror "${msg}"
- die "${msg}"
- ;;
- esac
-
- if !(use lapack); then
- rm -f site.cfg
- export BLAS=None
- export LAPACK=None
- export ATLAS=None
- fi
-
- # http://projects.scipy.org/scipy/numpy/ticket/182
- # Can't set LDFLAGS
- unset LDFLAGS
- export F77LFLAGS="${F77LFLAGS} -fPIC"
-
- distutils_src_compile \
- config_fc \
- --fcompiler=${NUMPY_FC} \
- --opt="${CFLAGS}" \
- || die "compilation failed"
-}
-
-src_install() {
- distutils_src_install
- dodoc numpy/doc/*
-}
diff --git a/dev-python/numpy/numpy-1.0.1-r1.ebuild b/dev-python/numpy/numpy-1.0.3.ebuild
index f5c53f3ee6e2..288ae064f4b3 100644
--- a/dev-python/numpy/numpy-1.0.1-r1.ebuild
+++ b/dev-python/numpy/numpy-1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.1-r1.ebuild,v 1.4 2007/03/06 10:06:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.3.ebuild,v 1.1 2007/05/25 15:52:03 bicatali Exp $
NEED_PYTHON=2.3
@@ -26,7 +26,7 @@ LICENSE="BSD"
S="${WORKDIR}/${MY_P}"
-FORTRAN="g77 gfortran"
+FORTRAN="gfortran g77"
numpy_configure() {
local mycblas
@@ -110,10 +110,7 @@ src_unpack() {
fortran_src_unpack
cd "${S}"
# fix some paths and docs in f2py
- epatch "${FILESDIR}"/${P}-f2py.patch
-
- # fix cpuinfo for p4 (gentoo bug #169262/ numpy ticket #349)
- epatch "${FILESDIR}"/${P}-cpuinfo.patch
+ epatch "${FILESDIR}"/${PN}-1.0.1-f2py.patch
# gentoo patch for ATLAS library names
sed -i \
@@ -121,7 +118,8 @@ src_unpack() {
-e "s:'ptblas':'blas':g" \
-e "s:'ptcblas':'cblas':g" \
-e "s:'lapack_atlas':'lapack':g" \
- numpy/distutils/system_info.py
+ numpy/distutils/system_info.py \
+ || die "sed system_info.py failed"
}
src_compile() {