[gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/ - gentoo-commits

From:	Andrew John Hughes <gnu_andrew@××××××××××.org>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/
Date:	Mon, 22 Feb 2016 14:53:38
Message-Id:	`1456152775.eef0fd282eb8efb775a8ff87ec55a778346106bb.gnu_andrew@gentoo`

1

commit:     eef0fd282eb8efb775a8ff87ec55a778346106bb

2

Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>

3

AuthorDate: Mon Feb 22 14:52:55 2016 +0000

4

Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>

5

CommitDate: Mon Feb 22 14:52:55 2016 +0000

6

URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=eef0fd28

7

8

dev-java/icedtea: Bump to 3.0.0pre09.

9

10

Package-Manager: portage-2.2.27

11

12

 dev-java/icedtea/ChangeLog                         |  7 ++++

13

 dev-java/icedtea/Manifest                          | 16 ++++-----

14

 dev-java/icedtea/files/pr1983.patch                | 41 ----------------------

15

 dev-java/icedtea/files/pr2804.patch                | 41 ----------------------

16

 dev-java/icedtea/files/pr2825.patch                | 12 -------

17

 ...0.0_pre08.ebuild => icedtea-3.0.0_pre09.ebuild} | 23 +++++-------

18

 dev-java/icedtea/metadata.xml                      | 14 +++++---

19

 7 files changed, 33 insertions(+), 121 deletions(-)

20

21

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog

22

index 4eb9cca..cdef374 100644

23

--- a/dev-java/icedtea/ChangeLog

24

+++ b/dev-java/icedtea/ChangeLog

25

@@ -2,6 +2,13 @@

26

 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2

27

 # $Header: $

28

29

+*icedtea-3.0.0_pre09 (22 Feb 2016)

30

+

31

+  22 Feb 2016; Andrew John Hughes <gnu_andrew@××××××××××.org>

32

+  +icedtea-3.0.0_pre09.ebuild, -files/pr1983.patch, -files/pr2804.patch,

33

+  -files/pr2825.patch, -icedtea-3.0.0_pre08.ebuild, metadata.xml:

34

+  dev-java/icedtea: Bump to 3.0.0pre09.

35

+

36

 *icedtea-3.0.0_pre08 (30 Jan 2016)

37

38

   30 Jan 2016; Andrew John Hughes <gnu_andrew@××××××××××.org>

39

40

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest

41

index b9f3c63..72fee78 100644

42

--- a/dev-java/icedtea/Manifest

43

+++ b/dev-java/icedtea/Manifest

44

@@ -13,14 +13,14 @@ DIST icedtea-2.7-jaxws-299588405837.tar.bz2 2022135 SHA256 816a6d7a4bd302871d73f

45

 DIST icedtea-2.7-jdk-2db5e90a399b.tar.bz2 32380031 SHA256 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c SHA512 f31bd7c08577b0f222e9c65538837c41a7d5f90d15738dc536fa105041d920cff05b5a7b39aa59ab04452a6c34f59e6e8ebcecc66194d6a466ced07ec24a8c76 WHIRLPOOL f78ef4ac0f43052066d0ed762b20017bbfd8567c177caac782a48fb88ef30b0447d29be3fe79663a9babe3470ca3c63e948e0b0c53b057313a42bc8f306476f8

46

 DIST icedtea-2.7-langtools-bc95d2472055.tar.bz2 1709785 SHA256 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661 SHA512 2a3a3c84be06c38ed6f0d861cf45099f24adb9fa2d958be8749b2a1821a91b17a81fc1a4ec21af575c6ee9a02ee9318751c9f12b438894e033c0accff5ece5a3 WHIRLPOOL a5b0a5509a5f499f41c8d06eb6d45c88737d78be48bebaa84f87511b6090bd9b414cf1b2698a4df1516d073df82037eb53e9eb04066f84bafbe7a57b6fcb3f42

47

 DIST icedtea-2.7-openjdk-dbfa75121aca.tar.bz2 129557 SHA256 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b SHA512 0847cb7982373ce9277a089e4f165de6ab4f335d5a7ca6dcfee79c356f402bbbb3c392ef5266b2257a40f8b79775ce2f2d8f99415d81b70a101e1e439c048747 WHIRLPOOL 0851e56d4b71290a557133c8f1cda53c5b3e6ee99d79be11385eb38db346207471afadf201d99291e2aaa9ad1dcb5e8ad7f4a7750820522960908268d7726049

48

-DIST icedtea-3.0-corba-ebc2780ebeb3.tar.xz 934340 SHA256 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66 SHA512 7eee8526ec3bdb870ccaf0af47aafe2d5a13ef96979e7a9c1570994faf4fb5f68b357609862308f7b47920a7b7d37db21f76883828eeb8631f28f343c90e5e84 WHIRLPOOL e4526febfffed1a3386440d1010f24805cafe16a13087860d1b2fb36e5507018a259f96cd3b3cddffdae482ba2edc16ff6d71d19ccfeffaeae3768286a249fd8

49

-DIST icedtea-3.0-hotspot-c313c4782bb3.tar.xz 6745716 SHA256 c876cd97bca74e2970161688eb3e388675ebce3ebc4a34bedfb6bec3bb8e9cab SHA512 884ac002d33ff683051119902186aa4b768488cb4058ec1e5a70a3bd9fc766690caff5007d653e742187138ba862f8ab3a2df61e8e4a359207b7f8255bfff818 WHIRLPOOL 5ecad3eab8e6769e0e463648f11c0a3a861cee47791278ff47547effddd0105763e928bedb9f7d31cb5f782a35f8500cf9d2eafa9a9209bb78001d4b441ca17d

50

-DIST icedtea-3.0-jaxp-ac52a8eed353.tar.xz 2295656 SHA256 e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b SHA512 dad8d7a90143589cb04a2d734e16b90578dcded64463f43676d772411885ffa89b8b0fe7b96ccff98d07e4d412e96fa417ab243a972215a285bf4707ac0139e3 WHIRLPOOL 3580ca7d0d2ea65f3e8e9b47bc9a1821b80ddbd5e39b0a77746c2e1cda094336d9d84c310ea20d9933f84e3fd596dc744c142bca9b51f9e04ba42e1551ca96da

