Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/
Date: Tue, 04 Aug 2020 21:58:58
Message-Id: 1596578305.e8e4a6a3c3636848ce477955ff3c0cb30b4f3ff3.gyakovlev@gentoo
1 commit: e8e4a6a3c3636848ce477955ff3c0cb30b4f3ff3
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 4 21:57:53 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 4 21:58:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e4a6a3
7
8 dev-java/openjdk-jre-bin: drop old
9
10 Package-Manager: Portage-3.0.1, Repoman-2.3.23
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 dev-java/openjdk-jre-bin/Manifest | 3 -
14 .../openjdk-jre-bin-11.0.7_p10-r1.ebuild | 100 ---------------------
15 .../openjdk-jre-bin-8.252_p09.ebuild | 84 -----------------
16 .../openjdk-jre-bin-8.262_p10.ebuild | 84 -----------------
17 4 files changed, 271 deletions(-)
18
19 diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
20 index 0235ffc940e..3c7fe33149f 100644
21 --- a/dev-java/openjdk-jre-bin/Manifest
22 +++ b/dev-java/openjdk-jre-bin/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
25 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
26 -DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
27 -DIST OpenJDK8U-jre_x64_linux_hotspot_8u262b10.tar.gz 41755965 BLAKE2B b417d12ba18f58fec1e692a567bd5c0551fcbe023370fe52c2e525692d0d2151d4c296f86e6f4e3b1178e8f933ec6ddb9559e358c5d080cc2dba94ce38680ab5 SHA512 63d65c576d40b798dbbf2c6923151d07ba74312d8e8b6dc722d4358c38855a3a5c9e9e7c267569d390065c4dcc7f4bcfddc3f78e8388b4faef1a61501e2b7b8c
28 DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095
29
30 diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
31 deleted file mode 100644
32 index 23e7a0fbadc..00000000000
33 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
34 +++ /dev/null
35 @@ -1,100 +0,0 @@
36 -# Copyright 1999-2020 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 nsplugin selinux webstart"
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 -PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
81 - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
82 -
83 -RESTRICT="preserve-libs splitdebug"
84 -QA_PREBUILT="*"
85 -
86 -S="${WORKDIR}/jdk-${MY_PV}-jre"
87 -
88 -src_install() {
89 - local dest="/opt/${P}"
90 - local ddest="${ED%/}/${dest#/}"
91 -
92 - # Not sure why they bundle this as it's commonly available and they
93 - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
94 - # also has an explicit dependency while Oracle seemingly dlopens it.
95 - rm -vf lib/libfreetype.so || die
96 -
97 - # Oracle and IcedTea have libjsoundalsa.so depending on
98 - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
99 - if ! use alsa ; then
100 - rm -v lib/libjsound.* || die
101 - fi
102 -
103 - if use headless-awt ; then
104 - rm -v lib/lib*{[jx]awt,splashscreen}* || die
105 - fi
106 -
107 - rm -v lib/security/cacerts || die
108 - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
109 -
110 - dodir "${dest}"
111 - cp -pPR * "${ddest}" || die
112 -
113 - # provide stable symlink
114 - dosym "${P}" "/opt/${PN}-${SLOT}"
115 -
116 - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
117 - java-vm_set-pax-markings "${ddest}"
118 - java-vm_revdep-mask
119 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
120 -}
121 -
122 -pkg_postinst() {
123 - java-vm-2_pkg_postinst
124 -
125 - if use gentoo-vm ; then
126 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
127 - ewarn "recognised by the system. This will almost certainly break things."
128 - else
129 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
130 - ewarn "will not be recognised by the system. For example, simply calling"
131 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
132 - ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
133 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
134 - fi
135 -}
136
137 diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
138 deleted file mode 100644
139 index 512f8678a75..00000000000
140 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
141 +++ /dev/null
142 @@ -1,84 +0,0 @@
143 -# Copyright 1999-2020 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=6
147 -
148 -inherit eapi7-ver java-vm-2
149 -
150 -abi_uri() {
151 - echo "${2-$1}? (
152 - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
153 - )"
154 -}
155 -
156 -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
157 -SLOT="$(ver_cut 1)"
158 -
159 -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
160 -HOMEPAGE="https://adoptopenjdk.net"
161 -SRC_URI="
162 - $(abi_uri x64 amd64)
163 -"
164 -
165 -LICENSE="GPL-2-with-classpath-exception"
166 -KEYWORDS="amd64"
167 -
168 -IUSE="alsa cups headless-awt nsplugin selinux webstart"
169 -
170 -RDEPEND="
171 - media-libs/fontconfig:1.0
172 - media-libs/freetype:2
173 - >net-libs/libnet-1.1
174 - >=sys-apps/baselayout-java-0.1.0-r1
175 - >=sys-libs/glibc-2.2.5:*
176 - sys-libs/zlib
177 - alsa? ( media-libs/alsa-lib )
178 - cups? ( net-print/cups )
179 - selinux? ( sec-policy/selinux-java )
180 - !headless-awt? (
181 - x11-libs/libX11
182 - x11-libs/libXext
183 - x11-libs/libXi
184 - x11-libs/libXrender
185 - x11-libs/libXtst
186 - )"
187 -
188 -PDEPEND="
189 - webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
190 - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
191 -
192 -RESTRICT="preserve-libs splitdebug"
193 -QA_PREBUILT="*"
194 -
195 -S="${WORKDIR}/jdk${MY_PV}-jre"
196 -
197 -src_install() {
198 - local dest="/opt/${P}"
199 - local ddest="${ED%/}/${dest#/}"
200 -
201 - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
202 -
203 - # this does not exist on arm64 hence -f
204 - rm -fv lib/*/libfreetype.so* || die
205 -
206 - if ! use alsa ; then
207 - rm -v lib/*/libjsoundalsa.so* || die
208 - fi
209 -
210 - if use headless-awt ; then
211 - rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
212 - bin/policytool || die
213 - fi
214 -
215 - rm -v lib/security/cacerts || die
216 - dosym ../../../../../etc/ssl/certs/java/cacerts \
217 - "${dest}"/lib/security/cacerts
218 -
219 - dodir "${dest}"
220 - cp -pPR * "${ddest}" || die
221 -
222 - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
223 - java-vm_set-pax-markings "${ddest}"
224 - java-vm_revdep-mask
225 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
226 -}
227
228 diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
229 deleted file mode 100644
230 index a38a136210d..00000000000
231 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
232 +++ /dev/null
233 @@ -1,84 +0,0 @@
234 -# Copyright 1999-2020 Gentoo Authors
235 -# Distributed under the terms of the GNU General Public License v2
236 -
237 -EAPI=6
238 -
239 -inherit eapi7-ver java-vm-2
240 -
241 -abi_uri() {
242 - echo "${2-$1}? (
243 - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
244 - )"
245 -}
246 -
247 -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
248 -SLOT="$(ver_cut 1)"
249 -
250 -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
251 -HOMEPAGE="https://adoptopenjdk.net"
252 -SRC_URI="
253 - $(abi_uri x64 amd64)
254 -"
255 -
256 -LICENSE="GPL-2-with-classpath-exception"
257 -KEYWORDS="~amd64"
258 -
259 -IUSE="alsa cups headless-awt nsplugin selinux webstart"
260 -
261 -RDEPEND="
262 - media-libs/fontconfig:1.0
263 - media-libs/freetype:2
264 - >net-libs/libnet-1.1
265 - >=sys-apps/baselayout-java-0.1.0-r1
266 - >=sys-libs/glibc-2.2.5:*
267 - sys-libs/zlib
268 - alsa? ( media-libs/alsa-lib )
269 - cups? ( net-print/cups )
270 - selinux? ( sec-policy/selinux-java )
271 - !headless-awt? (
272 - x11-libs/libX11
273 - x11-libs/libXext
274 - x11-libs/libXi
275 - x11-libs/libXrender
276 - x11-libs/libXtst
277 - )"
278 -
279 -PDEPEND="
280 - webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
281 - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
282 -
283 -RESTRICT="preserve-libs splitdebug"
284 -QA_PREBUILT="*"
285 -
286 -S="${WORKDIR}/jdk${MY_PV}-jre"
287 -
288 -src_install() {
289 - local dest="/opt/${P}"
290 - local ddest="${ED%/}/${dest#/}"
291 -
292 - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
293 -
294 - # this does not exist on arm64 hence -f
295 - rm -fv lib/*/libfreetype.so* || die
296 -
297 - if ! use alsa ; then
298 - rm -v lib/*/libjsoundalsa.so* || die
299 - fi
300 -
301 - if use headless-awt ; then
302 - rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
303 - bin/policytool || die
304 - fi
305 -
306 - rm -v lib/security/cacerts || die
307 - dosym ../../../../../etc/ssl/certs/java/cacerts \
308 - "${dest}"/lib/security/cacerts
309 -
310 - dodir "${dest}"
311 - cp -pPR * "${ddest}" || die
312 -
313 - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
314 - java-vm_set-pax-markings "${ddest}"
315 - java-vm_revdep-mask
316 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
317 -}