1 |
commit: c75e137e7d8f5a747f27d597df6c9a356a20ea3f |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 27 18:26:28 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 27 18:28:27 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75e137e |
7 |
|
8 |
dev-java/openjdk-bin: drop old 11.x |
9 |
|
10 |
Bug: https://bugs.gentoo.org/782367 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
dev-java/openjdk-bin/Manifest | 9 -- |
15 |
dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild | 132 --------------------- |
16 |
dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild | 111 ----------------- |
17 |
3 files changed, 252 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
20 |
index c847b2a2231..c458f93a152 100644 |
21 |
--- a/dev-java/openjdk-bin/Manifest |
22 |
+++ b/dev-java/openjdk-bin/Manifest |
23 |
@@ -1,16 +1,7 @@ |
24 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz 190883956 BLAKE2B 404236a3448a64b3f8a74543179dff076d0eb226250525dd5988f5884f25d9d02fd561d3155144082aca61f825b5565593a4aa6e31a70b864dbe504af6151673 SHA512 043195ceb116380dd6ef1a51cfc172f798f7494913af074eb959a8871aebf9e89b2396bfba018cb39d3e5792274ba518c49c0ca3cdbc1ee08839af295dbfd2be |
25 |
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz 189549576 BLAKE2B 9eb55593643911573dbb7aa0f69169cf63c0cd8d0a4b4d3a4bf42131f2dfa51305c55c26e802f07fddd70911dba20c4d7b57983782aa2da61fa730f12258a94c SHA512 f2aa4514bad0a4116d0b703adef866f420b1bf264781b58d4075c54747856a657ec7fd1ef622712419823f76a87b9965426f59e5c66b21dbc073387e66f949a9 |
26 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz 190728488 BLAKE2B beda483e90e733932ca9cf9631ae3f97b7106fd3c80b4a70465f9d32d52bf2ba4f395fa5ad7b08a4998e5c72f3794e0189750a883422aaeaf42877750d7c4647 SHA512 a9fbd1336357bf7880e6eebaab9649ca2b5db5ea93bb184e9fa682d64f18bfa0addb87de5a04e13bc337536b2edce5189bba703c8eb3a524567073add6d29a95 |
27 |
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz 182395059 BLAKE2B 585a5bb34c61526e1ff233b86bb8be9757a3aad14ffe3c7825b77a3f3d6aaa02dd3db5f6c1a033c83808f0b3df56d5b1c1913c159a09ef7e5448731120bb5689 SHA512 65bfc7949c6d2b04d06076dce903ae8036afc73980b709cd7a925b36815adc565c160362c421c13bca077a54ba13861ac1434e13f23eec6394f9f84e8a49edbb |
28 |
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae126f1c2bb00f97571d4bb3316ecf5ee36a18895eefb48db616996dcdf363acbbd8ac17ecb6a507cc0f3a811f476cd72993b42e0a0b857b82c3e2d4d5279 SHA512 33cdc99dcf119a3f5161cdc08853ed1b8a1630f884577b6a167cf79621b0fa6f87ec652452fce0e27ee550b63952fcf75a3a6bd70c61564faafc0e8e1c74c0bf |
29 |
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz 182835103 BLAKE2B 2b8849c5b9f490bf7700317525d3538ace19abcd73436a5c27251a282348345dba3c438c062ee60a2070f64c8c8e93a5d5d632a44f410775ed4fff1d691219f8 SHA512 707efc9d0660f0c06d4955e56761422b9da41b5afacfa337711c6a2500441f80fad1c65d8a4b0a1334ec6d5c6e55d464fc1cff1ade21e8cca42cffd0c161c1e2 |
30 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz 176435718 BLAKE2B c99ed49a093d9bbb30ece0d7157dd2664eca0fe334d379b282410a5ddb90d80a52ba85da6c32d16a1b08be37cb098b34d5465c2de593b4562c1c46f60e626fb6 SHA512 0bd978a09886078f646cab2fb856e99a08498e7170e2031df9d1e3c813200f8d9d152737e3d7cf8c6bf845f59c792f1aa13f7a6693de9f87ebe6a12c25e80af8 |
31 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz 174865783 BLAKE2B 717168b8b2dc326495dc41f3af2d85b515c10774ae58f35bcdf86694d89b1e11db50be24f4c046add5223e912448d67c2ecac8a3a6f3ca2dca3e915fa61f9654 SHA512 dafd40c133fd83c06a29816f4e45ff63e588ea5e6046fe331acbee4eb5efac4b3fc7da0f0fd55e4044846a053644a71efa00e45cf4ba39106b8d1018f9bca0ec |
32 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890 |
33 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz 194069769 BLAKE2B b537bdf553b1da11c06ba8aed7f2baa498da384209b5c94b22995a6d05e1d83b4fee215c6c27e1975e6d2e04805916f85c8fa244f53a6f002d3eb42d56898b74 SHA512 993881259ba470030c589f272d239aa185b1b460c4d505a266cb99f7107de2aa646b3cb8bb8d38fa454d226228c6d3dd8245301c8535c7f6b3bec766cc555bf9 |
34 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a0934d358d255df743e241fa5040bbc48746b5fd131e98a9b253add114d3504a0f4b10887d9b86189da4f2bccfc65134247b0580d96e2fa7ae9374d44ff38 SHA512 b79eb8a672706b643773711a59a756de88eadd54e74bfef7dad14a0f7ab7412ee6c457b4d3489f6c530abbd442307a9355b5d4a01d2610f90cfd614b614f6507 |
35 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727 |
36 |
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz 186160219 BLAKE2B 5a044db5ff02dadd8a1677254c8653e14f41e09e4180dc8726d35dd293193e8a332db54aede19d7a2c2bd3c3b3c799cb0faa315bfd9deda03c231fd01670ff61 SHA512 cd115893162a9db3e7e5763028a0040eb83773ae82cd056fdb9400ae3a2b720e7e1bee24a0251ea29eb01923400a1c459d3fbca08bf563d15f7434f5a4d6c69f |
37 |
DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e |
38 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4 |
39 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c |
40 |
|
41 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild |
42 |
deleted file mode 100644 |
43 |
index 3eaf868c6d2..00000000000 |
44 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild |
45 |
+++ /dev/null |
46 |
@@ -1,132 +0,0 @@ |
47 |
-# Copyright 1999-2021 Gentoo Authors |
48 |
-# Distributed under the terms of the GNU General Public License v2 |
49 |
- |
50 |
-EAPI=6 |
51 |
- |
52 |
-inherit java-vm-2 toolchain-funcs |
53 |
- |
54 |
-abi_uri() { |
55 |
- local os=linux |
56 |
- case ${2} in |
57 |
- *-macos) os=mac ;; |
58 |
- *-solaris) os=solaris ;; |
59 |
- esac |
60 |
- echo "${2-$1}? ( |
61 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz |
62 |
- )" |
63 |
-} |
64 |
- |
65 |
-MY_PV=${PV/_p/+} |
66 |
-SLOT=${MY_PV%%[.+]*} |
67 |
- |
68 |
-SRC_URI=" |
69 |
- $(abi_uri arm) |
70 |
- $(abi_uri aarch64 arm64) |
71 |
- $(abi_uri ppc64le ppc64) |
72 |
- $(abi_uri x64 amd64) |
73 |
- $(abi_uri x64 x64-macos) |
74 |
-" |
75 |
- |
76 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
77 |
-HOMEPAGE="https://adoptopenjdk.net" |
78 |
-LICENSE="GPL-2-with-classpath-exception" |
79 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" |
80 |
-IUSE="alsa cups +gentoo-vm 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 |
- cups? ( net-print/cups ) |
91 |
- selinux? ( sec-policy/selinux-java ) |
92 |
- !headless-awt? ( |
93 |
- x11-libs/libX11 |
94 |
- x11-libs/libXext |
95 |
- x11-libs/libXi |
96 |
- x11-libs/libXrender |
97 |
- x11-libs/libXtst |
98 |
- ) |
99 |
- )" |
100 |
- |
101 |
-RESTRICT="preserve-libs splitdebug" |
102 |
-QA_PREBUILT="*" |
103 |
- |
104 |
-S="${WORKDIR}/jdk-${MY_PV}" |
105 |
- |
106 |
-pkg_pretend() { |
107 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
108 |
- die "These binaries require a hardfloat system." |
109 |
- fi |
110 |
-} |
111 |
- |
112 |
-src_unpack() { |
113 |
- default |
114 |
- if [[ ${A} == *_mac_* ]] ; then |
115 |
- mv -v "${S}/Contents/Home/"* "${S}" || die |
116 |
- rm -Rf "${S}/Contents" # drop macOS executable |
117 |
- fi |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- local dest="/opt/${P}" |
122 |
- local ddest="${ED%/}/${dest#/}" |
123 |
- |
124 |
- # on macOS if they would exist they would be called .dylib, but most |
125 |
- # importantly, there are no different providers, so everything |
126 |
- # that's shipped works. |
127 |
- if [[ ${A} != *_mac_* ]] ; then |
128 |
- # Not sure why they bundle this as it's commonly available and they |
129 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
130 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
131 |
- rm -vf lib/libfreetype.so || die |
132 |
- |
133 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
134 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
135 |
- if ! use alsa ; then |
136 |
- rm -v lib/libjsound.* || die |
137 |
- fi |
138 |
- |
139 |
- if use headless-awt ; then |
140 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
141 |
- fi |
142 |
- fi |
143 |
- |
144 |
- if ! use source ; then |
145 |
- rm -v lib/src.zip || die |
146 |
- fi |
147 |
- |
148 |
- rm -v lib/security/cacerts || die |
149 |
- dosym ../../../../etc/ssl/certs/java/cacerts \ |
150 |
- "${dest}"/lib/security/cacerts |
151 |
- |
152 |
- dodir "${dest}" |
153 |
- cp -pPR * "${ddest}" || die |
154 |
- |
155 |
- # provide stable symlink |
156 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
157 |
- |
158 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
159 |
- java-vm_set-pax-markings "${ddest}" |
160 |
- java-vm_revdep-mask |
161 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
162 |
-} |
163 |
- |
164 |
-pkg_postinst() { |
165 |
- java-vm-2_pkg_postinst |
166 |
- |
167 |
- if use gentoo-vm ; then |
168 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
169 |
- ewarn "recognised by the system. This will almost certainly break" |
170 |
- ewarn "many java ebuilds as they are not ready for openjdk-11" |
171 |
- else |
172 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
173 |
- ewarn "will not be recognised by the system. For example, simply calling" |
174 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
175 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
176 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
177 |
- fi |
178 |
-} |
179 |
|
180 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild |
181 |
deleted file mode 100644 |
182 |
index 94b04394047..00000000000 |
183 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.9_p11.ebuild |
184 |
+++ /dev/null |
185 |
@@ -1,111 +0,0 @@ |
186 |
-# Copyright 1999-2020 Gentoo Authors |
187 |
-# Distributed under the terms of the GNU General Public License v2 |
188 |
- |
189 |
-EAPI=6 |
190 |
- |
191 |
-inherit java-vm-2 toolchain-funcs |
192 |
- |
193 |
-abi_uri() { |
194 |
- echo "${2-$1}? ( |
195 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
196 |
- )" |
197 |
-} |
198 |
- |
199 |
-MY_PV=${PV/_p/+} |
200 |
-SLOT=${MY_PV%%[.+]*} |
201 |
- |
202 |
-SRC_URI=" |
203 |
- $(abi_uri arm) |
204 |
- $(abi_uri aarch64 arm64) |
205 |
- $(abi_uri ppc64le ppc64) |
206 |
- $(abi_uri x64 amd64) |
207 |
-" |
208 |
- |
209 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
210 |
-HOMEPAGE="https://adoptopenjdk.net" |
211 |
-LICENSE="GPL-2-with-classpath-exception" |
212 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
213 |
-IUSE="alsa cups +gentoo-vm headless-awt selinux source" |
214 |
- |
215 |
-RDEPEND=" |
216 |
- media-libs/fontconfig:1.0 |
217 |
- media-libs/freetype:2 |
218 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
219 |
- >=sys-libs/glibc-2.2.5:* |
220 |
- sys-libs/zlib |
221 |
- alsa? ( media-libs/alsa-lib ) |
222 |
- cups? ( net-print/cups ) |
223 |
- selinux? ( sec-policy/selinux-java ) |
224 |
- !headless-awt? ( |
225 |
- x11-libs/libX11 |
226 |
- x11-libs/libXext |
227 |
- x11-libs/libXi |
228 |
- x11-libs/libXrender |
229 |
- x11-libs/libXtst |
230 |
- )" |
231 |
- |
232 |
-RESTRICT="preserve-libs splitdebug" |
233 |
-QA_PREBUILT="*" |
234 |
- |
235 |
-S="${WORKDIR}/jdk-${MY_PV}" |
236 |
- |
237 |
-pkg_pretend() { |
238 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
239 |
- die "These binaries require a hardfloat system." |
240 |
- fi |
241 |
-} |
242 |
- |
243 |
-src_install() { |
244 |
- local dest="/opt/${P}" |
245 |
- local ddest="${ED%/}/${dest#/}" |
246 |
- |
247 |
- # Not sure why they bundle this as it's commonly available and they |
248 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
249 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
250 |
- rm -vf lib/libfreetype.so || die |
251 |
- |
252 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
253 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
254 |
- if ! use alsa ; then |
255 |
- rm -v lib/libjsound.* || die |
256 |
- fi |
257 |
- |
258 |
- if use headless-awt ; then |
259 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
260 |
- fi |
261 |
- |
262 |
- if ! use source ; then |
263 |
- rm -v lib/src.zip || die |
264 |
- fi |
265 |
- |
266 |
- rm -v lib/security/cacerts || die |
267 |
- dosym ../../../../etc/ssl/certs/java/cacerts \ |
268 |
- "${dest}"/lib/security/cacerts |
269 |
- |
270 |
- dodir "${dest}" |
271 |
- cp -pPR * "${ddest}" || die |
272 |
- |
273 |
- # provide stable symlink |
274 |
- dosym "${P}" "/opt/${PN}-${SLOT}" |
275 |
- |
276 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
277 |
- java-vm_set-pax-markings "${ddest}" |
278 |
- java-vm_revdep-mask |
279 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
280 |
-} |
281 |
- |
282 |
-pkg_postinst() { |
283 |
- java-vm-2_pkg_postinst |
284 |
- |
285 |
- if use gentoo-vm ; then |
286 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
287 |
- ewarn "recognised by the system. This will almost certainly break" |
288 |
- ewarn "many java ebuilds as they are not ready for openjdk-11" |
289 |
- else |
290 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
291 |
- ewarn "will not be recognised by the system. For example, simply calling" |
292 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
293 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
294 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
295 |
- fi |
296 |
-} |