gentoo resync : 31.05.2021

3 files changed, 26 insertions, 55 deletions

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index e7d7ee3d3f9d..a00aa9da10e5 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -1,5 +1,4 @@
 AUX pythia-6.4.28-fno-common.patch 1899 BLAKE2B b05c2f147ec34fa334b830c1105d682dd45ba80f824ed706de12cf2bf5767808a1ac698f57d6a9ea78e6cbcb39ab4fc25a8d5c1e3f7ccc50ac54d81bb1faa678 SHA512 41005cfdc1766541c1336c1d0c2e1acb606496feb4fbd75fc3ef38d5ccb2010d095c927e615d6e33b7533dbe02a876608a7d789e58bcc03de59b233efcbfe814
-AUX pythia-8.2.26-run-tests.patch 1044 BLAKE2B e97cf79874004b0ec99ef19b2b4af39ae96a1f115206d1ddb912bacc895d144162f62156cf92bc876d27a976a1465a6509393b0b50230f1990fe95b8d068d2ed SHA512 37297dbf852b402adc03f9a60ca2f9108d192dc005de1c6dfd9a9725220a50da322267938a91cfe082301942059a9b4caf91a85e41179becee6e9889881c9b57
 AUX pythia8209-root-noninteractive.patch 500 BLAKE2B 7af9e7375cac38d87ae8935e712ac9b2a5109984a4c7111c59033adf46f0d133b94eb8dccb663683302ff0529e56b819c9f667e2d1253e4b4f1c585dcd1a4eff SHA512 9dad44ee084b5edea6560ba639e562c6ddc56cd7170ec21628176aeaec11d535de2813599b9c45b49511ad3d0ad9cb0540d9052179c9e9907d10d81ea55bdea2
 DIST CT10.tar.gz 10246366 BLAKE2B f0daf0a3ca6cd2f178f993944cdc29de5deb1f441d197e47c8b1c285a56abc0fdb1cd53ec5a8e7736e200397bea9ec9cf4d04420ce206e5c396b85b63f695d00 SHA512 90406bd102ab54b683fa3e6f3fc759febea2454a0b96c6a8d373cdec297f5d652097057a015c7d87241792ed9b5d9ac658a33155cdd7362f59110f8f06ecce73
 DIST MRST2004qed.tar.gz 185079 BLAKE2B 62e0371de965698100755b14b0c282095b84b40800a58cd6776c458b03982f032f3b2464eb76174084dd22de9fd962e202a4896327b0a00579c3a632dac24ccc SHA512 404aacf0e241f572cc42ad4cf963deef1acd3d365fa68cfa3518878f921858046377ea39caf663fdced2cdde07af2f6ce695737f7fea229489df3d3f38283c95
@@ -12,7 +11,7 @@ DIST lutp0613man2.pdf 2902047 BLAKE2B c2f8e8f9031c843933cd927b32921813b580a18117
 DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c366c2adf9e914b9abf8c38968dcbc09129badcccd2705bc9437c05e73ee4489807835383546f55fbc9cd65399fb507e704e SHA512 ba921379a6df4ca417b60ea5b78af506f13135cdf896fa6beeca9713428ad6f298c94c0fe65fca3e583f8f268dcf84ebe4f1f81b46fd865d5f641f7c1e9fa7e1
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
-DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
+DIST pythia8245.tgz 23737440 BLAKE2B 74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b SHA512 25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a
 EBUILD pythia-6.4.28-r2.ebuild 2015 BLAKE2B 8e26f38ac4ed140dbd49d9149a9bf56388d9809a26beb27bcd87f2f09503f9bdac7e28ea96413f0f849bfb1cf32c71f32efc2d8c1ca68a8d287168fb35ec5ddc SHA512 9d8527a168976ec0da2aff8ff220a294df566d9581913cb4561ef738eb33a6ec28b77e162fc5b6977cb06359d2264e198821833f5801293ab56a50d20431aaa8
