commit:     ea83d9a9692668c300d27d2821f185df419058f7
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 14:44:48 2016 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed May 18 14:44:48 2016 +0000
URL:        https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=ea83d9a9

sci-misc/{cube,opari2,otf2,scorep}: version bump

 sci-misc/cube/Manifest                                |  2 +-
 .../cube/{cube-4.3.3.ebuild => cube-4.3.4.ebuild}     |  0
 sci-misc/opari2/Manifest                              |  2 +-
 .../opari2/{opari2-1.1.4.ebuild => opari2-2.0.ebuild} | 10 +++++++---
 sci-misc/otf2/Manifest                                |  2 +-
 sci-misc/otf2/{otf2-1.5.1.ebuild => otf2-2.0.ebuild}  |  3 +++
 sci-misc/scorep/Manifest                              |  2 +-
 .../{scorep-1.4.2.ebuild => scorep-2.0.1.ebuild}      | 19 ++++++++++++-------
 8 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/sci-misc/cube/Manifest b/sci-misc/cube/Manifest
index 2a74059..f0b2e00 100644
--- a/sci-misc/cube/Manifest
+++ b/sci-misc/cube/Manifest
@@ -1 +1 @@
-DIST cube-4.3.3.tar.gz 8192705 SHA256 
ce8e1bff5a208fe5700a0194170be85bbd8f554e1aa1514b4afc5129326c7f83 SHA512 
4293d378f6137294db7e85c02ca92b2a98d7c7126486b3463de518aa582dc780fd11fd9e061c8baa22ec4f75e64e74cfe46aeeb184cecbda699b13cddce47b02
 WHIRLPOOL 
2de70686e904b326522e0269f92cb60619aa2bb5e078029b634a5f667f3e10b7f7d8c7533554209d4398ed29511a3b8cd35b8c15f63ed0c6a8207be194ffe018
+DIST cube-4.3.4.tar.gz 9426048 SHA256 
34c55fc5d0c84942c0845a7324d84cde09f3bc1b3fae6a0f9556f7ea0e201065 SHA512 
bdd08f517be1e0b4ba0b4dc62ed29914a40eb2e640f81840013c90665b44f924d95770ffaf024f5a64f9176c712d0b6aef4ea9eea5ddb7e246ab6b56e8b77e5e
 WHIRLPOOL 
bac4fa4d520aae1a95759e547509945926336183334926121e00ae065e0af26e1aaf55cecf1eb8dc9e4c2bbc05f6e875df7a347a2221e39ad2234f6b55c56d60

diff --git a/sci-misc/cube/cube-4.3.3.ebuild b/sci-misc/cube/cube-4.3.4.ebuild
similarity index 100%
rename from sci-misc/cube/cube-4.3.3.ebuild
rename to sci-misc/cube/cube-4.3.4.ebuild

diff --git a/sci-misc/opari2/Manifest b/sci-misc/opari2/Manifest
index 33a4d4a..8592eec 100644
--- a/sci-misc/opari2/Manifest
+++ b/sci-misc/opari2/Manifest
@@ -1 +1 @@
-DIST opari2-1.1.4.tar.gz 950100 SHA256 
b80c04fe876faaa4ee9a0654486ecbeba516b27fc14a90d20c6384e81060cffe SHA512 
a9659d1a6c5219e2ac83a880092e04d0b53c7730f8e965e661fbf3c51de0b84561afa216349cfc122dc0c1dc80e44157b5367e6d6c03649ade7f115ce7b517a4
 WHIRLPOOL 
eb8e8dc1d9c9ea3f9be128e3673a3070bd61bf5b3234afcffd0d994a6c0b4fe21b64fa452fe6c16544971d35b51cc62cc4f26602c62eb13c641e70aa5387399d
+DIST opari2-2.0.tar.gz 1354803 SHA256 
0c4e575be05627cd001d692204f10caef37b2f3d1ec825f98cbe1bfa4232b0b7 SHA512 
5db8878d9fa713df1532f56c96085e0d0aaebfa5b5e59dc88960aa22094e76fd9432b89fea53ae991a8e1ac3253a75d716b6eaa0c331cf258e5209d7e08b4599
 WHIRLPOOL 
