Gentoo Archives: gentoo-commits

From: Nicolas Bock <nicolasbock@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/
Date: Thu, 02 Jan 2014 16:15:44
Message-Id: 1388679323.e1fb5129431ecc369598449a879ee326d6df4a8d.nicolasbock@gentoo
1 commit: e1fb5129431ecc369598449a879ee326d6df4a8d
2 Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
3 AuthorDate: Thu Jan 2 16:15:23 2014 +0000
4 Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
5 CommitDate: Thu Jan 2 16:15:23 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e1fb5129
7
8 sys-cluster/charm: Removing versions moved to x86.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 sys-cluster/charm/ChangeLog | 6 +-
14 sys-cluster/charm/charm-6.5.1-r2.ebuild | 209 --------------------------------
15 sys-cluster/charm/charm-6.5.1-r3.ebuild | 204 -------------------------------
16 3 files changed, 5 insertions(+), 414 deletions(-)
17
18 diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
19 index e4057d2..01e8eff 100644
20 --- a/sys-cluster/charm/ChangeLog
21 +++ b/sys-cluster/charm/ChangeLog
22 @@ -1,7 +1,11 @@
23 # ChangeLog for sys-cluster/charm
24 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
26 # $Header: $
27
28 + 02 Jan 2014; Nicolas Bock <nicolasbock@g.o> -Manifest,
29 + -charm-6.5.1-r2.ebuild, -charm-6.5.1-r3.ebuild:
30 + sys-cluster/charm: Removing versions moved to x86.
31 +
32 13 Dec 2013; Nicolas Bock <nicolasbock@g.o> metadata.xml:
33 sys-cluster/charm: Updated maintainer email to gentoo.org.
34
35
36 diff --git a/sys-cluster/charm/charm-6.5.1-r2.ebuild b/sys-cluster/charm/charm-6.5.1-r2.ebuild
37 deleted file mode 100644
38 index 4d1523e..0000000
39 --- a/sys-cluster/charm/charm-6.5.1-r2.ebuild
40 +++ /dev/null
41 @@ -1,209 +0,0 @@
42 -# Copyright 1999-2013 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
45 -
46 -EAPI=5
47 -
48 -PYTHON_COMPAT=( python{2_6,2_7} )
49 -
50 -inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
51 -
52 -DESCRIPTION="Message-passing parallel language and runtime system"
53 -HOMEPAGE="http://charm.cs.uiuc.edu/"
54 -SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
55 -
56 -LICENSE="charm"
57 -SLOT="0"
58 -KEYWORDS="~amd64 ~x86"
59 -IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
60 -
61 -RDEPEND="mpi? ( virtual/mpi )"
62 -DEPEND="
63 - ${RDEPEND}
64 - doc? (
65 - >=app-text/poppler-0.12.3-r3[utils]
66 - dev-tex/latex2html
67 - virtual/tex-base
68 - >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
69 - dev-python/lxml[${PYTHON_USEDEP}]
70 - media-libs/netpbm
71 - ${PYTHON_DEPS}
72 - )"
73 -
74 -REQUIRED_USE="
75 - doc? ( ${PYTHON_REQUIRED_USE} )
76 - cmkopt? ( !charmdebug !charmtracing )
77 - charmproduction? ( !charmdebug !charmtracing )"
78 -
79 -FORTRAN_STANDARD="90"
80 -
81 -get_opts() {
82 - local CHARM_OPTS
83 -
84 - # TCP instead of default UDP for socket comunication
85 - # protocol
86 - CHARM_OPTS+="$(usex tcp ' tcp' '')"
87 -
88 - # enable direct SMP support using shared memory
89 - CHARM_OPTS+="$(usex smp ' smp' '')"
90 -
91 - CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
92 - CHARM_OPTS+="$(usex syncft ' syncft' '')"
93 -
94 - # Build shared libraries by default.
95 - CHARM_OPTS+=" --build-shared"
96 -
97 - if use charmproduction; then
98 - CHARM_OPTS+=" --with-production"
99 - else
100 - if use charmdebug; then
101 - CHARM_OPTS+=" --enable-charmdebug"
102 - fi
103 -
104 - if use charmtracing; then
105 - CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
106 - fi
107 - fi
108 -
109 - CHARM_OPTS+="$(usex numa ' --with-numa' '')"
110 - echo $CHARM_OPTS
111 -}
112 -
113 -src_prepare() {
114 - sed \
115 - -e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
116 - -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
117 - -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
118 - -e '/CMK_F90_MODINC/s:-p:-I:g' \
119 - -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
120 - -i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
121 -
122 - sed \
123 - -e "s:-o conv-cpm:${LDFLAGS} &:g" \
124 - -e "s:-o charmxi:${LDFLAGS} &:g" \
125 - -e "s:-o charmrun-silent:${LDFLAGS} &:g" \
126 - -e "s:-o charmrun-notify:${LDFLAGS} &:g" \
127 - -e "s:-o charmrun:${LDFLAGS} &:g" \
128 - -e "s:-o charmd_faceless:${LDFLAGS} &:g" \
129 - -e "s:-o charmd:${LDFLAGS} &:g" \
130 - -i \
131 - src/scripts/Makefile \
132 - src/arch/net/charmrun/Makefile || die
133 -
134 - # CMK optimization
135 - use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
136 -
137 - # Fix QA notice. Filed report with upstream.
138 - append-cflags -DALLOCA_H
139 -
140 - epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
141 - epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
142 - epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
143 - epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
144 - epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
145 -}
146 -
147 -src_compile() {
148 - local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
149 -
150 - # Build charmm++ first.
151 - einfo "running ./build charm++ ${mybuildoptions}"
152 - ./build charm++ ${mybuildoptions} || die "Failed to build charm++"
153 -
154 - # make pdf/html docs
155 - if use doc; then
156 - python-single-r1_pkg_setup
157 - python_fix_shebang "${S}/doc"
158 - einfo "forcing ${EPYTHON}"
159 - emake -j1 -C doc/charm++
160 - fi
161 -}
162 -
163 -src_test() {
164 - make -C tests/charm++ test TESTOPTS="++local" || die
165 -}
166 -
167 -src_install() {
168 - # Make charmc play well with gentoo before we move it into /usr/bin. This
169 - # patch cannot be applied during src_prepare() because the charmc wrapper
170 - # is used during building.
171 - epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
172 -
173 - sed -e "s|gentoo-include|${P}|" \
174 - -e "s|gentoo-libdir|$(get_libdir)|g" \
175 - -e "s|VERSION|${P}/VERSION|" \
176 - -i ./src/scripts/charmc || die "failed patching charmc script"
177 -
178 - # In the following, some of the files are symlinks to ../tmp which we need
179 - # to dereference first (see bug 432834).
180 -
181 - local i
182 -
183 - # Install binaries.
184 - for i in bin/*; do
185 - if [[ -L ${i} ]]; then
186 - i=$(readlink -e "${i}") || die
187 - fi
188 - dobin "${i}"
189 - done
190 -
191 - # Install headers.
192 - insinto /usr/include/${P}
193 - for i in include/*; do
194 - if [[ -L ${i} ]]; then
195 - i=$(readlink -e "${i}") || die
196 - fi
197 - doins "${i}"
198 - done
199 -
200 - # Install static libs. Charm has a lot of .o "libs" that it requires at
201 - # runtime.
202 - if use static-libs; then
203 - for i in lib/*.{a,o}; do
204 - if [[ -L ${i} ]]; then
205 - i=$(readlink -e "${i}") || die
206 - fi
207 - dolib "${i}"
208 - done
209 - fi
210 -
211 - # Install shared libs.
212 - for i in lib_so/*; do
213 - if [[ -L ${i} ]]; then
214 - i=$(readlink -e "${i}") || die
215 - fi
216 - dolib.so "${i}"
217 - done
218 -
219 - # Basic docs.
220 - dodoc CHANGES README
221 -
222 - # Install examples.
223 - if use examples; then
224 - find examples/ -name 'Makefile' | xargs sed \
225 - -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
226 - die "Failed to fix examples"
227 - find examples/ -name 'Makefile' | xargs sed \
228 - -r "s:./charmrun:./charmrun ++local:" -i || \
229 - die "Failed to fix examples"
230 - insinto /usr/share/doc/${PF}/examples
231 - doins -r examples/charm++/*
232 - fi
233 -
234 - # Install pdf/html docs
235 - if use doc; then
236 - cd "${S}/doc/charm++"
237 - # Install pdfs.
238 - insinto /usr/share/doc/${PF}/pdf
239 - doins *.pdf
240 - # Install html.
241 - docinto html
242 - dohtml -r manual/*
243 - fi
244 -}
245 -
246 -pkg_postinst() {
247 - einfo "Please test your charm installation by copying the"
248 - einfo "content of /usr/share/doc/${PF}/examples to a"
249 - einfo "temporary location and run 'make test'."
250 -}
251
252 diff --git a/sys-cluster/charm/charm-6.5.1-r3.ebuild b/sys-cluster/charm/charm-6.5.1-r3.ebuild
253 deleted file mode 100644
254 index 3f11990..0000000
255 --- a/sys-cluster/charm/charm-6.5.1-r3.ebuild
256 +++ /dev/null
257 @@ -1,204 +0,0 @@
258 -# Copyright 1999-2013 Gentoo Foundation
259 -# Distributed under the terms of the GNU General Public License v2
260 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
261 -
262 -EAPI=5
263 -
264 -inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
265 -
266 -DESCRIPTION="Message-passing parallel language and runtime system"
267 -HOMEPAGE="http://charm.cs.uiuc.edu/"
268 -SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
269 -
270 -LICENSE="charm"
271 -SLOT="0"
272 -KEYWORDS="~amd64 ~x86"
273 -IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
274 -
275 -RDEPEND="mpi? ( virtual/mpi )"
276 -DEPEND="
277 - ${RDEPEND}
278 - doc? (
279 - >=app-text/poppler-0.12.3-r3[utils]
280 - dev-tex/latex2html
281 - virtual/tex-base
282 - >=dev-python/beautifulsoup-4
283 - dev-python/lxml
284 - media-libs/netpbm
285 - )"
286 -
287 -REQUIRED_USE="
288 - doc? ( ${PYTHON_REQUIRED_USE} )
289 - cmkopt? ( !charmdebug !charmtracing )
290 - charmproduction? ( !charmdebug !charmtracing )"
291 -
292 -FORTRAN_STANDARD="90"
293 -
294 -get_opts() {
295 - local CHARM_OPTS
296 -
297 - # TCP instead of default UDP for socket comunication
298 - # protocol
299 - CHARM_OPTS+="$(usex tcp ' tcp' '')"
300 -
301 - # enable direct SMP support using shared memory
302 - CHARM_OPTS+="$(usex smp ' smp' '')"
303 -
304 - CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
305 - CHARM_OPTS+="$(usex syncft ' syncft' '')"
306 -
307 - # Build shared libraries by default.
308 - CHARM_OPTS+=" --build-shared"
309 -
310 - if use charmproduction; then
311 - CHARM_OPTS+=" --with-production"
312 - else
313 - if use charmdebug; then
314 - CHARM_OPTS+=" --enable-charmdebug"
315 - fi
316 -
317 - if use charmtracing; then
318 - CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
319 - fi
320 - fi
321 -
322 - CHARM_OPTS+="$(usex numa ' --with-numa' '')"
323 - echo $CHARM_OPTS
324 -}
325 -
326 -src_prepare() {
327 - sed \
328 - -e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
329 - -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
330 - -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
331 - -e '/CMK_F90_MODINC/s:-p:-I:g' \
332 - -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
333 - -i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
334 -
335 - sed \
336 - -e "s:-o conv-cpm:${LDFLAGS} &:g" \
337 - -e "s:-o charmxi:${LDFLAGS} &:g" \
338 - -e "s:-o charmrun-silent:${LDFLAGS} &:g" \
339 - -e "s:-o charmrun-notify:${LDFLAGS} &:g" \
340 - -e "s:-o charmrun:${LDFLAGS} &:g" \
341 - -e "s:-o charmd_faceless:${LDFLAGS} &:g" \
342 - -e "s:-o charmd:${LDFLAGS} &:g" \
343 - -i \
344 - src/scripts/Makefile \
345 - src/arch/net/charmrun/Makefile || die
346 -
347 - # CMK optimization
348 - use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
349 -
350 - # Fix QA notice. Filed report with upstream.
351 - append-cflags -DALLOCA_H
352 -
353 - epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
354 - epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
355 - epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
356 - epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
357 - epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
358 - epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
359 -}
360 -
361 -src_compile() {
362 - local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
363 -
364 - # Build charmm++ first.
365 - einfo "running ./build charm++ ${mybuildoptions}"
366 - ./build charm++ ${mybuildoptions} || die "Failed to build charm++"
367 -
368 - # make pdf/html docs
369 - if use doc; then
370 - emake -j1 -C doc/charm++
371 - fi
372 -}
373 -
374 -src_test() {
375 - make -C tests/charm++ test TESTOPTS="++local" || die
376 -}
377 -
378 -src_install() {
379 - # Make charmc play well with gentoo before we move it into /usr/bin. This
380 - # patch cannot be applied during src_prepare() because the charmc wrapper
381 - # is used during building.
382 - epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
383 -
384 - sed -e "s|gentoo-include|${P}|" \
385 - -e "s|gentoo-libdir|$(get_libdir)|g" \
386 - -e "s|VERSION|${P}/VERSION|" \
387 - -i ./src/scripts/charmc || die "failed patching charmc script"
388 -
389 - # In the following, some of the files are symlinks to ../tmp which we need
390 - # to dereference first (see bug 432834).
391 -
392 - local i
393 -
394 - # Install binaries.
395 - for i in bin/*; do
396 - if [[ -L ${i} ]]; then
397 - i=$(readlink -e "${i}") || die
398 - fi
399 - dobin "${i}"
400 - done
401 -
402 - # Install headers.
403 - insinto /usr/include/${P}
404 - for i in include/*; do
405 - if [[ -L ${i} ]]; then
406 - i=$(readlink -e "${i}") || die
407 - fi
408 - doins "${i}"
409 - done
410 -
411 - # Install static libs. Charm has a lot of .o "libs" that it requires at
412 - # runtime.
413 - if use static-libs; then
414 - for i in lib/*.{a,o}; do
415 - if [[ -L ${i} ]]; then
416 - i=$(readlink -e "${i}") || die
417 - fi
418 - dolib "${i}"
419 - done
420 - fi
421 -
422 - # Install shared libs.
423 - for i in lib_so/*; do
424 - if [[ -L ${i} ]]; then
425 - i=$(readlink -e "${i}") || die
426 - fi
427 - dolib.so "${i}"
428 - done
429 -
430 - # Basic docs.
431 - dodoc CHANGES README
432 -
433 - # Install examples.
434 - if use examples; then
435 - find examples/ -name 'Makefile' | xargs sed \
436 - -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
437 - die "Failed to fix examples"
438 - find examples/ -name 'Makefile' | xargs sed \
439 - -r "s:./charmrun:./charmrun ++local:" -i || \
440 - die "Failed to fix examples"
441 - insinto /usr/share/doc/${PF}/examples
442 - doins -r examples/charm++/*
443 - fi
444 -
445 - # Install pdf/html docs
446 - if use doc; then
447 - cd "${S}/doc/charm++"
448 - # Install pdfs.
449 - insinto /usr/share/doc/${PF}/pdf
450 - doins *.pdf
451 - # Install html.
452 - docinto html
453 - dohtml -r manual/*
454 - fi
455 -}
456 -
457 -pkg_postinst() {
458 - einfo "Please test your charm installation by copying the"
459 - einfo "content of /usr/share/doc/${PF}/examples to a"
460 - einfo "temporary location and run 'make test'."
461 -}