1 |
commit: ba62eeaae25c5bcc1bad59ad0de3bb52a83ed6f4 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 11 19:13:37 2022 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 11 20:14:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba62eeaa |
7 |
|
8 |
dev-java/openjdk-bin: drop 11.0.13_p8, 11.0.13_p8-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-11.0.13_p8-r1.ebuild | 124 --------------------- |
14 |
dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild | 124 --------------------- |
15 |
3 files changed, 253 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
18 |
index 4b4067c337a9..61010eadf897 100644 |
19 |
--- a/dev-java/openjdk-bin/Manifest |
20 |
+++ b/dev-java/openjdk-bin/Manifest |
21 |
@@ -1,13 +1,8 @@ |
22 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz 189667474 BLAKE2B e79c362e30a21871ed56b95a51d17bbcae4d16ccb9f1747c00615537aedaf6b43a675d2fe66638f95d06a7a6bec3c296c5c198ac4595707f434e228e899aec70 SHA512 317cce81d129f823a63d4f1a234826d28bb8e9799b5dcc9c0d6b84fc44d2bab9713875f08416c1db6ca5d8c23bdb63e7837fc640b5931940be365ea059e165d9 |
23 |
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz 189849188 BLAKE2B e4d5d5d20b54642cec8941bbfb2a8523ed4f12185bed235d2dded02eca4ef6628ed5b8e36f614278ecad966b2c7cb4ab3b74d696b10718f56faf83834de424db SHA512 299478112d15b335d2cc802e8bcac3a00eb55cfedacbc0c62e462277dce10bfd45de789d760650171a064a574834b2c24e31e70914d63e82362da190e417105d |
24 |
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz 180757722 BLAKE2B b34bb2c2346609da20bc27db5e1dd0f7aa124ea9ac9e7501ce2a374b61596f96e950a7d69e675dad1dd16037183dbbd155089c6b10d965adff56f000ab19355b SHA512 88500ddbff3c58a69ec450428bfa1ade8e01056c926fbaf77d6908d08b24b0e0536a4d067f32cdb50fb6003cdcc2b22509c5478e080e748c001340334514c711 |
25 |
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.14_9.tar.gz 180888469 BLAKE2B f5fb5a52c4f0b8c997d0a44122262e2754ab0a0adf369d095793ddf07b8189df7f9b2fa6503d5e765b7d0f792d98b88ea1ce7a23abde1c53dc42ffe90e077671 SHA512 a0e9d5aa5d1ccce23f1197e75e412c6a5369e30adcbe07e3c4c4f5b8448d88e0ea68455b42ac766ec825e0076a6d55d82ac745e0081c7ce4a79304f3d623940a |
26 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz 174991442 BLAKE2B 376fe73257f8518599be31262d83d1a01381cd9891fb45c18460bdf33c3569b3032206363593db5b7e3006b895ab855407a1938cbabed0fc58f3bcc86c650cb4 SHA512 d3ef319edc1f29b12e681c09e639cf296ff4e4890c81ecb2c8bb38ea2936f5425ae892420a53db5a0796b192f55a9a8c97b850d8bd400d6d7a8b3c4effc90f34 |
27 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz 175127578 BLAKE2B ed7f55434b0273765c78c3efd8a5ae622e2fa7557334af74784f0e99936d489c3d191197fec251a4d8532c66727bdd9188344d3591cce623aa2553e79ee5da67 SHA512 bf4b3f18499420a44ed40fb2d751f294b5354d5b1d278725de97de9be7d2f37fbe5c281c50e33aceebd880d59d35de799454ca0a7bd382b5b3d8729286986d5b |
28 |
DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz 192425435 BLAKE2B 3e98f8819bf36aaee0ae009e97c7efa9a26dfc55b856e3d2d098d266621c97b5a8448331888e18eb5a8ea164875020db59cb9be61f3756fa87f9376c2b6e5f6b SHA512 667bc8e6d745c693e5e60e332f491fd485e3f4d99e1543d6e72f1b64956e56b4e6892f3a47e642809378f0a8a8dfaaa034ac96a0aa70b0b7fec51ec53bafbaa7 |
29 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz 192958006 BLAKE2B 441d396e0c43c78bb3802800f58779999dfa2275c4e0e0a048e28e3b99a41044b9c66904f1eba435cc22ab1bcf6d6d98723b8b090eefdece4d712279f36a74fa SHA512 abcbc5b781749e3c8fbcfb999e724d4862c03d60c78962d75d31b7cbc71124b04488872bc70f6a6642ec59b6d2289c391b564fc5fd7f465863f96dd4d2b5207d |
30 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz 193109331 BLAKE2B d1f3031c479bc32e3d4d56fb914c33c9e19444ef3b4fd836c52623619872d11cea843904d1425cdbfde2181f41bc63d97c14a479a134ae7280b4b5e49f7789ff SHA512 27d1a8627e6e97d4830f2b8839a7f8455d1e0680853049eb1417f78c5b8e05dc2e8f48520770b422797021a169c80ddbb0c907a5e40e02a4d951a429c5a2c86f |
31 |
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz 190666788 BLAKE2B 9248072292727e6ac6d3f1783996c13ad7c78418da444d96e8df3c11ac1f2a7c047dcc16951dbabcfa0e46d7121c91e916940ef0749e982f20b6fc36be516d64 SHA512 603ddb6f01a556040e56a8f1d0769636295e2c1579f07d1f58828ab1db9634cc07cada66496a6144cc6de29469eedd02e6fa788961a9e4e6b5c7c6a5fd94839e |
32 |
DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz 191414234 BLAKE2B abc031558434dc4f800ab2f3251f66cddd49f2296933ae34c58406a1780982693106fe6f37747e48365bd4b6c9f9dd20e0492ddcca62d7e2555df776297d6f96 SHA512 a306fbd6775f4186483e0403f593f599af95e295acc46cba44dd0758dfae8b6a7b1b6ef4581c2ecac1f18b5e98a84e3e3900fae6ca948b74aba2c62a63c00dee |
33 |
DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2b4272ae91f12b8a4c7a3c1cf2eab250102ff1590c84f2f3612bc206337477284d63914dddcecd8dc259da1ddd08a1fc6e3c52a37b0cbb5ed0187456c2b24e SHA512 8289fb50b06f08c6288bcbab9e609a24744f123568a901b5ea4f2c1928bfdc236a9a9cfa572708c56f1f7f844b17562f9ddcb502b15df8ac8bc7d1ef758a741b |
34 |
DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz 188965124 BLAKE2B 659bf8518b3104e1fedd116cb9af8b0455d323ce883485f5e42cc9d1fb4d9bae5556757b309a7473559bd67c17a9aa0e0c51934e549141b25dcaeb9032a55b80 SHA512 5eadc730b39f6300be7b64a0a4e9d87873cdfa7b0a031923ddfab473affd5b22788a33e2f01412c99c2e42ffb2774cc655c732e7721a6fc02c2b34a42dc9088d |
35 |
|
36 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild |
37 |
deleted file mode 100644 |
38 |
index bc75e084b8ea..000000000000 |
39 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,124 +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 toolchain-funcs |
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}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz |
57 |
- )" |
58 |
-} |
59 |
- |
60 |
-MY_PV=${PV/_p/+} |
61 |
-SLOT=${MY_PV%%[.+]*} |
62 |
- |
63 |
-SRC_URI=" |
64 |
- $(abi_uri arm) |
65 |
- $(abi_uri aarch64 arm64) |
66 |
- $(abi_uri ppc64le ppc64) |
67 |
- $(abi_uri x64 amd64) |
68 |
- $(abi_uri x64 x64-macos) |
69 |
-" |
70 |
- |
71 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" |
72 |
-HOMEPAGE="https://adoptium.net" |
73 |
-LICENSE="GPL-2-with-classpath-exception" |
74 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" |
75 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux source" |
76 |
- |
77 |
-RDEPEND=" |
78 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
79 |
- kernel_linux? ( |
80 |
- media-libs/fontconfig:1.0 |
81 |
- media-libs/freetype:2 |
82 |
- media-libs/harfbuzz |
83 |
- >=sys-libs/glibc-2.2.5:* |
84 |
- sys-libs/zlib |
85 |
- alsa? ( media-libs/alsa-lib ) |
86 |
- cups? ( net-print/cups ) |
87 |
- selinux? ( sec-policy/selinux-java ) |
88 |
- !headless-awt? ( |
89 |
- x11-libs/libX11 |
90 |
- x11-libs/libXext |
91 |
- x11-libs/libXi |
92 |
- x11-libs/libXrender |
93 |
- x11-libs/libXtst |
94 |
- ) |
95 |
- )" |
96 |
- |
97 |
-RESTRICT="preserve-libs splitdebug" |
98 |
-QA_PREBUILT="*" |
99 |
- |
100 |
-S="${WORKDIR}/jdk-${MY_PV}" |
101 |
- |
102 |
-pkg_pretend() { |
103 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
104 |
- die "These binaries require a hardfloat system." |
105 |
- fi |
106 |
-} |
107 |
- |
108 |
-src_unpack() { |
109 |
- default |
110 |
- if [[ ${A} == *_mac_* ]] ; then |
111 |
- mv -v "${S}/Contents/Home/"* "${S}" || die |
112 |
- rm -Rf "${S}/Contents" # drop macOS executable |
113 |
- fi |
114 |
-} |
115 |
- |
116 |
-src_install() { |
117 |
- local dest="/opt/${P}" |
118 |
- local ddest="${ED}/${dest#/}" |
119 |
- |
120 |
- # on macOS if they would exist they would be called .dylib, but most |
121 |
- # importantly, there are no different providers, so everything |
122 |
- # that's shipped works. |
123 |
- if [[ ${A} != *_mac_* ]] ; then |
124 |
- # Not sure why they bundle this as it's commonly available and they |
125 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
126 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
127 |
- rm -vf lib/libfreetype.so || die |
128 |
- |
129 |
- # prefer system copy # https://bugs.gentoo.org/776676 |
130 |
- rm -vf lib/libharfbuzz.so || die |
131 |
- |
132 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
133 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
134 |
- if ! use alsa ; then |
135 |
- rm -v lib/libjsound.* || die |
136 |
- fi |
137 |
- |
138 |
- if use headless-awt ; then |
139 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
140 |
- fi |
141 |
- fi |
142 |
- |
143 |
- if ! use source ; then |
144 |
- rm -v lib/src.zip || die |
145 |
- fi |
146 |
- |
147 |
- rm -v lib/security/cacerts || die |
148 |
- dosym ../../../../etc/ssl/certs/java/cacerts \ |
149 |
- "${dest}"/lib/security/cacerts |
150 |
- |
151 |
- dodir "${dest}" |
152 |
- cp -pPR * "${ddest}" || die |
153 |
- |
154 |
- # provide stable symlink |
155 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
156 |
- |
157 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
158 |
- java-vm_set-pax-markings "${ddest}" |
159 |
- java-vm_revdep-mask |
160 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
161 |
-} |
162 |
- |
163 |
-pkg_postinst() { |
164 |
- java-vm-2_pkg_postinst |
165 |
-} |
166 |
|
167 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild |
168 |
deleted file mode 100644 |
169 |
index 12b3337375bf..000000000000 |
170 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild |
171 |
+++ /dev/null |
172 |
@@ -1,124 +0,0 @@ |
173 |
-# Copyright 1999-2022 Gentoo Authors |
174 |
-# Distributed under the terms of the GNU General Public License v2 |
175 |
- |
176 |
-EAPI=6 |
177 |
- |
178 |
-inherit java-vm-2 toolchain-funcs |
179 |
- |
180 |
-abi_uri() { |
181 |
- local os=linux |
182 |
- case ${2} in |
183 |
- *-macos) os=mac ;; |
184 |
- *-solaris) os=solaris ;; |
185 |
- esac |
186 |
- echo "${2-$1}? ( |
187 |
- https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz |
188 |
- )" |
189 |
-} |
190 |
- |
191 |
-MY_PV=${PV/_p/+} |
192 |
-SLOT=${MY_PV%%[.+]*} |
193 |
- |
194 |
-SRC_URI=" |
195 |
- $(abi_uri arm) |
196 |
- $(abi_uri aarch64 arm64) |
197 |
- $(abi_uri ppc64le ppc64) |
198 |
- $(abi_uri x64 amd64) |
199 |
- $(abi_uri x64 x64-macos) |
200 |
-" |
201 |
- |
202 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" |
203 |
-HOMEPAGE="https://adoptium.net" |
204 |
-LICENSE="GPL-2-with-classpath-exception" |
205 |
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos" |
206 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux source" |
207 |
- |
208 |
-RDEPEND=" |
209 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
210 |
- kernel_linux? ( |
211 |
- media-libs/fontconfig:1.0 |
212 |
- media-libs/freetype:2 |
213 |
- media-libs/harfbuzz |
214 |
- >=sys-libs/glibc-2.2.5:* |
215 |
- sys-libs/zlib |
216 |
- alsa? ( media-libs/alsa-lib ) |
217 |
- cups? ( net-print/cups ) |
218 |
- selinux? ( sec-policy/selinux-java ) |
219 |
- !headless-awt? ( |
220 |
- x11-libs/libX11 |
221 |
- x11-libs/libXext |
222 |
- x11-libs/libXi |
223 |
- x11-libs/libXrender |
224 |
- x11-libs/libXtst |
225 |
- ) |
226 |
- )" |
227 |
- |
228 |
-RESTRICT="preserve-libs splitdebug" |
229 |
-QA_PREBUILT="*" |
230 |
- |
231 |
-S="${WORKDIR}/jdk-${MY_PV}" |
232 |
- |
233 |
-pkg_pretend() { |
234 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
235 |
- die "These binaries require a hardfloat system." |
236 |
- fi |
237 |
-} |
238 |
- |
239 |
-src_unpack() { |
240 |
- default |
241 |
- if [[ ${A} == *_mac_* ]] ; then |
242 |
- mv -v "${S}/Contents/Home/"* "${S}" || die |
243 |
- rm -Rf "${S}/Contents" # drop macOS executable |
244 |
- fi |
245 |
-} |
246 |
- |
247 |
-src_install() { |
248 |
- local dest="/opt/${P}" |
249 |
- local ddest="${ED%/}/${dest#/}" |
250 |
- |
251 |
- # on macOS if they would exist they would be called .dylib, but most |
252 |
- # importantly, there are no different providers, so everything |
253 |
- # that's shipped works. |
254 |
- if [[ ${A} != *_mac_* ]] ; then |
255 |
- # Not sure why they bundle this as it's commonly available and they |
256 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
257 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
258 |
- rm -vf lib/libfreetype.so || die |
259 |
- |
260 |
- # prefer system copy # https://bugs.gentoo.org/776676 |
261 |
- rm -vf lib/libharfbuzz.so || die |
262 |
- |
263 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
264 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
265 |
- if ! use alsa ; then |
266 |
- rm -v lib/libjsound.* || die |
267 |
- fi |
268 |
- |
269 |
- if use headless-awt ; then |
270 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
271 |
- fi |
272 |
- fi |
273 |
- |
274 |
- if ! use source ; then |
275 |
- rm -v lib/src.zip || die |
276 |
- fi |
277 |
- |
278 |
- rm -v lib/security/cacerts || die |
279 |
- dosym ../../../../etc/ssl/certs/java/cacerts \ |
280 |
- "${dest}"/lib/security/cacerts |
281 |
- |
282 |
- dodir "${dest}" |
283 |
- cp -pPR * "${ddest}" || die |
284 |
- |
285 |
- # provide stable symlink |
286 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
287 |
- |
288 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
289 |
- java-vm_set-pax-markings "${ddest}" |
290 |
- java-vm_revdep-mask |
291 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
292 |
-} |
293 |
- |
294 |
-pkg_postinst() { |
295 |
- java-vm-2_pkg_postinst |
296 |
-} |