66c71f68550cae05835a3848d44c36dbb4d31f2085d8b1711dcfd5f41c30a0c5f929aa3cd55d9b234afa33894efbdeb9356194902abee6b1f7e65befb29b259a

diff --git a/sci-misc/opari2/opari2-1.1.4.ebuild 
b/sci-misc/opari2/opari2-2.0.ebuild
similarity index 79%
rename from sci-misc/opari2/opari2-1.1.4.ebuild
rename to sci-misc/opari2/opari2-2.0.ebuild
index 679f09c..34afc8b 100644
--- a/sci-misc/opari2/opari2-1.1.4.ebuild
+++ b/sci-misc/opari2/opari2-2.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit fortran-2
+inherit eutils fortran-2
 
 DESCRIPTION="Source-to-source instrumentation tool for OpenMP and hybrid 
codes."
 HOMEPAGE="http://www.vi-hps.org/Tools/OPARI2.html";
@@ -13,7 +13,7 @@ 
SRC_URI="http://www.vi-hps.org/upload/packages/opari2/${P}.tar.gz";
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc +openmp"
+IUSE="doc +openmp static-libs"
 
 DEPEND=""
 RDEPEND=""
@@ -21,12 +21,16 @@ RDEPEND=""
 src_configure() {
        econf \
                --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable openmp)
