refmac bump and cleanup

12 files changed, 7 insertions, 502 deletions

diff --git a/sci-chemistry/refmac/Manifest b/sci-chemistry/refmac/Manifest
index 50f607153..33c901b06 100644
--- a/sci-chemistry/refmac/Manifest
+++ b/sci-chemistry/refmac/Manifest
@@ -7,26 +7,11 @@ AUX 5.6.0033-allow-dynamic-linking.patch 1178 RMD160 8222b326a7f2d80d1d6202f8761
 AUX test.log.patch 1146 RMD160 0ea6293e8ecde3b9ae12658a523e3c30a5c9f01b SHA1 d026fdea6a487754f7e48ec24bcf4851a613b6d1 SHA256 d2c2a09f44e525dc255bc2ac93ca4194b24ca1fe58c31f0e3b5c32e439dfe2e7
 AUX twin.inp 91 RMD160 0848ddf8ebdb6e0dd327f9d01d89f86007ac1859 SHA1 bdef4076010499cae0d0c886138e2230b835481a SHA256 172706f6ef1b7a85636a176d18e73611406f29ca8d84f1d82a6120daa8f956e6
 DIST refmac5.6_source_v5.6.0041.tar.gz 1487802 RMD160 575b0152c2c8c941f46acd8bf30ebf2ce7bf1f23 SHA1 6e1b68159597167b5167966ebf80a68064bcb90b SHA256 e8074bb2e86d9b9af698939acce6d81ea5a2ae7bb895585574e4b77787d39e8e
-DIST refmac_5.5.0092.tar.gz 1296668 RMD160 1f48cb3d2cfc3b7e91bcde5caa212813d63b20be SHA1 35497b7986ad4861518077f5e06937851cbeb4ff SHA256 6aabf0af882605a2dc73b29f42e8dee34be0888f667befb7342576b2df84623d
-DIST refmac_5.5.0095.tar.gz 1297509 RMD160 bbf3f3cf43c6aaba08864d7e76a795c0b22395d4 SHA1 06bb2c0567e09cc04a5443f033b9c5b7d50f9515 SHA256 1e781566c320e63c3769e59e7a14ea8c7da2f81d6d88ec3a8cc196f14da8d694
-DIST refmac_5.5.0097.tar.gz 1297620 RMD160 e3e5cfe977d677f5efd0c5419d638d0fe3c20334 SHA1 873b5adbacde2fb1912d37a519acc4860c14e68a SHA256 5219949741d422244fca19d01ff675786deb08c6699f2c0e53008170ccbfcabd
-DIST refmac_5.5.0098.tar.gz 1298071 RMD160 5a7d2937727ae83327572bea5d35cca93e4fdfcc SHA1 c27c6cb0cce70ea8994b26fc26d60bb421afa84b SHA256 bd1ea457a6f6c79e56270dd128785d05403fb78263f0ec225c4a8c86f4e002c9
-DIST refmac_5.5.0099.tar.gz 1298129 RMD160 2a5820d62f590a45a6c3ca66b3691b7fb1b66bc3 SHA1 78d798fe4db63d5eb4748c905832a59ef75ddea0 SHA256 c680fa40a1417efa9f6725f45c73b7bada09a3bcf5d24993369ebccbaeea90a6
-DIST refmac_5.5.0100.tar.gz 1298143 RMD160 751f4c3f9730b4b12536f2c8f927d25138db47e2 SHA1 d87c9c5136da2b03b06a9178b6b14dbdec883217 SHA256 086301efe23346c7f9319d69095f5af4c2d34c2d838597dd74d73293f3732aef
-DIST refmac_5.5.0101.tar.gz 1298239 RMD160 c1181ac8038d83ae03cf06e8f19ed8e4107bd5be SHA1 5cbb73121773d0bbe0b980c5dea443914ef1d3d6 SHA256 65d16edc81fed7abaf139a91d3e605bd8d82ae8fbc5c9f2374be2fedd50b92be
 DIST refmac_5.5.0102.tar.gz 1298285 RMD160 0a33e10ad498f9d516aa174ceddf8f860ec1711f SHA1 b6291eb524b419434cd851d8b3b6e9ef6845695f SHA256 435614b4aa946fa4e982237d76f814ac6459e5de7db003009563b8d6a2e3aa9f
