Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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