summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2015-08-01 19:51:30 +0000
committerAndrew Savchenko <bircoph@gentoo.org>2015-08-01 19:51:30 +0000
commit464c9f3fca1fd36721e9949993591c2834356f6e (patch)
tree75ae5fa582d336fa8e27d1a329e8e0e3c4dc9dd7 /sci-physics
parentMask dev-java/antenna for removal. See bug 556460. (diff)
downloadhistorical-464c9f3fca1fd36721e9949993591c2834356f6e.tar.gz
historical-464c9f3fca1fd36721e9949993591c2834356f6e.tar.bz2
historical-464c9f3fca1fd36721e9949993591c2834356f6e.zip
fix bugs 532146, 553558
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org> Package-Manager: portage-2.2.20/cvs/Linux i686 Manifest-Sign-Key: 0x565953B95372756C
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/herwig/ChangeLog9
-rw-r--r--sci-physics/herwig/Manifest32
-rw-r--r--sci-physics/herwig/herwig-6.5.10.ebuild20
-rw-r--r--sci-physics/herwig/herwig-6.5.21.ebuild15
4 files changed, 45 insertions, 31 deletions
diff --git a/sci-physics/herwig/ChangeLog b/sci-physics/herwig/ChangeLog
index 0c557fc95837..7f298483b2cc 100644
--- a/sci-physics/herwig/ChangeLog
+++ b/sci-physics/herwig/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-physics/herwig
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/ChangeLog,v 1.6 2013/06/04 18:00:58 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/ChangeLog,v 1.7 2015/08/01 19:51:26 bircoph Exp $
+
+ 01 Aug 2015; Andrew Savchenko <bircoph@gentoo.org> herwig-6.5.10.ebuild,
+ herwig-6.5.21.ebuild:
+ Update HOMEPAGE, SRC_URI, Manifest - fixes bugs 532146, 553558.
+ Patch herwig header for 6.5.10 version.
*herwig-6.5.21 (04 Jun 2013)
diff --git a/sci-physics/herwig/Manifest b/sci-physics/herwig/Manifest
index 02aef87d83cf..5512ee45e719 100644
--- a/sci-physics/herwig/Manifest
+++ b/sci-physics/herwig/Manifest
@@ -1,20 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST HERWIG65.INC 32 SHA256 593013b04d0c7a0c341befefc9263c10934741ca123394600350475313afda01 SHA512 288fcd7949be871afb0aab04a971be53854f351fa9be11155fc878729cf74a1969a1c4d8aa0790dd992c89252985ea203d19d8d19f227ee4be60e0ebb708b949 WHIRLPOOL 6db2b7404611770cad4f8eff7d70efa98ae2e7fc8f7fb240431a14ab766acd85ac5dbbf928e0cd73227aa7c1cf2c04dc9fe169f12b3893b3b32e87ae8181144f
-DIST herwig6510.f 2502723 SHA256 62105cbd5531223ff71c3c0e7215c87fde8202b15b22ba3a0eaa052c1177dc0c
-DIST herwig6510.inc 14803 SHA256 4cab87f24cf6e61ba647407e0533a9b77d9d3886762945569d4ec0f95780f90c
+DIST HERWIG65.INC 32 SHA256 637f8e4c1bd76ec0fd96acc61120d2a41b6b8ca53884a1db30e7f1e35cf52fa4 SHA512 fe63b262458a0e2e9aa5bb76efa2980714e8af96fbd9e226fa33dfda3111e45e6ec033a4c9d21ca339e2336dea3e0f723aa3cff29c4fbbc871a30a9a5690c888 WHIRLPOOL c7459023e7e21a46b7e4bc846f1b6ec3f1358f2efded20411b08c714a98e338c5ad0f2d90b00f4e53967b07a65397d51a562d8334f943efb698d6114469be706
+DIST herwig6510.f 2502723 SHA256 62105cbd5531223ff71c3c0e7215c87fde8202b15b22ba3a0eaa052c1177dc0c SHA512 3176822a3b54d928e66cccaf89ddcfcc1374df54c6159a2557e66d248ec445aa9365f1de8e94af33a7d072a322d78f2684ba09bc0e88a70552b5ef6ecd0a5da0 WHIRLPOOL 53f187eff5c65931f2276ca6e260dbeae7b601aa85be106a9c550be54833f5517b0e421ffef082527b7c19e1955038eaef60dc191a58ff0515e54b83553875dd
+DIST herwig6510.inc 14853 SHA256 4373338dc3f4bc1f0376df8238eedaab785e5ef9823621b1f5beb874f478dca0 SHA512 3ad92ea3327506b469cec086547623d4793b9727ab4ff8ef5d329e3843bae3b1fc8af34520ecce45dc08147caf360dd389297a2f765a4a4e389ad74ef9a04aad WHIRLPOOL d5793d19de41690cd8fb4ff658fc1e963dc2f0959b3cde36f9223173f87f0b4f74cf2372f1ad2c93740fd5bf48682971dea9484192cd54039750515cac5c19ce
DIST herwig6521.f 2513511 SHA256 6e47079ee19e5cdc538aa7eae6cd6102ce783bfa501f6356eb34349af33954c0 SHA512 c13bc74132ddb86ca0fea61bc2da21dc6908b96d14a33c378c0f37be0dce201012fdd11681e11fcfb715b345ccd72fb4d166017eaf4e0cd19762acbe6687809a WHIRLPOOL 8baf5931614424d8ce873c31d5d494523fa1e8a783fbbc23ea99035cf5ac5f8be7026436991e078ae8b7334e55a9716da86c10aefce8995f6ea34a03c795b715
DIST herwig6521.inc 15224 SHA256 f75e4cef481a97f73aa0710789fb3e2bd9b8b4ee26850bf7ecdc8ca6e058476c SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa WHIRLPOOL a5c45472e2350a2fd3459156c7fc77498624e29807d0008b0393eff3a6c027ff4bdc7d1df1cfc3ccf9c70a8a710e94e208638da10ec8a320470581f5ce67a695
-DIST hw65_manual.pdf 934022 SHA256 a857263bc5ee6ead2c7414ffd9a64d04ab40b6c846399c23001ac8b5211b1ac6
-EBUILD herwig-6.5.10.ebuild 1369 SHA256 4bd22562087bea206e9f3e692695ebcc7246dc3ed0b9a0aa2a1750d642a935d5 SHA512 f9857625f71bdc3866347f974e5655cd96beb9c3fe262ab6ba32659525cdc643814a65e6833adb164f29f3240406e2330611c8d59b079edda42df9cde1e603b2 WHIRLPOOL 8a93e42a2e4f16a85888b9326b7a0de4469c69a2667536b9894df3cc58712862c4f23c2790ee262e9217a3bface1855bd80e4554ac7aaaeba356513f315973bd
-EBUILD herwig-6.5.21.ebuild 1592 SHA256 886489a71cf9723a33e4313dc2cb39b6d8fc90a70891d617de16cae64f7ba6d7 SHA512 afc858cfb1680413f59f61575a7d1f942cdd959c28b712893e65a0a02ec3903e3b06868e9f007cb489c978247b78fdeb5cec50b268f88c9f0fec4acff54b2106 WHIRLPOOL b5c16705927c24883c016fd99a9bd7800760eca2b02f40c928a408a8b840a5700e26664d3239153b98608fc6c5b7912f236b9489efaaf809415a9a362d0b1a74
-MISC ChangeLog 1312 SHA256 c6ef34c5d5f11952346579a778a278891c54c9dc25b08c8ccb7a2ae293b825c1 SHA512 ade019c219f55cce1509a3bb73a60b17c5d66a3d8aa49ce887df53bc9d47c78dcf9897af8d69700026afab0ffc3353797acc67d2d843fc5ecb8df81073fb2e47 WHIRLPOOL 360c001db2fefa928cd75c446e87bea44bf3cdfffbc44c72a68888c52e4c3a45149636b67a76bc8a610b208ceab2714e01f1ce1aad549057fc307b6f82e55c54
+DIST hw65_manual.pdf 934022 SHA256 a857263bc5ee6ead2c7414ffd9a64d04ab40b6c846399c23001ac8b5211b1ac6 SHA512 68c4407e27abe2d34e239455bd94324d919b712cc8b031faa4635caf4e3eb6ff30d35b4e7f8dc9146c8f54886ff77cc690b296b15805dcd9302ef93e707915ff WHIRLPOOL f51dcb8c7d84d872110ba4e9e698284ab36f8a17f3c2de1578b0ecb3127c3f2481d2c005e623267cdea6785a4f78d4a4dbba938fabbaedea2fc94139da155687
+EBUILD herwig-6.5.10.ebuild 1356 SHA256 3fb709b4c6d380b6c61483294fdbdf1d6b1a331f8c7416f5375d2374d920e473 SHA512 3092e78316836989fcf344520a4593e1d5ccbfd275792c4426f6a947b336047e53d572492aabfa547d9d3b12d6e4cc374515b0ef25be5f7fc0702dba9959a3a8 WHIRLPOOL c2547d5e86827773accaadb4a8d74f45109f23ba3a8ee5aa6ea3fc9b13b85f429fee0da9e2332f553a72f5dd5e0775f1f1d6e644ab9f00d258814b183517e90f
+EBUILD herwig-6.5.21.ebuild 1536 SHA256 44c43e63fbeb0e7f49157252922c50f7fceb702f80034c830aca2780db822ca6 SHA512 6a55a4006a46fc81eef44606a55343f7dcd229d43cd858aaed483e2be3f50dca85a238d13eecdde6aad025cfa65c8a19e01b96fb317fc49cc4c8ce165f2c55b4 WHIRLPOOL 512d296e889783eabfc67775474cebbec28f231ed0fa8b46ed220e00e2a169e14ff3ec8972514c16a4bc82cfc26e4cbe1bc3c1db0bbf130531bb3b24e508332a
+MISC ChangeLog 1519 SHA256 204aaf44892911ea2b034bcd320ffb007e4d83a99ee41a95d4b9b293b061aacd SHA512 8bb850a6ad608b407481a41cc905fb8dfbf0cec86407a7072947dc2056d2e2721d2075ab7822446008fba4e8e673999506ae0cf1b7cccd5a3fa0384b77980d2c WHIRLPOOL 0538012650a1c2047cd12b27b618bcbeebf805bbe87211133e9843f9a040da38a826c82fc5e2e99a17df2cf20bf1090d9e6c276d9c1f35ac95303ed0989e7583
MISC metadata.xml 313 SHA256 3af9012ca7aa066d35a12c04ea294ac11b6125b56127fb831e3e92e71ec60cf7 SHA512 81ca81499604fbd06614e13b36065139875db167525ca988941c3c84bb1203a360b4fe22bfbc6b130d01b1039db35e23e5bdbe6ea9b90a8454b6cacbcb3d6a4c WHIRLPOOL 6531e3eaaf53feb6370335bfb1a4f96311f33704adfa6af4a64d7f0fd96fb8eb6e0cfcce89c4f159a0fb0e10a6437135bca9b5d94fcd431765871c23617d1c3c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlGuK1sACgkQ1ycZbhPLE2C8WACffMF4+WDg/nklRzDiVUIL4m9j
-clIAnR29U2VMQLun+wXOGvJN8J8D0/zz
-=4um+
+iQIcBAEBCAAGBQJVvSM/AAoJEPZTWjO6HuSN+tgQAJmtNdzr8NQp5ST3HiczkbO9
+4Agn++jjUzTUGKVxG0COFvrO/qPzJT+LR06zdy6MjJUd3CvTxwhqNkM0muZ1+pHl
+6S1ShVeTXOyYRsU6ct3Fz21MqtgEZuTP6Ai1hUNp2DRkKeIM/ScLFe7AY/nIQK2i
+Eg0U7A21aVi4bxBkN8Ww5fAkOheP+KffBQ/qMAp8e+tGrkT4KI0hc0ipIhuXzR8z
+I1PaNYhA+Go/TjR+ZUY21+QSvTCqeilpxY2qY8srPWXsZt8LLi/lX0b/Jtt1h3fB
++a1SZwWo2X9LJKEPjBgpiikQvIE3W7wxB/CkBtvLIA0qdjaeXNAxLttjJRwMIFT9
+51B2Es6FsjjGBWZTvJUW0+h5x6Fc1FywfExHATcOKJgRfMo0k04FijmgyO0wn8SH
+OuP0L/VIxatl/XIbL8LPn5Pdvxbipdl2PPr5zF/rvJegnnxgXznvGhxoBkJFwhqo
+WzR6ySuMHoJqBFam4Ig8V82PLRphPC6YdN1R7Sz50yWTNhn5P1aFa8qjgQlqzLmH
+icpK9REzTJOMZgDq6QXW/9DLBp6HrDyDpLKP9AGkxE3F2Ez+pmVlLDoX6oz+OYMm
+EmwWNu0KKK8SVsjW/qAu1w9OdbmFM8wmhE9wGpYfmLVDSdSs3CgR4RjcvQl+soKU
+SXrQthKDuYp5Am+flfwQ
+=bcLC
-----END PGP SIGNATURE-----
diff --git a/sci-physics/herwig/herwig-6.5.10.ebuild b/sci-physics/herwig/herwig-6.5.10.ebuild
index 656fcbfe8bdd..0f42b19b80d7 100644
--- a/sci-physics/herwig/herwig-6.5.10.ebuild
+++ b/sci-physics/herwig/herwig-6.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.10.ebuild,v 1.5 2013/06/04 18:00:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.10.ebuild,v 1.6 2015/08/01 19:51:26 bircoph Exp $
EAPI=2
@@ -9,17 +9,16 @@ inherit versionator 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_VER=${PV1}${PV2}${PV3}
+MY_P=${PN}${MY_VER}
MY_PINC="$(echo ${PN}|tr '[:lower:]' '[:upper:]')${PV1}${PV2}.INC"
DESCRIPTION="High Energy Physics Event Generator"
-HOMEPAGE="http://hepwww.rl.ac.uk/theory/seymour/herwig/"
-
-COM_URI="http://hepwww.rl.ac.uk/theory/seymour/${PN}"
+HOMEPAGE="http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/"
SRC_URI="
- ${COM_URI}/${MY_P}.f
- ${COM_URI}/${MY_P}.inc
- ${COM_URI}/${MY_PINC}"
+ ${HOMEPAGE}/${MY_P}.f
+ ${HOMEPAGE}/${MY_P}.inc
+ ${HOMEPAGE}/${MY_PINC}"
LICENSE="all-rights-reserved"
RESTRICT="mirror bindist"
@@ -38,6 +37,7 @@ src_unpack() {
}
src_prepare() {
+ sed -i "s/6521/${MY_VER}/" "${MY_PINC}" || die
cat > configure.ac <<-EOF
AC_INIT(${PN},${PV})
AM_INIT_AUTOMAKE
@@ -58,5 +58,5 @@ src_prepare() {
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
}
diff --git a/sci-physics/herwig/herwig-6.5.21.ebuild b/sci-physics/herwig/herwig-6.5.21.ebuild
index 226a2375f82d..8f3951f76b42 100644
--- a/sci-physics/herwig/herwig-6.5.21.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.21.ebuild,v 1.1 2013/06/04 18:00:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.21.ebuild,v 1.2 2015/08/01 19:51:26 bircoph Exp $
EAPI=5
@@ -15,12 +15,11 @@ MY_PINC="$(echo ${PN}|tr '[:lower:]' '[:upper:]')${PV1}${PV2}.INC"
DESCRIPTION="High Energy Physics Event Generator"
HOMEPAGE="http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/"
-
-COM_URI="http://www.hep.phy.cam.ac.uk/theory/webber/Herwig"
-SRC_URI="${COM_URI}/${MY_P}.f
- ${COM_URI}/${MY_P}.inc
- ${COM_URI}/${MY_PINC}
- doc? ( ${COM_URI}/hw65_manual.pdf )"
+SRC_URI="
+ ${HOMEPAGE}/${MY_P}.f
+ ${HOMEPAGE}/${MY_P}.inc
+ ${HOMEPAGE}/${MY_PINC}
+ doc? ( ${HOMEPAGE}/hw65_manual.pdf )"
LICENSE="all-rights-reserved"
RESTRICT="mirror bindist"