cleaned to sync with portage

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

10 files changed, 2 insertions, 200 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 923a25839..8fb198822 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,6 +1,6 @@
 MD5 917df696332bf92ed0d12474dcc04944 ChangeLog 4080
-MD5 164457a27c959174cc2933d826190f3d files/digest-matplotlib-0.87.2 192
+MD5 164457a27c959174cc2933d826190f3d files/digest-matplotlib-0.87.2-r1 192
 MD5 bf815cadfdb2159e83dffd0862545458 files/matplotlib-0.87.2-no-autodetect.patch 1817
 MD5 802d475da9c3232949f87351fd10847b files/matplotlib-mplot3d.patch 918
-MD5 bdf28f13337a15989272fbffc517c0dc matplotlib-0.87.2.ebuild 1782
+MD5 bdf28f13337a15989272fbffc517c0dc matplotlib-0.87.2-r1.ebuild 1782
 MD5 7d1fbbf5496138b3b2f2f07ec757fecb metadata.xml 428
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.87.2 b/dev-python/matplotlib/files/digest-matplotlib-0.87.2-r1
index c293c85ba..c293c85ba 100644
--- a/dev-python/matplotlib/files/digest-matplotlib-0.87.2
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.87.2-r1
diff --git a/dev-python/matplotlib/matplotlib-0.87.2.ebuild b/dev-python/matplotlib/matplotlib-0.87.2-r1.ebuild
index 74a957e53..74a957e53 100644
--- a/dev-python/matplotlib/matplotlib-0.87.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.87.2-r1.ebuild
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
deleted file mode 100644
index 27c4fd81c..000000000
--- a/sci-libs/scipy/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# ChangeLog for sci-libs/scipy
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*scipy-0.4.6 (19 Feb 2006)
-
-  19 Feb 2006; Sebastien Fabbro <seb@ist.utl.pt>
-  +metadata.xml, +scipy-0.4.6.ebuild:
-  Version bump and slight modifs. Closes bug #119469.
-  Thanks to Alok Singhal <alok_singhal@yahoo.com> and others.
-
-*scipy-0.3.2 (22 Aug 2005)
-
-  22 Aug 2005; Peter Bienstman <pbienst@gentoo.org> +files/system_info.diff,
-  +metadata.xml, +scipy-0.3.2.ebuild:
-  Initial import. Closes 24593. Thanks to D. Grant, D. Dale and others.
-
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
deleted file mode 100644
index 453d5c577..000000000
--- a/sci-libs/scipy/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e9fb7edfed65991c7026915252774a16 ChangeLog 563
-MD5 190361bc8c86c26f2509e2711bf3a82c files/digest-scipy-0.4.6 64
-MD5 33b97bb0d4cf02b003fc6fb26d8ace5f files/digest-scipy-0.4.8 64
-MD5 51dd57e78f009510e5b3a8384723e22d metadata.xml 686
-MD5 72f08c25a83ef7c7c62a70699e588f4d scipy-0.4.6.ebuild 1751
-MD5 9ad3b892903b709f9c18212b3ca96958 scipy-0.4.8.ebuild 2428
diff --git a/sci-libs/scipy/files/digest-scipy-0.4.6 b/sci-libs/scipy/files/digest-scipy-0.4.6
deleted file mode 100644
index bc776cefb..000000000
--- a/sci-libs/scipy/files/digest-scipy-0.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdf236f1d93fca286d27a7c10b6fe446 scipy-0.4.6.tar.gz 2524579
diff --git a/sci-libs/scipy/files/digest-scipy-0.4.8 b/sci-libs/scipy/files/digest-scipy-0.4.8
deleted file mode 100644
index 34e444254..000000000
--- a/sci-libs/scipy/files/digest-scipy-0.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 854db037c56a0a359f877e8f852925ea scipy-0.4.8.tar.gz 2623917
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
deleted file mode 100644
index af51deb43..000000000
--- a/sci-libs/scipy/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-  <maintainer>
-    <email>seb@ist.utl.pt</email>
-    <name>Sebastien Fabbro</name>
-  </maintainer>
-  <longdescription lang="en">
-    SciPy is an Open Source library of scientific tools for Python. It
-    gathers a variety of high level science and engineering modules
-    together as a single package. SciPy provides modules for
-    statistics, optimization, integration, linear algebra, Fourier
-    transforms, signal and image processing, genetic algorithms, ODE
-    solvers, special functions, and more. 
-  </longdescription>
-</pkgmetadata>
-
diff --git a/sci-libs/scipy/scipy-0.4.6.ebuild b/sci-libs/scipy/scipy-0.4.6.ebuild
deleted file mode 100644
index 8d9d0c256..000000000
--- a/sci-libs/scipy/scipy-0.4.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~x86"
-
-# did not use virtual/blas and virtual/lapack
-# because scipy needs to compile all libraries with the same compiler
-# needs more work
-RDEPEND=">=dev-lang/python-2.3.3
-	>=dev-python/numpy-0.9.5
-	sci-libs/blas-atlas
-	sci-libs/lapack-atlas
-	fftw? ( =sci-libs/fftw-2.1* )"
-
-DEPEND="${RDEPEND}
-	=sys-devel/gcc-3*"
-
-# install doc claims fftw-2 is faster for complex ffts.
-# 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 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
-}
-
-src_unpack() {
-	unpack ${A}
-    cd "${S}"
-	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
-}
-
-src_test() {
-	python -c "import scipy; scipy.test(level=1)" || \
-		die "tests failed"
-}
-
-src_install() {
-	distutils_src_install
-	dodoc `ls *.txt`
-}
diff --git a/sci-libs/scipy/scipy-0.4.8.ebuild b/sci-libs/scipy/scipy-0.4.8.ebuild
deleted file mode 100644
index 7e60ce75e..000000000
--- a/sci-libs/scipy/scipy-0.4.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~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.6
-	sci-libs/blas-atlas
-	sci-libs/lapack-atlas
-	fftw? ( =sci-libs/fftw-2.1* )"
-
-DEPEND="${RDEPEND}
-	=sys-devel/gcc-3*"
-
-# install doc claims fftw-2 is faster for complex ffts.
-# 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() {
-
-	# force ATLAS
-	if [ -z "$(/usr/bin/eselect lapack show $(get_libdir) | grep ATLAS)"] &&
-		[ -z "$(/usr/bin/eselect blas show $(get_libdir) C | grep ATLAS)" ]; then
-		eerror "You need to set blas,lapack-atlas to use this version of scipy"
-		einfo "Please run:"
-		einfo "\teselect blas set ATLAS"
-		einfo "\teselect lapack set ATLAS"
-		einfo "or, if you have the threaded version:"
-		einfo "\teselect blas set threaded-ATLAS"
-		einfo "And re-emerge scipy"
-		die "setup failed"
-	fi
-
-	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
-	
-	fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-    cd "${S}"
-
-	echo "[atlas]"  > site.cfg
-	echo "include_dirs = /usr/include/atlas" >> site.cfg
-	echo "atlas_libs = lapack, blas, cblas, 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
-	else
-		echo "/usr/$(get_libdir)/blas/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_install() {
-	distutils_src_install
-	dodoc `ls *.txt`
-}