From 48910296a628153e7dd3b8fd99dcb8d2d9787c2d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 24 Nov 2014 00:17:07 +0000 Subject: [PATCH] added python-3.4 support Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586 --- sys-cluster/charm/ChangeLog | 7 +- sys-cluster/charm/Manifest | 17 +- sys-cluster/charm/charm-6.6.0-r1.ebuild | 210 ++++++++++++++++++++++++ 3 files changed, 225 insertions(+), 9 deletions(-) create mode 100644 sys-cluster/charm/charm-6.6.0-r1.ebuild diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index a329c0a0de5f..178481362fb6 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/charm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.42 2014/09/26 20:43:32 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.43 2014/11/24 00:16:57 ottxor Exp $ + +*charm-6.6.0-r1 (24 Nov 2014) + + 24 Nov 2014; Christoph Junghans +charm-6.6.0-r1.ebuild: + added python-3.4 support 26 Sep 2014; Christoph Junghans charm-6.6.0.ebuild: clean up install diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest index 0f7be0e43934..fcddb38ed30b 100644 --- a/sys-cluster/charm/Manifest +++ b/sys-cluster/charm/Manifest @@ -13,17 +13,18 @@ DIST charm-6.6.0.tar.gz 18779545 SHA256 c916010f2d4cc2c6bd30ea19764839d0298fb56d EBUILD charm-6.5.1-r1.ebuild 5368 SHA256 07aeebc151441baa3aee6b3cddc6e36bf9ddaa516dc342c3478a6e95a3a17f7e SHA512 12d2afb4c88e900542e44d19c35fabe0502260e612b3da81fc60cca05ca3ddc652a1cce54960aa9a7bdd9b5f45986a13a2c911ae48307194f8f1ddaec845e218 WHIRLPOOL 1ecd4405bb5eaa962d1b3b56c32e8693cfd5ce06aa5874b07d9a89782f52313278fe61457b4a4f3c9a4a1122f02686ce0b3a72d68d8c67a7048024d606d0d9e1 EBUILD charm-6.5.1-r2.ebuild 5431 SHA256 e40245a09e9889a053fb4ebaaa9f6651218993af1c94ae3699e0cd0a15e74767 SHA512 d181c08a298d8733456facc532953c0f018e53a1a032da816e39d40a6a05a0ec4c8ec93dd7b5bbe197835dd36951708ccdeb4b9548e697dca349a75fbf7fc083 WHIRLPOOL 52a48f96bb73bcff41b3e27ff5f518ed573350b6821d1634e106788d49ffe2356a6e1621dca0787432359e034bbc7310e9e683e00669b7c57647f4599b284a9f EBUILD charm-6.5.1-r3.ebuild 5496 SHA256 01488757549d007923056f62804e889987e11b8e1855c1114e04c0750f9cc1d9 SHA512 2a57c3dbfe4d6169df664b805edb373a389bccb34ea2945dd57bfdb4b6bc2689cbbdc54b01e96a3f4b77cf3fd4abe6939a8491dc1b091073787f60a43b4376a3 WHIRLPOOL c545712c7d8c711ad2997161afc43ad71493c10647811c21706b56ca71140ba706cddd51b5a3f91672821730e6e4ebf7baadb78b6e99e624ea775a7ca847eb04 +EBUILD charm-6.6.0-r1.ebuild 5737 SHA256 0f3c76799579cb8f3fae7d9ef703b7f7eed2fb202e0863d98ee68dd870533530 SHA512 a1a0a774c261a5c7a780b6c8b70fa38f03035fdf85399a4fad14a86a92c5c392e078c3cae0c88d84b24c6ac8e4a9294c0702b5adf99f4495c8752fcea1ae3b2e WHIRLPOOL dfbce4b5a4fc9f4f5e29c7251810a7ad1e1d50d28d633718181bad2c410faeba8304891d6b7b23bdbe66092f5d589a13c940d124ba8a72bec16395cf64313870 EBUILD charm-6.6.0.ebuild 5730 SHA256 fd88ca16e7d783a54d1398a3dea386b948b4ba75a327601ecef10af3f2271eb5 SHA512 2710bcda025b277cddb60c7e7ba66568ce36aaac840ad207a7eac5e0f9acb1aa00578fe668be291527404cfdc35d7fb1e571f6f35d1119c6c8d07fe4dbb577e7 WHIRLPOOL ce12c546e4f1097e40c0d48fadab61b03648b354cf387d3f439a3f07b82ee4e2cfc6a05e2963d532dc63c0040139195c6f674d72267e547c90dd83d08508bfe9 -MISC ChangeLog 7257 SHA256 dad4fd24a777529224076f6818942055fec2d050737572d877b9d6470e8dbcb6 SHA512 5421e92611ce20235902c1adee7ec585215bf39349a9379e6c0eb00a9e2a07c9b1342d5c9958bc99e8c36dce105f6853bc4566e85dd0a3d9ca68dd1e46ad0781 WHIRLPOOL 14f3501a370a8ce5da41754f7af4d34c31317eb610ef5769aabf86f15e6cfd81625e38d2e0e66e63e9af682a98f383a494f24e54b3f30298072d042907ae3524 +MISC ChangeLog 7394 SHA256 86e2f542e6024eead5226368711be64afa26ba4301993d04d7d25a20a01b20c7 SHA512 99942aadedb1bc3939afad49a91fc9b2b4188317ec58a4e5db5c61204c0eff529cf97e0d4d252e8a25ab4e002d6d6127e26caa5a73182f1cb1832ba7ecabf323 WHIRLPOOL cd949c24cade0daa72b94015e8d5512e5d1ca496283112239d544a612d312b3af9603225dc639bced95277ec0adb9a9eedd10b6f11a98079139e59388452232d MISC metadata.xml 801 SHA256 4f15971f2c242322338a8c9a08d45707ce56a9a8d09e4e83a5808dd0754d21e4 SHA512 570f95d5d7609b34529524f7932327d1b1a9a3734211a14696fa8156475cc7a0d61a9fcf81f2732acd8f8ae61f88504635bd4278c061fe9e2ee6b796e9860ad5 WHIRLPOOL 70592d90dd5c757e5ec748b809e4dba8acd1f2900a83d639bd0d2f17bf99f957153d5a7664a8950167dc5b89331c2ea2e462afb592c1de57acf083e2e86e2f42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUJc/6AAoJEOeBhlrCAAWG0cQH/3t8f9hZ3cg63eEvd9TZkGAp -jtWSEUl/GcKvaepCCO5OQXhx2DpWPZXjy4s6J5JICiL3Tnu7Sx4YPbDuRNtARlv4 -rF+Jn60PK8a4L9haqbLc/gjTtPxiHM31XTJpa4fINjxpqQQb2fXtDucBDAWuj1/u -lLqJZwzDUJXKOjtcJFDly6A10xxlM4V6JM3EwFd2G0B8Wp8dAdtv0vUTgU6vS0pY -eR/g/nVLG6DUyJ9z3Q56UrcHk9Tb0iz8g07zhcLzuyOZZFw5YM0h/E/Zpp51D3bQ -4uSx7JbgQ3RpcaV0ApljgXPn9hu9nsK1M/+Am6Dfrcm9/2RZpUX76NyHKE53hhE= -=KA9X +iQEcBAEBCAAGBQJUcnj+AAoJEOeBhlrCAAWGGsMH+wdhIqElKtfFtftadQLElkxx +prHGSeEg7FymMzhG5NDuW6iku56Z4ZUGvf7YsfM+Nu3yvoMWWJj6K17wrhB9ihd7 +4I+zhi8KieCeakLzq1Bxzmr39udpb6wyTTj8ZD5liJwScqF0Mest3FIuLVuRr+aV +k1bd5rH0/jBp7q88BpduSGWwvnZ4cf9/zk04Df0596OhsHrCTQ2im6sbNtChyEeq +RfhWxXRMQH0u7HKv85XDpvqmJ2onuPahC0S1NA7r+vEtqRO1nCKyIHKX6p1P+QL2 +EzVn7tV7NnFgfs4IR/gyJZsCG3ceTCfBSKU6xnujwa5uu6A+DugtomthPc9npm8= +=oIzW -----END PGP SIGNATURE----- diff --git a/sys-cluster/charm/charm-6.6.0-r1.ebuild b/sys-cluster/charm/charm-6.6.0-r1.ebuild new file mode 100644 index 000000000000..a8afb985e620 --- /dev/null +++ b/sys-cluster/charm/charm-6.6.0-r1.ebuild @@ -0,0 +1,210 @@ +# 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-r1.ebuild,v 1.1 2014/11/24 00:16:57 ottxor Exp $ + +EAPI=5 + +FORTRAN_STANDARD="90" +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) + +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 libs incl. charm objects + for i in lib*/*.{so,o,a}; do + [[ ${i} = *.a ]] && use !static-libs && continue + if [[ -L ${i} ]]; then + i=$(readlink -e "${i}") || die + fi + [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${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'." +} -- 2.26.2