Drop old

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 23 insertions, 151 deletions

diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index 4dec64783daf..3b0ed69edf10 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/mosflm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.26 2015/05/15 10:58:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.27 2015/05/15 11:32:10 jlec Exp $
+
+  15 May 2015; Justin Lecher <jlec@gentoo.org> -mosflm-7.0.6-r2.ebuild,
+  -mosflm-7.0.7-r2.ebuild:
+  Drop old
 
   15 May 2015; Pacho Ramos <pacho@gentoo.org> mosflm-7.0.9.ebuild:
   ppc stable wrt bug #548692
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
index 6b75d17f6494..98cbeb1de895 100644
--- a/sci-chemistry/mosflm/Manifest
+++ b/sci-chemistry/mosflm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
@@ -9,18 +9,26 @@ AUX 7.0.9-parallel.patch 2370 SHA256 35bc7ed6987b88a06f8f5562a19741f7c4bcab8ead8
 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
 AUX mosflm-7.0.9-buffer-overflow.patch 526 SHA256 47d14ecf1d794bff58d35da43db93c707ca6ce1b100288b319e9a6107f16149b SHA512 c97327fb1696cb488e83f0588b7900bff2addf2adf6cc7a6f1174133a08b2287b1e966def87c4cbc54c3ea65dbce30a983ecf71bc6c45e6cffde96305053ddf0 WHIRLPOOL 85a8fbc8372ee17de422810a67eb070e6390d24008b5f2d0de13bf2fe223d5f61c0a6c957ab508feee91b6d2a57ec82a58ab22df7c287affd463ba70838bca9a
-DIST mosflm706.tgz 3468405 SHA256 5e26a49fd37749a14e7a1d1e867c1c0333db3bbcc01376fb7a516d4a67b1ebb0 SHA512 8f2568a3dffd5f94a13a518a3b1d65e39474a223ae5aadae090e31bf844d11a3f05e007d7369d5ef3c31d2b56e51c0784fa499db7345d11eb84d7e0fae5ad4e4 WHIRLPOOL afa9b892b8e4c257a80f5d1cc12e2b84df7cba064e997fd5a5f879c7b7fb9b4c9fadb5d15c2f63916e5ec8745b596c0ffc6fcda31a4f911d98427f9860ae556d
-DIST mosflm707.tgz 3401235 SHA256 fb14a02834929423569a23a04800de62ed1da2a02966958b79c157a71b9b6118 SHA512 d9417b76d6ced68ca13382fc4c4300fd8b534e39e785a0e418780d7dc0aa85a65b6d9efef1e94e3259f938d4cfdeec1dd8d42feace36afc6bef0d2dcce69d8a1 WHIRLPOOL e2df963a79408f50e4d9011c1b6bc99465e2d58ac4f9611a1b5d2bd911a2d78fee217e952bfa4966c5bf84e662dc8ed4e74cdd26c6fddc48a9cb65e2899ec4ab
 DIST mosflm709.tgz 3324010 SHA256 d22b05211f274b50c284d4c14fcb456c52b13344e2a48d5f45855fe87f82f6d1 SHA512 aa85f8459f280e0e1d2d54041029ef072346ecef3ffcc7724eb524469e1b77dfbd95aac8b46f2b9682d605a4e5931d9c13f1162d5f3bcff08644db7e79a6316c WHIRLPOOL b3a82858a8d2a3162bc0fcfb3bf7fb7b01cfc6bca80b34643e7c6caae54b1ef1e2b24a58617ffe2b0423ca6626d51e31b49c0dba6a82ed5c61fa10d044e0d3b8
-EBUILD mosflm-7.0.6-r2.ebuild 1789 SHA256 84de710abe29adc0f916924e27ba3a9e5ee5491f8da844cf7b2da010028c77b5 SHA512 7008022541bfcdd531cbe31d513b492303456bed8b76761c9ceb53b4e65365c1873ba98b15e72d8a95c13c0fc977e0d58969b88e65705c4877c70d3fe3cdcc45 WHIRLPOOL 558b8161c47875b8c4e2434011eaa39e30e15015e435c3d840ad9566dad23fa94f9b3d6a74fa6c62516fe4fa8a2cd653d23eee617418292804c9f951853b0633
-EBUILD mosflm-7.0.7-r2.ebuild 1792 SHA256 1babf3c434fbbde9b6a409cc7a6607f796bb62465d9868b034a2e02e7f200957 SHA512 cc0b170e2e0bc52ca02bfa1cb1629fca756e743421596e78ffe6ad4214e393a6724f38d87de96742a7d2a46cad8b7930a08e4af2ede336cc13c90a8cc71b427d WHIRLPOOL 38cff7cbff24e4e08448f6ebb9889face5586127ef0e61bec283b2a9a332986cf2659f192c5656ab3c276a0a1cf79273a29c5e1ff395ad8d0b617e7fd4589f2c
 EBUILD mosflm-7.0.9.ebuild 1838 SHA256 3273bb6acd869944ef3e656ba2be96d8ca901ed6dea9781f1437ee9bce06af71 SHA512 efe0f84f70d8776534906ea9b126b7f502d31653015d1b7048bb1d0cb5f8dbeb4eb4598c411c6ccfb67cf8cd615309a2ac84d77f11474dfea478d79b97891ae9 WHIRLPOOL f4919d74bd6cc8e2bc9e690374a4d95de91fff9a7fbdbd9d864871c6d47b7cd8a81ab43263637781664698500b890358e4aecd4cb21f947c4b444b7e61057df6
