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/imosflm: metadata.xml ChangeLog imosflm-1.0.5.ebuild imosflm-1.0.4.ebuild
Date: Wed, 07 Sep 2011 15:27:46
Message-Id: 20110907152735.2342B2004C@flycatcher.gentoo.org
1 jlec 11/09/07 15:27:35
2
3 Modified: metadata.xml ChangeLog imosflm-1.0.4.ebuild
4 Added: imosflm-1.0.5.ebuild
5 Log:
6 Version Bump, #349409; keyworded *-linux
7
8 (Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 sci-chemistry/imosflm/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/metadata.xml?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/metadata.xml?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/metadata.xml?r1=1.1&r2=1.2
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/metadata.xml,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- metadata.xml 6 Feb 2010 23:22:49 -0000 1.1
24 +++ metadata.xml 7 Sep 2011 15:27:34 -0000 1.2
25 @@ -1,8 +1,8 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 -<herd>sci</herd>
30 -<maintainer>
31 - <email>sci@g.o</email>
32 -</maintainer>
33 + <herd>sci</herd>
34 + <maintainer>
35 + <email>sci@g.o</email>
36 + </maintainer>
37 </pkgmetadata>
38
39
40
41 1.5 sci-chemistry/imosflm/ChangeLog
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/ChangeLog?rev=1.5&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/ChangeLog?rev=1.5&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/ChangeLog?r1=1.4&r2=1.5
46
47 Index: ChangeLog
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v
50 retrieving revision 1.4
51 retrieving revision 1.5
52 diff -u -r1.4 -r1.5
53 --- ChangeLog 27 Jan 2011 10:53:31 -0000 1.4
54 +++ ChangeLog 7 Sep 2011 15:27:34 -0000 1.5
55 @@ -1,6 +1,12 @@
56 # ChangeLog for sci-chemistry/imosflm
57 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
58 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.4 2011/01/27 10:53:31 hwoarang Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.5 2011/09/07 15:27:34 jlec Exp $
60 +
61 +*imosflm-1.0.5 (07 Sep 2011)
62 +
63 + 07 Sep 2011; Justin Lecher <jlec@g.o> imosflm-1.0.4.ebuild,
64 + +imosflm-1.0.5.ebuild, metadata.xml:
65 + Version Bump, #349409; keyworded *-linux
66
67 27 Jan 2011; Markos Chandras <hwoarang@g.o> imosflm-1.0.4.ebuild:
68 Stable on amd64 wrt bug #352051
69
70
71
72 1.5 sci-chemistry/imosflm/imosflm-1.0.4.ebuild
73
74 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild?rev=1.5&view=markup
75 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild?rev=1.5&content-type=text/plain
76 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild?r1=1.4&r2=1.5
77
78 Index: imosflm-1.0.4.ebuild
79 ===================================================================
80 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild,v
81 retrieving revision 1.4
82 retrieving revision 1.5
83 diff -u -r1.4 -r1.5
84 --- imosflm-1.0.4.ebuild 27 Jan 2011 10:53:31 -0000 1.4
85 +++ imosflm-1.0.4.ebuild 7 Sep 2011 15:27:34 -0000 1.5
86 @@ -1,6 +1,6 @@
87 # Copyright 1999-2011 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild,v 1.4 2011/01/27 10:53:31 hwoarang Exp $
90 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.4.ebuild,v 1.5 2011/09/07 15:27:34 jlec Exp $
91
92 EAPI="3"
93
94 @@ -14,7 +14,7 @@
95
96 LICENSE="ccp4"
97 SLOT="0"
98 -KEYWORDS="amd64 ~ppc ~x86"
99 +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
100 IUSE=""
101
102 RDEPEND="
103
104
105
106 1.1 sci-chemistry/imosflm/imosflm-1.0.5.ebuild
107
108 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild?rev=1.1&view=markup
109 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild?rev=1.1&content-type=text/plain
110
111 Index: imosflm-1.0.5.ebuild
112 ===================================================================
113 # Copyright 1999-2011 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild,v 1.1 2011/09/07 15:27:34 jlec Exp $
116
117 EAPI=4
118
119 inherit eutils toolchain-funcs versionator
120
121 MY_PV="$(delete_all_version_separators ${PV})"
122
123 DESCRIPTION="A new GUI for the Mosflm crystallographic data processing tool"
124 HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/imosflm"
125 SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
126
127 LICENSE="ccp4"
128 SLOT="0"
129 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
130 IUSE=""
131
132 RDEPEND="
133 dev-lang/tcl
134 >=dev-tcltk/itcl-3.3
135 >=dev-tcltk/itk-3.3
136 >=dev-tcltk/iwidgets-4
137 >=dev-tcltk/tdom-0.8
138 >=dev-tcltk/tkimg-1.3
139 >=dev-tcltk/tktreectrl-2.1
140 dev-tcltk/anigif
141 dev-tcltk/combobox
142 dev-tcltk/tablelist
143 >=sci-chemistry/mosflm-7.0.4"
144 DEPEND="app-arch/unzip"
145
146 S="${WORKDIR}"/${PN}
147
148 src_prepare() {
149 epatch \
150 "${FILESDIR}"/1.0.4-tk.patch \
151 "${FILESDIR}"/1.0.4-impl-dec.patch
152 }
153
154 src_compile() {
155 cd c
156
157 objs="tkImageLoadDLL.o tkImageLoad.o"
158 libs="-ltclstub -ltkstub"
159 config="-fPIC -DUSE_TCL_STUBS -DTK_USE_STUBS"
160 ldextra="-shared"
161
162 for file in ${objs}; do
163 einfo "$(tc-getCC) -c ${CFLAGS} ${config} ${file/.o/.c} -o ${file}"
164 $(tc-getCC) -c ${CFLAGS} ${config} ${file/.o/.c} -o ${file}
165 done
166
167 einfo "$(tc-getCC) ${LDFLAGS} ${ldextra} ${objs} -o tkImageLoad.so ${libs}"
168 $(tc-getCC) ${LDFLAGS} ${ldextra} ${objs} -o tkImageLoad.so ${libs}
169 }
170
171 src_install(){
172 rm -rf lib/{*.so,anigif,combobox}
173
174 insinto /usr/$(get_libdir)/${PN}
175 doins -r "${S}"/{src,bitmaps,lib}
176 fperms 775 /usr/$(get_libdir)/${PN}/src/imosflm
177
178 dolib.so c/tkImageLoad.so
179
180 cat >> "${T}"/23imosflm <<- EOF
181 IMOSFLM_VERSION="${PV}"
182 EOF
183
184 doenvd "${T}"/23imosflm
185
186 make_wrapper imosflm /usr/$(get_libdir)/${PN}/src/imosflm
187 }