PIC for all arches when FFLAGS are set, and some fixes for atlas.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 160 insertions, 6 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 94ff745f1fc3..60ce7e767242 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scipy
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.37 2008/12/11 23:43:53 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.38 2009/01/14 18:11:57 bicatali Exp $
+
+*scipy-0.6.0-r6 (14 Jan 2009)
+
+  14 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +scipy-0.6.0-r6.ebuild:
+  PIC for all arches when FFLAGS are set, and some fixes for atlas.
 
   11 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
   scipy-0.6.0-r5.ebuild, scipy-0.7.0_beta1.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index d9055cc57c08..3401f68c7639 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -13,13 +13,14 @@ DIST scipy-0.6.0.tar.gz 6572954 RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b
 DIST scipy-0.7.0b1.tar.gz 4473284 RMD160 2cb2197830c2655f91420668ae90913a06e28bea SHA1 8ae07883105c0966022b414643dff138de71d079 SHA256 d720ccd5045e75761b3b1d695ba28b23f696892756072a1af85a6f1ec91d5467
 EBUILD scipy-0.6.0-r4.ebuild 4339 RMD160 8c7a9d9cf7c245452ca62e8aed9dfc9e62d200eb SHA1 f752488c2b74f17da3b25e4aec92c247a7560710 SHA256 d30c515cbf47ace06ef251c8735ea89b2b181cf511549cbd354353202cfe0290
 EBUILD scipy-0.6.0-r5.ebuild 4428 RMD160 d7bc77e986c4403aabd81ea08e1bb5ae3506327b SHA1 ca91bcd8895e2ccba05ae1998ed7467e9d73e270 SHA256 9e00b97ed7405411ebd9fa0ab2ebcd216876bfd155ab54b283d3cba950685e25
+EBUILD scipy-0.6.0-r6.ebuild 4179 RMD160 ce7bca0a3e6ed5786eac02617339762c0b7d4e92 SHA1 d5b80a0f319b76c666536f5fd4950286332c20bb SHA256 a7c4088c0d1cde1faba25986e3f8d3c570f4dbfc34284170f69a63d4e350c295
 EBUILD scipy-0.7.0_beta1.ebuild 3755 RMD160 0eef9e6abc93e7debdb866febfbf3a7f6d29eb74 SHA1 3ef639f3077764a7a6720e9c143524fb8660b2bc SHA256 b6c31e4c92ea33caa763c53dfdf0f828e2f02e34b8005ea07db5698ee35366ef
-MISC ChangeLog 8499 RMD160 508440733ff7e2e1709e38ed1020c6e5ce30428e SHA1 ef61061424da10c44e2b8e906b631a7a1c0098d2 SHA256 741342b08d85aa2226668cb0c04408f5314fe70e6e764e9e9c075c766a3781b9
+MISC ChangeLog 8680 RMD160 86cad6f0e2e528df1b29462a60580e76c7b7aa6b SHA1 cc6ed34723c791389493f73bc1a6e205d0ec3ce7 SHA256 7fb3e593d713485a417fdb271c80a850ab1ffac5d2d0ee66f0b3687025c65f10
 MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklBpcMACgkQ1ycZbhPLE2Ae/wCcDqoFONVUizrEBIcZZtJMmogG
-p78An0togA0WeMqdO6wniBpf4D69LWqx
-=GcBg
+iEYEARECAAYFAkluKvYACgkQ1ycZbhPLE2AkjwCdGXT/4QeyrnhXdnzBhb5rmclo
+H+kAn2KolXQEbTxRjtngfokqqFYVZyLB
+=Qre1
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.6.0-r6.ebuild b/sci-libs/scipy/scipy-0.6.0-r6.ebuild
new file mode 100644
index 000000000000..53f06d2a4f0d
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.6.0-r6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2009 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-r6.ebuild,v 1.1 2009/01/14 18:11:57 bicatali Exp $
+
+EAPI=2
+NEED_PYTHON=2.3
+inherit eutils distutils fortran flag-o-matic
+
+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 ~ppc64 ~x86"
+
+CDEPEND="dev-python/numpy
+	virtual/cblas
+	virtual/lapack
+	fftw? ( sci-libs/fftw:2.1 )
+	umfpack? ( sci-libs/umfpack )
+	sandbox? ( >=sci-libs/netcdf-3.6 x11-libs/libX11 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	umfpack? ( dev-lang/swig[python] )"
+
+RDEPEND="${CDEPEND}
+	dev-python/imaging"
+
+# 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() {
+	append-ldflags -shared
+	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
+	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
+}
+
+pkg_setup() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use fftw && unset FFTW
+	use umfpack && unset UMFPACK
+	use sandbox && elog "Warning: using sandbox modules at your own risk!"
+	scipy_fortran_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-implicit.patch
+	epatch "${FILESDIR}"/${P}-randomkit.patch
+	epatch "${FILESDIR}"/${P}-cdf.patch
+	epatch "${FILESDIR}"/${P}-fftw-fix.patch
+	epatch "${FILESDIR}"/${P}-ndimage.patch
+	epatch "${FILESDIR}"/${P}-python-2.6-c_abs.patch
+	epatch "${FILESDIR}"/${P}-stsci.patch
+	cat > site.cfg <<-EOF
+		[DEFAULT]
+		library_dirs = /usr/$(get_libdir)
+		include_dirs = /usr/include
+		[atlas]
+		include_dirs = $(pkg-config --cflags-only-I \
+			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+		library_dirs = $(pkg-config --libs-only-L \
+			cblas blas lapack| sed -e \
+			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
+		atlas_libs = $(pkg-config --libs-only-l \
+			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+		lapack_libs = $(pkg-config --libs-only-l \
+			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+		[blas_opt]
+		include_dirs = $(pkg-config --cflags-only-I \
+			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+		library_dirs = $(pkg-config --libs-only-L \
+			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
+			-e 's/ //g'):/usr/$(get_libdir)
+		libraries = $(pkg-config --libs-only-l \
+			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+		[lapack_opt]
+		library_dirs = $(pkg-config --libs-only-L \
+			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
+			-e 's/ //g'):/usr/$(get_libdir)
+		libraries = $(pkg-config --libs-only-l \
+			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+	EOF
+	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() {
+	# when fortran flags are set, pic is removed.
+	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
+	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"
+}