+DIST refmac_5.5.0104.tar.gz 1298444 RMD160 b4c679194ed8de2041d991cf727df6214cb46c52 SHA1 e77134088683641a3e4c7997e3015040a72f8fbd SHA256 87e621722d69081daea334a8a84087830588c99d97e6e76b495f8bfb80d0da2c
 DIST test-framework.tar.gz 130939944 RMD160 ab9dbb0ad1b86dbedf3633742b252c2cc8aa4541 SHA1 2d5f9857fd2cfcd40e79e4ab48f3cd7d2ced1117 SHA256 8b56ade3423bc4c04495241b972d7591a980b32bf09d3c296db5fdd2f5db5229
-EBUILD refmac-5.5.0092.ebuild 1045 RMD160 ab5645566baf7d0dbac1522258377130e837d2a7 SHA1 6dacfd7d27edf0121344e255f5bda678b5701f69 SHA256 dbb5111b9ede779c6345c44400510a0d12f655d89eb0208f9e2ddc2304315c70
-EBUILD refmac-5.5.0095.ebuild 1011 RMD160 c129e2b3178a6b84428233940befe445fd86a4d6 SHA1 9e99428fadbb4a28be7a7208dce74d82c13ed063 SHA256 6530e9486e2769a9f0b9c139a0e000c5661e9b64582cdbb2b7798ce001367aae
-EBUILD refmac-5.5.0097.ebuild 1033 RMD160 80c2fc2f65ac928413aa1b6de16bd1d708562272 SHA1 188fcb5b2847abe298b6c607b619fe68db93ad15 SHA256 669c5de8be79e006c30b88789e2711eb71e54da4cfb411fb9b284139c110043c
-EBUILD refmac-5.5.0098-r1.ebuild 1373 RMD160 970562c9a2caf4f7fe789dd4fcf26baaedaed8d7 SHA1 2909add93100f3b639ba05731b4db2d7c227cd55 SHA256 4c4198e2263f3d9f44045ca4514788c04de6231e74d65df4c6654462a107959f
-EBUILD refmac-5.5.0098.ebuild 1080 RMD160 7829b2a9db340fcf141d450bb5ac7c69669374b4 SHA1 978647cca646c89d5f4b6c863464265b34534fc0 SHA256 8c45013ac7949cc2f3f3ed949abecc3cdaf06629b01d5b4da30ba375899451de
-EBUILD refmac-5.5.0099-r1.ebuild 1400 RMD160 14e0c50c2b37fc7d64e48123f3738a102c39bbe6 SHA1 2dfd3c824dedc83465673e0eb6ea92b113fe3e3a SHA256 b9d841e329979a968864774d0f481893c36f5c46807935c3f73818f0c89b6da5
-EBUILD refmac-5.5.0099.ebuild 1080 RMD160 7829b2a9db340fcf141d450bb5ac7c69669374b4 SHA1 978647cca646c89d5f4b6c863464265b34534fc0 SHA256 8c45013ac7949cc2f3f3ed949abecc3cdaf06629b01d5b4da30ba375899451de
-EBUILD refmac-5.5.0100-r1.ebuild 1520 RMD160 a0b5b9345d1b38c60359b1fb9565f66c19d138eb SHA1 b242ddd0e5c488d67ce1ba87948ff4d22611d12b SHA256 5de8819428d31b121fead099df475e4eb8513ca282b2c3d9d8657d03b0f97d58
-EBUILD refmac-5.5.0100.ebuild 1400 RMD160 14e0c50c2b37fc7d64e48123f3738a102c39bbe6 SHA1 2dfd3c824dedc83465673e0eb6ea92b113fe3e3a SHA256 b9d841e329979a968864774d0f481893c36f5c46807935c3f73818f0c89b6da5
-EBUILD refmac-5.5.0101.ebuild 1520 RMD160 a0b5b9345d1b38c60359b1fb9565f66c19d138eb SHA1 b242ddd0e5c488d67ce1ba87948ff4d22611d12b SHA256 5de8819428d31b121fead099df475e4eb8513ca282b2c3d9d8657d03b0f97d58
 EBUILD refmac-5.5.0102.ebuild 1569 RMD160 a8bb80cb3cfaef17e83fcd23a348d145783c7021 SHA1 847ea6af6c6144fa23112d60c9bb2ece077dd3e7 SHA256 5307b738af874fb6f041b542ab1b505ef706fff0b6c405b67f9a99f7874bf230