51

-DIST icedtea-3.0-jaxws-26a1fdce80b7.tar.xz 2264108 SHA256 be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2 SHA512 380eb8bfded1628a98f8d3dc70e5823a460eba7a45c5bd8ea96f8a057b8da6793d40e93af1ffe868c6d7403eb84f5558af09b2df3e4c219ecf18ba9c206d8bb5 WHIRLPOOL 980c2b157733937282cd00b75aba60d2ec255604c591f4319f0f0bf0987574d5cb8187fc14c16a4beb2c3e6ec200810c7a202d2956ef626e493ed3360e8f83fa

52

-DIST icedtea-3.0-jdk-809d98eeda49.tar.xz 38237376 SHA256 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25 SHA512 3b12ce3488e13c8b79a516f5f4bfd4b799959e984560885648e12155f6295fb7ac5dff04269876edab112710a34784d7e1f4898cd703caa12aecf132ef20017b WHIRLPOOL 909744010c015ae4fd1e6ff6d16136c3ef522f26642109fe47b0b094b4e4d7cdf946bb0e950a31a1685d1eac923f1b6049805c6d40f6d8f3aebef657d57f2343

53

-DIST icedtea-3.0-langtools-0d3479e0bac6.tar.xz 2050684 SHA256 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86 SHA512 f04b24e4c091e1665fe0e9b0de1cfa7824bf300d5a6c2b085ea4aa30dd808fdc945f83cef69e074a6885979fca170d809147b5a48f2573d3f0d38628c87554bd WHIRLPOOL 3af7c2bc02b7140feb3552b55f2e4b21edf1885b7b6a9f9b29d53f2547f6bed8356c1b65ca267f3f6bd2b4a79cdcfaed8eab84e6b654b71e32d74b17a46ef2e8

54

-DIST icedtea-3.0-nashorn-7babac6e7ecf.tar.xz 2200204 SHA256 b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150 SHA512 8321076c910819b8ad183ede286d0f4dc438944fce4a5f737c8b379331b24e08bd7f24730dabaa7b2a6d3a32862f0c31cdf99044e6980fa89ab638728f7b07d3 WHIRLPOOL bede2f9150842f6baaa0af45ff2103b60d97c60b36656b2e4560c47aceb0728193d2e626d772ee69bb4a9945450b41ebdc93054418e045a98b74c6cc7681ac16

55

-DIST icedtea-3.0-openjdk-f0635543beb3.tar.xz 328764 SHA256 fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8 SHA512 aa0d6c976b6e13b9513fb1f6e53cbc7f980c7bad4dfaccb213abf520a15bbbf0cdf37c17924c56e3d630cf2033886e4e0d401e5b211a5e45eeb734d62bdabbbf WHIRLPOOL c91e68bbfcc4424be095b852b10aa889383be1936611539a00a7d59e45ad5d6b5b51ed642f810d5bf457a50772a155c5fb96085b62f9b27103a0044eca7786f6

56

+DIST icedtea-3.0-corba-834cf5ee24b3.tar.xz 936596 SHA256 883a4ce631d9587efdca8b45e1fb5fddc9cf993fa6cb7a56b80c4095bac951b7 SHA512 75c6e97eda86eff93c66cc06058e0603336f98e1c080abbbbe6fe695af7fa0d95f9df0c607f5e1d4622185d631f8ffb3d9959667cf3744763c06d92f158b7f0d WHIRLPOOL f0696a0a57d28f1d3be99ee2a776d8447262ea130273cef1f6a888a233d33bba104b2dee05b9be33f0553da9059debf150e4226eedc8e73fef76df2022f041a7

57

+DIST icedtea-3.0-hotspot-dbf85d44da89.tar.xz 6748520 SHA256 f84673a0cd41131b86280173c268521152086570ad2c7702034552d5848f4bea SHA512 db6cfcbe141d656233571a7c64b2d70c9b707a0721b051cee7c2f2066b6661458c67668379bde2f811b5c255afddef8aa320e850a6a45c93f0ed429c9612ab84 WHIRLPOOL 565e935f44ecd9304f0b5cf981cac26a2a53e71e79147a7d99b8fece389a4c46828044cc2294fd852b672f8f5156d8fea4bf8aaa50a4a91adce996ced743d136

58

+DIST icedtea-3.0-jaxp-6527813420de.tar.xz 2295820 SHA256 59df142c58ccd0fd081e7533c19fabd708c9617818c09d62dcca55cc9ef1514c SHA512 a8c0803c57ae4b831795954aec0121b856d4186c57b2641ae8ff9a3dc3f0eab7ef922fb661e0fa519f13accacabab508c99b5de932c4cc62271f62b64b21767c WHIRLPOOL a9a3eb62a04fd75eabbc8e31f441d679fd7e15de75c7323b9a5c0ba9459dd485199b339ecdf008825f4913610a97dc86b6360edfa2953c8aefff967ae3489344

59

+DIST icedtea-3.0-jaxws-2ceaeebc6760.tar.xz 2265888 SHA256 f3ad0fe6d232faab9d6b5ec3d048734af1add9d9e625c254e0ecc86e2287b977 SHA512 0496264c680c0a9cb9ac050df00f550c9e300d6dee86da582037561598ef331e1eb25cb28822db028a08afe2844521a53b5174df524c2867f3f1d49c034488d3 WHIRLPOOL c0e254298a5d05d8e04777fb1b9bc9af859ecde49412887e5ae6656b83fa02f7f9ad31383d1947edb2b964a9d5693c5b15233a1365d205b1dd3a123f8a06b393

60

