Fix blocking of refmac-5.6, EAPI bump

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

5 files changed, 68 insertions, 21 deletions

diff --git a/sci-chemistry/makecif/ChangeLog b/sci-chemistry/makecif/ChangeLog
index 56774bc8f979..9367a3663243 100644
--- a/sci-chemistry/makecif/ChangeLog
+++ b/sci-chemistry/makecif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/makecif
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/makecif/ChangeLog,v 1.9 2011/06/21 16:03:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/makecif/ChangeLog,v 1.10 2011/06/29 11:51:15 jlec Exp $
+
+*makecif-5.6.6-r1 (29 Jun 2011)
+
+  29 Jun 2011; Justin Lecher <jlec@gentoo.org> makecif-5.6.6.ebuild,
+  +makecif-5.6.6-r1.ebuild, metadata.xml:
+  Fix blocking of refmac-5.6, EAPI bump
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> makecif-5.6.6.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-chemistry/makecif/Manifest b/sci-chemistry/makecif/Manifest
index 72b7bce20a35..8389fe97939f 100644
--- a/sci-chemistry/makecif/Manifest
+++ b/sci-chemistry/makecif/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 5.6.6-makefile.patch 3713 RMD160 9ea6ed99a99132dee094148162ddbf6a66718d69 SHA1 3b7455469a573033646b1cebcaab2b24b7c23659 SHA256 a0ceb0a8e68c58c3bb568f7700a9594956f4dae6f63920d0ce812ef1650abf43
 DIST makecif-5.6.6.tar.gz 3797710 RMD160 f5b914ccf135e8adf2867d6fd19113d7f2808fad SHA1 3ffa1543980cc8babfcf08786a46ef8850cb42d6 SHA256 fdcc1bee70583da3161f0d46eb792d965c04f08f0ad3033f730486550e859d1f
-EBUILD makecif-5.6.6.ebuild 857 RMD160 c149f3486f1002304f58301554789379c85f1ca2 SHA1 0fcbc83b2916cf63bfa577c4cfb6a172191eedd7 SHA256 e7b0eb7c28926decfc90bbb0bdfda6740d5436a0ca7da9e1625862c4733964f9
-MISC ChangeLog 1150 RMD160 ea2ce8898cb25b618d9cb7f5d0b0dfc65cf00131 SHA1 a4fa4f3a4e40da7d312685aac769c9e71c563efb SHA256 3356a2dd28e097582356eb89751ef5f1a5fe6171d3f6172ef44ce88b63a076b3
-MISC metadata.xml 517 RMD160 c2ed5af79224585a4997fc3fad6b61709d7ce11f SHA1 c18997d00b6d3f696b5df3f71a71ce342f5ac8c2 SHA256 f7528f1e90b532ef40dd7eeddcb71718c4f4658f766cc0b66a29802e36ef6746
+EBUILD makecif-5.6.6-r1.ebuild 843 RMD160 131898f8dee4a5866365c2ba6b0ff5b3a98a21ee SHA1 9c2c2284d78e4b0d013d52eeacecda1dde8143f2 SHA256 a4b34878e8140780271211be4a37e1e8672f15df1b20e532c04257f1781dfc37
+EBUILD makecif-5.6.6.ebuild 856 RMD160 ad36ee94d12a74e3d14f8dc27d0dccc076cbe279 SHA1 9a33c661b70636e8fe1a7085bcfe706daedd67f4 SHA256 94478c1dc07c293feda4cd7ee19fac670660d13ce167e34893d18804e34e46b6
+MISC ChangeLog 1336 RMD160 677200b62d5b409873798d13e6ea8978e1d01eb7 SHA1 eef2fa6e2a1b1edf1abcbf78bbc0d001c16e360c SHA256 4eab468d4c31156e6a86a72fb01578fd6e49ad909be506eac219bf21f0784b1b
+MISC metadata.xml 519 RMD160 467001b6faeb273a8ebf305ae33c758ced0c2dff SHA1 7ed439e0f62f630f06c130206a17e972178835a7 SHA256 80b0b422642f9a790eb8c1b259cfb4d63dbba0297dcb029da31dddd5d3c91e16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4AwL4ACgkQgAnW8HDreRZCIACeKDhmVErGynIpBJYnxcxnYuu2
-xlAAoMSHES3TQ+zfcORaxj7YY/2/4TDk
-=+/N1
+iEYEAREKAAYFAk4LEb0ACgkQgAnW8HDreRaXywCgvm5ugvuZpswsRtQ3m9wH7HS9
+DFIAnjrVypAm/qTqE5hhFVX3qdPyeEeo
+=hKuF
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild b/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild
new file mode 100644
index 000000000000..1484ea658bf3
--- /dev/null
+++ b/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/makecif/makecif-5.6.6-r1.ebuild,v 1.1 2011/06/29 11:51:15 jlec Exp $
+
+EAPI=4
+
+inherit eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="PDB --> CIF convertor"
+HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/makecif.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="ccp4"
+IUSE=""
+
+S="${WORKDIR}"/${PN}
+
+DEPEND="
+	!>=sci-chemistry/refmac-5.6
+	virtual/fortran"
+RDEPEND="${DEPEND}
+	sci-libs/monomer-db"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-makefile.patch
+}
+
+src_compile() {
+	emake -C src clean
+	emake \
+		-C src \
+		BLANC_FORT="$(tc-getFC) ${FFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin bin/*
+	dodoc readme
+}
diff --git a/sci-chemistry/makecif/makecif-5.6.6.ebuild b/sci-chemistry/makecif/makecif-5.6.6.ebuild
index 9844ea22b7d0..2ac244edf3be 100644
--- a/sci-chemistry/makecif/makecif-5.6.6.ebuild
+++ b/sci-chemistry/makecif/makecif-5.6.6.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/makecif/makecif-5.6.6.ebuild,v 1.9 2011/06/21 16:03:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/makecif/makecif-5.6.6.ebuild,v 1.10 2011/06/29 11:51:15 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils fortran-2 toolchain-funcs
 
@@ -18,11 +18,10 @@ IUSE=""
 S="${WORKDIR}"/${PN}
 
 DEPEND="
-	virtual/fortran
-	"
-RDEPEND="
-	sci-libs/monomer-db
-	!<sci-chemistry/refmac-5.5.0110-r1"
+	!>=sci-chemistry/refmac-5.6
+	virtual/fortran"
+RDEPEND="${DEPEND}
+	sci-libs/monomer-db"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-makefile.patch
diff --git a/sci-chemistry/makecif/metadata.xml b/sci-chemistry/makecif/metadata.xml
index fc1a45358926..993c1d1ffcda 100644
--- a/sci-chemistry/makecif/metadata.xml
+++ b/sci-chemistry/makecif/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-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<longdescription>
-PDB --> CIF convertor
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+PDB - CIF convertor
 check and create correct structure description
 create the list of restraints
 create dictionary description of new ligands