1 |
commit: dfc8ea1d8f46693535c7a02a77e5764a782ca0d2 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 25 18:55:44 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 25 18:55:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc8ea1d |
7 |
|
8 |
dev-java/openjdk-jre-bin: drop 8.272_p10, 8.282_p08, 11.0.9_p11, 11.0.10_p9 |
9 |
|
10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
11 |
|
12 |
dev-java/openjdk-jre-bin/Manifest | 4 - |
13 |
.../openjdk-jre-bin-11.0.10_p9.ebuild | 97 ---------------------- |
14 |
.../openjdk-jre-bin-11.0.9_p11.ebuild | 97 ---------------------- |
15 |
.../openjdk-jre-bin-8.272_p10.ebuild | 80 ------------------ |
16 |
.../openjdk-jre-bin-8.282_p08.ebuild | 80 ------------------ |
17 |
5 files changed, 358 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest |
20 |
index 1f1bc641e70..168fc7d9462 100644 |
21 |
--- a/dev-java/openjdk-jre-bin/Manifest |
22 |
+++ b/dev-java/openjdk-jre-bin/Manifest |
23 |
@@ -1,6 +1,2 @@ |
24 |
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz 43146855 BLAKE2B eab22a4134dd94143adc5f6da6932d015874ec1ae58fda927279c85190b9c90a13de2c08e9f1d6d2d91f9c13f3999d2e76b8fd511c17f66e4d18f687d0bc2047 SHA512 2cb56a58aa9c0644374d437d20eb908a8a997f6b8e49e4a3589e4d79d0d15eb4dc574e815cbba2cffce62e4e20fefec706e0c4a76d42212e10365ed90f8b6263 |
25 |
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96 |
26 |
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz 43086814 BLAKE2B 20785b5edb3fbfae99c7cdc76fba964a7a00eb148e68125138281c0995d6a82cfe9924c7f653dd188ab97da41135004546ec822bfa845f599135c8a9ec5e9336 SHA512 b0c53febc2628b91763cd5304cce782adaa71ff466c4dd9d056c7f1ac18e8f1f4ad2fc355882b2990fbd71e7792134697bcd1204eb9e03c12cf3b287ac33c3f0 |
27 |
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz 42139854 BLAKE2B 52e7a594aab1a70d351daf9dc42598b4952894a9a72ed996e261e347eece4337fe95c5f63850a0dde2d8862045d22ef41832a6af51df5113b81713bab20c797e SHA512 2fd45a9b967e96309c79724fea047d7c35f31da8e0290bd5cdafeea47b83941b9269129d0d557ee488526c0667ba581dee860381fc344374971e1005105db376 |
28 |
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz 41371208 BLAKE2B a6ca557a33a9d917a3e26824d7c1e3c8b17b90eb4fad8a3d63dac4e2f5a024c9b4328194a366b28c05605f249f35efd332145706696d3721b8883ac023deb10c SHA512 4717ed22d9716ab24175cec7091b400254d633045c8e64e45d05112566a5b489d716cd9af1e4572d7da70cd06d048d84a0fd735402ea60b9210d8214f4ba53d0 |
29 |
DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd |
30 |
|
31 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.10_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.10_p9.ebuild |
32 |
deleted file mode 100644 |
33 |
index 441b2550e44..00000000000 |
34 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.10_p9.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,97 +0,0 @@ |
37 |
-# Copyright 1999-2021 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-inherit java-vm-2 |
43 |
- |
44 |
-abi_uri() { |
45 |
- echo "${2-$1}? ( |
46 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
47 |
- )" |
48 |
-} |
49 |
- |
50 |
-MY_PV=${PV/_p/+} |
51 |
-SLOT=${MY_PV%%[.+]*} |
52 |
- |
53 |
-SRC_URI=" |
54 |
- $(abi_uri x64 amd64) |
55 |
-" |
56 |
- |
57 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
58 |
-HOMEPAGE="https://adoptopenjdk.net" |
59 |
-LICENSE="GPL-2-with-classpath-exception" |
60 |
-KEYWORDS="~amd64" |
61 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux" |
62 |
- |
63 |
-RDEPEND=" |
64 |
- media-libs/fontconfig:1.0 |
65 |
- media-libs/freetype:2 |
66 |
- >net-libs/libnet-1.1 |
67 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
68 |
- >=sys-libs/glibc-2.2.5:* |
69 |
- sys-libs/zlib |
70 |
- alsa? ( media-libs/alsa-lib ) |
71 |
- cups? ( net-print/cups ) |
72 |
- selinux? ( sec-policy/selinux-java ) |
73 |
- !headless-awt? ( |
74 |
- x11-libs/libX11 |
75 |
- x11-libs/libXext |
76 |
- x11-libs/libXi |
77 |
- x11-libs/libXrender |
78 |
- x11-libs/libXtst |
79 |
- )" |
80 |
- |
81 |
-RESTRICT="preserve-libs splitdebug" |
82 |
-QA_PREBUILT="*" |
83 |
- |
84 |
-S="${WORKDIR}/jdk-${MY_PV}-jre" |
85 |
- |
86 |
-src_install() { |
87 |
- local dest="/opt/${P}" |
88 |
- local ddest="${ED%/}/${dest#/}" |
89 |
- |
90 |
- # Not sure why they bundle this as it's commonly available and they |
91 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
92 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
93 |
- rm -vf lib/libfreetype.so || die |
94 |
- |
95 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
96 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
97 |
- if ! use alsa ; then |
98 |
- rm -v lib/libjsound.* || die |
99 |
- fi |
100 |
- |
101 |
- if use headless-awt ; then |
102 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
103 |
- fi |
104 |
- |
105 |
- rm -v lib/security/cacerts || die |
106 |
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
107 |
- |
108 |
- dodir "${dest}" |
109 |
- cp -pPR * "${ddest}" || die |
110 |
- |
111 |
- # provide stable symlink |
112 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
113 |
- |
114 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
115 |
- java-vm_set-pax-markings "${ddest}" |
116 |
- java-vm_revdep-mask |
117 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
118 |
-} |
119 |
- |
120 |
-pkg_postinst() { |
121 |
- java-vm-2_pkg_postinst |
122 |
- |
123 |
- if use gentoo-vm ; then |
124 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" |
125 |
- ewarn "recognised by the system. This will almost certainly break things." |
126 |
- else |
127 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" |
128 |
- ewarn "will not be recognised by the system. For example, simply calling" |
129 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
130 |
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its" |
131 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
132 |
- fi |
133 |
-} |
134 |
|
135 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild |
136 |
deleted file mode 100644 |
137 |
index a6aade59d9e..00000000000 |
138 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.9_p11.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,97 +0,0 @@ |
141 |
-# Copyright 1999-2020 Gentoo Authors |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
- |
144 |
-EAPI=6 |
145 |
- |
146 |
-inherit java-vm-2 |
147 |
- |
148 |
-abi_uri() { |
149 |
- echo "${2-$1}? ( |
150 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
151 |
- )" |
152 |
-} |
153 |
- |
154 |
-MY_PV=${PV/_p/+} |
155 |
-SLOT=${MY_PV%%[.+]*} |
156 |
- |
157 |
-SRC_URI=" |
158 |
- $(abi_uri x64 amd64) |
159 |
-" |
160 |
- |
161 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
162 |
-HOMEPAGE="https://adoptopenjdk.net" |
163 |
-LICENSE="GPL-2-with-classpath-exception" |
164 |
-KEYWORDS="~amd64" |
165 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux" |
166 |
- |
167 |
-RDEPEND=" |
168 |
- media-libs/fontconfig:1.0 |
169 |
- media-libs/freetype:2 |
170 |
- >net-libs/libnet-1.1 |
171 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
172 |
- >=sys-libs/glibc-2.2.5:* |
173 |
- sys-libs/zlib |
174 |
- alsa? ( media-libs/alsa-lib ) |
175 |
- cups? ( net-print/cups ) |
176 |
- selinux? ( sec-policy/selinux-java ) |
177 |
- !headless-awt? ( |
178 |
- x11-libs/libX11 |
179 |
- x11-libs/libXext |
180 |
- x11-libs/libXi |
181 |
- x11-libs/libXrender |
182 |
- x11-libs/libXtst |
183 |
- )" |
184 |
- |
185 |
-RESTRICT="preserve-libs splitdebug" |
186 |
-QA_PREBUILT="*" |
187 |
- |
188 |
-S="${WORKDIR}/jdk-${MY_PV}-jre" |
189 |
- |
190 |
-src_install() { |
191 |
- local dest="/opt/${P}" |
192 |
- local ddest="${ED%/}/${dest#/}" |
193 |
- |
194 |
- # Not sure why they bundle this as it's commonly available and they |
195 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
196 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
197 |
- rm -vf lib/libfreetype.so || die |
198 |
- |
199 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
200 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
201 |
- if ! use alsa ; then |
202 |
- rm -v lib/libjsound.* || die |
203 |
- fi |
204 |
- |
205 |
- if use headless-awt ; then |
206 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
207 |
- fi |
208 |
- |
209 |
- rm -v lib/security/cacerts || die |
210 |
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
211 |
- |
212 |
- dodir "${dest}" |
213 |
- cp -pPR * "${ddest}" || die |
214 |
- |
215 |
- # provide stable symlink |
216 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
217 |
- |
218 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
219 |
- java-vm_set-pax-markings "${ddest}" |
220 |
- java-vm_revdep-mask |
221 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
222 |
-} |
223 |
- |
224 |
-pkg_postinst() { |
225 |
- java-vm-2_pkg_postinst |
226 |
- |
227 |
- if use gentoo-vm ; then |
228 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" |
229 |
- ewarn "recognised by the system. This will almost certainly break things." |
230 |
- else |
231 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" |
232 |
- ewarn "will not be recognised by the system. For example, simply calling" |
233 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
234 |
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its" |
235 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
236 |
- fi |
237 |
-} |
238 |
|
239 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild |
240 |
deleted file mode 100644 |
241 |
index 16aae21f0a4..00000000000 |
242 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.272_p10.ebuild |
243 |
+++ /dev/null |
244 |
@@ -1,80 +0,0 @@ |
245 |
-# Copyright 1999-2020 Gentoo Authors |
246 |
-# Distributed under the terms of the GNU General Public License v2 |
247 |
- |
248 |
-EAPI=6 |
249 |
- |
250 |
-inherit eapi7-ver java-vm-2 |
251 |
- |
252 |
-abi_uri() { |
253 |
- echo "${2-$1}? ( |
254 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz |
255 |
- )" |
256 |
-} |
257 |
- |
258 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
259 |
-SLOT="$(ver_cut 1)" |
260 |
- |
261 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
262 |
-HOMEPAGE="https://adoptopenjdk.net" |
263 |
-SRC_URI=" |
264 |
- $(abi_uri x64 amd64) |
265 |
-" |
266 |
- |
267 |
-LICENSE="GPL-2-with-classpath-exception" |
268 |
-KEYWORDS="amd64" |
269 |
- |
270 |
-IUSE="alsa cups headless-awt selinux" |
271 |
- |
272 |
-RDEPEND=" |
273 |
- media-libs/fontconfig:1.0 |
274 |
- media-libs/freetype:2 |
275 |
- >net-libs/libnet-1.1 |
276 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
277 |
- >=sys-libs/glibc-2.2.5:* |
278 |
- sys-libs/zlib |
279 |
- alsa? ( media-libs/alsa-lib ) |
280 |
- cups? ( net-print/cups ) |
281 |
- selinux? ( sec-policy/selinux-java ) |
282 |
- !headless-awt? ( |
283 |
- x11-libs/libX11 |
284 |
- x11-libs/libXext |
285 |
- x11-libs/libXi |
286 |
- x11-libs/libXrender |
287 |
- x11-libs/libXtst |
288 |
- )" |
289 |
- |
290 |
-RESTRICT="preserve-libs splitdebug" |
291 |
-QA_PREBUILT="*" |
292 |
- |
293 |
-S="${WORKDIR}/jdk${MY_PV}-jre" |
294 |
- |
295 |
-src_install() { |
296 |
- local dest="/opt/${P}" |
297 |
- local ddest="${ED%/}/${dest#/}" |
298 |
- |
299 |
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die |
300 |
- |
301 |
- # this does not exist on arm64 hence -f |
302 |
- rm -fv lib/*/libfreetype.so* || die |
303 |
- |
304 |
- if ! use alsa ; then |
305 |
- rm -v lib/*/libjsoundalsa.so* || die |
306 |
- fi |
307 |
- |
308 |
- if use headless-awt ; then |
309 |
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \ |
310 |
- bin/policytool || die |
311 |
- fi |
312 |
- |
313 |
- rm -v lib/security/cacerts || die |
314 |
- dosym ../../../../../etc/ssl/certs/java/cacerts \ |
315 |
- "${dest}"/lib/security/cacerts |
316 |
- |
317 |
- dodir "${dest}" |
318 |
- cp -pPR * "${ddest}" || die |
319 |
- |
320 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
321 |
- java-vm_set-pax-markings "${ddest}" |
322 |
- java-vm_revdep-mask |
323 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
324 |
-} |
325 |
|
326 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.282_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.282_p08.ebuild |
327 |
deleted file mode 100644 |
328 |
index 569ea64aa3e..00000000000 |
329 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.282_p08.ebuild |
330 |
+++ /dev/null |
331 |
@@ -1,80 +0,0 @@ |
332 |
-# Copyright 1999-2021 Gentoo Authors |
333 |
-# Distributed under the terms of the GNU General Public License v2 |
334 |
- |
335 |
-EAPI=6 |
336 |
- |
337 |
-inherit eapi7-ver java-vm-2 |
338 |
- |
339 |
-abi_uri() { |
340 |
- echo "${2-$1}? ( |
341 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz |
342 |
- )" |
343 |
-} |
344 |
- |
345 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
346 |
-SLOT="$(ver_cut 1)" |
347 |
- |
348 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
349 |
-HOMEPAGE="https://adoptopenjdk.net" |
350 |
-SRC_URI=" |
351 |
- $(abi_uri x64 amd64) |
352 |
-" |
353 |
- |
354 |
-LICENSE="GPL-2-with-classpath-exception" |
355 |
-KEYWORDS="~amd64" |
356 |
- |
357 |
-IUSE="alsa cups headless-awt selinux" |
358 |
- |
359 |
-RDEPEND=" |
360 |
- media-libs/fontconfig:1.0 |
361 |
- media-libs/freetype:2 |
362 |
- >net-libs/libnet-1.1 |
363 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
364 |
- >=sys-libs/glibc-2.2.5:* |
365 |
- sys-libs/zlib |
366 |
- alsa? ( media-libs/alsa-lib ) |
367 |
- cups? ( net-print/cups ) |
368 |
- selinux? ( sec-policy/selinux-java ) |
369 |
- !headless-awt? ( |
370 |
- x11-libs/libX11 |
371 |
- x11-libs/libXext |
372 |
- x11-libs/libXi |
373 |
- x11-libs/libXrender |
374 |
- x11-libs/libXtst |
375 |
- )" |
376 |
- |
377 |
-RESTRICT="preserve-libs splitdebug" |
378 |
-QA_PREBUILT="*" |
379 |
- |
380 |
-S="${WORKDIR}/jdk${MY_PV}-jre" |
381 |
- |
382 |
-src_install() { |
383 |
- local dest="/opt/${P}" |
384 |
- local ddest="${ED%/}/${dest#/}" |
385 |
- |
386 |
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die |
387 |
- |
388 |
- # this does not exist on arm64 hence -f |
389 |
- rm -fv lib/*/libfreetype.so* || die |
390 |
- |
391 |
- if ! use alsa ; then |
392 |
- rm -v lib/*/libjsoundalsa.so* || die |
393 |
- fi |
394 |
- |
395 |
- if use headless-awt ; then |
396 |
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \ |
397 |
- bin/policytool || die |
398 |
- fi |
399 |
- |
400 |
- rm -v lib/security/cacerts || die |
401 |
- dosym ../../../../../etc/ssl/certs/java/cacerts \ |
402 |
- "${dest}"/lib/security/cacerts |
403 |
- |
404 |
- dodir "${dest}" |
405 |
- cp -pPR * "${ddest}" || die |
406 |
- |
407 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
408 |
- java-vm_set-pax-markings "${ddest}" |
409 |
- java-vm_revdep-mask |
410 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
411 |
-} |