+DIST icedtea-3.0-jdk-dfad9b612327.tar.xz 38255436 SHA256 4b61c2ed76141091a83376793d344f3e7c84b9742eb39773c3df394eb50b9869 SHA512 3c048dece3c14101528ee44f133b085d074365cfc27c94340568ab655730390f42309564e7a3c0d67e8e4f8bed7199af6ffde61130a1288829b025422944fbc9 WHIRLPOOL e41b4e04ea1ed0042ce5994e0d7a3167008a4dce6aa0642fa1e78d328b58a14c93f992ff79cad25cf077d88a0d047fba6088bcd4c970815a63e39ba4d40113be

61

+DIST icedtea-3.0-langtools-076ec0ef64f0.tar.xz 2055592 SHA256 c1e5fe95f85536b924af3c6178678f2c540225b21f6d8493a37ef4793fea1e6f SHA512 ccd7d9ce1959f48b91b9c8ebfd6afa55759bfe2f392e89c59aadde1378675c7d1b4662e2a7d350f9eb0c2f980ee9ae4f82dc09a7465f558ff9d02e03701b6db7 WHIRLPOOL db475d7c86e8c32e9435fa4c3787c51b66c6a90d173098b75954c19a565a53562951f24c944136111a8d1f624b0e066e1c0b2822a35a67f3efa1b4030a263374

62

+DIST icedtea-3.0-nashorn-bbc1966c6af9.tar.xz 2219032 SHA256 753700234e82a16911934019e5a897709a7b75f0bd9e847da9949f0d2a5a9831 SHA512 d4022aa1bdccb6a5ac20d6fab84eb4d13f6d72f41dc5dc38f26eb333875791781b03b9bcab98d41dc4482c8603a46a16dcd6cf434016aca5283ab03b76b39878 WHIRLPOOL 0b8189b45cd1f12c489df0daa876a753410491b1f10ab2bc440a02b55f194f1c227bf3a6e7539a57573b9e45ee5e410dcd615ac673c30060688cd99acb421ee8

63

+DIST icedtea-3.0-openjdk-a358b13af298.tar.xz 329880 SHA256 fac06481d2b27f01524141c4e4ed64ecf60842bb634f8b83c33644b796a1a5f4 SHA512 bf6c9a66d957487dda8ac366e974b165102faac85f5b8fede75f8905e9615cc3d621f463a298c2e9f4e12a13019e0e52ba42fb4bce200d060c59be4a3c9e13b4 WHIRLPOOL 9e188e22d41089d0e8ef14199b6b91a783f968736c9fbe13f7393fa7e64d4b6d34f4ad2542e2061d0ea1e8c5497d9ee2e75da3a95714f09187e496da3e84064a

64

 DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3

65

 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4

66

 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0

67

68

diff --git a/dev-java/icedtea/files/pr1983.patch b/dev-java/icedtea/files/pr1983.patch

69

deleted file mode 100644

70

index 425bd6f..0000000

71

--- a/dev-java/icedtea/files/pr1983.patch

72

+++ /dev/null

73

@@ -1,41 +0,0 @@

74

-# HG changeset patch

75

-# User Andrew John Hughes <gnu_andrew@××××××××××.org>

76

-# Date 1454117106 0

77

-#      Sat Jan 30 01:25:06 2016 +0000

78

-# Node ID 130888a5c7134f73540323d45f64e2e7372c4a01

79

-# Parent  e4660f6210fa312c8392ab2be79f85bb86673a85

80

-PR1983: Support using the system installation of NSS with the SunEC provider

81

-

82

-2016-01-29  Andrew John Hughes  <gnu.andrew@××××××××××.org>

83

-

84

-	PR1983: Support using the system installation

85

-	of NSS with the SunEC provider

86

-	* Makefile.am:

87

-	(check-ecc): Make argument dependent on whether

88

-	the SunEC provider is enabled or not.

89

-

90

-diff -r e4660f6210fa -r 130888a5c713 Makefile.am

91

---- a/Makefile.am	Sat Jan 30 01:15:16 2016 +0000

92

-+++ b/Makefile.am	Sat Jan 30 01:25:06 2016 +0000

93

-@@ -209,6 +209,12 @@

94

- TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))

95

- endif

96

-

97

-+if ENABLE_SUNEC

98

-+ECC_RESULT = yes

99

-+else

100

-+ECC_RESULT = no

101

-+endif

102

-+

103

- # Target to ensure a patched OpenJDK tree containing Zero & Shark

104

- # and any overlays is available in $(abs_top_builddir)/openjdk

105

- OPENJDK_TREE = stamps/overlay.stamp

106

-@@ -2367,7 +2373,7 @@

107

-

108

- stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp

109

- 	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \

110

--	  $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport no ; \

111

-+	  $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \

112

- 	fi

113

- 	mkdir -p stamps

114

- 	touch $@

115

116

diff --git a/dev-java/icedtea/files/pr2804.patch b/dev-java/icedtea/files/pr2804.patch

117

deleted file mode 100644

118

index cebda48..0000000

119

--- a/dev-java/icedtea/files/pr2804.patch

120

+++ /dev/null

121

@@ -1,41 +0,0 @@

122

-# HG changeset patch

123

-# User Andrew John Hughes <gnu_andrew@××××××××××.org>

124

-# Date 1454116428 0

125

-#      Sat Jan 30 01:13:48 2016 +0000

126

-# Node ID 48e97835c60091a6cf69053ba2d6c38b51d368e3

127

-# Parent  b88b516766014824885b6559621ff89e5b714547

128

-PR2804: test/tapset/jstaptest.pl should be executable

129

-

130

-2016-01-29  Andrew John Hughes  <gnu.andrew@××××××××××.org>

131

-

132

-	PR2804: test/tapset/jstaptest.pl should be executable

133

-	* Makefile.am:

134

