summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Puck Neuwirth <alexander@neuwirth-informatik.de>2023-02-01 22:36:51 +0100
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-02-02 11:10:07 +0100
commitdfece2078c46247f37eb83c824c420f81e8b615e (patch)
tree32ac9b1837967d48ed6cd5e7ae42955ca55d1391 /sci-physics
parentdev-libs/rocm-comgr: Re-add accidentally removed patch (diff)
downloadgentoo-dfece2078c46247f37eb83c824c420f81e8b615e.tar.gz
gentoo-dfece2078c46247f37eb83c824c420f81e8b615e.tar.bz2
gentoo-dfece2078c46247f37eb83c824c420f81e8b615e.zip
sci-physics/herwig: .inc became .INC, EAPI 6 -> 8
Closes: https://bugs.gentoo.org/761817 Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de> Closes: https://github.com/gentoo/gentoo/pull/29383 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/herwig/Manifest2
-rw-r--r--sci-physics/herwig/herwig-6.5.21-r2.ebuild (renamed from sci-physics/herwig/herwig-6.5.21-r1.ebuild)31
2 files changed, 14 insertions, 19 deletions
diff --git a/sci-physics/herwig/Manifest b/sci-physics/herwig/Manifest
index 071524b1bca7..a66f50f7d578 100644
--- a/sci-physics/herwig/Manifest
+++ b/sci-physics/herwig/Manifest
@@ -1,4 +1,4 @@
DIST HERWIG65.INC 32 BLAKE2B 89056a5d5bca2bfe1493ba32c73501c2a0b46c0b27e3ff0ebdf62a3d7d1161835af7cb299bdbd3bb10f810944b3a8ca00a5e7798cb70ff274002995498caa7ab SHA512 fe63b262458a0e2e9aa5bb76efa2980714e8af96fbd9e226fa33dfda3111e45e6ec033a4c9d21ca339e2336dea3e0f723aa3cff29c4fbbc871a30a9a5690c888
+DIST herwig6521.INC 15224 BLAKE2B 176f3b329f0eabdf5befdbc0cd372e57a3027e6d7faf447356e72b0a5c396e21f44dd594e18f37e4139e2ecc507749175441644513de4b10e055a95731ab3046 SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa
DIST herwig6521.f 2513511 BLAKE2B 5172e07e8dfd5c731d0a8dffe061980a2629ffac5581d2df3cc619e9de166d4ecc1e66da0a07ee8527c62d45665f3740c22a92b89b88638dddee7fbd41a9a94f SHA512 c13bc74132ddb86ca0fea61bc2da21dc6908b96d14a33c378c0f37be0dce201012fdd11681e11fcfb715b345ccd72fb4d166017eaf4e0cd19762acbe6687809a
-DIST herwig6521.inc 15224 BLAKE2B 176f3b329f0eabdf5befdbc0cd372e57a3027e6d7faf447356e72b0a5c396e21f44dd594e18f37e4139e2ecc507749175441644513de4b10e055a95731ab3046 SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa
DIST hw65_manual.pdf 934022 BLAKE2B ab6d000f236246779450a239e7b7d18ed3487189b33ec27407edcf40ae7f19134a2bdc7689c55eb44ab5637efa8aa32d678eb71b782e386e6ea340f936c6cb79 SHA512 68c4407e27abe2d34e239455bd94324d919b712cc8b031faa4635caf4e3eb6ff30d35b4e7f8dc9146c8f54886ff77cc690b296b15805dcd9302ef93e707915ff
diff --git a/sci-physics/herwig/herwig-6.5.21-r1.ebuild b/sci-physics/herwig/herwig-6.5.21-r2.ebuild
index 4dc4c8c9cff4..e119e9ddb327 100644
--- a/sci-physics/herwig/herwig-6.5.21-r1.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21-r2.ebuild
@@ -1,43 +1,38 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit autotools fortran-2 versionator
+inherit autotools fortran-2
-PV1=$(get_version_component_range 1 ${PV})
-PV2=$(get_version_component_range 2 ${PV})
-PV3=$(get_version_component_range 3 ${PV})
-MY_P=${PN}${PV1}${PV2}${PV3}
-MY_PINC="${PN^^}${PV1}${PV2}.INC"
+MY_P=${PN}$(ver_rs 1- '')
+MY_PINC="${PN^^}$(ver_cut 1)$(ver_cut 2).INC"
DESCRIPTION="High Energy Physics Event Generator"
HOMEPAGE="https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/"
SRC_URI="
https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_P}.f
- https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_P}.inc
+ https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_P}.INC
https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_PINC}
doc? ( https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/hw65_manual.pdf )"
+S="${WORKDIR}"
LICENSE="all-rights-reserved"
-RESTRICT="mirror bindist"
-
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
IUSE="doc static-libs"
+RESTRICT="mirror bindist"
-RDEPEND="!sci-physics/cernlib-montecarlo[herwig]"
DEPEND="${RDEPEND}"
-S="${WORKDIR}"
-
src_unpack() {
- cp "${DISTDIR}"/{"${MY_P}".f,"${MY_P}".inc,"${MY_PINC}"} "${S}" || die
+ cp "${DISTDIR}"/{"${MY_P}".f,"${MY_P}".INC,"${MY_PINC}"} "${S}" || die
}
src_prepare() {
sed -i \
- -e "s/${PN}.*.inc/${MY_P}.inc/" \
+ -e "s/${PN}.*.inc/${MY_P}.INC/" \
${MY_PINC} || die
cat > configure.ac <<-EOF || die
AC_INIT(${PN},${PV})
@@ -52,10 +47,10 @@ src_prepare() {
lib${PN}_la_SOURCES = ${MY_P}.f
include_HEADERS = \
${MY_PINC} \
- ${MY_P}.inc
+ ${MY_P}.INC
EOF
- eapply_user
+ default
eautoreconf
}