Version bump, removed older revisions

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 19 insertions, 321 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 60ce7e767242..589a5438e8b2 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/scipy
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.39 2009/02/02 16:50:21 bicatali Exp $
+
+*scipy-0.7.0_rc2 (02 Feb 2009)
+
+  02 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -scipy-0.6.0-r4.ebuild, -scipy-0.6.0-r5.ebuild, -scipy-0.7.0_beta1.ebuild,
+  +scipy-0.7.0_rc2.ebuild:
+  Version bump, removed older revisions
 
 *scipy-0.6.0-r6 (14 Jan 2009)
 
diff --git a/sci-libs/scipy/scipy-0.6.0-r4.ebuild b/sci-libs/scipy/scipy-0.6.0-r4.ebuild
deleted file mode 100644
index 37d31399c238..000000000000
--- a/sci-libs/scipy/scipy-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2008 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-r4.ebuild,v 1.8 2008/10/28 12:51:14 bicatali Exp $
-
-EAPI=1
-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 )"
-
-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
-
-	# when fortran flags are set, pic is removed.
-	use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
-}
-
-pkg_setup() {
-	if use umfpack && ! built_with_use dev-lang/swig python; then
-		eerror "With umfpack enabled you need"
-		eerror "dev-lang/swig with python enabled"
-		einfo  "Please re-emerge swig with USE=python"
-		die "needs swig with python"
-	fi
-	# 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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
-	cat > site.cfg <<-EOF
-		[DEFAULT]
-		library_dirs = /usr/$(get_libdir)
-		include_dirs = /usr/include
-		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas lapack | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas lapack | sed -e \
-			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
-		atlas_libs = $(pkg-config --libs-only-l \
-			cblas | 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 | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			cblas | 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() {
-	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"
-}
diff --git a/sci-libs/scipy/scipy-0.6.0-r5.ebuild b/sci-libs/scipy/scipy-0.6.0-r5.ebuild
deleted file mode 100644
index 6de06a7dca78..000000000000
--- a/sci-libs/scipy/scipy-0.6.0-r5.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2008 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-r5.ebuild,v 1.2 2008/12/11 23:43:53 bicatali Exp $
-
-EAPI=1
-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 )"
-
-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() {
-	if use umfpack && ! built_with_use dev-lang/swig python; then
-		eerror "With umfpack enabled you need"
-		eerror "dev-lang/swig with python enabled"
-		einfo  "Please re-emerge swig with USE=python"
-		die "needs swig with python"
-	fi
-	# 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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 lapack | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas lapack | sed -e \
-			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
-		atlas_libs = $(pkg-config --libs-only-l \
-			cblas | 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 | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			cblas | 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.
-	use amd64 && [[ -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"
-}
diff --git a/sci-libs/scipy/scipy-0.7.0_beta1.ebuild b/sci-libs/scipy/scipy-0.7.0_rc2.ebuild
index b6f7c8c9694f..53c9ff26b859 100644
--- a/sci-libs/scipy/scipy-0.7.0_beta1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.0_rc2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.7.0_beta1.ebuild,v 1.2 2008/12/11 23:43:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.0_rc2.ebuild,v 1.1 2009/02/02 16:50:21 bicatali Exp $
 
 EAPI=1
 NEED_PYTHON=2.4
-MYP=${P/_beta/b}
+MYP=${P/_rc/rc}
 inherit eutils distutils fortran flag-o-matic
 
 SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
@@ -31,7 +31,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	dev-python/imaging"
 
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt FORMAT_GUIDELINES.txt"
+DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
 
 S="${WORKDIR}/${MYP}"
 
@@ -74,7 +74,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-implicit.patch
+	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
 	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
 	cat > site.cfg <<-EOF
 		[DEFAULT]
@@ -82,22 +82,22 @@ src_unpack() {
 		include_dirs = /usr/include
 		[atlas]
 		include_dirs = $(pkg-config --cflags-only-I \
-			cblas lapack | sed -e 's/^-I//' -e 's/ -I/:/g')
+			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
 		library_dirs = $(pkg-config --libs-only-L \
-			cblas lapack | sed -e \
+			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 | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			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 | sed -e 's/^-L//' -e 's/ -L/:/g' \
+			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
 			-e 's/ //g'):/usr/$(get_libdir)
 		libraries = $(pkg-config --libs-only-l \
-			cblas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			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' \
@@ -119,7 +119,7 @@ src_test() {
 		--no-compile \
 		${SCIPY_FCONFIG} || die "install test failed"
 	pushd "${S}"/test/lib*/python
-	PYTHONPATH=. "${python}" -c "import scipy; scipy.test()" 2>&1 | tee test.log
+	PYTHONPATH=. "${python}" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
 	grep -q ^ERROR test.log && die "test failed"
 	popd
 	rm -rf test