cleaning scipy

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@484 32389bae-6d03-0410-99cf-db05cde120eb

5 files changed, 7 insertions, 125 deletions

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 0f7157468..55565cbcd 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,13 +1,8 @@
-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.5.1-r1.ebuild 2357 RMD160 928735770f43c62f691834f01fc72e2e4c2abdae SHA1 b90c93b702659d5ddfaaa4a4be13b5f020ac6d16 SHA256 aaf82ec56674948cbe028e9a8e1de842c405d30e6871cda954bb006486f5376a
-MD5 3f54c3c6eb998d6d512db387c8ac70ec scipy-0.5.1-r1.ebuild 2357
-RMD160 928735770f43c62f691834f01fc72e2e4c2abdae scipy-0.5.1-r1.ebuild 2357
-SHA256 aaf82ec56674948cbe028e9a8e1de842c405d30e6871cda954bb006486f5376a scipy-0.5.1-r1.ebuild 2357
-EBUILD scipy-0.5.2.ebuild 2357 RMD160 928735770f43c62f691834f01fc72e2e4c2abdae SHA1 b90c93b702659d5ddfaaa4a4be13b5f020ac6d16 SHA256 aaf82ec56674948cbe028e9a8e1de842c405d30e6871cda954bb006486f5376a
-MD5 3f54c3c6eb998d6d512db387c8ac70ec scipy-0.5.2.ebuild 2357
-RMD160 928735770f43c62f691834f01fc72e2e4c2abdae scipy-0.5.2.ebuild 2357
-SHA256 aaf82ec56674948cbe028e9a8e1de842c405d30e6871cda954bb006486f5376a scipy-0.5.2.ebuild 2357
+EBUILD scipy-0.5.2-r1.ebuild 2357 RMD160 928735770f43c62f691834f01fc72e2e4c2abdae SHA1 b90c93b702659d5ddfaaa4a4be13b5f020ac6d16 SHA256 aaf82ec56674948cbe028e9a8e1de842c405d30e6871cda954bb006486f5376a
+MD5 3f54c3c6eb998d6d512db387c8ac70ec scipy-0.5.2-r1.ebuild 2357
+RMD160 928735770f43c62f691834f01fc72e2e4c2abdae scipy-0.5.2-r1.ebuild 2357
+SHA256 aaf82ec56674948cbe028e9a8e1de842c405d30e6871cda954bb006486f5376a scipy-0.5.2-r1.ebuild 2357
 MISC ChangeLog 408 RMD160 297585470844c725a5283c4f5cebe63b5d36c4e0 SHA1 460fbd6bdcbc4d681655e25edac0177a5bc9f0e6 SHA256 be4d2a04dd6df0bdc4c6db8f2706b46f8400b34c9b70aa204bf686ecb37396b3
 MD5 02bcfdef7aebab02e9966dfb31883fcb ChangeLog 408
 RMD160 297585470844c725a5283c4f5cebe63b5d36c4e0 ChangeLog 408
@@ -16,9 +11,6 @@ MISC metadata.xml 558 RMD160 0a2308551f796cbfeb30440ecca7650ac54f0bdc SHA1 8fb86
 MD5 7a770a5f57ac6eeb8b1d3117e6a8ca6c metadata.xml 558
 RMD160 0a2308551f796cbfeb30440ecca7650ac54f0bdc metadata.xml 558
 SHA256 f79bac3eb0be97c135f1c6d90f98e6adb2d1b62cb87f32859286d0ce51036101 metadata.xml 558
-MD5 66932efefabfe718cb3d73282ad705a6 files/digest-scipy-0.5.1-r1 238
-RMD160 390c13d3a30931cde09e3f744f550a00a96ba2bd files/digest-scipy-0.5.1-r1 238
-SHA256 cd9eb7d7e35ce61f15b7489977e02c867e8e2185ed49a1767d6b3e527e4e0bb4 files/digest-scipy-0.5.1-r1 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
+MD5 a0f199713808244386c7eac017f8179d files/digest-scipy-0.5.2-r1 238
+RMD160 45b26148c69c7694d10e9da1e25588098755792b files/digest-scipy-0.5.2-r1 238
+SHA256 05960916e457668d7d2c27fc089cefb7fa07abc02476cd812f9e6b5c0267f99e files/digest-scipy-0.5.2-r1 238
diff --git a/sci-libs/scipy/files/digest-scipy-0.5.1-r1 b/sci-libs/scipy/files/digest-scipy-0.5.1-r1
deleted file mode 100644
index 08c980676..000000000
--- a/sci-libs/scipy/files/digest-scipy-0.5.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48442a427f0556ad2ad1721dd62e401c scipy-0.5.1.tar.gz 4141008
-RMD160 60a184b57f50e9bef78843cbe96542aee43ac386 scipy-0.5.1.tar.gz 4141008
-SHA256 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a scipy-0.5.1.tar.gz 4141008
diff --git a/sci-libs/scipy/files/digest-scipy-0.5.2 b/sci-libs/scipy/files/digest-scipy-0.5.2-r1
index 89b1226c8..89b1226c8 100644
--- a/sci-libs/scipy/files/digest-scipy-0.5.2
+++ b/sci-libs/scipy/files/digest-scipy-0.5.2-r1
diff --git a/sci-libs/scipy/scipy-0.5.1-r1.ebuild b/sci-libs/scipy/scipy-0.5.2-r1.ebuild
index 465f59106..465f59106 100644
--- a/sci-libs/scipy/scipy-0.5.1-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.5.2-r1.ebuild
diff --git a/sci-libs/scipy/scipy-0.5.2.ebuild b/sci-libs/scipy/scipy-0.5.2.ebuild
deleted file mode 100644
index 465f59106..000000000
--- a/sci-libs/scipy/scipy-0.5.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils fortran flag-o-matic
-
-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 umfpack"
-KEYWORDS="~amd64 ~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_beta1
-	virtual/blas
-	virtual/lapack
-	fftw? ( =sci-libs/fftw-2.1* )
-	umfpack? ( sci-libs/umfpack )"
-
-DEPEND="${RDEPEND}
-	umfpack? ( dev-lang/swig )"
-
-# 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
-
-	if use umfpack; then
-		echo "[umfpack] " >> site.cfg
-		echo "umfpack_libs = umfpack" >> site.cfg
-	else
-		export UMFPACK=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
-	export F77FLAGS="${CFLAGS} -fPIC"
-	distutils_src_compile \
-		config_fc \
-		--fcompiler=${SCIPY_FC} \
-		--opt="${CFLAGS}" \
-		|| die "compilation failed"
-}
-
-src_install() {
-	distutils_src_install
-	dodoc *.txt
-}