-	(check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR

135

-	as mentioned in previous commit.

136

-	* test/tapset/jstaptest.pl: Fix capitalisation of

137

-	"IcedTea".

138

-

139

-diff -r b88b51676601 -r 48e97835c600 Makefile.am

140

---- a/Makefile.am	Sat Jan 30 01:10:54 2016 +0000

141

-+++ b/Makefile.am	Sat Jan 30 01:13:48 2016 +0000

142

-@@ -2327,7 +2327,7 @@

143

- 	  echo "ERROR: Perl not found"; exit -1; \

144

- 	fi

145

- 	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \

146

--	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \

147

-+	  -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \

148

- 	  -S $(abs_top_srcdir)/test/tapset \

149

- 	  -a test/check-stap.log -j

150

- endif

151

-diff -r b88b51676601 -r 48e97835c600 test/tapset/jstaptest.pl

152

---- a/test/tapset/jstaptest.pl	Sat Jan 30 01:10:54 2016 +0000

153

-+++ b/test/tapset/jstaptest.pl	Sat Jan 30 01:13:48 2016 +0000

154

-@@ -597,7 +597,7 @@

155

-                 || ($opt_p && $opt_j)); # -p and -j are mutually exclusive.

156

-     if ($opt_B && $opt_A) {

157

-         die "Directory $opt_B not found." unless (-d $opt_B);

158

--        die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding Icedtea with systemtap support.\n"

159

-+        die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding IcedTea with systemtap support.\n"

160

-                 unless (-d "$opt_B/j2sdk-image/tapset");

161

-         push(@tapset_dirs, "-I$opt_B/j2sdk-image/tapset");

162

-         set_java_vars("$opt_B/j2sdk-image", $opt_A);

163

164

diff --git a/dev-java/icedtea/files/pr2825.patch b/dev-java/icedtea/files/pr2825.patch

165

deleted file mode 100644

166

index 510217a..0000000

167

--- a/dev-java/icedtea/files/pr2825.patch

168

+++ /dev/null

169

@@ -1,12 +0,0 @@

170

-diff -r 0883b7a8311a acinclude.m4

171

---- a/acinclude.m4	Fri Jan 29 22:47:27 2016 +0000

172

-+++ b/acinclude.m4	Fri Jan 29 23:24:48 2016 +0000

173

-@@ -1969,7 +1969,7 @@

174

-     PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])

175

-     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then

176

-       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;

177

--      SUNEC_LIBS="$NSS_LIBS -lfreebl";

178

-+      SUNEC_LIBS="-lfreebl $NSS_LIBS";

179

-    elif test "x${NSS_JAVA_FOUND}" = "xyes"; then

180

-       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";

181

-       SUNEC_LIBS=$NSS_JAVA_LIBS;

182

183

diff --git a/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild

184

similarity index 95%

185

rename from dev-java/icedtea/icedtea-3.0.0_pre08.ebuild

186

rename to dev-java/icedtea/icedtea-3.0.0_pre09.ebuild

187

index be8af53..f1f5763 100644

188

--- a/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild

189

+++ b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild

190

@@ -16,14 +16,14 @@ ICEDTEA_VER=$(get_version_component_range 1-3)

191

 ICEDTEA_BRANCH=$(get_version_component_range 1-2)

192

 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}

193

 ICEDTEA_PRE=$(get_version_component_range _)

194

-CORBA_TARBALL="ebc2780ebeb3.tar.xz"

195

-JAXP_TARBALL="ac52a8eed353.tar.xz"

196

-JAXWS_TARBALL="26a1fdce80b7.tar.xz"

197

-JDK_TARBALL="809d98eeda49.tar.xz"

198

-LANGTOOLS_TARBALL="0d3479e0bac6.tar.xz"

199

-OPENJDK_TARBALL="f0635543beb3.tar.xz"

200

-NASHORN_TARBALL="7babac6e7ecf.tar.xz"

201

-HOTSPOT_TARBALL="c313c4782bb3.tar.xz"

202

+CORBA_TARBALL="834cf5ee24b3.tar.xz"

203

+JAXP_TARBALL="6527813420de.tar.xz"

204

+JAXWS_TARBALL="2ceaeebc6760.tar.xz"

205

+JDK_TARBALL="dfad9b612327.tar.xz"

206

+LANGTOOLS_TARBALL="076ec0ef64f0.tar.xz"

207

+OPENJDK_TARBALL="a358b13af298.tar.xz"

208

+NASHORN_TARBALL="bbc1966c6af9.tar.xz"

209

+HOTSPOT_TARBALL="dbf85d44da89.tar.xz"

210

211

 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"

212

 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"

213

@@ -200,13 +200,6 @@ java_prepare() {

214

 	# icedtea doesn't like some locales. #330433 #389717

215

 	export LANG="C" LC_ALL="C"

216

217

-	# Fix issue with ordering of NSS libraries and bfd linker

218

-	epatch "${FILESDIR}/pr2825.patch"

219

-	# Fix location of JDK image used by check-tapset-jstack

220

-	epatch "${FILESDIR}/pr2804.patch"

221

-	# Fix setting of ECC test, depending on whether SunEC is enabled or not

222

-	epatch "${FILESDIR}/pr1983.patch"

223

-

224

 	eautoreconf

225

}

226

227

228

diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml

229

index 83663b2..b5480c2 100644

230

--- a/dev-java/icedtea/metadata.xml

231

+++ b/dev-java/icedtea/metadata.xml

232

@@ -1,18 +1,24 @@

233

 <?xml version="1.0" encoding="UTF-8"?>

234

 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

235

 <pkgmetadata>

236

-<herd>java</herd>

237

-<herd>proxy-maintainers</herd>

238

-<maintainer>

239

+<maintainer type="person">

240

   <email>gnu_andrew@××××××××××.org</email>

241

   <name>Andrew John Hughes</name>

242

   <description>Proxy Maintainer</description>

243

 </maintainer>

244

-<maintainer>

245

+<maintainer type="person">

246

   <email>chewi@g.o</email>

247

   <name>James Le Cuirot</name>

248

   <description>Committer</description>

249

 </maintainer>

250

+<maintainer type="project">

251

+  <email>java@g.o</email>

252

+  <name>Java</name>

