[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     98a385f9a7de6f373f5ab0baddca7f2f6615f1d6
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 22:13:23 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 22:22:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a385f9

dev-java/openjdk-bin: add 11.0.18_p10

amd64 arm macos only for now

Bug: https://bugs.gentoo.org/891323
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjdk-bin/Manifest                      |   3 +
 .../openjdk-bin/openjdk-bin-11.0.18_p10.ebuild     | 136 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 0dc5f5f5977b..3088bb0e933a 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -4,6 +4,7 @@ DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz 190830566 BLAKE2B fe5
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz 181437038 BLAKE2B d87e38a9600e2f4289637f9b54044bb25777cd7a434eae89800945515ecb3965eae8f4660d18e96f1fb95e2401133e6630d98b3b23d826425bff5bd88e5b99b8 SHA512 72e2846718fc2e2a85a23cb97f49acf9314b7da78a79d3fe9cd0a91d34867bb2a3b6ace359b366caf564bb5d026f19400564e31064691016e9827a450b5e1a6a
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz 181771684 BLAKE2B 17999bd2e1599b1a129f50f4139bcb12fbd4ad0fdd30f2e8024a17a24912820aaa24fab747938f802c1f30d3dea9c696cf8ca858c1438b944ab1c45c1ee21fbf SHA512 8adab075049b52b7b80bb4bd48a8cac0633c7bd6e6b05932464753e03883f33665cd9609038519f048e2cc73e0d78b51ab2d7ca0716ca12ecf6883522c7448d1
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.18_10.tar.gz 181837466 BLAKE2B df9935b4a2b8255439a0691b06636c4c40cd6d15dbcdf6b722eb57219cf67f1a7e44bf1eee3d7f8b65ca854c83d61a942d8384add454384f5b0f0113767173c2 SHA512 0b8a7e7a856d310ead1fbae214473a11ce41fef00b19b4e5a9553d076d4d6f692852983ea6afc3fb06800c8478e79c510e60d7157e7b13a710663ee01939bfad
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.16.1_1.tar.gz 175833123 BLAKE2B c027ac3c128ee8cc6e62e375c66a642931a9344bd7d06cad6025094a8569d135a2982ead3057da7841ebcc5a02fc8c8db653f8aa09bcc8179122e1c1e6018be0 SHA512 f3af5dc335d0573ed89037a6227e96e75ec2031af6653f3a034b2d5e0737f1edc875aa883050783c6d556ce5a55ce4f9cd7859b574915b994b58fb26d906fbfd
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz 176227429 BLAKE2B 7b8dd16eabec342d606d4a342d25f669d879a7ab259f9b88a2fc95fd11bc0883ad2d21d69881c6e25d71ef500be9326eda4c17c79aa00c075c50bb69b0cf94e7 SHA512 bfedee850260e7d9dcd441832859de59f572626ca7c48eb52ab2122a31f6de3857cd766a582159508a2782dbd63abfa175f32a4963ef72d7070e2749164d7824
@@ -13,9 +14,11 @@ DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz 192983282 BLAKE2B
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 193245074 BLAKE2B 0a559bd0513984c2bc93e31ab7afcb8f5fc152c9984d957359bf1901e46b25b25ddee81c4c8fc0f560e65b343f74e39c55a1af61526fceec0eb530309eb65383 SHA512 85b21da3ff777b6239df5534ee3539b256a1de5d02abf4f537bca38d2cbf8006b4130d8bde2e24835a8da7a651fc8852df2c5060d26b9d594927f4d609912554
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz 193754645 BLAKE2B 5ab76378de497da3e59b5c33025322aacfa67edfa9766fbee346399f8dca71309aa9e6c6ad43a59c2bc7033fc01806b045832ee6b57f08956a2d696e760c247d SHA512 38aa02b8ab14b678b226891ffb2d2ab1248202d595e8c37ded3479d3d0a210355df75cabb62b03ccfae5369965e80ab4872cf7f530d0ddbc4cbf4c9a0f922e37
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz 194082362 BLAKE2B 14dc6f09cadc774b7f69914c468daafb00686fca376f22acb5b7777d8d767e22baa58201aa062c4ab229d77f4311116dbc1b02c49c56439612c4c5e0df5ccecf SHA512 f74b704581f3cfb66d4df79f9583ce0e3e94ff0b4930188485c57594af507359dcd579d22aeb9dede3c2d7bc2e8a51212c615f9a367ddcc180fe8a318efaf95b
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz 194100197 BLAKE2B 751034d006335d3c48f5394d797d963b13a1eb4f30688dbae2be29cdc4c21855a8dd5f1faac895e17c0a56c43bd64b0a73bad61b845dd1cc1b0ce0d62019bcb9 SHA512 8d3e285b850b6f5d81481d7d2ffa1951a28ad383eda6ecbede3f2653437bd7d978a4b8613d870613a0b97e76325ee03e97b3b89e0cd124ffdf3c9bd2e16426d2
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4aed529de853e47b848b46c15fade1a8c120f83b3409492801084114724f1d3875fedf1607133192ef5a612dbab828e578bff98adf1605fd990a24b21 SHA512 af69ea99e3d3b7ae84405190a12f788348162fd235aa5df8ce7ea3127d961e015b51cf70277aefa0e29a434ba10876812e997a063c5aaedafa460fc5451783c7
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz 186335152 BLAKE2B ce97404fe164c89cc43d053e14a4abd596c104a6dfa355cc011de274aa5e1b9d2d5cb881299fad7877fd0b49bf1f738672eb565d4c543720d059663b34fd5da6 SHA512 6ccbbf271e23d6d2315ac62e5ea574991e728a4298cbf217aa7fffb3717c6a13cd82a467d15a0be9699e7b9e9a062ed0f10772165a40604f2f3c8e02729a6eaa
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz 186594836 BLAKE2B 00d52b8e2f750335e87358df56bd94082370832b2ae01cc200c1fb96c8401e7dc941cd1eeb6a8f9c33319440a82d2f98d243a1c14a0c15620e0226280e159c96 SHA512 342a68be1779680161174cc24a8111e72bb9bd2ff5a92a67d4b901538a81dd694fb90eee1f890ea6d8e2a89727a31ea2dc8b97091cc8e43c9f842b114530f485
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.18_10.tar.gz 187254949 BLAKE2B 063f437ae64b3b6e30dacca5c01b02118ec7752cc91ece1ddaef16994629a6f5e8912fc4c11fdb44d521929a620803f1c3906911a45f5cec67a705b62bb279a3 SHA512 d9ed4bc73965672752392fd2741372a92dff4d2262c45dff31d95e13970afd31f513bc3ad93071e568c3e9e8afbf9af89f758d80f4922dc364ff332df08e762c
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz 190142132 BLAKE2B e6b0fb199ba788a31b6238d3bc458216baf37f1517a449be63668c412dfe7662d644ffdb312194533d4af089ac2753c164059978d65eddd951bb98bfc108da87 SHA512 f406ae289659e902dd3314d40485c1f3b04915451794c2bebfb1eeda7c83dbf051c26461aec7fe07c1a43f5319f80044aefc99c9177e2a9ca0a31a9c9f06c157
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz 189797923 BLAKE2B 8732ba8ce23d8ebdcac7fbb2c6035c3cafd11eda4853b948327c6c9839a88294d5c89a03006d542c8ab797b3d4d570aefc6289ff97338d68089387d0ed742d3c SHA512 d2bcf2b766e3135320f28de1df47c3d3f9012281501390ffb6a4c01f59c72fccd348139f4eeb0a9bcce747ed8cfb04f2c8d78161dda2f2f6e0728993f8953061
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz 190100891 BLAKE2B dcf1aca6db5af78d39a0e27422c3c9d17b7e459dad73fa74a475881a221a235f8ffbba1633a1d4858efa4e38d11a5f6e15a2eeb5a580edb0ce3ba7eebb559967 SHA512 7d16ee70f6f8a17cd22adfddd29d23e8cc74c24cae7a33cced6f73e16767da217c9959e82033cadf9c20d887f521a6807304ec80a23a033040b179b348312034

diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild
new file mode 100644
index 000000000000..2a50574e80ee
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+	$(abi_uri arm)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+"
+#	$(abi_uri aarch64 arm64)
+#	$(abi_uri ppc64le ppc64)
+#	$(abi_uri x64 amd64 musl)
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~x64-macos"
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}