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