Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/rivet/
Date: Fri, 02 Sep 2022 09:24:51
Message-Id: 1662110647.6fd0e1971a4a01a866f4a0d8101d21f08469f09d.andrewammerlaan@gentoo
1 commit: 6fd0e1971a4a01a866f4a0d8101d21f08469f09d
2 Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de>
3 AuthorDate: Fri Sep 2 04:29:50 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 09:24:07 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6fd0e197
7
8 sci-physics/rivet: ESYSROOT and bracketed vars
9
10 Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de>
11 Closes: https://github.com/gentoo/sci/pull/1170
12 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
13
14 sci-physics/rivet/rivet-3.1.5.ebuild | 8 ++++----
15 sci-physics/rivet/rivet-3.1.6.ebuild | 8 ++++----
16 2 files changed, 8 insertions(+), 8 deletions(-)
17
18 diff --git a/sci-physics/rivet/rivet-3.1.5.ebuild b/sci-physics/rivet/rivet-3.1.5.ebuild
19 index 5470ea5a7..4cc7c6018 100644
20 --- a/sci-physics/rivet/rivet-3.1.5.ebuild
21 +++ b/sci-physics/rivet/rivet-3.1.5.ebuild
22 @@ -62,10 +62,10 @@ src_configure() {
23 PREFIX_YODA=$(yoda-config --prefix) || die
24 PREFIX_FJ=$(fastjet-config --prefix) || die
25 econf \
26 - $(usex hepmc2 "--with-hepmc=/usr" "") \
27 - $(usex hepmc3 "--with-hepmc3=/usr" "") \
28 - --with-yoda=$PREFIX_YODA \
29 - --with-fastjet=$PREFIX_FJ
30 + $(usex hepmc2 "--with-hepmc=${ESYSROOT}/usr" "") \
31 + $(usex hepmc3 "--with-hepmc3=${ESYSROOT}/usr" "") \
32 + --with-yoda=${PREFIX_YODA} \
33 + --with-fastjet=${PREFIX_FJ}
34 }
35
36 src_install() {
37
38 diff --git a/sci-physics/rivet/rivet-3.1.6.ebuild b/sci-physics/rivet/rivet-3.1.6.ebuild
39 index 89a2a09ba..3a83f7136 100644
40 --- a/sci-physics/rivet/rivet-3.1.6.ebuild
41 +++ b/sci-physics/rivet/rivet-3.1.6.ebuild
42 @@ -62,10 +62,10 @@ src_configure() {
43 PREFIX_YODA=$(yoda-config --prefix) || die
44 PREFIX_FJ=$(fastjet-config --prefix) || die
45 econf \
46 - $(usex hepmc2 "--with-hepmc=/usr" "") \
47 - $(usex hepmc3 "--with-hepmc3=/usr" "") \
48 - --with-yoda=$PREFIX_YODA \
49 - --with-fastjet=$PREFIX_FJ
50 + $(usex hepmc2 "--with-hepmc=${ESYSROOT}/usr" "") \
51 + $(usex hepmc3 "--with-hepmc3=${ESYSROOT}/usr" "") \
52 + --with-yoda=${PREFIX_YODA} \
53 + --with-fastjet=${PREFIX_FJ}
54 }
55
56 src_install() {