.

mosflm bump to 7.0.5

6 files changed, 86 insertions, 5 deletions

diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index 447685423..3da477d76 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mosflm-7.0.5 (14 Aug 2009)
+
+  14 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/7.0.5-Makefile.patch, +mosflm-7.0.5.ebuild:
+  version bump
+
 *mosflm-7.0.4-r1 (09 Jul 2009)
 
   09 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
index 82140d207..e9d829dca 100644
--- a/sci-chemistry/mosflm/Manifest
+++ b/sci-chemistry/mosflm/Manifest
@@ -1,6 +1,9 @@
 AUX 7.0.4-Makefile.patch 340 RMD160 52852ec16147e4a427a1021e22726ac815212162 SHA1 25b2d6f1fcb787fd94bb39e2383679e43dd1582e SHA256 95fff32e52116bafb685ad8e73744922dcda66eb258b5a7216ee4cb41642a944
+AUX 7.0.5-Makefile.patch 340 RMD160 52852ec16147e4a427a1021e22726ac815212162 SHA1 25b2d6f1fcb787fd94bb39e2383679e43dd1582e SHA256 95fff32e52116bafb685ad8e73744922dcda66eb258b5a7216ee4cb41642a944
 DIST mosflm704.tgz 3350591 RMD160 313f448ed2d8030ef7732f5ee9134fe025adacbc SHA1 c07fa7752ce4e8d99570f424950f6b8c61a301a5 SHA256 e488b9379ff7c979b69005552bf6eee816f8efaadba85f6a51801283c8a49bed
-EBUILD mosflm-7.0.4-r1.ebuild 1435 RMD160 59fa860d84e1585a9db89f2234771e87fc27c7d2 SHA1 2074644a2a976e085fe765e93458ca4a455bf33b SHA256 f65e39ee958b73f1a8036754ee19fdb233501eecfa0f2374574f258355c1a476
-EBUILD mosflm-7.0.4.ebuild 1441 RMD160 cd832a2fdc7c7923720311831bcfdde4fb990e55 SHA1 7002f22d008de7a9578821febce18c49d297447f SHA256 8a36c8e73b712588c0e3b2401e7e5be81e9e410234e5d5644b52d4c47a0a1836
-MISC ChangeLog 437 RMD160 f7435cb08d462395b82d429c6e462b9dc415b318 SHA1 1b24a3d0360992bfe230e8df8d839b7b707f27f4 SHA256 6abd7eab7d4b676c85a969f87a7da0fc9e8e2fa352e7c8310db17f21f3d4fb41
+DIST mosflm705.tgz 3434787 RMD160 aacf7fceb1376deb99f9ed6eb47729f9577c2303 SHA1 d3639559d6cc8293de8e77873323e2f39398fcd3 SHA256 90a75ae12c545346d202c96cc46d0d79e7b724e9a26867cb65378e4c1f76ab3a
+EBUILD mosflm-7.0.4-r1.ebuild 1434 RMD160 09f99b474537e93e2d91af814e0c6b3e7ccb01da SHA1 52527222606cadc44c219620bcbff6710c8c9940 SHA256 d0abcd177a9def20f79cd4cece9c9f97437f4bd18bf07f853f047fd822bad435
+EBUILD mosflm-7.0.4.ebuild 1440 RMD160 2e889f677520e8dde6e601b613f6938647761f1a SHA1 ef10ef4996ca39d99fbe27af0dec3262b1f6c57b SHA256 f6421270e1c3eeb144429e210a9efde4696791d54e7ca41ed83b37216156e39c
+EBUILD mosflm-7.0.5.ebuild 1464 RMD160 b9c5c4c277e4b0eb6e5e6f7295a2e2969e65a21e SHA1 c77c3612cc729b1b04a997f08caafe178e1aec57 SHA256 9ababd268ff4fd240b6fda86a722715edcced672e08ee88796da667a9f1cffcf
+MISC ChangeLog 592 RMD160 269571134cd53198f52a2cce92becb547a4cccec SHA1 7dc6a3b932d4aaec5d222d0a7dbde89ec7b73b16 SHA256 60fae889e7ba9d03b64d9f146ce5133bc8a399e349cc37e14670e035235ddde0
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-chemistry/mosflm/files/7.0.5-Makefile.patch b/sci-chemistry/mosflm/files/7.0.5-Makefile.patch
new file mode 100644
index 000000000..349940a30
--- /dev/null
+++ b/sci-chemistry/mosflm/files/7.0.5-Makefile.patch
@@ -0,0 +1,12 @@
+--- Makefile	2008-10-17 16:15:30.000000000 +0200
++++ Makefile.new	2009-02-20 21:52:34.000000000 +0100
+@@ -22,7 +22,7 @@
+ CBFLIBS = cbf/lib/libcbf.a
+ JPGLIBS = jpg/libjpeg.a
+ 
+-all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
++all:	$(DPSLIBS) $(CBFLIBS)
+ 	cd mosflm ; make
+ 
+ ##########################################################################
+
diff --git a/sci-chemistry/mosflm/mosflm-7.0.4-r1.ebuild b/sci-chemistry/mosflm/mosflm-7.0.4-r1.ebuild
index 5f93d5d0b..e5d92de04 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.4-r1.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.4-r1.ebuild
@@ -34,7 +34,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}"-Makefile.patch
 }
 
-
 src_compile() {
 	F77=$(tc-getF77)
 
diff --git a/sci-chemistry/mosflm/mosflm-7.0.4.ebuild b/sci-chemistry/mosflm/mosflm-7.0.4.ebuild
index 8dcc46aad..14a1e010f 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.4.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.4.ebuild
@@ -34,7 +34,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}"-Makefile.patch
 }
 
-
 src_compile() {
 	F77=$(tc-getF77)
 
diff --git a/sci-chemistry/mosflm/mosflm-7.0.5.ebuild b/sci-chemistry/mosflm/mosflm-7.0.5.ebuild
new file mode 100644
index 000000000..bde9297af
--- /dev/null
+++ b/sci-chemistry/mosflm/mosflm-7.0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit fortran toolchain-funcs versionator eutils
+
+MY_PV="$(delete_all_version_separators)"
+MY_P="${PN}${MY_PV}"
+
+FORTRAN="g77 gfortran ifc"
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="sci-libs/ccp4-libs"
+DEPEND="${RDEPEND}
+	x11-libs/libxdl_view
+	app-shells/tcsh
+	media-libs/jpeg"
+# 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:/usr/$(get_libdir)/libcbf.a:g" \
+	sed -e "s:../jpg/libjpeg.a:/usr/$(get_libdir)/libjpeg.a:g" \
+		-i ${PN}/Makefile || die
+
+	epatch "${FILESDIR}/${PV}"-Makefile.patch
+}
+
+src_compile() {
+	emake \
+		MOSHOME=`pwd` \
+		DPS=`pwd` \
+		FC=${FORTRANC} \
+		FLINK=${FORTRANC} \
+		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}" \
+		CFLAGS="${CFLAGS}" \
+		MOSCFLAGS="${CFLAGS}" \
+		LFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin bin/ipmosflm || die
+}