+EBUILD refmac-5.5.0104.ebuild 1569 RMD160 a8bb80cb3cfaef17e83fcd23a348d145783c7021 SHA1 847ea6af6c6144fa23112d60c9bb2ece077dd3e7 SHA256 5307b738af874fb6f041b542ab1b505ef706fff0b6c405b67f9a99f7874bf230
 EBUILD refmac-5.6.0041.ebuild 1550 RMD160 ff952f4817594c90ae3df23a7c7ca1f5f180a32f SHA1 5e1e60b01e2399e1de3989b135dca722258d251d SHA256 10913143ddeeaff69d3cdc11b602a7ecb95ca77ef231b23152f501bf6dd72ade
 MISC ChangeLog 6848 RMD160 f7fb30e4d11c5fc70407aeba5d1824ab594d88d4 SHA1 9cb68e238a46574a3a486e393690f90cea15cafc SHA256 4f5e7be5c0c746bdafe75ca2c242063cc7f5dcb23af076fc3b6db41656e2e09e
 MISC metadata.xml 314 RMD160 d8922635160b6047732051715291e8553b513bba SHA1 b53fc6fb6cf908093794b876e729606c00351937 SHA256 50a519ddbcef4ad4f76175df36849a076d20adbb6340fdba292175b70c0d9719
