ottxor 14/09/26 19:04:03 Modified: ChangeLog Added: charm-6.6.0.ebuild Log: version bump (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.41 sys-cluster/charm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.41&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.41&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.40&r2=1.41 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- ChangeLog 15 Dec 2013 04:19:41 -0000 1.40 +++ ChangeLog 26 Sep 2014 19:04:03 -0000 1.41 @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/charm -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.40 2013/12/15 04:19:41 nicolasbock Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.41 2014/09/26 19:04:03 ottxor Exp $ + +*charm-6.6.0 (26 Sep 2014) + + 26 Sep 2014; Christoph Junghans <[email protected]> +charm-6.6.0.ebuild: + version bump 15 Dec 2013; Nicolas Bock <[email protected]> charm-6.5.1-r3.ebuild: sys-cluster/charm-6.5.1-r3: Fix python build time requirements for 1.1 sys-cluster/charm/charm-6.6.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild?rev=1.1&content-type=text/plain Index: charm-6.6.0.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.1 2014/09/26 19:04:03 ottxor Exp $ EAPI=5 FORTRAN_STANDARD="90" PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs DESCRIPTION="Message-passing parallel language and runtime system" HOMEPAGE="http://charm.cs.uiuc.edu/"; SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"; LICENSE="charm" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp" RDEPEND="mpi? ( virtual/mpi )" DEPEND=" ${RDEPEND} doc? ( >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base $(python_gen_any_dep ' >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ') media-libs/netpbm ${PYTHON_DEPS} )" REQUIRED_USE=" doc? ( ${PYTHON_REQUIRED_USE} ) cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing )" pkg_setup() { use doc && python-any-r1_pkg_setup } get_opts() { local CHARM_OPTS # TCP instead of default UDP for socket comunication # protocol CHARM_OPTS+="$(usex tcp ' tcp' '')" # enable direct SMP support using shared memory CHARM_OPTS+="$(usex smp ' smp' '')" CHARM_OPTS+="$(usex mlogft ' mlogft' '')" CHARM_OPTS+="$(usex syncft ' syncft' '')" # Build shared libraries by default. CHARM_OPTS+=" --build-shared" if use charmproduction; then CHARM_OPTS+=" --with-production" else if use charmdebug; then CHARM_OPTS+=" --enable-charmdebug" fi if use charmtracing; then CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" fi fi CHARM_OPTS+="$(usex numa ' --with-numa' '')" echo $CHARM_OPTS } src_prepare() { sed \ -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \ -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ -e "/CMK_CF90/s:\`which f90.*$::g" \ -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ -e '/CMK_F90_MODINC/s:-p:-I:g' \ -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ -i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die sed \ -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ -i src/arch/common/*.sh || die sed \ -e "s:-o conv-cpm:${LDFLAGS} &:g" \ -e "s:-o charmxi:${LDFLAGS} &:g" \ -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ -e "s:-o charmrun:${LDFLAGS} &:g" \ -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ -e "s:-o charmd:${LDFLAGS} &:g" \ -i \ src/scripts/Makefile \ src/util/charmrun-src/Makefile || die # CMK optimization use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 # Fix QA notice. Filed report with upstream. append-cflags -DALLOCA_H epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch" epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch" } src_compile() { local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')" local build_options="$(get_opts)" #build only accepts -j from MAKEOPTS local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)" # Build charmm++ first. einfo "running ./build charm++ ${build_commandline}" ./build charm++ ${build_commandline} || die "Failed to build charm++" # make pdf/html docs if use doc; then emake -j1 -C doc/charm++ fi } src_test() { make -C tests/charm++ test TESTOPTS="++local" || die } src_install() { # Make charmc play well with gentoo before we move it into /usr/bin. This # patch cannot be applied during src_prepare() because the charmc wrapper # is used during building. epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" sed -e "s|gentoo-include|${P}|" \ -e "s|gentoo-libdir|$(get_libdir)|g" \ -e "s|VERSION|${P}/VERSION|" \ -i ./src/scripts/charmc || die "failed patching charmc script" # In the following, some of the files are symlinks to ../tmp which we need # to dereference first (see bug 432834). local i # Install binaries. for i in bin/*; do if [[ -L ${i} ]]; then i=$(readlink -e "${i}") || die fi dobin "${i}" done # Install headers. insinto /usr/include/${P} for i in include/*; do if [[ -L ${i} ]]; then i=$(readlink -e "${i}") || die fi doins "${i}" done # Install static libs. Charm has a lot of .o "libs" that it requires at # runtime. if use static-libs; then for i in lib/*.{a,o}; do if [[ -L ${i} ]]; then i=$(readlink -e "${i}") || die fi dolib "${i}" done fi # Install shared libs. for i in lib_so/*; do if [[ -L ${i} ]]; then i=$(readlink -e "${i}") || die fi dolib.so "${i}" done # Basic docs. dodoc CHANGES README # Install examples. if use examples; then find examples/ -name 'Makefile' | xargs sed \ -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ die "Failed to fix examples" find examples/ -name 'Makefile' | xargs sed \ -r "s:./charmrun:./charmrun ++local:" -i || \ die "Failed to fix examples" insinto /usr/share/doc/${PF}/examples doins -r examples/charm++/* docompress -x /usr/share/doc/${PF}/examples fi # Install pdf/html docs if use doc; then cd "${S}/doc/charm++" # Install pdfs. insinto /usr/share/doc/${PF}/pdf doins *.pdf # Install html. docinto html dohtml -r manual/* fi } pkg_postinst() { einfo "Please test your charm installation by copying the" einfo "content of /usr/share/doc/${PF}/examples to a" einfo "temporary location and run 'make test'." }
