commit: 543cb580a394d750871cf6ef3a09ebdeb1418800
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sun Jan 11 18:05:58 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sun Jan 11 18:05:58 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=543cb580
Let CACAO handle ppc64 with OpenJDK 6 / IcedTea 1.x as there is no HotSpot port
there.
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 35964222
---
dev-java/icedtea/ChangeLog | 5 +++++
dev-java/icedtea/Manifest | 12 ++++++------
dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild | 2 +-
dev-java/icedtea/icedtea-6.9999.ebuild | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 790ddb4..73f874b 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -3,6 +3,11 @@
# $Header: $
11 Jan 2015; Andrew John Hughes <gnu_and...@member.fsf.org>
+ icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild:
+ Let CACAO handle ppc64 with OpenJDK 6 / IcedTea 1.x as there is no HotSpot
+ port there.
+
+ 11 Jan 2015; Andrew John Hughes <gnu_and...@member.fsf.org>
icedtea-3.9999.ebuild, icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild,
icedtea-7.2.5.3.ebuild, icedtea-7.2.6.0_pre11.ebuild:
Synchronise arch selection across all ebuilds, update to match Gentoo values
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 11c89bc..4bf0ffe 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -41,16 +41,16 @@ DIST icedtea7-openjdk-05e485acec14.tar.bz2 126830 SHA256
56d5f39698e91571c815576
DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256
ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512
3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55
WHIRLPOOL
4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256
cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512
e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c
WHIRLPOOL
bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291
EBUILD icedtea-3.9999.ebuild 11661 SHA256
3a2f3d9c6ecd7305c36118d1984917ca7e3d0ed3ac0063a5e450181786327523 SHA512
1287f5518f64cc991365d0d271bee9531d955690f3128dabf7432e928a72d2413b396c1523a91d1d47cb63d7abe891f52a72e05b7c2e7ab1214639b98510c8ac
WHIRLPOOL
878ab905a55d29dd5e60caa57bcf9c7e829fd28b10c83c4d3d965cebe932d87e65dd6b69580e6e2fe87d247973bf86d1dd2abff0be693152330e12a5f885aebc
-EBUILD icedtea-6.1.13.5-r1.ebuild 11011 SHA256
79927c530660fbc7e2d21bb50da6ce6a11b9075d141cffdc742ce31570a1ced8 SHA512
98dd5a074a842a6870349d22d2b5a85eb988f2cf7e2941f8ece5480c91f75749ff226d099ab8f9d4e94aa7090b35d9e2aedf9d25b68efb4a48adbfb7dc1887d8
WHIRLPOOL
5aba919a6f8a84deb6505f594b5f34add0d64e005eb63d8856d88d09003adf8e7d8fd29afd811e456a09a96b8f92fc679afe6a0d52429db3f5a8b9e6d4c43a5e
-EBUILD icedtea-6.9999.ebuild 10718 SHA256
e9641f8cd7506f26c9c1c55c12b11df5ff50c573fefcd27039b81b91ef649540 SHA512
6963e41a00d5b4f09a972b07bc65a9c86e2aef339a726ce0eac6ff92d8dd1c886ce66a8b308c02629fcca8592405792459bdec81f2ee95f3f7d8b02d3b662a94
WHIRLPOOL
5cea7be6c2187ef2892f08addab7179aab57a1635d621f8e2ff1fdf326fb33a54e22c7056a94db27d741d2745677a4076b4505552b486a8b0af45e9449b87fb3
+EBUILD icedtea-6.1.13.5-r1.ebuild 11029 SHA256
ba4422794d3810272a2a1058985510d186ff4be9d8692fd2437ef57ed1773741 SHA512
d5db738c8c0b813b44ee2d3dee0fdc669d00fb35112f8066540f3d9b1c0b225f1a8081d3c4502bb1b56ca2f21d82ba28608a722b28a4c4f10f726535986931f8
WHIRLPOOL
588c21167b99f6af14eb2a52721456a0b6ee5e3a27890d35afe649a653aef131543af36331203ec90da30512291698a3d9144a4c418c8c3668b64427f64e36cc
+EBUILD icedtea-6.9999.ebuild 10736 SHA256
e24fd15c06009009eb81d6d6380667026184b7f9a1afc7fbdd77895363a7f2a4 SHA512
ffdd505208273611598d13c7779242c56d9ff80cf0c3f073445d42e38de1942ff9feb3e29f974bd58c791cfc68e3ef50cdd0e42f27cad3d22b5c7c3ddc29d76f
WHIRLPOOL
a3c0843a623c9ef908800aafac06a470d9ad90c3331349bfdc6038b12e3a6cb44558b6f7ce170522bb9edc349786f6e54bfd21cbb7978f2e0d00fe9e6968c714
EBUILD icedtea-7.2.5.3.ebuild 12710 SHA256
f6707610fccc5f9cabb6069cfb2c6cf76025d2051d2df74b7ba04fb2b25fdd74 SHA512
6161e431ed56f3e3fd5d6b5391d7090db3140788730c3e1c96277491a47f416f12f9eaa852a634f43b645743254638f9b645e7a77362c8a301157395b72aa255
WHIRLPOOL
ca0ae74585fee47fdb105c801d0a51f33448d267bf4bcf5289f553e7c1be6e2af44374bc07afe070742c3cfafa204ff76615ccc3a2488d367e355613899e173b
EBUILD icedtea-7.2.6.0_pre11.ebuild 12570 SHA256
0644ba31949bb0d2ccd5d78ee3577f458b9aa00a59565f7cdb81787b134aa927 SHA512
1e6610482a02360534232a96bd607cda6fbf4f1651e62b2c66011a6f34cf8bc1828ade48ee00315e679c5bd4435e0cec0d4e1be81aa82ee0bea027a4522bfdab
WHIRLPOOL
4db1f14099cc1563077f75246bf9b9efb83d39955a8039e89323c5dfdc35fcd4a5c83f707f8af3494e763f7bda08a323a4f00b037337fb7caf7f4d7aea0fb884
-MISC ChangeLog 87757 SHA256
3b2ca5835913865115bf231708cf256881b9e94ac0f6d67f2f52a0a9f9c2db05 SHA512
af2c6674e0da4ea4fd2b83d86f454fa5ba261548ee76f3694773752f2d85945b38f170e3b3ce4481855f0285eca77dc9cc908eb6e560a4e9d5a94e9e7acec0c2
WHIRLPOOL
10b126564b2c1e10ff33242dde327c4332836bf47ebf096824d8324b874d11ffd063da5a8700f6a32245683e6cfaba7dc58dc6d5e158d6febb61b08440c734a9
+MISC ChangeLog 87964 SHA256
0d71cecfe368c0fdcdfcd9c2b4d1db01c045603e7970b922c68070dce982a80d SHA512
7706467bf4d5310b0bc62a502b096229bde0179dd2db9f56fd2fba323c59b9ffb7d6b7e180145bce47b33a1a5ee2ffb04d1165dc1b4483ec2b6f9f3615ba383d
WHIRLPOOL
db2720aa75c93351512b08c27a029638e2077a5cb49f3a10dc79d09ef094bd3d2e0c5e0995ff50cff0300fcfe9e2ad2b166849d1458e17109372285a0dbf1d23
MISC metadata.xml 1680 SHA256
41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512
5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c
WHIRLPOOL
5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EARYIAAYFAlSyuWsACgkQz9oPmzWWQiIUGQEA5Pu4ixNw0C0oij6GgIvOhY8z
-5+8pcIUU0WvccXLe5c4BAEOk8I64LlpvtgdbvQsPcirBIs6KlDJbwO47J2XelJ4F
-=qk2O
+iF4EARYIAAYFAlSyu4UACgkQz9oPmzWWQiI6fAEAX+J6T4rtkta9QiqoiuNN8NQ7
+sdUQuQUbqeML5DRQdL8BAEkgrGxdBBDzzIKXrkfnoz4NqBROyobG8kfBe5zyGJsD
+=RUob
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
index 98da314..032efab 100644
--- a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
@@ -211,7 +211,7 @@ src_configure() {
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
# Otherwise use CACAO on ppc and Zero on anything else
if test "x${hotspot_port}" != "xyes"; then
- if use ppc; then
+ if { use ppc || use ppc64; }; then
use_cacao="yes"
else
use_zero="yes"
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index 1627d7a..50620f4 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -208,7 +208,7 @@ src_configure() {
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
# Otherwise use CACAO on ppc and Zero on anything else
if test "x${hotspot_port}" != "xyes"; then
- if use ppc; then
+ if { use ppc || use ppc64; }; then
use_cacao="yes"
else
use_zero="yes"
