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_and...@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_and...@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_and...@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.and...@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_and...@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.and...@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}
}
