diff options
author | bicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb> | 2006-03-16 09:29:13 +0000 |
---|---|---|
committer | bicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb> | 2006-03-16 09:29:13 +0000 |
commit | 75597c2631811089b86091c8a466ea727db47020 (patch) | |
tree | fa04c4fd3f2ec1a9650b3ac583956c219c5c3469 /sci-libs/scipy | |
parent | fixed pic behaviour for openmpi and torque (diff) | |
download | sci-75597c2631811089b86091c8a466ea727db47020.tar.gz sci-75597c2631811089b86091c8a466ea727db47020.tar.bz2 sci-75597c2631811089b86091c8a466ea727db47020.zip |
scipy-0.4.6.ebuild: removed eselect dependencies
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@129 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-libs/scipy')
-rw-r--r-- | sci-libs/scipy/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/scipy/scipy-0.4.6.ebuild | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 51479f869..5cb8665d9 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -1,4 +1,4 @@ MD5 e9fb7edfed65991c7026915252774a16 ChangeLog 563 MD5 190361bc8c86c26f2509e2711bf3a82c files/digest-scipy-0.4.6 64 MD5 51dd57e78f009510e5b3a8384723e22d metadata.xml 686 -MD5 fa269cfa9316a07bac90a26c9fd6af5d scipy-0.4.6.ebuild 1366 +MD5 60d0e313966956ca99916b7ee66ef306 scipy-0.4.6.ebuild 1755 diff --git a/sci-libs/scipy/scipy-0.4.6.ebuild b/sci-libs/scipy/scipy-0.4.6.ebuild index f65f5f5b5..69f11be8c 100644 --- a/sci-libs/scipy/scipy-0.4.6.ebuild +++ b/sci-libs/scipy/scipy-0.4.6.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.scipy.org/" LICENSE="BSD" SLOT="0" -IUSE="fftw" +IUSE="fftw ifc" KEYWORDS="~amd64 ~x86" # did not use virtual/blas and virtual/lapack @@ -23,31 +23,35 @@ RDEPEND=">=dev-lang/python-2.3.3 fftw? ( =sci-libs/fftw-2.1* )" DEPEND="${RDEPEND} - app-admin/eselect =sys-devel/gcc-3*" # install doc claims fftw-2 is faster for complex ffts. -# install doc claims gcc-4 not fully tested +# install doc claims gcc-4 not fully tested and blas-atlas is compiled +# with g77 only, so force use of g77 here as well. # wxwindows seems to have disapeared : ? # f2py seems to be in numpy. -# FORTRAN="g77" pkg_setup() { - if [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ]; then - eselect blas set threaded-ATLAS - else - eselect blas set ATLAS + if built_with_use lapack-atlas ifc; then + ewarn "scipy needs consistency among fortran compiler!" + eerror "lapack-atlas was compiled with the ifc" + eerror "whereas blas-atlas and scipy will use the GNU compiler" + eerror "please re-emerge lapack-atlas with USE=-ifc" + die fi - eselect lapack set ATLAS } src_unpack() { unpack ${A} cd "${S}" - einfo "" echo "[atlas]" > site.cfg + if [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ]; then + echo "library_dirs = /usr/$(get_libdir)/blas/threaded-atlas" >> site.cfg + else + echo "library_dirs = /usr/$(get_libdir)/blas/atlas" >> site.cfg + fi echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg # let discover fftw by itself if installed } |