* [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/
@ 2015-11-27 10:09 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-11-27 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 23350670827369f2957a91901a4a2a50314bb597
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 09:38:53 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 10:08:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23350670
sci-physics/herwig++: Drop obsolete virtual/fortran in *DEPEND
fortran-2.eclass handles this
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-physics/herwig++/herwig++-2.7.1.ebuild | 9 ++++-----
sci-physics/herwig++/metadata.xml | 18 +++++++++---------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/sci-physics/herwig++/herwig++-2.7.1.ebuild b/sci-physics/herwig++/herwig++-2.7.1.ebuild
index 4479a2c..dce4918 100644
--- a/sci-physics/herwig++/herwig++-2.7.1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.1.ebuild
@@ -15,9 +15,8 @@ DESCRIPTION="High-Energy Physics event generator"
HOMEPAGE="http://herwig.hepforge.org/"
SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"
-LICENSE="GPL-2"
-
SLOT="0/15"
+LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="c++11 fastjet static-libs"
@@ -29,8 +28,7 @@ RDEPEND="
<=sci-physics/looptools-2.8:0=
>=sci-physics/thepeg-1.9.2:0=
fastjet? ( sci-physics/fastjet:0= )"
-DEPEND="${RDEPEND}
- virtual/fortran"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${MYP}"
@@ -53,7 +51,8 @@ src_configure() {
autotools-utils_src_configure
}
-pkg_preinst () {
+src_install() {
+ autotools-utils_src_install
sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die
sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die
}
diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
index 73787df..7080135 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-physics</herd>
-<maintainer>
- <email>jauhien@gentoo.org</email>
-</maintainer>
-<longdescription>
+ <herd>sci-physics</herd>
+ <maintainer>
+ <email>jauhien@gentoo.org</email>
+ </maintainer>
+ <longdescription>
Herwig++ is a completely new event generator, written in C++.
It is built on the experience gained with the well-known
event generator HERWIG. The aim is to provide a multi purpose
event generator with similar or improved capabilities (like angular
ordered parton evolution and the cluster hadronization model).
</longdescription>
-<use>
- <flag name='c++11'>Build Herwig++ using the C++11 standard.
+ <use>
+ <flag name="c++11">Build Herwig++ using the C++11 standard.
Experimental feature, not for production use.</flag>
- <flag name='fastjet'>Adds support for <pkg>sci-physics/fastjet</pkg></flag>
-</use>
+ <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/
@ 2016-01-05 19:48 Jauhien Piatlicki
0 siblings, 0 replies; 6+ messages in thread
From: Jauhien Piatlicki @ 2016-01-05 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 0d526d437a5e992acdd7c86fa757aa0a0ca3a34c
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 19:45:53 2016 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 19:49:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d526d43
sci-physics/herwig++: fix sci-physics/thepeg dependency
Package-Manager: portage-2.2.26
.../herwig++/{herwig++-2.7.1.ebuild => herwig++-2.7.1-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-physics/herwig++/herwig++-2.7.1.ebuild b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
similarity index 95%
rename from sci-physics/herwig++/herwig++-2.7.1.ebuild
rename to sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
index dce4918..9777789 100644
--- a/sci-physics/herwig++/herwig++-2.7.1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.1-r1.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$
@@ -26,7 +26,7 @@ RDEPEND="
dev-libs/boost:0=
sci-libs/gsl:0=
<=sci-physics/looptools-2.8:0=
- >=sci-physics/thepeg-1.9.2:0=
+ ~sci-physics/thepeg-1.9.2:0=
fastjet? ( sci-physics/fastjet:0= )"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/
@ 2016-03-28 14:45 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-03-28 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 6f17acd8d7e1235cdf3590df00889e0399b72a9a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 14:44:16 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 14:44:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f17acd8
sci-physics/herwig++: Dep on >=sys-devel/boost-m4-0.4_p20160328 for modern boost
Gentoo-Bug: 570458
Package-Manager: portage-2.2.28
sci-physics/herwig++/herwig++-2.7.1-r1.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
index 9777789..1e8d799 100644
--- a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
@@ -28,12 +28,15 @@ RDEPEND="
<=sci-physics/looptools-2.8:0=
~sci-physics/thepeg-1.9.2:0=
fastjet? ( sci-physics/fastjet:0= )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ >=sys-devel/boost-m4-0.4_p20160328"
S="${WORKDIR}/${MYP}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.6.3-looptools.patch
+ # fixes bug 570458, which is due to an outdated bundled boost.m4
+ rm m4/boost.m4 || die
find -name 'Makefile.am' -exec \
sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die
autotools-utils_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/
@ 2016-08-07 8:28 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2016-08-07 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 33dc84033be3fb9e96ff3715ecd03f9cfa1c9716
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 08:17:30 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 08:17:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33dc8403
sci-physics/herwig++: Cleanup per bug #498492
Package-Manager: portage-2.3.0
sci-physics/herwig++/metadata.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
index 2b45ab5..23f7c30 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jauhien@gentoo.org</email>
- </maintainer>
<maintainer type="project">
<email>sci-physics@gentoo.org</email>
<name>Gentoo Physics Project</name>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/
@ 2021-03-28 1:14 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-03-28 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 3e1ecdd7fdf6972db07119f7840359ff48ef22e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 00:10:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 01:13:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1ecdd7
sci-physics/herwig++: port to EAPI 7 despite last-rites
* Port to EAPI 7
* Drop autotools-utils
This lets us get closer to removing autotools-utils.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-physics/herwig++/herwig++-2.7.1-r1.ebuild | 46 ++++++++++++++++-----------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
index 33fcc97e82f..0efec5352f5 100644
--- a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils flag-o-matic multilib
+inherit autotools flag-o-matic
MYP=Herwig++-${PV}
DESCRIPTION="High-Energy Physics event generator"
-HOMEPAGE="http://herwig.hepforge.org/"
-SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"
+HOMEPAGE="https://herwig.hepforge.org/"
+SRC_URI="https://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"
+S="${WORKDIR}/${MYP}"
SLOT="0/15"
LICENSE="GPL-2"
@@ -27,36 +25,46 @@ RDEPEND="
<=sci-physics/looptools-2.8:0=
~sci-physics/thepeg-1.9.2:0=
fastjet? ( sci-physics/fastjet:0= )"
-DEPEND="${RDEPEND}
- >=sys-devel/boost-m4-0.4_p20160328"
+DEPEND="
+ ${RDEPEND}
+ >=sys-devel/boost-m4-0.4_p20160328
+"
-S="${WORKDIR}/${MYP}"
src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.6.3-looptools.patch \
- "${FILESDIR}"/${PN}-2.7.1-fix-boost-1.67.patch
+ default
+
+ eapply -p0 "${FILESDIR}"/${PN}-2.6.3-looptools.patch
+ eapply "${FILESDIR}"/${PN}-2.7.1-fix-boost-1.67.patch
+
+
# fixes bug 570458, which is due to an outdated bundled boost.m4
rm m4/boost.m4 || die
+
find -name 'Makefile.am' -exec \
sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die
- autotools-utils_src_prepare
+
+ eautoreconf
}
src_configure() {
- use prefix && \
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/ThePEG
+ if use prefix ; then
+ append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/ThePEG"
+ fi
+
local myeconfargs=(
--with-boost="${EPREFIX}"/usr
--with-thepeg="${EPREFIX}"/usr
$(use_enable c++11 stdcxx11)
$(use_with fastjet fastjet "${EPREFIX}"/usr)
)
- autotools-utils_src_configure
+
+ econf "${myeconfargs[@]}"
}
src_install() {
- autotools-utils_src_install
+ default
+
sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die
sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/
@ 2021-03-28 1:29 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-03-28 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 38413f3b54f7090b0bcd40720b3e469deac3a2da
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 01:15:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 01:26:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38413f3b
sci-physics/herwig++: fix DoubleEmptyLine
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-physics/herwig++/herwig++-2.7.1-r1.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
index 0efec5352f5..8f7bfafc054 100644
--- a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
@@ -30,14 +30,12 @@ DEPEND="
>=sys-devel/boost-m4-0.4_p20160328
"
-
src_prepare() {
default
eapply -p0 "${FILESDIR}"/${PN}-2.6.3-looptools.patch
eapply "${FILESDIR}"/${PN}-2.7.1-fix-boost-1.67.patch
-
# fixes bug 570458, which is due to an outdated bundled boost.m4
rm m4/boost.m4 || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-28 1:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-28 1:29 [gentoo-commits] repo/gentoo:master commit in: sci-physics/herwig++/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-03-28 1:14 Sam James
2016-08-07 8:28 Pacho Ramos
2016-03-28 14:45 David Seifert
2016-01-05 19:48 Jauhien Piatlicki
2015-11-27 10:09 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox