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