sci-chemistry/mosflm: Version Bump, drop old

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

5 files changed, 124 insertions, 90 deletions

diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index aba96cfc2954..3674ece42625 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/mosflm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.16 2012/06/19 06:21:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.17 2012/07/05 13:50:48 jlec Exp $
+
+*mosflm-7.0.8 (05 Jul 2012)
+
+  05 Jul 2012; Justin Lecher <jlec@gentoo.org> +files/7.0.8-parallel.patch,
+  -mosflm-7.0.7.ebuild, -mosflm-7.0.7-r1.ebuild, +mosflm-7.0.8.ebuild:
+  Version Bump, drop old
 
 *mosflm-7.0.7-r2 (19 Jun 2012)
 
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
index 80d7ed3bf086..f667aa4ffd80 100644
--- a/sci-chemistry/mosflm/Manifest
+++ b/sci-chemistry/mosflm/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-AUX 7.0.7-parallel.patch 2482 RMD160 2aa7e34342fa46b7d7a55726f06e30b156d846a1 SHA1 3db79b77ba765eebcc2f1aa8b69d4ae3b39413c7 SHA256 7bb2636833a5332472c5c60a0736e5c75cd04691909784a5e363da64c3e254bb
-AUX mosflm-7.0.7-buffer-overflow.patch 492 RMD160 d4ae6366e01cee8730c7a097be30b52fdbcebd82 SHA1 0b6a799df54465c5f9d1b091ecda83564a67074b SHA256 8938c13a53bb59d0703f35ce8586257fb1427c2951bd2e800c6792fc4bdc5379
-AUX mosflm-7.0.7-impl-dec.patch 903 RMD160 3e1bd85edd96112ed26ee48f91793ad4e9c06647 SHA1 b9daeab6c472007dc0a84d49f61ff311eec4c56c SHA256 446d5eec4cae43ad08c819c6fc35f035436b0fc0a8dd70d20382eef937c6c343
-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 1778 RMD160 60cded72308c2158ac369cbcbed817a7baf99aaf SHA1 29729ca74b23d2de8b20dac9aeea56271ad476b7 SHA256 269b94ae627bc4d053a60ab6915273f76338d3187cfbd7f71ae6521df0646e84
-EBUILD mosflm-7.0.7-r1.ebuild 1703 RMD160 ed97fe6cf13ca41c6db3b4062156322f2bfcf69c SHA1 9a73cbb5c1c5b3fb596db020f02b078426987ddf SHA256 441ea84a02997badf6eb42ca1765950a9c0fa2b45f8fb8f65669bfe8563c8865
-EBUILD mosflm-7.0.7-r2.ebuild 1780 RMD160 2920352b88158c441245ae83417a91b14ec4e92b SHA1 8e8ecfc4922795ccc0e65cf123613d99976210b1 SHA256 1c07191058fa3c8dfbb50f541a208463968b5fda3bddf19daba5998112fa0811
-EBUILD mosflm-7.0.7.ebuild 1764 RMD160 7b8fff5a5841aa8b894233d8e9d15b212c69d148 SHA1 e6abc3d4a04deb86ea07dbcbbad2014962e01a6c SHA256 92449bc206253b5ae3ce06f261f225fb479a188c3f21f36bf120fb776c8fd7c1
-MISC ChangeLog 2424 RMD160 15fa404f4678341938bb84cd13809d1463db8c5a SHA1 f894e6f8b65c7062ded46a598559ee926d1cc89f SHA256 3ca4fe27c7131439a51a3ca9099fa781069af1fe9a1bf7a5de7aed6235c9e543
-MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
+AUX 7.0.6-Makefile.patch 352 SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7 SHA512 d28eb7998bd7d1eb60e83410c08569eeeb16f312b490941a6a93e7b18d0b762f1fc5e6cfbc06a816be4ee5d5efd186676184fde76d195a2deed326644f55c39a WHIRLPOOL 6dd6b6dea6a0d46266db5eee1f6e9cd9999173f733d03fcf5ed5ccb371479889f92bec3e6beedbf64c95cfde9adc9c9f45250fc2222568d4587a01c13efa73dc
+AUX 7.0.6-impl-dec.patch 949 SHA256 7c39b9d37ea4ea01668dd16ccf1b31e288bca37eaef497c5b0c725d42ebeb8b2 SHA512 3ba7fea77f5ec58c6c1d4f80b7d3aa4531f3bce3cbd86063df4317e86c49dddcf1148b74d05913e581531983b34b3bbcb6967edfec7b5a018d5f552c91ae1f7f WHIRLPOOL da08476b2544fa46f75727366750d1ff9d4f71d2de0bd6dd413fdb6ed286bf9c5b61ed321f4eb142b866acaa9c9367ad9f2127fe14735f210de187072b18f0f6
+AUX 7.0.6-parallel.patch 654 SHA256 c821e031a039502364c4ae151fd64886a6a33153e5c746d55838a99050d18c60 SHA512 f3a3bf25f92ec66b41ba872b129fabcff817afb8548da27c6a5b4958808f9531b45470adaf8b9cf154d817afe564f8846ca91b7b7228f27d0fbab7b00cbfe07a WHIRLPOOL e5d08c67fe31685a40b9191ea046bc964a8fb80f6bd450dc5aa581732fb74e860723f04c0ee182501a65f2f6192d99dfa3345c715dcadb9627dc8ff91ff0c6b7
+AUX 7.0.7-parallel.patch 2482 SHA256 7bb2636833a5332472c5c60a0736e5c75cd04691909784a5e363da64c3e254bb SHA512 c40fb0d24e6fade971af87aa7ee71df22a5edef348bc85f0be559211c0ff59d70cc0c91368dd684cbfb294a0ebb4a5413134b089a2b16b5bc4e74fd3061f1b6d WHIRLPOOL 2a7656df4af061acc4a50f257bfe1f442a2b36bd9b5c949e0b546161f697ca0956938c35dddfbf2b14fe959d07f1944ac4b1ff13f0f54e2c416d6832e1b3005f
+AUX 7.0.8-parallel.patch 2370 SHA256 35bc7ed6987b88a06f8f5562a19741f7c4bcab8ead8e623b876d814d6a97d4b2 SHA512 bdc3e3dc3e414adf7b427d1ad243f627d3723e2f3c78fbfa7f102498dfe364dac25aca4c63ef4e1c17ca8a7dbb817133e72cf367b1d81d6ec87d199beba72cc5 WHIRLPOOL e549f30453a7ab86fbed97f24d699523675aafea2f790d677552a894c853538cd749b7c9f5907c212b323570f989a7abd8259bd9b1f3a38d98d547643d9c5420
+AUX mosflm-7.0.7-buffer-overflow.patch 492 SHA256 8938c13a53bb59d0703f35ce8586257fb1427c2951bd2e800c6792fc4bdc5379 SHA512 955fb0cd71839841fe7e9cd5757f979641e3bd155a08d819ba9b090a7476b759606cea8ef38128cff0f5c8c6ee8134f4cdbdb3c0debf4faad18215bf6616fb44 WHIRLPOOL fbd6f5bb5c42c9f49bdc190079f868a948258b138a2b2ba07e5bb4db35d93e9a9430c51dc4eca9c15ce2c42cb2d957ace41fa3be139cae64c1693cb61113bd4a
+AUX mosflm-7.0.7-impl-dec.patch 903 SHA256 446d5eec4cae43ad08c819c6fc35f035436b0fc0a8dd70d20382eef937c6c343 SHA512 a6eb163e6d02a77279bc9a5b314eb15352e0b80848b38b984a5e6c94868ed0c6182d9cf77cc5349aca5fdb25e5432c66703ae589dab4f56b0145f47f542fe4ee WHIRLPOOL 05425de7340526172831fbf1b7efaa4a449316423205a8e7aa93492b6ac6a3b3c3472be976092638b96310d79bcc33fc6ab8f93910beca626aa141ff8b2592d6
+DIST mosflm706.tgz 3468405 SHA256 5e26a49fd37749a14e7a1d1e867c1c0333db3bbcc01376fb7a516d4a67b1ebb0 SHA512 8f2568a3dffd5f94a13a518a3b1d65e39474a223ae5aadae090e31bf844d11a3f05e007d7369d5ef3c31d2b56e51c0784fa499db7345d11eb84d7e0fae5ad4e4 WHIRLPOOL afa9b892b8e4c257a80f5d1cc12e2b84df7cba064e997fd5a5f879c7b7fb9b4c9fadb5d15c2f63916e5ec8745b596c0ffc6fcda31a4f911d98427f9860ae556d
+DIST mosflm707.tgz 3401235 SHA256 fb14a02834929423569a23a04800de62ed1da2a02966958b79c157a71b9b6118 SHA512 d9417b76d6ced68ca13382fc4c4300fd8b534e39e785a0e418780d7dc0aa85a65b6d9efef1e94e3259f938d4cfdeec1dd8d42feace36afc6bef0d2dcce69d8a1 WHIRLPOOL e2df963a79408f50e4d9011c1b6bc99465e2d58ac4f9611a1b5d2bd911a2d78fee217e952bfa4966c5bf84e662dc8ed4e74cdd26c6fddc48a9cb65e2899ec4ab
+DIST mosflm708.tgz 3498880 SHA256 6d0d13bae806eea2a0e260d14a1f02a1d5949a9ba8744813b3ee4783f946deef SHA512 09a5088ad4fb3dc3d83741597e014b924643f2482e241300602914739910154384306e6765cbd31faea952e85fb809ae187121fae11108a2ca4174ecdf571975 WHIRLPOOL 585f97885728cc49c69172994279288041d6a17997c861143990f512d1e864af45d78f53e599e0b516479c7c2f47cd1885f6e80440209ef33ed5b7a75e789798
+EBUILD mosflm-7.0.6-r2.ebuild 1778 SHA256 269b94ae627bc4d053a60ab6915273f76338d3187cfbd7f71ae6521df0646e84 SHA512 d1d44ba30f364e9a319b10fe4b51bb5c180c0bf597bbb88d08eab477ae541d40ead046789a350419bf2d1d4b193ef562a36ef6b8f15b8bf2f79ddc7f1d5557ed WHIRLPOOL a0100253575f1880cc02a6a3f664212da55a6836994abd790ad04431e193fc353b3c4b0e82b64b7cbc18333916f8c5beaa369c97ebb5c9cc97949397012e373f
+EBUILD mosflm-7.0.7-r2.ebuild 1780 SHA256 1c07191058fa3c8dfbb50f541a208463968b5fda3bddf19daba5998112fa0811 SHA512 63b63fa419267c0f795a83cbc73f06d44b7ad56c852c51b431992866157200f8037bfbff58f753462060750d3c55880ac1bb8fecf32179316bdba40a3b91c197 WHIRLPOOL 72ce5afa901c49ce66b24bf335a52c172195a429e75394881e08054b80f99a445ce5d93d886523caf1e00621d2a8ca490be1d1eee8463f5e72e0ffce1848ed29
+EBUILD mosflm-7.0.8.ebuild 1825 SHA256 9ccfe956aa1f5ea9e499a2879107a3f5a4aaf5f0c2ce37c2dcce9b28169bd893 SHA512 60c193b461ee48733a855856f1798b39dbafa1ef447259a4eaed9cf4ebd16485c357360e2a21be4da910ed171c40726251cc3c18bcbf9d4eee171baef44b3704 WHIRLPOOL d7f6c15c357b540d6b469bf9df80f1def532821a3da43342271a481701701dfa54833967560a09ade69e78e505a3c866650697f062dfc2b658d499da3bafab82
+MISC ChangeLog 2626 SHA256 07a480bb3c11679879a8fb55f253054d4d84334a3a3d94c0500afeaef4a887ec SHA512 f655c8e20b1f4d54835a58d914afef3b826990a893de9ede6d183aade734f4f1c197c2408e46c8b37e34ac94e14047a3e1a8154c8f963644b997441ba146ee1a WHIRLPOOL 799da48d02b519d2965f52921bafe2c5698e74ca3bc7635702305a20b28a71c8519cdb4b9507e9ae65d95eec2c5b7914aa4337a8f20150c47f6f291841361012
+MISC metadata.xml 219 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8 SHA512 8e1fa48bb6533db28b30f09f61673779d75cebd0ba8058abb411cb62595788272998bb9d3e1be8a0f6f95ca42722efc6af7e4d5741e15fe72df4ad8c872383c1 WHIRLPOOL 12f73f93602d45fe69385989b4e8e91507665e0d7deb148365fce2c41d9a85e9bcaaa940ce039a554770f4f4b2207e33a2cea5ad784561b3c3a92be8584f4478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/gGmIACgkQgAnW8HDreRaIZACdEIvWR8AxQqXPi5tSQcUZcp8W
-qCgAnihmFy6c1vTb0LY6Dl1qdW5++0uI
-=M0tN
+iEYEAREKAAYFAk/1m74ACgkQgAnW8HDreRbNRACfdj/+N9a2IciirYdkGsLiPqKq
+4/IAnAyosJ8tL757ddNxpiKufb6R18VF
+=lrGv
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mosflm/files/7.0.8-parallel.patch b/sci-chemistry/mosflm/files/7.0.8-parallel.patch
new file mode 100644
index 000000000000..38c6fc45a5c0
--- /dev/null
+++ b/sci-chemistry/mosflm/files/7.0.8-parallel.patch
@@ -0,0 +1,92 @@
+ Makefile     |   21 ++++++++++-----------
+ cbf/Makefile |    9 +++++++--
+ 2 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3d2f543..2219d8d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a
+ CBFLIBS = cbf/lib/libcbf.a
+ JPGLIBS = jpg/libjpeg.a
+ 
+-all:	$(DPSLIBS) $(CBFLIBS) $(JPGLIBS)
+-	cd mosflm ; make
++all:	$(DPSLIBS)
++	$(MAKE) -C mosflm
+ 
+ dpslibs:
+ 	@-find . -name "*a" -delete
+@@ -32,22 +32,21 @@ dpslibs:
+ 
+ cbflibs: 
+ 	@-find ./cbf -name "*.a" -delete
+-	cd cbf ; make all ; if [ -f $(RANLIB) ]; \
+-	then $(RANLIB) lib/libcbf.a; fi
++	$(MAKE) -C cbf all
+ 
+ jpglibs: 
+-	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a
++	cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a
+ 
+ ${DPSLIBS}:
+-	make dpslibs
++	$(MAKE) dpslibs
+ 
+ ${CBFLIBS}:
+-	make cbflibs
++	$(MAKE) cbflibs
+ 
+ ${JPGLIBS}:
+-	make jpglibs
++	$(MAKE) jpglibs
+ 
+-libs:	${DPSLIBS} ${CBFLIBS} ${JPGLIBS}
++libs:	${DPSLIBS} ${CBFLIBS}
+ 	@echo "****************************************************************"
+ 	@echo "             Making libraries for system ${HOSTTYPE}"
+ 	@echo "****************************************************************"
+@@ -56,11 +55,11 @@ ipmosflm: libs
+ 	@echo "****************************************************************"
+ 	@echo "           Making IPMOSFLM for system ${HOSTTYPE}"
+ 	@echo "****************************************************************"
+-	cd mosflm ; make ipmosflm
++	$(MAKE) -C mosflm ipmosflm
+ 
+ force:
+ 	@-rm -f bin/ipmosflm
+-	make ipmosflm
++	$(MAKE) ipmosflm
+ 
+ install:
+ 	@echo "the executable is in ${MOSHOME}/bin/ipmosflm"
+diff --git a/cbf/Makefile b/cbf/Makefile
+index e61497c..c3c94ac 100644
+--- a/cbf/Makefile
++++ b/cbf/Makefile
+@@ -362,6 +362,8 @@ HEADERS   =  $(INCLUDE)/cbf.h                  \
+              $(EXAMPLES)/img.h               \
+              $(INCLUDE)/md5.h
+ 
++OBJ = $(subst .c,.o,$(SOURCE))
++
+ #
+ # Compile the library and examples
+ #
+@@ -379,11 +381,14 @@ $(INSTALLDIR):
+ $(LIB):
+ 	mkdir $(LIB)
+ 
++
++.c.o: $(SOURCE) $(HEADERS)
++	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $<
++
+ #
+ # CBF library
+ #
+-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP)
+-	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
++$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP)
+ 	$(AR) cr $@ *.o
+ 	rm *.o
+ 	if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi
diff --git a/sci-chemistry/mosflm/mosflm-7.0.7.ebuild b/sci-chemistry/mosflm/mosflm-7.0.7.ebuild
deleted file mode 100644
index ac34106262ff..000000000000
--- a/sci-chemistry/mosflm/mosflm-7.0.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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}
-}
diff --git a/sci-chemistry/mosflm/mosflm-7.0.7-r1.ebuild b/sci-chemistry/mosflm/mosflm-7.0.8.ebuild
index bb6f9f3b70dc..278ca25bdeea 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.7-r1.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/04/28 07:58:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.8.ebuild,v 1.1 2012/07/05 13:50:48 jlec Exp $
 
 EAPI=4
 
@@ -40,9 +40,13 @@ src_prepare() {
 		-e '/jinclude.h/d' \
 		-i mosflm/mosflm_jpeg.c || die
 
+	cp DATETIME.C mosflm/datetime.c
+
 	epatch \
 		"${FILESDIR}"/${PV}-parallel.patch \
-		"${FILESDIR}"/7.0.6-impl-dec.patch
+		"${FILESDIR}"/7.0.6-impl-dec.patch \
+		"${FILESDIR}"/${PN}-7.0.7-buffer-overflow.patch \
+		"${FILESDIR}"/${PN}-7.0.7-impl-dec.patch
 
 	rm -rf test.f {cbf,jpg}/*.{h,c} || die
 }
@@ -58,7 +62,7 @@ src_compile() {
 		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" \
+		FFLAGS="${FFLAGS} -fno-second-underscore" \
 		CFLAGS="${CFLAGS}" \
 		MOSCFLAGS="${CFLAGS}" \
 		LFLAGS="${LDFLAGS}"