-EBUILD pythia-8.2.26-r1.ebuild 5732 BLAKE2B e93959f6db754f19d410abf4b4c4b25723857a768106cea744374d7195a6fcad6534f683414fbbe3c1512732e4a1353a1f5f136d672aa9e98d1fa6e29ddd0644 SHA512 ff3805db1893b4204f2d6de709b48bb6105ef23c535ecd7c53018a754b56d2f1a319b6ffec7cfca1ba3c10752a6deeb84272f50d00a62e3cd4a85a69f784b571
+EBUILD pythia-8.2.45.ebuild 5696 BLAKE2B a6d951224e50d05ebad40247c5ba38e0515730bdfed77807ab64bfa6445bdab683c18b555bf42184c5dd84bc11cb857e2ac79b6e617092a5242e1217c063efe4 SHA512 da40dc43614288e10c54cd0e2f7d6105528a79d33a08022813655c46c4f7dbaac1af54c7ac29c56f3f0089a02c4c0e679bb4d28423183980d23cea9101c62421
 MISC metadata.xml 1298 BLAKE2B 3a8448cffc50ab81baf30e783a7d30387f4cd61be3f1a35ccdc9277dbb33d7178bbe9e103d189dd78a6775fcfa563480363448308a583ab2d9b513eb6e6f2b46 SHA512 b991381193c62d05d01ea82c74a2fabe3968683b4a1e0914027768dbbc3d2b52a85584b77b1b7274e77222e10da0aaa1a55d3982b423bc7c2b5deb4d775e6389
diff --git a/sci-physics/pythia/files/pythia-8.2.26-run-tests.patch b/sci-physics/pythia/files/pythia-8.2.26-run-tests.patch
deleted file mode 100644
index 34c7179fa55d..000000000000
--- a/sci-physics/pythia/files/pythia-8.2.26-run-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- examples/Makefile.orig	2017-07-25 11:56:03.545393093 +0200
-+++ examples/Makefile	2017-07-25 11:56:37.468572887 +0200
-@@ -158,6 +158,7 @@
- 	rm -f $(LOCAL_EXAMPLE)/weakbosons.lhe
- 	rm -f $(LOCAL_EXAMPLE)/Pythia8.promc
- 	rm -f $(LOCAL_EXAMPLE)/hist.root
-+	rm main*out *.dat
- 
- # Clean all temporary and generated files.
- distclean: clean
-@@ -168,3 +169,16 @@
- 	rm -f $(LOCAL_SHARE)/COPYING
- 	rm -f $(LOCAL_SHARE)/GUIDELINES
- 	rm -f $(LOCAL_SHARE)/README
-+
-+# Run tests, inject test-specific arguments when needed
-+main%.out: main%
-+	./$< \
-+		$(if $(findstring $*,16 42 43 $(shell seq 81 89)), main$*.cmnd) \
-+		$(if $(findstring $*,         $(shell seq 81 83)), w+_production_lhc_0.lhe) \
-+		$(if $(findstring $*,                         84), hepmcout84.dat 2 w+_production_lhc) \
-+		$(if $(findstring $*,         $(shell seq 85 88)), w_production) \
-+		$(if $(findstring $*,   42 43 $(shell seq 81 89)), histout$*.dat) \
-+		> $@
-+
-+main89.out: main89
-+	$(foreach cmd, $(wildcard main89*.cmnd), ./$< $(cmd) histout-$(cmd).dat >> $@ || exit;)
diff --git a/sci-physics/pythia/pythia-8.2.26-r1.ebuild b/sci-physics/pythia/pythia-8.2.45.ebuild
index 3c735682cf15..0dc12374459b 100644
--- a/sci-physics/pythia/pythia-8.2.26-r1.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-run-tests.patch
 	"${FILESDIR}"/${PN}8209-root-noninteractive.patch
 )
 
