commit: 1ea648affd30e1fef6a0ed1601bb6533f9c25285 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 29 16:20:00 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 30 21:28:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea648af
sci-physics/pythia: drop IUSE hepmc, minor ebuild style cleanups It was blocking sci-physics/hepmc:2 cleanup. Bug: https://bugs.gentoo.org/968135 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...{pythia-9999.ebuild => pythia-8.3.16-r1.ebuild} | 22 ++++++++++------------ sci-physics/pythia/pythia-9999.ebuild | 18 ++++++------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/sci-physics/pythia/pythia-9999.ebuild b/sci-physics/pythia/pythia-8.3.16-r1.ebuild similarity index 94% copy from sci-physics/pythia/pythia-9999.ebuild copy to sci-physics/pythia/pythia-8.3.16-r1.ebuild index 2967483d6ed1..cce0c6485d54 100644 --- a/sci-physics/pythia/pythia-9999.ebuild +++ b/sci-physics/pythia/pythia-8.3.16-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) inherit toolchain-funcs python-single-r1 optfeature -MV=$(ver_cut 1-2) +MY_PV=$(ver_cut 1-2) MY_P="${PN}${PV//./}" LHA_VER="6.2.1" @@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"; else - SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz + SRC_URI="https://pythia.org/download/${PN}${MY_PV//./}/${MY_P}.tgz ${SRC_URI}" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" @@ -34,29 +34,23 @@ fi LICENSE="GPL-2" SLOT="8" -IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg +IUSE="doc examples fastjet +hepmc3 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg RESTRICT="!test? ( test )" -REQUIRED_USE=" - ?? ( hepmc3 hepmc2 ) - python? ( ${PYTHON_REQUIRED_USE} ) -" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" fastjet? ( sci-physics/fastjet ) hepmc3? ( sci-physics/hepmc:3= ) - hepmc2? ( sci-physics/hepmc:2= ) lhapdf? ( sci-physics/lhapdf:= ) zlib? ( virtual/zlib:= ) highfive? ( sci-libs/highfive sci-libs/hdf5[cxx] ) - rivet? ( - >=sci-physics/rivet-4:* - ) + rivet? ( >=sci-physics/rivet-4:* ) mpich? ( sys-cluster/mpich ) python? ( ${PYTHON_DEPS} ) - " +" DEPEND="${RDEPEND}" # ROOT is used only when building related tests BDEPEND=" @@ -65,6 +59,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-8.3.15-ar.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sci-physics/pythia/pythia-9999.ebuild b/sci-physics/pythia/pythia-9999.ebuild index 2967483d6ed1..3fc7af42a508 100644 --- a/sci-physics/pythia/pythia-9999.ebuild +++ b/sci-physics/pythia/pythia-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) inherit toolchain-funcs python-single-r1 optfeature -MV=$(ver_cut 1-2) +MY_PV=$(ver_cut 1-2) MY_P="${PN}${PV//./}" LHA_VER="6.2.1" @@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/Pythia8/releases"; else - SRC_URI="https://pythia.org/download/${PN}${MV//./}/${MY_P}.tgz + SRC_URI="https://pythia.org/download/${PN}${MY_PV//./}/${MY_P}.tgz ${SRC_URI}" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" @@ -34,29 +34,23 @@ fi LICENSE="GPL-2" SLOT="8" -IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg +IUSE="doc examples fastjet +hepmc3 lhapdf root test zlib python highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg RESTRICT="!test? ( test )" -REQUIRED_USE=" - ?? ( hepmc3 hepmc2 ) - python? ( ${PYTHON_REQUIRED_USE} ) -" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" fastjet? ( sci-physics/fastjet ) hepmc3? ( sci-physics/hepmc:3= ) - hepmc2? ( sci-physics/hepmc:2= ) lhapdf? ( sci-physics/lhapdf:= ) zlib? ( virtual/zlib:= ) highfive? ( sci-libs/highfive sci-libs/hdf5[cxx] ) - rivet? ( - >=sci-physics/rivet-4:* - ) + rivet? ( >=sci-physics/rivet-4:* ) mpich? ( sys-cluster/mpich ) python? ( ${PYTHON_DEPS} ) - " +" DEPEND="${RDEPEND}" # ROOT is used only when building related tests BDEPEND="