diff --git a/sci-chemistry/refmac/refmac-5.5.0092.ebuild b/sci-chemistry/refmac/refmac-5.5.0092.ebuild
deleted file mode 100644
index d53653bdc..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0092.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fortran toolchain-funcs
-
-DESCRIPTION="Macromolecular crystallographic refinement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
-SRC_URI="${HOMEPAGE}data/refmac_stable/refmac_${PV}.tar.gz"
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-allow-dynamic-linking.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_install() {
-	for i in refmac libcheck makecif; do
-		dobin ${i} || die
-	done
-	dosym refmac /usr/bin/refmac5 || die
-	dodoc refmac_keywords.pdf || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.5.0095.ebuild b/sci-chemistry/refmac/refmac-5.5.0095.ebuild
deleted file mode 100644
index 0c220e3fc..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0095.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit fortran base toolchain-funcs
-
-DESCRIPTION="Macromolecular crystallographic refinement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
-SRC_URI="${HOMEPAGE}data/refmac_stable/refmac_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-allow-dynamic-linking.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_install() {
-	for i in refmac libcheck makecif; do
-		dobin ${i} || die
-	done
-	dosym refmac /usr/bin/refmac5 || die
-	dodoc refmac_keywords.pdf || die
-}
diff --git a/sci-chemistry/refmac/refmac-5.5.0097.ebuild b/sci-chemistry/refmac/refmac-5.5.0097.ebuild
deleted file mode 100644
index 64c1df9a3..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0097.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit fortran base toolchain-funcs
-
-DESCRIPTION="Macromolecular crystallographic refinement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
-SRC_URI="${HOMEPAGE}data/refmac_stable/refmac_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-allow-dynamic-linking.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_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.0098-r1.ebuild b/sci-chemistry/refmac/refmac-5.5.0098-r1.ebuild
deleted file mode 100644
index c35d65666..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0098-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-IUSE="test"
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-allow-dynamic-linking.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() {
-	export PATH="${S}:${PATH}"
-	export CCP4_TEST="${WORKDIR}"/test-framework
-	cd ${CCP4_TEST}
-	sed 's:refmac5:refmac:g' -i refmac5/test_refmac5.py
-	python refmac5/test_refmac5.py || die "damn"
-}
-
-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.0098.ebuild b/sci-chemistry/refmac/refmac-5.5.0098.ebuild
deleted file mode 100644
index f66da7081..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0098.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-allow-dynamic-linking.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_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.0099-r1.ebuild b/sci-chemistry/refmac/refmac-5.5.0099-r1.ebuild
deleted file mode 100644
index 1914be15c..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0099-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-IUSE="test"
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-allow-dynamic-linking.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 "Staring tests ..."
-	export PATH="${S}:${PATH}"
-	export CCP4_TEST="${WORKDIR}"/test-framework
-	cd ${CCP4_TEST}
-	sed 's:refmac5:refmac:g' -i refmac5/test_refmac5.py
-	python refmac5/test_refmac5.py || die "damn"
-}
-
-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.0099.ebuild b/sci-chemistry/refmac/refmac-5.5.0099.ebuild
deleted file mode 100644
index f66da7081..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0099.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-allow-dynamic-linking.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_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.0100.ebuild b/sci-chemistry/refmac/refmac-5.5.0100.ebuild
deleted file mode 100644
index 1914be15c..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0100.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-IUSE="test"
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/$(get_version_component_range 1-2 ${PV})-allow-dynamic-linking.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 "Staring tests ..."
-	export PATH="${S}:${PATH}"
-	export CCP4_TEST="${WORKDIR}"/test-framework
-	cd ${CCP4_TEST}
-	sed 's:refmac5:refmac:g' -i refmac5/test_refmac5.py
-	python refmac5/test_refmac5.py || die "damn"
-}
-
-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.0101.ebuild b/sci-chemistry/refmac/refmac-5.5.0101.ebuild
deleted file mode 100644
index 122a1af43..000000000
--- a/sci-chemistry/refmac/refmac-5.5.0101.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-IUSE="test"
-RESTRICT="mirror"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	sci-libs/ccp4-libs"
-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}"/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 "Staring tests ..."
-	export PATH="${S}:${PATH}"
-	export CCP4_TEST="${WORKDIR}"/test-framework
-	export CCP4_SCR="${T}"
-	cd ${CCP4_TEST}
-	sed 's:refmac5:refmac:g' -i refmac5/test_refmac5.py
-	python refmac5/test_refmac5.py || die "damn"
-}
-
-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.0100-r1.ebuild b/sci-chemistry/refmac/refmac-5.5.0104.ebuild
index 122a1af43..68b90a568 100644
--- a/sci-chemistry/refmac/refmac-5.5.0100-r1.ebuild
+++ b/sci-chemistry/refmac/refmac-5.5.0104.ebuild
@@ -48,13 +48,13 @@ src_compile() {
 }
 
 src_test() {
-	einfo "Staring tests ..."
-	export PATH="${S}:${PATH}"
+	einfo "Starting tests ..."
+	export PATH="${WORKDIR}/test-framework/scripts:${S}:${PATH}"
 	export CCP4_TEST="${WORKDIR}"/test-framework
 	export CCP4_SCR="${T}"
-	cd ${CCP4_TEST}
-	sed 's:refmac5:refmac:g' -i refmac5/test_refmac5.py
-	python refmac5/test_refmac5.py || die "damn"
+	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() {
diff --git a/sci-chemistry/refmac/refmac-5.6.0041.ebuild b/sci-chemistry/refmac/refmac-5.6.0041.ebuild
index 2c868673a..82eef60ea 100644
--- a/sci-chemistry/refmac/refmac-5.6.0041.ebuild
+++ b/sci-chemistry/refmac/refmac-5.6.0041.ebuild
@@ -12,7 +12,6 @@ HOMEPAGE="http://www.ysbl.york.ac.uk/~garib/refmac/"
 SRC_URI="${HOMEPAGE}data/refmac_experimental/${PN}${MY_PV}_source_v${PV}.tar.gz
 	test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )"
 
-
 SLOT="0"
 LICENSE="ccp4"
 KEYWORDS="~amd64 ~x86"
@@ -61,4 +60,3 @@ src_install() {
 	dosym refmac /usr/bin/refmac5 || die
 #	dodoc refmac_keywords.pdf || die
 }
-