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, 01 Dec 2021 11:46:43
Message-Id: 1638359113.cd4a507c34d98ba09d857ac36e424e8bb49237b7.gyakovlev@gentoo
1 commit: cd4a507c34d98ba09d857ac36e424e8bb49237b7
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 11:45:13 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 11:45:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd4a507c
7
8 dev-java/openjdk-bin: drop 11.0.12_p7
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk-bin/Manifest | 5 -
13 dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild | 136 ---------------------
14 2 files changed, 141 deletions(-)
15
16 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
17 index 7f2f1e237149..3d388bd4d246 100644
18 --- a/dev-java/openjdk-bin/Manifest
19 +++ b/dev-java/openjdk-bin/Manifest
20 @@ -1,12 +1,7 @@
21 -DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz 189702606 BLAKE2B 110b03fdc85f9456b253569caa6f6be119045cbecb8e13cd1ecc1566236a9ad860dddad9d46ba88c46396a16f27f080364909bf1587f5bdc96e72c9d0ba0b165 SHA512 c6122bae7269143638e43191505e9ea2265280d039de89b7bc2a79aa89eaa3a1658765d8490c4e363e7e7982575bd309f7e6ac18c4fc7bb915dca2b27e7a6a3f
22 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz 189667474 BLAKE2B e79c362e30a21871ed56b95a51d17bbcae4d16ccb9f1747c00615537aedaf6b43a675d2fe66638f95d06a7a6bec3c296c5c198ac4595707f434e228e899aec70 SHA512 317cce81d129f823a63d4f1a234826d28bb8e9799b5dcc9c0d6b84fc44d2bab9713875f08416c1db6ca5d8c23bdb63e7837fc640b5931940be365ea059e165d9
23 -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.12_7.tar.gz 180761575 BLAKE2B a04e91561aaa6c3e921c61b8956e797c0de20eea98b1356267a3046db9917df65fcec4c569134675e3adaef259572772deb62c0cbe3e70aef01e7984233f78af SHA512 b0ebe7832c5b03930ee72d2f5ff5171dd44cf0fa1c48120fcb508f1be08921e8ce848f4348f0424eaa9955e1be4b04a9d82ebb72e5bc6a2cf8551fa35da093c7
24 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz 180757722 BLAKE2B b34bb2c2346609da20bc27db5e1dd0f7aa124ea9ac9e7501ce2a374b61596f96e950a7d69e675dad1dd16037183dbbd155089c6b10d965adff56f000ab19355b SHA512 88500ddbff3c58a69ec450428bfa1ade8e01056c926fbaf77d6908d08b24b0e0536a4d067f32cdb50fb6003cdcc2b22509c5478e080e748c001340334514c711
25 -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz 175004135 BLAKE2B 36b63c4b8c654c418c244c06d2b2d0d6395ec462c98c3b8548ad15d9f7620b685074307f80c79a0d42e353158d91a2a2c9c2dd6a2d4cca889d2158c2f0736f6a SHA512 34c6c6a309205bb02e52565dbcdb3d7a1f7eff9b7c2212f3a45b519a5032491b8d2c55811b097a6a4a744d4ace38d93ca89c463be9f058008786b1ba0b20cae8
26 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz 174991442 BLAKE2B 376fe73257f8518599be31262d83d1a01381cd9891fb45c18460bdf33c3569b3032206363593db5b7e3006b895ab855407a1938cbabed0fc58f3bcc86c650cb4 SHA512 d3ef319edc1f29b12e681c09e639cf296ff4e4890c81ecb2c8bb38ea2936f5425ae892420a53db5a0796b192f55a9a8c97b850d8bd400d6d7a8b3c4effc90f34
27 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz 192983830 BLAKE2B 4d97711e37b72bb24e9feb14b4902378d02e7bc4fa1f12dd40a277957ebb4b36efb115666124337331bb95a1f53ae3b13ffeededee8c3c0eda66ba9abf937bcc SHA512 73b7c430d4095fd518191a9d85eebb2749d4940eb64a95cca8f3c6fe2392a71239e264b47f4f74b433c488aa0a80cca610c87a49bbc143da1c15b45fb491c62b
28 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz 192958006 BLAKE2B 441d396e0c43c78bb3802800f58779999dfa2275c4e0e0a048e28e3b99a41044b9c66904f1eba435cc22ab1bcf6d6d98723b8b090eefdece4d712279f36a74fa SHA512 abcbc5b781749e3c8fbcfb999e724d4862c03d60c78962d75d31b7cbc71124b04488872bc70f6a6642ec59b6d2289c391b564fc5fd7f465863f96dd4d2b5207d
29 -DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b51f09d6e15ca009291a5f5d81f46d55357c2d80351b3d20b459c37995fe434ffb2d666d64e1311ddc510a5a73a49f0d19c00767dc4749e06e432cd4 SHA512 e38bf5a31c3e453784d4067601b3f2125d528f8d210d3a80910c66fc70b5a5beca56dbc0328ee3add99776bdd6d6284506803e553540ae434c438f2dd706e268
30 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz 190666788 BLAKE2B 9248072292727e6ac6d3f1783996c13ad7c78418da444d96e8df3c11ac1f2a7c047dcc16951dbabcfa0e46d7121c91e916940ef0749e982f20b6fc36be516d64 SHA512 603ddb6f01a556040e56a8f1d0769636295e2c1579f07d1f58828ab1db9634cc07cada66496a6144cc6de29469eedd02e6fa788961a9e4e6b5c7c6a5fd94839e
31 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2b4272ae91f12b8a4c7a3c1cf2eab250102ff1590c84f2f3612bc206337477284d63914dddcecd8dc259da1ddd08a1fc6e3c52a37b0cbb5ed0187456c2b24e SHA512 8289fb50b06f08c6288bcbab9e609a24744f123568a901b5ea4f2c1928bfdc236a9a9cfa572708c56f1f7f844b17562f9ddcb502b15df8ac8bc7d1ef758a741b
32 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz 188832535 BLAKE2B 4ea2e209f7bebde4cfae439773b42cb9d4143eb5b61a5e69fba181946cd3a3dc977966ed14e24ce6b23066450e64bbf204b72b04562f7af381c765bb4ea31d53 SHA512 615806f02c108c08be70d975f3dc402fc2e30f9a961630fe6528eedb7a5ee76ac07851ada5264fe263453eaefc40aa1ded1cefa37d3455af78b04fdf9caf9a93
33
34 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
35 deleted file mode 100644
36 index 1fd28021ae50..000000000000
37 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
38 +++ /dev/null
39 @@ -1,136 +0,0 @@
40 -# Copyright 1999-2021 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=6
44 -
45 -inherit java-vm-2 toolchain-funcs
46 -
47 -abi_uri() {
48 - local os=linux
49 - case ${2} in
50 - *-macos) os=mac ;;
51 - *-solaris) os=solaris ;;
52 - esac
53 - echo "${2-$1}? (
54 - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
55 - )"
56 -}
57 -
58 -MY_PV=${PV/_p/+}
59 -SLOT=${MY_PV%%[.+]*}
60 -
61 -SRC_URI="
62 - $(abi_uri arm)
63 - $(abi_uri aarch64 arm64)
64 - $(abi_uri ppc64le ppc64)
65 - $(abi_uri x64 amd64)
66 - $(abi_uri x64 x64-macos)
67 -"
68 -
69 -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
70 -HOMEPAGE="https://adoptium.net"
71 -LICENSE="GPL-2-with-classpath-exception"
72 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
73 -IUSE="alsa cups +gentoo-vm headless-awt selinux source"
74 -
75 -RDEPEND="
76 - >=sys-apps/baselayout-java-0.1.0-r1
77 - kernel_linux? (
78 - media-libs/fontconfig:1.0
79 - media-libs/freetype:2
80 - media-libs/harfbuzz
81 - >=sys-libs/glibc-2.2.5:*
82 - sys-libs/zlib
83 - alsa? ( media-libs/alsa-lib )
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 splitdebug"
96 -QA_PREBUILT="*"
97 -
98 -S="${WORKDIR}/jdk-${MY_PV}"
99 -
100 -pkg_pretend() {
101 - if [[ "$(tc-is-softfloat)" != "no" ]]; then
102 - die "These binaries require a hardfloat system."
103 - fi
104 -}
105 -
106 -src_unpack() {
107 - default
108 - if [[ ${A} == *_mac_* ]] ; then
109 - mv -v "${S}/Contents/Home/"* "${S}" || die
110 - rm -Rf "${S}/Contents" # drop macOS executable
111 - fi
112 -}
113 -
114 -src_install() {
115 - local dest="/opt/${P}"
116 - local ddest="${ED%/}/${dest#/}"
117 -
118 - # on macOS if they would exist they would be called .dylib, but most
119 - # importantly, there are no different providers, so everything
120 - # that's shipped works.
121 - if [[ ${A} != *_mac_* ]] ; then
122 - # Not sure why they bundle this as it's commonly available and they
123 - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
124 - # also has an explicit dependency while Oracle seemingly dlopens it.
125 - rm -vf lib/libfreetype.so || die
126 -
127 - # prefer system copy # https://bugs.gentoo.org/776676
128 - rm -vf lib/libharfbuzz.so || die
129 -
130 - # Oracle and IcedTea have libjsoundalsa.so depending on
131 - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
132 - if ! use alsa ; then
133 - rm -v lib/libjsound.* || die
134 - fi
135 -
136 - if use headless-awt ; then
137 - rm -v lib/lib*{[jx]awt,splashscreen}* || die
138 - fi
139 - fi
140 -
141 - if ! use source ; then
142 - rm -v lib/src.zip || die
143 - fi
144 -
145 - rm -v lib/security/cacerts || die
146 - dosym ../../../../etc/ssl/certs/java/cacerts \
147 - "${dest}"/lib/security/cacerts
148 -
149 - dodir "${dest}"
150 - cp -pPR * "${ddest}" || die
151 -
152 - # provide stable symlink
153 - dosym "${P}" "/opt/${PN}-${SLOT}"
154 -
155 - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
156 - java-vm_set-pax-markings "${ddest}"
157 - java-vm_revdep-mask
158 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
159 -}
160 -
161 -pkg_postinst() {
162 - java-vm-2_pkg_postinst
163 -
164 - if use gentoo-vm ; then
165 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
166 - ewarn "recognised by the system. This will almost certainly break"
167 - ewarn "many java ebuilds as they are not ready for openjdk-11"
168 - else
169 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
170 - ewarn "will not be recognised by the system. For example, simply calling"
171 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
172 - ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
173 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
174 - fi
175 -}