@@ -60,43 +59,43 @@ src_prepare() {
 	default
 	# set datadir for xmldor in include file
 	sed -i \
-		-e "s:../share/Pythia8/xmldoc:${EPYTHIADIR}/xmldoc:" \
+		-e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
 		include/Pythia8/Pythia.h || die
 	# respect libdir, prefix, flags
 	sed -i \
-		-e "s:/lib:/$(get_libdir):g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:-O2:${CXXFLAGS}:g" \
-		-e "s:Cint:Core:g" \
+		-e "s|/lib|/$(get_libdir)|g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|-O2|${CXXFLAGS}|g" \
+		-e "s|Cint|Core|g" \
 		configure || die
-	sed -i 's:$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED):$(CXX) $(LDFLAGS) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED):g' \
+	sed -i 's|$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED)|$(CXX) $(LDFLAGS) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED)|g' \
 		Makefile || die
-	sed -i 's:$(CXX):$(CXX) $(LDFLAGS):' examples/Makefile || die
+	sed -i 's|$(CXX)|$(CXX) $(LDFLAGS)|' examples/Makefile || die
 	# we use lhapdf6 instead of lhapdf5
 	# some PDFs changed, use something similar
 	sed -i \
-		-e "s:LHAPDF5:LHAPDF6:g" \
-		-e "s:\.LHgrid::g" \
-		-e "s:\.LHpdf::g" \
-		-e "s:MRST2001lo:MRST2007lomod:g" \
-		-e "s:cteq6ll:cteq6l1:g" \
-		-e "s:cteq6m:cteq66:g" \
+		-e "s|LHAPDF5|LHAPDF6|g" \
+		-e "s|\.LHgrid||g" \
+		-e "s|\.LHpdf||g" \
+		-e "s|MRST2001lo|MRST2007lomod|g" \
+		-e "s|cteq6ll|cteq6l1|g" \
+		-e "s|cteq6m|cteq66|g" \
 		examples/*.{cc,cmnd} || die
 	# After lhapdf5->6 migration PDFs are identical within ~1/1000
-	# https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
+	# https|//www.hepforge.org/archive/lhapdf/pdfsets/6.1/README
 	sed -i \
-		-e "s:1e-8:3e-1:g" \
-		-e "s:nlo_as_0119_qed:nlo_as_0119_qed_mc:g" \
-		-e "s:xmldoc:share/Pythia8/xmldoc:g" \
+		-e "s|1e-8|3e-1|g" \
+		-e "s|nlo_as_0119_qed|nlo_as_0119_qed_mc|g" \
+		-e "s|xmldoc|share/Pythia8/xmldoc|g" \
 		examples/main54.cc || die
 	# ask cflags from root
-	sed -i "s:root-config:root-config --cflags:g" examples/Makefile || die
+	sed -i "s|root-config|root-config --cflags|g" examples/Makefile || die
 
 	sed -i \
 		-e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \
-		-e 's:libpythia8\.a$:libpythia8$(LIB_SUFFIX):g' \
+		-e 's|libpythia8\.a$|libpythia8$(LIB_SUFFIX)|g' \
 		Makefile || die
-	sed -i 's:libpythia8\.a:libpythia8$(LIB_SUFFIX):g' \
+	sed -i 's|libpythia8\.a|libpythia8$(LIB_SUFFIX)|g' \
 		examples/Makefile || die
 }
 
@@ -126,8 +125,8 @@ src_configure() {
 
 	# fix pythia config script
 	sed -i \
-		-e 's:pythia8/examples/Makefile.inc:pythia8/Makefile.inc:' \
-		-e 's:LINE%=:LINE%%=:' \
+		-e 's|pythia8/examples/Makefile.inc|pythia8/Makefile.inc|' \
+		-e 's|LINE%=|LINE%%=|' \
 		bin/pythia8-config || die
 }
 
@@ -175,7 +174,7 @@ src_install() {
 	if use examples; then
 		# reuse system Makefile.inc
 		rm examples/Makefile.inc || die
-		sed -i "s:include Makefile.inc:include ${EPYTHIADIR}:" \
+		sed -i "s|include Makefile.inc|include ${EPYTHIADIR}|" \
 			examples/Makefile || die
 
 		insinto /usr/share/${PN}