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/ccpn: ChangeLog ccpn-2.1.5_p120109.ebuild ccpn-2.2.1_p120109.ebuild
Date: Mon, 09 Jan 2012 12:42:23
Message-Id: 20120109124211.5C57B2004B@flycatcher.gentoo.org
1 jlec 12/01/09 12:42:11
2
3 Modified: ChangeLog
4 Added: ccpn-2.1.5_p120109.ebuild ccpn-2.2.1_p120109.ebuild
5 Log:
6 Todays Python Patches
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.79 sci-chemistry/ccpn/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ChangeLog?rev=1.79&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ChangeLog?rev=1.79&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ChangeLog?r1=1.78&r2=1.79
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v
20 retrieving revision 1.78
21 retrieving revision 1.79
22 diff -u -r1.78 -r1.79
23 --- ChangeLog 21 Dec 2011 13:46:42 -0000 1.78
24 +++ ChangeLog 9 Jan 2012 12:42:11 -0000 1.79
25 @@ -1,6 +1,13 @@
26 # ChangeLog for sci-chemistry/ccpn
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.78 2011/12/21 13:46:42 jlec Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.79 2012/01/09 12:42:11 jlec Exp $
31 +
32 +*ccpn-2.2.1_p120109 (09 Jan 2012)
33 +*ccpn-2.1.5_p120109 (09 Jan 2012)
34 +
35 + 09 Jan 2012; Justin Lecher <jlec@g.o> +ccpn-2.1.5_p120109.ebuild,
36 + +ccpn-2.2.1_p120109.ebuild:
37 + Todays Python Patches
38
39 *ccpn-2.2.1_p111221 (21 Dec 2011)
40 *ccpn-2.1.5_p111221 (21 Dec 2011)
41
42
43
44 1.1 sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild?rev=1.1&content-type=text/plain
48
49 Index: ccpn-2.1.5_p120109.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/ccpn/ccpn-2.1.5_p120109.ebuild,v 1.1 2012/01/09 12:42:11 jlec Exp $
54
55 EAPI="3"
56
57 PYTHON_DEPEND="2:2.5"
58 PYTHON_USE_WITH="ssl tk"
59
60 inherit eutils portability python toolchain-funcs versionator
61
62 PATCHSET="${PV##*_p}"
63 MY_PN="${PN}mr"
64 MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
65 MY_MAJOR="$(get_version_component_range 1-3)"
66
67 DESCRIPTION="The Collaborative Computing Project for NMR"
68 HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
69 SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
70 [[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
71
72 SLOT="0"
73 LICENSE="|| ( CCPN LGPL-2.1 )"
74 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
75 IUSE="extendnmr +opengl"
76
77 RDEPEND="
78 dev-lang/tk[threads]
79 >=dev-python/numpy-1.4
80 >=dev-tcltk/tix-8.4.3
81 =sci-libs/ccpn-data-"${MY_MAJOR}"*
82 >=sci-libs/ccpn-data-2.1.5_p111011
83 sci-biology/psipred
84 x11-libs/libXext
85 x11-libs/libX11
86 opengl? (
87 media-libs/freeglut
88 dev-python/pyglet )"
89 # We need to fix this
90 # sci-chemistry/mdd
91 DEPEND="${RDEPEND}"
92 PDEPEND="
93 extendnmr? (
94 <=sci-chemistry/aria-2.3.2
95 sci-chemistry/prodecomp )"
96
97 RESTRICT="mirror"
98
99 S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
100
101 pkg_setup() {
102 python_set_active_version 2
103 }
104
105 src_prepare() {
106 [[ -n ${PATCHSET} ]] && \
107 epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
108
109 epatch "${FILESDIR}"/${MY_PV}-parallel.patch
110
111 sed \
112 -e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
113 -e "s:weights_s:weights:g" \
114 -i python/ccpnmr/analysis/wrappers/Psipred.py || die
115
116 local tk_ver
117 local myconf
118
119 tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
120
121 if use opengl; then
122 GLUT_NEED_INIT="-DNEED_GLUT_INIT"
123 IGNORE_GL_FLAG=""
124 GL_FLAG="-DUSE_GL_TRUE"
125 GL_DIR="${EPREFIX}/usr"
126 GL_LIB="-lglut -lGLU -lGL"
127 GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
128 GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
129
130 else
131 IGNORE_GL_FLAG="-DIGNORE_GL"
132 GL_FLAG="-DUSE_GL_FALSE"
133 fi
134
135 GLUT_NOT_IN_GL=""
136 GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
137
138 rm -rf data model doc license || die
139
140 sed \
141 -e "s|/usr|${EPREFIX}/usr|g" \
142 -e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
143 -e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
144 -e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
145 -e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
146 -e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
147 -e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
148 -e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
149 -e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
150 -e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
151 -e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
152 -e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
153 -e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
154 -e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
155 -e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
156 -e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
157 -e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
158 c/environment_default.txt > c/environment.txt
159 }
160
161 src_compile() {
162 emake -C c all links || die
163 }
164
165 src_install() {
166 local libdir
167 local tkver
168 local _wrapper
169
170 find . -name "*.pyc" -type d -delete
171
172 libdir=$(get_libdir)
173 tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
174
175 _wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
176 use extendnmr && _wrapper="${_wrapper} extendNmr"
177 for wrapper in ${_wrapper}; do
178 sed \
179 -e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
180 -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
181 -e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
182 -e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
183 -e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
184 -e "s|gentoousr|${EPREFIX}/usr|g" \
185 -e "s|//|/|g" \
186 "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
187 dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
188 done
189
190 local in_path
191 local files
192 local pydocs
193
194 pydocs="$(find python -name doc -type d)"
195 rm -rf ${pydocs} || die
196
197 in_path=$(python_get_sitedir)/${PN}
198
199 for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
200 sed \
201 -e 's|#from __future__|from __future__|g' \
202 -i ${i} || die
203 done
204
205 insinto ${in_path}
206
207 dodir ${in_path}/c
208
209 ebegin "Installing main files"
210 doins -r python || die "main files installation failed"
211 eend
212
213 einfo "Adjusting permissions"
214
215 files="
216 cambridge/c/BayesPeakSeparator.so
217 ccp/c/StructUtil.so
218 ccp/c/StructStructure.so
219 ccp/c/StructBond.so
220 ccp/c/StructAtom.so
221 ccpnmr/c/DyAtomCoord.so
222 ccpnmr/c/DyDistConstraint.so
223 ccpnmr/c/DyDistForce.so
224 ccpnmr/c/AtomCoordList.so
225 ccpnmr/c/DyAtomCoordList.so
226 ccpnmr/c/ContourStyle.so
227 ccpnmr/c/ContourLevels.so
228 ccpnmr/c/SliceFile.so
229 ccpnmr/c/PeakCluster.so
230 ccpnmr/c/Dynamics.so
231 ccpnmr/c/Bacus.so
232 ccpnmr/c/Midge.so
233 ccpnmr/c/DyDistConstraintList.so
234 ccpnmr/c/WinPeakList.so
235 ccpnmr/c/PeakList.so
236 ccpnmr/c/DistConstraint.so
237 ccpnmr/c/CloudUtil.so
238 ccpnmr/c/DistForce.so
239 ccpnmr/c/DistConstraintList.so
240 ccpnmr/c/AtomCoord.so
241 ccpnmr/c/DyDynamics.so
242 ccpnmr/c/ContourFile.so
243 memops/c/ShapeFile.so
244 memops/c/BlockFile.so
245 memops/c/PdfHandler.so
246 memops/c/MemCache.so
247 memops/c/FitMethod.so
248 memops/c/PsHandler.so
249 memops/c/GlHandler.so
250 memops/c/StoreFile.so
251 memops/c/StoreHandler.so
252 memops/c/TkHandler.so"
253 for FILE in ${files}; do
254 fperms 755 ${in_path}/python/${FILE}
255 done
256 }
257
258 pkg_postinst() {
259 python_mod_optimize ${PN}
260 }
261
262 pkg_postrm() {
263 python_mod_cleanup ${PN}
264 }
265
266
267
268 1.1 sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild
269
270 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild?rev=1.1&view=markup
271 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild?rev=1.1&content-type=text/plain
272
273 Index: ccpn-2.2.1_p120109.ebuild
274 ===================================================================
275 # Copyright 1999-2012 Gentoo Foundation
276 # Distributed under the terms of the GNU General Public License v2
277 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild,v 1.1 2012/01/09 12:42:11 jlec Exp $
278
279 EAPI="3"
280
281 PYTHON_DEPEND="2:2.5"
282 PYTHON_USE_WITH="ssl tk"
283
284 inherit eutils portability python toolchain-funcs versionator
285
286 PATCHSET="${PV##*_p}"
287 MY_PN="${PN}mr"
288 MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
289 MY_MAJOR="$(get_version_component_range 1-3)"
290
291 DESCRIPTION="The Collaborative Computing Project for NMR"
292 SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
293 [[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
294 HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
295
296 SLOT="0"
297 LICENSE="|| ( CCPN LGPL-2.1 )"
298 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
299 IUSE="extendnmr +opengl"
300
301 RDEPEND="
302 dev-lang/tk[threads]
303 >=dev-python/numpy-1.4
304 >=dev-tcltk/tix-8.4.3
305 =sci-libs/ccpn-data-"${MY_MAJOR}"*
306 >=sci-libs/ccpn-data-2.2.1_p111011
307 sci-biology/psipred
308 x11-libs/libXext
309 x11-libs/libX11
310 opengl? (
311 media-libs/freeglut
312 dev-python/pyglet )"
313 # We need to fix this
314 # sci-chemistry/mdd
315 DEPEND="${RDEPEND}"
316 PDEPEND="
317 extendnmr? (
318 >=sci-chemistry/aria-2.3.2-r1
319 sci-chemistry/prodecomp )"
320
321 RESTRICT="mirror"
322
323 S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
324
325 pkg_setup() {
326 python_set_active_version 2
327 }
328
329 src_prepare() {
330 [[ -n ${PATCHSET} ]] && \
331 epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
332
333 epatch "${FILESDIR}"/${MY_PV}-parallel.patch
334
335 sed \
336 -e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
337 -e "s:weights_s:weights:g" \
338 -i python/ccpnmr/analysis/wrappers/Psipred.py || die
339
340 local tk_ver
341 local myconf
342
343 tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
344
345 if use opengl; then
346 GLUT_NEED_INIT="-DNEED_GLUT_INIT"
347 IGNORE_GL_FLAG=""
348 GL_FLAG="-DUSE_GL_TRUE"
349 GL_DIR="${EPREFIX}/usr"
350 GL_LIB="-lglut -lGLU -lGL"
351 GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
352 GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
353
354 else
355 IGNORE_GL_FLAG="-DIGNORE_GL"
356 GL_FLAG="-DUSE_GL_FALSE"
357 fi
358
359 GLUT_NOT_IN_GL=""
360 GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
361
362 rm -rf data model doc license || die
363
364 sed \
365 -e "s|/usr|${EPREFIX}/usr|g" \
366 -e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
367 -e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
368 -e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
369 -e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
370 -e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
371 -e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
372 -e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
373 -e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
374 -e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
375 -e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
376 -e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
377 -e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
378 -e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
379 -e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
380 -e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
381 -e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
382 c/environment_default.txt > c/environment.txt
383 }
384
385 src_compile() {
386 emake -C c all links || die
387 }
388
389 src_install() {
390 local libdir
391 local tkver
392 local _wrapper
393
394 find . -name "*.pyc" -type d -delete
395
396 libdir=$(get_libdir)
397 tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
398
399 _wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
400 use extendnmr && _wrapper="${_wrapper} extendNmr"
401 for wrapper in ${_wrapper}; do
402 sed \
403 -e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
404 -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
405 -e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
406 -e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
407 -e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
408 -e "s|gentoousr|${EPREFIX}/usr|g" \
409 -e "s|//|/|g" \
410 "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
411 dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
412 done
413
414 local in_path
415 local files
416 local pydocs
417
418 pydocs="$(find python -name doc -type d)"
419 rm -rf ${pydocs} || die
420
421 in_path=$(python_get_sitedir)/${PN}
422
423 for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
424 sed \
425 -e 's|#from __future__|from __future__|g' \
426 -i ${i} || die
427 done
428
429 insinto ${in_path}
430
431 dodir ${in_path}/c
432
433 ebegin "Installing main files"
434 doins -r python || die "main files installation failed"
435 eend
436
437 einfo "Adjusting permissions"
438
439 files="
440 cambridge/c/BayesPeakSeparator.so
441 ccp/c/StructUtil.so
442 ccp/c/StructStructure.so
443 ccp/c/StructBond.so
444 ccp/c/StructAtom.so
445 ccpnmr/c/DyAtomCoord.so
446 ccpnmr/c/DyDistConstraint.so
447 ccpnmr/c/DyDistForce.so
448 ccpnmr/c/AtomCoordList.so
449 ccpnmr/c/DyAtomCoordList.so
450 ccpnmr/c/ContourStyle.so
451 ccpnmr/c/ContourLevels.so
452 ccpnmr/c/SliceFile.so
453 ccpnmr/c/PeakCluster.so
454 ccpnmr/c/Dynamics.so
455 ccpnmr/c/Bacus.so
456 ccpnmr/c/Midge.so
457 ccpnmr/c/DyDistConstraintList.so
458 ccpnmr/c/WinPeakList.so
459 ccpnmr/c/PeakList.so
460 ccpnmr/c/DistConstraint.so
461 ccpnmr/c/CloudUtil.so
462 ccpnmr/c/DistForce.so
463 ccpnmr/c/DistConstraintList.so
464 ccpnmr/c/AtomCoord.so
465 ccpnmr/c/DyDynamics.so
466 ccpnmr/c/ContourFile.so
467 memops/c/ShapeFile.so
468 memops/c/BlockFile.so
469 memops/c/PdfHandler.so
470 memops/c/MemCache.so
471 memops/c/FitMethod.so
472 memops/c/PsHandler.so
473 memops/c/GlHandler.so
474 memops/c/StoreFile.so
475 memops/c/StoreHandler.so
476 memops/c/TkHandler.so"
477 for FILE in ${files}; do
478 fperms 755 ${in_path}/python/${FILE}
479 done
480 }
481
482 pkg_postinst() {
483 python_mod_optimize ${PN}
484 }
485
486 pkg_postrm() {
487 python_mod_cleanup ${PN}
488 }