commit: 05d94d6c8dd8d75ddf69eef770fc0b1480a4c803
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 08:18:18 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 08:20:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d94d6c
sci-physics/thepeg: Remove dep on rivet
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-physics/thepeg/metadata.xml | 1 -
sci-physics/thepeg/thepeg-1.9.2.ebuild | 5 ++---
sci-physics/thepeg/thepeg-2.0.0.ebuild | 5 ++---
sci-physics/thepeg/thepeg-2.0.4.ebuild | 5 ++---
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index b98a9450c6f..4f8dcee86a8 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -19,6 +19,5 @@
<flag name="hepmc">Adds support for High Energy Physics Monte
Carlo
Generators <pkg>sci-physics/hepmc</pkg></flag>
<flag name="lhapdf">Adds support for
<pkg>sci-physics/lhapdf</pkg></flag>
- <flag name="rivet">Adds support for
<pkg>sci-physics/rivet</pkg></flag>
</use>
</pkgmetadata>
diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild
b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index 1f333ed8402..dfe097cf8ca 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
SLOT="0/18"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
lhapdf? ( sci-physics/lhapdf:0= )
- rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"
DEPEND="${RDEPEND}
test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
$(use_with hepmc hepmc "${EPREFIX}"/usr)
$(use_with java javagui)
$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
- $(use_with rivet rivet "${EPREFIX}"/usr)
+ --without-rivet
$(use_with zlib zlib "${EPREFIX}"/usr)
)
autotools-utils_src_configure
diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild
b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 6d4e9927f49..22c553e8f5d 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
SLOT="0/20"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
lhapdf? ( sci-physics/lhapdf:0= )
- rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"
DEPEND="${RDEPEND}
test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
$(use_with hepmc hepmc "${EPREFIX}"/usr)
$(use_with java javagui)
$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
- $(use_with rivet rivet "${EPREFIX}"/usr)
+ --without-rivet
$(use_with zlib zlib "${EPREFIX}"/usr)
)
autotools-utils_src_configure
diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 93ed41abb78..69fd55af01e 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
SLOT="0/20"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -31,7 +31,6 @@ RDEPEND="
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
- rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"
DEPEND="${RDEPEND}
test? ( sys-process/time )"
@@ -64,7 +63,7 @@ src_configure() {
$(use_with hepmc hepmc "${EPREFIX}"/usr) \
$(use_with java javagui) \
$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
- $(use_with rivet rivet "${EPREFIX}"/usr) \
+ --without-rivet \
$(use_with zlib zlib "${EPREFIX}"/usr)
}