253

+</maintainer>

254

+<maintainer type="project">

255

+  <email>proxy-maint@g.o</email>

256

+  <name>Proxy Maintainers</name>

257

+</maintainer>

258

 <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>

259

 <use>

260

   <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>

1	commit: eef0fd282eb8efb775a8ff87ec55a778346106bb
2	Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
3	AuthorDate: Mon Feb 22 14:52:55 2016 +0000
4	Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
5	CommitDate: Mon Feb 22 14:52:55 2016 +0000
6	URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=eef0fd28
7
8	dev-java/icedtea: Bump to 3.0.0pre09.
9
10	Package-Manager: portage-2.2.27
11
12	dev-java/icedtea/ChangeLog \| 7 ++++
13	dev-java/icedtea/Manifest \| 16 ++++-----
14	dev-java/icedtea/files/pr1983.patch \| 41 ----------------------
15	dev-java/icedtea/files/pr2804.patch \| 41 ----------------------
16	dev-java/icedtea/files/pr2825.patch \| 12 -------
17	...0.0_pre08.ebuild => icedtea-3.0.0_pre09.ebuild} \| 23 +++++-------
18	dev-java/icedtea/metadata.xml \| 14 +++++---
19	7 files changed, 33 insertions(+), 121 deletions(-)
20
21	diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
22	index 4eb9cca..cdef374 100644
23	--- a/dev-java/icedtea/ChangeLog
24	+++ b/dev-java/icedtea/ChangeLog
25	@@ -2,6 +2,13 @@
26	# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
27	# $Header: $
28
29	+*icedtea-3.0.0_pre09 (22 Feb 2016)
30	+
31	+ 22 Feb 2016; Andrew John Hughes <gnu_andrew@××××××××××.org>
32	+ +icedtea-3.0.0_pre09.ebuild, -files/pr1983.patch, -files/pr2804.patch,
33	+ -files/pr2825.patch, -icedtea-3.0.0_pre08.ebuild, metadata.xml:
34	+ dev-java/icedtea: Bump to 3.0.0pre09.
35	+
36	*icedtea-3.0.0_pre08 (30 Jan 2016)
37
38	30 Jan 2016; Andrew John Hughes <gnu_andrew@××××××××××.org>
39
40	diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
41	index b9f3c63..72fee78 100644
42	--- a/dev-java/icedtea/Manifest
43	+++ b/dev-java/icedtea/Manifest
44	@@ -13,14 +13,14 @@ DIST icedtea-2.7-jaxws-299588405837.tar.bz2 2022135 SHA256 816a6d7a4bd302871d73f
45	DIST icedtea-2.7-jdk-2db5e90a399b.tar.bz2 32380031 SHA256 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c SHA512 f31bd7c08577b0f222e9c65538837c41a7d5f90d15738dc536fa105041d920cff05b5a7b39aa59ab04452a6c34f59e6e8ebcecc66194d6a466ced07ec24a8c76 WHIRLPOOL f78ef4ac0f43052066d0ed762b20017bbfd8567c177caac782a48fb88ef30b0447d29be3fe79663a9babe3470ca3c63e948e0b0c53b057313a42bc8f306476f8
46	DIST icedtea-2.7-langtools-bc95d2472055.tar.bz2 1709785 SHA256 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661 SHA512 2a3a3c84be06c38ed6f0d861cf45099f24adb9fa2d958be8749b2a1821a91b17a81fc1a4ec21af575c6ee9a02ee9318751c9f12b438894e033c0accff5ece5a3 WHIRLPOOL a5b0a5509a5f499f41c8d06eb6d45c88737d78be48bebaa84f87511b6090bd9b414cf1b2698a4df1516d073df82037eb53e9eb04066f84bafbe7a57b6fcb3f42
47	DIST icedtea-2.7-openjdk-dbfa75121aca.tar.bz2 129557 SHA256 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b SHA512 0847cb7982373ce9277a089e4f165de6ab4f335d5a7ca6dcfee79c356f402bbbb3c392ef5266b2257a40f8b79775ce2f2d8f99415d81b70a101e1e439c048747 WHIRLPOOL 0851e56d4b71290a557133c8f1cda53c5b3e6ee99d79be11385eb38db346207471afadf201d99291e2aaa9ad1dcb5e8ad7f4a7750820522960908268d7726049
48	-DIST icedtea-3.0-corba-ebc2780ebeb3.tar.xz 934340 SHA256 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66 SHA512 7eee8526ec3bdb870ccaf0af47aafe2d5a13ef96979e7a9c1570994faf4fb5f68b357609862308f7b47920a7b7d37db21f76883828eeb8631f28f343c90e5e84 WHIRLPOOL e4526febfffed1a3386440d1010f24805cafe16a13087860d1b2fb36e5507018a259f96cd3b3cddffdae482ba2edc16ff6d71d19ccfeffaeae3768286a249fd8
49	-DIST icedtea-3.0-hotspot-c313c4782bb3.tar.xz 6745716 SHA256 c876cd97bca74e2970161688eb3e388675ebce3ebc4a34bedfb6bec3bb8e9cab SHA512 884ac002d33ff683051119902186aa4b768488cb4058ec1e5a70a3bd9fc766690caff5007d653e742187138ba862f8ab3a2df61e8e4a359207b7f8255bfff818 WHIRLPOOL 5ecad3eab8e6769e0e463648f11c0a3a861cee47791278ff47547effddd0105763e928bedb9f7d31cb5f782a35f8500cf9d2eafa9a9209bb78001d4b441ca17d
50	-DIST icedtea-3.0-jaxp-ac52a8eed353.tar.xz 2295656 SHA256 e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b SHA512 dad8d7a90143589cb04a2d734e16b90578dcded64463f43676d772411885ffa89b8b0fe7b96ccff98d07e4d412e96fa417ab243a972215a285bf4707ac0139e3 WHIRLPOOL 3580ca7d0d2ea65f3e8e9b47bc9a1821b80ddbd5e39b0a77746c2e1cda094336d9d84c310ea20d9933f84e3fd596dc744c142bca9b51f9e04ba42e1551ca96da
51	-DIST icedtea-3.0-jaxws-26a1fdce80b7.tar.xz 2264108 SHA256 be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2 SHA512 380eb8bfded1628a98f8d3dc70e5823a460eba7a45c5bd8ea96f8a057b8da6793d40e93af1ffe868c6d7403eb84f5558af09b2df3e4c219ecf18ba9c206d8bb5 WHIRLPOOL 980c2b157733937282cd00b75aba60d2ec255604c591f4319f0f0bf0987574d5cb8187fc14c16a4beb2c3e6ec200810c7a202d2956ef626e493ed3360e8f83fa
52	-DIST icedtea-3.0-jdk-809d98eeda49.tar.xz 38237376 SHA256 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25 SHA512 3b12ce3488e13c8b79a516f5f4bfd4b799959e984560885648e12155f6295fb7ac5dff04269876edab112710a34784d7e1f4898cd703caa12aecf132ef20017b WHIRLPOOL 909744010c015ae4fd1e6ff6d16136c3ef522f26642109fe47b0b094b4e4d7cdf946bb0e950a31a1685d1eac923f1b6049805c6d40f6d8f3aebef657d57f2343
53	-DIST icedtea-3.0-langtools-0d3479e0bac6.tar.xz 2050684 SHA256 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86 SHA512 f04b24e4c091e1665fe0e9b0de1cfa7824bf300d5a6c2b085ea4aa30dd808fdc945f83cef69e074a6885979fca170d809147b5a48f2573d3f0d38628c87554bd WHIRLPOOL 3af7c2bc02b7140feb3552b55f2e4b21edf1885b7b6a9f9b29d53f2547f6bed8356c1b65ca267f3f6bd2b4a79cdcfaed8eab84e6b654b71e32d74b17a46ef2e8
54	-DIST icedtea-3.0-nashorn-7babac6e7ecf.tar.xz 2200204 SHA256 b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150 SHA512 8321076c910819b8ad183ede286d0f4dc438944fce4a5f737c8b379331b24e08bd7f24730dabaa7b2a6d3a32862f0c31cdf99044e6980fa89ab638728f7b07d3 WHIRLPOOL bede2f9150842f6baaa0af45ff2103b60d97c60b36656b2e4560c47aceb0728193d2e626d772ee69bb4a9945450b41ebdc93054418e045a98b74c6cc7681ac16
55	-DIST icedtea-3.0-openjdk-f0635543beb3.tar.xz 328764 SHA256 fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8 SHA512 aa0d6c976b6e13b9513fb1f6e53cbc7f980c7bad4dfaccb213abf520a15bbbf0cdf37c17924c56e3d630cf2033886e4e0d401e5b211a5e45eeb734d62bdabbbf WHIRLPOOL c91e68bbfcc4424be095b852b10aa889383be1936611539a00a7d59e45ad5d6b5b51ed642f810d5bf457a50772a155c5fb96085b62f9b27103a0044eca7786f6
56	+DIST icedtea-3.0-corba-834cf5ee24b3.tar.xz 936596 SHA256 883a4ce631d9587efdca8b45e1fb5fddc9cf993fa6cb7a56b80c4095bac951b7 SHA512 75c6e97eda86eff93c66cc06058e0603336f98e1c080abbbbe6fe695af7fa0d95f9df0c607f5e1d4622185d631f8ffb3d9959667cf3744763c06d92f158b7f0d WHIRLPOOL f0696a0a57d28f1d3be99ee2a776d8447262ea130273cef1f6a888a233d33bba104b2dee05b9be33f0553da9059debf150e4226eedc8e73fef76df2022f041a7
57	+DIST icedtea-3.0-hotspot-dbf85d44da89.tar.xz 6748520 SHA256 f84673a0cd41131b86280173c268521152086570ad2c7702034552d5848f4bea SHA512 db6cfcbe141d656233571a7c64b2d70c9b707a0721b051cee7c2f2066b6661458c67668379bde2f811b5c255afddef8aa320e850a6a45c93f0ed429c9612ab84 WHIRLPOOL 565e935f44ecd9304f0b5cf981cac26a2a53e71e79147a7d99b8fece389a4c46828044cc2294fd852b672f8f5156d8fea4bf8aaa50a4a91adce996ced743d136
58	+DIST icedtea-3.0-jaxp-6527813420de.tar.xz 2295820 SHA256 59df142c58ccd0fd081e7533c19fabd708c9617818c09d62dcca55cc9ef1514c SHA512 a8c0803c57ae4b831795954aec0121b856d4186c57b2641ae8ff9a3dc3f0eab7ef922fb661e0fa519f13accacabab508c99b5de932c4cc62271f62b64b21767c WHIRLPOOL a9a3eb62a04fd75eabbc8e31f441d679fd7e15de75c7323b9a5c0ba9459dd485199b339ecdf008825f4913610a97dc86b6360edfa2953c8aefff967ae3489344
59	+DIST icedtea-3.0-jaxws-2ceaeebc6760.tar.xz 2265888 SHA256 f3ad0fe6d232faab9d6b5ec3d048734af1add9d9e625c254e0ecc86e2287b977 SHA512 0496264c680c0a9cb9ac050df00f550c9e300d6dee86da582037561598ef331e1eb25cb28822db028a08afe2844521a53b5174df524c2867f3f1d49c034488d3 WHIRLPOOL c0e254298a5d05d8e04777fb1b9bc9af859ecde49412887e5ae6656b83fa02f7f9ad31383d1947edb2b964a9d5693c5b15233a1365d205b1dd3a123f8a06b393
60	+DIST icedtea-3.0-jdk-dfad9b612327.tar.xz 38255436 SHA256 4b61c2ed76141091a83376793d344f3e7c84b9742eb39773c3df394eb50b9869 SHA512 3c048dece3c14101528ee44f133b085d074365cfc27c94340568ab655730390f42309564e7a3c0d67e8e4f8bed7199af6ffde61130a1288829b025422944fbc9 WHIRLPOOL e41b4e04ea1ed0042ce5994e0d7a3167008a4dce6aa0642fa1e78d328b58a14c93f992ff79cad25cf077d88a0d047fba6088bcd4c970815a63e39ba4d40113be
61	+DIST icedtea-3.0-langtools-076ec0ef64f0.tar.xz 2055592 SHA256 c1e5fe95f85536b924af3c6178678f2c540225b21f6d8493a37ef4793fea1e6f SHA512 ccd7d9ce1959f48b91b9c8ebfd6afa55759bfe2f392e89c59aadde1378675c7d1b4662e2a7d350f9eb0c2f980ee9ae4f82dc09a7465f558ff9d02e03701b6db7 WHIRLPOOL db475d7c86e8c32e9435fa4c3787c51b66c6a90d173098b75954c19a565a53562951f24c944136111a8d1f624b0e066e1c0b2822a35a67f3efa1b4030a263374
62	+DIST icedtea-3.0-nashorn-bbc1966c6af9.tar.xz 2219032 SHA256 753700234e82a16911934019e5a897709a7b75f0bd9e847da9949f0d2a5a9831 SHA512 d4022aa1bdccb6a5ac20d6fab84eb4d13f6d72f41dc5dc38f26eb333875791781b03b9bcab98d41dc4482c8603a46a16dcd6cf434016aca5283ab03b76b39878 WHIRLPOOL 0b8189b45cd1f12c489df0daa876a753410491b1f10ab2bc440a02b55f194f1c227bf3a6e7539a57573b9e45ee5e410dcd615ac673c30060688cd99acb421ee8
63	+DIST icedtea-3.0-openjdk-a358b13af298.tar.xz 329880 SHA256 fac06481d2b27f01524141c4e4ed64ecf60842bb634f8b83c33644b796a1a5f4 SHA512 bf6c9a66d957487dda8ac366e974b165102faac85f5b8fede75f8905e9615cc3d621f463a298c2e9f4e12a13019e0e52ba42fb4bce200d060c59be4a3c9e13b4 WHIRLPOOL 9e188e22d41089d0e8ef14199b6b91a783f968736c9fbe13f7393fa7e64d4b6d34f4ad2542e2061d0ea1e8c5497d9ee2e75da3a95714f09187e496da3e84064a
64	DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
65	DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
66	DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
67
68	diff --git a/dev-java/icedtea/files/pr1983.patch b/dev-java/icedtea/files/pr1983.patch
69	deleted file mode 100644
70	index 425bd6f..0000000
71	--- a/dev-java/icedtea/files/pr1983.patch
72	+++ /dev/null
73	@@ -1,41 +0,0 @@
74	-# HG changeset patch
75	-# User Andrew John Hughes <gnu_andrew@××××××××××.org>
76	-# Date 1454117106 0
77	-# Sat Jan 30 01:25:06 2016 +0000
78	-# Node ID 130888a5c7134f73540323d45f64e2e7372c4a01
79	-# Parent e4660f6210fa312c8392ab2be79f85bb86673a85
80	-PR1983: Support using the system installation of NSS with the SunEC provider
81	-
82	-2016-01-29 Andrew John Hughes <gnu.andrew@××××××××××.org>
83	-
84	- PR1983: Support using the system installation
85	- of NSS with the SunEC provider
86	- * Makefile.am:
87	- (check-ecc): Make argument dependent on whether
88	- the SunEC provider is enabled or not.
89	-
90	-diff -r e4660f6210fa -r 130888a5c713 Makefile.am
91	---- a/Makefile.am Sat Jan 30 01:15:16 2016 +0000
92	-+++ b/Makefile.am Sat Jan 30 01:25:06 2016 +0000
93	-@@ -209,6 +209,12 @@
94	- TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
95	- endif
96	-
97	-+if ENABLE_SUNEC
98	-+ECC_RESULT = yes
99	-+else
100	-+ECC_RESULT = no
101	-+endif
102	-+
103	- # Target to ensure a patched OpenJDK tree containing Zero & Shark
104	- # and any overlays is available in $(abs_top_builddir)/openjdk
105	- OPENJDK_TREE = stamps/overlay.stamp
106	-@@ -2367,7 +2373,7 @@
107	-
108	- stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp
109	- if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
110	-- $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport no ; \
111	-+ $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \
112	- fi
113	- mkdir -p stamps
114	- touch $@
115
116	diff --git a/dev-java/icedtea/files/pr2804.patch b/dev-java/icedtea/files/pr2804.patch
117	deleted file mode 100644
118	index cebda48..0000000
119	--- a/dev-java/icedtea/files/pr2804.patch
120	+++ /dev/null
121	@@ -1,41 +0,0 @@
122	-# HG changeset patch
123	-# User Andrew John Hughes <gnu_andrew@××××××××××.org>
124	-# Date 1454116428 0
125	-# Sat Jan 30 01:13:48 2016 +0000
126	-# Node ID 48e97835c60091a6cf69053ba2d6c38b51d368e3
127	-# Parent b88b516766014824885b6559621ff89e5b714547
128	-PR2804: test/tapset/jstaptest.pl should be executable
129	-
130	-2016-01-29 Andrew John Hughes <gnu.andrew@××××××××××.org>
131	-
132	- PR2804: test/tapset/jstaptest.pl should be executable
133	- * Makefile.am:
134	- (check-tapset-jstack): Actually replace BUILD_OUTPUT_DIR
135	- as mentioned in previous commit.
136	- * test/tapset/jstaptest.pl: Fix capitalisation of
137	- "IcedTea".
138	-
139	-diff -r b88b51676601 -r 48e97835c600 Makefile.am
140	---- a/Makefile.am Sat Jan 30 01:10:54 2016 +0000
141	-+++ b/Makefile.am Sat Jan 30 01:13:48 2016 +0000
142	-@@ -2327,7 +2327,7 @@
143	- echo "ERROR: Perl not found"; exit -1; \
144	- fi
145	- ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
146	-- -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
147	-+ -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
148	- -S $(abs_top_srcdir)/test/tapset \
149	- -a test/check-stap.log -j
150	- endif
151	-diff -r b88b51676601 -r 48e97835c600 test/tapset/jstaptest.pl
152	---- a/test/tapset/jstaptest.pl Sat Jan 30 01:10:54 2016 +0000
153	-+++ b/test/tapset/jstaptest.pl Sat Jan 30 01:13:48 2016 +0000
154	-@@ -597,7 +597,7 @@
155	- \|\| ($opt_p && $opt_j)); # -p and -j are mutually exclusive.
156	- if ($opt_B && $opt_A) {
157	- die "Directory $opt_B not found." unless (-d $opt_B);
158	-- die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding Icedtea with systemtap support.\n"
159	-+ die "Directory $opt_B/j2sdk-image/tapset not found.\nTry rebuilding IcedTea with systemtap support.\n"
160	- unless (-d "$opt_B/j2sdk-image/tapset");
161	- push(@tapset_dirs, "-I$opt_B/j2sdk-image/tapset");
162	- set_java_vars("$opt_B/j2sdk-image", $opt_A);
163
164	diff --git a/dev-java/icedtea/files/pr2825.patch b/dev-java/icedtea/files/pr2825.patch
165	deleted file mode 100644
166	index 510217a..0000000
167	--- a/dev-java/icedtea/files/pr2825.patch
168	+++ /dev/null
169	@@ -1,12 +0,0 @@
170	-diff -r 0883b7a8311a acinclude.m4
171	---- a/acinclude.m4 Fri Jan 29 22:47:27 2016 +0000
172	-+++ b/acinclude.m4 Fri Jan 29 23:24:48 2016 +0000
173	-@@ -1969,7 +1969,7 @@
174	- PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
175	- if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
176	- SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
177	-- SUNEC_LIBS="$NSS_LIBS -lfreebl";
178	-+ SUNEC_LIBS="-lfreebl $NSS_LIBS";
179	- elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
180	- SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
181	- SUNEC_LIBS=$NSS_JAVA_LIBS;
182
183	diff --git a/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
184	similarity index 95%
185	rename from dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
186	rename to dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
187	index be8af53..f1f5763 100644
188	--- a/dev-java/icedtea/icedtea-3.0.0_pre08.ebuild
189	+++ b/dev-java/icedtea/icedtea-3.0.0_pre09.ebuild
190	@@ -16,14 +16,14 @@ ICEDTEA_VER=$(get_version_component_range 1-3)
191	ICEDTEA_BRANCH=$(get_version_component_range 1-2)
192	ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
193	ICEDTEA_PRE=$(get_version_component_range _)
194	-CORBA_TARBALL="ebc2780ebeb3.tar.xz"
195	-JAXP_TARBALL="ac52a8eed353.tar.xz"
196	-JAXWS_TARBALL="26a1fdce80b7.tar.xz"
197	-JDK_TARBALL="809d98eeda49.tar.xz"
198	-LANGTOOLS_TARBALL="0d3479e0bac6.tar.xz"
199	-OPENJDK_TARBALL="f0635543beb3.tar.xz"
200	-NASHORN_TARBALL="7babac6e7ecf.tar.xz"
201	-HOTSPOT_TARBALL="c313c4782bb3.tar.xz"
202	+CORBA_TARBALL="834cf5ee24b3.tar.xz"
203	+JAXP_TARBALL="6527813420de.tar.xz"
204	+JAXWS_TARBALL="2ceaeebc6760.tar.xz"
205	+JDK_TARBALL="dfad9b612327.tar.xz"
206	+LANGTOOLS_TARBALL="076ec0ef64f0.tar.xz"
207	+OPENJDK_TARBALL="a358b13af298.tar.xz"
208	+NASHORN_TARBALL="bbc1966c6af9.tar.xz"
209	+HOTSPOT_TARBALL="dbf85d44da89.tar.xz"
210
211	CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
212	JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
213	@@ -200,13 +200,6 @@ java_prepare() {
214	# icedtea doesn't like some locales. #330433 #389717
215	export LANG="C" LC_ALL="C"
216
217	- # Fix issue with ordering of NSS libraries and bfd linker
218	- epatch "${FILESDIR}/pr2825.patch"
219	- # Fix location of JDK image used by check-tapset-jstack
220	- epatch "${FILESDIR}/pr2804.patch"
221	- # Fix setting of ECC test, depending on whether SunEC is enabled or not
222	- epatch "${FILESDIR}/pr1983.patch"
223	-
224	eautoreconf
225	}
226
227
228	diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
229	index 83663b2..b5480c2 100644
230	--- a/dev-java/icedtea/metadata.xml
231	+++ b/dev-java/icedtea/metadata.xml
232	@@ -1,18 +1,24 @@
233	<?xml version="1.0" encoding="UTF-8"?>
234	<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
235	<pkgmetadata>
236	-<herd>java</herd>
237	-<herd>proxy-maintainers</herd>
238	-<maintainer>
239	+<maintainer type="person">
240	<email>gnu_andrew@××××××××××.org</email>
241	<name>Andrew John Hughes</name>
242	<description>Proxy Maintainer</description>
243	</maintainer>
244	-<maintainer>
245	+<maintainer type="person">
246	<email>chewi@g.o</email>
247	<name>James Le Cuirot</name>
248	<description>Committer</description>
249	</maintainer>
250	+<maintainer type="project">
251	+ <email>java@g.o</email>
252	+ <name>Java</name>
253	+</maintainer>
254	+<maintainer type="project">
255	+ <email>proxy-maint@g.o</email>
256	+ <name>Proxy Maintainers</name>
257	+</maintainer>
258	<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>
259	<use>
260	<flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>

Gentoo Archives: gentoo-commits