commit: 87d830cf9b57732d4d4b6133c05c0c583fcadaed
Author: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 17 12:30:32 2025 +0000
Commit: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org>
CommitDate: Wed Oct 29 14:33:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d830cf
sci-physics/pythia: add 8.3.15, 8.3.16, drop 8.3.13
- symlink inconsistent /usr/share/{pythia,Pythia8} names
- expose USE static-libs for sci-physics/madgraph5::sci
- add upstream submiteed AR patch for linked bug
See-also: https://github.com/gentoo/sci/pull/1380
Closes: https://bugs.gentoo.org/866719
Part-of: https://github.com/gentoo/gentoo/pull/44219
Signed-off-by: Alexander Puck Neuwirth <apn-pucky <AT> gentoo.org>
sci-physics/pythia/Manifest | 2 ++
sci-physics/pythia/files/pythia-8.3.15-ar.patch | 23 ++++++++++++++++++++++
.../{pythia-8.3.13.ebuild => pythia-8.3.15.ebuild} | 22 ++++++++++++++-------
.../{pythia-9999.ebuild => pythia-8.3.16.ebuild} | 13 +++++++-----
sci-physics/pythia/pythia-9999.ebuild | 9 ++++-----
5 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 0f84aa8bbe3a..054bb7233f69 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -15,3 +15,5 @@ DIST pythia8311.tgz 28757044 BLAKE2B
93a7cc26682bc6418f85e41def94a8cdfe39e180fa9
DIST pythia8312.tgz 30218597 BLAKE2B
71efca55572a241cf369e90186b033fbcd2326de82867f3f13057fbda372885632cab3d7b34ac5b444419bba4dd8d6c4bb90e12bf2424a43ae313c21268e8d89
SHA512
683ece1bd2cfd49d9cee742ce3fab693c5bf15017a6584d33e2a00bd0f0a67d1b84ff48da75f39cb4a4b564b9a35f997ab5187fe691f1f4b724cec5a4d717a23
DIST pythia8313.tgz 29957501 BLAKE2B
2149cafba036d09a66b874c775f4a425d5bbdd65d37f23c851f9cd3f7026ae45581187542d11ae5bbc18b7280fbc14e4daabd684b71c4437b3d9d1a4429f254a
SHA512
1753323aa021ec5d999056517dc021fd73b7331441ff4c841d559df884700cc997e6384043de7c15a054ec8a3b2d76f1cb9f5edc7c6141f08f70d49ca5f6fb84
DIST pythia8314.tgz 30007148 BLAKE2B
e953496c67e7678d6bb30660b83eba4928e7696e582924971ffb07aedc76baab5ab9103e720b49eac5d4f8014131926726df322e808e38416f395aa9f9f4776f
SHA512
bd21f56a8a07f3f9198328cddaa5b6c7fb0f048e2ab17d2f4e9da17dc98039dbb0df3cb1022a0d1030bc9eeda59036bc0a7299a5df38d202ee3c58f484e1635e
+DIST pythia8315.tgz 30604140 BLAKE2B
0a9e799cde433cd0fac3645c4fed84404184f5d0a112bb19561b1d6d3b1bd5b1269cf07fb81f032ece07db683e8f919d0300a83997fe4fd6d39087ddee63d329
SHA512
37919544e5fe49194aae712ab34890c242e4da13a814e21b823d3835cc806d157e1cafff3fd93f27c0c30aab894b045e2b6e240e4dbd54bc4d6252698ff2356a
+DIST pythia8316.tgz 30428099 BLAKE2B
d78bf0f9ae1978b46ae94322dbe63c010a05cd17deb441bbee4851af8d5920592b83386fd7c96dce0bcf47218b4360d56037ee52a6f9a8e29e01a85bc2f00419
SHA512
3c308b09e25856d079f1b5790e2560d28fc6e9ae23ece70f37efa53569360747e74ad7264604e8f2f99a75b3a18059196e71b375ad2321abfd2c5ceab1e0ec66
diff --git a/sci-physics/pythia/files/pythia-8.3.15-ar.patch
b/sci-physics/pythia/files/pythia-8.3.15-ar.patch
new file mode 100644
index 000000000000..b58d0579f621
--- /dev/null
+++ b/sci-physics/pythia/files/pythia-8.3.15-ar.patch
@@ -0,0 +1,23 @@
+diff --git c/Makefile w/Makefile
+index ba61cc2a..d301c3c2 100644
+--- c/Makefile
++++ w/Makefile
+@@ -17,6 +17,9 @@
+
+ # Set the shell.
+ SHELL=/usr/bin/env bash
++# Use standard variables if missing
++AR ?= ar
++ARFLAGS ?= cr
+
+ # Include the configuration and set the local directory structure.
+ ifeq (,$(findstring clean, $(MAKECMDGOALS)))
+@@ -129,7 +132,7 @@ $(LOCAL_TMP)/Streams.o: $(LOCAL_SRC)/Streams.cc
Makefile.inc
+ $(LOCAL_TMP)/%.o: $(LOCAL_SRC)/%.cc
+ $(CXX) $< -o $@ -c $(OBJ_COMMON)
+ $(LOCAL_LIB)/libpythia8.a: $(OBJECTS)
+- ar cr $@ $^
++ $(AR) $(ARFLAGS) $@ $^
+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX): $(OBJECTS)
+ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
+ $(LIB_COMMON) $(CXX_DTAGS)
diff --git a/sci-physics/pythia/pythia-8.3.13.ebuild
b/sci-physics/pythia/pythia-8.3.15.ebuild
similarity index 91%
rename from sci-physics/pythia/pythia-8.3.13.ebuild
rename to sci-physics/pythia/pythia-8.3.15.ebuild
index 9528a6282f71..f629c4237692 100644
--- a/sci-physics/pythia/pythia-8.3.13.ebuild
+++ b/sci-physics/pythia/pythia-8.3.15.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{11..13} )
-inherit toolchain-funcs python-single-r1
+inherit toolchain-funcs python-single-r1 optfeature
MV=$(ver_cut 1-2)
MY_P="${PN}${PV//./}"
@@ -34,7 +34,7 @@ fi
LICENSE="GPL-2"
SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python
highfive mpich rivet" # evtgen mg5mes rivet powheg
+IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python
highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
RESTRICT="!test? ( test )"
REQUIRED_USE="
?? ( hepmc3 hepmc2 )
@@ -52,7 +52,7 @@ RDEPEND="
sci-libs/hdf5[cxx]
)
rivet? (
- sci-physics/rivet:*
+ >=sci-physics/rivet-4:*
)
mpich? ( sys-cluster/mpich )
python? ( ${PYTHON_DEPS} )
@@ -65,6 +65,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.3.15-ar.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
@@ -179,9 +183,11 @@ src_install() {
dobin bin/pythia8-config
doheader -r include/*
dolib.so lib/libpythia8.so
+ use static-libs && dolib.a lib/libpythia8.a
use lhapdf && dolib.so lib/libpythia8lhapdf6.so
insinto "${PYTHIADIR}"
- doins -r share/Pythia8/xmldoc share/Pythia8/pdfdata
examples/Makefile.inc
+ doins -r share/Pythia8/tunes share/Pythia8/xmldoc share/Pythia8/pdfdata
examples/Makefile.inc
+ dosym Pythia8 /usr/share/${PN}
newenvd - 99pythia8 <<- _EOF_
PYTHIA8DATA=${EPYTHIADIR}/xmldoc
@@ -194,12 +200,9 @@ src_install() {
dodoc -r share/Pythia8/htmldoc/.
fi
if use examples; then
- # reuse system Makefile.inc
- rm examples/Makefile.inc || die
sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
examples/Makefile || die
- insinto /usr/share/${PN}
doins -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
@@ -212,3 +215,8 @@ src_install() {
# cleanup
unset PYTHIADIR EPYTHIADIR
}
+
+pkg_postinstall() {
+ optfeature "python interface awkward array support" dev-python/awkward
+ optfeature "python interface vector support" dev-python/vector
+}
diff --git a/sci-physics/pythia/pythia-9999.ebuild
b/sci-physics/pythia/pythia-8.3.16.ebuild
similarity index 96%
copy from sci-physics/pythia/pythia-9999.ebuild
copy to sci-physics/pythia/pythia-8.3.16.ebuild
index e18740843e10..f629c4237692 100644
--- a/sci-physics/pythia/pythia-9999.ebuild
+++ b/sci-physics/pythia/pythia-8.3.16.ebuild
@@ -34,7 +34,7 @@ fi
LICENSE="GPL-2"
SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python
highfive mpich rivet" # evtgen mg5mes rivet powheg
+IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python
highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
RESTRICT="!test? ( test )"
REQUIRED_USE="
?? ( hepmc3 hepmc2 )
@@ -52,7 +52,7 @@ RDEPEND="
sci-libs/hdf5[cxx]
)
rivet? (
- sci-physics/rivet:*
+ >=sci-physics/rivet-4:*
)
mpich? ( sys-cluster/mpich )
python? ( ${PYTHON_DEPS} )
@@ -65,6 +65,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.3.15-ar.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
@@ -179,9 +183,11 @@ src_install() {
dobin bin/pythia8-config
doheader -r include/*
dolib.so lib/libpythia8.so
+ use static-libs && dolib.a lib/libpythia8.a
use lhapdf && dolib.so lib/libpythia8lhapdf6.so
insinto "${PYTHIADIR}"
doins -r share/Pythia8/tunes share/Pythia8/xmldoc share/Pythia8/pdfdata
examples/Makefile.inc
+ dosym Pythia8 /usr/share/${PN}
newenvd - 99pythia8 <<- _EOF_
PYTHIA8DATA=${EPYTHIADIR}/xmldoc
@@ -194,12 +200,9 @@ src_install() {
dodoc -r share/Pythia8/htmldoc/.
fi
if use examples; then
- # reuse system Makefile.inc
- rm examples/Makefile.inc || die
sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
examples/Makefile || die
- insinto /usr/share/${PN}
doins -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/sci-physics/pythia/pythia-9999.ebuild
b/sci-physics/pythia/pythia-9999.ebuild
index e18740843e10..4f29b7f37f90 100644
--- a/sci-physics/pythia/pythia-9999.ebuild
+++ b/sci-physics/pythia/pythia-9999.ebuild
@@ -34,7 +34,7 @@ fi
LICENSE="GPL-2"
SLOT="8"
-IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python
highfive mpich rivet" # evtgen mg5mes rivet powheg
+IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib python
highfive mpich rivet static-libs" # evtgen mg5mes rivet powheg
RESTRICT="!test? ( test )"
REQUIRED_USE="
?? ( hepmc3 hepmc2 )
@@ -52,7 +52,7 @@ RDEPEND="
sci-libs/hdf5[cxx]
)
rivet? (
- sci-physics/rivet:*
+ >=sci-physics/rivet-4:*
)
mpich? ( sys-cluster/mpich )
python? ( ${PYTHON_DEPS} )
@@ -179,9 +179,11 @@ src_install() {
dobin bin/pythia8-config
doheader -r include/*
dolib.so lib/libpythia8.so
+ use static-libs && dolib.a lib/libpythia8.a
use lhapdf && dolib.so lib/libpythia8lhapdf6.so
insinto "${PYTHIADIR}"
doins -r share/Pythia8/tunes share/Pythia8/xmldoc share/Pythia8/pdfdata
examples/Makefile.inc
+ dosym Pythia8 /usr/share/${PN}
newenvd - 99pythia8 <<- _EOF_
PYTHIA8DATA=${EPYTHIADIR}/xmldoc
@@ -194,12 +196,9 @@ src_install() {
dodoc -r share/Pythia8/htmldoc/.
fi
if use examples; then
- # reuse system Makefile.inc
- rm examples/Makefile.inc || die
sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
examples/Makefile || die
- insinto /usr/share/${PN}
doins -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
