[gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/files/

2022-06-02 Thread Guilherme Amadio
commit: f0ad7e052bcb1de5e5464ebeb36d4af5920d43f4
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Thu Jun  2 14:27:11 2022 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Thu Jun  2 14:30:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ad7e05

sci-physics/pythia: fix bug 836833

Closes: https://bugs.gentoo.org/836833
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Guilherme Amadio  gentoo.org>

 .../pythia/files/pythia-6.4.28-fno-common.patch| 44 +++---
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch 
b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
index 3ee9bc7c0f7a..45cbe3ea57d6 100644
--- a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
+++ b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
@@ -27,28 +27,28 @@ https://bugs.gentoo.org/766306
 -int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
 -int pyints[2*20];
 -int pybins[4+1000+2*2];
-+extern int pyjets[2+5*4000+2*2*5*4000];
-+extern int pydat1[200+2*200+200+2*200];
-+extern int pydat2[4*500+2*4*500+2*2000+2*4*4];
-+extern int pydat3[3*500+2*8000+2*8000+5*8000];  /* KNDCAY=8000 */
-+extern char pydat4[2*500*16];
-+extern int pydatr[6+2*100];
-+extern int pysubs[2+500+81*2+2*200];
-+extern int pypars[200+2*200+200+2*200];
-+extern int pyint1[400+2*400];
-+extern int pyint2[500+2*500+2*20*500+2*4*40];
-+extern int pyint3[2*81*2+3*1000+2*1000];
-+extern int pyint4[500+2*5*500];
-+extern int pyint5[1+3*501+2*3*501];
-+extern char pyint6[501*28];
-+extern int pyint7[2*6*7*7];
-+extern int pyint8[2*5*13];
-+extern int pyint9[2*4*13];
-+extern int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN 
PYTHIA6 AT ALL!!! */
-+extern int pymssm[100+2*100];
-+extern int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
-+extern int pyints[2*20];
-+extern int pybins[4+1000+2*2];
++static int pyjets[2+5*4000+2*2*5*4000];
++static int pydat1[200+2*200+200+2*200];
++static int pydat2[4*500+2*4*500+2*2000+2*4*4];
++static int pydat3[3*500+2*8000+2*8000+5*8000];  /* KNDCAY=8000 */
++static char pydat4[2*500*16];
++static int pydatr[6+2*100];
++static int pysubs[2+500+81*2+2*200];
++static int pypars[200+2*200+200+2*200];
++static int pyint1[400+2*400];
++static int pyint2[500+2*500+2*20*500+2*4*40];
++static int pyint3[2*81*2+3*1000+2*1000];
++static int pyint4[500+2*5*500];
++static int pyint5[1+3*501+2*3*501];
++static char pyint6[501*28];
++static int pyint7[2*6*7*7];
++static int pyint8[2*5*13];
++static int pyint9[2*4*13];
++static int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN 
PYTHIA6 AT ALL!!! */
++static int pymssm[100+2*100];
++static int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
++static int pyints[2*20];
++static int pybins[4+1000+2*2];
  
  void *pythia6_common_address(const char* name) {
 if  (!strcmp(name,"PYJETS")) return pyjets;



[gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/files/, sci-physics/pythia/

2021-05-23 Thread Andrew Savchenko
commit: bee5d368529051b293849191a395f2a6604d296e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 13:26:07 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 13:29:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee5d368

sci-physics/pythia: remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/pythia/Manifest|   1 -
 .../pythia/files/pythia-8.2.26-run-tests.patch |  27 ---
 sci-physics/pythia/pythia-8.2.26-r1.ebuild | 188 -
 3 files changed, 216 deletions(-)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index f526c4d1d10..b9d8657ca23 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -9,5 +9,4 @@ 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

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 34c7179fa55..000
--- 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.26-r1.ebuild
deleted file mode 100644
index 3c735682cf1..000
--- a/sci-physics/pythia/pythia-8.2.26-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MV=$(ver_cut 1)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/;
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
-   test? ( lhapdf? (
-   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz
-   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/MRST2007lomod.tar.gz
-   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-   

[gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/files/, sci-physics/pythia/

2021-02-13 Thread David Seifert
commit: 8e6368a04f768fdbcaab867866f7a1b9d306a46f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Feb 13 22:51:42 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 13 22:51:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6368a0

sci-physics/pythia: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-physics/pythia/Manifest|   1 -
 .../pythia/files/pythia8209-run-tests.patch|  20 -
 sci-physics/pythia/pythia-8.1.86-r1.ebuild | 100 -
 3 files changed, 121 deletions(-)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index a8c8cb3fe79..7f224575c76 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -10,5 +10,4 @@ DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B 
ec655014d3904b66da4a1e748a37c3
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B 
aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4
 SHA512 
f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 
92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7
 SHA512 
2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia6.tar.gz 567451 BLAKE2B 
c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd
 SHA512 
baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1
-DIST pythia8186.tgz 8921248 BLAKE2B 
9e753a04c2dbc5362a24b06d40c238e5fcc5ac700dd20b9bc47b1a68604fdb87808018593c28a1d6dcb06a212bdec1146431f1096db70f4c934413a0c3b20fa0
 SHA512 
84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b
 DIST pythia8226.tgz 17639842 BLAKE2B 
b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad
 SHA512 
85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0

diff --git a/sci-physics/pythia/files/pythia8209-run-tests.patch 
b/sci-physics/pythia/files/pythia8209-run-tests.patch
deleted file mode 100644
index d1edc839372..000
--- a/sci-physics/pythia/files/pythia8209-run-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 pythia8209/examples/Makefile.orig  2015-06-04 22:21:53.0 +0300
-+++ pythia8209/examples/Makefile   2015-06-05 05:35:25.324262331 +0300
-@@ -139,3 +139,17 @@
-   rm -f test[0-9][0-9][0-9]; rm -f out[0-9][0-9][0-9];\
-   rm -f weakbosons.lhe; rm -f Pythia8.promc; rm -f hist.root;\
-   rm -f *~; rm -f \#*; rm -f core*; rm -f *Dct.*
-+  rm -f main*out *.dat
-+
-+# 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.1.86-r1.ebuild 
b/sci-physics/pythia/pythia-8.1.86-r1.ebuild
deleted file mode 100644
index 60aca11c247..000
--- a/sci-physics/pythia/pythia-8.1.86-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator toolchain-funcs multilib
-
-MV=$(get_major_version)
-MY_P=${PN}$(replace_all_version_separators "" ${PV})
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/;
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz;
-
-SLOT="8"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gzip +hepmc static-libs"
-
-DEPEND="
-   gzip? ( dev-libs/boost sys-libs/zlib )
-   hepmc? ( sci-physics/hepmc:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   PYTHIADIR="${EPREFIX}/usr/share/pythia8"
-   # set datadir for xmldor in include file
-   sed -i \
-   -e "s:../xmldoc:${PYTHIADIR}/xmldoc:" \
-   include/Pythia8/Pythia.h || die
-   # respect libdir, prefix,