Moved the installation of profile files from sci-chemistry/ccp4-apps to sci-libs/ccp4-libs, #349700

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

10 files changed, 26 insertions, 447 deletions

diff --git a/sci-chemistry/refmac/ChangeLog b/sci-chemistry/refmac/ChangeLog
index 1f05bf339c6b..b6760626c22b 100644
--- a/sci-chemistry/refmac/ChangeLog
+++ b/sci-chemistry/refmac/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2011/01/04 08:55:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/ChangeLog,v 1.33 2011/01/10 21:17:34 jlec Exp $
+
+  10 Jan 2011; Justin Lecher <jlec@gentoo.org> -refmac-5.5.0109.ebuild,
+  -refmac-5.5.0110.ebuild, -refmac-5.5.0110-r1.ebuild,
+  refmac-5.5.0110-r2.ebuild, -refmac-5.6.0093.ebuild, -refmac-5.6.0094.ebuild,
+  -refmac-5.6.0096.ebuild, refmac-5.6.0097.ebuild:
+  Moved the installation of profile files from sci-chemistry/ccp4-apps to
+  sci-libs/ccp4-libs, #349700
 
 *refmac-5.6.0097 (04 Jan 2011)
 
diff --git a/sci-chemistry/refmac/Manifest b/sci-chemistry/refmac/Manifest
index 97ee7e227c95..29b9158128c3 100644
--- a/sci-chemistry/refmac/Manifest
+++ b/sci-chemistry/refmac/Manifest
@@ -18,27 +18,17 @@ AUX 5.6.0092-allow-dynamic-linking.patch 15244 RMD160 c7d1313f9addc68a9fb3f1a387
 AUX 5.6.0094-allow-dynamic-linking.patch 14253 RMD160 52c75acd769fc8df8c0c877457b558f7e1e4d52f SHA1 b2ce0c5adcd945037e2333818278fb4adfb15eb2 SHA256 629a7c10a8af3c5ddb8e6c5be65f121d3719f6d3298e2d41720dbecc16ea4d42
 AUX 5.6.0096-allow-dynamic-linking.patch 15644 RMD160 a5918087c640f6b460da8f03e85da04618983d90 SHA1 6b40bf1401114102b4eccc775b2b08849765d275 SHA256 c01c2dcd9130e7e7e465b753416a62a495c16eac1cff56289cb2de070b2e62fc
 AUX 5.6.0097-allow-dynamic-linking.patch 15960 RMD160 d5b0c7a0dcb3e3ca32d6c22b47cd20fd64e391e2 SHA1 b6cd3f6df9110670dba356acad31a3af56f65cd0 SHA256 4f1f5ed765c487f14b56d4386bb25a7f4dd069e49a5cb2b66c7c963c39c83812
-DIST refmac5.6_source_v5.6.0093.tar.gz 1376999 RMD160 c7604eec1ac4a1b7bfede6ffcb5565bc1e437782 SHA1 e33cb346a5bebd0a8a95e28566d09ad43d24b9b4 SHA256 1ad6da34a2133a0489b1bf9138cb367f18cbb72a4da4038da2e97e69ee5fb29a
-DIST refmac5.6_source_v5.6.0094.tar.gz 1377162 RMD160 6fc3e22e82f7df8870d645323aa8cca446438cf0 SHA1 67ae1f389c54208c6e57c539d6c1c788cbb4c569 SHA256 e19a389bd5398529ab4cc1fde42f87d19919f91fee6819b0b13ccd755905a92d
-DIST refmac5.6_source_v5.6.0096.tar.gz 1378374 RMD160 11395e181c0e591983d81480acc9b36e03ee20e1 SHA1 ec1ff85e86461923a162228b35d158b50267b767 SHA256 0418177eea1eef1fd6ee48739fe21d8eaba13418449068fd8edde271e54fb62c
 DIST refmac5.6_source_v5.6.0097.tar.gz 1385352 RMD160 794ec5b52fd3e59743a9a5f6e4e53e2b18b5eff7 SHA1 fee5a0b542f47c2f6c693489b2ca6bbc13b3a74d SHA256 127a260491cb8db7d670b6b9a48c74685bfd07e64e7819533b141ae7a90b055d
