more molrep fixes

3 files changed, 14 insertions, 47 deletions

diff --git a/sci-chemistry/molrep/Manifest b/sci-chemistry/molrep/Manifest
index 6e5fc17c8..a75a1962c 100644
--- a/sci-chemistry/molrep/Manifest
+++ b/sci-chemistry/molrep/Manifest
@@ -1,7 +1,6 @@
 AUX 10.2.24-respect-FLAGS.patchbak 1729 RMD160 ec37f01a8909a6c1f2ba643aa3e88daa76865226 SHA1 80c01a0b7982fdd62a907309ccfdfa51037136a1 SHA256 cf84b22ba3a48cccb039f53fcd9725952ac6b322919d65230bf60789a16bf40b
 AUX 10.2.27-respect-FLAGS.patch 2376 RMD160 d11071cc402375b2376b6202f960b6f909d1b8df SHA1 7c1ea85188776bbf1054ef18efd55c04343ba187 SHA256 30b55e61663e217c1ee5ef12fe9954046016e303f77f9ff52caa6959c3e3eaa5
 DIST molrep-10.2.27.tar.gz 3595088 RMD160 6e36b6bf992fb306b67de6e483a3487c5fc21da3 SHA1 04d1ecdbd62498703d3c9f3a7d31659074f75c66 SHA256 85c15c827936540134ab65ea9de5a13faa789edeea0f39f65ec1b319ca43c42a
-EBUILD molrep-10.2.27.ebuild 822 RMD160 0bd3bcb55f0578900a83d269938937f1ed0f2611 SHA1 acf5a4d4a32f00376956fa727e6861b2cbff1be8 SHA256 b9fdb3706601a1e7704d629bc402b94c4f4cbe1b26eb0eea34cca0bdf980cd94
+EBUILD molrep-10.2.27.ebuild 914 RMD160 807cbb03e2715c0586c3b3cbd0bb684f2e6b1b52 SHA1 8487990cad705da15aa011460ec65a670c585b46 SHA256 1b65f8e44e4e526b55ef2a44e2607413bc90cd2f5effab34f0cbbcd715a1de5f
 MISC ChangeLog 346 RMD160 3e978bdeb6a153b90bb6b9c7ed33c2b5023fc676 SHA1 e5e31d79f7c2dca07036810854207e865e4f5c10 SHA256 58b6d649935156857008b55913b90471ed85e3fafc92ad864bb991b5bfc48752
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
-MISC molrep-10.2.27.ebuild.save 912 RMD160 4d4f86f76e83bf25a581370cb7830bc51f710585 SHA1 70b9afca2595f65bd80e722d758df051c17e1780 SHA256 47eec3c49ca62c5485afd7b65c86cef1a8c1658151fc27ab4af54678201abf8d
diff --git a/sci-chemistry/molrep/molrep-10.2.27.ebuild b/sci-chemistry/molrep/molrep-10.2.27.ebuild
index 84b63709c..891c78999 100644
--- a/sci-chemistry/molrep/molrep-10.2.27.ebuild
+++ b/sci-chemistry/molrep/molrep-10.2.27.ebuild
@@ -34,3 +34,16 @@ src_compile() {
 		MR_LIBRARY="-lccp4f -lccp4c -lmmdb -lccif -L/usr/lib64 -llapack -lstdc++ -lm" \
 	|| die
 }
+
+src_test() {
+	cd molrep_check && \
+		em.bat && \
+		mr.bat || \
+		die "test failed"
+}
+
+src_install() {
+	dobin bin/${PN} || die
+
+	dodoc readme doc/${PN}.rtf || die
+}
diff --git a/sci-chemistry/molrep/molrep-10.2.27.ebuild.save b/sci-chemistry/molrep/molrep-10.2.27.ebuild.save
deleted file mode 100644
index 9cad516c4..000000000
--- a/sci-chemistry/molrep/molrep-10.2.27.ebuild.save
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="molecular replacement program"
-HOMEPAGE="http://www.ysbl.york.ac.uk/~alexei/molrep.html"
-#SRC_URI="http://www.ysbl.york.ac.uk/~alexei/downloads/${PN}_f90.tar.gz"
-SRC_URI="http://www.ysbl.york.ac.uk/~alexei/downloads/${P}.tar.gz"
-
-LICENSE="ccp4"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-RDEPEND=">=sci-libs/ccp4-libs-6.1.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-respect-FLAGS.patch
-}
-
-src_compile() {
-	cd "${S}"/src
-	emake \
-		MR_FORT=$(tc-getFC) \
-		FFLAGS="${FFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		MR_LIBRARY="-lccp4f -lccp4c -lmmdb -lccif -L/usr/lib64 -llapack -lstdc++ -lm" \
-	|| die
-}
-
-src_install() {
-	dobin bin/${PN} || die
-
-	insinto /usr/share/ccp4/${PN}
-	doins data/* || die
-	
-}