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

2024-04-23 Thread Andrew Ammerlaan
commit: 20eb18a80e9c1f2dac377a200a5fe100d5db1cc2
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Apr 23 09:47:22 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 23 09:48:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20eb18a8

sci-physics/thepeg: update copyright header

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.2.2-r1.ebuild | 2 +-
 sci-physics/thepeg/thepeg-2.2.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild 
b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
index 9b140feff26c..d01ade252d4f 100644
--- a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
index d1dbd3dcc513..c84a2d6c96e3 100644
--- a/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8



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

2024-04-23 Thread Andrew Ammerlaan
commit: 5bd928c207198ae17edc36361edfdf122cf52b15
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Apr 21 10:29:51 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 23 09:48:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd928c2

sci-physics/thepeg: add myself as a maintainer

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 701b9c3edc66..50328a988ae2 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -1,6 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   alexan...@neuwirth-informatik.de
+   Alexander Puck Neuwirth
+   

sci-phys...@gentoo.org
Gentoo Physics Project



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

2024-04-23 Thread Andrew Ammerlaan
commit: 8805c295703f838efe0b435a2915b32bbc35f077
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Mon Apr 22 13:12:42 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 23 09:48:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8805c295

sci-physics/thepeg: rename USE flag hepmc -> +hepmc3

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/36341
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../thepeg/{thepeg-2.2.3.ebuild => thepeg-2.2.3-r1.ebuild} | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
similarity index 91%
rename from sci-physics/thepeg/thepeg-2.2.3.ebuild
rename to sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
index 0d83d03fffcb..d1dbd3dcc513 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://home.thep.lu.se/ThePEG/;
 
 TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current;
 SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
-   test? ( hepmc? (
+   test? ( hepmc3? (
${TEST_URI}/cteq6ll.LHpdf
${TEST_URI}/cteq5l.LHgrid
${TEST_URI}/GRV98nlo.LHgrid
@@ -22,14 +22,14 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3"
 SLOT="0/30"
 KEYWORDS="~amd64 ~x86"
-IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"
+IUSE="emacs fastjet +hepmc3 java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
sci-libs/gsl:0=
emacs? ( >=app-editors/emacs-23.1:* )
fastjet? ( sci-physics/fastjet:0= )
-   hepmc? ( sci-physics/hepmc:3= )
+   hepmc3? ( sci-physics/hepmc:3= )
lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
zlib? ( sys-libs/zlib:0= )"
 DEPEND="${CDEPEND}
@@ -63,8 +63,8 @@ src_configure() {
econf \
$(use_enable static-libs static) \
$(use_with fastjet fastjet "${EPREFIX}"/usr) \
-   $(use_with hepmc hepmc "${EPREFIX}"/usr) \
-   $(use_with hepmc hepmcversion 3) \
+   $(use_with hepmc3 hepmc "${EPREFIX}"/usr) \
+   $(use_with hepmc3 hepmcversion 3) \
$(use_with java javagui) \
$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
$(use_with test boost "${EPREFIX}"/usr) \



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

2024-04-23 Thread Andrew Ammerlaan
commit: 5ec62a5f85c88dcdfff6135416ac384e92e7fca7
Author: Alexander Puck Neuwirth  users  noreply  
github  com>
AuthorDate: Sun Apr 21 22:29:36 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 23 09:48:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec62a5f

sci-physics/thepeg: Move S before RESTRICT

Co-authored-by: Aliaksei Urbanski  gmail.com>
Signed-off-by: Alexander Puck Neuwirth  users.noreply.github.com>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.2.2-r1.ebuild | 3 +--
 sci-physics/thepeg/thepeg-2.2.3.ebuild| 3 +--
 sci-physics/thepeg/thepeg-2.3.0.ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild 
b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
index d2d923373f48..9b140feff26c 100644
--- a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
@@ -17,6 +17,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
${TEST_URI}/cteq5l.LHgrid
${TEST_URI}/GRV98nlo.LHgrid
${TEST_URI}/MRST2001nlo.LHgrid ) )"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0/20"
@@ -37,8 +38,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
java? ( virtual/jre:1.8 )"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-1.8.3-java.patch
"${FILESDIR}"/${PN}-2.0.4-gcc6.patch

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3.ebuild
index 7c788bbfb4d2..0d83d03fffcb 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -17,6 +17,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
${TEST_URI}/cteq5l.LHgrid
${TEST_URI}/GRV98nlo.LHgrid
${TEST_URI}/MRST2001nlo.LHgrid ) )"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0/30"
@@ -40,8 +41,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
java? ( virtual/jre:1.8 )"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-1.8.3-java.patch
"${FILESDIR}"/${PN}-2.0.4-gcc6.patch

diff --git a/sci-physics/thepeg/thepeg-2.3.0.ebuild 
b/sci-physics/thepeg/thepeg-2.3.0.ebuild
index 2d39b9c8d9d4..f378565e51ca 100644
--- a/sci-physics/thepeg/thepeg-2.3.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.3.0.ebuild
@@ -22,6 +22,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
${TEST_URI}/GRV98nlo.LHgrid
${TEST_URI}/MRST2001nlo.LHgrid )
)"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0/30"
@@ -48,8 +49,6 @@ RDEPEND="${CDEPEND}
java? ( virtual/jre:1.8 )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-1.8.3-java.patch
"${FILESDIR}"/${PN}-2.0.4-gcc6.patch



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

2024-04-23 Thread Andrew Ammerlaan
commit: 6465b1d9d5355b2e3b1fd3b47452e2bad4e5b3eb
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Apr 21 21:58:17 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 23 09:48:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6465b1d9

sci-physics/thepeg: update LICENSE

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.2.2-r1.ebuild | 2 +-
 sci-physics/thepeg/thepeg-2.2.3.ebuild| 2 +-
 sci-physics/thepeg/thepeg-2.3.0.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild 
b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
index dac77266dd4f..d2d923373f48 100644
--- a/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
${TEST_URI}/GRV98nlo.LHgrid
${TEST_URI}/MRST2001nlo.LHgrid ) )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3.ebuild
index e7cb0fa42ad8..7c788bbfb4d2 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
${TEST_URI}/GRV98nlo.LHgrid
${TEST_URI}/MRST2001nlo.LHgrid ) )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0/30"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"

diff --git a/sci-physics/thepeg/thepeg-2.3.0.ebuild 
b/sci-physics/thepeg/thepeg-2.3.0.ebuild
index 22285ae6bf08..2d39b9c8d9d4 100644
--- a/sci-physics/thepeg/thepeg-2.3.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.3.0.ebuild
@@ -23,7 +23,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
${TEST_URI}/MRST2001nlo.LHgrid )
)"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0/30"
 KEYWORDS="~amd64"
 IUSE="emacs fastjet +hepmc3 lhapdf static-libs test zlib rivet"



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

2024-04-23 Thread Andrew Ammerlaan
commit: cdbb008b1326263394af387598909c2288bbe982
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Apr 21 10:25:24 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 23 09:48:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbb008b

sci-physics/thepeg: add 2.3.0

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/Manifest   |   1 +
 sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch |  25 +
 sci-physics/thepeg/metadata.xml   |   8 +-
 sci-physics/thepeg/thepeg-2.3.0.ebuild| 114 ++
 4 files changed, 146 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index f3ee2e5fbe91..96864cdd051c 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -2,5 +2,6 @@ DIST GRV98nlo.LHgrid 221908 BLAKE2B 
