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/files/, dev-java/openjdk-bin/
Date: Fri, 08 Oct 2021 15:03:01
Message-Id: 1633705213.4b613bcba5db5f2b9891eb8426fdb6489e39cb01.gyakovlev@gentoo
1 commit: 4b613bcba5db5f2b9891eb8426fdb6489e39cb01
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 8 14:22:09 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 8 15:00:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b613bcb
7
8 dev-java/openjdk-bin: add 17_p35
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk-bin/Manifest | 5 +
13 dev-java/openjdk-bin/files/openjdk-bin-17.env.sh | 16 +++
14 dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild | 136 +++++++++++++++++++++++
15 3 files changed, 157 insertions(+)
16
17 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
18 index ca6f46ddc76..4a703dfcf3f 100644
19 --- a/dev-java/openjdk-bin/Manifest
20 +++ b/dev-java/openjdk-bin/Manifest
21 @@ -8,6 +8,11 @@ DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a093
22 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz 192983830 BLAKE2B 4d97711e37b72bb24e9feb14b4902378d02e7bc4fa1f12dd40a277957ebb4b36efb115666124337331bb95a1f53ae3b13ffeededee8c3c0eda66ba9abf937bcc SHA512 73b7c430d4095fd518191a9d85eebb2749d4940eb64a95cca8f3c6fe2392a71239e264b47f4f74b433c488aa0a80cca610c87a49bbc143da1c15b45fb491c62b
23 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e
24 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b51f09d6e15ca009291a5f5d81f46d55357c2d80351b3d20b459c37995fe434ffb2d666d64e1311ddc510a5a73a49f0d19c00767dc4749e06e432cd4 SHA512 e38bf5a31c3e453784d4067601b3f2125d528f8d210d3a80910c66fc70b5a5beca56dbc0328ee3add99776bdd6d6284506803e553540ae434c438f2dd706e268
25 +DIST OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz 188907472 BLAKE2B 7159e03fe2a9ae79bea6130574b484e9f1ecc0549065d31e019f9d90c299be4b4f4a09bea85e6ebb13eabb5eace3db0283f00f19d7bdf362e52849aeb476adf5 SHA512 1daec8504962c06cbafeb3265edf5e220adb75e7b9d11e8f92b784ee273623b770bb38182dbbab2ffd8751254667d972c99f3d859620751f94c9c1d1b603546d
26 +DIST OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz 188807831 BLAKE2B 55e0d944f5d2f7f09ce9a6bd87d6d432f9b086083f906fa9aa6f85f0e006cf15bb88cc6433ce41d6840ab2d7bc6d07223b51a1855ceb937aff6d0142c3f87c63 SHA512 a20c0de63ea404653e54b7eb30fd9c8c66cf6aae43845fefc7a67edbfc60e777fc4bf1a16a7958a56b36a868a8b4ce75e065b78ccb74a8ff26efc61a90d6e498
27 +DIST OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz 187664371 BLAKE2B c12df4a24cd14fb57e6757056931da69b067576d22fdc9493c3d8eee34cace10718dc234b4f1cf6b525ee082752cdc7de9e1bc6467f2ecfffd5fa391095662e6 SHA512 c1f3ce3d8d7e33dbf1a838fee054741cf1aa6133fe375ec8c8508072b9da78158bcbbe633f4cdd3b1b8dae4915418b26de2fd218354ae2264a3694aad5fc9cd9
28 +DIST OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz 192014376 BLAKE2B 6707451ca3aaa22f232592f6497899f4751a67cfce5c539a275806b551d3494c686905dd91c03ba6de64afc65841d1e9836a1dead4ce55d99df3da4a077aecb4 SHA512 9af1945e46a1b444cb49ec8e58e14650098266e29973688c2a25b3707d23bf90b0a1287ad0ea5c467425f959354359fcdf1eaa8bd68e784399a6780298b22a44
29 +DIST OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz 192417649 BLAKE2B 53fdd3f71b9c3860231451eb0f59414c03a863944c9b7f2106490c1d39a8b94715d1743bab10959fe513277f5fa9a4d397c76c464680f9b1f35d879e7c82ff05 SHA512 ebe2f1f936c93150f2bd5e2bb9b07b572eb14abd71ad7446dd0f5c511c8b6debc882d6ec69376b55a50b964c9a2b8efb52db96de1041dd2aa857bcdb64915494
30 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
31 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz 102111219 BLAKE2B 0af54c05957c3f56c495cc83baf68f27fea4773ab4577b212e8abd19e7c7be123c067cb614fb42a320a865c3ab96c9e6ae663d96f79346f73282d99ea8aba5e6 SHA512 43e74f8029cb0d0ea48c6af4e2b8f00c4664264a51803acf0f539efb117be2dadf4c6a216ecf81c86e24152e6f87933f7a9e97bf4ba526eb01557bf561c2cc22
32 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
33
34 diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
35 new file mode 100644
36 index 00000000000..6dc16a10bff
37 --- /dev/null
38 +++ b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
39 @@ -0,0 +1,16 @@
40 +# Copyright 1999-2021 Gentoo Authors
41 +# Distributed under the terms of the GNU General Public License v2
42 +
43 +VERSION="AdoptOpenJDK ${PV}"
44 +JAVA_HOME="${EPREFIX}/opt/${P}"
45 +JDK_HOME="${EPREFIX}/opt/${P}"
46 +JAVAC="\${JAVA_HOME}/bin/javac"
47 +PATH="\${JAVA_HOME}/bin"
48 +ROOTPATH="\${JAVA_HOME}/bin"
49 +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
50 +MANPATH=""
51 +PROVIDES_TYPE="JDK JRE"
52 +PROVIDES_VERSION="${SLOT}"
53 +BOOTCLASSPATH=""
54 +GENERATION="2"
55 +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
56
57 diff --git a/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
58 new file mode 100644
59 index 00000000000..e21153320a4
60 --- /dev/null
61 +++ b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
62 @@ -0,0 +1,136 @@
63 +# Copyright 1999-2021 Gentoo Authors
64 +# Distributed under the terms of the GNU General Public License v2
65 +
66 +EAPI=6
67 +
68 +inherit java-vm-2 toolchain-funcs
69 +
70 +abi_uri() {
71 + local os=linux
72 + case ${2} in
73 + *-macos) os=mac ;;
74 + *-solaris) os=solaris ;;
75 + esac
76 + echo "${2-$1}? (
77 + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
78 + )"
79 +}
80 +
81 +MY_PV=${PV/_p/+}
82 +SLOT=${MY_PV%%[.+]*}
83 +
84 +SRC_URI="
85 + $(abi_uri arm)
86 + $(abi_uri aarch64 arm64)
87 + $(abi_uri ppc64le ppc64)
88 + $(abi_uri x64 amd64)
89 + $(abi_uri x64 x64-macos)
90 +"
91 +
92 +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
93 +HOMEPAGE="https://adoptium.net"
94 +LICENSE="GPL-2-with-classpath-exception"
95 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
96 +IUSE="alsa cups +gentoo-vm headless-awt selinux source"
97 +
98 +RDEPEND="
99 + >=sys-apps/baselayout-java-0.1.0-r1
100 + kernel_linux? (
101 + media-libs/fontconfig:1.0
102 + media-libs/freetype:2
103 + media-libs/harfbuzz
104 + >=sys-libs/glibc-2.2.5:*
105 + sys-libs/zlib
106 + alsa? ( media-libs/alsa-lib )
107 + cups? ( net-print/cups )
108 + selinux? ( sec-policy/selinux-java )
109 + !headless-awt? (
110 + x11-libs/libX11
111 + x11-libs/libXext
112 + x11-libs/libXi
113 + x11-libs/libXrender
114 + x11-libs/libXtst
115 + )
116 + )"
117 +
118 +RESTRICT="preserve-libs splitdebug"
119 +QA_PREBUILT="*"
120 +
121 +S="${WORKDIR}/jdk-${MY_PV}"
122 +
123 +pkg_pretend() {
124 + if [[ "$(tc-is-softfloat)" != "no" ]]; then
125 + die "These binaries require a hardfloat system."
126 + fi
127 +}
128 +
129 +src_unpack() {
130 + default
131 + if [[ ${A} == *_mac_* ]] ; then
132 + mv -v "${S}/Contents/Home/"* "${S}" || die
133 + rm -Rf "${S}/Contents" # drop macOS executable
134 + fi
135 +}
136 +
137 +src_install() {
138 + local dest="/opt/${P}"
139 + local ddest="${ED%/}/${dest#/}"
140 +
141 + # on macOS if they would exist they would be called .dylib, but most
142 + # importantly, there are no different providers, so everything
143 + # that's shipped works.
144 + if [[ ${A} != *_mac_* ]] ; then
145 + # Not sure why they bundle this as it's commonly available and they
146 + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
147 + # also has an explicit dependency while Oracle seemingly dlopens it.
148 + rm -vf lib/libfreetype.so || die
149 +
150 + # prefer system copy # https://bugs.gentoo.org/776676
151 + rm -vf lib/libharfbuzz.so || die
152 +
153 + # Oracle and IcedTea have libjsoundalsa.so depending on
154 + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
155 + if ! use alsa ; then
156 + rm -v lib/libjsound.* || die
157 + fi
158 +
159 + if use headless-awt ; then
160 + rm -v lib/lib*{[jx]awt,splashscreen}* || die
161 + fi
162 + fi
163 +
164 + if ! use source ; then
165 + rm -v lib/src.zip || die
166 + fi
167 +
168 + rm -v lib/security/cacerts || die
169 + dosym ../../../../etc/ssl/certs/java/cacerts \
170 + "${dest}"/lib/security/cacerts
171 +
172 + dodir "${dest}"
173 + cp -pPR * "${ddest}" || die
174 +
175 + # provide stable symlink
176 + dosym "${P}" "/opt/${PN}-${SLOT}"
177 +
178 + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
179 + java-vm_set-pax-markings "${ddest}"
180 + java-vm_revdep-mask
181 + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
182 +}
183 +
184 +pkg_postinst() {
185 + java-vm-2_pkg_postinst
186 +
187 + if use gentoo-vm ; then
188 + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
189 + ewarn "recognised by the system. This will almost certainly break"
190 + ewarn "many java ebuilds as they are not ready for openjdk-11"
191 + else
192 + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
193 + ewarn "will not be recognised by the system. For example, simply calling"
194 + ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
195 + ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
196 + ewarn "absolute location under ${EPREFIX}/opt/${P}."
197 + fi
198 +}