sci-chemistry/refmac: 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 70EB7916)

5 files changed, 13 insertions, 96 deletions

diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog
index 9e45bd5b8c82..7ae1313f6607 100644
--- a/sci-chemistry/refmac/ChangeLog
+++ b/sci-chemistry/refmac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/refmac
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.49 2011/07/11 08:59:06 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.50 2012/10/19 10:25:51 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> refmac-5.5.0110-r2.ebuild,
+  refmac-5.5.0110-r3.ebuild, -refmac-5.6.0117.ebuild, refmac-5.6.0119.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
 *refmac-5.6.0119 (11 Jul 2011)
 
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
index c4a01357becb..8d7d0f0127c8 100644
--- a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.13 2011/06/29 11:11:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.14 2012/10/19 10:25:51 jlec Exp $
 
 EAPI=2
 
@@ -23,7 +23,6 @@ RDEPEND="
 	sci-libs/mmdb
 	<sci-libs/monomer-db-1
 	virtual/blas
-	virtual/fortran
 	virtual/lapack"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
index a109f350d3fe..d1a473524237 100644
--- a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v 1.5 2011/06/29 11:11:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild,v 1.6 2012/10/19 10:25:51 jlec Exp $
 
 EAPI=4
 
@@ -23,7 +23,6 @@ RDEPEND="
 	sci-libs/mmdb
 	<sci-libs/monomer-db-1
 	virtual/blas
-	virtual/fortran
 	virtual/lapack"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-chemistry/refmac/refmac-5.6.0117.ebuild b/sci-chemistry/refmac/refmac-5.6.0117.ebuild
deleted file mode 100644
index fd14fe877bf7..000000000000
--- a/sci-chemistry/refmac/refmac-5.6.0117.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0117.ebuild,v 1.4 2011/06/29 11:11:20 jlec Exp $
-
-EAPI=4
-
-inherit base fortran-2 flag-o-matic toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)_source_v${PV}"
-
-DESCRIPTION="Macromolecular crystallographic refinement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac"
-SRC_URI="
-	${HOMEPAGE}/data/refmac_experimental/${PN}${MY_PV}.tar.gz
-	test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	!sci-chemistry/makecif
-	>=sci-libs/ccp4-libs-6.1.3-r7
-	sci-libs/mmdb
-	>sci-libs/monomer-db-1
-	virtual/blas
-	virtual/fortran
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-FORTRAN_STANDARD="77 90"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/5.6.0116-allow-dynamic-linking.patch
-	)
-
-src_prepare() {
-	base_src_prepare
-	use test && epatch "${FILESDIR}"/5.5-test.log.patch
-	[[ ${FC} == *gfortran* ]] && \
-		append-fflags -fno-second-underscore && \
-		append-cflags -DGFORTRAN -DPROTOTYPE && \
-		append-libs -lgfortran -lgfortranbegin -lstdc++
-	[[ ${FC} == *ifort* ]] && \
-		append-libs -lstdc++
-}
-
-src_compile() {
-	emake \
-		FC=$(tc-getFC) \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		COPTIM="${CFLAGS}" \
-		FOPTIM="${FFLAGS:- -O2}" \
-		VERSION="" \
-		XFFLAGS="-fwhole-file" \
-		XCFLAGS="" \
-		LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \
-		LLIBLAPACK="$(pkg-config --libs lapack blas)" \
-		LLIBOTHERS="${LIBS}"
-}
-
-src_test() {
-	einfo "Starting tests ..."
-	source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
-	export PATH="${WORKDIR}/test-framework/scripts:${S}:${PATH}"
-	export CCP4_TEST="${WORKDIR}"/test-framework
-	export CCP4_SCR="${T}"
-	ln -sf refmac "${S}"/refmac5
-	sed '/^ANISOU/d' -i ${CCP4_TEST}/data/pdb/1vr7.pdb
-	ccp4-run-thorough-tests -v test_refmac5 || die
-}
-
-src_install() {
-	for i in refmac libcheck FreeTwin header2matr; do
-		exeinto /usr/libexec/ccp4/bin/
-		doexe ${i}
-		dosym ../libexec/ccp4/bin/${i} /usr/bin/${i}
-	done
-	dosym refmac /usr/bin/refmac5
-	dosym refmac /usr/libexec/ccp4/bin/refmac5
-}
diff --git a/sci-chemistry/refmac/refmac-5.6.0119.ebuild b/sci-chemistry/refmac/refmac-5.6.0119.ebuild
index c4726e13eb50..f5d8ee90f8e9 100644
--- a/sci-chemistry/refmac/refmac-5.6.0119.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0119.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0119.ebuild,v 1.1 2011/07/11 08:59:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0119.ebuild,v 1.2 2012/10/19 10:25:51 jlec Exp $
 
 EAPI=4
 
@@ -25,7 +25,6 @@ RDEPEND="
 	sci-libs/mmdb
 	>sci-libs/monomer-db-1
 	virtual/blas
-	virtual/fortran
 	virtual/lapack"
 DEPEND="${RDEPEND}"