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: Wed, 11 May 2022 20:41:25
Message-Id: 1652300050.d5de0c5d0b5d31137dce15809d070b8d243b37ba.gyakovlev@gentoo
1 commit: d5de0c5d0b5d31137dce15809d070b8d243b37ba
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 11 19:13:05 2022 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed May 11 20:14:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5de0c5d
7
8 dev-java/openjdk-bin: drop 8.312_p07, 8.312_p07-r1
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk-bin/Manifest | 5 -
13 .../openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild | 123 ---------------------
14 dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild | 123 ---------------------
15 3 files changed, 251 deletions(-)
16
17 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
18 index 80a035afc84b..4b4067c337a9 100644
19 --- a/dev-java/openjdk-bin/Manifest
20 +++ b/dev-java/openjdk-bin/Manifest
21 @@ -22,13 +22,8 @@ DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e6
22 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz 192041953 BLAKE2B 76b66b6571d50fd00c80bfdfd63023d070b7fb0f4ecacce86fcc10b651fa193a88ac8357e097d83ee4cfb982cd34b15cf4a9b59441066677d19a29073bee3666 SHA512 25ffa17e6d7c402e976823ac90d6fd6c4f07093c3766c6d48a7d1ecfe5908d6d73efe6f732af8fcb3f4f91b6daa0dd8f4a141ce7aae5fc12f0ed23a1c1e2ebb5
23 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz 192449459 BLAKE2B 506d31e97c7be57a870e80e1beb0bfa72528cb0e5d006b0dc76667f6ef29624165375a91127e3cc934f3135298d748c43a5adcecb9a07c5d758998bbf6551837 SHA512 8d7afed31b37759ba426d412f70c36e380f0f472d850c9ba9e895e0ebd4a2cf9a7f6118526f0a30f6a1d9d880affca4e1ed9848125509ae97e32f506ad78f541
24 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d8b5ace125d62a96ec2b76faf5acf12acd94d3cf6c3f80c84abe9ae91b9e53a85d5f57ff69bd2596cfb5715808d73070c971a5ed8dddec2694a9d64 SHA512 c43075b14450de6763a66c0f73d7836ec880045cc84c1b8f1e72f9e3f1e3ba6057afff27cb3bdcadd89a52c75671ed7cf844299943ba8d3bf86e6c45386fa039
25 -DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
26 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
27 -DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
28 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz 98420081 BLAKE2B 77d735d6f07320d226cf575c84f3879d7dafb4fa4ce06c737e7bdaf4f731af323c3ed0bdbd66067200ef350c7b5202c75bdf7cdc2a538c54ef1058be54a9d57f SHA512 b355c813b2b382bb37c2ca34c01a631b6651e0559a864286c04518332c513d1f833f8441bed52ecc1e24074951a2e5149ce60c88fa2490165d43d0058efe073c
29 -DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
30 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
31 -DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
32 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz 103063877 BLAKE2B 9ca165707b4f02eeb5156a5379d246942eb06ffe4338490600e7a834c49c1199d46cd098bbcd8041e7c58107ccb657818e6ea37cdd39018a17a87e370c32665b SHA512 6ec164df1f95d2c8921b5d90c2dbd208107fa20e66d97e2920dbefd2b616214609392e36b885700bba14571d10848f412194db2f18206c1a21d16e6df7e29e53
33 -DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
34 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz 108075347 BLAKE2B 89c81377516b737e1ce096b66c8460c86f77229c8a7021471e6c67ae738c99183dbe4e5d868de0de5251cca9eb5bcf888f88526a8390a56eb33bb6270038ebfb SHA512 5f9e6036ca72b015609c503b8446b79013dd4aac09349e3c65c9df0e91e2541f3672d867006cd1f236cdd8a60e16671c6e4423d5d6e85a5a31f6f97f1d168434
35
36 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild
37 deleted file mode 100644
38 index 3144abff510b..000000000000
39 --- a/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild
40 +++ /dev/null
41 @@ -1,123 +0,0 @@
42 -# Copyright 1999-2022 Gentoo Authors
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=8
46 -
47 -inherit java-vm-2
48 -
49 -abi_uri() {
50 - local os=linux
51 - case ${2} in
52 - *-macos) os=mac ;;
53 - *-solaris) os=solaris ;;
54 - esac
55 - echo "${2-$1}? (
56 - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
57 - )"
58 -}
59 -
60 -# they have different tarball names for different arches...
61 -# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
62 -# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
63 -
64 -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
65 -SLOT="$(ver_cut 1)"
66 -
67 -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
68 -HOMEPAGE="https://adoptium.net"
69 -SRC_URI="
70 - $(abi_uri aarch64 arm64)
71 - $(abi_uri arm)
72 - $(abi_uri ppc64le ppc64)
73 - $(abi_uri x64 amd64)
74 - $(abi_uri x64 x64-macos)
75 -"
76 -
77 -LICENSE="GPL-2-with-classpath-exception"
78 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
79 -
80 -IUSE="alsa cups examples headless-awt selinux source"
81 -
82 -RDEPEND="
83 - >=sys-apps/baselayout-java-0.1.0-r1
84 - kernel_linux? (
85 - media-libs/fontconfig:1.0
86 - media-libs/freetype:2
87 - >=sys-libs/glibc-2.2.5:*
88 - sys-libs/zlib
89 - alsa? ( media-libs/alsa-lib )
90 - arm? ( dev-libs/libffi-compat:6 )
91 - cups? ( net-print/cups )
92 - selinux? ( sec-policy/selinux-java )
93 - !headless-awt? (
94 - x11-libs/libX11
95 - x11-libs/libXext
96 - x11-libs/libXi
97 - x11-libs/libXrender
98 - x11-libs/libXtst
99 - )
100 - )
101 -"
102 -
103 -RESTRICT="preserve-libs strip"
104 -QA_PREBUILT="*"
105 -
106 -S="${WORKDIR}/jdk${MY_PV}"
107 -
108 -src_unpack() {
109 - default
110 - # 753575
111 - if use arm; then
112 - mv -v "${S}"* "${S}" || die
113 - elif [[ ${A} == *_mac_* ]] ; then
114 - mv -v "${S}/Contents/Home/"* "${S}" || die
115 - rm -Rf "${S}/Contents" # drop macOS executable
116 - fi
117 -}
118 -
119 -src_install() {
120 - local dest="/opt/${P}"
121 - local ddest="${ED}/${dest#/}"
122 -
123 - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
124 -
125 - # on macOS if they would exist they would be called .dylib, but most
126 - # importantly, there are no different providers, so everything
127 - # that's shipped works.
128 - if [[ ${A} != *_mac_* ]] ; then
129 - # this does not exist on arm64 hence -f
130 - rm -fv jre/lib/*/libfreetype.so* || die
131 -
132 - if ! use alsa ; then
133 - rm -v jre/lib/*/libjsoundalsa.so* || die
134 - fi
135 -
136 - if ! use examples ; then
137 - rm -vr sample || die
138 - fi
139 -
140 - if use headless-awt ; then
141 - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
142 - {,jre/}bin/policytool bin/appletviewer || die
143 - fi
144 - fi
145 -
146 - if ! use source ; then
147 - rm -v src.zip || die
148 - fi
149 -
150 - rm -v jre/lib/security/cacerts || die
151 - dosym ../../../../../etc/ssl/certs/java/cacerts \
152 - "${dest}"/jre/lib/security/cacerts
153 -
154 - dodir "${dest}"
155 - cp -pPR * "${ddest}" || die
156 -
157 - # provide stable symlink
158 - dosym "${P}" "/opt/${PN}-${SLOT}"
159 -
160 - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
161 - java-vm_set-pax-markings "${ddest}"
162 - java-vm_revdep-mask
163 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
164 -}
165
166 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild
167 deleted file mode 100644
168 index 6abd1ee29121..000000000000
169 --- a/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild
170 +++ /dev/null
171 @@ -1,123 +0,0 @@
172 -# Copyright 1999-2021 Gentoo Authors
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=6
176 -
177 -inherit eapi7-ver java-vm-2
178 -
179 -abi_uri() {
180 - local os=linux
181 - case ${2} in
182 - *-macos) os=mac ;;
183 - *-solaris) os=solaris ;;
184 - esac
185 - echo "${2-$1}? (
186 - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
187 - )"
188 -}
189 -
190 -# they have different tarball names for different arches...
191 -# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
192 -# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
193 -
194 -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
195 -SLOT="$(ver_cut 1)"
196 -
197 -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
198 -HOMEPAGE="https://adoptium.net"
199 -SRC_URI="
200 - $(abi_uri aarch64 arm64)
201 - $(abi_uri arm)
202 - $(abi_uri ppc64le ppc64)
203 - $(abi_uri x64 amd64)
204 - $(abi_uri x64 x64-macos)
205 -"
206 -
207 -LICENSE="GPL-2-with-classpath-exception"
208 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
209 -
210 -IUSE="alsa cups examples headless-awt selinux source"
211 -
212 -RDEPEND="
213 - >=sys-apps/baselayout-java-0.1.0-r1
214 - kernel_linux? (
215 - media-libs/fontconfig:1.0
216 - media-libs/freetype:2
217 - >=sys-libs/glibc-2.2.5:*
218 - sys-libs/zlib
219 - alsa? ( media-libs/alsa-lib )
220 - arm? ( dev-libs/libffi-compat:6 )
221 - cups? ( net-print/cups )
222 - selinux? ( sec-policy/selinux-java )
223 - !headless-awt? (
224 - x11-libs/libX11
225 - x11-libs/libXext
226 - x11-libs/libXi
227 - x11-libs/libXrender
228 - x11-libs/libXtst
229 - )
230 - )
231 -"
232 -
233 -RESTRICT="preserve-libs strip"
234 -QA_PREBUILT="*"
235 -
236 -S="${WORKDIR}/jdk${MY_PV}"
237 -
238 -src_unpack() {
239 - default
240 - # 753575
241 - if use arm; then
242 - mv -v "${S}"* "${S}" || die
243 - elif [[ ${A} == *_mac_* ]] ; then
244 - mv -v "${S}/Contents/Home/"* "${S}" || die
245 - rm -Rf "${S}/Contents" # drop macOS executable
246 - fi
247 -}
248 -
249 -src_install() {
250 - local dest="/opt/${P}"
251 - local ddest="${ED%/}/${dest#/}"
252 -
253 - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
254 -
255 - # on macOS if they would exist they would be called .dylib, but most
256 - # importantly, there are no different providers, so everything
257 - # that's shipped works.
258 - if [[ ${A} != *_mac_* ]] ; then
259 - # this does not exist on arm64 hence -f
260 - rm -fv jre/lib/*/libfreetype.so* || die
261 -
262 - if ! use alsa ; then
263 - rm -v jre/lib/*/libjsoundalsa.so* || die
264 - fi
265 -
266 - if ! use examples ; then
267 - rm -vr sample || die
268 - fi
269 -
270 - if use headless-awt ; then
271 - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
272 - {,jre/}bin/policytool bin/appletviewer || die
273 - fi
274 - fi
275 -
276 - if ! use source ; then
277 - rm -v src.zip || die
278 - fi
279 -
280 - rm -v jre/lib/security/cacerts || die
281 - dosym ../../../../../etc/ssl/certs/java/cacerts \
282 - "${dest}"/jre/lib/security/cacerts
283 -
284 - dodir "${dest}"
285 - cp -pPR * "${ddest}" || die
286 -
287 - # provide stable symlink
288 - dosym "${P}" "/opt/${PN}-${SLOT}"
289 -
290 - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
291 - java-vm_set-pax-markings "${ddest}"
292 - java-vm_revdep-mask
293 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
294 -}