01af851928bbcfae110f3f5bc2b7599f86c25adb54e9
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 
67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648
 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
 DIST ThePEG-2.2.2.tar.bz2 1930050 BLAKE2B 
a10e966ed090f148b991a6434a2d527353014c25f5a91c92c2ce5302e1c51030fe56c2387f409ea3fb804a8efd7f0039424bd98471f0accb22c3092714df0c31
 SHA512 
70fa179dc1712b27549d1949c6f144cb899c372ec46606ab6b7dbcbf348961562a0a3ed769bdd8f8b8d62c07859a67c5e646ab357a9cbdd0644e557670fe3a3e
 DIST ThePEG-2.2.3.tar.bz2 1940925 BLAKE2B 
f233a637df0018e35e95f1cfaa0f354ac0df594e259bc177108723991697699d25c66721c23d82e03c3d768a108e37c2abf8c2f9817e74c78c7470b37e263cf8
 SHA512 
143f9a4974e5aa44c8957edd1ac8c621ce298cec8d1aaef39bb7061448e730a90cdb453c9fbf43caa2cf8e5757910584d91a908520bb540ff8e4a67a22455bb4
+DIST ThePEG-2.3.0.tar.bz2 1950464 BLAKE2B 
ab35bfe6b520c64ce2d65deb1cc79262090256734f42152bdc4ae3e08bb1b2ab686a310d6959a47ad9e0c48fd382d760ccc257fd7e55d99ed06208feea0c8f75
 SHA512 
5792ea3533ce1aaead96eb8de79827d6e3a3314e4ace7e5dc9392f98ec1160bf5bf7e69e1fbd77040887f09517afdf3e6f0ef9472cf766c70e9f135253b22cdc
 DIST cteq5l.LHgrid 134797 BLAKE2B 
1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32
 SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 
66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640
 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728

diff --git a/sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch 
b/sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch
new file mode 100644
index ..1770b4451534
--- /dev/null
+++ b/sci-physics/thepeg/files/thepeg-2.3.0-rivet.patch
@@ -0,0 +1,25 @@
+--- a/Analysis/RivetAnalysis.cc2024-01-30 23:57:34.065788628 +0100
 b/Analysis/RivetAnalysis.cc2024-01-31 00:00:54.544781058 +0100
