Version Bump, #349409

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

4 files changed, 89 insertions, 12 deletions

diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index efcc5086ed81..791e4d640c42 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/mosflm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.13 2011/07/19 19:45:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.14 2011/09/07 15:21:32 jlec Exp $
+
+*mosflm-7.0.7 (07 Sep 2011)
+
+  07 Sep 2011; Justin Lecher <jlec@gentoo.org> +mosflm-7.0.7.ebuild,
+  metadata.xml:
+  Version Bump, #349409
 
   19 Jul 2011; Markus Meier <maekke@gentoo.org> mosflm-7.0.6-r2.ebuild:
   x86 stable, bug #352112
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
index fc28531d11b9..7ba804253cca 100644
--- a/sci-chemistry/mosflm/Manifest
+++ b/sci-chemistry/mosflm/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 7.0.6-Makefile.patch 352 RMD160 69fd182574615b90bbeb1b633885006051e81683 SHA1 f2964f48bb4bf89880fe47f0af1bff090c59092e SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7
 AUX 7.0.6-impl-dec.patch 949 RMD160 e2dc1b8236a1ac72836af911d19a1ce5e1d048bf SHA1 5f51546471f5ab3530f56d0e7bbdeb6a977f91be SHA256 7c39b9d37ea4ea01668dd16ccf1b31e288bca37eaef497c5b0c725d42ebeb8b2
 AUX 7.0.6-parallel.patch 654 RMD160 f28cdb670c3ecfcc4ec194dd44136182fbf9cf7f SHA1 bf6742b58d6e9ce67e76f38e81aeb64f88fae729 SHA256 c821e031a039502364c4ae151fd64886a6a33153e5c746d55838a99050d18c60
 DIST mosflm706.tgz 3468405 RMD160 fb0b7e51ed9845d4d17aa804cb1424e5aa0f24b8 SHA1 f9a771c3991c7ad3125a7e39d5c59b3049784f4f SHA256 5e26a49fd37749a14e7a1d1e867c1c0333db3bbcc01376fb7a516d4a67b1ebb0
+DIST mosflm707.tgz 3401235 RMD160 0301c22df9f0229f8ee5ac5b87c1353a5608fa94 SHA1 6ac29381bbea57ea370d72b31f36660332316d07 SHA256 fb14a02834929423569a23a04800de62ed1da2a02966958b79c157a71b9b6118
 EBUILD mosflm-7.0.6-r2.ebuild 1779 RMD160 2af1c2870a86d5e306ec30545355c736816a7aa6 SHA1 a99997333e1209e48dcfa5fc16b245a4bcce5186 SHA256 1f9413660dda2ff593c13e5edf131a1d81c911b93819edb67472301054274d0f
-MISC ChangeLog 1813 RMD160 63cb62b8276dc3997de845512065c25a136acbf9 SHA1 15115b86bab47ea4c796d549e8ea769bbd44d697 SHA256 4f9de6060d3036e8c62c1fdc523166cc7a6cc10a42f574f5f952aef8847a49eb
-MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
+EBUILD mosflm-7.0.7.ebuild 1764 RMD160 7b8fff5a5841aa8b894233d8e9d15b212c69d148 SHA1 e6abc3d4a04deb86ea07dbcbbad2014962e01a6c SHA256 92449bc206253b5ae3ce06f261f225fb479a188c3f21f36bf120fb776c8fd7c1
+MISC ChangeLog 1950 RMD160 477c651abadd4c42b026f05a3993a10f61997ca3 SHA1 6e8d781a200a5b0f13edb25e01604afdcf7f9710 SHA256 be19a83d6e99553706d1aae1529a64889d850a423ba2793d7f318a81bb2c11b6
+MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4l3wUACgkQkKaRLQcq0GJgtwCeLWiLyNqOPwSlzj0qVKpOSIT5
-h18AnR63OGmF3WCjZ7gKjCRpoqfWtIqU
-=IAVM
+iEYEAREKAAYFAk5ni/wACgkQgAnW8HDreRY4gACfVSp19J7M3ZbgkAT8JI4sDM7I
+rdYAoLgNfSm2oB72w1Xrrwnz0wuauwOi
+=ceC/
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mosflm/metadata.xml b/sci-chemistry/mosflm/metadata.xml
index c6856dc7f2cf..210ad0db014c 100644
--- a/sci-chemistry/mosflm/metadata.xml
+++ b/sci-chemistry/mosflm/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/mosflm/mosflm-7.0.7.ebuild b/sci-chemistry/mosflm/mosflm-7.0.7.ebuild
new file mode 100644
index 000000000000..ac34106262ff
--- /dev/null
+++ b/sci-chemistry/mosflm/mosflm-7.0.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.7.ebuild,v 1.1 2011/09/07 15:21:32 jlec Exp $
+
+EAPI=4
+
+inherit eutils fortran-2 toolchain-funcs versionator
+
+MY_PV="$(delete_all_version_separators)"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="A program for integrating single crystal diffraction data from area detectors"
+HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/"
+SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	virtual/fortran
+
+	app-shells/tcsh
+	virtual/jpeg
+	sci-libs/ccp4-libs
+	sys-libs/ncurses
+	x11-libs/libxdl_view"
+DEPEND="${RDEPEND}"
+# Needs older version as current, perhaps we can fix that next release
+#	sci-libs/cbflib
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+# See DEPEND
+#	sed -e "s:../cbf/lib/libcbf.a:${EPREFIX}/usr/$(get_libdir)/libcbf.a:g" \
+	sed -e "s:../jpg/libjpeg.a:-ljpeg:g" \
+		-i ${PN}/Makefile || die
+
+	epatch \
+		"${FILESDIR}"/7.0.6-Makefile.patch \
+		"${FILESDIR}"/7.0.6-parallel.patch \
+		"${FILESDIR}"/7.0.6-impl-dec.patch
+	rm test.f || die
+}
+
+src_compile() {
+	emake \
+		MOSHOME="${S}" \
+		DPS="${S}" \
+		FC=$(tc-getFC) \
+		FLINK=$(tc-getFC) \
+		CC=$(tc-getCC) \
+		AR_FLAGS=vru \
+		MOSLIBS='-lccp4f -lccp4c -lxdl_view -lcurses -lXt -lmmdb -lccif -lstdc++' \
+		MCFLAGS="-O0 -fno-second-underscore" \
+		MOSFLAGS="${FFLAGS} -fno-second-underscore" \
+		FFLAGS="${FFLAGS:- -O2} -fno-second-underscore" \
+		CFLAGS="${CFLAGS}" \
+		MOSCFLAGS="${CFLAGS}" \
+		LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/libexec/ccp4/bin/
+	doexe bin/ipmosflm
+	dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN}
+}