Bump. Incorporates many changes from the science overlay, mainly from bicatali.

Package-Manager: portage-2.1

4 files changed, 160 insertions, 5 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index bdb329228a0a..02a9f4a03b8b 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.7 2006/06/14 00:35:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.8 2006/06/14 01:09:34 spyderous Exp $
+
+*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:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 4cea14e094e5..eaa035051ad7 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -4,6 +4,7 @@ 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-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
 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
@@ -16,10 +17,14 @@ EBUILD scipy-0.4.8.ebuild 2033 RMD160 21fef90ef50cbe13cfa8dacf1dfcebcee5d37c11 S
 MD5 a464eb04b95a4627c0e9f519a8e40b1d scipy-0.4.8.ebuild 2033
 RMD160 21fef90ef50cbe13cfa8dacf1dfcebcee5d37c11 scipy-0.4.8.ebuild 2033
 SHA256 c9073fc47828b83d466e973149b29c95c76c474ceb9422edf7901c9c91114b3b scipy-0.4.8.ebuild 2033
-MISC ChangeLog 1376 RMD160 ce90cf969e90f3460bff9d9ec370257082940b36 SHA1 274da2bbfcafe863f08814af5adbe50f487c9dad SHA256 3e69783fb007d98da68cbceff19a65f9a1c1a85b28050130d8ae7cbe991c5042
-MD5 c8c4b98472ee26cd58078518effdbdf3 ChangeLog 1376
-RMD160 ce90cf969e90f3460bff9d9ec370257082940b36 ChangeLog 1376
-SHA256 3e69783fb007d98da68cbceff19a65f9a1c1a85b28050130d8ae7cbe991c5042 ChangeLog 1376
+EBUILD scipy-0.4.9.ebuild 3740 RMD160 75168f72024bc69350c9e8701519ce6ccc56c9a6 SHA1 4492eb48b9bcaf0d941e616e569babdbcaed818d SHA256 bf455b0bb916717482c6fa6413a81fad7123913b87cf53c89c357ae54f991e18
+MD5 7ec3049681901081a622642e8f908736 scipy-0.4.9.ebuild 3740
+RMD160 75168f72024bc69350c9e8701519ce6ccc56c9a6 scipy-0.4.9.ebuild 3740
+SHA256 bf455b0bb916717482c6fa6413a81fad7123913b87cf53c89c357ae54f991e18 scipy-0.4.9.ebuild 3740
+MISC ChangeLog 1563 RMD160 e9a0fa115197394ec158f3a1392069318d96f74d SHA1 a244a5ce1be488b0af820207df04a4e98f816e1f SHA256 04a6774645574c1c71c066a8b1cc8c954f8dfb71968aa897ee603af8f10b2928
+MD5 b80fc77be974c88535499925874d6eed ChangeLog 1563
+RMD160 e9a0fa115197394ec158f3a1392069318d96f74d ChangeLog 1563
+SHA256 04a6774645574c1c71c066a8b1cc8c954f8dfb71968aa897ee603af8f10b2928 ChangeLog 1563
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -33,3 +38,6 @@ SHA256 79f8fef2f0a4e4e8c3b359edefdf1233172528ba6cd0d292419188bea0e7a873 files/di
 MD5 8a1e9abeb6dc28e5f59ec55abcf388b8 files/digest-scipy-0.4.8-r1 238
 RMD160 be4b9f5912977af0425b611d361868e896e3900f files/digest-scipy-0.4.8-r1 238
 SHA256 79f8fef2f0a4e4e8c3b359edefdf1233172528ba6cd0d292419188bea0e7a873 files/digest-scipy-0.4.8-r1 238
+MD5 7d483eafb208390157f2741b044a24e9 files/digest-scipy-0.4.9 238
+RMD160 a03fb6ff3a3c6543b9168bc78954842521585df9 files/digest-scipy-0.4.9 238
+SHA256 d082ddde8a78b4c9ffc79a54926e262cfd01a9d78da5c8c249f89554d5f8c504 files/digest-scipy-0.4.9 238
diff --git a/sci-libs/scipy/files/digest-scipy-0.4.9 b/sci-libs/scipy/files/digest-scipy-0.4.9
new file mode 100644
index 000000000000..146cff436541
--- /dev/null
+++ b/sci-libs/scipy/files/digest-scipy-0.4.9
@@ -0,0 +1,3 @@
+MD5 bb1db6e0b60652ef26f92587c853a15f scipy-0.4.9.tar.gz 2599608
+RMD160 b1816980c23d306c54eb907e50c3d5b78c98fbd7 scipy-0.4.9.tar.gz 2599608
+SHA256 f2af35827624dd3d6eed4aa02376ba724a3d5f469aefa6d5c85fa5847a2eb3d2 scipy-0.4.9.tar.gz 2599608
diff --git a/sci-libs/scipy/scipy-0.4.9.ebuild b/sci-libs/scipy/scipy-0.4.9.ebuild
new file mode 100644
index 000000000000..49ec61826f5f
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.4.9.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.9.ebuild,v 1.1 2006/06/14 01:09:34 spyderous Exp $
+
+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"
+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-0.9.8
+	sci-libs/blas-atlas
+	sci-libs/blas-config
+	sci-libs/lapack-config
+	sci-libs/lapack-atlas
+	fftw? ( =sci-libs/fftw-2.1* )"
+
+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"
+
+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
+}
+
+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
+	distutils_src_compile \
+		config_fc \
+		--fcompiler=${SCIPY_FC} \
+		--opt="${CFLAGS}" \
+		|| die "compilation failed"
+}
+
+src_install() {
+	distutils_src_install
+	dodoc *.txt
+}