diff options
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/scipy/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-libs/scipy/Manifest | 29 | ||||
| -rw-r--r-- | sci-libs/scipy/files/digest-scipy-0.6.0-r1 | 3 | ||||
| -rw-r--r-- | sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch | 12 | ||||
| -rw-r--r-- | sci-libs/scipy/scipy-0.6.0-r1.ebuild | 127 |
5 files changed, 165 insertions, 15 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog index a3adfd7d15aa..12845b755b69 100644 --- a/sci-libs/scipy/ChangeLog +++ b/sci-libs/scipy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/scipy # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.23 2007/09/25 21:54:57 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.24 2007/10/05 14:01:38 markusle Exp $ + +*scipy-0.6.0-r1 (05 Oct 2007) + + 05 Oct 2007; Markus Dittrich <markusle@gentoo.org> + +files/scipy-0.6.0-fftw-fix.patch, +scipy-0.6.0-r1.ebuild: + New revision with patch to fix fftw problem (see bug #194708). + Thanks much to David Heavens <david.heavens@gmail.com> for his patch. *scipy-0.6.0 (25 Sep 2007) diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 3926b44450e7..5b5305651850 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX enabled_packages.txt 181 RMD160 b9a6c1d710f286eacd6741dedffe6e134768b235 SHA1 463eeb53dc178753c2bb577757ab00628cc2c10e SHA256 ee4c1664e91ef92bea34ffbd2aa88d957e88f1c86f13e41caeace8e982272223 MD5 d6458d50d1751e316e70c1c143762d30 files/enabled_packages.txt 181 RMD160 b9a6c1d710f286eacd6741dedffe6e134768b235 files/enabled_packages.txt 181 @@ -41,6 +38,10 @@ AUX scipy-0.6.0-cdf.patch 1200 RMD160 1656a3836925c869c06ecdd93e7e861fe2c4781d S MD5 6aeda168eb34559427f514600718bb64 files/scipy-0.6.0-cdf.patch 1200 RMD160 1656a3836925c869c06ecdd93e7e861fe2c4781d files/scipy-0.6.0-cdf.patch 1200 SHA256 0c45106a3b20d63af992630a7959c7bca772ccdff48d8caef98b76377420a9ca files/scipy-0.6.0-cdf.patch 1200 +AUX scipy-0.6.0-fftw-fix.patch 535 RMD160 3a42973062b6b5834596ffd16ffccedb4ddc0818 SHA1 f472a8b4461b60b23226044d0096143b67c765e1 SHA256 2af135be8c16538d59e5e65743dc2a0d6408d7ea18affc5be2b3c766a1afd752 +MD5 72880dfc17fce0411d01d7f1436a9404 files/scipy-0.6.0-fftw-fix.patch 535 +RMD160 3a42973062b6b5834596ffd16ffccedb4ddc0818 files/scipy-0.6.0-fftw-fix.patch 535 +SHA256 2af135be8c16538d59e5e65743dc2a0d6408d7ea18affc5be2b3c766a1afd752 files/scipy-0.6.0-fftw-fix.patch 535 AUX scipy-0.6.0-randomkit.patch 15283 RMD160 d59f0cfc56aa80c516ee48c82392c0e3db4b03f0 SHA1 90b4b64a4ecf28dfc418ad318c175221aa9aa8ab SHA256 6bf246b9393acf1183a0702dc0e752cbc8905ac1b94d5823cc4c76d6ae4b9a85 MD5 aeb96ed028fbdcfb3d64a3c5bafb1c75 files/scipy-0.6.0-randomkit.patch 15283 RMD160 d59f0cfc56aa80c516ee48c82392c0e3db4b03f0 files/scipy-0.6.0-randomkit.patch 15283 @@ -56,14 +57,18 @@ EBUILD scipy-0.5.2.ebuild 2290 RMD160 195b7e4a0a7012b2abdf5dd41d850fa017a22d09 S MD5 bd429029b1626be0f4d7d811779ace89 scipy-0.5.2.ebuild 2290 RMD160 195b7e4a0a7012b2abdf5dd41d850fa017a22d09 scipy-0.5.2.ebuild 2290 SHA256 2da67d20e5c0b6bbd05df9d5c6fb267b4d070ff91fd9ab421444ca9b0626d953 scipy-0.5.2.ebuild 2290 +EBUILD scipy-0.6.0-r1.ebuild 3290 RMD160 42f5b1a9f16ebbfe245527a30940b8e8be81867a SHA1 670ad3597de83774d58ee7f7002731e343592bdc SHA256 f1cea1d8b12e32fa901dba7d5f0e089abe07aea8b832c710420a6e9025023a2f +MD5 21b37b0ce17f56dbba87eaf83d3a893d scipy-0.6.0-r1.ebuild 3290 +RMD160 42f5b1a9f16ebbfe245527a30940b8e8be81867a scipy-0.6.0-r1.ebuild 3290 +SHA256 f1cea1d8b12e32fa901dba7d5f0e089abe07aea8b832c710420a6e9025023a2f scipy-0.6.0-r1.ebuild 3290 EBUILD scipy-0.6.0.ebuild 3245 RMD160 7e6a22cc612571d915b48b7d3cbc1bc97dca4565 SHA1 a19a74095ff6366dd041ce78d80753e2d4a87739 SHA256 525c2ea3792430ab8fd4a81f646f296bb1e9cece572e94e9f1bed1ca234d2fe4 MD5 3803c5b55dac10c2943d001b281a72ec scipy-0.6.0.ebuild 3245 RMD160 7e6a22cc612571d915b48b7d3cbc1bc97dca4565 scipy-0.6.0.ebuild 3245 SHA256 525c2ea3792430ab8fd4a81f646f296bb1e9cece572e94e9f1bed1ca234d2fe4 scipy-0.6.0.ebuild 3245 -MISC ChangeLog 5055 RMD160 5205280b8632d43a95e2aa5bab286eb7a115b21a SHA1 4dfa43aa7ac27f7ae612b7bf18c200e0f3703fc2 SHA256 adaa5feed3ba3deeb7fbbbf241dbd55d8ec062a7381ca05fa35b3a5192aca1de -MD5 5fc15a6aeb1faef9309936eef7087b08 ChangeLog 5055 -RMD160 5205280b8632d43a95e2aa5bab286eb7a115b21a ChangeLog 5055 -SHA256 adaa5feed3ba3deeb7fbbbf241dbd55d8ec062a7381ca05fa35b3a5192aca1de ChangeLog 5055 +MISC ChangeLog 5339 RMD160 4db6bfa6f26d8e8827d1e3d7e33f17e1af0aad5d SHA1 d02882ca57489944536168fdb8273d744a9bc7d7 SHA256 7fa05e44aca1bb375d74b8beae5886778f12325404f8a3b7480887b2d606715e +MD5 7e012df54757ab681020d0033f22fdfa ChangeLog 5339 +RMD160 4db6bfa6f26d8e8827d1e3d7e33f17e1af0aad5d ChangeLog 5339 +SHA256 7fa05e44aca1bb375d74b8beae5886778f12325404f8a3b7480887b2d606715e ChangeLog 5339 MISC metadata.xml 577 RMD160 c9ddccf05c22b5460372ef1c47a91e3441ec6480 SHA1 fb55340f9fbf7877f5874cabcfbac9ea19f849bd SHA256 768246bd968275941fcf6cb3b9d084fdc45a2ab10d257709f644fe87c69c3b88 MD5 27ccaa063e4ff212f9a4f5e84e1d7386 metadata.xml 577 RMD160 c9ddccf05c22b5460372ef1c47a91e3441ec6480 metadata.xml 577 @@ -77,10 +82,6 @@ SHA256 f75d6ba46639ce4d9755422b5144922d34d4b345bcee364465cab12a8f390171 files/di MD5 7502d3b639cb67aaec77310db11f4b45 files/digest-scipy-0.6.0 238 RMD160 2a71e6c471815d13edc9f66234b3b9c3a8c2534a files/digest-scipy-0.6.0 238 SHA256 ad604f7a85dacec1a9abeb950b1184baff269dc9468fdf5af139b1be4e719d15 files/digest-scipy-0.6.0 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) - -iD8DBQFG+YO41ycZbhPLE2ARAprEAKCTBdMz2gdOgc+SVU9/YIDwIv+gWgCdGG9o -BzfNZe9ZH6HQLGH8PTmtGwI= -=mLis ------END PGP SIGNATURE----- +MD5 7502d3b639cb67aaec77310db11f4b45 files/digest-scipy-0.6.0-r1 238 +RMD160 2a71e6c471815d13edc9f66234b3b9c3a8c2534a files/digest-scipy-0.6.0-r1 238 +SHA256 ad604f7a85dacec1a9abeb950b1184baff269dc9468fdf5af139b1be4e719d15 files/digest-scipy-0.6.0-r1 238 diff --git a/sci-libs/scipy/files/digest-scipy-0.6.0-r1 b/sci-libs/scipy/files/digest-scipy-0.6.0-r1 new file mode 100644 index 000000000000..aa28d16fa675 --- /dev/null +++ b/sci-libs/scipy/files/digest-scipy-0.6.0-r1 @@ -0,0 +1,3 @@ +MD5 417adf3bfe03f4c23c9fb265018e545c scipy-0.6.0.tar.gz 6572954 +RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b scipy-0.6.0.tar.gz 6572954 +SHA256 5f70390963fb4e3ae8cf5effa301c160ef68c791098e2ea95b99380e298eac4f scipy-0.6.0.tar.gz 6572954 diff --git a/sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch b/sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch new file mode 100644 index 000000000000..8db84dd8dcdd --- /dev/null +++ b/sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch @@ -0,0 +1,12 @@ +diff -Naur scipy-0.6.0/scipy/fftpack/src/zfftnd_fftw.c scipy-0.6.0-new/scipy/fftpack/src/zfftnd_fftw.c +--- scipy-0.6.0/scipy/fftpack/src/zfftnd_fftw.c 2007-09-22 03:56:38.000000000 -0400 ++++ scipy-0.6.0-new/scipy/fftpack/src/zfftnd_fftw.c 2007-10-05 09:20:19.000000000 -0400 +@@ -25,7 +25,7 @@ + free(caches_zfftnd_fftw[id].dims);, 10) + + +-extern void zfftnd_mkl(complex_double * inout, int rank, ++extern void zfftnd_fftw(complex_double * inout, int rank, + int *dims, int direction, int howmany, + int normalize) + { diff --git a/sci-libs/scipy/scipy-0.6.0-r1.ebuild b/sci-libs/scipy/scipy-0.6.0-r1.ebuild new file mode 100644 index 000000000000..eccfa7dd551b --- /dev/null +++ b/sci-libs/scipy/scipy-0.6.0-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/10/05 14:01:38 markusle Exp $ + +NEED_PYTHON=2.3 + +inherit eutils distutils fortran + +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +DESCRIPTION="Scientific algorithms library for Python" +HOMEPAGE="http://www.scipy.org/" +LICENSE="BSD" + +SLOT="0" + +IUSE="fftw umfpack sandbox" + +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=">=dev-python/numpy-1.0.3.1 + virtual/lapack + fftw? ( =sci-libs/fftw-2.1* ) + umfpack? ( sci-libs/umfpack dev-lang/swig ) + sandbox? ( >=sci-libs/netcdf-3.6 x11-libs/libX11 )" + +RDEPEND=">=dev-python/numpy-1.0.3.1 + dev-python/imaging + virtual/lapack + fftw? ( =sci-libs/fftw-2.1* ) + umfpack? ( sci-libs/umfpack ) + sandbox? ( >=sci-libs/netcdf-3.6 x11-libs/libX11 )" + +# test still buggy on lapack with 2 failures on check_syevr +# (lapack float). check every version bump. +RESTRICT="test" + +DOCS="THANKS.txt DEVELOPERS.txt LATEST.txt TOCHANGE.txt FORMAT_GUIDELINES.txt" + +scipy_fortran_setup() { + FORTRAN="gfortran g77 ifc" + fortran_pkg_setup + local fc= + case ${FORTRANC} in + gfortran) fc=gnu95 ;; + g77) fc=gnu ;; + ifc|ifort) + if use ia64; then + fc=intele + elif use amd64; then + fc=intelem + else + fc=intel + fi + ;; + *) eerror "Unknown fortran compiler: ${FORTRANC}" + die "scipy_fortran_setup failed" ;; + esac + + # when fortran flags are set, pic is removed. + use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC" + export SCIPY_FCONFIG="config_fc --fcompiler=${fc}" +} + +# see numpy ebuild about unsetting LDFLAGS +LDFLAGS_sav="${LDFLAGS}" +unset LDFLAGS + +pkg_setup() { + [[ -n ${LDFLAGS_sav} ]] && einfo "Ignoring LDFLAGS=${LDFLAGS_sav}" + if use umfpack && ! built_with_use dev-lang/swig python; then + eerror "With umfpack enabled you need" + eerror "dev-lang/swig with python enabled" + einfo "Please re-emerge swig with USE=python" + die "needs swig with python" + fi + # scipy automatically detects libraries by default + export FFTW=None FFTW3=None UMFPACK=None DJBFFT=None + use fftw && unset FFTW + use umfpack && unset UMFPACK + use sandbox && elog "Warning: using sandbox modules at your own risk!" + scipy_fortran_setup +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-randomkit.patch + epatch "${FILESDIR}"/${P}-cdf.patch + epatch "${FILESDIR}"/${P}-fftw-fix.patch + + if use sandbox; then + cd scipy/sandbox + ls -1 */__init__.py \ + | sed -e 's:/__init__.py::' \ + | grep -v exmplpackage \ + > enabled_packages.txt \ + || die "sandbox listing failed" + fi +} + +src_compile() { + distutils_src_compile ${SCIPY_FCONFIG} +} + +src_test() { + "${python}" setup.py install \ + --home="${S}"/test \ + --no-compile \ + ${SCIPY_FCONFIG} || die "install test failed" + pushd "${S}"/test/lib*/python + PYTHONPATH=. "${python}" -c \ + "import scipy as s;import sys;sys.exit(s.test(10,3))" \ + 2>&1 | tee test.log + grep -q OK test.log || die "test failed" + popd + rm -rf test +} + +src_install() { + distutils_src_install ${SCIPY_FCONFIG} +} + +pkg_postinst() { + elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" + elog "to your prefered image viewer if you don't like the default one. Ex:" + elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" +} |