sci-libs/scipy: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

(Portage version: 2.2.0_alpha138/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 14 insertions, 13 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index ed3a2d6cf5ad..0d84266fec99 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.79 2012/10/02 01:36:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.80 2012/10/16 19:47:58 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> scipy-0.9.0-r1.ebuild,
+  scipy-0.10.1.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   02 Oct 2012; Mike Gilbert <floppym@gentoo.org> scipy-0.10.1.ebuild,
   scipy-0.9.0-r1.ebuild:
diff --git a/sci-libs/scipy/scipy-0.10.1.ebuild b/sci-libs/scipy/scipy-0.10.1.ebuild
index 2c231313e42a..7c186691d743 100644
--- a/sci-libs/scipy/scipy-0.10.1.ebuild
+++ b/sci-libs/scipy/scipy-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v 1.5 2012/10/02 01:36:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v 1.6 2012/10/16 19:47:58 jlec Exp $
 
 EAPI=4
 
@@ -12,7 +12,8 @@ inherit eutils fortran-2 distutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? (
 		http://docs.scipy.org/doc/${P}/${PN}-html.zip -> ${P}-html.zip
 		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${P}-ref.pdf
@@ -23,20 +24,19 @@ SLOT="0"
 IUSE="doc test umfpack"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
-CDEPEND="dev-python/numpy
+CDEPEND="
+	dev-python/numpy
 	sci-libs/arpack
 	virtual/cblas
 	virtual/lapack
 	umfpack? ( sci-libs/umfpack )"
-
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
 	test? ( dev-python/nose )
 	umfpack? ( dev-lang/swig )"
 
-RDEPEND="virtual/fortran
-	${CDEPEND}
+RDEPEND="${CDEPEND}
 	dev-python/imaging"
 
 DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
diff --git a/sci-libs/scipy/scipy-0.9.0-r1.ebuild b/sci-libs/scipy/scipy-0.9.0-r1.ebuild
index 6ac7c6f8ac48..39a42b8a26e3 100644
--- a/sci-libs/scipy/scipy-0.9.0-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.9.0-r1.ebuild,v 1.10 2012/10/02 01:36:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.9.0-r1.ebuild,v 1.11 2012/10/16 19:47:58 jlec Exp $
 
 EAPI="3"
 
@@ -33,15 +33,11 @@ CDEPEND="
 	virtual/cblas
 	virtual/lapack
 	umfpack? ( sci-libs/umfpack )"
-
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
 	umfpack? ( dev-lang/swig )"
-
-RDEPEND="
-	virtual/fortran
-	${CDEPEND}
+RDEPEND="${CDEPEND}
 	dev-python/imaging"
 
 # buggy test suite - still true for 0.9.0