+               --enable-shared \
+               $(use_enable openmp) \
+               $(use_enable static-libs static)
 }
 
 src_install() {
        default
 
+       prune_libtool_files
+
        if ! use doc ; then
                rm -r "${ED}/usr/share/doc/${PF}"/{example*,html,pdf} || die 
"removing docs failed"
        fi

diff --git a/sci-misc/otf2/Manifest b/sci-misc/otf2/Manifest
index f0a5ec5..bd6a498 100644
--- a/sci-misc/otf2/Manifest
+++ b/sci-misc/otf2/Manifest
@@ -1 +1 @@
-DIST otf2-1.5.1.tar.gz 6185146 SHA256 
a4dc9f6c99376030b43a4c7b1ee77cfb530b03928ea688c6d1a380b3f4e8e488 SHA512 
6fb52e139a543c75e65ba9c8c384b950a072503d5e8154db4430499d7963fc8812e8d6fef0d35f6aa44bdca946fdb5578ea3347ebf69a2f5939fd9eb367a6699
 WHIRLPOOL 
038589a3060aa1b9c9ce83a7ae6d0b1760ccd53971fcab6552cea995eac8dbf0914a86366cc212b012032e80551ab31b73ffd861d6970d076e7072e1c1d2b02a
+DIST otf2-2.0.tar.gz 4568878 SHA256 
bafe0ac08e0a13e71568e5774dc83bd305d907159b4ceeb53d2e9f6e29462754 SHA512 
6ce4e23801cce3377fd29c1e4a5a4d1dbebe7260202c1ce77d213d09ecf536679f15a23c06424e491ef4fb6116596d54187fd7f51c8c8cefb25fac4a52475207
 WHIRLPOOL 
e85150dfcc105c1ebddf2403ad018ea355348267c74117f16268a3364fddf8cf0d6a2e4e41dd62449f5d15d0f8eba18d1ba778dd3037841f328b9faf286da35f

diff --git a/sci-misc/otf2/otf2-1.5.1.ebuild b/sci-misc/otf2/otf2-2.0.ebuild
similarity index 95%
rename from sci-misc/otf2/otf2-1.5.1.ebuild
rename to sci-misc/otf2/otf2-2.0.ebuild
index 79a04d9..8a9cb9e 100644
--- a/sci-misc/otf2/otf2-1.5.1.ebuild
+++ b/sci-misc/otf2/otf2-2.0.ebuild
@@ -21,6 +21,9 @@ DEPEND="${PYTHON_DEPS}
                dev-python/jinja[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
+# TODO:
+# sionlib (see ./build-backend/configure)
+
 src_configure() {
        python_setup
 

diff --git a/sci-misc/scorep/Manifest b/sci-misc/scorep/Manifest
index 35c8be4..a580254 100644
--- a/sci-misc/scorep/Manifest
+++ b/sci-misc/scorep/Manifest
@@ -1 +1 @@
-DIST scorep-1.4.2.tar.gz 19567836 SHA256 
d7f3fcca2efeb2f5d5b5f183b3b2c4775e66cbb3400ea2da841dd0428713ebac SHA512 
5cfce14c26335f97590510c407788c4e42d69d0d0d7bb09f645c6f7151480d797007e638c44966e4b631eec076e1bd56c35143ec3b611d60b3ca2dbc814d3761
 WHIRLPOOL 
31c3e0e27174f06f9866e538e297a3046970f1ce05bd19c28aab51489b6d6506da5ac9de9aff7213efdaf7e54578ae246970bfd4e836a332b817023fd9a95797
+DIST scorep-2.0.1.tar.gz 20147849 SHA256 
e871cfdbcf51384e252037af2bf4d4e8c5200619263e85e3c8b7d211090911ef SHA512 
896a45593db053c0de7be10b06394880381c7b22e37f20828a1a590ebbb13ad19f444f757aec8f64ac39cb3480be46fa09b475afbabb8b4e13d781deb9ffe5c2
 WHIRLPOOL 
f6f90957febb99ffb21c596bd8219d983a836b1d7ef116b1979c9072f139643b26fadfe772a7d780728d0160bef61c3cbac8e2ed0121cc15aa96bac775190f59

diff --git a/sci-misc/scorep/scorep-1.4.2.ebuild 
b/sci-misc/scorep/scorep-2.0.1.ebuild
similarity index 80%
rename from sci-misc/scorep/scorep-1.4.2.ebuild
rename to sci-misc/scorep/scorep-2.0.1.ebuild
index 0a9b947..0b01cfe 100644
--- a/sci-misc/scorep/scorep-1.4.2.ebuild
+++ b/sci-misc/scorep/scorep-2.0.1.ebuild
@@ -13,20 +13,22 @@ 
SRC_URI="http://www.vi-hps.org/upload/packages/${PN}/${P}.tar.gz";
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+bfd cuda debug doc +gcc-plugin mpi opencl +openmp pmi static-libs"
+IUSE="+bfd cuda debug doc +gcc-plugin mpi opencl +openmp pmi static-libs 
unwind"
 
-DEPEND="=sci-misc/otf2-1.5*
+DEPEND="=sci-misc/otf2-2.0*
        =sci-misc/cube-4.3*
-       ~sci-misc/opari2-1.1.4[openmp?]
+       =sci-misc/opari2-2.0*[openmp?]
        dev-libs/papi
        bfd? ( sys-libs/binutils-libs:= )
        cuda? ( dev-util/nvidia-cuda-sdk )
-       mpi? ( virtual/mpi )
+       mpi? ( sys-cluster/openmpi )
        opencl? ( virtual/opencl )
-       pmi? ( sys-cluster/slurm )"
+       pmi? ( sys-cluster/slurm )
+       unwind? ( sys-libs/libunwind )"
 RDEPEND="${DEPEND}"
 
 # TODO:
+# - plugins incidentally get linked to installed versions of score-p !
 # - papi seems optional, but upstream does not support to disable it explicitly
 # - analyze/expose different CUDA support flags: CUDA vs CUDA-Runtime (CUDART) 
vs CUDA Profiling Tools Interface (CUPTI)
 # - RCA is only on Cray
@@ -34,6 +36,8 @@ RDEPEND="${DEPEND}"
 #   part of TAU: https://www.cs.uoregon.edu/research/tau/downloads.php
 
 src_configure() {
+       local mpi="openmpi"
+
        econf \
                $(use_with bfd libbfd) \
                $(use_enable cuda) \
@@ -42,14 +46,15 @@ src_configure() {
                $(use_with cuda libcupti) \
                $(use_enable debug) \
                $(use_enable gcc-plugin) \
-               $(use_with mpi) \
+               $(use_with mpi mpi ${mpi}) \
                $(use_with opencl libOpenCL) \
                $(use_enable openmp) \
                --without-pdt \
                $(use_with pmi libpmi) \
                --without-librca \
                --enable-shared \
-               $(use_enable static-libs static)
+               $(use_enable static-libs static) \
+               $(use_with unwind libunwind)
 }
 
 src_install() {

Reply via email to