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

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

6 files changed, 11 insertions, 133 deletions

diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog
index 828bba2c5696..e574949276ad 100644
--- a/sci-libs/arpack/ChangeLog
+++ b/sci-libs/arpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/arpack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.43 2012/10/15 12:06:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.44 2012/10/18 21:11:23 jlec Exp $
+
+  18 Oct 2012; Justin Lecher <jlec@gentoo.org> -arpack-0.96-r3.ebuild,
+  arpack-3.0.2.ebuild, arpack-3.1.1.ebuild, arpack-3.1.2.ebuild,
+  arpack-96-r3.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   15 Oct 2012;  <naota@gentoo.org> arpack-3.1.2.ebuild, arpack-96-r3.ebuild:
   Add ~x86-fbsd
diff --git a/sci-libs/arpack/arpack-0.96-r3.ebuild b/sci-libs/arpack/arpack-0.96-r3.ebuild
deleted file mode 100644
index 791382fbeee1..000000000000
--- a/sci-libs/arpack/arpack-0.96-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-0.96-r3.ebuild,v 1.1 2012/06/13 10:57:51 jlec Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
-
-MY_PV="96"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems."
-HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/"
-SRC_URI="
-	http://www.caam.rice.edu/software/ARPACK/SRC/${PN}${MY_PV}.tar.gz
-	http://www.caam.rice.edu/software/ARPACK/SRC/p${PN}${MY_PV}.tar.gz
-	http://dev.gentoo.org/~bicatali/${MY_P}-patches-2.tar.bz2
-	doc? (
-		http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz
-		http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi static-libs"
-
-RDEPEND="
-	virtual/fortran
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[fortran] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/ARPACK"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./*patch.tar.gz
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${WORKDIR}"/${PN}-arscnd.patch
-	# http://savannah.gnu.org/bugs/?func=detailitem&item_id=31479
-	epatch "${WORKDIR}"/${PN}-neupd.patch
-	epatch "${WORKDIR}"/${PN}-autotools.patch
-
-	cd "${S}"
-	# fix examples library paths
-	sed -i \
-		-e '/^include/d' \
-		-e "s:\$(ALIBS):-larpack $(pkg-config --libs blas lapack):g" \
-		-e 's:$(FFLAGS):$(FFLAGS) $(LDFLAGS):g' \
-		EXAMPLES/*/makefile || die "sed failed"
-
-	sed -i \
-		-e '/^include/d' \
-		-e "s:\$(PLIBS):-larpack -lparpack $(pkg-config --libs blas lapack):g" \
-		-e 's:_$(PLAT)::g' \
-		-e 's:$(PFC):mpif77:g' \
-		-e 's:$(PFFLAGS):$(FFLAGS) $(LDFLAGS) $(EXTOBJS):g' \
-		PARPACK/EXAMPLES/MPI/makefile || die "sed failed"
-
-	# bug #354993
-	rm -f PARPACK/{SRC,UTIL,EXAMPLES}/MPI/mpif.h
-	#ln -s "${EPREFIX}"/usr/include/mpif*.h PARPACK/SRC/MPI/
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_enable static-libs static) \
-		$(use_enable mpi)
-}
-
-src_test() {
-	pushd EXAMPLES/SIMPLE
-	emake simple FC=$(tc-getFC) LDFLAGS="${LDFLAGS} -L${S}/.libs"
-	local prog=
-	for p in ss ds sn dn cn zn; do
-		prog=${p}simp
-		LD_LIBRARY_PATH="${S}/.libs" ./${prog} \
-			|| die "${prog} test failed"
-		rm -f ${prog} *.o
-	done
-	popd
-
-	if use mpi; then
-		pushd PARPACK/EXAMPLES/MPI
-		mpif77 ${FFLAGS} -c ../../../LAPACK/dpttr{f,s}.f \
-			|| die "compiling dpttrf,s failed"
-		emake \
-			FC=mpif77 \
-			EXTOBJS="dpttr{f,s}.o" \
-			LDFLAGS="${LDFLAGS} -L${S}/.libs -L${S}/PARPACK/.libs" \
-			pdndrv || die "emake pdndrv failed"
-		for p in 1 3; do
-			prog=pdndrv${p}
-			LD_LIBRARY_PATH="${S}/.libs:${S}/PARPACK/.libs" \
-				./${prog} || die "${prog} test failed"
-			rm -f ${prog} *.o
-		done
-		popd
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README DOCUMENTS/*.doc
-	newdoc DOCUMENTS/README README.doc
-	use doc && dodoc "${WORKDIR}"/*.ps
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r EXAMPLES
-		if use mpi; then
-			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
-			doins -r PARPACK/EXAMPLES/MPI
-		fi
-	fi
-}
diff --git a/sci-libs/arpack/arpack-3.0.2.ebuild b/sci-libs/arpack/arpack-3.0.2.ebuild
index 30a07d4f980d..0a7b80e0dd82 100644
--- a/sci-libs/arpack/arpack-3.0.2.ebuild
+++ b/sci-libs/arpack/arpack-3.0.2.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/arpack/arpack-3.0.2.ebuild,v 1.3 2012/05/04 08:22:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.0.2.ebuild,v 1.4 2012/10/18 21:11:23 jlec Exp $
 
 EAPI=4
 
@@ -22,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-maco
 IUSE="doc examples mpi static-libs"
 
 RDEPEND="
-	virtual/fortran
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[fortran] )"
diff --git a/sci-libs/arpack/arpack-3.1.1.ebuild b/sci-libs/arpack/arpack-3.1.1.ebuild
index 9036ec9f4b09..e97e53aeb8a9 100644
--- a/sci-libs/arpack/arpack-3.1.1.ebuild
+++ b/sci-libs/arpack/arpack-3.1.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/arpack/arpack-3.1.1.ebuild,v 1.2 2012/05/30 19:03:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.1.ebuild,v 1.3 2012/10/18 21:11:23 jlec Exp $
 
 EAPI=4
 
@@ -22,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-maco
 IUSE="doc examples mpi static-libs"
 
 RDEPEND="
-	virtual/fortran
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[fortran] )"
diff --git a/sci-libs/arpack/arpack-3.1.2.ebuild b/sci-libs/arpack/arpack-3.1.2.ebuild
index 53083bf3056d..8e0012fa07e3 100644
--- a/sci-libs/arpack/arpack-3.1.2.ebuild
+++ b/sci-libs/arpack/arpack-3.1.2.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/arpack/arpack-3.1.2.ebuild,v 1.2 2012/10/15 12:06:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.2.ebuild,v 1.3 2012/10/18 21:11:23 jlec Exp $
 
 EAPI=4
 
@@ -22,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 IUSE="doc examples mpi static-libs"
 
 RDEPEND="
-	virtual/fortran
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[fortran] )"
diff --git a/sci-libs/arpack/arpack-96-r3.ebuild b/sci-libs/arpack/arpack-96-r3.ebuild
index 9a77963544ab..483e858942bf 100644
--- a/sci-libs/arpack/arpack-96-r3.ebuild
+++ b/sci-libs/arpack/arpack-96-r3.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/arpack/arpack-96-r3.ebuild,v 1.14 2012/05/04 08:22:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r3.ebuild,v 1.15 2012/10/18 21:11:23 jlec Exp $
 
 EAPI=4
 
@@ -22,7 +22,6 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples mpi static-libs"
 
 RDEPEND="
-	virtual/fortran
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[fortran] )"