Block makecif for 5.6

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

5 files changed, 35 insertions, 31 deletions

diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog
index 5b9bcf578faa..232c631c0ca2 100644
--- a/sci-chemistry/refmac/ChangeLog
+++ b/sci-chemistry/refmac/ChangeLog
@@ -1,6 +1,10 @@
 # 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.47 2011/06/21 15:57:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.48 2011/06/29 11:11:20 jlec Exp $
+
+  29 Jun 2011; Justin Lecher <jlec@gentoo.org> refmac-5.5.0110-r2.ebuild,
+  refmac-5.5.0110-r3.ebuild, refmac-5.6.0117.ebuild, metadata.xml:
+  Block makecif for 5.6
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> refmac-5.5.0110-r2.ebuild,
   refmac-5.5.0110-r3.ebuild, refmac-5.6.0117.ebuild:
diff --git a/sci-chemistry/refmac/metadata.xml b/sci-chemistry/refmac/metadata.xml
index a4525fd92784..a5288b32ee55 100644
--- a/sci-chemistry/refmac/metadata.xml
+++ b/sci-chemistry/refmac/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-<maintainer>
- <email>jlec@gentoo.org</email>
-  <name>Justin Lecher (jlec)</name>
- </maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher (jlec)</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
index e7860e64041a..c4a01357becb 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
 # 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.12 2011/06/21 15:57:34 jlec Exp $
+# $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 $
 
 EAPI=2
 
@@ -18,15 +18,15 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	virtual/fortran
-
 	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}"
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
index d356eb57378c..a109f350d3fe 100644
--- a/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0110-r3.ebuild
@@ -1,8 +1,8 @@
 # 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.5.0110-r3.ebuild,v 1.4 2011/06/21 15:57:34 jlec Exp $
+# $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 $
 
-EAPI=2
+EAPI=4
 
 inherit base fortran-2 flag-o-matic toolchain-funcs versionator
 
@@ -18,15 +18,15 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	virtual/fortran
-
 	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}"
@@ -60,7 +60,7 @@ src_compile() {
 		LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \
 		LLIBLAPACK="$(pkg-config --libs lapack blas)" \
 		LLIBOTHERS="${LIBS}" \
-		${PN} libcheck || die
+		${PN} libcheck
 }
 
 src_test() {
@@ -76,9 +76,9 @@ src_test() {
 
 src_install() {
 	exeinto /usr/libexec/ccp4/bin/
-	doexe ${PN} || die
-	dosym refmac /usr/libexec/ccp4/bin/refmac5 || die
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN} || die
-	dosym refmac /usr/bin/refmac5 || die
-	dodoc refmac_keywords.pdf bugs_and_features.pdf || die
+	doexe ${PN}
+	dosym refmac /usr/libexec/ccp4/bin/refmac5
+	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
+	dosym refmac /usr/bin/refmac5
+	dodoc refmac_keywords.pdf bugs_and_features.pdf
 }
diff --git a/sci-chemistry/refmac/refmac-5.6.0117.ebuild b/sci-chemistry/refmac/refmac-5.6.0117.ebuild
index 97c82d319abf..fd14fe877bf7 100644
--- a/sci-chemistry/refmac/refmac-5.6.0117.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0117.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2011/06/21 15:57:34 jlec Exp $
+# $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=2
+EAPI=4
 
 inherit base fortran-2 flag-o-matic toolchain-funcs versionator
 
@@ -20,14 +20,15 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	virtual/fortran
-
+	!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}"
@@ -59,8 +60,7 @@ src_compile() {
 		XCFLAGS="" \
 		LLIBCCP="-lccp4f -lccp4c -lccif $(pkg-config --libs mmdb)" \
 		LLIBLAPACK="$(pkg-config --libs lapack blas)" \
-		LLIBOTHERS="${LIBS}" \
-		|| die
+		LLIBOTHERS="${LIBS}"
 }
 
 src_test() {
@@ -77,9 +77,9 @@ src_test() {
 src_install() {
 	for i in refmac libcheck FreeTwin header2matr; do
 		exeinto /usr/libexec/ccp4/bin/
-		doexe ${i} || die
+		doexe ${i}
 		dosym ../libexec/ccp4/bin/${i} /usr/bin/${i}
 	done
-	dosym refmac /usr/bin/refmac5 || die
-	dosym refmac /usr/libexec/ccp4/bin/refmac5 || die
+	dosym refmac /usr/bin/refmac5
+	dosym refmac /usr/libexec/ccp4/bin/refmac5
 }