1 |
commit: 85358e6517899ce5e64bbf3562644738ef286246 |
2 |
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
3 |
AuthorDate: Thu Aug 25 02:35:40 2016 +0000 |
4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
5 |
CommitDate: Thu Aug 25 02:35:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=85358e65 |
7 |
|
8 |
dev-java/icedtea: Update to 1.13.12 and OpenJDK 6 b40; http://bitly.com/it11312 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
dev-java/icedtea/ChangeLog | 7 +++++++ |
13 |
dev-java/icedtea/Manifest | 4 ++-- |
14 |
.../{icedtea-6.1.13.11.ebuild => icedtea-6.1.13.12.ebuild} | 13 +++++++++---- |
15 |
dev-java/icedtea/icedtea-6.9999.ebuild | 13 +++++++++---- |
16 |
4 files changed, 27 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog |
19 |
index 359c816..a57bdd9 100644 |
20 |
--- a/dev-java/icedtea/ChangeLog |
21 |
+++ b/dev-java/icedtea/ChangeLog |
22 |
@@ -2,6 +2,13 @@ |
23 |
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+*icedtea-6.1.13.12 (25 Aug 2016) |
27 |
+ |
28 |
+ 25 Aug 2016; Andrew John Hughes <gnu_andrew@××××××××××.org> |
29 |
+ +icedtea-6.1.13.12.ebuild, -icedtea-6.1.13.11.ebuild, icedtea-6.9999.ebuild: |
30 |
+ dev-java/icedtea: Update to 1.13.12 and OpenJDK 6 b40; |
31 |
+ http://bitly.com/it11312 |
32 |
+ |
33 |
*icedtea-3.2.0_pre02 (09 Aug 2016) |
34 |
|
35 |
09 Aug 2016; Andrew John Hughes <gnu_andrew@××××××××××.org> |
36 |
|
37 |
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest |
38 |
index 70a6388..45a5bf3 100644 |
39 |
--- a/dev-java/icedtea/Manifest |
40 |
+++ b/dev-java/icedtea/Manifest |
41 |
@@ -36,5 +36,5 @@ DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b |
42 |
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4 |
43 |
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0 |
44 |
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 |
45 |
-DIST icedtea6-1.13.11.tar.xz 4492256 SHA256 526ecdf6fec35c10160df305e87cb477f5fe1ea32f02f6c9b1c865a2d28833bf SHA512 2b8462463af9655b76b0472a1c51cffeef7ccf3cc24b7255fc18b6b6482d82804647b3ac1133d00ad2bc1fa6b0664a5309e3359bf67afa6a04f3a4f0be299497 WHIRLPOOL 9e0bc4e3f0743bab15ab1889a232b7ba819b7a9c126e3f7ee8cd708e90ad9da4e7c820a36b89a0206358e736dd3c469a6af9f367679cb7f9da5375e3733f99f2 |
46 |
-DIST openjdk-6-src-b39-03_may_2016.tar.xz 33887004 SHA256 d11dc2ababe88e7891f1abbd7fa4fe033a65dea22c071331a641374b3247717f SHA512 973f1495da6f145e7871521946c96556043061362d6df9071e5b61a5b52c22ca2fedd275dd9a42178aff1852a35b8e8a76fca6ae11097453878ce3dda622baf1 WHIRLPOOL 5c49b35190e85d3c39171c64622397fced50aa89bcace3080315e85cf332509e2f59b68b2f4f5ccfaa053872cd42e38385770431c8b6f3b598e959877bf1c0d0 |
47 |
+DIST icedtea6-1.13.12.tar.xz 4482372 SHA256 48d66845f43361eee804210c5ba1cb54e7393f83181bc9dbe048e2df46c5b1e0 SHA512 0a96c0ec0bdc0daf8c9a955c2b24447311828103aed4376b70d13a0ecc7a1411b6a68988381b335d68cda6241922763296fa076c37b219c78f1a6fa4dee770df WHIRLPOOL 58e979cedfcf9caff17689f8c87f9b29d0890c3121130492b681b365b4fb3532cc0557b1a0785ec61185e24ce33b9ffce1615af167e905911ce554ae6ff3e47a |
48 |
+DIST openjdk-6-src-b40-22_aug_2016.tar.xz 34323680 SHA256 70ac61635032e77cecf935b53b22a9545d5d0a7f55ad6a15dca9b84a2be993be SHA512 f24ecce3a035693416db14b6a4f05a22b6a251ba9210efff49dfaab39c78b0d36dbc994585f76b18be901fada357d02a6f342c05bccc2980d224f78994c4dee4 WHIRLPOOL f8d82a3d92241ff3659b93a4ea6a6890a41b177ef4ac98584d3c4ce802cda2385aa5ad2915436af2042048962075da5eda6cfb8da3e1a594fa118aae2fb4991f |
49 |
|
50 |
diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild b/dev-java/icedtea/icedtea-6.1.13.12.ebuild |
51 |
similarity index 96% |
52 |
rename from dev-java/icedtea/icedtea-6.1.13.11.ebuild |
53 |
rename to dev-java/icedtea/icedtea-6.1.13.12.ebuild |
54 |
index f1ef452..11de588 100644 |
55 |
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
56 |
+++ b/dev-java/icedtea/icedtea-6.1.13.12.ebuild |
57 |
@@ -15,8 +15,8 @@ inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator vi |
58 |
ICEDTEA_VER=$(get_version_component_range 2-4) |
59 |
ICEDTEA_BRANCH=$(get_version_component_range 2-3) |
60 |
ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER} |
61 |
-OPENJDK_BUILD="39" |
62 |
-OPENJDK_DATE="03_may_2016" |
63 |
+OPENJDK_BUILD="40" |
64 |
+OPENJDK_DATE="22_aug_2016" |
65 |
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" |
66 |
# Download cacao and jamvm regardless for use with EXTRA_ECONF |
67 |
CACAO_TARBALL="cacao-68fe50ac34ec.tar.gz" |
68 |
@@ -71,6 +71,7 @@ X_DEPEND=" |
69 |
x11-proto/xproto" |
70 |
|
71 |
COMMON_DEP=" |
72 |
+ app-misc/mime-types |
73 |
>=media-libs/freetype-2.3.5:2= |
74 |
>=media-libs/lcms-2.5 |
75 |
>=sys-libs/zlib-1.2.3:= |
76 |
@@ -249,10 +250,14 @@ src_configure() { |
77 |
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ |
78 |
--with-jdk-home="$(java-config -O)" \ |
79 |
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ |
80 |
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ |
81 |
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ |
82 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
83 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
84 |
--with-pkgversion="Gentoo ${PF}" \ |
85 |
- --disable-downloading --disable-Werror --disable-jdk-tests \ |
86 |
+ --disable-downloading --disable-Werror --disable-tests \ |
87 |
--enable-system-lcms --enable-system-jpeg \ |
88 |
- --enable-system-zlib --disable-pulse-java \ |
89 |
+ --enable-system-zlib --disable-pulse-java --disable-systemtap-tests\ |
90 |
$(use_enable !headless-awt system-gif) \ |
91 |
$(use_enable !headless-awt system-png) \ |
92 |
$(use_enable !debug optimizations) \ |
93 |
|
94 |
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild |
95 |
index d60452f..7bd32b4 100644 |
96 |
--- a/dev-java/icedtea/icedtea-6.9999.ebuild |
97 |
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild |
98 |
@@ -14,8 +14,8 @@ inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax- |
99 |
|
100 |
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) |
101 |
ICEDTEA_BRANCH=$(get_version_component_range 1-3) |
102 |
-OPENJDK_BUILD="39" |
103 |
-OPENJDK_DATE="03_may_2016" |
104 |
+OPENJDK_BUILD="40" |
105 |
+OPENJDK_DATE="22_aug_2016" |
106 |
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" |
107 |
# Download cacao and jamvm regardless for use with EXTRA_ECONF |
108 |
CACAO_TARBALL="cacao-68fe50ac34ec.tar.gz" |
109 |
@@ -69,6 +69,7 @@ X_DEPEND=" |
110 |
x11-proto/xproto" |
111 |
|
112 |
COMMON_DEP=" |
113 |
+ app-misc/mime-types |
114 |
>=media-libs/freetype-2.3.5:2= |
115 |
>=media-libs/lcms-2.5 |
116 |
>=sys-libs/zlib-1.2.3:= |
117 |
@@ -249,10 +250,14 @@ src_configure() { |
118 |
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ |
119 |
--with-jdk-home="$(java-config -O)" \ |
120 |
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ |
121 |
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ |
122 |
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ |
123 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
124 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
125 |
--with-pkgversion="Gentoo ${PF}" \ |
126 |
- --disable-downloading --disable-Werror --disable-jdk-tests \ |
127 |
+ --disable-downloading --disable-Werror --disable-tests \ |
128 |
--enable-system-lcms --enable-system-jpeg \ |
129 |
- --enable-system-zlib --disable-pulse-java \ |
130 |
+ --enable-system-zlib --disable-pulse-java --disable-systemtap-tests\ |
131 |
$(use_enable !headless-awt system-gif) \ |
132 |
$(use_enable !headless-awt system-png) \ |
133 |
$(use_enable !debug optimizations) \ |