-DIST refmac_5.5.0109.tar.gz 1326779 RMD160 3b603c13638407cceb907bd43ac0a971b587c116 SHA1 3cc35a55df71bac4de3eec9cf0e690e221ae3c86 SHA256 38d416c94e1f86a0676d48d7ddaeb4af272970b8cd6b084e70aa38481327c59e
 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 1752 RMD160 aff34677eb8fa20e11879f4a2ee9a8e8c0b8c25d SHA1 7e9f78ccc7f1a5e4c6403b0e5d7404687d175287 SHA256 4c2a034bc3203128eff10d266d2c0fe77793c954c7e46c1d17f0cd01a50f3aa9
-EBUILD refmac-5.5.0110-r1.ebuild 1779 RMD160 555db7d27cee1c43304d55a4311545d6de45a105 SHA1 63ce012f4aa10e1d6689470725fb125f5b1d856b SHA256 10ef6ab5aea396f740b8975efe249c76e7c40feb11f2c374e6cd693bc99d8858
-EBUILD refmac-5.5.0110-r2.ebuild 1805 RMD160 edef077ca4ca6ab44f3584d0e2188b596bf81dcd SHA1 348662903ef1fb0c14acfe7713359afd54ce4271 SHA256 83e633b9d2f0bfe2a3b23abba738729f9feeb7bfb4de42f62329c58b4bf99677
-EBUILD refmac-5.5.0110.ebuild 1797 RMD160 12b3a0f9f8870f7f77d87ed633d080e6d81ca973 SHA1 029e2279213f37b73d9afe4f0a30a14350b6c7c9 SHA256 8d56bbc902280deb7fc792f364b05db34915482e81a3db087baa3d02ee88830c
-EBUILD refmac-5.6.0093.ebuild 1802 RMD160 27b6347e894ab8da82f34ca52bee12ed8595905a SHA1 aac4116505a948e1b4bc143b014750a2994f8862 SHA256 8e56838917d43cac17fc8f74981c1108662bdb5dd1f3b4b4423f1ee7c12576b5
-EBUILD refmac-5.6.0094.ebuild 1799 RMD160 71f48ef1066f779e270549ba6cd40bbfab3c3766 SHA1 2446e7e61a944e34f1cc5b12a55e6327293b58fd SHA256 d059348d3794d0c658a61aba450646a4e02001e441182a3a1a797f8b8c7b8019
-EBUILD refmac-5.6.0096.ebuild 1799 RMD160 ffb42954d3bfc7c4aef1a445c1695b6912dc3815 SHA1 cbc124f56cac7ef1102c3032b4da51d25e3a29fe SHA256 79c892bae3e446ef9501db1f5738c9c64b2c37b6b1867029621fc4e3efb06739
-EBUILD refmac-5.6.0097.ebuild 1799 RMD160 1899571b277cda55d4e4173caa22b55c9e318e48 SHA1 c9f7971612754f8d37ee34af956738eec121d085 SHA256 d292711f5e700c2d895883f83f72ac536e8178fc2e25a37ba1c0fb4817468ff7
-MISC ChangeLog 5656 RMD160 7b823800e3401cc6d440a0f41c4a0efbbc758f4e SHA1 d49221bf142c4832c4f10becd9ca458932999c70 SHA256 34b9d3ea562d6994bd7ee57ba41b5c9ed11236d61fa3f4e4977d2f84eda8947d
+EBUILD refmac-5.5.0110-r2.ebuild 1824 RMD160 66ee74d3ad7d30ea6d3ea3745f19d16ff88d2a6c SHA1 d688481fa44f0dd2334fd627036056ba2ff42f08 SHA256 6a2946301ff25f61b39c8e18934fc634f3b2ce8d409fb247b5baae55be9facf4
+EBUILD refmac-5.6.0097.ebuild 1812 RMD160 8ac3b3b983d1e935676a62f5809f9ebbdac35a04 SHA1 7f28d6629c250235d4cf6a5a21a9cd1815c20e52 SHA256 d708ff29109fddfb73097f78a03887032003fcf1af1d3bd3628bec0ba87700ee
+MISC ChangeLog 6018 RMD160 b087d3c561748b3c0b079096cdd4f8e385099a90 SHA1 8d053287a13499e0e22455d0e14100913ef53eab SHA256 5d789ef271a4b5a97da0bd6ecb7d1ed0f8e6667c38ba93feba2646eed2ae904a
 MISC metadata.xml 311 RMD160 df83b13d491a71b729455b664088d89ddbde1c8c SHA1 fffd2a5645181aa12ac9b6f74da9a011cdcf1b97 SHA256 782521c7e16d7eec82d7b7e7c43102806e7f72bc7366401808b1e1ac6e26045a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0i4H4ACgkQgAnW8HDreRbTYgCeI96aqP3eHa5idw/vD+mXp66u
