Unbundled makecif into sci-chemistry/makecif

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 82 insertions, 5 deletions

diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog
index bef7e83e3150..15e2edce3125 100644
--- a/sci-chemistry/refmac/ChangeLog
+++ b/sci-chemistry/refmac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/refmac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.8 2010/05/27 08:50:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.9 2010/06/15 07:34:44 jlec Exp $
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> +refmac-5.5.0110-r1.ebuild:
+  Unbundled makecif into sci-chemistry/makecif
+
+*refmac-5.5.0110-r1 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> +refmac-5.5.0110-r1.ebuild:
+  Exclude makecif from refmac cause we have sci-chemistry/makecif now
 
 *refmac-5.6.0077 (27 May 2010)
 
diff --git a/sci-chemistry/refmac/Manifest b/sci-chemistry/refmac/Manifest
index 226aa67406dc..f7ad642b5566 100644
--- a/sci-chemistry/refmac/Manifest
+++ b/sci-chemistry/refmac/Manifest
@@ -11,15 +11,16 @@ DIST refmac_5.5.0109.tar.gz 1326779 RMD160 3b603c13638407cceb907bd43ac0a971b587c
 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.0109.ebuild 1736 RMD160 4db9926be6b3cb3d17e7e1dd1bbf56d2bf34271a SHA1 daf39f7a3d57471dbaf2c217ca49fb38a36dd911 SHA256 26ce3f5cdddae57f5f6b35ed835cb826f8f3d4de3f645abec040754cc92fff9e
+EBUILD refmac-5.5.0110-r1.ebuild 1763 RMD160 65019949be65514c0b65294d04551745e50358f6 SHA1 6a4c5e6bc98bfb3c35eae8464a2933a3c0ecf0e2 SHA256 074f0e841f0efa56cfb1293190407ef3805aca9888a41da25b4a1154add66612
 EBUILD refmac-5.5.0110.ebuild 1781 RMD160 664874944ea21da9c3cb315a4f0114e3c32d4741 SHA1 5a1d4e8001f03782b8c1e43bd717a884f63ffd89 SHA256 9e54db2886755e77ea6950b63fbd4d11ff090df19f6e741f78c1ccee32188f4c
 EBUILD refmac-5.6.0076.ebuild 1765 RMD160 f3974d98bcb4ccf2254dd5b65aa816a6a88a24e1 SHA1 b40a1023fbc24690d81d06c0de0d8934bb580625 SHA256 d4ea7d50118030cb08c530740e27a158c2914635d16e402d4c70ad1d4a97e0b1
 EBUILD refmac-5.6.0077.ebuild 1765 RMD160 8ce1b0b156536e1d41341ce0a4588471538a8eb4 SHA1 a27b138986db54c7f41ac06e46f4b2e71d4e3deb SHA256 cfffa59da70b098c5472c50bb89d9dd02251c730c2bfef1aa700fed91d91f232
-MISC ChangeLog 1292 RMD160 3de1d57bdd738807658e198552b87045773405e0 SHA1 8839e34f203a9b9b39210ccafdc3051346f061e7 SHA256 c06afa203ce0f99e6d79562d126826101eb10cb1295a2d9a13ee81a200fbe205
+MISC ChangeLog 1596 RMD160 a20deb49faa3bb85e512210b904130faec96d7f4 SHA1 ad414a96c14eef27c39bb2851d883d91a5723a0c SHA256 be0a5c5f01fb9864b71d4844af2f9619baccbf23450d1f39570f0502b052eca1
 MISC metadata.xml 311 RMD160 df83b13d491a71b729455b664088d89ddbde1c8c SHA1 fffd2a5645181aa12ac9b6f74da9a011cdcf1b97 SHA256 782521c7e16d7eec82d7b7e7c43102806e7f72bc7366401808b1e1ac6e26045a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv+MmEACgkQgAnW8HDreRYbEQCgwcwx9nJYk8aCGBBmgW6l+j/K
-TrEAn1MCfF2yS5Ib1rseURI2KwAFJ40U
-=voEL
+iEYEARECAAYFAkwXLSYACgkQgAnW8HDreRbBHwCgn5eiDGjzXqVRu3crcF3BjAj6
+gSIAn3j4b9s8+IGte4EfL33rKelgIMy4
+=FPFO
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild
new file mode 100644
index 000000000000..976139641151
--- /dev/null
+++ b/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/06/15 07:34:44 jlec Exp $
+
+EAPI="2"
+
+inherit fortran base toolchain-funcs versionator
+
+DESCRIPTION="Macromolecular crystallographic refinement program"
+HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
+SRC_URI="${HOMEPAGE}data/refmac_stable/refmac_${PV}.tar.gz
+	test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )"
+
+SLOT="0"
+LICENSE="ccp4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	sci-chemistry/makecif
+	sci-libs/ccp4-libs
+	sci-libs/mmdb
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-allow-dynamic-linking.patch
+	)
+
+src_prepare() {
+	base_src_prepare
+	use test && epatch "${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-test.log.patch
+}
+
+src_compile() {
+	emake \
+		FC=$(tc-getFC) \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		COPTIM="${CFLAGS}" \
+		FOPTIM="${FFLAGS:- -O2}" \
+		VERSION="" \
+		XFFLAGS="-fno-second-underscore" \
+		LLIBCCP="-lccp4f -lccp4c -lccif -lmmdb -lstdc++" \
+		LLIBLAPACK="-llapack -lblas" \
+		|| die
+}
+
+src_test() {
+	einfo "Starting tests ..."
+	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() {
+	exeinto /usr/libexec/ccp4/bin/
+	doexe ${PN} || die
+	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
+	dosym refmac /usr/bin/refmac5 || die
+	dodoc refmac_keywords.pdf bugs_and_features.pdf || die
+}