From c963b8aedf778d54ae71be5f23ace4808e05c0cf Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Wed, 31 Jan 2007 09:03:43 +0000 Subject: [PATCH] version bump with fix for bug 149153 Package-Manager: portage-2.1.2-r4 --- sci-libs/scipy/ChangeLog | 9 ++- sci-libs/scipy/Manifest | 24 ++++-- sci-libs/scipy/files/digest-scipy-0.3.2 | 2 + sci-libs/scipy/files/digest-scipy-0.5.2 | 3 + sci-libs/scipy/scipy-0.5.2.ebuild | 101 ++++++++++++++++++++++++ 5 files changed, 129 insertions(+), 10 deletions(-) create mode 100644 sci-libs/scipy/files/digest-scipy-0.5.2 create mode 100644 sci-libs/scipy/scipy-0.5.2.ebuild diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog index 2675a541524e..7b8374e70851 100644 --- a/sci-libs/scipy/ChangeLog +++ b/sci-libs/scipy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/scipy -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.14 2006/11/01 00:51:46 dberkholz Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.15 2007/01/31 09:03:43 nerdboy Exp $ + +*scipy-0.5.2 (31 Jan 2007) + + 31 Jan 2007; Steve Arnold +scipy-0.5.2.ebuild: + version bump with fix for bug 149153 (needs cleanup and stablization) 01 Nov 2006; Donnie Berkholz ; ChangeLog: Update for my nick change spyderous -> dberkholz. diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 5c2ce1c38275..958033a7f019 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -2,10 +2,11 @@ AUX system_info.diff 2155 RMD160 2a54ac3249478045cb494014bcbd2063281bec24 SHA1 5 MD5 a5ac5edc39d8266b13659fd429e8e939 files/system_info.diff 2155 RMD160 2a54ac3249478045cb494014bcbd2063281bec24 files/system_info.diff 2155 SHA256 ac355cfb0e6b20341bccf13f2d933e3c0a2e98467772410500d85b0598e229e1 files/system_info.diff 2155 -DIST SciPy_complete-0.3.2.tar.gz 3368595 +DIST SciPy_complete-0.3.2.tar.gz 3368595 RMD160 15abb0d60577132bf38090fa7e4840bb0347cab8 SHA1 b770493c4159b9fb1792b9cddfffb3d71aceefcb SHA256 bd1addc8d41d79f8866e7960cea391cfbfc3c6b36d5af205864d7f30a2fb98e8 DIST scipy-0.4.8.tar.gz 2623917 RMD160 a6cd4aeec75aced07bb23113c43f00a9e80ffdc9 SHA1 a34fbb8f854549ccb294137ab45c62368c61d65a SHA256 40edd0bc444ae88c97b587b7bb7f2e6fe9758c382c9ac0d4cfa87b4db7ef2a35 DIST scipy-0.4.9.tar.gz 2599608 RMD160 b1816980c23d306c54eb907e50c3d5b78c98fbd7 SHA1 ba895631a0346a1df6b2a6f336b3135d69b0230e SHA256 f2af35827624dd3d6eed4aa02376ba724a3d5f469aefa6d5c85fa5847a2eb3d2 DIST scipy-0.5.1.tar.gz 4141008 RMD160 60a184b57f50e9bef78843cbe96542aee43ac386 SHA1 bed9be244fc73c96a252184cfc14653035832f7e SHA256 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a +DIST scipy-0.5.2.tar.gz 6362164 RMD160 fa945185df7fc48e03bafdddeaaea72a8eb4914d SHA1 879cfdbb2b2f7a8616737f828cd01790d222a636 SHA256 38e42155d3445699f28c36facdaa82200d8e017b4ca608f95f6d928065dc03ed EBUILD scipy-0.3.2.ebuild 1414 RMD160 e7fd43cd1417934fa3afc9e42c7ee60857dee7d5 SHA1 6c5f117d860775cf7cc0c2030e49df6539e527d9 SHA256 fbe8720d7d1cbf9260d6f0b0914ce53e630c7cb75a77ce79cee8007414e22f4c MD5 c48241d7cc7765759cf9eb54bbdff32f scipy-0.3.2.ebuild 1414 RMD160 e7fd43cd1417934fa3afc9e42c7ee60857dee7d5 scipy-0.3.2.ebuild 1414 @@ -26,17 +27,21 @@ EBUILD scipy-0.5.1.ebuild 2215 RMD160 a5d5f4d21ae75f72356e2d189af96db55bdb7054 S MD5 db14ccd0f666cb1e50c1de51e3fdc080 scipy-0.5.1.ebuild 2215 RMD160 a5d5f4d21ae75f72356e2d189af96db55bdb7054 scipy-0.5.1.ebuild 2215 SHA256 2a3b515d49be54bdfd59a80d3730946e380078635f978589ac5d8a02d1e3d14c scipy-0.5.1.ebuild 2215 -MISC ChangeLog 2824 RMD160 8ee5eef9da9279aa53a6dd436158198634551f45 SHA1 8678feff74b606495c318ecc4666ec170341db1e SHA256 a932783cd83214afee2115c1a906150d007cae99b276d7bebf67e858eaf74a43 -MD5 1a3ea8fd1a62a991737cf05a9c3384dd ChangeLog 2824 -RMD160 8ee5eef9da9279aa53a6dd436158198634551f45 ChangeLog 2824 -SHA256 a932783cd83214afee2115c1a906150d007cae99b276d7bebf67e858eaf74a43 ChangeLog 2824 +EBUILD scipy-0.5.2.ebuild 2290 RMD160 195b7e4a0a7012b2abdf5dd41d850fa017a22d09 SHA1 134f2fb73fbdac7059ded08833c980a38de3c5d0 SHA256 2da67d20e5c0b6bbd05df9d5c6fb267b4d070ff91fd9ab421444ca9b0626d953 +MD5 bd429029b1626be0f4d7d811779ace89 scipy-0.5.2.ebuild 2290 +RMD160 195b7e4a0a7012b2abdf5dd41d850fa017a22d09 scipy-0.5.2.ebuild 2290 +SHA256 2da67d20e5c0b6bbd05df9d5c6fb267b4d070ff91fd9ab421444ca9b0626d953 scipy-0.5.2.ebuild 2290 +MISC ChangeLog 2993 RMD160 c7f5b9138c9a58b54b451472a8effd62336e0722 SHA1 00054581f252b14f52f3dbedba7936b995342285 SHA256 5cdf0bc29be1caff2ba248e87073832e0b86f984c65c77843719315f03853df8 +MD5 04e021b3e04d2706ed3ac4317faddd60 ChangeLog 2993 +RMD160 c7f5b9138c9a58b54b451472a8effd62336e0722 ChangeLog 2993 +SHA256 5cdf0bc29be1caff2ba248e87073832e0b86f984c65c77843719315f03853df8 ChangeLog 2993 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156 -MD5 1b281bbd7d7655bf8fb89c5cb8e05db0 files/digest-scipy-0.3.2 73 -RMD160 c5e3db38c6cd92bd90e3c6d1e7555980a0b125df files/digest-scipy-0.3.2 73 -SHA256 a5dbf5015d5af3248a2eb0d3361ad7fd5b23c7123ceea859133416d8349553ec files/digest-scipy-0.3.2 73 +MD5 252efa250456458815d24b2fa27b63d8 files/digest-scipy-0.3.2 265 +RMD160 c9518755738be4f46875caf03ba7be0696293734 files/digest-scipy-0.3.2 265 +SHA256 3cc700dbc33f1a3a69dddc6b503553f37448500a1352e6f406059caca9b9e8a7 files/digest-scipy-0.3.2 265 MD5 8a1e9abeb6dc28e5f59ec55abcf388b8 files/digest-scipy-0.4.8 238 RMD160 be4b9f5912977af0425b611d361868e896e3900f files/digest-scipy-0.4.8 238 SHA256 79f8fef2f0a4e4e8c3b359edefdf1233172528ba6cd0d292419188bea0e7a873 files/digest-scipy-0.4.8 238 @@ -49,3 +54,6 @@ SHA256 d082ddde8a78b4c9ffc79a54926e262cfd01a9d78da5c8c249f89554d5f8c504 files/di 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 +MD5 a0f199713808244386c7eac017f8179d files/digest-scipy-0.5.2 238 +RMD160 45b26148c69c7694d10e9da1e25588098755792b files/digest-scipy-0.5.2 238 +SHA256 05960916e457668d7d2c27fc089cefb7fa07abc02476cd812f9e6b5c0267f99e files/digest-scipy-0.5.2 238 diff --git a/sci-libs/scipy/files/digest-scipy-0.3.2 b/sci-libs/scipy/files/digest-scipy-0.3.2 index 1daba1be229f..47ecb96b9982 100644 --- a/sci-libs/scipy/files/digest-scipy-0.3.2 +++ b/sci-libs/scipy/files/digest-scipy-0.3.2 @@ -1 +1,3 @@ MD5 5ae2280ab2c4c653cb0ff8479e81284a SciPy_complete-0.3.2.tar.gz 3368595 +RMD160 15abb0d60577132bf38090fa7e4840bb0347cab8 SciPy_complete-0.3.2.tar.gz 3368595 +SHA256 bd1addc8d41d79f8866e7960cea391cfbfc3c6b36d5af205864d7f30a2fb98e8 SciPy_complete-0.3.2.tar.gz 3368595 diff --git a/sci-libs/scipy/files/digest-scipy-0.5.2 b/sci-libs/scipy/files/digest-scipy-0.5.2 new file mode 100644 index 000000000000..89b1226c8e1b --- /dev/null +++ b/sci-libs/scipy/files/digest-scipy-0.5.2 @@ -0,0 +1,3 @@ +MD5 e24387ac7f9e589816364db7c64c3185 scipy-0.5.2.tar.gz 6362164 +RMD160 fa945185df7fc48e03bafdddeaaea72a8eb4914d scipy-0.5.2.tar.gz 6362164 +SHA256 38e42155d3445699f28c36facdaa82200d8e017b4ca608f95f6d928065dc03ed scipy-0.5.2.tar.gz 6362164 diff --git a/sci-libs/scipy/scipy-0.5.2.ebuild b/sci-libs/scipy/scipy-0.5.2.ebuild new file mode 100644 index 000000000000..00856bf72100 --- /dev/null +++ b/sci-libs/scipy/scipy-0.5.2.ebuild @@ -0,0 +1,101 @@ +# 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.5.2.ebuild,v 1.1 2007/01/31 09:03:43 nerdboy Exp $ + +inherit distutils 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" +KEYWORDS="~amd64 ~ppc ~ppc64 ~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 + virtual/blas + virtual/lapack + fftw? ( sci-libs/fftw )" + +DEPEND="${RDEPEND}" + +# 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 +} + +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 + + # need to build with -fPIC (bug #149153) + export F77LFLAGS="${F77LFLAGS} -fPIC" + + distutils_src_compile \ + config_fc \ + --fcompiler=${SCIPY_FC} \ + --opt="${CFLAGS}" \ + || die "compilation failed" +} + +src_install() { + distutils_src_install + dodoc *.txt +} -- 2.26.2