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