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-bin/
Date: Tue, 25 May 2021 18:56:09
Message-Id: 1621968894.62a7146390f6d1cbad023e68f607154c0a06e15a.gyakovlev@gentoo
1 commit: 62a7146390f6d1cbad023e68f607154c0a06e15a
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 25 18:53:52 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue May 25 18:54:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a71463
7
8 dev-java/openjdk-bin: drop 8.272_p10, 8.282_p08
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk-bin/Manifest | 9 --
13 dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild | 100 ------------------
14 dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild | 120 ----------------------
15 3 files changed, 229 deletions(-)
16
17 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
18 index e2c6727064f..113076a3d89 100644
19 --- a/dev-java/openjdk-bin/Manifest
20 +++ b/dev-java/openjdk-bin/Manifest
21 @@ -3,17 +3,8 @@ DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae12
22 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz 174865783 BLAKE2B 717168b8b2dc326495dc41f3af2d85b515c10774ae58f35bcdf86694d89b1e11db50be24f4c046add5223e912448d67c2ecac8a3a6f3ca2dca3e915fa61f9654 SHA512 dafd40c133fd83c06a29816f4e45ff63e588ea5e6046fe331acbee4eb5efac4b3fc7da0f0fd55e4044846a053644a71efa00e45cf4ba39106b8d1018f9bca0ec
23 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a0934d358d255df743e241fa5040bbc48746b5fd131e98a9b253add114d3504a0f4b10887d9b86189da4f2bccfc65134247b0580d96e2fa7ae9374d44ff38 SHA512 b79eb8a672706b643773711a59a756de88eadd54e74bfef7dad14a0f7ab7412ee6c457b4d3489f6c530abbd442307a9355b5d4a01d2610f90cfd614b614f6507
24 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e
25 -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4
26 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
27 -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5
28 -DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
29 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
30 -DIST OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz 98247854 BLAKE2B de96234507ae2831548c8bfc04d46ddca19d17dad6292cc51021f6001338ddd0722e16bba886cf06187f5df7e8dca34a972696be74dc1ba23be7dbad91c8d3ce SHA512 9cc2240c04f0945beb75536ee85b8e1d19acc9357e2ba844000db7e9f64c6247bd57cd0193c1ac66cbbd79e6f1197d68604519689fdff88a8b90193dba3237ef
31 -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3
32 -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84
33 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d1b32f76359362bc101678b0123d29d32bd720a10b806a55cf9b4cd3e9d5cf2ec50f985a4de85ae41ec4b90376e7b7e2f501bfe86ad9ba832813444a8f9a SHA512 2999972ecd574169d50afc6c7ff3e7b3f892939b125a9d02184b09ac11ed32b741e1bacac64f93fd4fce75bb4b16130290c1011d3948c66095132208cfc05839
34 -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555
35 -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz 102873064 BLAKE2B 2331a8c4fd404ea6d44ae5e9f168e7955b96888ebceaa0d72cc1ae044972869bdede26e1d69b926fbac1ad54cdfa4080b2dffd41e6667717a34ceb5da96c8eb3 SHA512 c56b4106f6f21c116d5229973f562e93aec91ae815b9f61291ae052540cd6c473ce74da9f9404c4d9028b313a70beae6bf328d2cdcc5c8ec8ebaca8d0fd3e892
36 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
37 -DIST OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz 101808251 BLAKE2B 7abcbe6b0f061f9b5d4cd4709fa2d6a53184c41a313a5bf861ff0796b2673bb2a8c783e56769aab20954258c5e505c6a057b3838408cc948500ea9f3e723f646 SHA512 7fb53d3cc6994d87769c53c992ef7fc4adf2488b6a0c41e3c2004ce334a86da7e9fb4955b58c9e06566c5999f317579736ad0f346dd8dd56037d3ec0d5689812
38 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
39
40 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild
41 deleted file mode 100644
42 index e4bdf87e57c..00000000000
43 --- a/dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild
44 +++ /dev/null
45 @@ -1,100 +0,0 @@
46 -# Copyright 1999-2020 Gentoo Authors
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=6
50 -
51 -inherit eapi7-ver java-vm-2
52 -
53 -abi_uri() {
54 - echo "${2-$1}? (
55 - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
56 - )"
57 -}
58 -
59 -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
60 -SLOT="$(ver_cut 1)"
61 -
62 -DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
63 -HOMEPAGE="https://adoptopenjdk.net"
64 -SRC_URI="
65 - $(abi_uri aarch64 arm64)
66 - $(abi_uri arm)
67 - $(abi_uri ppc64le ppc64)
68 - $(abi_uri x64 amd64)
69 -"
70 -
71 -LICENSE="GPL-2-with-classpath-exception"
72 -KEYWORDS="amd64 ~arm arm64 ppc64"
73 -
74 -IUSE="alsa cups examples headless-awt selinux source"
75 -
76 -RDEPEND="
77 - media-libs/fontconfig:1.0
78 - media-libs/freetype:2
79 - >=sys-apps/baselayout-java-0.1.0-r1
80 - >=sys-libs/glibc-2.2.5:*
81 - sys-libs/zlib
82 - alsa? ( media-libs/alsa-lib )
83 - arm? ( dev-libs/libffi-compat:6 )
84 - cups? ( net-print/cups )
85 - selinux? ( sec-policy/selinux-java )
86 - !headless-awt? (
87 - x11-libs/libX11
88 - x11-libs/libXext
89 - x11-libs/libXi
90 - x11-libs/libXrender
91 - x11-libs/libXtst
92 - )
93 -"
94 -
95 -RESTRICT="preserve-libs strip"
96 -QA_PREBUILT="*"
97 -
98 -S="${WORKDIR}/jdk${MY_PV}"
99 -
100 -src_unpack() {
101 - default
102 - # 753575
103 - if use arm; then
104 - mv -v "${S}"* "${S}" || die
105 - fi
106 -}
107 -
108 -src_install() {
109 - local dest="/opt/${P}"
110 - local ddest="${ED%/}/${dest#/}"
111 -
112 - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
113 -
114 - # this does not exist on arm64 hence -f
115 - rm -fv jre/lib/*/libfreetype.so* || die
116 -
117 - if ! use alsa ; then
118 - rm -v jre/lib/*/libjsoundalsa.so* || die
119 - fi
120 -
121 - if ! use examples ; then
122 - rm -vr sample || die
123 - fi
124 -
125 - if use headless-awt ; then
126 - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
127 - {,jre/}bin/policytool bin/appletviewer || die
128 - fi
129 -
130 - if ! use source ; then
131 - rm -v src.zip || die
132 - fi
133 -
134 - rm -v jre/lib/security/cacerts || die
135 - dosym ../../../../../etc/ssl/certs/java/cacerts \
136 - "${dest}"/jre/lib/security/cacerts
137 -
138 - dodir "${dest}"
139 - cp -pPR * "${ddest}" || die
140 -
141 - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
142 - java-vm_set-pax-markings "${ddest}"
143 - java-vm_revdep-mask
144 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
145 -}
146
147 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
148 deleted file mode 100644
149 index fa7d21f0c5f..00000000000
150 --- a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild
151 +++ /dev/null
152 @@ -1,120 +0,0 @@
153 -# Copyright 1999-2021 Gentoo Authors
154 -# Distributed under the terms of the GNU General Public License v2
155 -
156 -EAPI=6
157 -
158 -inherit eapi7-ver java-vm-2
159 -
160 -abi_uri() {
161 - local os=linux
162 - case ${2} in
163 - *-macos) os=mac ;;
164 - *-solaris) os=solaris ;;
165 - esac
166 - echo "${2-$1}? (
167 - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
168 - )"
169 -}
170 -
171 -# they have different tarball names for different arches...
172 -# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
173 -# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
174 -
175 -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
176 -SLOT="$(ver_cut 1)"
177 -
178 -DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
179 -HOMEPAGE="https://adoptopenjdk.net"
180 -SRC_URI="
181 - $(abi_uri aarch64 arm64 jdk${MY_PV})
182 - $(abi_uri arm arm jdk${MY_PV})
183 - $(abi_uri ppc64le ppc64)
184 - $(abi_uri x64 amd64)
185 - $(abi_uri x64 x64-macos)
186 -"
187 -
188 -LICENSE="GPL-2-with-classpath-exception"
189 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
190 -
191 -IUSE="alsa cups examples headless-awt selinux source"
192 -
193 -RDEPEND="
194 - >=sys-apps/baselayout-java-0.1.0-r1
195 - kernel_linux? (
196 - media-libs/fontconfig:1.0
197 - media-libs/freetype:2
198 - >=sys-libs/glibc-2.2.5:*
199 - sys-libs/zlib
200 - alsa? ( media-libs/alsa-lib )
201 - arm? ( dev-libs/libffi-compat:6 )
202 - cups? ( net-print/cups )
203 - selinux? ( sec-policy/selinux-java )
204 - !headless-awt? (
205 - x11-libs/libX11
206 - x11-libs/libXext
207 - x11-libs/libXi
208 - x11-libs/libXrender
209 - x11-libs/libXtst
210 - )
211 - )
212 -"
213 -
214 -RESTRICT="preserve-libs strip"
215 -QA_PREBUILT="*"
216 -
217 -S="${WORKDIR}/jdk${MY_PV}"
218 -
219 -src_unpack() {
220 - default
221 - # 753575
222 - if use arm; then
223 - mv -v "${S}"* "${S}" || die
224 - elif [[ ${A} == *_mac_* ]] ; then
225 - mv -v "${S}/Contents/Home/"* "${S}" || die
226 - rm -Rf "${S}/Contents" # drop macOS executable
227 - fi
228 -}
229 -
230 -src_install() {
231 - local dest="/opt/${P}"
232 - local ddest="${ED%/}/${dest#/}"
233 -
234 - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
235 -
236 - # on macOS if they would exist they would be called .dylib, but most
237 - # importantly, there are no different providers, so everything
238 - # that's shipped works.
239 - if [[ ${A} != *_mac_* ]] ; then
240 - # this does not exist on arm64 hence -f
241 - rm -fv jre/lib/*/libfreetype.so* || die
242 -
243 - if ! use alsa ; then
244 - rm -v jre/lib/*/libjsoundalsa.so* || die
245 - fi
246 -
247 - if ! use examples ; then
248 - rm -vr sample || die
249 - fi
250 -
251 - if use headless-awt ; then
252 - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
253 - {,jre/}bin/policytool bin/appletviewer || die
254 - fi
255 - fi
256 -
257 - if ! use source ; then
258 - rm -v src.zip || die
259 - fi
260 -
261 - rm -v jre/lib/security/cacerts || die
262 - dosym ../../../../../etc/ssl/certs/java/cacerts \
263 - "${dest}"/jre/lib/security/cacerts
264 -
265 - dodir "${dest}"
266 - cp -pPR * "${ddest}" || die
267 -
268 - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
269 - java-vm_set-pax-markings "${ddest}"
270 - java-vm_revdep-mask
271 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
272 -}