commit: c67245d1b85ad2f5ebd3a8fef13e93dbff561f57 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Tue Jan 24 05:31:18 2023 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Tue Jan 24 05:31:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67245d1
dev-java/openjdk-bin: drop 17.0.3_p7, 17.0.4.1_p1, 17.0.5_p8 Bug: https://bugs.gentoo.org/891421 Bug: https://bugs.gentoo.org/891323 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-java/openjdk-bin/Manifest | 21 ---- dev-java/openjdk-bin/metadata.xml | 1 - dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild | 136 --------------------- .../openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild | 136 --------------------- dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild | 136 --------------------- 5 files changed, 430 deletions(-) diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index 5e6cc6bd9280..cece946b921a 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -21,33 +21,12 @@ DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4 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 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz 190151132 BLAKE2B f602ebc908f111d6c3aceb5cf6fabdc0940bd3aafb840b78fdda64e98a247f0dfa7fc648827cc62cb46c16ce084ca1cf51274c9629b28580d028a9ac4b2be8a0 SHA512 f8a46cbc32160ebeee9c2047e6ac7837fbdc73549257c61d197486675fcb9420def98400779a0ec40a73652dc919daa5a9442bafe4f9129891527e24a109bb99 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz 177467402 BLAKE2B 38b8508e81bcbaf90a1db9bfe3f804da9838cc43b6043c328d19523c83dc5d953465a1018a9054979163140a28f5e213815634005cf096f6932407e8f7ccf9a6 SHA512 0433dc839a98b810cad9fe0d98c46cabccec5ceb44fd5bc67fff0c27962f183a3814b9aab521768b578d8f11bda97934629bf9fce5c010cdc93c685b842566e7 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz 177121101 BLAKE2B bfbbdfdf77e5f52bdef3bc9ab387590f2d02ed7f039ab49b15127b9a09430b0a9cfadde04cdb70668812d68ed4279dce3fceee6183d469e0ff4b37f43bff60cb SHA512 36403f81c06c4d7bb76058bae6a4e5c94d3c134f9b6ff9ec4b9f8ab9437195f0e2e2c2770cea4d765a182a0b2fdfc4b7fc4343fa5170af5720343d3fe0302e02 -DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz 177335828 BLAKE2B 9c4748b4099f2d6d3bcdd709c294f1d1f7fe8731a389362d30e2717acf79d79279f1c8d6d05bb6a11a8d3fad0cabcc166ce7db44a4a31dee9f3b45f4565c7c18 SHA512 858dd4ebb5844acd40a517dd849d284521375286d5e025558c50fc406306d1aa6160af07ecfa43f35f7e30c2bd3845c63814edbe2e6c85f611aacb8da2e2019d DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.6_10.tar.gz 177369180 BLAKE2B c45592830d2a9d87871b324d6ee331013c7ac5c1a968edede6ebb639c611422c4d2ee507c8cac7b154abf2031c71f7248b5ab4795bf4e56fc89e75469cdce1a2 SHA512 3e63a9c5457ca82cae15058f86c06bafb9172f95669d24b43bb371d19eedb7afec8725fabe1104fb0f575c2bd7e7ac8f41c103d6f967f7b910663b1e51d05a4a -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz 188309462 BLAKE2B e47b98ebcb661631732e3238ce3cd1630a0a2103d7e32beabb49d1a0ff216c34c0c39fac11a848474a36dd2c98f6724c58900e3026d04cb7e4f7f00adbe1fe18 SHA512 9158821b22633177866ac0a5c4ffd774d2d750adea2de2adce661060ab7d28cf67fc703eb9e0e200149fa03eb040a05dc45ac944dacd140e0d0fa06515584795 -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz 187944772 BLAKE2B 6e04360ff4abec1bb76d5e73bc21716a935224ccd799ab4ee09f989a996ba4684677cd28545f90ef9a5d53e1ecb46a0e1d641c6c41aa93f74992b53cc19ece5e SHA512 850a0241ee1c67b5f8c2350432de82d3d264015cad7455f98d392b5bf32bc0b44aeaf1fc9b42035a2a13f157f57e833667329970e61f4626b88bbb4fcfd39482 -DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz 188272844 BLAKE2B 7a86c2c4f27322ffe9e2296ab8a0042b0f3e900c11605a06c64bb5817dc9d9e0235e55e27d08ebd53ecbc7b85cc0ce6f3421b8f87e3779e5585104533a371bfb SHA512 dfbddc376da65abf7cf73fc4a9bd5e85488f996035c7b9d1d8e5624e999b688c76ffb53030d09d8e482c91c79771bfb10e7536a081537eee3bac8ba54b624690 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.6_10.tar.gz 188314167 BLAKE2B 71d8de8745dc5777cbec614f7ea254919b485d225e1eda0d43dde6c21bda20e5cb19c751af851471e5aa0d7399737df769758f7962932b63a85e00dabe746675 SHA512 7bd7a1a638088cf12b5722320c90504a661ab684dfd3f13fd87e24f12b94f5f2abcc98570d8939da9fe89d8f62e0de939db883b4d1e4f1262dae1e63610b4b6b -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz 190898839 BLAKE2B b5188190ab30393ff789724ca99ce89232d8a4d81c22205111da4cc60cc258fe5bee47a5550cf032937542d7fb677af0de9aebbe39fe20b4af223a6d7d3211e5 SHA512 e1f1ade72f12c21eef9d34d05e2a4a8228320138d0c626c4eb31431ac9d5e5123ec8ef24c168005e3bb3508537c826399122461a0ce8de1310ccab40d8d21145 -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz 190474121 BLAKE2B ac8b741cf29816960de615999d5030f03677fc3a370c0c430d408802535cbbb2b304aa18d036529d29c1939c2d43ff84bdddeb15dde5a22bbda7c807ddc900db SHA512 04c9182fc503369b7dcf53729e3c5e7f16828477e168d279806c7968482588ee5a04b1c31407c2baa1c1d24468592e1e416a9ea2115391113b83e792457e31b1 -DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz 190798083 BLAKE2B 5750a7a908f2b679edf337b7f6795ea598a57bc2298ab9ef2ccaf7e6b2d6f81802eae120c8f971ed79ea8f8b6ee9607f28a2113e37005bb6528b37a33f6dd670 SHA512 636ad7c5363c1173655ca734f4184ad2ffaeac49ec20520fa75d337c52bf3517ac86d9f7552e0158adb73def293372eaa14625cdec927f09062596586b861b1a DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.6_10.tar.gz 190834846 BLAKE2B 9a14c48bc58221e510ca95ac6e24d5016114a40b4c7881ddf5138647f8d1b486ceb179a757145f713d252e5df3d4df71c36ac6129b6cea9ff2c6d38d91c005a6 SHA512 84cedd98b622c953e89d81a7e39a38e1aeb1d86d582a328e5cbd7c94eac9c39c01874327bd75ca0aa0c32aa0dc6a748f94d2f3252e84e042a0875b1f34f4d43a -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz 191298712 BLAKE2B abcb97374d38cb7457139865617d7570627d390c0db47ed572048dbb9f35b7cf6cf1a7d973684607ce3f7477f9b03b85ba43b8b4447b04f9fe1bfe419a18d190 SHA512 4e69597c134f37db83b44fd86e13c25ded20d8a1b2d8e959b6ddee29e5cc8c2a7bfd449636399f2d7bf030d93b2a29236e614a1578f9bbd37ca7e12249dc80bc -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz 190514211 BLAKE2B 07f802438dffcd54b07ea5342ee78fcfecaf51bac90666aadce34c871f25df6e21a30565e17952dd13fc5da9f032eaa931b66a725f416c98bcbcad0a1d584ad0 SHA512 927a83458e89ff8acd82a443cfe08d6cd93e73bec3311661d2bd4e09eba151088e0d1f40206f50c681586d6629a02c4549fc97df043edacb255e841ea17c83f4 -DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz 190792800 BLAKE2B 6406f30e88b409a23f9fe96fcf833290c0fce00b0b7951bbf104d93149a9a5571655143502dde101d6ffd559eaf48f34840e08d38d87e129a1b0dfc0250d4602 SHA512 2312d538e697161c1378793fdd8f63dd46db76041be22d3243b7f9bea964b422a0fc7daf18f7dec228bedb49602dd104908915d6f4ea3c7b893fb52630d57980 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.6_10.tar.gz 190844751 BLAKE2B 7dfe7dc8abb09cb32c626f75e668cbc9c40eb83ae3b8155cdd5656f3fbfd6bf971bb8142fb7749050d2f120385a35c99d70016f5afafc36cbbee12e0899f8056 SHA512 e26e653196ad7bbdff0551ff23581c23936e98f3b89fc6bcc4592edcc29eb59aae294ed043ac3febd60bbd268322d143e83a487ba73e530977fd4061ac67008c -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz 191514138 BLAKE2B 3e2d64cdf15c63f2f50148576bc8ed085ec808a28a07113910f7b04c5729a1a56840751da627d8012751a7b533f6730c3a9bb99914382caf82f63e5a65dad40a SHA512 144f1e1c0f9558bd0be0536b48b89081579d1232d75c00fcfb7be2460475a4eaf3a6ae89007e683fd6148b4ebf33c2d9492419db96090e07f4ae52afc71df861 -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz 191174859 BLAKE2B e6552e71279ca4a6d04a6e6d5a1707720fa7900c03fb31e312dfacf44d4dd699f657fe2f672881783a1918bac1598a99b4c56d90bb42b2c28a75762ea647f2c3 SHA512 db61842d4482da4fd5b86aee5b1c7f7c28218a58d73850513f272153a1ab09374462cd0d6f631b69f30204e5cfaca44357fa481dc4ebc67a50eda5b71a761082 -DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz 191466567 BLAKE2B 688a939a48f39ae112c415ec4523a65f6bb311250142fdb66efc4a986744306b44704450aa0abc5ad5608293b6300c82956131d832d8e8577772a4e9b71e96d9 SHA512 c77a59ef59690108c90677125f6ad93959f1618096334d28cf9c9d22db96a728576bd25e6ac2df62cc0f8656cf4b9f6b9a72743f31fb40ba74c794a2a8226380 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz 191502157 BLAKE2B 7de684d2529e63e6e28f726c57c139c4890caa7f2f753199eb1a5ac623d2f554c22f43b4b32fd1030c29c0cb6b9ad74ca27b1c7c4bb422bb889d48ba597726ef SHA512 71f0f14647d672ceff9a53db7bd6a158c787a3fb3196498a57ccd94c7da46af2550c04ab7ba95a549fe4f3d6482ecd7c77c4b20057ec2b32beb9a2a46c9ad0a5 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz 187277835 BLAKE2B 2a6766ae47281222a570485bbb67b10b78b2d17399a2fd76e254be3d30808a09002fe6fcf5814be044c4a95c3f791af4b45df9320cea5ec212f9db38329b1630 SHA512 00cb5c5628ef2fcbc44ffcb2f81b8cae8c57107df8c456b4f3bf6897269daebdbd9ce0fe78af686cebedbd2426fa85095b198d47578828404a1b046eb0cbca60 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz 186906753 BLAKE2B e86da7cb28aa43fde9ab947fbe886ed2ce4985d15a3aabf846f5bfc647203fe330f5333c9a7bf30936b2b566424c695c83b246baeda10b32de1b59a118414fb4 SHA512 b4911f006af320acf7ce18ae981a3a29d72d6fc1190bf4a0cd47f389d415de4980f65a0007a7cdcd8f15b7434b2e0e772acf4dcb3b76daa32841c7b4016e9458 -DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz 187174050 BLAKE2B df8a7369f7beb49f57bdba9e291471f805d427bdd019528cfc7874b49335b8598e614cacf82b64c0f6a3dfca055c174eaa30a0a3723effc958c40f826d1c10cc SHA512 29f848434cee5345d23434fae28e20fb722ae181cfbd0ec966aa730e05937015586a31d694cba4556fcbccb96752373fc8c13c2748f9ee5a30a243f3ce239989 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.6_10.tar.gz 187219587 BLAKE2B dd8f19c7498bec3afcf464e38583ea769c14575d4fb2b4bc3102ded6731db934d85353863d46201e92dbf93b19ad8c2237f5e3c62cb1360da05cf56df8618362 SHA512 1e17bce0ae272dff9e788bc4d83e7a3a518aaab589448eb3139dba89e52e63ecaad9c991db99839ed7b22f1fd47820579a570271a5df01d37f595b72de89055e DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz 102003248 BLAKE2B 75eb1dc4e09f868ca1a5f0ccc275e36992414e250c2815ab2a6e879942dfdd57a069d6d2cc79aee967c8d2077cecef6d65285cf870e70d22aebef607e906dbec SHA512 cf716f9a614932ccffeb8a7a2ee3a2f10543b31b8f6953933ba4785f386873fe00fee69061c70c26b55a6db13f26ba529f9953d7f3fce9b42172fe3b4e0eee52 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz 102022940 BLAKE2B 40b14e0399de76c6dd2bdc9cd6b3aba7d62cddbb636a2b11a905dc432b0aa91ad62d415203f3f83c0ba82c3667f83a485ec57e71077c26c8eaf35c0f08edd713 SHA512 d932f0a0101fdce350e48a4a79754477478b6c345bdd66bd63be53a10fe6e613b89028d4ebb03d48e85284d5a1caca7f128690765e91968e01420f5fbc08ce48 diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml index 37e5947f7cf2..c09a0d4ca3e7 100644 --- a/dev-java/openjdk-bin/metadata.xml +++ b/dev-java/openjdk-bin/metadata.xml @@ -16,7 +16,6 @@ </longdescription> <use> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="source">Install JVM sources</flag> </use> </pkgmetadata> diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild deleted file mode 100644 index bba49ad388a3..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2022 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 aarch64 arm64) - $(abi_uri arm) - $(abi_uri x64 amd64) - $(abi_uri x64 amd64 musl) - $(abi_uri aarch64 arm64-macos) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 x64-macos) -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net"; -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos" -IUSE="alsa cups +gentoo-vm 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}" - - use gentoo-vm && 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 -} diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild deleted file mode 100644 index 10cf917bc189..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2022 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 aarch64 arm64) - $(abi_uri arm) - $(abi_uri x64 amd64) - $(abi_uri x64 amd64 musl) - $(abi_uri aarch64 arm64-macos) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 x64-macos) -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net"; -LICENSE="GPL-2-with-classpath-exception" -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 -} diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild deleted file mode 100644 index 10cf917bc189..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2022 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 aarch64 arm64) - $(abi_uri arm) - $(abi_uri x64 amd64) - $(abi_uri x64 amd64 musl) - $(abi_uri aarch64 arm64-macos) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 x64-macos) -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net"; -LICENSE="GPL-2-with-classpath-exception" -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 -}
