commit:     6fd0e1971a4a01a866f4a0d8101d21f08469f09d
Author:     Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> 
de>
AuthorDate: Fri Sep  2 04:29:50 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 09:24:07 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6fd0e197

sci-physics/rivet: ESYSROOT and bracketed vars

Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
Closes: https://github.com/gentoo/sci/pull/1170
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-physics/rivet/rivet-3.1.5.ebuild | 8 ++++----
 sci-physics/rivet/rivet-3.1.6.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-physics/rivet/rivet-3.1.5.ebuild 
b/sci-physics/rivet/rivet-3.1.5.ebuild
index 5470ea5a7..4cc7c6018 100644
--- a/sci-physics/rivet/rivet-3.1.5.ebuild
+++ b/sci-physics/rivet/rivet-3.1.5.ebuild
@@ -62,10 +62,10 @@ src_configure() {
        PREFIX_YODA=$(yoda-config --prefix) || die
        PREFIX_FJ=$(fastjet-config --prefix) || die
        econf \
-               $(usex hepmc2 "--with-hepmc=/usr" "") \
-               $(usex hepmc3 "--with-hepmc3=/usr" "") \
-               --with-yoda=$PREFIX_YODA \
-               --with-fastjet=$PREFIX_FJ
+               $(usex hepmc2 "--with-hepmc=${ESYSROOT}/usr" "") \
+               $(usex hepmc3 "--with-hepmc3=${ESYSROOT}/usr" "") \
+               --with-yoda=${PREFIX_YODA} \
+               --with-fastjet=${PREFIX_FJ}
 }
 
 src_install() {

diff --git a/sci-physics/rivet/rivet-3.1.6.ebuild 
b/sci-physics/rivet/rivet-3.1.6.ebuild
index 89a2a09ba..3a83f7136 100644
--- a/sci-physics/rivet/rivet-3.1.6.ebuild
+++ b/sci-physics/rivet/rivet-3.1.6.ebuild
@@ -62,10 +62,10 @@ src_configure() {
        PREFIX_YODA=$(yoda-config --prefix) || die
        PREFIX_FJ=$(fastjet-config --prefix) || die
        econf \
-               $(usex hepmc2 "--with-hepmc=/usr" "") \
-               $(usex hepmc3 "--with-hepmc3=/usr" "") \
-               --with-yoda=$PREFIX_YODA \
-               --with-fastjet=$PREFIX_FJ
+               $(usex hepmc2 "--with-hepmc=${ESYSROOT}/usr" "") \
+               $(usex hepmc3 "--with-hepmc3=${ESYSROOT}/usr" "") \
+               --with-yoda=${PREFIX_YODA} \
+               --with-fastjet=${PREFIX_FJ}
 }
 
 src_install() {

Reply via email to