commit: d883b7e82d7aefa0d36b1801eae6519600a505d6
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 3 05:18:39 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 05:18:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d883b7e8
dev-java/icedtea-bin: restore amd64 and x86 keywords for 3.14
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-java/icedtea-bin/Manifest | 4 ++++
dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 35d38eb46cd..4e98a6b3faa 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -4,10 +4,12 @@ DIST icedtea-bin-core-3.13.0-arm64.tar.xz 61700464 BLAKE2B
333202f47b63ae050aa43
DIST icedtea-bin-core-3.13.0-ppc64.tar.xz 55002324 BLAKE2B
b93312e3e82c75d2611f6907c57046fc4dc1498be989fde841a43162c381247fd934c4c3d83493455f4aecec338cb343e30cf26a313cd0d26dcca9e76ee2a2d3
SHA512
c04d0afe3b5b9a592bc9d9d26cc15e920edc6a6646337f969b889388d0ae08ddfdd84435076538b27106dc7dc1edc31d7dc84abd744de927d403e8fcde0fe742
DIST icedtea-bin-core-3.13.0-ppc64le.tar.xz 55089960 BLAKE2B
915a80eefe41dc5cbfa7baa4db133fda0057a43e2c4d4e5c042d0ec2b8cd174fd4950cf66ec60e41f038036a09b309533ad4cf647cc9f1c6641ac040d38c6afc
SHA512
a914559df5981cc88d54fed48c013632771b094b49198fc742718c549c0188846a399d1fb28710bdcf1b224df6e5588aeb2d29feebd523943759e3f3fff4b20e
DIST icedtea-bin-core-3.13.0-x86.tar.xz 61579520 BLAKE2B
736941e5b41c4f0e13f5d60e4cefe716c7759fd4eb77e8cf7bb831c13525e8d007e5039dfb15c75ac0c9a18bd3d037564eca2bed4a6229c598f8ea8d92aa58e7
SHA512
d0f70ea72a55e5abfd459f4ce7eb4e4cee6779860c6bf95cea0bf682896cba2c2e836c613d80c5f90cf5bb14ae9abc9f0692aa4cea3bb0f6c245f8f21c842fe7
+DIST icedtea-bin-core-3.14.0-amd64.tar.xz 62155444 BLAKE2B
cfa6a11778d159026151fffcfa7189fe45d23d22d810375f36f237afcdcd646be73788cb5cfa0a2e4822026ae58456b69f6f4baa03c7d143429f2ffe55d73e19
SHA512
2d29f7f61ef67d93b57318c34fbccf99077f40c6322bc774326e33ba11c8dc2a07d34c8e9d8b500feaeabe4aa45644d03140b57a3996261d13da9f9bf85ebf5c
DIST icedtea-bin-core-3.14.0-arm.tar.xz 58158680 BLAKE2B
3899136ccb43550129a33996ec50f7b60b9b3d118f758e3d5c51a837f6222033a32677fca58f8c95de12abb4b1b8940190a442d9b1901808307634662af7aeb8
SHA512
8a56048439f50bd01ce4723f8f9b97f764f655370927dad0a92db9d678e8eb797ce3a6d813a247f60d4c38ae1a3de3ab9a3b78341d19977ef05d939e85194e67
DIST icedtea-bin-core-3.14.0-arm64.tar.xz 61710384 BLAKE2B
f02c68f71a057232f9a8ea7476b476a376c0bd508b53f1043dfc6a6f86b5701e50d0d6be7d627436c3cff931ebe3c56f0d634196d8e1b96058142421214d525d
SHA512
853b7ef0d21d0d9645ef3bc4b5cb24ed43ca71687d2630a10d3087a4ea82855f98cc7c8190b0de62a746cfa214489c8ac3afdc17dfc13dbb61dd4c8a908da31b
DIST icedtea-bin-core-3.14.0-ppc64.tar.xz 55154368 BLAKE2B
0a509f1ae6ef885c18cf15a7c4dbe984650e242ea820aa65602cfc1a001f0123151fb5c33f25546391c9a62cc735c5a6a6cb98ef97c61900d65154c5b44ab3d2
SHA512
f6b19b8e7dd80df8a162665d7c3dcc8f7d739fefcd1e6a1e8d588cbbf7de08240ef49c6542524bcd173f7150a1ff5d752a9c7532dc6a9b37954ea29928bf123c
DIST icedtea-bin-core-3.14.0-ppc64le.tar.xz 55152852 BLAKE2B
198dffad2beefa5fed0fb0a9151ba68bf4f24e8dd1ff2a430983ecb72131d82119423eba6192365620731e030a58b60bb3492b34e2a87d19a58178c43e69853d
SHA512
8ccfd5ba3ae3d0a7125b99c52db7ee37229f9071209e2011023398c3dd4746e7edda92f361427667739b298ee2d0de7777bab4346cffbe6572f2729e59971ef7
+DIST icedtea-bin-core-3.14.0-x86.tar.xz 61674516 BLAKE2B
9297b3192985e1925f732c38229854781ebc61a49b487d147380c0fcd088601908f59488f8795f2c9069d103613785082f0fe4e227659fe3916d807a6622c3bf
SHA512
ca61c53a1a424a059b4a0b2b8fea8fa2a8ab9cf1e3dc8f5600b89b29f280f71841a7b853bfd1e88d756211816e733aef8fb232fcfdebca85978cf50c9026f0fb
DIST icedtea-bin-doc-3.13.0.tar.xz 11641004 BLAKE2B
de8fbfe42a214276e1cbb60d4567c0d06b03078ff3db50611cce5a7381c67d0219e74ff53a63b900f6353b72ef8ec943d80c4271769a058cc191ae06f9615840
SHA512
2b786ed12424494dd4e8018b5a41a558517f2614cd6dc6f59fbf4b9be5afd94e76e0c3d0e5a170d61c2212570b9d68ca9b88728e5eacd4baf2448052d782c0dd
DIST icedtea-bin-doc-3.14.0.tar.xz 11406340 BLAKE2B
249832aaa0093f70c8bfff78bfcbe6fe32c3e6210789e1f7993d24098d467fc0b5dba505b58135da82a3e55a357891a90a03eb8032b4c4db9af15d3c16915db9
SHA512
3665b702f25e548061970a1078c4f6fb6b412bbcf59391ad04850d64cc3a664357990ad55ef1ba0a7e1fd214b23e408ca59314ad79ca0736e0f1dd94d6f92ab8
DIST icedtea-bin-examples-3.13.0-amd64.tar.xz 1854064 BLAKE2B
ca2b4fc55561843a081edd3de935f9f78f0ce072b22fa758caa6ff323182e1b295ed777d8550645c6f954f17dfbe8b932d008698b9767f2ac1cdee8b96c1a90f
SHA512
906f9a83174898b47616428d797b2ea0c96c3f21a6b0c630895950292fe69ed6431aa3dd066e68e70bfd9f267e22620f1775505e0175b8ed43006c05715dbf76
@@ -16,9 +18,11 @@ DIST icedtea-bin-examples-3.13.0-arm64.tar.xz 1852148
BLAKE2B 1126bc4a17b3224640
DIST icedtea-bin-examples-3.13.0-ppc64.tar.xz 1865612 BLAKE2B
f24e19d55da3cc588c61b4671b3494e42e7864efe624199be5cf7a1687724bdb86adc1e29de6f1f240bb1d21dc31b4a78757632a28960f3d235aa69aaf286ea7
SHA512
e86385db7f0d81ca9b73e0ea86e55714632aff87cb6fe959ec15fb323c3981a4817e12a69ac7dd2a1d0aa3fe10630ad104ccf70aa84f3318274d43c8b09c16c6
DIST icedtea-bin-examples-3.13.0-ppc64le.tar.xz 1866904 BLAKE2B
35d86c859010608c276fb7358bea8a7b66aeb423d7a8479a2ca919907c91e2709ce915a16d8d4c9cc6796c05fa12216b96ad59f67bf761d58b8f140878b89d49
SHA512
1e10bd09028cba7d19f1a9d96f8b835cd7fdd8059cfab443d769575f2a0aa77f39df75943a2a446fad9d52481c7bef45846b757d375848c6d0cde329609e8bed
DIST icedtea-bin-examples-3.13.0-x86.tar.xz 1860412 BLAKE2B
8c4f729b19e2badf4dbbab3c434f9af50bbdf792950c1c6582a4931afb6d0058c40641d15873bb3539f630df1ee3f4d1474627ed22334c4a5543b32e6c7117e1
SHA512
6f665210039af9ef2d68d4e5bb61e7dd553d2894d6f46dd56d07b36c43c47d43c0574f0fe07f42d26946dc89897b062bb41a77e0c3a4937167daddcde0f5c164
+DIST icedtea-bin-examples-3.14.0-amd64.tar.xz 1855132 BLAKE2B
751c5ce41983960a0e08c7e544cf04379a591ef7077ce72aca33bfe5237a887e47ce00f2070d6bc2bfc0660ab0ac15dd1c408dd46f9bd66b2d70ad6d06235027
SHA512
96fd2459d61d5fafe798688f1b4e0c352975728255c779a91f640bbbda01149e3522025db0c1e01b9f14200be63f242eff73689c3c81ae8fb14930e460ab9c93
DIST icedtea-bin-examples-3.14.0-arm.tar.xz 1840984 BLAKE2B
52c58563f24033203f95a4a4ece6a44e056aef145fae4221090c417c5cf091fdb79cf38d847c80f67c79711514173f99a2d62eeb39a4a7811b3fd1c8b46d235f
SHA512
1b8c1738a485fa91e3a48835fa6ca8570bf4b428bd96837dd3c1f713c73de596ab874610a7d570fc54d31795168483912462ba2a8566b798265e351f8352fe5f
DIST icedtea-bin-examples-3.14.0-arm64.tar.xz 1849808 BLAKE2B
2faa1faa65662ceb0ccf13142781ff01d2fa8601cbff0cdf30a8f53247012d3d68355780f77701804eb82e4b26082977996e10ab38181f372318165d3e08c624
SHA512
7b09e125ae6d65096ca3ee0165347336a36dc1cd016bf6fbfb3fadb0530681b5291a93429bf820533740306e75d09632bf3a1071609951e87d447d126ead2737
DIST icedtea-bin-examples-3.14.0-ppc64.tar.xz 1864844 BLAKE2B
393f501701f6255692026fee6f6f03758828ae9771de2527ac00fb5378f4d7e8e8c15bd2f3a25d5f27dac0e57dbd19f9b93ca1b8bb453ee7460bfbb3ffa3eb74
SHA512
02c93ca019ffd281b54747c0dae47b5283d4f96b7a174dc2d433b803ae57afb04486ea6c8cf59bce34fefa64b0bb3b565c7e083fe606d161a5033bec06a25c5f
DIST icedtea-bin-examples-3.14.0-ppc64le.tar.xz 1862512 BLAKE2B
2ebc865f23fd94c9065bf94d718ea2eea45f3c513d066f6513f190d83565378975491a66caff521e85e3f1307178979b0435487f46373615c1980c258e600c0c
SHA512
9fff9c5b490010b06b695a864ec8ddc8ce44acfddde104fcb83742d9ecff70906669e02da36cef8e903ef1ef923cf9e92342daafde47e6fa35885865dd079eb7
+DIST icedtea-bin-examples-3.14.0-x86.tar.xz 1860288 BLAKE2B
a2c8eb4cee690615f624fa97e0360cd25776beabbdd52089747fa48ab0f8b440a776e601455c87803f36889d1caeee6ffc44a43c9d366e2913bd07f877997a48
SHA512
862f6a23e9eef4b271491b19b9c4a98baa76fead458d6230424693151695b0a6e082a38ef4ad2cb05fbd80db4967840de718898cab25269a10bff3ea5f5acf01
DIST icedtea-bin-src-3.13.0.tar.xz 45821508 BLAKE2B
9054dfbbf243170d42d27579d56caabbc714951f28bd3e93e4eb4f1060649f87f81ce19b6aa0925f70e436aa415e1a4be88e5eead03f146ec360d9737554590b
SHA512
db50381d81f7b02a0b4f42eba505874aff0ce8bb30fc72377a8ad99b2b97dfab53382603fe96014780c9862a25436918a27389e538d21a634af6a26845fc30fd
DIST icedtea-bin-src-3.14.0.tar.xz 45781864 BLAKE2B
b4bef50c7c8ea17cb7e5c60ea17c31120181d0616869f2ca99676328cf1ba3eef95e5750301c1dc8d1b0024ccfa56088aa0ab4ca26bebf7253de7d75cab5d346
SHA512
00e0637e825073d33099665e2aff95c1a6555fda7177c0c0057298b5a74263acb35f98db946877ddd82c1d1bfb421a07da2801c8d3013ebb99e1a0229f9781ea
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
b/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
index 3b2d6ede7e7..c516938e391 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
# Don't block arm. See bug #600134.
#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* ~arm ~arm64 ~ppc64"
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
inherit java-vm-2 multilib-build toolchain-funcs
@@ -19,10 +19,13 @@ abi_uri() {
BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles";
SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+ multilib? ( amd64? ( abi_x86_32? (
${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
big-endian? ( $(abi_uri ppc64) )
!big-endian? ( $(abi_uri ppc64le ppc64) )
+ $(abi_uri amd64)
$(abi_uri arm)
- $(abi_uri arm64)"
+ $(abi_uri arm64)
+ $(abi_uri x86)"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org";
