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