-MISC ChangeLog 3838 SHA256 2eabbdf56482f282374f61944a66e053f7453a7d488c4d914640bb2bc3967659 SHA512 3017773d29f45b9d06853d973fe4e76f659f93fcce0d0e0a78c0a6cf2f354bf413c1d13eb64da5f8c3e9f24e955566753cb7bfd2e9075c6d0a597e5f42693f34 WHIRLPOOL cdab51d99084055fb1b4102d2b1ba035cd530f6872719567d53bc1df8ddea600d16e29ddd8054666eb065ff79e73bbb462dcdddba1b09b7051420e1b18ace818
+MISC ChangeLog 3948 SHA256 e987bc0f2f023996c38d46067ac545cb644e24f821eef2054df1781f227b3743 SHA512 3932a9df9688e28117146c7ea1d96a6f6cb233b724e4e1267234e317dc0c844cc9fdb32099096cb85f91fc7c80e5792715ab17322b021ca42459228002770430 WHIRLPOOL 2233e2de0f264f715bbc03008ebcd842470c654054a96ba8773ff1c70aa83cf9817f72db3403d23cf724890dc7bd97a665459b919c72cad14d9300422eca3f4f
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVV0VkACgkQCaWpQKGI+9Tp5gCdGmYeNfWz/RiFb65JLorv6pz0
-KisAn3uKynyp1kiuBs2mcG8SAvXEbPnH
-=46lw
+iQJ8BAEBCgBmBQJVVdk7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivzEP/idcBrFX1Xqk+zDKHCD02G+o
+SxZJkGCZeDva2XrTwMgHJ3EcqSgVi0PNwfQxYr/xjrF/aUvVw93KJCZTS+8mx0rj
+o9pOBpX/12aQH4S4zIT2fPyHc7CSPzkDb9AqU/8RKyURhBLXVywhIu9YNlKmuio4
+dnVcgMMIrj6ZlHi8UzTWFRi6L/6X+Nj7o8f3pdOT+v6SQlfxf2+olO8iddBOpk3Y
+yYgPebUJkMTrq+TLruHowmPw9YidGEQNyjk2Z++gM4nKAtTKTxSJwymuMpm1ZDYG
+oQumr5APLIBNVbtaZtobVApdMQwwRc/8huOJ8CGcho+iOu7T3v0LTRbmcootaD9T
+UeEPyetM+oaPwaNKmJAiS5gN8UrCHlR6L9uQEjIKJ9gBDCSMtrpHzbiq9PScVd9M
+NlD6WrGTvfBYHL/iy2H4JQ+/qGDgTNaMXxwkjiymEkNkvbyblCVIG9PxTFEG4bTl
+eVamEcwdaDGDubDQ0oXR90o673YL002x/yABxLiuhlHSY0Tx3z3tnE0sK/mkdgGT
+aBfKl5FMY0nUtq55Bt9ahjopCV0jneDBE7lxnJFvdkOMsWufTUxDUMuqB0dl/lio
+gVeSCZmJXhDwRwUwHhzTxMpUgzk1PXJYy4QBemPSoNsH9M9+DOo9CGAeVDwB62df
+CMA6QDlNHbMH/Nx4XAf2
+=qIau
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
deleted file mode 100644
index 35eebe37e12b..000000000000
--- a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild,v 1.13 2013/05/05 13:15:00 jlec Exp $
-
-EAPI="3"
-
-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"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	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}/${PV}"-Makefile.patch \
-		"${FILESDIR}/${PV}"-parallel.patch \
-		"${FILESDIR}/${PV}"-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 $($(tc-getPKG_CONFIG) --libs ncurses) -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() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe bin/ipmosflm || die
-	dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN}
-}
diff --git a/sci-chemistry/mosflm/mosflm-7.0.7-r2.ebuild b/sci-chemistry/mosflm/mosflm-7.0.7-r2.ebuild
deleted file mode 100644
index 612587e5d52d..000000000000
--- a/sci-chemistry/mosflm/mosflm-7.0.7-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 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-r2.ebuild,v 1.3 2013/05/05 13:15:00 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"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-shells/tcsh
-	virtual/jpeg
-	sci-libs/cbflib
-	sci-libs/ccp4-libs
-	sys-libs/ncurses
-	x11-libs/libxdl_view"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed \
-		-e "s:../cbf/lib/libcbf.a:-lcbf -limg:g" \
-		-e "s:../jpg/libjpeg.a:-ljpeg:g" \
-		-i ${PN}/Makefile || die
-
-	sed \
-		-e '/jinclude.h/d' \
-		-i mosflm/mosflm_jpeg.c || die
-
-	epatch \
-		"${FILESDIR}"/${PV}-parallel.patch \
-		"${FILESDIR}"/7.0.6-impl-dec.patch \
-		"${FILESDIR}"/${P}-buffer-overflow.patch \
-		"${FILESDIR}"/${P}-impl-dec.patch
-
-	rm -rf test.f {cbf,jpg}/*.{h,c} || 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 $($(tc-getPKG_CONFIG) --libs ncurses) -lXt -lmmdb -lccif -lstdc++" \
-		MCFLAGS="-O0 -fno-second-underscore" \
-		MOSFLAGS="${FFLAGS} -fno-second-underscore" \
-		FFLAGS="${FFLAGS} -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}
-}