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:24
Message-Id: 1652300051.ec68418b06ae875b05b83d1d1fff1e289101c3e7.gyakovlev@gentoo
1 commit: ec68418b06ae875b05b83d1d1fff1e289101c3e7
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 11 19:13:57 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=ec68418b
7
8 dev-java/openjdk-bin: drop 17.0.1_p12-r1
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk-bin/Manifest | 6 -
13 .../openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild | 147 ---------------------
14 2 files changed, 153 deletions(-)
15
16 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
17 index 61010eadf897..7c48eed582fb 100644
18 --- a/dev-java/openjdk-bin/Manifest
19 +++ b/dev-java/openjdk-bin/Manifest
20 @@ -4,18 +4,12 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz 175127578 BLAKE2B ed7
21 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz 192425435 BLAKE2B 3e98f8819bf36aaee0ae009e97c7efa9a26dfc55b856e3d2d098d266621c97b5a8448331888e18eb5a8ea164875020db59cb9be61f3756fa87f9376c2b6e5f6b SHA512 667bc8e6d745c693e5e60e332f491fd485e3f4d99e1543d6e72f1b64956e56b4e6892f3a47e642809378f0a8a8dfaaa034ac96a0aa70b0b7fec51ec53bafbaa7
22 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz 193109331 BLAKE2B d1f3031c479bc32e3d4d56fb914c33c9e19444ef3b4fd836c52623619872d11cea843904d1425cdbfde2181f41bc63d97c14a479a134ae7280b4b5e49f7789ff SHA512 27d1a8627e6e97d4830f2b8839a7f8455d1e0680853049eb1417f78c5b8e05dc2e8f48520770b422797021a169c80ddbb0c907a5e40e02a4d951a429c5a2c86f
23 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz 191414234 BLAKE2B abc031558434dc4f800ab2f3251f66cddd49f2296933ae34c58406a1780982693106fe6f37747e48365bd4b6c9f9dd20e0492ddcca62d7e2555df776297d6f96 SHA512 a306fbd6775f4186483e0403f593f599af95e295acc46cba44dd0758dfae8b6a7b1b6ef4581c2ecac1f18b5e98a84e3e3900fae6ca948b74aba2c62a63c00dee
24 -DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2b4272ae91f12b8a4c7a3c1cf2eab250102ff1590c84f2f3612bc206337477284d63914dddcecd8dc259da1ddd08a1fc6e3c52a37b0cbb5ed0187456c2b24e SHA512 8289fb50b06f08c6288bcbab9e609a24744f123568a901b5ea4f2c1928bfdc236a9a9cfa572708c56f1f7f844b17562f9ddcb502b15df8ac8bc7d1ef758a741b
25 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz 188965124 BLAKE2B 659bf8518b3104e1fedd116cb9af8b0455d323ce883485f5e42cc9d1fb4d9bae5556757b309a7473559bd67c17a9aa0e0c51934e549141b25dcaeb9032a55b80 SHA512 5eadc730b39f6300be7b64a0a4e9d87873cdfa7b0a031923ddfab473affd5b22788a33e2f01412c99c2e42ffb2774cc655c732e7721a6fc02c2b34a42dc9088d
26 DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz 182550014 BLAKE2B 24a7aae5c6d282a416c996f6b35ff5c92522ac7853d4cc3248a34f642029fb95b798de3159dcd7ee60a9952dd5ef2926a97c82df0708655044fb4faa6d82019f SHA512 50e27087804582a1b124a17762cf24272cbd24ae1d1bc443950bd91c88da220415ca429894bd1d1172cb39fdbff262470276a3b3e9043b5eabf550c05ee2438b
27 -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz 188832535 BLAKE2B 4ea2e209f7bebde4cfae439773b42cb9d4143eb5b61a5e69fba181946cd3a3dc977966ed14e24ce6b23066450e64bbf204b72b04562f7af381c765bb4ea31d53 SHA512 615806f02c108c08be70d975f3dc402fc2e30f9a961630fe6528eedb7a5ee76ac07851ada5264fe263453eaefc40aa1ded1cefa37d3455af78b04fdf9caf9a93
28 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz 188894874 BLAKE2B 9881d30cc0b4edc1c3a2d5978b08e820833e82c202f39ddf20600e56c596dc5b53d667eafdeb3048ed59a1d4e13f2ecfa136e123d8ae3f14ce43ece6ede9ab55 SHA512 708aa4a6912970ef6ea88ac3a4fcc04d4adaafcb207837dbe6c1f1e731e87faeb985fc8338a9d59f5637778be40690189c5c936ffb819265b558fc06bee99ddb
29 -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.1_12.tar.gz 187718236 BLAKE2B a55eeb2651d6fbd83b579527761e246bc3babb3858b7c14823e0d512e308a65be1e35899206c1e2458db74ee2aaf4d69578b4045a13a35a0b3d6577d4821d137 SHA512 5179991d451f8736776de933aa44fa726217282da66236f373a0e47d815d03754f28588acf0aca55258ca1085d0e06f53627092bd0cff2c2b60eb6ff9c1df248
30 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz 189073596 BLAKE2B 1303795dd08dedee8ea4723adaeaae4ab7ef28b81da0f5fd8b19ac5f027ec8f7edb67efe37ca47381a44b4a94223a36d37652a290c2f2cf9702520e01b700786 SHA512 beab26ef69c0ed07a14976c01dad4b2a4d708d04b22c86dabff7b87eaefd8e03f627c5c3388a0dbc55b10edaa14004bc0c44ea1fe3edb18e68cb23105d2ca44d
31 -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz 191355612 BLAKE2B 21c1459c58a10ed6a87a422e70fc4fa27a37a1ea4cbd121e237d82f9ec0991e7245193c5a44cd2826d502301166a48e2d3e7ac0015dcb9a1c3732f03210ff366 SHA512 30ce2ff05d46ea125fc17256420c8bf9dcc3afe802338cd62d0961e6588cf54663aee07c6d4d21fd0f363b58628ee34cf4f9cf622b6da970924aa94d47e6406a
32 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz 191420670 BLAKE2B 901cd6f9e816e1eaa949c97a86d9cfa6d3265b33da483ac5a4ba87621b5a196c7c51305be19745f8aa504ee4471a583180bc36de5a6013ca59e4f0890ea8fa34 SHA512 e80c8f02a35587c9305a92ed20926e79b0bab6b2d0fa3fd62ef7825383f68567c38cb52d2cc82b5def219df1fe2dbb531d0973b3713d1ec18c06c6967a228f73
33 -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e67c6f75bc204c8e7c74b25c73a270cff1889c0e3fdcc830f868bcddb58e6c9a480ba0313638a7edf56dd2e61e52b7c4f1dd9ad3643f3e70c9770141c93 SHA512 057fc5c4869bc9113c1a299b125c8bed47e4a841238b42fbd4b39adfd7bbbca0fa9efed7315a98303ff8f4000afd02baaa5b3169be6287d06edbfbbb44728538
34 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz 192041953 BLAKE2B 76b66b6571d50fd00c80bfdfd63023d070b7fb0f4ecacce86fcc10b651fa193a88ac8357e097d83ee4cfb982cd34b15cf4a9b59441066677d19a29073bee3666 SHA512 25ffa17e6d7c402e976823ac90d6fd6c4f07093c3766c6d48a7d1ecfe5908d6d73efe6f732af8fcb3f4f91b6daa0dd8f4a141ce7aae5fc12f0ed23a1c1e2ebb5
35 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz 192449459 BLAKE2B 506d31e97c7be57a870e80e1beb0bfa72528cb0e5d006b0dc76667f6ef29624165375a91127e3cc934f3135298d748c43a5adcecb9a07c5d758998bbf6551837 SHA512 8d7afed31b37759ba426d412f70c36e380f0f472d850c9ba9e895e0ebd4a2cf9a7f6118526f0a30f6a1d9d880affca4e1ed9848125509ae97e32f506ad78f541
36 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d8b5ace125d62a96ec2b76faf5acf12acd94d3cf6c3f80c84abe9ae91b9e53a85d5f57ff69bd2596cfb5715808d73070c971a5ed8dddec2694a9d64 SHA512 c43075b14450de6763a66c0f73d7836ec880045cc84c1b8f1e72f9e3f1e3ba6057afff27cb3bdcadd89a52c75671ed7cf844299943ba8d3bf86e6c45386fa039
37 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
38 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz 98420081 BLAKE2B 77d735d6f07320d226cf575c84f3879d7dafb4fa4ce06c737e7bdaf4f731af323c3ed0bdbd66067200ef350c7b5202c75bdf7cdc2a538c54ef1058be54a9d57f SHA512 b355c813b2b382bb37c2ca34c01a631b6651e0559a864286c04518332c513d1f833f8441bed52ecc1e24074951a2e5149ce60c88fa2490165d43d0058efe073c
39
40 diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
41 deleted file mode 100644
42 index bcac729452c5..000000000000
43 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
44 +++ /dev/null
45 @@ -1,147 +0,0 @@
46 -# Copyright 1999-2022 Gentoo Authors
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=8
50 -
51 -inherit java-vm-2 toolchain-funcs
52 -
53 -abi_uri() {
54 - local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
55 - local musl=
56 - local os=linux
57 -
58 - case ${2} in
59 - *-macos) os=mac ;;
60 - *-solaris) os=solaris ;;
61 - esac
62 -
63 - if [[ ${3} == musl ]]; then
64 - os=alpine-linux
65 - musl=true
66 - fi
67 -
68 - echo "${2-$1}? (
69 - ${musl:+ elibc_musl? ( }
70 - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
71 - ${musl:+ ) } )"
72 -}
73 -
74 -MY_PV=${PV/_p/+}
75 -SLOT=${MY_PV%%[.+]*}
76 -
77 -SRC_URI="
78 - $(abi_uri arm)
79 - $(abi_uri aarch64 arm64)
80 - $(abi_uri ppc64le ppc64)
81 - $(abi_uri x64 amd64)
82 - $(abi_uri x64 amd64 musl)
83 - $(abi_uri x64 x64-macos)
84 -"
85 -
86 -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
87 -HOMEPAGE="https://adoptium.net"
88 -LICENSE="GPL-2-with-classpath-exception"
89 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
90 -IUSE="alsa cups +gentoo-vm headless-awt selinux source"
91 -
92 -RDEPEND="
93 - >=sys-apps/baselayout-java-0.1.0-r1
94 - kernel_linux? (
95 - media-libs/fontconfig:1.0
96 - media-libs/freetype:2
97 - media-libs/harfbuzz
98 - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
99 - sys-libs/zlib
100 - alsa? ( media-libs/alsa-lib )
101 - cups? ( net-print/cups )
102 - selinux? ( sec-policy/selinux-java )
103 - !headless-awt? (
104 - x11-libs/libX11
105 - x11-libs/libXext
106 - x11-libs/libXi
107 - x11-libs/libXrender
108 - x11-libs/libXtst
109 - )
110 - )"
111 -
112 -RESTRICT="preserve-libs splitdebug"
113 -QA_PREBUILT="*"
114 -
115 -S="${WORKDIR}/jdk-${MY_PV}"
116 -
117 -pkg_pretend() {
118 - if [[ "$(tc-is-softfloat)" != "no" ]]; then
119 - die "These binaries require a hardfloat system."
120 - fi
121 -}
122 -
123 -src_unpack() {
124 - default
125 - if [[ ${A} == *_mac_* ]] ; then
126 - mv -v "${S}/Contents/Home/"* "${S}" || die
127 - rm -Rf "${S}/Contents" # drop macOS executable
128 - fi
129 -}
130 -
131 -src_install() {
132 - local dest="/opt/${P}"
133 - local ddest="${ED}/${dest#/}"
134 -
135 - # on macOS if they would exist they would be called .dylib, but most
136 - # importantly, there are no different providers, so everything
137 - # that's shipped works.
138 - if [[ ${A} != *_mac_* ]] ; then
139 - # Not sure why they bundle this as it's commonly available and they
140 - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
141 - # also has an explicit dependency while Oracle seemingly dlopens it.
142 - rm -vf lib/libfreetype.so || die
143 -
144 - # prefer system copy # https://bugs.gentoo.org/776676
145 - rm -vf lib/libharfbuzz.so || die
146 -
147 - # Oracle and IcedTea have libjsoundalsa.so depending on
148 - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
149 - if ! use alsa ; then
150 - rm -v lib/libjsound.* || die
151 - fi
152 -
153 - if use headless-awt ; then
154 - rm -v lib/lib*{[jx]awt,splashscreen}* || die
155 - fi
156 - fi
157 -
158 - if ! use source ; then
159 - rm -v lib/src.zip || die
160 - fi
161 -
162 - rm -v lib/security/cacerts || die
163 - dosym ../../../../etc/ssl/certs/java/cacerts \
164 - "${dest}"/lib/security/cacerts
165 -
166 - dodir "${dest}"
167 - cp -pPR * "${ddest}" || die
168 -
169 - # provide stable symlink
170 - dosym "${P}" "/opt/${PN}-${SLOT}"
171 -
172 - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
173 - java-vm_set-pax-markings "${ddest}"
174 - java-vm_revdep-mask
175 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
176 -}
177 -
178 -pkg_postinst() {
179 - java-vm-2_pkg_postinst
180 -
181 - if use gentoo-vm ; then
182 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
183 - ewarn "recognised by the system. This will almost certainly break"
184 - ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
185 - else
186 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
187 - ewarn "will not be recognised by the system. For example, simply calling"
188 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
189 - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
190 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
191 - fi
192 -}