summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-05-15 11:32:10 +0000
committerJustin Lecher <jlec@gentoo.org>2015-05-15 11:32:10 +0000
commit39aead9049b06ff0bdcdba7ba28af68d53a90b28 (patch)
tree59d7eba43dc226dee5e4172b89ace94f84c9f7f4 /sci-chemistry/mosflm
parentFix python-dateutil compatibility (diff)
downloadgentoo-2-39aead9049b06ff0bdcdba7ba28af68d53a90b28.tar.gz
gentoo-2-39aead9049b06ff0bdcdba7ba28af68d53a90b28.tar.bz2
gentoo-2-39aead9049b06ff0bdcdba7ba28af68d53a90b28.zip
Drop old
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-chemistry/mosflm')
-rw-r--r--sci-chemistry/mosflm/ChangeLog6
-rw-r--r--sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild68
-rw-r--r--sci-chemistry/mosflm/mosflm-7.0.7-r2.ebuild72
3 files changed, 5 insertions, 141 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/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}
-}