+@@ -31,7 +31,22 @@
+   AnalysisHandler::analyze(event, ieve, loop, state);
+   // Rotate to CMS, extract final state particles and call analyze(particles).
+   // convert to hepmc
++#ifdef HAVE_HEPMC3
++std::shared_ptr ri = 
std::make_shared();
++std::vector  w_names;
++w_names.push_back("Default");
++for ( map::const_iterator w = 
event->optionalWeights().begin();
++ w != event->optionalWeights().end(); ++w ) {
++ w_names.push_back(w->first);
++}
++ri->set_weight_names(w_names);
++#endif
++
+   HepMC::GenEvent * hepmc = 
ThePEG::HepMCConverter::convert(*event);
++#ifdef HAVE_HEPMC3
++  hepmc->set_run_info(ri);
++#endif
++
+   // analyse the event
+   if(_nevent>1) CurrentGenerator::Redirect stdout(cout);
+   if ( _rivet ){

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index cacb2f090dd4..701b9c3edc66 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -14,8 +14,12 @@


Adds support for 
sci-physics/fastjet
-   Adds support for High Energy Physics Monte 
Carlo
-   Generators sci-physics/hepmc
+   Adds support for High Energy Physics Monte 
Carlo Generatorssci-physics/hepmc
+   Adds support for High Energy Physics Monte 
Carlo Generators 3sci-physics/hepmc
Adds support for 
sci-physics/lhapdf
+   Adds support for 
sci-physics/rivet

+   
+   https://thepeg.hepforge.org/doxygen/
+   
 

diff --git a/sci-physics/thepeg/thepeg-2.3.0.ebuild 
b/sci-physics/thepeg/thepeg-2.3.0.ebuild
new file mode 100644
index ..22285ae6bf08

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

2022-12-11 Thread Arthur Zamarin
commit: 6435efcd56fd5badac8737f08e98f4385c2a4f49
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 11 17:55:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 11 17:55:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6435efcd

sci-physics/thepeg: Keyword 2.2.3 x86, #866674

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-physics/thepeg/thepeg-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3.ebuild
index 4e63bda4b59c..e7cb0fa42ad8 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/30"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 



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

2022-08-28 Thread Andrew Ammerlaan
commit: d60f13ac9278bb42c39b0bc7d34ecb5d094a1eba
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Aug 28 07:37:56 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Aug 28 07:38:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60f13ac

sci-physics/thepeg: properly build and execute the tests

Closes: https://bugs.gentoo.org/866731
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.2.3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3.ebuild
index d608d0b5e7e3..4e63bda4b59c 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -68,6 +68,7 @@ src_configure() {
$(use_with hepmc hepmcversion 3) \
$(use_with java javagui) \
$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
+   $(use_with test boost "${EPREFIX}"/usr) \
--without-rivet \
$(use_with zlib zlib "${EPREFIX}"/usr)
 }



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

2022-08-27 Thread Andrew Ammerlaan
commit: bc2ff4a73f750a84d935bfe8a6a976901c75cc25
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Aug 27 07:52:16 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Aug 27 07:52:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2ff4a7

sci-physics/thepeg: add test dep: boost

Bug: https://bugs.gentoo.org/866731
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.2.3.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3.ebuild
index 9cfcb5e1f40a..d608d0b5e7e3 100644
--- a/sci-physics/thepeg/thepeg-2.2.3.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -33,7 +33,10 @@ CDEPEND="
zlib? ( sys-libs/zlib:0= )"
 DEPEND="${CDEPEND}
java? ( virtual/jdk:1.8 )
-   test? ( sys-process/time )"
+   test? (
+   sys-process/time
+   dev-libs/boost
+   )"
 RDEPEND="${CDEPEND}
java? ( virtual/jre:1.8 )"
 



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

2022-08-26 Thread Andrew Ammerlaan
commit: e3da499f481209c0739ea0b1d20568b1f4033b84
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Aug 26 10:42:04 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Aug 26 11:12:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3da499f

sci-physics/thepeg: drop 2.0.4-r1

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/Manifest   |  1 -
 sci-physics/thepeg/thepeg-2.0.4-r1.ebuild | 98 ---
 2 files changed, 99 deletions(-)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 45fdef6df37f..f3ee2e5fbe91 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,6 +1,5 @@
 DIST GRV98nlo.LHgrid 221908 BLAKE2B 
01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d
 SHA512 
fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 
67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648
 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
-DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B 
f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325
 SHA512 
5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 DIST ThePEG-2.2.2.tar.bz2 1930050 BLAKE2B 
a10e966ed090f148b991a6434a2d527353014c25f5a91c92c2ce5302e1c51030fe56c2387f409ea3fb804a8efd7f0039424bd98471f0accb22c3092714df0c31
 SHA512 
70fa179dc1712b27549d1949c6f144cb899c372ec46606ab6b7dbcbf348961562a0a3ed769bdd8f8b8d62c07859a67c5e646ab357a9cbdd0644e557670fe3a3e
 DIST ThePEG-2.2.3.tar.bz2 1940925 BLAKE2B 
f233a637df0018e35e95f1cfaa0f354ac0df594e259bc177108723991697699d25c66721c23d82e03c3d768a108e37c2abf8c2f9817e74c78c7470b37e263cf8
 SHA512 
143f9a4974e5aa44c8957edd1ac8c621ce298cec8d1aaef39bb7061448e730a90cdb453c9fbf43caa2cf8e5757910584d91a908520bb540ff8e4a67a22455bb4
 DIST cteq5l.LHgrid 134797 BLAKE2B 
1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32
 SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b

diff --git a/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild
deleted file mode 100644
index 30b441b5a8e2..
--- a/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common java-pkg-opt-2
-
-MY_P=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="http://home.thep.lu.se/ThePEG/;
-
-TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current;
-SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
-   test? ( hepmc? (
-   ${TEST_URI}/cteq6ll.LHpdf
-   ${TEST_URI}/cteq5l.LHgrid
-   ${TEST_URI}/GRV98nlo.LHgrid
-   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-
-LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   sci-libs/gsl:0=
-   emacs? ( >=app-editors/emacs-23.1:* )
-   fastjet? ( sci-physics/fastjet:0= )
-   hepmc? ( sci-physics/hepmc:0= )
-   lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-   zlib? ( sys-libs/zlib:0= )"
-DEPEND="${CDEPEND}
-   java? ( virtual/jdk:1.8 )
-   test? ( sys-process/time )"
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.8.3-java.patch
-   "${FILESDIR}"/${PN}-2.0.4-gcc6.patch
-)
-
-src_prepare() {
-   find -name 'Makefile.am' -exec \
-   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-   # trick to force c++ linking
-   sed -i \
-   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
-   lib/Makefile.am || die
-   default
-   java-pkg-opt-2_src_prepare
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable static-libs static) \
-   $(use_enable c++11 stdcxx11) \
-   $(use_with fastjet fastjet "${EPREFIX}"/usr) \
-   $(use_with hepmc hepmc "${EPREFIX}"/usr) \
-   $(use_with java javagui) \
-   $(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
-   --without-rivet \
-

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

2022-08-26 Thread Andrew Ammerlaan
commit: 78b04e75a03dc617a65921df65464088742e61be
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Aug 26 11:12:15 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Aug 26 11:13:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b04e75

sci-physics/thepeg: drop unused flag

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index c591073f15ca..cacb2f090dd4 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -13,8 +13,6 @@
of the toolkit and which can be used by any event generator model.


-   Build ThePEG using the C++11 standard.
-   Experimental feature, not for production use.
Adds support for 
sci-physics/fastjet
Adds support for High Energy Physics Monte 
Carlo
Generators sci-physics/hepmc



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

2022-08-26 Thread Andrew Ammerlaan
commit: c5e59df91d2d1b309c1683c249734867b01eb84f
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Aug 26 10:37:44 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Aug 26 11:12:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e59df9

sci-physics/thepeg: depend on hepmc:2

Closes: https://bugs.gentoo.org/851537
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../thepeg/{thepeg-2.2.2.ebuild => thepeg-2.2.2-r1.ebuild}   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.2.2.ebuild 
b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
similarity index 93%
rename from sci-physics/thepeg/thepeg-2.2.2.ebuild
rename to sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
index 750ea66b2e33..dac77266dd4f 100644
--- a/sci-physics/thepeg/thepeg-2.2.2.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common java-pkg-opt-2
 
@@ -28,7 +28,7 @@ CDEPEND="
sci-libs/gsl:0=
emacs? ( >=app-editors/emacs-23.1:* )
fastjet? ( sci-physics/fastjet:0= )
-   hepmc? ( sci-physics/hepmc:0= )
+   hepmc? ( sci-physics/hepmc:2= )
lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
zlib? ( sys-libs/zlib:0= )"
 DEPEND="${CDEPEND}
@@ -62,6 +62,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_with fastjet fastjet "${EPREFIX}"/usr) \
$(use_with hepmc hepmc "${EPREFIX}"/usr) \
+   $(use_with hepmc hepmcversion 2) \
$(use_with java javagui) \
$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
--without-rivet \
@@ -86,6 +87,8 @@ src_install() {
LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
EOF
doenvd "${T}"/50${PN}
+
+   find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {



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

2022-08-26 Thread Andrew Ammerlaan
commit: f69a05b46bbecdc37cc358bcd399bc2c02f065a5
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Aug 26 10:32:19 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Aug 26 11:12:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69a05b4

sci-physics/thepeg: add 2.2.3

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/Manifest|   1 +
 sci-physics/thepeg/thepeg-2.2.3.ebuild | 100 +
 2 files changed, 101 insertions(+)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 64a8a9e21bc1..45fdef6df37f 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -2,5 +2,6 @@ DIST GRV98nlo.LHgrid 221908 BLAKE2B 
01af851928bbcfae110f3f5bc2b7599f86c25adb54e9
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 
67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648
 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
 DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B 
f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325
 SHA512 
5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 DIST ThePEG-2.2.2.tar.bz2 1930050 BLAKE2B 
a10e966ed090f148b991a6434a2d527353014c25f5a91c92c2ce5302e1c51030fe56c2387f409ea3fb804a8efd7f0039424bd98471f0accb22c3092714df0c31
 SHA512 
70fa179dc1712b27549d1949c6f144cb899c372ec46606ab6b7dbcbf348961562a0a3ed769bdd8f8b8d62c07859a67c5e646ab357a9cbdd0644e557670fe3a3e
+DIST ThePEG-2.2.3.tar.bz2 1940925 BLAKE2B 
f233a637df0018e35e95f1cfaa0f354ac0df594e259bc177108723991697699d25c66721c23d82e03c3d768a108e37c2abf8c2f9817e74c78c7470b37e263cf8
 SHA512 
143f9a4974e5aa44c8957edd1ac8c621ce298cec8d1aaef39bb7061448e730a90cdb453c9fbf43caa2cf8e5757910584d91a908520bb540ff8e4a67a22455bb4
 DIST cteq5l.LHgrid 134797 BLAKE2B 
1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32
 SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 
66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640
 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728

diff --git a/sci-physics/thepeg/thepeg-2.2.3.ebuild 
b/sci-physics/thepeg/thepeg-2.2.3.ebuild
new file mode 100644
index ..9cfcb5e1f40a
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-2.2.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common java-pkg-opt-2
+
+MY_P=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/;
+
+TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current;
+SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
+   test? ( hepmc? (
+   ${TEST_URI}/cteq6ll.LHpdf
+   ${TEST_URI}/cteq5l.LHgrid
+   ${TEST_URI}/GRV98nlo.LHgrid
+   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+
+LICENSE="GPL-2"
+SLOT="0/30"
+KEYWORDS="~amd64"
+IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   sci-libs/gsl:0=
+   emacs? ( >=app-editors/emacs-23.1:* )
+   fastjet? ( sci-physics/fastjet:0= )
+   hepmc? ( sci-physics/hepmc:3= )
+   lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
+   zlib? ( sys-libs/zlib:0= )"
+DEPEND="${CDEPEND}
+   java? ( virtual/jdk:1.8 )
+   test? ( sys-process/time )"
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.3-java.patch
+   "${FILESDIR}"/${PN}-2.0.4-gcc6.patch
+)
+
+src_prepare() {
+   find -name 'Makefile.am' -exec \
+   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
+   # trick to force c++ linking
+   sed -i \
+   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
+   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
+   lib/Makefile.am || die
+   default
+   java-pkg-opt-2_src_prepare
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable static-libs static) \
+   $(use_with fastjet fastjet "${EPREFIX}"/usr) \
+   $(use_with hepmc hepmc "${EPREFIX}"/usr) \
+   $(use_with hepmc hepmcversion 3) \
+   $(use_with java javagui) \
+   $(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
+   

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

2021-07-26 Thread Andrew Ammerlaan
commit: 339da22b0e68826bd9267b4dd4e4e7c31c1e845d
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jul 26 11:04:48 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jul 26 11:06:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339da22b

sci-physics/thepeg: add version 2.2.2

Bug: https://bugs.gentoo.org/732054
Closes: https://bugs.gentoo.org/732054
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/Manifest|  1 +
 sci-physics/thepeg/thepeg-2.2.2.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 8452bd82cff..64a8a9e21bc 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,5 +1,6 @@
 DIST GRV98nlo.LHgrid 221908 BLAKE2B 
01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d
 SHA512 
fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 
67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648
 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
 DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B 
f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325
 SHA512 
5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
+DIST ThePEG-2.2.2.tar.bz2 1930050 BLAKE2B 
a10e966ed090f148b991a6434a2d527353014c25f5a91c92c2ce5302e1c51030fe56c2387f409ea3fb804a8efd7f0039424bd98471f0accb22c3092714df0c31
 SHA512 
70fa179dc1712b27549d1949c6f144cb899c372ec46606ab6b7dbcbf348961562a0a3ed769bdd8f8b8d62c07859a67c5e646ab357a9cbdd0644e557670fe3a3e
 DIST cteq5l.LHgrid 134797 BLAKE2B 
1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32
 SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 
66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640
 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728

diff --git a/sci-physics/thepeg/thepeg-2.2.2.ebuild 
b/sci-physics/thepeg/thepeg-2.2.2.ebuild
new file mode 100644
index 000..750ea66b2e3
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-2.2.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common java-pkg-opt-2
+
+MY_P=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/;
+
+TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current;
+SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
+   test? ( hepmc? (
+   ${TEST_URI}/cteq6ll.LHpdf
+   ${TEST_URI}/cteq5l.LHgrid
+   ${TEST_URI}/GRV98nlo.LHgrid
+   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+
+LICENSE="GPL-2"
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs fastjet hepmc java lhapdf static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   sci-libs/gsl:0=
+   emacs? ( >=app-editors/emacs-23.1:* )
+   fastjet? ( sci-physics/fastjet:0= )
+   hepmc? ( sci-physics/hepmc:0= )
+   lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
+   zlib? ( sys-libs/zlib:0= )"
+DEPEND="${CDEPEND}
+   java? ( virtual/jdk:1.8 )
+   test? ( sys-process/time )"
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.3-java.patch
+   "${FILESDIR}"/${PN}-2.0.4-gcc6.patch
+)
+
+src_prepare() {
+   find -name 'Makefile.am' -exec \
+   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
+   # trick to force c++ linking
+   sed -i \
+   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
+   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
+   lib/Makefile.am || die
+   default
+   java-pkg-opt-2_src_prepare
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable static-libs static) \
+   $(use_with fastjet fastjet "${EPREFIX}"/usr) \
+   $(use_with hepmc hepmc "${EPREFIX}"/usr) \
+   $(use_with java javagui) \
+   $(use_with lhapdf lhapdf "${EPREFIX}"/usr) 

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

2021-07-26 Thread Andrew Ammerlaan
commit: c6e806aad14a88af6a5e1eb8dbdb0002edf8f915
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jul  7 13:48:07 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jul 26 11:06:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e806aa

sci-physics/thepeg: min java 1.8

Closes: https://bugs.gentoo.org/798732
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.0.4-r1.ebuild | 98 +++
 1 file changed, 98 insertions(+)

diff --git a/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild
new file mode 100644
index 000..30b441b5a8e
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-2.0.4-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common java-pkg-opt-2
+
+MY_P=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/;
+
+TEST_URI="https://www.hepforge.org/archive/lhapdf/pdfsets/current;
+SRC_URI="https://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
+   test? ( hepmc? (
+   ${TEST_URI}/cteq6ll.LHpdf
+   ${TEST_URI}/cteq5l.LHgrid
+   ${TEST_URI}/GRV98nlo.LHgrid
+   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+
+LICENSE="GPL-2"
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   sci-libs/gsl:0=
+   emacs? ( >=app-editors/emacs-23.1:* )
+   fastjet? ( sci-physics/fastjet:0= )
+   hepmc? ( sci-physics/hepmc:0= )
+   lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
+   zlib? ( sys-libs/zlib:0= )"
+DEPEND="${CDEPEND}
+   java? ( virtual/jdk:1.8 )
+   test? ( sys-process/time )"
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.3-java.patch
+   "${FILESDIR}"/${PN}-2.0.4-gcc6.patch
+)
+
+src_prepare() {
+   find -name 'Makefile.am' -exec \
+   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
+   # trick to force c++ linking
+   sed -i \
+   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
+   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
+   lib/Makefile.am || die
+   default
+   java-pkg-opt-2_src_prepare
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable static-libs static) \
+   $(use_enable c++11 stdcxx11) \
+   $(use_with fastjet fastjet "${EPREFIX}"/usr) \
+   $(use_with hepmc hepmc "${EPREFIX}"/usr) \
+   $(use_with java javagui) \
+   $(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
+   --without-rivet \
+   $(use_with zlib zlib "${EPREFIX}"/usr)
+}
+
+src_compile() {
+   default
+   use emacs && elisp-compile lib/ThePEG.el
+}
+
+src_test() {
+   emake LHAPATH="${DISTDIR}" check
+}
+
+src_install() {
+   default
+   use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
+   use java && java-pkg_newjar java/ThePEG.jar
+
+   cat <<-EOF > "${T}"/50${PN}
+   LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
+   EOF
+   doenvd "${T}"/50${PN}
+}
+
+pkg_postinst() {
+   use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+   use emacs && elisp-site-regen
+}



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

2021-07-26 Thread Andrew Ammerlaan
commit: 7c56d3f610e09b398ca5d84661144311a6d9909b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jul  7 13:49:24 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jul 26 11:06:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c56d3f6

sci-physics/thepeg: remove obsolete

Closes: https://bugs.gentoo.org/787659
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21551
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/thepeg/thepeg-2.0.4.ebuild | 96 --
 1 file changed, 96 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
deleted file mode 100644
index 69fd55af01e..000
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common java-pkg-opt-2
-
-MY_P=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="http://home.thep.lu.se/ThePEG/;
-
-TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current;
-SRC_URI="http://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
-   test? ( hepmc? (
-  ${TEST_URI}/cteq6ll.LHpdf
-  ${TEST_URI}/cteq5l.LHgrid
-  ${TEST_URI}/GRV98nlo.LHgrid
-  ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-LICENSE="GPL-2"
-
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   sci-libs/gsl:0=
-   emacs? ( >=app-editors/emacs-23.1:* )
-   fastjet? ( sci-physics/fastjet:0= )
-   hepmc? ( sci-physics/hepmc:0= )
-   java? ( >=virtual/jre-1.5:* )
-   lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-   zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-   test? ( sys-process/time )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.8.3-java.patch
-   "${FILESDIR}"/${PN}-2.0.4-gcc6.patch
-)
-
-src_prepare() {
-   find -name 'Makefile.am' -exec \
-   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-   # trick to force c++ linking
-   sed -i \
-   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
-   lib/Makefile.am || die
-   default
-   java-pkg-opt-2_src_prepare
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable static-libs static) \
-   $(use_enable c++11 stdcxx11) \
-   $(use_with fastjet fastjet "${EPREFIX}"/usr) \
-   $(use_with hepmc hepmc "${EPREFIX}"/usr) \
-   $(use_with java javagui) \
-   $(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
-   --without-rivet \
-   $(use_with zlib zlib "${EPREFIX}"/usr)
-}
-
-src_compile() {
-   default
-   use emacs && elisp-compile lib/ThePEG.el
-}
-
-src_test() {
-   emake LHAPATH="${DISTDIR}" check
-}
-
-src_install() {
-   default
-   use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
-   use java && java-pkg_newjar java/ThePEG.jar
-
-   cat <<-EOF > "${T}"/50${PN}
-   LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
-   EOF
-   doenvd "${T}"/50${PN}
-}
-
-pkg_postinst() {
-   use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-   use emacs && elisp-site-regen
-}



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

2021-03-07 Thread Andreas Sturmlechner
commit: 9d39db8208f871f3dc2f7e47663d0dc0d54fc8bb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  7 14:21:22 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar  7 19:01:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d39db82

sci-physics/thepeg: Drop 1.9.2 and 2.0.0, EAPI5--

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-physics/thepeg/Manifest|  2 -
 sci-physics/thepeg/thepeg-1.9.2.ebuild | 96 --
 sci-physics/thepeg/thepeg-2.0.0.ebuild | 96 --
 3 files changed, 194 deletions(-)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 7e57657bc2b..8452bd82cff 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,7 +1,5 @@
 DIST GRV98nlo.LHgrid 221908 BLAKE2B 
01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d
 SHA512 
fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 DIST MRST2001nlo.LHgrid 719692 BLAKE2B 
67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648
 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
-DIST ThePEG-1.9.2.tar.bz2 1870577 BLAKE2B 
cbc46698390d84e41a0f788af0ae160ba00428cb2b1c5ae11905029b2fd58b16ccf76248ab5d600206262ddd922587f19798734e80a71e2728f2335627997c77
 SHA512 
bc43606c79bb15938969b9d444db49c6af5c8ba21072a879a502086a77fe18b13fec44691046b4e0772b260b83ea7ef29b906027eadda6a8ea004ace9318379c
-DIST ThePEG-2.0.0.tar.bz2 1938251 BLAKE2B 
8f9403a7f442da6b3bf753f3b45fbddfe339eb8b8398fe52d23a6c3d57a1e9a8838b8f808540cae78b1099f4f92e2d3c182d392538ee82aadf402ff3f355f21d
 SHA512 
a3e9a4ab90b126ea67187e2adc5b64480e5afd49ac58d6f3a3855003251d5c7b6ab67fa35b0380684e39f38cf8d4bc8e0ccd9dc4cb7d7b900e90b3448d6182a9
 DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B 
f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325
 SHA512 
5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 DIST cteq5l.LHgrid 134797 BLAKE2B 
1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32
 SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 
66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640
 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728

diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild 
b/sci-physics/thepeg/thepeg-1.9.2.ebuild
deleted file mode 100644
index dfe097cf8ca..000
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils elisp-common eutils java-pkg-opt-2
-
-MYP=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="http://home.thep.lu.se/ThePEG/;
-
-TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current;
-SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
-   test? ( hepmc? (
-  ${TEST_URI}/cteq6ll.LHpdf
-  ${TEST_URI}/cteq5l.LHgrid
-  ${TEST_URI}/GRV98nlo.LHgrid
-  ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-LICENSE="GPL-2"
-
-SLOT="0/18"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   sci-libs/gsl:0=
-   emacs? ( >=app-editors/emacs-23.1:* )
-   fastjet? ( sci-physics/fastjet:0= )
-   hepmc? ( sci-physics/hepmc:0= )
-   java? ( >=virtual/jre-1.5:* )
-   lhapdf? ( sci-physics/lhapdf:0= )
-   zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-   test? ( sys-process/time )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
-
-src_prepare() {
-   find -name 'Makefile.am' -exec \
-   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-   # trick to force c++ linking
-   sed -i \
-   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
-   lib/Makefile.am || die
-   autotools-utils_src_prepare
-   java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-   

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

2020-10-09 Thread Michał Górny
commit: 05d94d6c8dd8d75ddf69eef770fc0b1480a4c803
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct  9 08:18:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct  9 08:20:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d94d6c

sci-physics/thepeg: Remove dep on rivet

Signed-off-by: Michał Górny  gentoo.org>

 sci-physics/thepeg/metadata.xml| 1 -
 sci-physics/thepeg/thepeg-1.9.2.ebuild | 5 ++---
 sci-physics/thepeg/thepeg-2.0.0.ebuild | 5 ++---
 sci-physics/thepeg/thepeg-2.0.4.ebuild | 5 ++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index b98a9450c6f..4f8dcee86a8 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -19,6 +19,5 @@
Adds support for High Energy Physics Monte 
Carlo
Generators sci-physics/hepmc
Adds support for 
sci-physics/lhapdf
-   Adds support for 
sci-physics/rivet

 

diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild 
b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index 1f333ed8402..dfe097cf8ca 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
 
 SLOT="0/18"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
lhapdf? ( sci-physics/lhapdf:0= )
-   rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
$(use_with hepmc hepmc "${EPREFIX}"/usr)
$(use_with java javagui)
$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-   $(use_with rivet rivet "${EPREFIX}"/usr)
+   --without-rivet
$(use_with zlib zlib "${EPREFIX}"/usr)
)
autotools-utils_src_configure

diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild 
b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 6d4e9927f49..22c553e8f5d 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
 
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
lhapdf? ( sci-physics/lhapdf:0= )
-   rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
$(use_with hepmc hepmc "${EPREFIX}"/usr)
$(use_with java javagui)
$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-   $(use_with rivet rivet "${EPREFIX}"/usr)
+   --without-rivet
$(use_with zlib zlib "${EPREFIX}"/usr)
)
autotools-utils_src_configure

diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 93ed41abb78..69fd55af01e 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -31,7 +31,6 @@ RDEPEND="
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-   rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
test? ( sys-process/time )"
@@ -64,7 +63,7 @@ src_configure() {
$(use_with hepmc hepmc "${EPREFIX}"/usr) \
$(use_with java javagui) \
$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
-   $(use_with rivet rivet "${EPREFIX}"/usr) \
+   --without-rivet \
$(use_with zlib zlib "${EPREFIX}"/usr)
 }
 



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

2019-12-20 Thread Ulrich Müller
commit: e0aaf0c81202dca06f00f53590d675f7ef240210
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Dec 20 16:32:16 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Dec 20 22:48:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0aaf0c8

sci-physics/thepeg: Update virtual/emacs dependency.

The virtual is deprecated, depend on app-editors/emacs instead.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 sci-physics/thepeg/thepeg-1.9.2.ebuild | 2 +-
 sci-physics/thepeg/thepeg-2.0.0.ebuild | 2 +-
 sci-physics/thepeg/thepeg-2.0.4.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild 
b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index eacacaa4808..1f333ed8402 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
sci-libs/gsl:0=
-   emacs? ( virtual/emacs )
+   emacs? ( >=app-editors/emacs-23.1:* )
fastjet? ( sci-physics/fastjet:0= )
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )

diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild 
b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 677e29bea9b..6d4e9927f49 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
sci-libs/gsl:0=
-   emacs? ( virtual/emacs )
+   emacs? ( >=app-editors/emacs-23.1:* )
fastjet? ( sci-physics/fastjet:0= )
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )

diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 1591dd59d17..93ed41abb78 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
sci-libs/gsl:0=
-   emacs? ( virtual/emacs )
+   emacs? ( >=app-editors/emacs-23.1:* )
fastjet? ( sci-physics/fastjet:0= )
hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )



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

2017-10-16 Thread Guilherme Amadio
commit: ec1223124a8d0d3065019c40d69c7675b801a8fb
Author: Peter Levine  gmail  com>
AuthorDate: Sun Oct 15 05:03:09 2017 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Mon Oct 16 09:44:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec122312

sci-physics/thepeg: Fix building with GCC-6

Bug: https://bugs.gentoo.org/599564
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch | 14 ++
 sci-physics/thepeg/thepeg-2.0.4.ebuild   |  7 +--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch 
b/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch
new file mode 100644
index 000..ed3bdac7b54
--- /dev/null
+++ b/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/599564
+
+--- a/Utilities/UnitIO.h
 b/Utilities/UnitIO.h
+@@ -25,6 +25,9 @@
+ 
+ namespace ThePEG {
+ 
++using std::isnan;
++using std::isinf;
++
+ /**
+  * The OUnit< class is used to
+  * facilitate output of unitful numbers to a

diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 84e48567e16..6cea3900306 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8.3-java.patch
+   "${FILESDIR}"/${PN}-2.0.4-gcc6.patch
+)
 
 src_prepare() {
find -name 'Makefile.am' -exec \



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

2017-09-05 Thread David Seifert
commit: 3a8c5b11b0db6772311ca15de1d190f1e97eca06
Author: David Seifert  gentoo  org>
AuthorDate: Tue Sep  5 07:13:22 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Sep  5 07:13:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8c5b11

sci-physics/thepeg: Fix indentation whitespace in metadata.xml

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-physics/thepeg/metadata.xml | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index e59c93f58d3..b98a9450c6f 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -1,24 +1,24 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  sci-phys...@gentoo.org
-  Gentoo Physics Project
-
-
-  Toolkit for High Energy Physics Event Generation.
-  ThePEG has been broken out from the PYTHIA7 program
-  to better factorize the parts which were PYTHIA-specific
-  from those which are general model-independent components
-  of the toolkit and which can be used by any event generator model.
-
-
-  Build ThePEG using the C++11 standard.
-  Experimental feature, not for production use.
-  Adds support for sci-physics/fastjet
-  Adds support for High Energy Physics Monte Carlo
- Generators sci-physics/hepmc
-  Adds support for sci-physics/lhapdf
-  Adds support for sci-physics/rivet
-
+   
+   sci-phys...@gentoo.org
+   Gentoo Physics Project
+   
+   
+   Toolkit for High Energy Physics Event Generation.
+   ThePEG has been broken out from the PYTHIA7 program
+   to better factorize the parts which were PYTHIA-specific
+   from those which are general model-independent components
+   of the toolkit and which can be used by any event generator model.
+   
+   
+   Build ThePEG using the C++11 standard.
+   Experimental feature, not for production use.
+   Adds support for 
sci-physics/fastjet
+   Adds support for High Energy Physics Monte 
Carlo
+   Generators sci-physics/hepmc
+   Adds support for 
sci-physics/lhapdf
+   Adds support for 
sci-physics/rivet
+   
 



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

2016-11-11 Thread Andreas Hüttel
commit: 6b785a844dbf9af8231edef10dc81595159770a4
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Fri Nov 11 13:52:01 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Nov 11 23:31:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b785a84

sci-physics/thepeg: Version bump to 2.0.4, EAPI bump 5 -> 6

Package-Manager: portage-2.3.0

 sci-physics/thepeg/Manifest  |  1 +
 sci-physics/thepeg/files/thepeg-1.8.3-java.patch |  8 +-
 sci-physics/thepeg/thepeg-2.0.4.ebuild   | 94 
 3 files changed, 99 insertions(+), 4 deletions(-)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 46d8f6a..25ff6d1 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -2,5 +2,6 @@ DIST GRV98nlo.LHgrid 221908 SHA256 
78e7b133ac1f1d5576aa688f98adb8b6e29feb15cbb58
 DIST MRST2001nlo.LHgrid 719692 SHA256 
7ec031afa2bd254b95b66b3058291365091f58b48e4be2b368e61fc170c51d58 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
 WHIRLPOOL 
bce25b3dc3b0a29c537eafac243c81bdb83b4e3daca34627d7d8bb8c59f802bb12ea6e8611fe2758a8c9a9880dab16276c11a332059431df0b14ecb6eb6d40f3
 DIST ThePEG-1.9.2.tar.bz2 1870577 SHA256 
ff7bbb256866f994dae04ade1f57c92d2670edaac3df11c9a300419a5343faf4 SHA512 
bc43606c79bb15938969b9d444db49c6af5c8ba21072a879a502086a77fe18b13fec44691046b4e0772b260b83ea7ef29b906027eadda6a8ea004ace9318379c
 WHIRLPOOL 
fb686c14a6c8a958f08be670085f10463d2928dacd8efe039e0e5fa781dc7532310702146dd9a0aef5bb8e881e1ff0e5d7f07637b8ad56a80c3d197e67d9c970
 DIST ThePEG-2.0.0.tar.bz2 1938251 SHA256 
571730cc956027dc82780dc04ef6e7382ab5ea853fcfebe259e488c6df302a04 SHA512 
a3e9a4ab90b126ea67187e2adc5b64480e5afd49ac58d6f3a3855003251d5c7b6ab67fa35b0380684e39f38cf8d4bc8e0ccd9dc4cb7d7b900e90b3448d6182a9
 WHIRLPOOL 
1c1052972e006c497bd3d23b63b05e97fae922bfe14c1233da39ac5c51b74a18a3480052c1a9dd06bca1ca816218b7a5945b86314ddbea953dd7c9e40e9865d9
+DIST ThePEG-2.0.4.tar.bz2 1921082 SHA256 
f3b625b411667e2708995f1d1379b5b8691406853c8c2cca2f4e4e6e062da0e4 SHA512 
5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 WHIRLPOOL 
fe2f618837b99d034f36aea103918e02e825c3fc220252f69f9b4ca66e4674f0966b6da4915efb7638d3d8168ea742a7ad7ec39065a2bfda2440d4bf26f70307
 DIST cteq5l.LHgrid 134797 SHA256 
83c92bc90fd6e12be9cd76bc032eca26dcedbe90f0c11aef843bbf54734d5bba SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 WHIRLPOOL 
8a86877fcbae2b45576e3fae08dfd4771c668257893ba2f813c578641dce9800f42bfd57d0d8ac2abc6bf7cd40921020478f1912014a36cfb722ed408ca1430f
 DIST cteq6ll.LHpdf 1461 SHA256 
a3c6bd1ebea30f75fa23fa94922ba281872a66e59465b61f73a0f3629c2b5c03 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
 WHIRLPOOL 
3eeba4277668b92bfa0de3d0fb27d0d9b940904061b6aa212936e4a9b86f9955188b81d9572672f64155abc7f2c6184fc90f8f81dd7eabbe1b015b749a5af304

diff --git a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch 
b/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
index 45b0e95..305207e 100644
--- a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
+++ b/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
@@ -1,5 +1,5 @@
 java/Makefile.am
-+++ java/Makefile.am
+--- a/java/Makefile.am
 b/java/Makefile.am
 @@ -11,8 +12,7 @@
  
  CLEANFILES = ThePEG.jar thepeg.sh
@@ -19,8 +19,8 @@
  -e s:@bindir[@]:$(bindir):g \
  -e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install > thepeg.sh
chmod +x thepeg.sh
 java/thepeg.install
-+++ java/thepeg.install
+--- a/java/thepeg.install
 b/java/thepeg.install
 @@ -1,6 +1,6 @@
  #!/bin/sh
  

diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
new file mode 100644
index ..43b009a
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools elisp-common java-pkg-opt-2
+
+MY_P=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/;
+
+TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current;
+SRC_URI="http://www.hepforge.org/archive/thepeg/${MY_P}.tar.bz2
+   test? ( hepmc? (
+  ${TEST_URI}/cteq6ll.LHpdf
+  ${TEST_URI}/cteq5l.LHgrid
+  ${TEST_URI}/GRV98nlo.LHgrid
+  ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+LICENSE="GPL-2"
+
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+
+RDEPEND="
+   sci-libs/gsl:=
+   emacs? ( virtual/emacs )
+   

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

2016-11-11 Thread Andreas Hüttel
commit: d93e38adaf98d183cbb1c8ad29e04d8a27087401
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Nov 11 23:37:43 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Nov 11 23:37:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93e38ad

sci-physics/thepeg: Pin slots

Package-Manager: portage-2.3.2

 sci-physics/thepeg/thepeg-2.0.4.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild 
b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 43b009a..e6acab9 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -25,14 +25,14 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
 
 RDEPEND="
-   sci-libs/gsl:=
+   sci-libs/gsl:0=
emacs? ( virtual/emacs )
-   fastjet? ( sci-physics/fastjet )
-   hepmc? ( sci-physics/hepmc )
+   fastjet? ( sci-physics/fastjet:0= )
+   hepmc? ( sci-physics/hepmc:0= )
java? ( >=virtual/jre-1.5:* )
-   lhapdf? ( >=sci-physics/lhapdf-6.0 )
-   rivet? ( sci-physics/rivet )
-   zlib? ( sys-libs/zlib )"
+   lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
+   rivet? ( sci-physics/rivet:0= )
+   zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
test? ( sys-process/time )"
 



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

2016-08-07 Thread Pacho Ramos
commit: 7f85f18cb1b7483c57c6b2cd50b0744168b678cc
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Aug  7 08:18:13 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Aug  7 08:18:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f85f18c

sci-physics/thepeg: Cleanup per bug #498492

Package-Manager: portage-2.3.0

 sci-physics/thepeg/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 7428c39..e59c93f 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -1,9 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  jauh...@gentoo.org
-
 
   sci-phys...@gentoo.org
   Gentoo Physics Project



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

2016-05-14 Thread David Seifert
commit: ce091cfb751bde050745e5528343a4f386c849c0
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 14 23:22:06 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 14 23:22:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce091cfb

sci-physics/thepeg: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

 sci-physics/thepeg/thepeg-1.9.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild 
b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index 2916f4d..e95b344 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ RDEPEND="
emacs? ( virtual/emacs )
fastjet? ( sci-physics/fastjet:0= )
hepmc? ( sci-physics/hepmc:0= )
-   java? ( >=virtual/jre-1.5 )
+   java? ( >=virtual/jre-1.5:* )
lhapdf? ( sci-physics/lhapdf:0= )
rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"



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

2016-05-14 Thread David Seifert
commit: e92ff90086a5b406c0d4b789cb3798c06738e7d7
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 14 23:22:36 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 14 23:22:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92ff900

sci-physics/thepeg: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

 sci-physics/thepeg/thepeg-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild 
b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 46ee6b7..0b8a500 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
emacs? ( virtual/emacs )
fastjet? ( sci-physics/fastjet:0= )
hepmc? ( sci-physics/hepmc:0= )
-   java? ( >=virtual/jre-1.5 )
+   java? ( >=virtual/jre-1.5:* )
lhapdf? ( sci-physics/lhapdf:0= )
rivet? ( sci-physics/rivet:0= )
zlib? ( sys-libs/zlib:0= )"



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

2016-01-01 Thread Jauhien Piatlicki
commit: 9c016059c223b4d8903d7a1bdaf3a699484ca572
Author: Jauhien Piatlicki  gentoo  org>
AuthorDate: Sat Jan  2 00:19:12 2016 +
Commit: Jauhien Piatlicki  gentoo  org>
CommitDate: Sat Jan  2 00:20:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c016059

sci-physics/thepeg: version bump

Package-Manager: portage-2.2.26

 sci-physics/thepeg/Manifest|  1 +
 sci-physics/thepeg/thepeg-2.0.0.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 4a71906..46d8f6a 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,5 +1,6 @@
 DIST GRV98nlo.LHgrid 221908 SHA256 
78e7b133ac1f1d5576aa688f98adb8b6e29feb15cbb58556c860cb7e183da647 SHA512 
fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 WHIRLPOOL 
ce0d01cd7c293efd199704cdeb0cb5ad9093393eef56b72cb6096b2e6135ce57d1710b0cbcd219bb4dfe82b15d684a3f6a5aad6dda97d3428dc2f645ec5a2dc4
 DIST MRST2001nlo.LHgrid 719692 SHA256 
7ec031afa2bd254b95b66b3058291365091f58b48e4be2b368e61fc170c51d58 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
 WHIRLPOOL 
bce25b3dc3b0a29c537eafac243c81bdb83b4e3daca34627d7d8bb8c59f802bb12ea6e8611fe2758a8c9a9880dab16276c11a332059431df0b14ecb6eb6d40f3
 DIST ThePEG-1.9.2.tar.bz2 1870577 SHA256 
ff7bbb256866f994dae04ade1f57c92d2670edaac3df11c9a300419a5343faf4 SHA512 
bc43606c79bb15938969b9d444db49c6af5c8ba21072a879a502086a77fe18b13fec44691046b4e0772b260b83ea7ef29b906027eadda6a8ea004ace9318379c
 WHIRLPOOL 
fb686c14a6c8a958f08be670085f10463d2928dacd8efe039e0e5fa781dc7532310702146dd9a0aef5bb8e881e1ff0e5d7f07637b8ad56a80c3d197e67d9c970
+DIST ThePEG-2.0.0.tar.bz2 1938251 SHA256 
571730cc956027dc82780dc04ef6e7382ab5ea853fcfebe259e488c6df302a04 SHA512 
a3e9a4ab90b126ea67187e2adc5b64480e5afd49ac58d6f3a3855003251d5c7b6ab67fa35b0380684e39f38cf8d4bc8e0ccd9dc4cb7d7b900e90b3448d6182a9
 WHIRLPOOL 
1c1052972e006c497bd3d23b63b05e97fae922bfe14c1233da39ac5c51b74a18a3480052c1a9dd06bca1ca816218b7a5945b86314ddbea953dd7c9e40e9865d9
 DIST cteq5l.LHgrid 134797 SHA256 
83c92bc90fd6e12be9cd76bc032eca26dcedbe90f0c11aef843bbf54734d5bba SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 WHIRLPOOL 
8a86877fcbae2b45576e3fae08dfd4771c668257893ba2f813c578641dce9800f42bfd57d0d8ac2abc6bf7cd40921020478f1912014a36cfb722ed408ca1430f
 DIST cteq6ll.LHpdf 1461 SHA256 
a3c6bd1ebea30f75fa23fa94922ba281872a66e59465b61f73a0f3629c2b5c03 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
 WHIRLPOOL 
3eeba4277668b92bfa0de3d0fb27d0d9b940904061b6aa212936e4a9b86f9955188b81d9572672f64155abc7f2c6184fc90f8f81dd7eabbe1b015b749a5af304

diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild 
b/sci-physics/thepeg/thepeg-2.0.0.ebuild
new file mode 100644
index 000..46ee6b7
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils elisp-common eutils java-pkg-opt-2
+
+MYP=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/;
+
+TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current;
+SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
+   test? ( hepmc? (
+  ${TEST_URI}/cteq6ll.LHpdf
+  ${TEST_URI}/cteq5l.LHgrid
+  ${TEST_URI}/GRV98nlo.LHgrid
+  ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+LICENSE="GPL-2"
+
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+
+RDEPEND="
+   sci-libs/gsl:0=
+   emacs? ( virtual/emacs )
+   fastjet? ( sci-physics/fastjet:0= )
+   hepmc? ( sci-physics/hepmc:0= )
+   java? ( >=virtual/jre-1.5 )
+   lhapdf? ( sci-physics/lhapdf:0= )
+   rivet? ( sci-physics/rivet:0= )
+   zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+   test? ( sys-process/time )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
+
+src_prepare() {
+   find -name 'Makefile.am' -exec \
+   sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
+   # trick to force c++ linking
+   sed -i \
+   -e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
+   -e '/dist_pkgdata_DATA = ThePEG.el/d' \
+   lib/Makefile.am || die
+   autotools-utils_src_prepare
+   java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   

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

2015-08-23 Thread Jauhien Piatlicki
commit: f68b678539fcd92d00a601a276275749c868d739
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Sun Aug 23 12:42:45 2015 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Sun Aug 23 12:42:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68b6785

sci-physics/thepeg: initial import from the science overlay

Package-Manager: portage-2.2.18

 sci-physics/thepeg/Manifest  |  5 ++
 sci-physics/thepeg/files/thepeg-1.8.3-java.patch | 37 +
 sci-physics/thepeg/metadata.xml  | 24 ++
 sci-physics/thepeg/thepeg-1.9.2.ebuild   | 97 
 4 files changed, 163 insertions(+)

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
new file mode 100644
index 000..4a71906
--- /dev/null
+++ b/sci-physics/thepeg/Manifest
@@ -0,0 +1,5 @@
+DIST GRV98nlo.LHgrid 221908 SHA256 
78e7b133ac1f1d5576aa688f98adb8b6e29feb15cbb58556c860cb7e183da647 SHA512 
fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
 WHIRLPOOL 
ce0d01cd7c293efd199704cdeb0cb5ad9093393eef56b72cb6096b2e6135ce57d1710b0cbcd219bb4dfe82b15d684a3f6a5aad6dda97d3428dc2f645ec5a2dc4
+DIST MRST2001nlo.LHgrid 719692 SHA256 
7ec031afa2bd254b95b66b3058291365091f58b48e4be2b368e61fc170c51d58 SHA512 
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
 WHIRLPOOL 
bce25b3dc3b0a29c537eafac243c81bdb83b4e3daca34627d7d8bb8c59f802bb12ea6e8611fe2758a8c9a9880dab16276c11a332059431df0b14ecb6eb6d40f3
+DIST ThePEG-1.9.2.tar.bz2 1870577 SHA256 
ff7bbb256866f994dae04ade1f57c92d2670edaac3df11c9a300419a5343faf4 SHA512 
bc43606c79bb15938969b9d444db49c6af5c8ba21072a879a502086a77fe18b13fec44691046b4e0772b260b83ea7ef29b906027eadda6a8ea004ace9318379c
 WHIRLPOOL 
fb686c14a6c8a958f08be670085f10463d2928dacd8efe039e0e5fa781dc7532310702146dd9a0aef5bb8e881e1ff0e5d7f07637b8ad56a80c3d197e67d9c970
+DIST cteq5l.LHgrid 134797 SHA256 
83c92bc90fd6e12be9cd76bc032eca26dcedbe90f0c11aef843bbf54734d5bba SHA512 
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 WHIRLPOOL 
8a86877fcbae2b45576e3fae08dfd4771c668257893ba2f813c578641dce9800f42bfd57d0d8ac2abc6bf7cd40921020478f1912014a36cfb722ed408ca1430f
+DIST cteq6ll.LHpdf 1461 SHA256 
a3c6bd1ebea30f75fa23fa94922ba281872a66e59465b61f73a0f3629c2b5c03 SHA512 
b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
 WHIRLPOOL 
3eeba4277668b92bfa0de3d0fb27d0d9b940904061b6aa212936e4a9b86f9955188b81d9572672f64155abc7f2c6184fc90f8f81dd7eabbe1b015b749a5af304

diff --git a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch 
b/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
new file mode 100644
index 000..45b0e95
--- /dev/null
+++ b/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
@@ -0,0 +1,37 @@
+--- java/Makefile.am
 java/Makefile.am
+@@ -11,8 +12,7 @@
+ 
+ CLEANFILES = ThePEG.jar thepeg.sh
+ 
+-jardir = $(pkglibdir)
+-nodist_jar_DATA = ThePEG.jar
++noinst_DATA = ThePEG.jar
+ 
+ dist_noinst_DATA = $(JAVASOURCES) jar-manifest
+ 
+@@ -34,7 +34,7 @@
+   $(JAR) cmf ThePEG/jar-manifest ThePEG.jar ThePEG/*.class
+ 
+ thepeg.sh: thepeg.install Makefile
+-  sed -e s:@pkglibdir[@]:$(pkglibdir):g \
++  sed -e s:@datadir[@]:$(datadir):g \
+ -e s:@bindir[@]:$(bindir):g \
+ -e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install  thepeg.sh
+   chmod +x thepeg.sh
+--- java/thepeg.install
 java/thepeg.install
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-pkglibdir=@pkglibdir@
++source @datadir@/thepeg/package.env
+ bindir=@bindir@
+ 
+ ThePEG_CMD=${bindir}/setupThePEG
+@@ -19,4 +19,4 @@
+ 
+ 
+ 
+-exec @java@ ${HEADLESS} -jar ${pkglibdir}/ThePEG.jar ${ThePEG_CMD} $@
++exec @java@ ${HEADLESS} -jar ${CLASSPATH} ${ThePEG_CMD} $@

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
new file mode 100644
index 000..60bfa04
--- /dev/null
+++ b/sci-physics/thepeg/metadata.xml
@@ -0,0 +1,24 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
+pkgmetadata
+herdsci-physics/herd
+maintainer
+  emailjauh...@gentoo.org/email
+/maintainer
+longdescription
+  Toolkit for High Energy Physics Event Generation.
+  ThePEG has been broken out from the PYTHIA7 program
+  to better factorize the parts which were PYTHIA-specific
+  from those which are general model-independent components
+  of the toolkit and which can be used by any event generator model.
+/longdescription
+use
+  flag name='c++11'Build ThePEG using the C++11 standard.
+  Experimental feature, not for production use./flag
+  flag name='fastjet'Adds support for pkgsci-physics/fastjet/pkg/flag
+  flag name='hepmc'Adds support for High Energy Physics Monte Carlo
+