-uAgAnRoNgQ3AbqE1z3K0xboXgKg9j6Gn
-=DBOh
+iEYEARECAAYFAk0rd3QACgkQgAnW8HDreRZgPgCeIvPkPyg5trM/7AV6SPEryYx2
+MsYAn2Wx4NSspTq5AWC+vALHZm1qXpug
+=EKhy
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/refmac/refmac-5.5.0109.ebuild b/sci-chemistry/refmac/refmac-5.5.0109.ebuild
deleted file mode 100644
index 7332f0d9dd88..000000000000
--- a/sci-chemistry/refmac/refmac-5.5.0109.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.0109.ebuild,v 1.5 2010/12/16 13:56:18 jlec Exp $
-
-EAPI="2"
-
-inherit 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-libs/ccp4-libs
-	sci-libs/mmdb
-	<sci-libs/monomer-db-1
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/$(get_version_component_range 1-2 ${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() {
-	for i in refmac libcheck makecif; do
-		dobin ${i} || die
-	done
-	dosym refmac /usr/bin/refmac5 || die
-	dodoc refmac_keywords.pdf bugs_and_features.pdf || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild
deleted file mode 100644
index bf3ddef06621..000000000000
--- a/sci-chemistry/refmac/refmac-5.5.0110-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.3 2010/12/16 13:56:18 jlec Exp $
-
-EAPI="2"
-
-inherit 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
-	<sci-libs/monomer-db-1
-	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
-}
diff --git a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild b/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
index ef1841ec6098..0d8ccf9a73a8 100644
--- a/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/12/31 16:08:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.5.0110-r2.ebuild,v 1.4 2011/01/10 21:17:34 jlec Exp $
 
 EAPI="2"
 
 inherit 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
+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"
@@ -18,7 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	sci-chemistry/makecif
-	>=sci-libs/ccp4-libs-6.1.3-r5
+	>=sci-libs/ccp4-libs-6.1.3-r7
 	sci-libs/mmdb
 	<sci-libs/monomer-db-1
 	virtual/blas
@@ -46,7 +47,7 @@ src_compile() {
 		VERSION="" \
 		XFFLAGS="-fno-second-underscore" \
 		LLIBCCP="-lccp4f -lccp4c -lccif -lmmdb -lstdc++" \
-		LLIBLAPACK="-llapack -lblas" \
+		LLIBLAPACK="$(pkg-config --libs lapack blas)" \
 		${PN} libcheck || die
 }
 
diff --git a/sci-chemistry/refmac/refmac-5.5.0110.ebuild b/sci-chemistry/refmac/refmac-5.5.0110.ebuild
deleted file mode 100644
index 267b8f492ac5..000000000000
--- a/sci-chemistry/refmac/refmac-5.5.0110.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.ebuild,v 1.4 2010/12/16 13:56:18 jlec Exp $
-
-EAPI="2"
-
-inherit 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-libs/ccp4-libs
-	sci-libs/mmdb
-	<sci-libs/monomer-db-1
-	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() {
-	for i in refmac libcheck makecif; do
-		exeinto /usr/libexec/ccp4/bin/
-		doexe ${i} || die
-		dosym ../libexec/ccp4/bin/${i} /usr/bin/${i}
-	done
-	dosym refmac /usr/bin/refmac5 || die
-	dodoc refmac_keywords.pdf bugs_and_features.pdf || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.6.0093.ebuild b/sci-chemistry/refmac/refmac-5.6.0093.ebuild
deleted file mode 100644
index 523ded34e934..000000000000
--- a/sci-chemistry/refmac/refmac-5.6.0093.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.6.0093.ebuild,v 1.2 2010/12/16 13:56:18 jlec Exp $
-
-EAPI="2"
-
-inherit base 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	sci-libs/ccp4-libs
-	sci-libs/mmdb
-	>sci-libs/monomer-db-1
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/5.6.0092-allow-dynamic-linking.patch
-	)
-
-src_prepare() {
-	base_src_prepare
-	use test && epatch "${FILESDIR}"/5.5-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="$(pkg-config --libs lapack blas)" \
-		|| 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() {
-	for i in refmac libcheck FreeTwin header2matr; do
-		exeinto /usr/libexec/ccp4/bin/
-		doexe ${i} || die
-		dosym ../libexec/ccp4/bin/${i} /usr/bin/${i}
-	done
-	dosym refmac /usr/bin/refmac5 || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.6.0094.ebuild b/sci-chemistry/refmac/refmac-5.6.0094.ebuild
deleted file mode 100644
index ce851c416824..000000000000
--- a/sci-chemistry/refmac/refmac-5.6.0094.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.6.0094.ebuild,v 1.2 2010/12/16 13:56:18 jlec Exp $
-
-EAPI="2"
-
-inherit base 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	sci-libs/ccp4-libs
-	sci-libs/mmdb
-	>sci-libs/monomer-db-1
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-allow-dynamic-linking.patch
-	)
-
-src_prepare() {
-	base_src_prepare
-	use test && epatch "${FILESDIR}"/5.5-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="$(pkg-config --libs lapack blas)" \
-		|| 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() {
-	for i in refmac libcheck FreeTwin header2matr; do
-		exeinto /usr/libexec/ccp4/bin/
-		doexe ${i} || die
-		dosym ../libexec/ccp4/bin/${i} /usr/bin/${i}
-	done
-	dosym refmac /usr/bin/refmac5 || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.6.0096.ebuild b/sci-chemistry/refmac/refmac-5.6.0096.ebuild
deleted file mode 100644
index bdcebe6324f4..000000000000
--- a/sci-chemistry/refmac/refmac-5.6.0096.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.6.0096.ebuild,v 1.1 2010/12/21 07:39:22 jlec Exp $
-
-EAPI="2"
-
-inherit base 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	sci-libs/ccp4-libs
-	sci-libs/mmdb
-	>sci-libs/monomer-db-1
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-allow-dynamic-linking.patch
-	)
-
-src_prepare() {
-	base_src_prepare
-	use test && epatch "${FILESDIR}"/5.5-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="$(pkg-config --libs lapack blas)" \
-		|| 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() {
-	for i in refmac libcheck FreeTwin header2matr; do
-		exeinto /usr/libexec/ccp4/bin/
-		doexe ${i} || die
-		dosym ../libexec/ccp4/bin/${i} /usr/bin/${i}
-	done
-	dosym refmac /usr/bin/refmac5 || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.6.0097.ebuild b/sci-chemistry/refmac/refmac-5.6.0097.ebuild
index 44fd3c1415d2..85865ce92844 100644
--- a/sci-chemistry/refmac/refmac-5.6.0097.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0097.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.6.0097.ebuild,v 1.1 2011/01/04 08:55:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/refmac/refmac-5.6.0097.ebuild,v 1.2 2011/01/10 21:17:34 jlec Exp $
 
 EAPI="2"
 
@@ -9,8 +9,9 @@ inherit base 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
+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"
@@ -19,7 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	sci-libs/ccp4-libs
+	>=sci-libs/ccp4-libs-6.1.3-r7
 	sci-libs/mmdb
 	>sci-libs/monomer-db-1
 	virtual/blas