[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/otf2/

[Andrew Ammerlaan]

commit:     19d5ef12cd48b585f2a2bc06abb5178beea9dc89
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Jul 26 22:32:18 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 23:28:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=19d5ef12

sys-cluster/otf2: fix sionlib detection

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/otf2/metadata.xml                            |  2 +-
 sys-cluster/otf2/{otf2-2.3.ebuild => otf2-2.3-r1.ebuild} | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/otf2/metadata.xml b/sys-cluster/otf2/metadata.xml
index 0c04defae..2edcd3ced 100644
--- a/sys-cluster/otf2/metadata.xml
+++ b/sys-cluster/otf2/metadata.xml
@@ -6,6 +6,6 @@
                <name>Alessandro Barbieri</name>
        </maintainer>
        <use>
-               <flag name="sionlib">Enable <pkg>sys-cluster/sionlib</pkg> 
support</flag>
+               <flag name="sionlib">Enable <pkg>sys-cluster/sionlibl</pkg> 
support</flag>
        </use>
 </pkgmetadata>

diff --git a/sys-cluster/otf2/otf2-2.3.ebuild 
b/sys-cluster/otf2/otf2-2.3-r1.ebuild
similarity index 76%
rename from sys-cluster/otf2/otf2-2.3.ebuild
rename to sys-cluster/otf2/otf2-2.3-r1.ebuild
index 078fda868..35a693294 100644
--- a/sys-cluster/otf2/otf2-2.3.ebuild
+++ b/sys-cluster/otf2/otf2-2.3-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
        ${PYTHON_DEPS}
        $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 
-       sionlib? ( sys-cluster/sionlib[tools] )
+       sionlib? ( sys-cluster/sionlibl:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -36,9 +36,15 @@ src_configure() {
 
                $(use_enable test backend-test-runs)
                $(use_enable debug)
-               $(use_with sionlib)
        )
 
+        if use sionlib; then
+                myconf+=( "--with-sionlib=${EPREFIX}/usr" )
+                myconf+=( 
"--with-sionlib-headers=${EPREFIX}/usr/include/sionlibl" )
+       else
+                myconf+=( "--without-sionlib" )
+        fi
+
        econf "${myconf[@]}"
 }