diff options
author | bicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb> | 2006-09-07 16:21:33 +0000 |
---|---|---|
committer | bicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb> | 2006-09-07 16:21:33 +0000 |
commit | 11e6533cf28b62659af024de72796bf73dec9daa (patch) | |
tree | d495f6b2c50407bb44031da8f69e83e36fd305b6 /sci-libs/scipy | |
parent | fixed a test in umfpack-5.0.1 (diff) | |
download | sci-11e6533cf28b62659af024de72796bf73dec9daa.tar.gz sci-11e6533cf28b62659af024de72796bf73dec9daa.tar.bz2 sci-11e6533cf28b62659af024de72796bf73dec9daa.zip |
added scipy-0.5.1
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@287 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-libs/scipy')
-rw-r--r-- | sci-libs/scipy/ChangeLog | 34 | ||||
-rw-r--r-- | sci-libs/scipy/Manifest | 22 | ||||
-rw-r--r-- | sci-libs/scipy/files/digest-scipy-0.4.9 | 1 | ||||
-rw-r--r-- | sci-libs/scipy/files/digest-scipy-0.5.1 | 3 | ||||
-rw-r--r-- | sci-libs/scipy/scipy-0.5.1.ebuild (renamed from sci-libs/scipy/scipy-0.4.9.ebuild) | 62 |
5 files changed, 95 insertions, 27 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog index eeef9fdc3..c710c1c15 100644 --- a/sci-libs/scipy/ChangeLog +++ b/sci-libs/scipy/ChangeLog @@ -2,15 +2,34 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*scipy-0.5.1 (07 Sep 2006) -*scipy-0.4.9 (06 Jun 2006) + 07 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt>. + Version bump. Use portage version from 0.4.9 + added umfpack option. + +*scipy-0.4.9 (14 Jun 2006) + + 14 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; +scipy-0.4.9.ebuild: + Bump. Incorporates many changes from the science overlay, mainly from bicatali. + + 14 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; + scipy-0.4.8-r1.ebuild: + Remove =gcc-3* dep. + + 13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; + scipy-0.4.8-r1.ebuild: + Keyword ~ppc. + + 13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; + scipy-0.4.8-r1.ebuild: + (#134248) Fix for gcc4, and stop appending -O3 -funroll-loops at the end of + our compiler flags by specifying --opt. + + 13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; + scipy-0.4.8-r1.ebuild: + When checking for ATLAS, do it case-insensitively. Future planning for + blas-config and lapack-config as eselect wrappers. - 06 Jun 2006; Sebastien Fabbro <seb@ist.utl.pt> +scipy-0.4.9.ebuild: - Version bump. Tested also with gcc4.1, added a threaded ATLAS better check. - Added a umfpack use flag, which depends on swig. - Had to force fpic on amd64 :(. Also restored metadata.xml which had a long - description on this overlay. - *scipy-0.4.8-r1 (13 Apr 2006) 13 Apr 2006; Olivier Fisette <ribosome@gentoo.org> +scipy-0.4.8-r1.ebuild: @@ -26,3 +45,4 @@ 22 Aug 2005; Peter Bienstman <pbienst@gentoo.org> +files/system_info.diff, +metadata.xml, +scipy-0.3.2.ebuild: Initial import. Closes 24593. Thanks to D. Grant, D. Dale and others. + diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 16b7163ba..7e69716e9 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -1,4 +1,20 @@ -MD5 435bf9d4ebefd6ca7ab624879a3526a4 ChangeLog 1016 -MD5 09dee760f41ae9a97527041c20beeeda files/digest-scipy-0.4.9 64 +DIST scipy-0.5.1.tar.gz 4141008 RMD160 60a184b57f50e9bef78843cbe96542aee43ac386 SHA1 bed9be244fc73c96a252184cfc14653035832f7e SHA256 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a +EBUILD scipy-0.5.1.ebuild 3852 RMD160 f3055f38fc4ed51bec35335a8f4f394b4748b348 SHA1 8e115fc3c9361f4c10b7cf8200fad124558c154e SHA256 704c17ea19a4e63a91f67c8a415400a3aad643a9cfc351f87847852d4e995f75 +MD5 61c1cdb07b68de309f64fd9abedc0e52 scipy-0.5.1.ebuild 3852 +RMD160 f3055f38fc4ed51bec35335a8f4f394b4748b348 scipy-0.5.1.ebuild 3852 +SHA256 704c17ea19a4e63a91f67c8a415400a3aad643a9cfc351f87847852d4e995f75 scipy-0.5.1.ebuild 3852 +MISC ChangeLog 1626 RMD160 9de05127081e08f8e2dea6ddd1d327807e13f18a SHA1 27bbba14aec63baf4dcc09cf6a180c8279222620 SHA256 e55bec5baa036a56f006d8ea3b60090adeb492e3095c4ca932ac491df13fc9d1 +MD5 83f92e25b4b3ed5a5d85ca505a6b0c07 ChangeLog 1626 +RMD160 9de05127081e08f8e2dea6ddd1d327807e13f18a ChangeLog 1626 +SHA256 e55bec5baa036a56f006d8ea3b60090adeb492e3095c4ca932ac491df13fc9d1 ChangeLog 1626 +MISC metadata.xml 686 RMD160 0dbe726ebcded6302f2e319c03b2413ae8da3ee9 SHA1 f87584bd67930e7a825875ff7c6ff3b33160f3fc SHA256 ff7ce4799090209979214132e42fb19833a6085351dc6f159955d6d77f6b1c7d MD5 51dd57e78f009510e5b3a8384723e22d metadata.xml 686 -MD5 0be15743737afd7b9347e9138304aa9e scipy-0.4.9.ebuild 3503 +RMD160 0dbe726ebcded6302f2e319c03b2413ae8da3ee9 metadata.xml 686 +SHA256 ff7ce4799090209979214132e42fb19833a6085351dc6f159955d6d77f6b1c7d metadata.xml 686 +MISC scipy-0.5.1.ebuild~ 3699 RMD160 2b1e7181635d02b8237ffbd06558f45a4ced10e3 SHA1 8d69817130f38dfafb05afcaebb78c2fb9e1f460 SHA256 f53d4c244345a51df6844cbf336fb926fd1014d4682aa112752612b91ceaacc0 +MD5 8f6fdad83a6e12603a23256b11e9b8b7 scipy-0.5.1.ebuild~ 3699 +RMD160 2b1e7181635d02b8237ffbd06558f45a4ced10e3 scipy-0.5.1.ebuild~ 3699 +SHA256 f53d4c244345a51df6844cbf336fb926fd1014d4682aa112752612b91ceaacc0 scipy-0.5.1.ebuild~ 3699 +MD5 66932efefabfe718cb3d73282ad705a6 files/digest-scipy-0.5.1 238 +RMD160 390c13d3a30931cde09e3f744f550a00a96ba2bd files/digest-scipy-0.5.1 238 +SHA256 cd9eb7d7e35ce61f15b7489977e02c867e8e2185ed49a1767d6b3e527e4e0bb4 files/digest-scipy-0.5.1 238 diff --git a/sci-libs/scipy/files/digest-scipy-0.4.9 b/sci-libs/scipy/files/digest-scipy-0.4.9 deleted file mode 100644 index 181e2b62d..000000000 --- a/sci-libs/scipy/files/digest-scipy-0.4.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 bb1db6e0b60652ef26f92587c853a15f scipy-0.4.9.tar.gz 2599608 diff --git a/sci-libs/scipy/files/digest-scipy-0.5.1 b/sci-libs/scipy/files/digest-scipy-0.5.1 new file mode 100644 index 000000000..08c980676 --- /dev/null +++ b/sci-libs/scipy/files/digest-scipy-0.5.1 @@ -0,0 +1,3 @@ +MD5 48442a427f0556ad2ad1721dd62e401c scipy-0.5.1.tar.gz 4141008 +RMD160 60a184b57f50e9bef78843cbe96542aee43ac386 scipy-0.5.1.tar.gz 4141008 +SHA256 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a scipy-0.5.1.tar.gz 4141008 diff --git a/sci-libs/scipy/scipy-0.4.9.ebuild b/sci-libs/scipy/scipy-0.5.1.ebuild index b3c281ddf..02d445684 100644 --- a/sci-libs/scipy/scipy-0.4.9.ebuild +++ b/sci-libs/scipy/scipy-0.5.1.ebuild @@ -11,12 +11,12 @@ LICENSE="BSD" SLOT="0" IUSE="fftw umfpack" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~x86" # did not use virtual/blas and virtual/lapack # because doc says scipy needs to compile all libraries with the same compiler -DEPEND=">=dev-lang/python-2.3.3 - >=dev-python/numpy-0.9.8 +RDEPEND=">=dev-lang/python-2.3.3 + >=dev-python/numpy-1.0_beta2 sci-libs/blas-atlas sci-libs/blas-config sci-libs/lapack-config @@ -24,15 +24,16 @@ DEPEND=">=dev-lang/python-2.3.3 fftw? ( =sci-libs/fftw-2.1* ) umfpack? ( dev-lang/swig sci-libs/umfpack )" -# install doc claims fftw-2 is faster for complex ffts. -# install doc claims gcc-4 not fully tested and blas-atlas is compiled -# with g77 only, so force use of g77 here as well. -# wxwindows seems to have disapeared : ? -# f2py seems to be in numpy. +DEPEND="${RDEPEND}" + +# install doc claims fftw-2 is faster for complex ffts. is this really true? +# f2py is in numpy. FORTRAN="g77 gfortran" pkg_setup() { + fortran_pkg_setup + if built_with_use sci-libs/lapack-atlas ifc; then echo ewarn "${PN} needs consistency among Fortran compilers." @@ -46,14 +47,14 @@ pkg_setup() { echo einfo "Checking active BLAS implementations for ATLAS." blas-config -p - if ! blas-config -p | grep "F77 BLAS:" | grep -q ATLAS; then + if ! blas-config -p | grep "F77 BLAS:" | grep -q -i atlas; then eerror "Your F77 BLAS profile is not set to the ATLAS implementation," eerror "which is required by ${PN} to compile and run properly." eerror "Use: 'blas-config -f ATLAS' to activate ATLAS." echo bad_profile=1 fi - if ! blas-config -p | grep "C BLAS:" | grep -q ATLAS; then + if ! blas-config -p | grep "C BLAS:" | grep -q -i atlas; then eerror "Your C BLAS profile is not set to the ATLAS implementation," eerror "Which is required by ${PN} to compile and run properly." eerror "Use: 'blas-config -c ATLAS' to activate ATLAS." @@ -62,7 +63,7 @@ pkg_setup() { fi einfo "Checking active LAPACK implementation for ATLAS." lapack-config -p - if ! lapack-config -p | grep "F77 LAPACK:" | grep -q ATLAS; then + if ! lapack-config -p | grep "F77 LAPACK:" | grep -q -i atlas; then eerror "Your F77 LAPACK profile is not set to the ATLAS implementation," eerror "which is required by ${PN} to compile and run properly." eerror "Use: 'lapack-config ATLAS' to activate ATLAS." @@ -104,12 +105,41 @@ src_unpack() { else export UMFPACK=None fi +} - # forcing fpic for now, avoiding it would need a lot of work - if use amd64; then - append-flags -fPIC - FFLAGS="${FFLAGS} -fPIC" - fi +src_compile() { + # Map compilers to what scipy calls them + local SCIPY_FC + case "${FORTRANC}" in + gfortran) + SCIPY_FC="gnu95" + ;; + g77) + SCIPY_FC="gnu" + ;; + g95) + SCIPY_FC="g95" + ;; + ifc|ifort) + if use ia64; then + SCIPY_FC="intele" + elif use amd64; then + SCIPY_FC="intelem" + else + SCIPY_FC="intel" + fi + ;; + *) + local msg="Invalid Fortran compiler \'${FORTRANC}\'" + eerror "${msg}" + die "${msg}" + ;; + esac + distutils_src_compile \ + config_fc \ + --fcompiler=${SCIPY_FC} \ + --opt="${CFLAGS}" \ + || die "compilation failed" } src_install() { |