Block makecif for 5.6

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

6 files changed, 44 insertions, 40 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/Manifest b/sci-chemistry/refmac/Manifest
index 5d545b9670e8..79601eb34911 100644
--- a/sci-chemistry/refmac/Manifest
+++ b/sci-chemistry/refmac/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 5.5-test.log.patch 1146 RMD160 0ea6293e8ecde3b9ae12658a523e3c30a5c9f01b SHA1 d026fdea6a487754f7e48ec24bcf4851a613b6d1 SHA256 d2c2a09f44e525dc255bc2ac93ca4194b24ca1fe58c31f0e3b5c32e439dfe2e7
 AUX 5.5.0110-allow-dynamic-linking.patch 2730 RMD160 3637d62986050317a1480e5074ecfac5307fb216 SHA1 c3035d478f22a9d9b95b70aaa3a357eb91d9375f SHA256 72e782184abc94f8efa46082e3b0d30000e745c8ee9141affa2c178b1cf87d35
@@ -9,15 +9,15 @@ AUX 5.6.0116-allow-dynamic-linking.patch 16438 RMD160 149cfb8af3f35afc61c26d99d4
 DIST refmac5.6_source_v5.6.0117.tar.gz 1291407 RMD160 690beb9ba7ffa59ca4326f91c7ab8ff58b1b3a4c SHA1 9dea92fb08230538d0c1ef14e84383666905a03f SHA256 17a0a63d7d9307a2694e5f3e09d8c4d99b47cbe57ef55ba7cbe16cb2b7fd3590
 DIST refmac_5.5.0110.tar.gz 1326832 RMD160 6613ca8b70e54e7827f8ff02b7d497560cb83e39 SHA1 ba2e38db6c88550bd901b474de881d6514b4d74e SHA256 1353fb1042586ec8fa37d0a90f274890d0ccc02377af5216200662338dfe08ca
 DIST test-framework.tar.gz 130933173 RMD160 7122539dc713615dca2ddaddfd8d152cd22624d0 SHA1 1d3e3019a67afb9b2346e919c859d402d3250fea SHA256 df050a2a29da80518cb0616a0bbeb82298ea0721549348d15353bf0f66240605
-EBUILD refmac-5.5.0110-r2.ebuild 2193 RMD160 5090a9756e0760b68cc8b4e04760d9a70e1b3259 SHA1 f7d0cbeea1946f92350ce7beea4235303b4228a3 SHA256 9a98f861fa988cec74e316a8597e0817389f8b5560a20e56a1b7eede6c110186
-EBUILD refmac-5.5.0110-r3.ebuild 2286 RMD160 91c6bf5b6eea3cae8575274f13bff8da67786c16 SHA1 2fe2ccfcbfb3944d40733786ddf781ac94cea042 SHA256 17e8b22284bc9578ba0660460bf98ceb54b5079d66b7be8a94024719c8aa69ad
-EBUILD refmac-5.6.0117.ebuild 2248 RMD160 e611894d6299e5402dacc1498910b0b3cbafd795 SHA1 a09f112ea1d334c86ad089d27d835473bb571c83 SHA256 d0df976a85a3f1e31d225fbe7236b37e5370648cd709e0f9cf1162c752295a5e
-MISC ChangeLog 9409 RMD160 a16a5f90b89bb72f4306f8031f884caa8e725d78 SHA1 4213412e4d4fb21495860586adb12d1ecd12a322 SHA256 49c45a227ca01e2bf7b1254b1b0a4e9c6104070c20c8848d7c34573eedb2b5fd
-MISC metadata.xml 311 RMD160 df83b13d491a71b729455b664088d89ddbde1c8c SHA1 fffd2a5645181aa12ac9b6f74da9a011cdcf1b97 SHA256 782521c7e16d7eec82d7b7e7c43102806e7f72bc7366401808b1e1ac6e26045a
+EBUILD refmac-5.5.0110-r2.ebuild 2193 RMD160 d15e5d23dfb33ace94dc9d3d56d3c02a59690f9d SHA1 bd23072a69463aed6b476780b9759c57ec451854 SHA256 a8f8b2cc925982d331483c982db592a788f2fbbfeecb23dacf8e15b83bd38dce
+EBUILD refmac-5.5.0110-r3.ebuild 2244 RMD160 b00d318dbc50ca46484970c33df72475e2cc2ab9 SHA1 892969800a89e1030747111b179c7b65be0b4814 SHA256 2e5df31c1fec48928db20599b733d519de838b8038e9d8be9acfdd4e7a4435ae
+EBUILD refmac-5.6.0117.ebuild 2240 RMD160 9cfe05e5038928c6da6c6e79fb26274a869d0c93 SHA1 5c6e2064cd83a1d48762a56f732ddffed73d2650 SHA256 9c0f1e5bc426ff2fc613cbaac035dbe1c6274cae857f8f2e9798c6f814accf3b
+MISC ChangeLog 9575 RMD160 a424b3cfd7331f1367e41072a60eb5602c36ce81 SHA1 50a1de26397619c9fcd5580e897cf67249bde19c SHA256 8ea187f354884c4600d727cb11f39fcd93c4052223b66bb9bb199c6b49125cfe
+MISC metadata.xml 316 RMD160 917d597c9b5e463cfaa0fc0ba55ff4da57666287 SHA1 69b22933f054e2716b8f7266a5d7b727beec2739 SHA256 ddb73bd401586087617638304ef518e463312dbaa2c343c305cb22a2c93a1a1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4Av3MACgkQgAnW8HDreRaiiACghOYwzs94x4iasYxUscYu69m5
-y4gAnR3pHj2s8GJNY2llcpM5x3LyLvF4
-=Ttzo
+iEYEAREKAAYFAk4LCGIACgkQgAnW8HDreRaU3ACgiZw4Z2A4nJ+nsmBR7f0eqnNU
+W10An36cOrCM8D2bt1rknLaHTn7KlXO+
+=VQWp
 -----END PGP SIGNATURE-----
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
 }