diff options
| -rw-r--r-- | sci-libs/scipy/ChangeLog | 46 | ||||
| -rw-r--r-- | sci-libs/scipy/Manifest | 34 | ||||
| -rw-r--r-- | sci-libs/scipy/files/digest-scipy-0.5.1-r1 (renamed from sci-libs/scipy/files/digest-scipy-0.5.1) | 0 | ||||
| -rw-r--r-- | sci-libs/scipy/metadata.xml | 20 | ||||
| -rw-r--r-- | sci-libs/scipy/scipy-0.5.1-r1.ebuild | 107 | ||||
| -rw-r--r-- | sci-libs/scipy/scipy-0.5.1.ebuild | 148 |
6 files changed, 133 insertions, 222 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog index c710c1c15..4d37fe037 100644 --- a/sci-libs/scipy/ChangeLog +++ b/sci-libs/scipy/ChangeLog @@ -2,47 +2,7 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -*scipy-0.5.1 (07 Sep 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. - -*scipy-0.4.8-r1 (13 Apr 2006) - - 13 Apr 2006; Olivier Fisette <ribosome@gentoo.org> +scipy-0.4.8-r1.ebuild: - Added ATLAS profile check in pk_setup() (fixes bug #129524). - -*scipy-0.4.8 (01 Apr 2006) - - 01 Apr 2006; Olivier Fisette <ribosome@gentoo.org> +scipy-0.4.8.ebuild: - New version. Thanks to bicatali and other contributors for their work. - -*scipy-0.3.2 (22 Aug 2005) - - 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. +*scipy-0.5.1-r1 (24 Sep 2006) + 24 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt>; +scipy-0.5.1-r1.ebuild: + Basically scipy-0.5.1 from main tree + umfpack + fix for fPIC. diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 7e69716e9..39dd73621 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -1,20 +1,16 @@ 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 -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 +EBUILD scipy-0.5.1-r1.ebuild 2328 RMD160 c7cd4800d2ea8ad59e865b65c2f0c2d99237365b SHA1 ce625d3c0ed0d8105c9ab2eed8ece7d67d452733 SHA256 393faa17d130060decf2f8321c960e3bad8644942ff5cae562eeeaf721280300 +MD5 610adcadb555e4ac4a72a4073f99d0af scipy-0.5.1-r1.ebuild 2328 +RMD160 c7cd4800d2ea8ad59e865b65c2f0c2d99237365b scipy-0.5.1-r1.ebuild 2328 +SHA256 393faa17d130060decf2f8321c960e3bad8644942ff5cae562eeeaf721280300 scipy-0.5.1-r1.ebuild 2328 +MISC ChangeLog 285 RMD160 b0c7b0a2246d7d0b62faf2ba98fb103f2e5806a0 SHA1 44152f73a95395fc8ed6c04eb5c43ae651df7848 SHA256 415fa2b2b98c646ee795142f2584c4d807690d99b7255cf03bb5214f4c9f66c2 +MD5 7473f42db02a71f763c6876fd25e761e ChangeLog 285 +RMD160 b0c7b0a2246d7d0b62faf2ba98fb103f2e5806a0 ChangeLog 285 +SHA256 415fa2b2b98c646ee795142f2584c4d807690d99b7255cf03bb5214f4c9f66c2 ChangeLog 285 +MISC metadata.xml 558 RMD160 0a2308551f796cbfeb30440ecca7650ac54f0bdc SHA1 8fb860ebe61ae3bfe58ac18cf90b092aaf800f66 SHA256 f79bac3eb0be97c135f1c6d90f98e6adb2d1b62cb87f32859286d0ce51036101 +MD5 7a770a5f57ac6eeb8b1d3117e6a8ca6c metadata.xml 558 +RMD160 0a2308551f796cbfeb30440ecca7650ac54f0bdc metadata.xml 558 +SHA256 f79bac3eb0be97c135f1c6d90f98e6adb2d1b62cb87f32859286d0ce51036101 metadata.xml 558 +MD5 66932efefabfe718cb3d73282ad705a6 files/digest-scipy-0.5.1-r1 238 +RMD160 390c13d3a30931cde09e3f744f550a00a96ba2bd files/digest-scipy-0.5.1-r1 238 +SHA256 cd9eb7d7e35ce61f15b7489977e02c867e8e2185ed49a1767d6b3e527e4e0bb4 files/digest-scipy-0.5.1-r1 238 diff --git a/sci-libs/scipy/files/digest-scipy-0.5.1 b/sci-libs/scipy/files/digest-scipy-0.5.1-r1 index 08c980676..08c980676 100644 --- a/sci-libs/scipy/files/digest-scipy-0.5.1 +++ b/sci-libs/scipy/files/digest-scipy-0.5.1-r1 diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml index af51deb43..f8562cdf7 100644 --- a/sci-libs/scipy/metadata.xml +++ b/sci-libs/scipy/metadata.xml @@ -2,17 +2,13 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>sci</herd> - <maintainer> - <email>seb@ist.utl.pt</email> - <name>Sebastien Fabbro</name> - </maintainer> - <longdescription lang="en"> - SciPy is an Open Source library of scientific tools for Python. It - gathers a variety of high level science and engineering modules - together as a single package. SciPy provides modules for - statistics, optimization, integration, linear algebra, Fourier - transforms, signal and image processing, genetic algorithms, ODE - solvers, special functions, and more. - </longdescription> +<longdescription lang="en"> +SciPy is an Open Source library of scientific tools for Python. It +gathers a variety of high level science and engineering modules +together as a single package. SciPy provides modules for statistics, +optimization, integration, linear algebra, Fourier transforms, signal +and image processing, genetic algorithms, ODE solvers, special +functions, and more. +</longdescription> </pkgmetadata> diff --git a/sci-libs/scipy/scipy-0.5.1-r1.ebuild b/sci-libs/scipy/scipy-0.5.1-r1.ebuild new file mode 100644 index 000000000..be3f8df7a --- /dev/null +++ b/sci-libs/scipy/scipy-0.5.1-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit distutils fortran flag-o-matic + +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +DESCRIPTION="Open source scientific tools for Python" +HOMEPAGE="http://www.scipy.org/" +LICENSE="BSD" + +SLOT="0" +IUSE="fftw umfpack" +KEYWORDS="~amd64 ~ppc ~x86" + +# doc says scipy needs to compile all libraries with the same compiler +RDEPEND=">=dev-lang/python-2.3.3 + >=dev-python/numpy-1.0_beta1 + virtual/blas + virtual/lapack + fftw? ( =sci-libs/fftw-2.1* ) + umfpack? ( sci-libs/umfpack )" + +DEPEND="${RDEPEND} + umfpack? ( dev-lang/swig )" + +# install doc claims fftw-2 is faster for complex ffts. +# wxwindows seems to have disapeared : ? +# f2py seems to be in numpy. + +FORTRAN="g77 gfortran" + +src_unpack() { + unpack ${A} + cd "${S}" + + echo "[atlas]" > site.cfg + echo "include_dirs = /usr/include/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 + echo "atlas_libs = lapack, blas, cblas, atlas, pthread" >> site.cfg + else + echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg + echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg + fi + + export FFTW3=None + if use fftw; then + echo "[fftw] " >> site.cfg + echo "fftw_libs = rfftw, fftw" >> site.cfg + echo "fftw_opt_libs = rfftw_threads, fftw_threads" >> site.cfg + else + export FFTW=None + fi + + if use umfpack; then + echo "[umfpack] " >> site.cfg + echo "umfpack_libs = umfpack" >> site.cfg + else + export UMFPACK=None + 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" + else + SCIPY_FC="intel" + fi + ;; + *) + local msg="Invalid Fortran compiler \'${FORTRANC}\'" + eerror "${msg}" + die "${msg}" + ;; + esac + + # http://projects.scipy.org/scipy/numpy/ticket/182 + # Can't set LDFLAGS + unset LDFLAGS + + distutils_src_compile \ + config_fc \ + --fcompiler=${SCIPY_FC} \ + --opt="${CFLAGS}" \ + || die "compilation failed" +} + +src_install() { + distutils_src_install + dodoc *.txt +} diff --git a/sci-libs/scipy/scipy-0.5.1.ebuild b/sci-libs/scipy/scipy-0.5.1.ebuild deleted file mode 100644 index 02d445684..000000000 --- a/sci-libs/scipy/scipy-0.5.1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit distutils flag-o-matic fortran - -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -DESCRIPTION="Open source scientific tools for Python" -HOMEPAGE="http://www.scipy.org/" -LICENSE="BSD" - -SLOT="0" -IUSE="fftw umfpack" -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 -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 - sci-libs/lapack-atlas - fftw? ( =sci-libs/fftw-2.1* ) - umfpack? ( dev-lang/swig sci-libs/umfpack )" - -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." - eerror "lapack-atlas was compiled with IFC, whereas" - eerror "blas-atlas and scipy use the GNU compiler." - eerror "please re-emerge lapack-atlas with 'USE=\"-ifc\"'." - echo - die "Inconsistent Fortran compilers" - fi - - echo - einfo "Checking active BLAS implementations for ATLAS." - blas-config -p - 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 -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." - echo - bad_profile=1 - fi - einfo "Checking active LAPACK implementation for ATLAS." - lapack-config -p - 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." - bad_profile=1 - fi - if ! [ -z ${bad_profile} ]; then - die "Active BLAS/LAPACK implementations are not ATLAS." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - echo "[atlas]" > site.cfg - echo "include_dirs = /usr/include/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 - echo "atlas_libs = lapack, blas, cblas, atlas, pthread" >> site.cfg - else - echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg - echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg - fi - - export FFTW3=None - if use fftw; then - echo "[fftw] " >> site.cfg - echo "fftw_libs = rfftw, fftw" >> site.cfg - echo "fftw_opt_libs = rfftw_threads, fftw_threads" >> site.cfg - else - export FFTW=None - fi - - if use umfpack; then - echo "[umfpack] " >> site.cfg - echo "umfpack_libs = umfpack" >> site.cfg - else - export UMFPACK=None - 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() { - distutils_src_install - dodoc *.txt -} |