* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-04-10 22:10 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-04-10 22:10 UTC (permalink / raw
To: gentoo-commits
commit: e93177f868da4b4b692d7d85ee9fde67003f5731
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 22:09:41 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 22:09:41 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=e93177f8
dev-java/icedtea: ccache - fix version check, strip PATH, no automagic
Package-Manager: portage-2.2.28
dev-java/icedtea/files/8-ccache.patch | 11 +++++++++++
dev-java/icedtea/icedtea-3.0.0.ebuild | 16 +++++++++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/dev-java/icedtea/files/8-ccache.patch b/dev-java/icedtea/files/8-ccache.patch
new file mode 100644
index 0000000..c846dba
--- /dev/null
+++ b/dev-java/icedtea/files/8-ccache.patch
@@ -0,0 +1,11 @@
+--- openjdk/common/autoconf/generated-configure.sh.orig 2016-04-01 04:32:19.000000000 +0100
++++ openjdk/common/autoconf/generated-configure.sh 2016-04-10 20:04:53.472885447 +0100
+@@ -35764,7 +35764,7 @@
+ # precompiled headers.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
+ $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
+- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
++ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null`
+ if test "x$HAS_GOOD_CCACHE" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
+ $as_echo "no, disabling ccache" >&6; }
diff --git a/dev-java/icedtea/icedtea-3.0.0.ebuild b/dev-java/icedtea/icedtea-3.0.0.ebuild
index f36fe40..a17c4ab 100644
--- a/dev-java/icedtea/icedtea-3.0.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0.ebuild
@@ -270,6 +270,18 @@ src_configure() {
zero_config="--enable-zero"
fi
+ # https://bugs.openjdk.java.net/browse/JDK-8067132
+ export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch"
+ ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die
+
+ # IcedTea itself doesn't handle ccache yet.
+ if has ccache ${FEATURES}; then
+ ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
+ export enable_ccache=yes
+ else
+ export enable_ccache=no
+ fi
+
config+=" --with-parallel-jobs=$(makeopts_jobs)"
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
@@ -304,7 +316,9 @@ src_configure() {
}
src_compile() {
- emake
+ # OpenJDK is quite picky about ccache and dies if you attempt to use
+ # it via wrapper symlinks like Gentoo normally does.
+ PATH=$(sed 's#[^:]*/ccache/bin:##g' <<< "${PATH}") emake
}
src_test() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-04-25 1:16 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2016-04-25 1:16 UTC (permalink / raw
To: gentoo-commits
commit: e9abb6ce586b2c16fbb95df6c48e8a3f031d437e
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Apr 25 01:16:33 2016 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Apr 25 01:16:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=e9abb6ce
dev-java/icedtea: Update to 3.0.1; http://bitly.com/it30001
Package-Manager: portage-2.2.27
dev-java/icedtea/ChangeLog | 6 ++++++
dev-java/icedtea/Manifest | 18 ++++++++--------
dev-java/icedtea/files/8-ccache.patch | 11 ----------
.../{icedtea-3.0.0.ebuild => icedtea-3.0.1.ebuild} | 25 ++++++++++------------
4 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 079d96d..5d9bfb9 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-3.0.1 (25 Apr 2016)
+
+ 25 Apr 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +icedtea-3.0.1.ebuild, -files/8-ccache.patch, -icedtea-3.0.0.ebuild:
+ dev-java/icedtea: Update to 3.0.1; http://bitly.com/it30001
+
*icedtea-7.2.6.6 (22 Apr 2016)
22 Apr 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 4141205..bbf3dd7 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,15 +13,15 @@ DIST icedtea-2.7-jaxws-76aade5c18f8.tar.bz2 2021815 SHA256 bc65e3078623f2d85df47
DIST icedtea-2.7-jdk-3fc5cbcd46dd.tar.bz2 32414746 SHA256 44adca39f854ce57defd7692796c193f9bf638a1110e283cc369552ec66bbba2 SHA512 73f21e74f10aa74a0cfb6102ae8d59e3799e11090ce92358f198cc5db923444833f1c1e28a8dc70aba091ab3ee93df24244ad90677144dda15c23f5b79e93f64 WHIRLPOOL 6dcddd80bd74e60a0a0546a5668994f2b0241465289777fd0863722a9f8bb06daeddb3fd6bef3b073eb3ae85c101848ca0eb646d22ff9c010f144c8f54f6a5da
DIST icedtea-2.7-langtools-caa50dd46a14.tar.bz2 1709753 SHA256 1a7195adfc1f05ecdf17559dd8afccbbd9b8c61e96f290a1e2ca9659856b4fa7 SHA512 ec0d89ade1edd7e2500f4257de8a6dd8afe8e89e8d14a730963378008060dd6a087e40cc4faaf769e7b9ca6f070356d70a0523359a81ed39ac9d032c9f3c4ec2 WHIRLPOOL da0e7fdb5ca5a65b19eefcb7e8c4d90337d73d2cbb85fe01c327969f85a1acd552dd97abb4d7bb9fcf87c0fafa1b0e1d6fc07e7f19507c428037e0e1dc02ed29
DIST icedtea-2.7-openjdk-7f245987a287.tar.bz2 129791 SHA256 72ab3fe89fab55d430af49ffaae216317e8a88b963350a7a695870f7fd744c33 SHA512 2ab9673ff532a77d339039c83f5253790c5fdf6e17eacb2e7af4b70e51ba1d0a74cfc81cdb3f8ea62ead73015ca53ff1dafe5e309d575de3e4d1d7c18c0960ab WHIRLPOOL 27093166c56cc5e89a3493e0e505b3e97b374d454e51d8fc47e65e539c55881854a7efc829749529b3bebc7e183b19c319fe4b0934cb483e8a3fc2af20c42232
-DIST icedtea-3.0-corba-37af47894175.tar.xz 936876 SHA256 d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc SHA512 21b2f069f1eaca62a46518173de3c1368963db489f436d5ad705c7cb36ecc259d342c059c4c593427e96604164f78be761e1fe4118d8517ece3630280524ad30 WHIRLPOOL ac7292f0a32cfa7b58d3616b704bfd90ead49044bb51fccc1ca87900555d15f28b3d3137512fe007b40f0a130d3e6eb9d805112725914b0f0721ac8dbad8794c
-DIST icedtea-3.0-hotspot-5e587a29a6aa.tar.xz 6766584 SHA256 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7 SHA512 c8a2355ef81ad1dd4a2f6be0e5cdaba9d6d66a4fd5514718cc09ed391bcce269a17a34fbc89d7c6d3e7a2632f2ffcb0028a8faaf41649055a096407a24cacd0e WHIRLPOOL 4e83ea5ee631ca76e7919a944f9f1a3a007ca951a99552ee087bd6d2d6e027c5ce9963ec3c593c8132a984dd9818fc42abfb0792b3628d44491488700b20ec09
-DIST icedtea-3.0-jaxp-4ed5441e40e1.tar.xz 2296120 SHA256 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8 SHA512 47e968f674176f74706ab268098a1635a54de7282993abc46a1c72c8d24f21216ed898bbca830623f5afd11912a744138547d6d22a82f68fa1ba15ccc7a9e375 WHIRLPOOL e94f961336d1e8b176ab2486ae98852049f930af3ee31dd3f7491544244c78d6b5657334fb45b9cc863bb6c377a6b1ab5d71df1257d02bc9e79513cd41ecc2ce
-DIST icedtea-3.0-jaxws-a81c04154cc5.tar.xz 2266356 SHA256 ef550609aaa526084256a7fdf6c326015641d6d8c80540c830c0c62302a2f076 SHA512 53ef8dfb1fa0602bfbbb75ca1f8a80af6c09029f22e69625680ce55aa04b820bdfc042d57e5edafbf25ea4f43c32fb988bad9e19b78676cb937af9062ec28ca2 WHIRLPOOL d76bae6c0b1540fe28dbbb5d516fea2c09facb29fd605df38429273e8358de6d0ca1f685098aa3c334a4ca9eeff66ff9759ba704697786a230315d236e01cca1
-DIST icedtea-3.0-jdk-3334efeacd83.tar.xz 38245460 SHA256 fa74b8aaa389495a685f3a28151a1957ff8ff88a4d4792059c5c1fb7c12eb1cd SHA512 92106e36d9dd522c355eec877709862b7e1ae18790a0965fa7fc74c1cd2b4aea145b630e37fa953e9cfd0feaadcba0117675bbb8e2c5705379078e16ac53a37e WHIRLPOOL 86cd77313b1fc50d6ff96de3e41d2d9c53627971ba475120d1724a1a690876e3383be6633baf074e14d95f0c0c16727f4bda5465ee66423dba1c8cc6533ab800
-DIST icedtea-3.0-langtools-dd581e8047e6.tar.xz 2055716 SHA256 e0e0e6a7cf8575506579306f76cca872b01a3f08a4880fb9b316444fb206ea86 SHA512 da64e53d360f591af599105cb244898f5092c3613f12f013244f9180b27629efcc0d5abbf2cf3043fd8c80edccfb9ad34dff854f36e539d24d206f6908c4f908 WHIRLPOOL f96b5afc4744f0cab3efdbb460da1c82bd2d8a370b59891ca3d0d351ecaf772c8c8414f92267be52f816d7d227d3dc175db2058fb6c9b7a7113b634fa47038e0
-DIST icedtea-3.0-nashorn-697c5f792bec.tar.xz 2220600 SHA256 b4c59d8269511f2073498518e599ec91dff11c57cadc0b97fa88af81835122c0 SHA512 e719c91ede0db0a5a0c97ff8ee165fadfecab053a48116d48974e24af06559540d2924b0d582fa4d4d5e4971ebc5929aa70b775f0fc6991c8311ca78d7860cd2 WHIRLPOOL e29ab3b81d095034e90c2996802f2c4ce1b338be817cf81ffddb084eedf52638e2b011b379534a9856303d3c3b722ef699d61d25a18f8e7910442c3139e01265
-DIST icedtea-3.0-openjdk-8ed8d26a3f9a.tar.xz 330164 SHA256 5b032673d74c4e2529427b9570b177285dc9a6430d016ef2e072dd2167669031 SHA512 9b0c6952e66708810cbdcd4f0a093f8d6f954c5cf1d098b6d70eced8908689fc0716fbb76ea6344c4a01127177fb078b31706551289aa7bd80fb649efe4d9018 WHIRLPOOL 361e0f9d3653a5718b3a2a1609c5b73adcee89c22f81e1c108c39499b5e755be639241a1de2946622731255ccbb8d00b097f77176fd31e7b9cfebfdcf94e1feb
-DIST icedtea-3.0.0.tar.xz 1402156 SHA256 947add69b3b89d7685cb0c9e2b51fc561e27f6e7c0bf1ea98dac8156fa8629a9 SHA512 80bece0c0dbe4c0eaf8716abd0018ae71fc62dd9a3698eeca37383af51884cac5b1185f226003e396b4b5691beca478b5419755795f906962e9f66674294ae9b WHIRLPOOL 4811b4041f96e2debc1f8760eb1c9c318f3c40b36ee45042788c99b74c9886c46a9859fe23eb369f531c596252a89e80b32b71b364e13bd1478c04e66911e824
+DIST icedtea-3.0-corba-a6736e860d67.tar.xz 937360 SHA256 42351003e03f8893435e424e652558ac7e6e7af86a0cf01338c84184b8ab6e50 SHA512 63aeb0f41b8d889a8e1f4a5a8033903145f4ef5bbdc5606085ee23f59f1696323a201e5ebd5ba9bb926b895bd773bdbce6bd1e2f421a4e13d499974cdc601c2c WHIRLPOOL f39270d8032772a86675ffb7a0c148743a765d4f133856a6dda203597143924f7695ce69637ade527cd2e615bfc0070045d881ad4b77d8db064b24b20cebe4fc
+DIST icedtea-3.0-hotspot-7bb48ba4de4f.tar.xz 6767200 SHA256 c15794ae90ee52222b73a5c8eb0a397062226fe8215aeed72fdf28f9c26780de SHA512 700c95265ff36912472126762a41642f4e49153411730748d112ee630497d4b5e487666755ccce1e3965ed55abde775ae44813bda24069a34a28be81b62b64d2 WHIRLPOOL d8f940158f08b0e171e7cb527ada65e17cad9c3ba09ac8c71bd6e126e27c2255dca6b8a2398eebd8b6b7db7df283fa57b74818607e2a8a68bffb0196e8d2c01f
+DIST icedtea-3.0-jaxp-c7145fc644df.tar.xz 2296808 SHA256 c0a9d523d451b895066dd747ee595eebba29f5626e9a69d9467cccd9b2df37c4 SHA512 39082376e3f24f589eab24c586c5af724e78f24a76b6d9c376b4b7197a36a9aabf85d7ad0717dc4ccc336ae8b1deb55e6d47f7ce5808150133814b9241f2a0e8 WHIRLPOOL 3a4f727482efc70938acb99d12bee9a81de5f89926607e9aaf46af681fc3e7364bb3fd2423d82f10ee62479a10cfc8ac2c944dc92ec61f5932855afda3cb6cf7
+DIST icedtea-3.0-jaxws-412389386184.tar.xz 2266852 SHA256 e378c1f46b067c9527d174c3683f4022eca3fe17bcf0e79177fa1713197d3338 SHA512 c8ef598c1625d3868302d1baefb9e40b7cd9540593278ff11c2cec73a7007d589daf873cb6ae06104d002f84a527f702ad673619b8970f8b1a542cf75014ec80 WHIRLPOOL 50c22b3433481cab34cbe028048314d17296fcf59239aeec8fa8e97d51b1cbb359d051e5ee8728027f81ed7f9a50ff73399c919c080e3baaf2db985e36bd8b21
+DIST icedtea-3.0-jdk-dab76de2f91c.tar.xz 38264484 SHA256 550556487de7fd769a9398082f26b358a2e5c07c2c1eb09724f0862667589cdd SHA512 54820354f847b2d28afb2523cd9cf4c24407add86135ccd30713c1c0319aa30a97b8a6fc6ac83e0fd100e1c00f4e96007f115faf4a3f5346865c535d80c19a93 WHIRLPOOL 794630afeecce34c1ac57b1f382b5fec4f60db25904fe3edba02f2105cac66f0e867162a92f6fed5a20b51ee03f7b39d91b0b9885c6f079b95953a985da62915
+DIST icedtea-3.0-langtools-ad6886e3a101.tar.xz 2056412 SHA256 2602601152576021736028604e56cf32f8e3f5997fe220e90297132274a251ca SHA512 9f5f1b69171b67320dd48cf7e88ae337983c1b90c516b034fd823ee349c0f1aa2554ccd22f59ce6d24aae530686c09bfcff1c48925f92f16b29e8327662ca574 WHIRLPOOL 21463b6d1cfebbe4a0dc127b934edecb347827f7351cd4ce4a717b7560ea3a6c8aaee74a76454f50879607f09e2d33a16f29520076d3c1446d16978461faf075
+DIST icedtea-3.0-nashorn-c89dc17f7c75.tar.xz 2220176 SHA256 e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc SHA512 3cf12d2696b630eec2a4c6fefe08db9e14db62bbd81a3a4546ef886f6b7fa059a2f41dd3a4377ab2da1f65d371b70766caac4054b447454863de82ce961c3d31 WHIRLPOOL ad2ede063f0e6cb1a67f90d42ddcf2ab33175008361620abf04ccc1a55b9e3c2a8a9827100137842c8f6de2a3af367b6143c0916a5ffa4920dbcd33fb66547c0
+DIST icedtea-3.0-openjdk-6a70821528ba.tar.xz 330720 SHA256 8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184 SHA512 5054d4a541b8f3e6fd09cd44355b39d3a0e1ea27247bcaf8bb800e1e3cf23a4133076383b74c19be1928a5fc0c3986ab3303614a834b9741209dcf20eb19d703 WHIRLPOOL 7ea8c98d4dca75325841929aa8049ecf713e637124e4ce6f9a98d7845d25153d851c42f632132ab61ff6823e0aeab07ad0dc43e6f699d4f3747b536e90eb0b76
+DIST icedtea-3.0.1.tar.xz 1403400 SHA256 346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2 SHA512 01506994e3c4b4a1dc927251de0db5e5a22754031604cf7c8660597525616d3205527ed768d67aa4b4c62b40a0e3fbd3327c97b95c81b634175dec69c5802c8f WHIRLPOOL 0641f49b6fcccb3981e2756a2403638897887634ff09b6ede9ae61af80259b5bc1168c6c5f236a07157befec4a1fe848d0814afe5515bb5a98c591370c62dacb
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
diff --git a/dev-java/icedtea/files/8-ccache.patch b/dev-java/icedtea/files/8-ccache.patch
deleted file mode 100644
index c846dba..0000000
--- a/dev-java/icedtea/files/8-ccache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/common/autoconf/generated-configure.sh.orig 2016-04-01 04:32:19.000000000 +0100
-+++ openjdk/common/autoconf/generated-configure.sh 2016-04-10 20:04:53.472885447 +0100
-@@ -35764,7 +35764,7 @@
- # precompiled headers.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
- $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
-- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
-+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null`
- if test "x$HAS_GOOD_CCACHE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
- $as_echo "no, disabling ccache" >&6; }
diff --git a/dev-java/icedtea/icedtea-3.0.0.ebuild b/dev-java/icedtea/icedtea-3.0.1.ebuild
similarity index 95%
rename from dev-java/icedtea/icedtea-3.0.0.ebuild
rename to dev-java/icedtea/icedtea-3.0.1.ebuild
index 2c9ebbb..9653bab 100644
--- a/dev-java/icedtea/icedtea-3.0.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.1.ebuild
@@ -16,14 +16,15 @@ ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=$(get_version_component_range 1-2)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="37af47894175.tar.xz"
-JAXP_TARBALL="4ed5441e40e1.tar.xz"
-JAXWS_TARBALL="a81c04154cc5.tar.xz"
-JDK_TARBALL="3334efeacd83.tar.xz"
-LANGTOOLS_TARBALL="dd581e8047e6.tar.xz"
-OPENJDK_TARBALL="8ed8d26a3f9a.tar.xz"
-NASHORN_TARBALL="697c5f792bec.tar.xz"
-HOTSPOT_TARBALL="5e587a29a6aa.tar.xz"
+
+CORBA_TARBALL="a6736e860d67.tar.xz"
+JAXP_TARBALL="c7145fc644df.tar.xz"
+JAXWS_TARBALL="412389386184.tar.xz"
+JDK_TARBALL="dab76de2f91c.tar.xz"
+LANGTOOLS_TARBALL="ad6886e3a101.tar.xz"
+OPENJDK_TARBALL="6a70821528ba.tar.xz"
+NASHORN_TARBALL="c89dc17f7c75.tar.xz"
+HOTSPOT_TARBALL="7bb48ba4de4f.tar.xz"
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -64,9 +65,9 @@ KEYWORDS="~amd64"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
jamvm +jbootstrap libressl nsplugin pax_kernel
- pulseaudio sctp selinux smartcard +source sunec test +webstart zero"
+ pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
-REQUIRED_USE="gtk? ( !headless-awt ) test? ( sunec )"
+REQUIRED_USE="gtk? ( !headless-awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -270,10 +271,6 @@ src_configure() {
zero_config="--enable-zero"
fi
- # https://bugs.openjdk.java.net/browse/JDK-8067132
- export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch"
- ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die
-
# IcedTea itself doesn't handle ccache yet.
if has ccache ${FEATURES}; then
ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-02-22 14:53 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2016-02-22 14:53 UTC (permalink / raw
To: gentoo-commits
commit: eef0fd282eb8efb775a8ff87ec55a778346106bb
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Feb 22 14:52:55 2016 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Feb 22 14:52:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=eef0fd28
dev-java/icedtea: Bump to 3.0.0pre09.
Package-Manager: portage-2.2.27
dev-java/icedtea/ChangeLog | 7 ++++
dev-java/icedtea/Manifest | 16 ++++-----
dev-java/icedtea/files/pr1983.patch | 41 ----------------------
dev-java/icedtea/files/pr2804.patch | 41 ----------------------
dev-java/icedtea/files/pr2825.patch | 12 -------
...0.0_pre08.ebuild => icedtea-3.0.0_pre09.ebuild} | 23 +++++-------
dev-java/icedtea/metadata.xml | 14 +++++---
7 files changed, 33 insertions(+), 121 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 4eb9cca..cdef374 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-3.0.0_pre09 (22 Feb 2016)
+
+ 22 Feb 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +icedtea-3.0.0_pre09.ebuild, -files/pr1983.patch, -files/pr2804.patch,
+ -files/pr2825.patch, -icedtea-3.0.0_pre08.ebuild, metadata.xml:
+ dev-java/icedtea: Bump to 3.0.0pre09.
+
*icedtea-3.0.0_pre08 (30 Jan 2016)
30 Jan 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index b9f3c63..72fee78 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,14 +13,14 @@ DIST icedtea-2.7-jaxws-299588405837.tar.bz2 2022135 SHA256 816a6d7a4bd302871d73f
DIST icedtea-2.7-jdk-2db5e90a399b.tar.bz2 32380031 SHA256 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c SHA512 f31bd7c08577b0f222e9c65538837c41a7d5f90d15738dc536fa105041d920cff05b5a7b39aa59ab04452a6c34f59e6e8ebcecc66194d6a466ced07ec24a8c76 WHIRLPOOL f78ef4ac0f43052066d0ed762b20017bbfd8567c177caac782a48fb88ef30b0447d29be3fe79663a9babe3470ca3c63e948e0b0c53b057313a42bc8f306476f8
DIST icedtea-2.7-langtools-bc95d2472055.tar.bz2 1709785 SHA256 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661 SHA512 2a3a3c84be06c38ed6f0d861cf45099f24adb9fa2d958be8749b2a1821a91b17a81fc1a4ec21af575c6ee9a02ee9318751c9f12b438894e033c0accff5ece5a3 WHIRLPOOL a5b0a5509a5f499f41c8d06eb6d45c88737d78be48bebaa84f87511b6090bd9b414cf1b2698a4df1516d073df82037eb53e9eb04066f84bafbe7a57b6fcb3f42
DIST icedtea-2.7-openjdk-dbfa75121aca.tar.bz2 129557 SHA256 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b SHA512 0847cb7982373ce9277a089e4f165de6ab4f335d5a7ca6dcfee79c356f402bbbb3c392ef5266b2257a40f8b79775ce2f2d8f99415d81b70a101e1e439c048747 WHIRLPOOL 0851e56d4b71290a557133c8f1cda53c5b3e6ee99d79be11385eb38db346207471afadf201d99291e2aaa9ad1dcb5e8ad7f4a7750820522960908268d7726049
-DIST icedtea-3.0-corba-ebc2780ebeb3.tar.xz 934340 SHA256 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66 SHA512 7eee8526ec3bdb870ccaf0af47aafe2d5a13ef96979e7a9c1570994faf4fb5f68b357609862308f7b47920a7b7d37db21f76883828eeb8631f28f343c90e5e84 WHIRLPOOL e4526febfffed1a3386440d1010f24805cafe16a13087860d1b2fb36e5507018a259f96cd3b3cddffdae482ba2edc16ff6d71d19ccfeffaeae3768286a249fd8
-DIST icedtea-3.0-hotspot-c313c4782bb3.tar.xz 6745716 SHA256 c876cd97bca74e2970161688eb3e388675ebce3ebc4a34bedfb6bec3bb8e9cab SHA512 884ac002d33ff683051119902186aa4b768488cb4058ec1e5a70a3bd9fc766690caff5007d653e742187138ba862f8ab3a2df61e8e4a359207b7f8255bfff818 WHIRLPOOL 5ecad3eab8e6769e0e463648f11c0a3a861cee47791278ff47547effddd0105763e928bedb9f7d31cb5f782a35f8500cf9d2eafa9a9209bb78001d4b441ca17d
-DIST icedtea-3.0-jaxp-ac52a8eed353.tar.xz 2295656 SHA256 e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b SHA512 dad8d7a90143589cb04a2d734e16b90578dcded64463f43676d772411885ffa89b8b0fe7b96ccff98d07e4d412e96fa417ab243a972215a285bf4707ac0139e3 WHIRLPOOL 3580ca7d0d2ea65f3e8e9b47bc9a1821b80ddbd5e39b0a77746c2e1cda094336d9d84c310ea20d9933f84e3fd596dc744c142bca9b51f9e04ba42e1551ca96da
-DIST icedtea-3.0-jaxws-26a1fdce80b7.tar.xz 2264108 SHA256 be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2 SHA512 380eb8bfded1628a98f8d3dc70e5823a460eba7a45c5bd8ea96f8a057b8da6793d40e93af1ffe868c6d7403eb84f5558af09b2df3e4c219ecf18ba9c206d8bb5 WHIRLPOOL 980c2b157733937282cd00b75aba60d2ec255604c591f4319f0f0bf0987574d5cb8187fc14c16a4beb2c3e6ec200810c7a202d2956ef626e493ed3360e8f83fa
-DIST icedtea-3.0-jdk-809d98eeda49.tar.xz 38237376 SHA256 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25 SHA512 3b12ce3488e13c8b79a516f5f4bfd4b799959e984560885648e12155f6295fb7ac5dff04269876edab112710a34784d7e1f4898cd703caa12aecf132ef20017b WHIRLPOOL 909744010c015ae4fd1e6ff6d16136c3ef522f26642109fe47b0b094b4e4d7cdf946bb0e950a31a1685d1eac923f1b6049805c6d40f6d8f3aebef657d57f2343
-DIST icedtea-3.0-langtools-0d3479e0bac6.tar.xz 2050684 SHA256 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86 SHA512 f04b24e4c091e1665fe0e9b0de1cfa7824bf300d5a6c2b085ea4aa30dd808fdc945f83cef69e074a6885979fca170d809147b5a48f2573d3f0d38628c87554bd WHIRLPOOL 3af7c2bc02b7140feb3552b55f2e4b21edf1885b7b6a9f9b29d53f2547f6bed8356c1b65ca267f3f6bd2b4a79cdcfaed8eab84e6b654b71e32d74b17a46ef2e8
-DIST icedtea-3.0-nashorn-7babac6e7ecf.tar.xz 2200204 SHA256 b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150 SHA512 8321076c910819b8ad183ede286d0f4dc438944fce4a5f737c8b379331b24e08bd7f24730dabaa7b2a6d3a32862f0c31cdf99044e6980fa89ab638728f7b07d3 WHIRLPOOL bede2f9150842f6baaa0af45ff2103b60d97c60b36656b2e4560c47aceb0728193d2e626d772ee69bb4a9945450b41ebdc93054418e045a98b74c6cc7681ac16
-DIST icedtea-3.0-openjdk-f0635543beb3.tar.xz 328764 SHA256 fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8 SHA512 aa0d6c976b6e13b9513fb1f6e53cbc7f980c7bad4dfaccb213abf520a15bbbf0cdf37c17924c56e3d630cf2033886e4e0d401e5b211a5e45eeb734d62bdabbbf WHIRLPOOL c91e68bbfcc4424be095b852b10aa889383be1936611539a00a7d59e45ad5d6b5b51ed642f810d5bf457a50772a155c5fb96085b62f9b27103a0044eca7786f6
+DIST icedtea-3.0-corba-834cf5ee24b3.tar.xz 936596 SHA256 883a4ce631d9587efdca8b45e1fb5fddc9cf993fa6cb7a56b80c4095bac951b7 SHA512 75c6e97eda86eff93c66cc06058e0603336f98e1c080abbbbe6fe695af7fa0d95f9df0c607f5e1d4622185d631f8ffb3d9959667cf3744763c06d92f158b7f0d WHIRLPOOL f0696a0a57d28f1d3be99ee2a776d8447262ea130273cef1f6a888a233d33bba104b2dee05b9be33f0553da9059debf150e4226eedc8e73fef76df2022f041a7
+DIST icedtea-3.0-hotspot-dbf85d44da89.tar.xz 6748520 SHA256 f84673a0cd41131b86280173c268521152086570ad2c7702034552d5848f4bea SHA512 db6cfcbe141d656233571a7c64b2d70c9b707a0721b051cee7c2f2066b6661458c67668379bde2f811b5c255afddef8aa320e850a6a45c93f0ed429c9612ab84 WHIRLPOOL 565e935f44ecd9304f0b5cf981cac26a2a53e71e79147a7d99b8fece389a4c46828044cc2294fd852b672f8f5156d8fea4bf8aaa50a4a91adce996ced743d136
+DIST icedtea-3.0-jaxp-6527813420de.tar.xz 2295820 SHA256 59df142c58ccd0fd081e7533c19fabd708c9617818c09d62dcca55cc9ef1514c SHA512 a8c0803c57ae4b831795954aec0121b856d4186c57b2641ae8ff9a3dc3f0eab7ef922fb661e0fa519f13accacabab508c99b5de932c4cc62271f62b64b21767c WHIRLPOOL a9a3eb62a04fd75eabbc8e31f441d679fd7e15de75c7323b9a5c0ba9459dd485199b339ecdf008825f4913610a97dc86b6360edfa2953c8aefff967ae3489344
+DIST icedtea-3.0-jaxws-2ceaeebc6760.tar.xz 2265888 SHA256 f3ad0fe6d232faab9d6b5ec3d048734af1add9d9e625c254e0ecc86e2287b977 SHA512 0496264c680c0a9cb9ac050df00f550c9e300d6dee86da582037561598ef331e1eb25cb28822db028a08afe2844521a53b5174df524c2867f3f1d49c034488d3 WHIRLPOOL c0e254298a5d05d8e04777fb1b9bc9af859ecde49412887e5ae6656b83fa02f7f9ad31383d1947edb2b964a9d5693c5b15233a1365d205b1dd3a123f8a06b393
+DIST icedtea-3.0-jdk-dfad9b612327.tar.xz 38255436 SHA256 4b61c2ed76141091a83376793d344f3e7c84b9742eb39773c3df394eb50b9869 SHA512 3c048dece3c14101528ee44f133b085d074365cfc27c94340568ab655730390f42309564e7a3c0d67e8e4f8bed7199af6ffde61130a1288829b025422944fbc9 WHIRLPOOL e41b4e04ea1ed0042ce5994e0d7a3167008a4dce6aa0642fa1e78d328b58a14c93f992ff79cad25cf077d88a0d047fba6088bcd4c970815a63e39ba4d40113be
+DIST icedtea-3.0-langtools-076ec0ef64f0.tar.xz 2055592 SHA256 c1e5fe95f85536b924af3c6178678f2c540225b21f6d8493a37ef4793fea1e6f SHA512 ccd7d9ce1959f48b91b9c8ebfd6afa55759bfe2f392e89c59aadde1378675c7d1b4662e2a7d350f9eb0c2f980ee9ae4f82dc09a7465f558ff9d02e03701b6db7 WHIRLPOOL db475d7c86e8c32e9435fa4c3787c51b66c6a90d173098b75954c19a565a53562951f24c944136111a8d1f624b0e066e1c0b2822a35a67f3efa1b4030a263374
+DIST icedtea-3.0-nashorn-bbc1966c6af9.tar.xz 2219032 SHA256 753700234e82a16911934019e5a897709a7b75f0bd9e847da9949f0d2a5a9831 SHA512 d4022aa1bdccb6a5ac20d6fab84eb4d13f6d72f41dc5dc38f26eb333875791781b03b9bcab98d41dc4482c8603a46a16dcd6cf434016aca5283ab03b76b39878 WHIRLPOOL 0b8189b45cd1f12c489df0daa876a753410491b1f10ab2bc440a02b55f194f1c227bf3a6e7539a57573b9e45ee5e410dcd615ac673c30060688cd99acb421ee8
+DIST icedtea-3.0-openjdk-a358b13af298.tar.xz 329880 SHA256 fac06481d2b27f01524141c4e4ed64ecf60842bb634f8b83c33644b796a1a5f4 SHA512 bf6c9a66d957487dda8ac366e974b165102faac85f5b8fede75f8905e9615cc3d621f463a298c2e9f4e12a13019e0e52ba42fb4bce200d060c59be4a3c9e13b4 WHIRLPOOL 9e188e22d41089d0e8ef14199b6b91a783f968736c9fbe13f7393fa7e64d4b6d34f4ad2542e2061d0ea1e8c5497d9ee2e75da3a95714f09187e496da3e84064a
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
diff --git a/dev-java/icedtea/files/pr1983.patch b/dev-java/icedtea/files/pr1983.patch
deleted file mode 100644
index 425bd6f..0000000
--- a/dev-java/icedtea/files/pr1983.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1454117106 0
-# Sat Jan 30 01:25:06 2016 +0000
-# Node ID 130888a5c7134f73540323d45f64e2e7372c4a01
-# Parent e4660f6210fa312c8392ab2be79f85bb86673a85
-PR1983: Support using the system installation of NSS with the SunEC provider
-
-2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org>
-
- PR1983: Support using the system installation
- of NSS with the SunEC provider
- * Makefile.am:
- (check-ecc): Make argument dependent on whether
- the SunEC provider is enabled or not.
-
-diff -r e4660f6210fa -r 130888a5c713 Makefile.am
---- a/Makefile.am Sat Jan 30 01:15:16 2016 +0000
-+++ b/Makefile.am Sat Jan 30 01:25:06 2016 +0000
-@@ -209,6 +209,12 @@
- TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
- endif
-
-+if ENABLE_SUNEC
-+ECC_RESULT = yes
-+else
-+ECC_RESULT = no
-+endif
-+
- # Target to ensure a patched OpenJDK tree containing Zero & Shark
- # and any overlays is available in $(abs_top_builddir)/openjdk
- OPENJDK_TREE = stamps/overlay.stamp
-@@ -2367,7 +2373,7 @@
-
- stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp
- if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
-- $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport no ; \
-+ $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \
- fi
- mkdir -p stamps
- touch $@
diff --git a/dev-java/icedtea/files/pr2804.patch b/dev-java/icedtea/files/pr2804.patch
deleted file mode 100644
index cebda48..0000000
--- a/dev-java/icedtea/files/pr2804.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1454116428 0
-# Sat Jan 30 01:13:48 2016 +0000
-# Node ID 48e97835c60091a6cf69053ba2d6c38b51d368e3
-# Parent b88b516766014824885b6559621ff89e5b714547
-PR2804: test/tapset/jstaptest.pl should be executable
-
-2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org>
-
- PR2804: test/tapset/jstaptest.pl should be executable
- * Makefile.am:
- (check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR
- as mentioned in previous commit.
- * test/tapset/jstaptest.pl: Fix capitalisation of
- "IcedTea".
-
-diff -r b88b51676601 -r 48e97835c600 Makefile.am
---- a/Makefile.am Sat Jan 30 01:10:54 2016 +0000
-+++ b/Makefile.am Sat Jan 30 01:13:48 2016 +0000
-@@ -2327,7 +2327,7 @@
- echo "ERROR: Perl not found"; exit -1; \
- fi
- ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
-- -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
-+ -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
- -S $(abs_top_srcdir)/test/tapset \
- -a test/check-stap.log -j
- endif
-diff -r b88b51676601 -r 48e97835c600 test/tapset/jstaptest.pl
---- a/test/tapset/jstaptest.pl Sat Jan 30 01:10:54 2016 +0000
-+++ b/test/tapset/jstaptest.pl Sat Jan 30 01:13:48 2016 +0000
-@@ -597,7 +597,7 @@
- || ($opt_p && $opt_j)); # -p and -j are mutually exclusive.
- if ($opt_B && $opt_A) {
- die "Directory $opt_B not found." unless (-d $opt_B);
-- die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding Icedtea with systemtap support.\n"
-+ die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding IcedTea with systemtap support.\n"
- unless (-d "$opt_B/j2sdk-image/tapset");
- push(@tapset_dirs, "-I$opt_B/j2sdk-image/tapset");
- set_java_vars("$opt_B/j2sdk-image", $opt_A);
diff --git a/dev-java/icedtea/files/pr2825.patch b/dev-java/icedtea/files/pr2825.patch
deleted file mode 100644
index 510217a..0000000
--- a/dev-java/icedtea/files/pr2825.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 0883b7a8311a acinclude.m4
---- a/acinclude.m4 Fri Jan 29 22:47:27 2016 +0000
-+++ b/acinclude.m4 Fri Jan 29 23:24:48 2016 +0000
-@@ -1969,7 +1969,7 @@
- PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
- if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
- SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
-- SUNEC_LIBS="$NSS_LIBS -lfreebl";
-+ SUNEC_LIBS="-lfreebl $NSS_LIBS";
- elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
- SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
- SUNEC_LIBS=$NSS_JAVA_LIBS;
diff --git a/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
similarity index 95%
rename from dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
rename to dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
index be8af53..f1f5763 100644
--- a/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
@@ -16,14 +16,14 @@ ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=$(get_version_component_range 1-2)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="ebc2780ebeb3.tar.xz"
-JAXP_TARBALL="ac52a8eed353.tar.xz"
-JAXWS_TARBALL="26a1fdce80b7.tar.xz"
-JDK_TARBALL="809d98eeda49.tar.xz"
-LANGTOOLS_TARBALL="0d3479e0bac6.tar.xz"
-OPENJDK_TARBALL="f0635543beb3.tar.xz"
-NASHORN_TARBALL="7babac6e7ecf.tar.xz"
-HOTSPOT_TARBALL="c313c4782bb3.tar.xz"
+CORBA_TARBALL="834cf5ee24b3.tar.xz"
+JAXP_TARBALL="6527813420de.tar.xz"
+JAXWS_TARBALL="2ceaeebc6760.tar.xz"
+JDK_TARBALL="dfad9b612327.tar.xz"
+LANGTOOLS_TARBALL="076ec0ef64f0.tar.xz"
+OPENJDK_TARBALL="a358b13af298.tar.xz"
+NASHORN_TARBALL="bbc1966c6af9.tar.xz"
+HOTSPOT_TARBALL="dbf85d44da89.tar.xz"
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -200,13 +200,6 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
- # Fix issue with ordering of NSS libraries and bfd linker
- epatch "${FILESDIR}/pr2825.patch"
- # Fix location of JDK image used by check-tapset-jstack
- epatch "${FILESDIR}/pr2804.patch"
- # Fix setting of ECC test, depending on whether SunEC is enabled or not
- epatch "${FILESDIR}/pr1983.patch"
-
eautoreconf
}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 83663b2..b5480c2 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -1,18 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>gnu_andrew@member.fsf.org</email>
<name>Andrew John Hughes</name>
<description>Proxy Maintainer</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>chewi@gentoo.org</email>
<name>James Le Cuirot</name>
<description>Committer</description>
</maintainer>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
<use>
<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2016-01-30 1:44 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2016-01-30 1:44 UTC (permalink / raw
To: gentoo-commits
commit: 4ec2d9514018308fffa832ca6ad9020517b4607f
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sat Jan 30 01:42:43 2016 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sat Jan 30 01:42:43 2016 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=4ec2d951
dev-java/icedtea: Bump to pre08 and sync against 2.x. Add SunEC support & remove PKCS11 (nss). Add back libXt dependency (needed for headers). Drop unneeded libxslt dependency. Fix SystemTap testing and disable all JTreg testing.
Package-Manager: portage-2.2.26
dev-java/icedtea/ChangeLog | 10 ++++
dev-java/icedtea/Manifest | 16 +++----
dev-java/icedtea/files/pr1983.patch | 41 ++++++++++++++++
dev-java/icedtea/files/pr2804.patch | 41 ++++++++++++++++
dev-java/icedtea/files/pr2825.patch | 12 +++++
..._pre07-r2.ebuild => icedtea-3.0.0_pre08.ebuild} | 54 ++++++++++++++--------
6 files changed, 146 insertions(+), 28 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 5003f69..4eb9cca 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,16 @@
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-3.0.0_pre08 (30 Jan 2016)
+
+ 30 Jan 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +files/pr1983.patch, +files/pr2804.patch, +files/pr2825.patch,
+ +icedtea-3.0.0_pre08.ebuild, -icedtea-3.0.0_pre07-r2.ebuild:
+ dev-java/icedtea: Bump to pre08 and sync against 2.x. Add SunEC support &
+ remove PKCS11 (nss). Add back libXt dependency (needed for headers). Drop
+ unneeded libxslt dependency. Fix SystemTap testing and disable all JTreg
+ testing.
+
25 Jan 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
icedtea-6.1.13.10.ebuild, icedtea-6.9999.ebuild:
dev-java/icedtea: Re-sync IcedTea 1.x ebuilds with IcedTea 2.x ebuilds.
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index e208bd1..b9f3c63 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,14 +13,14 @@ DIST icedtea-2.7-jaxws-299588405837.tar.bz2 2022135 SHA256 816a6d7a4bd302871d73f
DIST icedtea-2.7-jdk-2db5e90a399b.tar.bz2 32380031 SHA256 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c SHA512 f31bd7c08577b0f222e9c65538837c41a7d5f90d15738dc536fa105041d920cff05b5a7b39aa59ab04452a6c34f59e6e8ebcecc66194d6a466ced07ec24a8c76 WHIRLPOOL f78ef4ac0f43052066d0ed762b20017bbfd8567c177caac782a48fb88ef30b0447d29be3fe79663a9babe3470ca3c63e948e0b0c53b057313a42bc8f306476f8
DIST icedtea-2.7-langtools-bc95d2472055.tar.bz2 1709785 SHA256 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661 SHA512 2a3a3c84be06c38ed6f0d861cf45099f24adb9fa2d958be8749b2a1821a91b17a81fc1a4ec21af575c6ee9a02ee9318751c9f12b438894e033c0accff5ece5a3 WHIRLPOOL a5b0a5509a5f499f41c8d06eb6d45c88737d78be48bebaa84f87511b6090bd9b414cf1b2698a4df1516d073df82037eb53e9eb04066f84bafbe7a57b6fcb3f42
DIST icedtea-2.7-openjdk-dbfa75121aca.tar.bz2 129557 SHA256 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b SHA512 0847cb7982373ce9277a089e4f165de6ab4f335d5a7ca6dcfee79c356f402bbbb3c392ef5266b2257a40f8b79775ce2f2d8f99415d81b70a101e1e439c048747 WHIRLPOOL 0851e56d4b71290a557133c8f1cda53c5b3e6ee99d79be11385eb38db346207471afadf201d99291e2aaa9ad1dcb5e8ad7f4a7750820522960908268d7726049
-DIST icedtea-3.0-corba-7418bb690047.tar.xz 934188 SHA256 e47d271bd2d0490d07d194480ae3943bc2617dc260b6cc2ef080697f588bbc62 SHA512 d4f15f1fe608e67d8d531a8b3eaeb716be98e09636bdcb4d6642882ec8bd10391d63236ff3d0a87af10f10d842f5e5f3b58f16d7e4d018abc74944ae8c9a1818 WHIRLPOOL e2f0445de219e8d907906e021e1b85b56cfc54c7ff94705c892e7198e04f314ed53981ede4b6ab2fe78e48be44539103f3edda3a9b76f5f2c1fd67f828345a28
-DIST icedtea-3.0-hotspot-ddebea156752.tar.xz 6746456 SHA256 0dd59345896a6b0f9b89681494a86de5471ded4e48bd81738fdd143c12918876 SHA512 214414f43235d739aa02e9bc93f3f815089d1636dd106345e24a7bd9f4c401c33067439c392ac11df214bfe9b719cf6ee62c46e5d0ffcd97e26d126e8a4d6419 WHIRLPOOL 6720df025086af6d703c7da5332dc099f235ca9ae12cb92ccc7c88ff989e3b1745ea4b723d2abe246e4fa4a9ff3c71903bce46d3ba828eeae7b24f1ba6430c3f
-DIST icedtea-3.0-jaxp-c08ba71fef66.tar.xz 2295560 SHA256 ce0e1a6c850420735233e06667b32d32f91051ae4abb57f76c86343fbe3aa7d3 SHA512 3ff3d61e320d2b96b07ef2cb66ad57dba8d9683a335bd7a24477ca0fe6771fb7589788e5f3dbdf2b54542472c9db68415fedb8ce889e8787a5063fe48fcb0d02 WHIRLPOOL 451e61c76ace96a16da628aa9c6ed4804e65f42c4d8be8778fde9dc81ee28a905294bb81fafd1935aa821a1a903435379c7bba15c85446978685ca1d411ddd03
-DIST icedtea-3.0-jaxws-2012603e0e90.tar.xz 2264124 SHA256 3b30942316cc58b2f461587f5032841d072cc31c1c4f4c62c60b9cc49713065e SHA512 6f98652b44e407188d35f6113c090b659f35424b1fac085ee555dc8c0bce48a367d8f990b783db98c81f3e00ab95055de8dde18cd2458ea65f4636e5dee5b2db WHIRLPOOL f6e7da55fd02ce65b2ba96028f80437db60c3c9ca6c211c685f9bdbafea0a099f9e84b71bad5fc58927e50364ca1d95fd3a3a38e0df048d2929c7a0070d74e82
-DIST icedtea-3.0-jdk-c4b25140f059.tar.xz 38240448 SHA256 8136f803b78577a35be6e481733b327831069723f1828f0c964c6d8689f459cc SHA512 77c9e6881e2311351aa472d33beca892fdf889f07d1a14250ae4299326ebe835212e96588f9c8d03432a3ce1b3dd6e9e8078103a8acf8808a57ec4191d9d8cd9 WHIRLPOOL c72ca5d52d509d9b6a4d64e27715589e87b4bcf1bd6cf1c09067bf891a30c30b3fbc68e112f494454d47d351e6e2096f188fabb047175178120980470f3d1203
-DIST icedtea-3.0-langtools-3c76eafe1b70.tar.xz 2052164 SHA256 d48f5de5ede27c075def8c79d2e3668223def1da671cc5b8a69b80fc7aeb2207 SHA512 94511bf127809a08848ddb074d417207c80715a546fb68163e23a53a18e4a683ac44e0e9af6238462c3d2597bcbf8f0e5af2f93fd60ef612dd616f3d598413b6 WHIRLPOOL 0fc27cd99bb20d2e2c8efae898a4996c065cff1a979bdc0386144478d245c55ad706baf57aea21bc195a7a70bfcc3d33d2a34933a0b3d22da340035c5427a405
-DIST icedtea-3.0-nashorn-fd478ce27023.tar.xz 2200932 SHA256 e3a6e093e574a6a9d2cefc25184510c023ad4bd65fbb060085e969e23050a515 SHA512 71996b439388249607444755f474979197f513ae3932c9cb730b0275f770fa9d6b09a44a3affaf62edd409b7358626be1f20958abfed6d41cb3a96b7d4b7395c WHIRLPOOL 17faebdc5f60f4c927e5e3c8016dbc080a76036584f1703c2e302c450b8a57debf9b6c18a3f6ce4d7cf523320d13213d930632e3e7e3e4afc53b6d0c7b9342b8
-DIST icedtea-3.0-openjdk-4b05cb9c5a4c.tar.xz 328220 SHA256 12d6348124c133ed43cc1ac0dad0ce3eafb2e42947c36cc87df2f5163674a805 SHA512 39bed4ca0d1f03d53ab75ee3389770aabd5686b9761346971b581f8dc0d2793c3a012be4136111e2fa89cafa0aeb29451e40d8f12be27f7db969cecea50e3f06 WHIRLPOOL a05f9a2c462d2c2bea33c10fc89eab1e3f96e116129d052958c70334ad17db2afadc8471eec6b68b9a9790e225f47036dcb6fba314d74419485b86c2ca90e366
+DIST icedtea-3.0-corba-ebc2780ebeb3.tar.xz 934340 SHA256 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66 SHA512 7eee8526ec3bdb870ccaf0af47aafe2d5a13ef96979e7a9c1570994faf4fb5f68b357609862308f7b47920a7b7d37db21f76883828eeb8631f28f343c90e5e84 WHIRLPOOL e4526febfffed1a3386440d1010f24805cafe16a13087860d1b2fb36e5507018a259f96cd3b3cddffdae482ba2edc16ff6d71d19ccfeffaeae3768286a249fd8
+DIST icedtea-3.0-hotspot-c313c4782bb3.tar.xz 6745716 SHA256 c876cd97bca74e2970161688eb3e388675ebce3ebc4a34bedfb6bec3bb8e9cab SHA512 884ac002d33ff683051119902186aa4b768488cb4058ec1e5a70a3bd9fc766690caff5007d653e742187138ba862f8ab3a2df61e8e4a359207b7f8255bfff818 WHIRLPOOL 5ecad3eab8e6769e0e463648f11c0a3a861cee47791278ff47547effddd0105763e928bedb9f7d31cb5f782a35f8500cf9d2eafa9a9209bb78001d4b441ca17d
+DIST icedtea-3.0-jaxp-ac52a8eed353.tar.xz 2295656 SHA256 e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b SHA512 dad8d7a90143589cb04a2d734e16b90578dcded64463f43676d772411885ffa89b8b0fe7b96ccff98d07e4d412e96fa417ab243a972215a285bf4707ac0139e3 WHIRLPOOL 3580ca7d0d2ea65f3e8e9b47bc9a1821b80ddbd5e39b0a77746c2e1cda094336d9d84c310ea20d9933f84e3fd596dc744c142bca9b51f9e04ba42e1551ca96da
+DIST icedtea-3.0-jaxws-26a1fdce80b7.tar.xz 2264108 SHA256 be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2 SHA512 380eb8bfded1628a98f8d3dc70e5823a460eba7a45c5bd8ea96f8a057b8da6793d40e93af1ffe868c6d7403eb84f5558af09b2df3e4c219ecf18ba9c206d8bb5 WHIRLPOOL 980c2b157733937282cd00b75aba60d2ec255604c591f4319f0f0bf0987574d5cb8187fc14c16a4beb2c3e6ec200810c7a202d2956ef626e493ed3360e8f83fa
+DIST icedtea-3.0-jdk-809d98eeda49.tar.xz 38237376 SHA256 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25 SHA512 3b12ce3488e13c8b79a516f5f4bfd4b799959e984560885648e12155f6295fb7ac5dff04269876edab112710a34784d7e1f4898cd703caa12aecf132ef20017b WHIRLPOOL 909744010c015ae4fd1e6ff6d16136c3ef522f26642109fe47b0b094b4e4d7cdf946bb0e950a31a1685d1eac923f1b6049805c6d40f6d8f3aebef657d57f2343
+DIST icedtea-3.0-langtools-0d3479e0bac6.tar.xz 2050684 SHA256 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86 SHA512 f04b24e4c091e1665fe0e9b0de1cfa7824bf300d5a6c2b085ea4aa30dd808fdc945f83cef69e074a6885979fca170d809147b5a48f2573d3f0d38628c87554bd WHIRLPOOL 3af7c2bc02b7140feb3552b55f2e4b21edf1885b7b6a9f9b29d53f2547f6bed8356c1b65ca267f3f6bd2b4a79cdcfaed8eab84e6b654b71e32d74b17a46ef2e8
+DIST icedtea-3.0-nashorn-7babac6e7ecf.tar.xz 2200204 SHA256 b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150 SHA512 8321076c910819b8ad183ede286d0f4dc438944fce4a5f737c8b379331b24e08bd7f24730dabaa7b2a6d3a32862f0c31cdf99044e6980fa89ab638728f7b07d3 WHIRLPOOL bede2f9150842f6baaa0af45ff2103b60d97c60b36656b2e4560c47aceb0728193d2e626d772ee69bb4a9945450b41ebdc93054418e045a98b74c6cc7681ac16
+DIST icedtea-3.0-openjdk-f0635543beb3.tar.xz 328764 SHA256 fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8 SHA512 aa0d6c976b6e13b9513fb1f6e53cbc7f980c7bad4dfaccb213abf520a15bbbf0cdf37c17924c56e3d630cf2033886e4e0d401e5b211a5e45eeb734d62bdabbbf WHIRLPOOL c91e68bbfcc4424be095b852b10aa889383be1936611539a00a7d59e45ad5d6b5b51ed642f810d5bf457a50772a155c5fb96085b62f9b27103a0044eca7786f6
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
diff --git a/dev-java/icedtea/files/pr1983.patch b/dev-java/icedtea/files/pr1983.patch
new file mode 100644
index 0000000..425bd6f
--- /dev/null
+++ b/dev-java/icedtea/files/pr1983.patch
@@ -0,0 +1,41 @@
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1454117106 0
+# Sat Jan 30 01:25:06 2016 +0000
+# Node ID 130888a5c7134f73540323d45f64e2e7372c4a01
+# Parent e4660f6210fa312c8392ab2be79f85bb86673a85
+PR1983: Support using the system installation of NSS with the SunEC provider
+
+2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org>
+
+ PR1983: Support using the system installation
+ of NSS with the SunEC provider
+ * Makefile.am:
+ (check-ecc): Make argument dependent on whether
+ the SunEC provider is enabled or not.
+
+diff -r e4660f6210fa -r 130888a5c713 Makefile.am
+--- a/Makefile.am Sat Jan 30 01:15:16 2016 +0000
++++ b/Makefile.am Sat Jan 30 01:25:06 2016 +0000
+@@ -209,6 +209,12 @@
+ TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
+ endif
+
++if ENABLE_SUNEC
++ECC_RESULT = yes
++else
++ECC_RESULT = no
++endif
++
+ # Target to ensure a patched OpenJDK tree containing Zero & Shark
+ # and any overlays is available in $(abs_top_builddir)/openjdk
+ OPENJDK_TREE = stamps/overlay.stamp
+@@ -2367,7 +2373,7 @@
+
+ stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp
+ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
+- $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport no ; \
++ $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \
+ fi
+ mkdir -p stamps
+ touch $@
diff --git a/dev-java/icedtea/files/pr2804.patch b/dev-java/icedtea/files/pr2804.patch
new file mode 100644
index 0000000..cebda48
--- /dev/null
+++ b/dev-java/icedtea/files/pr2804.patch
@@ -0,0 +1,41 @@
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1454116428 0
+# Sat Jan 30 01:13:48 2016 +0000
+# Node ID 48e97835c60091a6cf69053ba2d6c38b51d368e3
+# Parent b88b516766014824885b6559621ff89e5b714547
+PR2804: test/tapset/jstaptest.pl should be executable
+
+2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org>
+
+ PR2804: test/tapset/jstaptest.pl should be executable
+ * Makefile.am:
+ (check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR
+ as mentioned in previous commit.
+ * test/tapset/jstaptest.pl: Fix capitalisation of
+ "IcedTea".
+
+diff -r b88b51676601 -r 48e97835c600 Makefile.am
+--- a/Makefile.am Sat Jan 30 01:10:54 2016 +0000
++++ b/Makefile.am Sat Jan 30 01:13:48 2016 +0000
+@@ -2327,7 +2327,7 @@
+ echo "ERROR: Perl not found"; exit -1; \
+ fi
+ ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+- -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
++ -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
+ -S $(abs_top_srcdir)/test/tapset \
+ -a test/check-stap.log -j
+ endif
+diff -r b88b51676601 -r 48e97835c600 test/tapset/jstaptest.pl
+--- a/test/tapset/jstaptest.pl Sat Jan 30 01:10:54 2016 +0000
++++ b/test/tapset/jstaptest.pl Sat Jan 30 01:13:48 2016 +0000
+@@ -597,7 +597,7 @@
+ || ($opt_p && $opt_j)); # -p and -j are mutually exclusive.
+ if ($opt_B && $opt_A) {
+ die "Directory $opt_B not found." unless (-d $opt_B);
+- die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding Icedtea with systemtap support.\n"
++ die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding IcedTea with systemtap support.\n"
+ unless (-d "$opt_B/j2sdk-image/tapset");
+ push(@tapset_dirs, "-I$opt_B/j2sdk-image/tapset");
+ set_java_vars("$opt_B/j2sdk-image", $opt_A);
diff --git a/dev-java/icedtea/files/pr2825.patch b/dev-java/icedtea/files/pr2825.patch
new file mode 100644
index 0000000..510217a
--- /dev/null
+++ b/dev-java/icedtea/files/pr2825.patch
@@ -0,0 +1,12 @@
+diff -r 0883b7a8311a acinclude.m4
+--- a/acinclude.m4 Fri Jan 29 22:47:27 2016 +0000
++++ b/acinclude.m4 Fri Jan 29 23:24:48 2016 +0000
+@@ -1969,7 +1969,7 @@
+ PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
+- SUNEC_LIBS="$NSS_LIBS -lfreebl";
++ SUNEC_LIBS="-lfreebl $NSS_LIBS";
+ elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+ SUNEC_LIBS=$NSS_JAVA_LIBS;
diff --git a/dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
similarity index 87%
rename from dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild
rename to dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
index 3c44b2a..3397cf9 100644
--- a/dev-java/icedtea/icedtea-3.0.0_pre07-r2.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
@@ -13,17 +13,17 @@ SLOT="8"
inherit autotools check-reqs gnome2-utils java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=3.0
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="7418bb690047.tar.xz"
-JAXP_TARBALL="c08ba71fef66.tar.xz"
-JAXWS_TARBALL="2012603e0e90.tar.xz"
-JDK_TARBALL="c4b25140f059.tar.xz"
-LANGTOOLS_TARBALL="3c76eafe1b70.tar.xz"
-OPENJDK_TARBALL="4b05cb9c5a4c.tar.xz"
-NASHORN_TARBALL="fd478ce27023.tar.xz"
-HOTSPOT_TARBALL="ddebea156752.tar.xz"
+CORBA_TARBALL="ebc2780ebeb3.tar.xz"
+JAXP_TARBALL="ac52a8eed353.tar.xz"
+JAXWS_TARBALL="26a1fdce80b7.tar.xz"
+JDK_TARBALL="809d98eeda49.tar.xz"
+LANGTOOLS_TARBALL="0d3479e0bac6.tar.xz"
+OPENJDK_TARBALL="f0635543beb3.tar.xz"
+NASHORN_TARBALL="7babac6e7ecf.tar.xz"
+HOTSPOT_TARBALL="c313c4782bb3.tar.xz"
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -60,12 +60,11 @@ EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea"
EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}"
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="test"
+KEYWORDS="~amd64"
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt jamvm
- +jbootstrap nsplugin +nss pax_kernel pulseaudio sctp selinux
- smartcard +source test +webstart zero"
+IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
+ jamvm +jbootstrap nsplugin pax_kernel
+ pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
REQUIRED_USE="gtk? ( !headless-awt )"
@@ -91,6 +90,8 @@ X_DEPEND="
x11-proto/xineramaproto
x11-proto/xproto"
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+# Kerberos will be added following PR1537
COMMON_DEP="
>=dev-libs/glib-2.26:2
>=dev-util/systemtap-1
@@ -99,10 +100,12 @@ COMMON_DEP="
>=media-libs/lcms-2.5
>=sys-libs/zlib-1.2.3:=
virtual/jpeg:0=
- nss? ( >=dev-libs/nss-3.12.5-r1 )
sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )"
+ smartcard? ( sys-apps/pcsc-lite )
+ sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
!dev-java/icedtea-web:7
@@ -127,6 +130,11 @@ RDEPEND="${COMMON_DEP}
selinux? ( sec-policy/selinux-java )"
# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
dev-java/icedtea-bin:8
@@ -139,10 +147,10 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
app-arch/zip
app-misc/ca-certificates
dev-lang/perl
- >=dev-libs/libxslt-1.1.26
dev-libs/openssl
sys-apps/attr
sys-apps/lsb-release
+ x11-libs/libXt
virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
@@ -192,6 +200,13 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
+ # Fix issue with ordering of NSS libraries and bfd linker
+ epatch "${FILESDIR}/pr2825.patch"
+ # Fix location of JDK image used by check-tapset-jstack
+ epatch "${FILESDIR}/pr2804.patch"
+ # Fix setting of ECC test, depending on whether SunEC is enabled or not
+ epatch "${FILESDIR}/pr1983.patch"
+
eautoreconf
}
@@ -282,16 +297,15 @@ src_configure() {
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
--with-pkgversion="Gentoo ${PF}" \
- --disable-downloading --disable-Werror \
- --disable-hotspot-tests --disable-jdk-tests \
+ --disable-downloading --disable-Werror --disable-tests \
--enable-system-lcms --enable-system-jpeg \
--enable-system-zlib --disable-pulse-java \
$(use_enable !headless-awt system-gif) \
$(use_enable !headless-awt system-png) \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
- $(use_enable nss) \
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sunec) \
${zero_config} ${cacao_config} ${jamvm_config}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-05-26 17:35 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-05-26 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 43acb543f09e3b296e0b1762ab6eb9d7e6fd0c98
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue May 26 17:12:06 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue May 26 17:12:06 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=43acb543
Bump IcedTea 3.x.x support to 3.0.0pre03.
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222
dev-java/icedtea/ChangeLog | 6 +
dev-java/icedtea/Manifest | 58 ++++----
dev-java/icedtea/files/pr2383.patch | 12 ++
...ea-3.9999.ebuild => icedtea-3.0.0_pre03.ebuild} | 156 ++++++++++-----------
4 files changed, 113 insertions(+), 119 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index ecc023f..bee084a 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icedtea-3.0.0_pre03 (26 May 2015)
+
+ 26 May 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +files/pr2383.patch, +icedtea-3.0.0_pre03.ebuild, -icedtea-3.9999.ebuild:
+ Bump IcedTea 3.x.x support to 3.0.0pre03.
+
07 May 2015; James Le Cuirot <chewi@gentoo.org> icedtea-3.9999.ebuild,
icedtea-6.9999.ebuild, icedtea-7.2.6.0_pre18.ebuild:
Fix various dependency SLOTs.
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index bccdba3..fda7038 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,48 +4,38 @@ Hash: SHA256
AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
-DIST icedtea-3.0-cacao-d6264eb66506.tar.gz 4210323 SHA256 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c SHA512 9867eab28944e2ccf82555fe385efc4494068b087789b0a5cc2ed94723b442e96b7e7e19ec3e2c670608ba8336173325690f413d7779c35fedb108450ab90237 WHIRLPOOL 184eee0d85ccd783e7b95a5dc560b1073c068107ed4cdd6d877b1ff14fdf7c199f61ea8cb01c1eb63e19c2de22b45840dc0841a7e099413194b376a1bc6fdcb4
-DIST icedtea-3.0-corba-2a00aeeb466b.tar.gz 1456824 SHA256 10bdd5cb934b6c6ce7fc0faaf9bb7f489c24136db82a5862cf82957f94ef67c4 SHA512 6a6b4c401db985eff5efb498a73606269cef48e5d3b32aacb0187fda9694fb83eb2e591946e49c4d87eba968a6d610b5acbe0b1925f369a4eb0eca3899829998 WHIRLPOOL 3dd73fb2b564ddd47c60c2840bdda6d9ee4b99252e207287b603b3f9a42a2e6e6b0cb372618fe51d058580b5296cd2a54673bca7143ff459582904a24046dc77
-DIST icedtea-3.0-hotspot-65b797426a3b.tar.gz 8884528 SHA256 e30bc3fa830478d6784d5578f0c7e82c7fbc0261c10112ff72ce4a5ce1093732 SHA512 bdfeb70bb224aed1c1a8da69d5f2cfb98f97f09ea9d842d138c6629792ebf4775cc9595eb981fcdc9bc4ad743a9fed9f922ba459e7845cc13b37ce25303a934f WHIRLPOOL 4b174bd400743a6c8e9e9b89a7375aa5976934c170f74a6526f1407e13d94e829b83f3c2bee198c64c3db1017d97d4ba7e7f9ae63334959efbdad754840bff51
-DIST icedtea-3.0-jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
-DIST icedtea-3.0-jaxp-ef3495555a4c.tar.gz 3864022 SHA256 25256922c03ea7b27ba8ef99f5db05816f999544c84a43bd5a3f6df1080128b3 SHA512 11ee1572bef5258292b2a8eb46c618aae95121a1bd7ab0a6f76e8986f16c336b01b964ff87a6708fc2b0ab237433b190a6ab2bdb454e498d50051c623b675fe6 WHIRLPOOL ffb4f80cbe298dd33018ffeb89be6037a5f288554b250059209a604767958fe4cd653c909b0bf2db68f9ede46c727b6878e936306fe0b9a14731d6a82049cd2e
-DIST icedtea-3.0-jaxws-c88bb21560cc.tar.gz 2862295 SHA256 c6ee04818488c042b27dcef5620006bdf79f2a7d0cab56180af3e340f174fb5c SHA512 e55a035f1b8473d39a6d94d2b8dc51c13011e71cb8eb28eee3bb088362c807416eb5b10054a599c62e95125d29ce4fe87e886bddc03fb1015c21078fa799053b WHIRLPOOL 6076199fed52dc75116daa3a95bb4c77c6420493fb9253b3dfb8dbdbc4ca016bb530559d3bfb2fcd49ccb5c20853298b2120f59beb57a41007701c8f5ec7de05
-DIST icedtea-3.0-jdk-758db1c4c65c.tar.gz 52985486 SHA256 476f61c1de7cbf4c7d1fe51bfe813049ba55707b808f0572a898653dacc4dfdb SHA512 7b8d7daa420ea4432416a3a31538feb959bb92277e4226a5c26bc8bb012ec9ca9be2ed7fd8002ed138d0b71fde7c964eaeea31f25bb7391ad5fc9772acd09c79 WHIRLPOOL d24f968f21a617bbd2b46ffe3ad38b6613be236a3c7ba594c1fdd59f82ad65c449fe990594f5be64f35dd43bf12bd02f73b24634c03bfd727182e348beae1fff
-DIST icedtea-3.0-langtools-ed69d087fdfd.tar.gz 2817543 SHA256 ef15659e1e3d685402d53a9d0d087bcc3499f305001a6d8976a2138db7c70229 SHA512 c72f98c2a3b0c019de4908c20ef0face54792a7e20b0d00eccc6af2da9e35535562c412fda0e84ad372f4f759aaebbd42c9f3974ae8d729ef32efc3b978ec1b0 WHIRLPOOL 11b1a663f3a1ab7cc576ae03c9892c93535aba99e1afa221b93c56dcbe0f5c92d5b04b0203c363d40035055327ee1e2f0e485d710f631f6a1a980216ae5c0ff8
-DIST icedtea-3.0-openjdk-cd7f2c7e2a0e.tar.gz 427938 SHA256 aae139654d4bbc23da7eb9eff4fe7c6a70f219f69ec3e39b4506f97a9c9d3a39 SHA512 b6fcf2b9c7d422342258e0bd6c121912bddac60f6184883cfbf54b73e9caeac042864bb3a79dbf6702de2fb564b8354aaa1e68d01eb633a2f3d8283baf1762f1 WHIRLPOOL 3b63fcad95e227aa6785e48f2e1ee683e53ee9211e98fa5f64f68f86d5abfea5ec7b27554e547a6e4d84385a5f97ffc2aa2dc44711e9eec0ba3a27fc1cb8d3d3
+AUX pr2383.patch 438 SHA256 da00790f5ab98b83e04b123e400017269bf79dcbcfcce7ab259d7ea23e4e0df7 SHA512 061eaf09218f47764fe38d4b70890b9636ece4f01360045f4da850e864820efe497a28aad51d2583ede5fb2fdbbde2ce035b6eaeb8aedfa8ae288552609df1be WHIRLPOOL 930b499c591734a970e5b9c4f8992dcb699ccec86a4fd590bca4d177c4f3f167019a3e204da6f989e9ac697544c29402b753d1374802e8d92966a2bd93dc2244
+DIST icedtea-3.0-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
+DIST icedtea-3.0-corba-6c974fba96cb.tar.xz 931856 SHA256 0b65f0faec1d3bea618a5d7ebc5fa734163ee21039e58ba1f38acf99ff92bbca SHA512 2ba96d4d3f117bca3f724408a1d2a74656e5a69f0b2797ff723209cb454865e4cd1ce4c08a263c8ef9627f1ab7841b9b00a6b876088a8f3b21cdcb0046aacec4 WHIRLPOOL d5371381062a9838f74955b7ab1ccb8bdb420b29b11e5310a8fe83d4a7c8079d15b5bb275815f8749476e5784487e0ad8d5dce448f3e668576aad8d127d0cc2b
+DIST icedtea-3.0-hotspot-85e5201a55e4.tar.xz 6687348 SHA256 0fcf2f5f49ff4504fd095a57e767ea3c3eb8181e65d9e8b3f3accd3f03ff97b8 SHA512 5c8e839d2d74b0308f468d8763a69ab06920f43b92659bbac76f53b48d83ce8d7070a091ca36df99629364fc8d05b8272e7c12d04609b969d5e8db6ace6908df WHIRLPOOL aa4f6f4f67a18699e491bfef32fa86a17e276fb91ffa5c55fb4906c5123ffdc886395ea606323b4a1807af687d104616d5f5aa81f94b57919476cad82471c960
+DIST icedtea-3.0-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
+DIST icedtea-3.0-jaxp-e727012c23d9.tar.xz 2292392 SHA256 01dc9a20c521ffa8057dbf47a4f7b555a47156c6f9a1826e2ef893deb830c5cc SHA512 56b5a645aeec9e8849eaf9b02b16fc16b504f136ff52fd09a822638e285675c399da9a2dc943a0668d55b51c1f5644239c8f198d3a36cc7b3ef39675a45f62b9 WHIRLPOOL a2d4073f7e1fa4b11710c5ce3e87d9f2490b1b29295d9d77ee0a5b26f98101f34c1be8b3fedfc0da15756f837f9ce2edf402a0fac42e5e271e52fe783c0c079c
+DIST icedtea-3.0-jaxws-7ba7b06f15cf.tar.xz 2261928 SHA256 2fc04ea4fabef520222600d533d72eb8305882349f8a6763144032a93bca521f SHA512 b0fed65d1d25ef14843e129e37ad0da33165e9c6455946469d2ce3605052c8911976accbf0999b68929ead00028af0b26adcb6c245f6ef356c26fd2eea45ca41 WHIRLPOOL 81d82467e14b0ceeb513a67863397e9488ac288374bd0b9ad740fe7d66d0f9a18229931ecb9386d5dadac33f62d8dc86934a33e8f891444d9b69f6bb80ab7b34
+DIST icedtea-3.0-jdk-a5c3d9643077.tar.xz 37890512 SHA256 1190242429de1c3c25db5114b35b9237deb53fe776a4b17613641d457030d9c7 SHA512 6aba5722d1ada7eda3fffe66c6b4a14fb9945920a8463d64b13fb43f2e9f16ccbb6d1e72bd14d38fead9c7380534fcc0abd7be6ff3a1ad2c75b006d6c9663828 WHIRLPOOL 6eb79b256f4e469f0f977d4afb01e24591fe0090898c107f115620fc87cf64f570b1299541ff0a27b599b32b2879795e4a636d9ac982fbf571516651be205114
+DIST icedtea-3.0-langtools-0d5d2b8411d9.tar.xz 2044980 SHA256 71dbcb8990f66749332d72001ea79b458baa51fcd1086907178c83f07007a860 SHA512 882c8535ed15c9c652c6289d47eb79c2932d7179c331c7ade70575e68f97f079ad76d45fa0a5e556efd9e6f07ec4ca786e804d6af02faebb75d89a300368f9a3 WHIRLPOOL 6ee11b1d040e4daa095055b48942b4fd7886e0186c3faf55e94f726ab9ac51a69a906d18dfc15be502bf31a42ea827c896c9700adb7bf2b98c31f649b3bfc5e7
+DIST icedtea-3.0-nashorn-d8fc6574c0b2.tar.xz 2163612 SHA256 b85c66df90280d529894563ab774968a462a57ad9568d8a2ab31a7f897cbe1e2 SHA512 d64b729f557b0bb55099735065c4c6e6ce80c0234ab21da4507c5727dda970a867d6f796290fd0a0c92f4a9f1302920f83b32e63e30f596a70e385e7c8518717 WHIRLPOOL 99e73302fdd36aa1eeddcab36bbfd9596ac245372b0b5097565bbf81cee5acaf5eb6aaa243a18d67336204b6e92c4eaae5f26950bdd80ce43339814b65850b0a
+DIST icedtea-3.0-openjdk-44a10ae251ca.tar.xz 319768 SHA256 b915757c7c17448c670e93b7b9885e46afad43fbf6585c2e0f9d3582237a8bd7 SHA512 85cd2dbd4cd2462a9b9c6201edac3c09725a1136b3616d4681ffab2e8740755c98d8daeca135039de77b07aa403844d0daf0b7ae5fd36957f28bfff57f4e32c8 WHIRLPOOL 17d4e3343b9e439cc18e71829871db735e055ea654858c2ca691d4339832331c45c2be30977571ef91b91e3b93340a73c98eb1298eda98bd5997fdd49b74d18d
DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
DIST icedtea7-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
-DIST icedtea7-corba-15250731630c.tar.bz2 1071010 SHA256 9448485932e5f74b545e7c9e1d4a586bf4a93c85223e500d803eecfe287786fb SHA512 15871d248bd3491e53b687a4dc51765e82c8c17d5044b27cc29852902a85e0abbaf1aa93d774009c991131c4915c519d3779b04341faf365096f14419ec55847 WHIRLPOOL b74550d7353d2bf0c53bff3575042c6abd195f79fe0226e46e6b283157162317b63cfb7885571bdb4490606dac9016e57ff4671ba9ebc2c368d60b828997acec
-DIST icedtea7-hotspot-1792bfb4a54d.tar.bz2 8148494 SHA256 c08056f64be5923353a75838e66b26aedf0213cbf2296cac449a5ee874c6759a SHA512 ff9fbf1656178f7c89bb249623f615aa2abfdd379fde2fb84c60f94e739951077b3e64659b26b867ca1d81962fbe44fe3fb11447919d5ad14df5ef79fed95a7b WHIRLPOOL 11ccdbca767122ca319d1a542965a325b5095f5f60dc4492eb4402fa19c2245bc947843c9a8851b9233b3bf57780c5a81952cbe97672769fcbaeeb6a5ed0f81a
+DIST icedtea7-corba-15250731630c.tar.bz2 1070729 SHA256 038202eb0daf849028c28ada6e11e0b8ef0308c26d45f94a0aefb834a4d41bf2 SHA512 c85f34283d81e72718bcbf2e201d26bf4f3937773d145a620e0e525a6b0015f5b33c68272ed7ca0541894f54a54fa61780d4c563848f55a43cbdde4d22877ec9 WHIRLPOOL 8fd4ddd54ec710b79239edf48fa6c6384e03c8fad37d79e7d76eb0ce4d45803dac51cd8e59060e43b8eaf443c36cd28413469bf9229e35f482bda7be224fe0f2
+DIST icedtea7-hotspot-1792bfb4a54d.tar.bz2 8151087 SHA256 b5d129a569016dadd359b7aa7b28b4832476b3eec2aafe42e21f1c9fd85f18de SHA512 d848bea522675fbe7f0162800a1593620604aa6d8ff1d184ad8a0a0fe67f738387f83510f4e68ce80cc00cb78ad2c7cc2f851cd3897ba31f3492925ceacc174b WHIRLPOOL 3fe0e2940e4abdfcb7f2a7280835626ffaeacbfe11ec373190a3044f349b0e0f9a912a26829574bf93443217c2d912f3e26804dc19a79e667f4a4bb2841a2a14
DIST icedtea7-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
-DIST icedtea7-jaxp-8cc37ea6edf6.tar.bz2 2726893 SHA256 66ee4dfac13fd748a6e7f42726be66b625ba0ee5454635e48c4f4b17c4257210 SHA512 ce1cfec73e2b86cddcd0ee29fd72e9c16221e9bee15de19018865935dd85304fd130ace329ffbc2e5b49ab4dc8b5971eb32a5789644f5ae2fe1812e8e300312e WHIRLPOOL f80bdcab08d729f6fca6e7fe82f16b907f7e876aae4541e125720a6eca80db9d217967a328418cf4cf7cc4c8bf86689e54a3cfe92ffdd951cab2d1b2669bf2e2
-DIST icedtea7-jaxws-5ee59be2092b.tar.bz2 2020900 SHA256 5891f10569b4f26f6bf6eb8548a565057930d7ca39e19a72ba28a220fd920614 SHA512 a3688463cbfbf48ac52058ccac0ca4e8cc17d1027ffee19e6315a22ca00e3738a47fda7475e9d6e18114ea3b28595e77e8c5884e5a0bea4d08b56d1e11991120 WHIRLPOOL 99e354eb2718050f759eca4e47cb3cc3d29d25820573d9895f316a9432cf0abc4903efe0235232d0a7b8e988550cdcf3fb60617d8df01d769814fef22289b131
-DIST icedtea7-jdk-19a30444897f.tar.bz2 32261734 SHA256 2f3c22d729d65851f491d924fb0844f7a04c6e4d9b5e926f08938d58e214dd1a SHA512 ee7875b12f85fa2dc5e8fc8dd4c855f8724c0f607602892234e0a2afe0d474401e6f36f3bfa21e313f38e77c32944c53291aa81b27c318177b39cd15e932749b WHIRLPOOL 8aa3876641c62bc8d6271fd659d015e1dffd9f30e2b22005746a0c7d74372b1eb2f620adc11c89954172182f94f9437af5bc871a0c715df34aa6525ebb2f1870
-DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1709221 SHA256 5df2c2a496409b0eb1f4ff923ee6de554ab74af8b91af26185f7e2f73071642d SHA512 51d9e5cbfbde281b8dbe0dc6d3ed3ee6a4cdda853809e64931220126de34ea74fa9359ea24cffaf913ea57b967a54fc0d25f31b2bdf62d0c8549cab07e83c969 WHIRLPOOL 655b67b53b6e8166e128bf1621eaa1fed39e18c0b336b6228a4fca4d64ec2efd60d66b1e02b5844beb9107ed1420f471f2ce687773c778418ab75e02e2d8d4f2
-DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128769 SHA256 8c77d4d16d38b2ee4edd98525186548c33138a400c61978e1e54b70c494250df SHA512 91e0eab9e9ba1f6ddc922e1a8e6093f211aabfeef0b8e833db871a40a3b624fcf7155efcd2d2de48b9992985079430b5d193277bf3744e4083de0fa0c7e18bc0 WHIRLPOOL c0ad8c0ed7e12f3717f030412408791b1fa3670167baf58cf879c1034781bce9ac8666edf2beb4169c0e6aab7165797e7b366fa7decdebabf54dfacfc460593c
+DIST icedtea7-jaxp-8cc37ea6edf6.tar.bz2 1117476 SHA256 0d8576adf45130c23fb1e4e79585cbba0a5259ec89da7bd61e53c08a886ca70d SHA512 f3681022249b46e4ca020d304cfb82dcb25f59bf1fb20e0320931e40407899ad979b4d03b402a52abf6b528d7bbfa2a7bdbf89f8afa9fcda90a2c867dd839953 WHIRLPOOL 6c35c0f55dd46d2e933fa37435222ad61726a3e5769c7db5ffedee02c22b35633f064941f42ad2e3c483a5fd9e890fdf1fab720e1e1e2fc80225e78c9f45b081
+DIST icedtea7-jaxws-5ee59be2092b.tar.bz2 2020593 SHA256 0408a8a0c02b84ed7b7701c0572dfae0fc886713614b2fcdada81b3d30a1ce23 SHA512 5c49b064c124325107795e8492e47f1ef3fee23b025333774a81c8926f9aea7c2c94ac9b32eefc81f68d88269fb79d5a2969755d5fe2c8d0f1656e61a7ee24a7 WHIRLPOOL 72c27cc0d85e03a46b668a3949b4d391e06d9dedff77a4ac64377b5606e3482475b053e119ce1ce923cd3c7ac7f495044113a96a5a0744520cdb3a746200d0bd
+DIST icedtea7-jdk-19a30444897f.tar.bz2 32277741 SHA256 bf66dabb0d427968fe8cbf26045ffa8d1db9fe9230f5819a3d88e61d2d56cd38 SHA512 1b44f5aad7fdaeeacdbb9dce50a9291dda1e0a76f54635b3334c176053ac4d9bba637997730f96670470bd6cfcda557c075be3fbec8f022db3129f8e3dd04945 WHIRLPOOL 9c9ea64c065454a13785a89e47fb7f9945e730e9a83ca30f32a0c5ae87ad4d67fb7d9e1e4712cd82cf2fa9f1001c7b6f0712ab5bf5b48bdce7d0ab210e371fb7
+DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1708961 SHA256 9f1b3252e84759750bc8259d6b2d94ccf8f778d56fe6fa7dca2c9a70a317bd48 SHA512 ba28c4f9c010e4db8fbfe1051d8ccc058943246f9062dbabb98f714f2473d0b5dac6103ac9d7dc1be93f1fe4083ec78a66e66a94424afec95cc747084961a8e7 WHIRLPOOL 30c0dd5cfe2bb3d8488c7f946530b01b443cca00600737a148684d55b1dda58ae38b64bc0f30012fd503ba75b58f04fd618025cd9312b9306d1743f7b547fd15
+DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128772 SHA256 af57bdf261cf377f5cdabab4a8a271a838b8f7969be7331d99390ff39f6f7b0a SHA512 5c1e5801253da4e5bd97152d47981ec38b32eea674a511ac4f9db441161bf05661cb1817378dba25187c6f3f4df4f21d947571463ece87fd5359f0232e874377 WHIRLPOOL 7430b79cd79a45cf410bfdbae1fa1feebe2169ef5436012cb7c7f46997fe9ea157a64ce8cc7106d8d3003eb0b394c5633c837843cfb7b4d521b36a9829b10d84
DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
-EBUILD icedtea-3.9999.ebuild 11508 SHA256 bb74a988fd9094e22dbbf078cee09e761f13c8ef5ebdf63b63c6f9b2ac9d1e90 SHA512 79680e1c02a246d04cecf9ec683032fd070696937ddc562ef8b192d02877a877d8c01fa93c49cc6f79c728cb6f98706f4652b8e96859c942e1d3128784be34a3 WHIRLPOOL 637639e8a15ff8bb30a83f3948eaa0997c37efb313485aea7a7d65a40023cf749840fbb2404ed4292df510345fef0961c5e61e5389baf49bb4a6458a8346054b
+EBUILD icedtea-3.0.0_pre03.ebuild 11419 SHA256 57b5cbcc851338d3d3f1d65642082d39f3f2c40f709204413d74f85bab1a0988 SHA512 1bb58f7f05caf822d09d08b37c876727f1f554e960363837d99d26ad593e16dbae01791231f029689aa5a203d18a65127cea9ac04bcecf54578a685a4badffa5 WHIRLPOOL 5f93a29b4c52a0f1861b0801f612231d210ab5333f6541659aa2207b0b69a1913e28491ffe0a285539ae8863579370b392c09a582933e2e19c71b52b8fac8622
EBUILD icedtea-6.9999.ebuild 10839 SHA256 ffa41507a26006ff1e7a16e8ca71c399dff000f5dcf080db57fe05a0aa539538 SHA512 2e52a795b404784ce5669c1e085761e623bf7dfb433eb0312989dc47b9ee58c97ea31052c486bafa66b20ab7bd82a35a43bc5866dd1047852d144ab65629c3af WHIRLPOOL 22dccdf4b9232e2d6d231e86086924c3005da09d152f7c3db651727e4791f03e85e43c32bd2693691d326c38c6fb384313aa1bc50fe26d2ff700d295f824ef52
EBUILD icedtea-7.2.6.0_pre18.ebuild 12409 SHA256 0e4f133c68a421e89794560b2e956acc0106d4be1c86c512b7f71945db57c6a0 SHA512 a9b727004b708c1ea572b585e2b5281ded50e9caba2422961f6695590d63e61355cbc150192ab97c48c7713c8dcb63ff1deed183cb27b25d96b8926aa8f98e5d WHIRLPOOL 9a6554a678d0ea2d69723df6667f518138de549adc46d8d4110a8d867805ded356fea18fa4bb6ce9c1b761354368fa0a0b92bc2146cb878fe4f9d43e1aaa9ddf
-MISC ChangeLog 89701 SHA256 5e776a8bf6021b6a60599658779e67bd52ef16b4126d060a47930c87a6014e73 SHA512 cc1a9ef5e30f3f7962e18ce285ab74bd0ecfb4f0bc2ec9e0921c1966e837ffd9334c15fce861fe3620fffc3dccd06bd0132c33cfd651840ee0eab1e161ced92e WHIRLPOOL 2d0b20f8e0f676a4d85a016498d8c2820693765c5931b7c5c323f8300f4026c5ad03af5c8113b70664f62d7fde34bdec743412b8b2bd7d24554d15b1261f636e
+MISC ChangeLog 89920 SHA256 d24c68944e3c1de45257b023dbe2a1ef5320d666ac39b189167037291cf0a59e SHA512 e03d04ee46f97734873251a717b243ff60e95084a8d44e956d884c6f27388028d07fb747a027dc28fe6baebfd70997cb126d0a724f06dd3b0ff5403f3aef2dda WHIRLPOOL 8f400742e14dfeb02378a86a19777fab317717495f70fc530e26c6e600e10a03d531b047c7d11edaa2c4e0e71b3dcaa40feab5dc83f8bf92f48a066770578b6e
MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQJ8BAEBCABmBQJVS1t9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k2h0P/iSBOcgz63foJ5dspR/SFvCU
-tie8BdUXCR3jy7oRcu5slOT/6YhwL8Q/FIB2Fk9x+eZH/VLnScAbc1pgKvdSezZ0
-+wQljxdAfx8UMJ0y3HXI73zheTHy+uv59VTfaghtu+k4RB94qL04WFNQ31/Me1DI
-NrSVsAJuhyVvQyXXTau2OgheO4YcYeWGC72r/nspxm9lG6CqBpUIed7kvP7zhGzj
-WYMssgNlWC6MCHJtaKAOIpmnl+QWkMJeK0FVwQ0QKbAqJ5uCOL0T5bXGaliKVDO7
-C3pPpJW4+WMhotmqBD4oUPOxfE1FIszv759zylpLHQzubEgzp6VvD/aTIyVCFkjt
-vKuY1FD0GmUVg2fWyXu9GMGlljl+PQXW5ZNZVAVFSBiLjhe382bNkJawTNczHLjE
-8aurkEggCQfMNV5rp8T7QRJ5/SVYE1F4vk7+2fMWB1l2Ca4xtrsMHTiWze5xQzSe
-e0WtRRVYgWic1yMwjOWUuMSpWyS9lG8J8VgMbezeHCrzvSITydgpdF8xxU/86Lia
-6+wZqtYnxC9DnnKNFVxF42YFamIuIYp2x17uOuWZNDANNokETcgLtk0JFqlPy3gf
-J4Cr5/u+oQkYYn0o8xc8X3bUASyph1z+az5BL1aZC/u/mMt61K51Dw5qmIrkK+fB
-0a7bELAJe6nyFiYoXEQi
-=Osdu
+iF4EARYIAAYFAlVkqWEACgkQz9oPmzWWQiJo8wD/a/YDX6+LHfwkpP0NbeoIY5MI
+Kf5+gv6xrz6UFO3FP/ABALDZsUckw5VjnKBQr0jOeVjKceb10C9C+rDU4tmjw/IL
+=Qqp+
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/pr2383.patch b/dev-java/icedtea/files/pr2383.patch
new file mode 100644
index 0000000..0ae484e
--- /dev/null
+++ b/dev-java/icedtea/files/pr2383.patch
@@ -0,0 +1,12 @@
+diff -r 10e7f91158ff Makefile.am
+--- a/Makefile.am Fri May 22 06:02:08 2015 +0100
++++ b/Makefile.am Tue May 26 03:31:31 2015 +0100
+@@ -2461,7 +2461,7 @@
+ touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile
+ if ENABLE_DOCS
+ ${mkinstalldirs} $(DESTDIR)$(docdir)/html
+- cp -RP $(BUILD_IMAGE_DIR)/docs $(DESTDIR)$(docdir)/html
++ cp -RP $(BUILD_OUTPUT_DIR)/docs $(DESTDIR)$(docdir)/html
+ endif
+ if !ENABLE_JAMVM
+ if !ENABLE_CACAO
diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
similarity index 73%
rename from dev-java/icedtea/icedtea-3.9999.ebuild
rename to dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
index 397e25a..c08489c 100644
--- a/dev-java/icedtea/icedtea-3.9999.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.0_pre03.ebuild
@@ -8,21 +8,24 @@
# *********************************************************
EAPI="5"
+SLOT="8"
inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx
-ICEDTEA_VER=$(get_version_component_range 1-)
+ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=3.0
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="2a00aeeb466b.tar.gz"
-JAXP_TARBALL="ef3495555a4c.tar.gz"
-JAXWS_TARBALL="c88bb21560cc.tar.gz"
-JDK_TARBALL="758db1c4c65c.tar.gz"
-LANGTOOLS_TARBALL="ed69d087fdfd.tar.gz"
-OPENJDK_TARBALL="cd7f2c7e2a0e.tar.gz"
-HOTSPOT_TARBALL="65b797426a3b.tar.gz"
-CACAO_TARBALL="d6264eb66506.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="6c974fba96cb.tar.xz"
+JAXP_TARBALL="e727012c23d9.tar.xz"
+JAXWS_TARBALL="7ba7b06f15cf.tar.xz"
+JDK_TARBALL="a5c3d9643077.tar.xz"
+LANGTOOLS_TARBALL="0d5d2b8411d9.tar.xz"
+OPENJDK_TARBALL="44a10ae251ca.tar.xz"
+NASHORN_TARBALL="d8fc6574c0b2.tar.xz"
+HOTSPOT_TARBALL="85e5201a55e4.tar.xz"
+CACAO_TARBALL="c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
@@ -30,38 +33,35 @@ JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}"
+
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="
- http://hg.openjdk.java.net/jdk8/jdk8/archive/${OPENJDK_TARBALL}
- -> ${OPENJDK_GENTOO_TARBALL}
- http://hg.openjdk.java.net/jdk8/jdk8/corba/archive/${CORBA_TARBALL}
- -> ${CORBA_GENTOO_TARBALL}
- http://hg.openjdk.java.net/jdk8/jdk8/jaxp/archive/${JAXP_TARBALL}
- -> ${JAXP_GENTOO_TARBALL}
- http://hg.openjdk.java.net/jdk8/jdk8/jaxws/archive/${JAXWS_TARBALL}
- -> ${JAXWS_GENTOO_TARBALL}
- http://hg.openjdk.java.net/jdk8/jdk8/jdk/archive/${JDK_TARBALL}
- -> ${JDK_GENTOO_TARBALL}
- http://hg.openjdk.java.net/jdk8/jdk8/hotspot/archive/${HOTSPOT_TARBALL}
- -> ${HOTSPOT_GENTOO_TARBALL}
- http://hg.openjdk.java.net/jdk8/jdk8/langtools/archive/${LANGTOOLS_TARBALL}
- -> ${LANGTOOLS_GENTOO_TARBALL}
- http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea"
+EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}"
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="8"
KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
- +nss pax_kernel pulseaudio selinux +source systemtap test +webstart"
+IUSE="+X +alsa cacao cjk +cups debug doc examples jamvm +jbootstrap +nsplugin
+ +nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -75,7 +75,7 @@ X_COMMON_DEP="
>=media-libs/freetype-2.3.5
>=x11-libs/cairo-1.8.8:=
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2
+ >=x11-libs/gtk+-2.8:2=
>=x11-libs/libX11-1.1.3
>=x11-libs/libXext-1.1.1
>=x11-libs/libXi-1.1.3
@@ -93,14 +93,13 @@ X_DEPEND="
COMMON_DEP="
>=media-libs/giflib-4.1.6:=
- media-libs/lcms:2
+ >=media-libs/lcms-2.5
>=media-libs/libpng-1.2:0=
>=sys-libs/zlib-1.2.3:=
virtual/jpeg:0=
- javascript? ( dev-java/rhino:1.6 )
nss? ( >=dev-libs/nss-3.12.5-r1 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
- systemtap? ( >=dev-util/systemtap-1 )"
+ >=dev-util/systemtap-1"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
@@ -137,7 +136,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
app-arch/unzip
app-arch/zip
app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
@@ -145,7 +143,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
sys-apps/attr
sys-apps/lsb-release
${X_DEPEND}
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
@@ -191,6 +189,7 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
+ epatch "${FILESDIR}/pr2383.patch"
eautoreconf
}
@@ -200,7 +199,7 @@ bootstrap_impossible() {
}
src_configure() {
- local bootstrap config hotspot_port jamvm_config use_jamvm use_zero zero_config
+ local bootstrap cacao_config config hotspot_port jamvm_config use_jamvm use_zero zero_config
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
@@ -233,9 +232,14 @@ src_configure() {
use_jamvm="yes"
fi
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
# Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, ppc64 (le&be), sparc and x86.
- if { use amd64 || use ppc64 || use sparc || use x86; }; then
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
hotspot_port="yes"
fi
@@ -258,6 +262,15 @@ src_configure() {
jamvm_config="--enable-jamvm"
fi
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ jamvm_config="--enable-cacao"
+ fi
+
# Turn on Zero if needed (non-HS/CACAO archs) or requested
if test "x${use_zero}" = "xyes"; then
zero_config="--enable-zero"
@@ -265,12 +278,6 @@ src_configure() {
config+=" --with-parallel-jobs=$(makeopts_jobs)"
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
econf ${config} \
@@ -281,18 +288,27 @@ src_configure() {
--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+ --with-pkgversion="Gentoo ${PF}" \
--disable-downloading --disable-Werror \
+ --disable-hotspot-tests --disable-jdk-tests \
+ --enable-system-lcms --enable-system-gif \
+ --enable-system-jpeg --enable-system-png \
+ --enable-system-zlib \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
- $(use_with pax_kernel pax paxctl) \
- ${zero_config} ${jamvm_config}
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ ${zero_config} ${cacao_config} ${jamvm_config}
}
src_compile() {
@@ -313,52 +329,29 @@ src_test() {
}
src_install() {
+ default
+
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- dodoc README NEWS AUTHORS
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- cd openjdk.build/images/j2sdk-image || die
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
+ rm -r "${ddest}"/jre/lib/$(get_system_arch)/xawt || die
fi
- # Don't hide classes
- rm lib/ct.sym || die
-
- #402507
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- # doins doesn't preserve executable bits.
- cp -vRP bin include jre lib man "${ddest}" || die
-
- dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
- if use doc; then
- docinto html
- dodoc -r ../docs/*
+ if ! use examples; then
+ rm -rf "${ddest}"/demo "${ddest}"/sample || die
fi
- if use examples; then
- cp -vRP demo sample "${ddest}" || die
+ if ! use source; then
+ rm -f "${ddest}"/src.zip || die
fi
- if use source; then
- cp src.zip "${ddest}" || die
- fi
+ dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
- # Needs to be done before generating cacerts
- java-vm_set-pax-markings "${ddest}"
-
# We need to generate keystore - bug #273306
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
mkdir "${T}/certgen" && cd "${T}/certgen" || die
@@ -370,13 +363,6 @@ src_install() {
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
- # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
- # install it anyway. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
set_java_env "${FILESDIR}/icedtea.env"
if ! use X || ! use alsa || ! use cups; then
java-vm_revdep-mask "${dest}"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
@ 2015-01-03 18:14 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-01-03 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 347b517adedf76c4f9f3896330aff8379b6963af
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sat Jan 3 18:14:37 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sat Jan 3 18:14:37 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=347b517a
Fix currency generation failure caused by 2014-12-31 being > 10 years ago; #534118
Package-Manager: portage-2.2.14
Manifest-Sign-Key: 248BDC07
---
dev-java/icedtea/ChangeLog | 7 +-
dev-java/icedtea/Manifest | 31 +-
dev-java/icedtea/files/7085757-currency_fix.patch | 412 ++++++++++++++++++++++
dev-java/icedtea/icedtea-7.2.5.3.ebuild | 7 +-
4 files changed, 439 insertions(+), 18 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index c53fd27..7564ca7 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for dev-java/icedtea
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Jan 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +files/7085757-currency_fix.patch, icedtea-7.2.5.3.ebuild:
+ Fix currency generation failure caused by 2014-12-31 being > 10 years ago;
+ #534118
+
*icedtea-7.2.6.0_pre11 (13 Nov 2014)
13 Nov 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 0c393b7..d24bf97 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX 7085757-currency_fix.patch 13087 SHA256 0735c2235ab7ed0c54769e6709ef0c30e4c892ae702a7bdd355eefb0e0f91802 SHA512 249579d9910d3fbf30e7cf5ffe41b0ea47af9ddc2cdec592008c597a9102bd4482565016c71389d2ea9bd6d806f68b38f52e2e237f0daa9109cac5d192e0c63d WHIRLPOOL 90f04220538e3855da0727ba12a3d3c4f146cd122a99aaa12fd4c76e9647cb2ec04f9e585d5d400d0dc7ee477a56d511c95b8a9018a7bbb1a339a7c9b3f75cb5
AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
@@ -42,24 +43,24 @@ DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256 cabc35587a90fa81edd8ba
EBUILD icedtea-3.9999.ebuild 10711 SHA256 fc6a22bf47db40c0f25d0bdc321901dd2585680b7c98e3e2d47b8235476182da SHA512 c1e36c3022f8712d32fa1d68191d97a1f0dbec2139ef4e8bc8f5b92494523c248c5731b9ada45afee2c275de8d233624cb1581b15041bd078fbbc44860ce236c WHIRLPOOL df90a1f053354da1330de836d08ab5f52fb00e02dbc15dfd6d9d58481d42a17805b4550f013171044a4913f103d08765042a8a1cbdd951e06948b439c153f142
EBUILD icedtea-6.1.13.5-r1.ebuild 10311 SHA256 822d0b24e1c81491fe292eb218aeada638a7f63c4096ad336df73a5bf219946a SHA512 c91327f708f4a42b2788a160ae5682f4f4c9d5600ab42b34149e083e8c5ba5ea1b1af4714e613ac7eaa3c53755346f63c6256597408af95cbccf2fcacd2fff7b WHIRLPOOL a2cabedc8e72c1703f9aaea659cebb3a59a461514b73e382b524d1c57e3d52150d1d90cf82c197fadb187155310eb7397bbb758bbd662ec7efd19435fd1e04b3
EBUILD icedtea-6.9999.ebuild 10014 SHA256 33a297abe609e27f3ca3c93ba374327c8e0beca9b277806a072715f61bd45784 SHA512 6507b894510471668698e7be1fa355e77033a9204f5e96351a37ff0abc67fe606d2c71213c2fa4810c6dedf3884da18d5a39cbcc7130303c98d95c0e7e737f46 WHIRLPOOL 79182d9db491f3900264680541e675ca033f174dfb223037fefe21abf8260a47dbc7e6d1d86e062655e76c15a23070f503d6757a0d71959f24f918261eff32a5
-EBUILD icedtea-7.2.5.3.ebuild 12295 SHA256 05d2ec8352756f0145c88b9e771f05d1426f693eb4b2dabb8150015fa89a9148 SHA512 4ca28934f8672c514e15549cb1bf65bc3b90dc72a5e3330d650922fbb304603c0ce4bd9648cdb7a33c5004b10a9660ba97fd8a5c9a597eb3a04d31dab4dd14d1 WHIRLPOOL d8638311e5c785124e685c1f23b217ee8a7a013f3e9e920592ca3d4dff7147bb4291c0f2f0f85a2112d638b0d4e19fb72dd3f3ce8f4dcf6b581885bf0a050716
+EBUILD icedtea-7.2.5.3.ebuild 12368 SHA256 215bb04afea4a560627c3b0252022e9d0c50ac881bf24ff8a742fd9f73415e97 SHA512 c38914d08a7fc323dc6257ead6cadb14b28f98255952acdc5e5bb3ce1118ebdef82ccecab2b20f9a38cda5fb0d07bb69007a3cbec49b6d3f71c964282c1afec6 WHIRLPOOL 265ae035b8fcaf3ddc29376d9dbee460a873e9061a09057ccc9f86e65dd56d6ecfff8578086080b1552a11beb454880fecd66b02c856a19d2c09999bb10a2ca5
EBUILD icedtea-7.2.6.0_pre11.ebuild 12228 SHA256 a93b555be8a38542c367461862d729cace970dee5cd437e7ba4684d6b77a9a13 SHA512 7fa0ed72dae3c87ddf33cbda2a18a2999d06f9c1e75016536790df3ea81bc6a84edde1923a45aa7751198ea67409bd2e28d21e4d008ac03916f151c5376bc3c1 WHIRLPOOL 903cc4312916107cb2d7db7e01c9cc14fc5fbce829e152c5ad0987d68b845e56e42bc8d21b9d9196a8b28300422b22895a0ceeeb352eeeaab6613efd6505ce08
-MISC ChangeLog 87214 SHA256 e4b44587b85f013d2b3f46833cfa523084e11ac579db37fae85ffb067a21f20e SHA512 4e5586158f3a3ca39009fd523b89561a10050aa304020560e24bae57993d14237ab2ed860a5cf831bf4216c9339cc5b8465c6cb2d993f5530ed0d0ba92a9a738 WHIRLPOOL edd2c67b5d3e59e254a67918cb5ba04152f2fd97a0bf6861e26909e1aff581127b5965d1637bfcfb87b0c88dc05a93abe48f57b07cab2258f1b47c4035070a7e
+MISC ChangeLog 87425 SHA256 478dc44a6caab7a7bf5ed6430b7a3a087f42605cf74fdbcfabc14e8f7323021d SHA512 49835bc07c3da39457375f77ae3eb2c54380ef13839775d87d7297ade59e8294f1fc89da92c95e1116af2bdf8af1b4513416d059acf783eaec5589eed459874f WHIRLPOOL 88b116fa006e8f5a01ed70922245f1c6f6779c89b8e39a47c8f7bc776407f0dde53759ed7493b190c8c0dbf80879bbebce8cfd2e47fbc0e7cb06e0b06e2eb563
MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUZIqBAAoJEDuWpXgki9wHPjQP/0mOYPisIe1TRORSf19HWVxB
-W72cUZ1XqM3uzGm4CI8LIQVvK3RF2FHOpiXHLXo+JDykaMwkKw8Mg3PAtK4SXUxo
-w2FAYwIODXXfXBmkEuaYby+g7q/esMoPeByqz1zgVGuGBECr9qqUrEALhqb2cpCl
-aAZOEOfK0tNPCJ7VWWzCDmgn446xk6r0/lTul37oNVaP7Av5yCJ/t3DyLTvYUO0A
-vBEzg5jFNYImjG9GHHdr9bCOTCX7pDGrgL6JlGmEKAW4b89ZRzZ8WiR5Nb3dxzF5
-vI+pvxrNM+ROsZsBjYHNOJWW/mK+HcVaqRngbNMSTntO+WPeWPR9Zq6OqBrcadek
-YZqEK76QdCR7NisuMSDwF081lmXU478Lkl5aE3pViVbNtu8zwa1CgthEdTHj1anw
-FZAFh6XUiWdd//iyOP6WDamntxdGZS/5GEvfT0Gh0ddgSonm4YWfAlshMEZjJ2jA
-qrCu0TWJmJpbqayByNNOaVR/ofbza7NRS2/wuT+bTx6VAXTG1JlA6AVT8IZ0hiAs
-YRG+eSzinV4nNTKq78N9KWlzPHRh7QAi9uTgZYKXbWzzIv1dcI2Ek5ZNFyAPceYU
-dMZzDkNVXicgd8QRqEp8R5kKI5pNt3m7u0ZyEBARlhwqXSdAvNCyt5Hk1xXPiwOc
-lYZDtX9esqiNP5iIMNLl
-=csS6
+iQIcBAEBCAAGBQJUqDGNAAoJEDuWpXgki9wHvUMQAI49mD8CPwUiF6LtUE5gHV7y
+F5JuhfIQDJKeqKP7X80mexZdTj19qT80nS+KtexzdktFolpJidZ6qVoPE6J1Heb5
+6UENEOwCzQGUuMG7omKrsfYjaB2NHbNdFrny5CKGQK2FtIP6hPQTQLkBYE4IlZHB
+aIqRmaylAt4EWtHrpfSWRlNLp55TrAGQ2sZekWYYFS++YpQWzJkP33j5XRO8cIKO
+9Tc/H3LGgi337MXmwxQVMdt3/g179OApCV3sLNUh7eTSR8PSW/JCeI05qNqnesjw
+G6fgx1qD03iqsih3tMun+r4vOa8GP6fSYQiGP3HpkeSRJHvz0I9/hfy4vvliH6CC
+TZcyaMGrSOpFqwsah4fXi7CA2VCUfLNrmhIkP4uOHeqGT0QI9bg+lYRg49p99ztn
+tLIrGMOjHMn5tvHO/+oEvHaSTri7i8BAL1hG0ggw9HawMUwMJmrEm53C8DJCRLWQ
+yjUrg2g/bJFfq6yiVOxlTcDkg1ItL1SHgdTQ9IQSikY6MmCHDbHVtBQKTuxQ0Xlp
+lAJQlBTHVEDuTfi1dwhQw7Zb/5+scQ4bAuyc6K1NurngXcdgwQIh8N2qHwDnRG0D
+tgWuuW4BEjGpOWFVDjfBsQoQNGIRWLrMkwZXhOxutB6sCcZCjK8fnCIVe+Kdm1J7
+GFKNZyKdmCoCSC29f49S
+=jNs0
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/7085757-currency_fix.patch b/dev-java/icedtea/files/7085757-currency_fix.patch
new file mode 100644
index 0000000..5a01325
--- /dev/null
+++ b/dev-java/icedtea/files/7085757-currency_fix.patch
@@ -0,0 +1,412 @@
+diff -r 13b10ea1447c Makefile.am
+--- a/Makefile.am Fri Dec 12 20:13:40 2014 +0000
++++ b/Makefile.am Sat Jan 03 16:53:45 2015 +0000
+@@ -242,7 +242,7 @@
+
+ # Patch list
+
+-ICEDTEA_PATCHES =
++ICEDTEA_PATCHES = patches/7085757-currency_data.patch
+
+ # Conditional patches
+
+diff -r 13b10ea1447c patches/7085757-currency_data.patch
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/7085757-currency_data.patch Sat Jan 03 16:53:45 2015 +0000
+@@ -0,0 +1,396 @@
++# HG changeset patch
++# User coffeys
++# Date 1412008618 -3600
++# Mon Sep 29 17:36:58 2014 +0100
++# Node ID 2f94c1a494f0aaad61626a7f901ddfbf57bd0199
++# Parent 993c08c0fcc7c6f404f708728679e6e707a95f8c
++7085757: Currency Data: ISO 4217 Amendment 152
++7195759: ISO 4217 Amendment 154
++8021121: ISO 4217 Amendment Number 156
++8055222: Currency update needed for ISO 4217 Amendment #159
++8006748: getISO3Country() returns wrong value
++7077119: remove past transition dates from CurrencyData.properties file
++7028073: The currency symbol for Peru is wrong
++Reviewed-by: naoto
++
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/java/util/CurrencyData.properties
++--- openjdk/jdk/src/share/classes/java/util/CurrencyData.properties Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/java/util/CurrencyData.properties Mon Sep 29 17:36:58 2014 +0100
++@@ -1,5 +1,5 @@
++ #
++-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+++# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ #
++ # This code is free software; you can redistribute it and/or modify it
++@@ -26,10 +26,9 @@
++ formatVersion=1
++
++ # Version of the currency code information in this class.
++-# It is a serial number that accompanies with each amendment, such as
++-# 'MAxxx.doc'
+++# It is a serial number that accompanies with each amendment.
++
++-dataVersion=151
+++dataVersion=159
++
++ # List of all valid ISO 4217 currency codes.
++ # To ensure compatibility, do not remove codes.
++@@ -49,11 +48,12 @@
++ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
++ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
++ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
++- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
+++ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
++ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\
++ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
++ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
++- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935
+++ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
+++ ZWN942-ZWR935
++
++
++ # Mappings from ISO 3166 country codes to ISO 4217 currency codes.
++@@ -71,7 +71,7 @@
++ #
++ # The table is based on the following web sites:
++ # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html
++-# http://www.bsi-global.com/iso4217currency
+++# http://www.currency-iso.org/iso_index/iso_tables.htm
++ # http://www.cia.gov/cia/publications/factbook/indexgeo.html
++
++ # AFGHANISTAN
++@@ -105,7 +105,7 @@
++ # AUSTRIA
++ AT=EUR
++ # AZERBAIJAN
++-AZ=AZM;2005-12-31-20-00-00;AZN
+++AZ=AZN
++ # BAHAMAS
++ BS=BSD
++ # BAHRAIN
++@@ -320,7 +320,7 @@
++ # LAO PEOPLE'S DEMOCRATIC REPUBLIC
++ LA=LAK
++ # LATVIA
++-LV=LVL
+++LV=LVL;2013-12-31-22-00-00;EUR
++ # LEBANON
++ LB=LBP
++ # LESOTHO
++@@ -332,7 +332,7 @@
++ # LIECHTENSTEIN
++ LI=CHF
++ # LITHUANIA
++-LT=LTL
+++LT=LTL;2014-12-31-22-00-00;EUR
++ # LUXEMBOURG
++ LU=EUR
++ # MACAU
++@@ -378,7 +378,7 @@
++ # MOROCCO
++ MA=MAD
++ # MOZAMBIQUE
++-MZ=MZM;2006-06-30-22-00-00;MZN
+++MZ=MZN
++ # MYANMAR
++ MM=MMK
++ # NAMIBIA
++@@ -440,7 +440,7 @@
++ # REUNION
++ RE=EUR
++ # ROMANIA
++-RO=ROL;2005-06-30-21-00-00;RON
+++RO=RON
++ # RUSSIAN FEDERATION
++ RU=RUB
++ # RWANDA
++@@ -463,6 +463,8 @@
++ WS=WST
++ # SAN MARINO
++ SM=EUR
+++# SOUTH SUDAN
+++SS=SSP
++ # SAO TOME AND PRINCIPE
++ ST=STD
++ # SAUDI ARABIA
++@@ -532,7 +534,7 @@
++ # TUNISIA
++ TN=TND
++ # TURKEY
++-TR=TRL;2004-12-31-22-00-00;TRY
+++TR=TRY
++ # TURKMENISTAN
++ TM=TMT
++ # TURKS AND CAICOS ISLANDS
++@@ -558,7 +560,7 @@
++ # VANUATU
++ VU=VUV
++ # VENEZUELA
++-VE=VEB;2008-01-01-04-00-00;VEF
+++VE=VEF
++ # VIET NAM
++ VN=VND
++ # VIRGIN ISLANDS, BRITISH
++@@ -572,7 +574,7 @@
++ # YEMEN
++ YE=YER
++ # ZAMBIA
++-ZM=ZMK
+++ZM=ZMW
++ # ZIMBABWE
++ ZW=ZWL
++
++@@ -583,7 +585,7 @@
++ minor0=\
++ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\
++ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\
++- TPE-TRL-VUV-XAF-XOF-XPF
+++ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF
++ minor1=
++ minor3=\
++ BHD-IQD-JOD-KWD-LYD-OMR-TND
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/java/util/LocaleISOData.java
++--- openjdk/jdk/src/share/classes/java/util/LocaleISOData.java Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/java/util/LocaleISOData.java Mon Sep 29 17:36:58 2014 +0100
++@@ -1,5 +1,5 @@
++ /*
++- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+++ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++@@ -433,6 +433,7 @@
++ + "SN" + "SEN" // Senegal, Republic of
++ + "SO" + "SOM" // Somalia, Somali Republic
++ + "SR" + "SUR" // Suriname, Republic of
+++ + "SS" + "SSD" // South Sudan
++ + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of
++ + "SV" + "SLV" // El Salvador, Republic of
++ + "SX" + "SXM" // Sint Maarten (Dutch part)
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames.properties
++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Mon Sep 29 17:36:58 2014 +0100
++@@ -1,5 +1,5 @@
++ #
++-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+++# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
++ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ #
++ # This code is free software; you can redistribute it and/or modify it
++@@ -26,7 +26,7 @@
++ #
++ # COPYRIGHT AND PERMISSION NOTICE
++ #
++-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+++# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
++ # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
++ #
++ # Permission is hereby granted, free of charge, to any person obtaining
++@@ -226,6 +226,7 @@
++ SOS=SOS
++ SRD=SRD
++ SRG=SRG
+++SSP=SSP
++ STD=STD
++ SVC=SVC
++ SYP=SYP
++@@ -277,6 +278,7 @@
++ YUM=YUM
++ ZAR=ZAR
++ ZMK=ZMK
+++ZMW=ZMW
++ ZWD=ZWD
++ ZWL=ZWL
++ ZWN=ZWN
++@@ -443,6 +445,7 @@
++ sos=Somali Shilling
++ srd=Surinamese Dollar
++ srg=Surinamese Guilder
+++ssp=South Sudanese Pound
++ std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
++ svc=Salvadoran Col\u00f3n
++ syp=Syrian Pound
++@@ -486,7 +489,9 @@
++ xpd=Palladium
++ xpf=CFP Franc
++ xpt=Platinum
+++xsu=Sucre
++ xts=Testing Currency Code
+++xua=ADB Unit of Account
++ xxx=Unknown Currency
++ yer=Yemeni Rial
++ yum=Yugoslavian New Dinar (1994-2002)
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties
++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Mon Sep 29 17:36:58 2014 +0100
++@@ -35,4 +35,4 @@
++ # This notice and attribution to Taligent may not be removed.
++ # Taligent is a registered trademark of Taligent, Inc.
++
++-PEN=S/
+++PEN=S/.
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties
++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Mon Sep 29 17:36:58 2014 +0100
++@@ -35,4 +35,5 @@
++ # This notice and attribution to Taligent may not be removed.
++ # Taligent is a registered trademark of Taligent, Inc.
++
+++EUR=\u20AC
++ LTL=Lt
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties
++--- openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Mon Sep 29 17:36:58 2014 +0100
++@@ -35,4 +35,5 @@
++ # This notice and attribution to Taligent may not be removed.
++ # Taligent is a registered trademark of Taligent, Inc.
++
+++EUR=\u20AC
++ LVL=Ls
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 src/share/classes/sun/util/resources/LocaleNames.properties
++--- openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/src/share/classes/sun/util/resources/LocaleNames.properties Mon Sep 29 17:36:58 2014 +0100
++@@ -1077,6 +1077,7 @@
++ SN=Senegal
++ SO=Somalia
++ SR=Suriname
+++SS=South Sudan
++ ST=Sao Tome And Principe
++ SV=El Salvador
++ SX=Sint Maarten (Dutch part)
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 test/java/util/Currency/ValidateISO4217.java
++--- openjdk/jdk/test/java/util/Currency/ValidateISO4217.java Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/test/java/util/Currency/ValidateISO4217.java Mon Sep 29 17:36:58 2014 +0100
++@@ -1,5 +1,5 @@
++ /*
++- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+++ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++@@ -22,7 +22,7 @@
++ */
++ /*
++ * @test
++- * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203
+++ * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
++ * @summary Validate ISO 4217 data for Currency class.
++ */
++
++@@ -92,7 +92,7 @@
++
++ /* Codes that are obsolete, do not have related country */
++ static final String otherCodes =
++- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR";
+++ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR";
++
++ static boolean err = false;
++
++diff -r 993c08c0fcc7 -r 2f94c1a494f0 test/java/util/Currency/tablea1.txt
++--- openjdk/jdk/test/java/util/Currency/tablea1.txt Fri Sep 27 13:06:47 2013 -0700
+++++ openjdk/jdk/test/java/util/Currency/tablea1.txt Mon Sep 29 17:36:58 2014 +0100
++@@ -1,12 +1,12 @@
++ #
++ #
++-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc
++-# (As of 7 April 2011)
+++# Amendments up until ISO 4217 AMENDMENT NUMBER 159
+++# (As of 15 August 2014)
++ #
++
++ # Version
++ FILEVERSION=1
++-DATAVERSION=151
+++DATAVERSION=159
++
++ # ISO 4217 currency data
++ AF AFN 971 2
++@@ -23,7 +23,7 @@
++ AU AUD 36 2
++ AT EUR 978 2
++ # MA 129
++-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2
+++AZ AZN 944 2
++ BS BSD 44 2
++ BH BHD 48 3
++ BD BDT 50 2
++@@ -96,7 +96,7 @@
++ GM GMD 270 2
++ GE GEL 981 2
++ DE EUR 978 2
++-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2
+++GH GHS 936 2
++ GI GIP 292 2
++ GR EUR 978 2
++ GL DKK 208 2
++@@ -135,14 +135,14 @@
++ KW KWD 414 3
++ KG KGS 417 2
++ LA LAK 418 2
++-LV LVL 428 2
+++LV LVL 428 2 2013-12-31-22-00-00 EUR 978 2
++ LB LBP 422 2
++ #LS ZAR 710 2
++ LS LSL 426 2
++ LR LRD 430 2
++ LY LYD 434 3
++ LI CHF 756 2
++-LT LTL 440 2
+++LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2
++ LU EUR 978 2
++ MO MOP 446 2
++ MK MKD 807 2
++@@ -166,7 +166,7 @@
++ MS XCD 951 2
++ MA MAD 504 2
++ # MA 130
++-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2
+++MZ MZN 943 2
++ MM MMK 104 2
++ # MA 134
++ ME EUR 978 2
++@@ -200,7 +200,7 @@
++ PR USD 840 2
++ QA QAR 634 2
++ RE EUR 978 2
++-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2
+++RO RON 946 2
++ RU RUB 643 2
++ RW RWF 646 0
++ SH SHP 654 2
++@@ -227,6 +227,7 @@
++ SB SBD 90 2
++ SO SOS 706 2
++ ZA ZAR 710 2
+++SS SSP 728 2
++ ES EUR 978 2
++ LK LKR 144 2
++ SD SDG 938 2
++@@ -255,7 +256,7 @@
++ TM TMT 934 2
++ TC USD 840 2
++ TV AUD 36 2
++-UG UGX 800 2
+++UG UGX 800 0
++ UA UAH 980 2
++ AE AED 784 2
++ GB GBP 826 2
++@@ -266,14 +267,14 @@
++ UY UYU 858 2
++ UZ UZS 860 2
++ VU VUV 548 0
++-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2
++-VN VND 704 2
+++VE VEF 937 2
+++VN VND 704 0
++ VG USD 840 2
++ VI USD 840 2
++ WF XPF 953 0
++ EH MAD 504 2
++ YE YER 886 2
++-ZM ZMK 894 2
+++ZM ZMW 967 2
++ ZW ZWL 932 2
++ #XAU XAU 959
++ #XBA XBA 955
diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
index 7fc0c77..18eea8f 100644
--- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.3.ebuild,v 1.1 2014/11/01 21:43:06 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -10,7 +10,7 @@
EAPI="5"
SLOT="7"
-inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+inherit autotools check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -197,6 +197,9 @@ java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
+
+ epatch "${FILESDIR}/7085757-currency_fix.patch"
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-25 1:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-10 22:10 [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2016-04-25 1:16 Andrew John Hughes
2016-02-22 14:53 Andrew John Hughes
2016-01-30 1:44 Andrew John Hughes
2015-05-26 17:35 Andrew John Hughes
2015-01-03 18:14 Andrew John Hughes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox