commit: 89c7b7bfddb1f1a9da43e4000b7bb79dbf6a628b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 30 21:32:37 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 21:38:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c7b7bf
sci-physics/rivet: fix DESCRIPTION to not repeat PN, sanitise MY_* vars
Improve ebuild style, move blocker to RDEPEND-only
9999: Stop unnecessary tarball renaming (assuming future bumps are spun off it)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-physics/rivet/rivet-4.1.2.ebuild | 20 ++++++++------------
sci-physics/rivet/rivet-9999.ebuild | 20 ++++++++------------
2 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/sci-physics/rivet/rivet-4.1.2.ebuild
b/sci-physics/rivet/rivet-4.1.2.ebuild
index 2ee335a0f125..a37c1ca27a09 100644
--- a/sci-physics/rivet/rivet-4.1.2.ebuild
+++ b/sci-physics/rivet/rivet-4.1.2.ebuild
@@ -3,14 +3,11 @@
EAPI=8
+MY_P=Rivet-${PV}
PYTHON_COMPAT=( python3_{11..13} )
-
inherit python-single-r1 flag-o-matic autotools optfeature bash-completion-r1
-MY_PN="Rivet"
-MY_PF=${MY_PN}-${PV}
-
-DESCRIPTION="Rivet toolkit (Robust Independent Validation of Experiment and
Theory)"
+DESCRIPTION="Robust Independent Validation of Experiment and Theory toolkit"
HOMEPAGE="
https://rivet.hepforge.org/
https://gitlab.com/hepcedar/rivet
@@ -20,19 +17,17 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.com/hepcedar/rivet";
EGIT_BRANCH="main"
else
- SRC_URI="https://www.hepforge.org/archive/rivet/${MY_PF}.tar.gz ->
${P}.tar.gz"
- S=${WORKDIR}/${MY_PF}
+ SRC_URI="https://www.hepforge.org/archive/rivet/${MY_P}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64"
fi
LICENSE="GPL-3+"
SLOT="4/${PV}"
IUSE="+zlib +python +highfive"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="
+DEPEND="
dev-cpp/yaml-cpp
>=sci-physics/fastjet-3.4.0[plugins]
>=sci-physics/fastjet-contrib-1.048
@@ -52,9 +47,10 @@ RDEPEND="
>=sci-physics/yoda-2.1[${PYTHON_SINGLE_USEDEP}]
)
>=sci-physics/yoda-2.1:=[highfive(-)?]
+"
+RDEPEND="${DEPEND}
!sci-physics/rivet:3
"
-DEPEND="${RDEPEND}"
BDEPEND="
app-shells/bash
python? (
diff --git a/sci-physics/rivet/rivet-9999.ebuild
b/sci-physics/rivet/rivet-9999.ebuild
index 1e38689db0c5..52dee33e38f0 100644
--- a/sci-physics/rivet/rivet-9999.ebuild
+++ b/sci-physics/rivet/rivet-9999.ebuild
@@ -3,14 +3,11 @@
EAPI=8
+MY_P=Rivet-${PV}
PYTHON_COMPAT=( python3_{11..13} )
-
inherit python-single-r1 flag-o-matic autotools optfeature bash-completion-r1
-MY_PN="Rivet"
-MY_PF=${MY_PN}-${PV}
-
-DESCRIPTION="Rivet toolkit (Robust Independent Validation of Experiment and
Theory)"
+DESCRIPTION="Robust Independent Validation of Experiment and Theory toolkit"
HOMEPAGE="
https://rivet.hepforge.org/
https://gitlab.com/hepcedar/rivet
@@ -20,19 +17,17 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.com/hepcedar/rivet";
EGIT_BRANCH="main"
else
- SRC_URI="https://www.hepforge.org/archive/rivet/${MY_PF}.tar.gz ->
${P}.tar.gz"
- S=${WORKDIR}/${MY_PF}
+ SRC_URI="https://www.hepforge.org/archive/rivet/${MY_P}.tar.gz";
+ S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64"
fi
LICENSE="GPL-3+"
SLOT="4/${PV}"
IUSE="+zlib +python +highfive"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="
+DEPEND="
dev-cpp/yaml-cpp
>=sci-physics/fastjet-3.4.0[plugins]
>=sci-physics/fastjet-contrib-1.048
@@ -52,9 +47,10 @@ RDEPEND="
sci-physics/yoda[${PYTHON_SINGLE_USEDEP}]
)
>=sci-physics/yoda-2.1:=
+"
+RDEPEND="${DEPEND}
!sci-physics/rivet:3
"
-DEPEND="${RDEPEND}"
BDEPEND="
app-shells/bash
python? (
