Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/mosflm: ChangeLog mosflm-7.0.8.ebuild mosflm-7.0.7-r1.ebuild mosflm-7.0.7.ebuild
Date: Thu, 05 Jul 2012 13:50:58
Message-Id: 20120705135048.EA3042004C@flycatcher.gentoo.org
1 jlec 12/07/05 13:50:48
2
3 Modified: ChangeLog
4 Added: mosflm-7.0.8.ebuild
5 Removed: mosflm-7.0.7-r1.ebuild mosflm-7.0.7.ebuild
6 Log:
7 sci-chemistry/mosflm: Version Bump, drop old
8
9 (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.17 sci-chemistry/mosflm/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/ChangeLog?rev=1.17&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/ChangeLog?rev=1.17&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/ChangeLog?r1=1.16&r2=1.17
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v
21 retrieving revision 1.16
22 retrieving revision 1.17
23 diff -u -r1.16 -r1.17
24 --- ChangeLog 19 Jun 2012 06:21:16 -0000 1.16
25 +++ ChangeLog 5 Jul 2012 13:50:48 -0000 1.17
26 @@ -1,6 +1,12 @@
27 # ChangeLog for sci-chemistry/mosflm
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.16 2012/06/19 06:21:16 jlec Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.17 2012/07/05 13:50:48 jlec Exp $
31 +
32 +*mosflm-7.0.8 (05 Jul 2012)
33 +
34 + 05 Jul 2012; Justin Lecher <jlec@g.o> +files/7.0.8-parallel.patch,
35 + -mosflm-7.0.7.ebuild, -mosflm-7.0.7-r1.ebuild, +mosflm-7.0.8.ebuild:
36 + Version Bump, drop old
37
38 *mosflm-7.0.7-r2 (19 Jun 2012)
39
40
41
42
43 1.1 sci-chemistry/mosflm/mosflm-7.0.8.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.8.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.8.ebuild?rev=1.1&content-type=text/plain
47
48 Index: mosflm-7.0.8.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.8.ebuild,v 1.1 2012/07/05 13:50:48 jlec Exp $
53
54 EAPI=4
55
56 inherit eutils fortran-2 toolchain-funcs versionator
57
58 MY_PV="$(delete_all_version_separators)"
59 MY_P="${PN}${MY_PV}"
60
61 DESCRIPTION="A program for integrating single crystal diffraction data from area detectors"
62 HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/"
63 SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
64
65 LICENSE="ccp4"
66 SLOT="0"
67 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
68 IUSE=""
69
70 RDEPEND="
71 virtual/fortran
72 app-shells/tcsh
73 virtual/jpeg
74 sci-libs/cbflib
75 sci-libs/ccp4-libs
76 sys-libs/ncurses
77 x11-libs/libxdl_view"
78 DEPEND="${RDEPEND}"
79
80 S="${WORKDIR}/${MY_P}"
81
82 src_prepare() {
83 sed \
84 -e "s:../cbf/lib/libcbf.a:-lcbf -limg:g" \
85 -e "s:../jpg/libjpeg.a:-ljpeg:g" \
86 -i ${PN}/Makefile || die
87
88 sed \
89 -e '/jinclude.h/d' \
90 -i mosflm/mosflm_jpeg.c || die
91
92 cp DATETIME.C mosflm/datetime.c
93
94 epatch \
95 "${FILESDIR}"/${PV}-parallel.patch \
96 "${FILESDIR}"/7.0.6-impl-dec.patch \
97 "${FILESDIR}"/${PN}-7.0.7-buffer-overflow.patch \
98 "${FILESDIR}"/${PN}-7.0.7-impl-dec.patch
99
100 rm -rf test.f {cbf,jpg}/*.{h,c} || die
101 }
102
103 src_compile() {
104 emake \
105 MOSHOME="${S}" \
106 DPS="${S}" \
107 FC=$(tc-getFC) \
108 FLINK=$(tc-getFC) \
109 CC=$(tc-getCC) \
110 AR_FLAGS=vru \
111 MOSLIBS='-lccp4f -lccp4c -lxdl_view -lcurses -lXt -lmmdb -lccif -lstdc++' \
112 MCFLAGS="-O0 -fno-second-underscore" \
113 MOSFLAGS="${FFLAGS} -fno-second-underscore" \
114 FFLAGS="${FFLAGS} -fno-second-underscore" \
115 CFLAGS="${CFLAGS}" \
116 MOSCFLAGS="${CFLAGS}" \
117 LFLAGS="${LDFLAGS}"
118 }
119
120 src_install() {
121 exeinto /usr/libexec/ccp4/bin/
122 doexe bin/ipmosflm
123 dosym ../libexec/ccp4/bin/ip${PN} /usr/bin/ip${PN}
124 }