commit:     ba1ebbcac4b2786b81587f19f2093b06cf07a6b9
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Oct 25 18:58:01 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 07:25:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba1ebbca

dev-java/openjdk: drop versions

Bug: https://bugs.gentoo.org/908243
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/openjdk/Manifest                     |   6 -
 dev-java/openjdk/openjdk-11.0.18_p10.ebuild   | 312 ------------------------
 dev-java/openjdk/openjdk-11.0.19_p7.ebuild    | 312 ------------------------
 dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild | 329 --------------------------
 dev-java/openjdk/openjdk-17.0.6_p10.ebuild    | 327 -------------------------
 dev-java/openjdk/openjdk-17.0.7_p7.ebuild     | 327 -------------------------
 dev-java/openjdk/openjdk-8.362_p09.ebuild     | 239 -------------------
 dev-java/openjdk/openjdk-8.372_p07.ebuild     | 239 -------------------
 8 files changed, 2091 deletions(-)

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5524d9d6ac67..402a522c0612 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,13 +1,7 @@
 DIST java17-riscv64.patch 2253475 BLAKE2B 
a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de
 SHA512 
06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165
 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B 
b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b
 SHA512 
c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
-DIST openjdk-11.0.18_p10.tar.gz 123369840 BLAKE2B 
1fa6a147ac0685f51b82f7b958b81d4ac56dd0d94234dab54d4c3641d4d5b0905b4778fa73f2d8582249f251839dd3ff5b8835c2ff3eb24f402d1399cfc27ffe
 SHA512 
10a48066ad1d2b627cc9be5c6e06a0deef7241f3b95b917b3bf86ffeb53ea043915e0eb7784ea244332d9c3941c8c5056c154e5aff4522b95aca8c8372c19474
-DIST openjdk-11.0.19_p7.tar.gz 123660996 BLAKE2B 
1b16d27700a39e7f1475384ad1178086f7c3e1e5f34390a6157d5d367057e90e1896eeca8d37cef4b93e3571a2eb26eee0e01890a1ef99a5a2a3542344cb9a9c
 SHA512 
570ab208decc9fc1290f77cf7283f433bc7ee046ea212943f90ca08f262648ed3d0a9dc1b31a7254e4db53e6073d8b3ac573ee74ed665b223801ada8dd1d15d6
 DIST openjdk-11.0.20.1_p1.tar.gz 116165519 BLAKE2B 
3f3627d6535770c6654226ca2c188ac4aa0f332c7f66d79ab1991274e019ee4aee5194b285bace03175593543017a2ec75494e8e50b5488df82c7d437bf31398
 SHA512 
765f90a24629e5db5afb23b09edc38a3d460ba27d1de53980942e711783fe9fdf1c4ef29a75d2ffd6d93864611ffce60d515e032180917cd053967a0d4ecfc69
-DIST openjdk-17.0.6_p10.tar.gz 105221267 BLAKE2B 
c885c10aea273e779bbee4463106598900790378e06012f0019bfbbba8987a99a6aad53aca39bdc5ffba5f610a84e6c4cfd98c697e46404d388d32186b2ccd6b
 SHA512 
7fa47285fb1776802dc35352bfe64d6b376cbc73d7b72ef7d5c8ad41c181d8aa9dc6fb392fe3b1c799974765d40c03a6643ad6afeb3ddc9ab45e546b747ebb3c
-DIST openjdk-17.0.7_p7.tar.gz 105568148 BLAKE2B 
a89961e0bc796a3c6337e1404fb33ee8cc6ced0319c2cf83a85cc36190af6b96817a51f407819fefbbc832213bef861913835abf20f1b10e6e2e49a759210302
 SHA512 
b403c581b2a89c576ca5468ac34e1a97ef0ab2d6150d31724151b098738684ef9213d31e06fd1923f9cd8a8a1f257f032a166a502177a9b0670bea7280439969
 DIST openjdk-17.0.8.1_p1.tar.gz 105878760 BLAKE2B 
e4d752dc87717855bfe4bd84c97056f0d93b554c67bdbb3e750e20479e2156628c85aea7b404577ea6ff40d49669d5f53aab06d0c4cf9aa926b060a0cd93cd03
 SHA512 
0d8e9e54173be855c15d121d4d6cd36996700e1e2fb194ad93ba8ad794a342c87b7d2f81a32d0bb215e45f1dc1f4efdfe1be5e8de99395730902d443ac773813
-DIST openjdk-8.362_p09.tar.gz 87939909 BLAKE2B 
cff08a04e2e0cf0af776d8ae8220cae86afb322a4dbb83df39444b08a23dd59fea761a0ee403d24d7fd639e1982eac7c77764920c7efcfeb877dc64763c9f672
 SHA512 
6579e881f36902db49db8d136f1cd9d2b2659705b216bfe014df99441d1984b4d7678998bb36edf78b77049bdd8315a8dcf22e6a598b485b972fee3784fe2ef7
-DIST openjdk-8.372_p07.tar.gz 88002433 BLAKE2B 
0f5ee2596099415dd377671a54cabcd7234e5b081ee41810ac3bfe11d9ba6e4bc92d96ff4713a165fdce46c0425f1698fd22c18cb02df107f886aa607f0f87b7
 SHA512 
400c1fd2df8b55a02ed9df0a7f38bb43e048eda5962b59f472eb2c8d23c1399cb418b3244d59816242bdd9c26249e7738cf2cf89c6b6e4f973399134a9f5d4ae
 DIST openjdk-8.382_p05.tar.gz 93105951 BLAKE2B 
07e2961dbbd8de153650a1f92fd88960e6b1b39e7d212cc158bd943d35da5fdab0595583226ac12134eb176b1c550576e7aef5dfaf4a76ac0060daa42f4b4495
 SHA512 
5879cfbd5795f0260897c52fe2503754767faf1e229832e0c4c6dd9957055fd7105d14403d82ccf92eed0adfecc5bc858a89643e68d3c81d437fd543fbfce49a
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 
5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d
 SHA512 
732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B 
d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29
 SHA512 
f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f

diff --git a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild 
b/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
deleted file mode 100644
index 9c455e1a1a45..000000000000
--- a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere 
else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-       local 
baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap";
-       local suff="tar.xz"
-       local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-       local ver="${2:?${FUNCNAME[0]}: version not specified}"
-       local cond="${3-}"
-
-       # here be dragons
-       echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} 
${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="
-       
https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-               -> ${P}.tar.gz
-       !system-bootstrap? (
-               $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-               $(bootstrap_uri riscv ${RISCV_XPAK})
-               $(bootstrap_uri x86 ${X86_XPAK})
-       )
-       riscv? ( 
https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz
 )
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-       javafx? ( alsa !headless-awt )
-       !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       media-libs/harfbuzz:=
-       media-libs/libpng:0=
-       media-libs/lcms:2=
-       sys-libs/zlib
-       media-libs/libjpeg-turbo:0=
-       systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       javafx? ( dev-java/openjfx:${SLOT}= )
-       system-bootstrap? (
-               || (
-                       dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-                       dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-               )
-       )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-       java-vm-2_pkg_setup
-
-       [[ ${MERGE_TYPE} == "binary" ]] && return
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       if use system-bootstrap; then
-               for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-                       if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-                               java-pkg-2_pkg_setup
-                               return
-                       fi
-               done
-       fi
-}
-
-src_prepare() {
-       use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch
-       default
-       chmod +x configure || die
-}
-
-src_configure() {
-       if ! use system-bootstrap; then
-               local xpakvar="${ARCH^^}_XPAK"
-               export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-       fi
-
-       # Work around stack alignment issue, bug #647954.
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #713180
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, we rely on USE=lto and 
--with-jvm-features=link-time-opt
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       # Enabling full docs appears to break doc building. If not
-       # explicitly disabled, the flag will get auto-enabled if pandoc and
-       # graphviz are detected. pandoc has loads of dependencies anyway.
-
-       local myconf=(
-               --disable-ccache
-               --disable-precompiled-headers
-               --enable-full-docs=no
-               --with-boot-jdk="${JDK_HOME}"
-               --with-extra-cflags="${CFLAGS}"
-               --with-extra-cxxflags="${CXXFLAGS}"
-               --with-extra-ldflags="${LDFLAGS}"
-               --with-freetype="${XPAK_BOOTSTRAP:-system}"
-               --with-giflib="${XPAK_BOOTSTRAP:-system}"
-               --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-               --with-lcms="${XPAK_BOOTSTRAP:-system}"
-               --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-               --with-libpng="${XPAK_BOOTSTRAP:-system}"
-               --with-native-debug-symbols=$(usex debug internal none)
-               --with-vendor-name="Gentoo"
-               --with-vendor-url="https://gentoo.org";
-               --with-vendor-bug-url="https://bugs.gentoo.org";
-               --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-               --with-vendor-version-string="${PVR}"
-               --with-version-pre=""
-               --with-version-string="${PV%_p*}"
-               --with-version-build="${PV#*_p}"
-               --with-zlib="${XPAK_BOOTSTRAP:-system}"
-               --enable-dtrace=$(usex systemtap yes no)
-               --enable-headless-only=$(usex headless-awt yes no)
-               $(tc-is-clang && echo "--with-toolchain-type=clang")
-       )
-       ! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
-       use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-       if use javafx; then
-               # this is not useful for users, just for upstream developers
-               # build system compares mesa version in md file
-               # https://bugs.gentoo.org/822612
-               export LEGAL_EXCLUDES=mesa3d.md
-
-               local 
zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-               if [[ -r ${zip} ]]; then
-                       myconf+=( --with-import-modules="${zip}" )
-               else
-                       die "${zip} not found or not readable"
-               fi
-       fi
-
-       if use !system-bootstrap ; then
-               addpredict /dev/random
-               addpredict /proc/self/coredump_filter
-       fi
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images product-images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/jdk || die
-
-       # Create files used as storage for system preferences.
-       mkdir .systemPrefs || die
-       touch .systemPrefs/.system.lock || die
-       touch .systemPrefs/.systemRootModFile || die
-
-       # Oracle and IcedTea have libjsoundalsa.so depending on
-       # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-       if ! use alsa ; then
-               rm -v lib/libjsound.* || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v lib/src.zip || die
-       fi
-
-       rm -v lib/security/cacerts || die
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-       # must be done before running itself
-       java-vm_set-pax-markings "${ddest}"
-
-       einfo "Creating the Class Data Sharing archives and disabling usage 
tracking"
-       "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking 
|| die
-
-       java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/images/docs/*
-               dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-}

diff --git a/dev-java/openjdk/openjdk-11.0.19_p7.ebuild 
b/dev-java/openjdk/openjdk-11.0.19_p7.ebuild
deleted file mode 100644
index 8d64a1fe2ce9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.19_p7.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere 
else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-       local 
baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap";
-       local suff="tar.xz"
-       local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-       local ver="${2:?${FUNCNAME[0]}: version not specified}"
-       local cond="${3-}"
-
-       # here be dragons
-       echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} 
${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="
-       
https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-               -> ${P}.tar.gz
-       !system-bootstrap? (
-               $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-               $(bootstrap_uri riscv ${RISCV_XPAK})
-               $(bootstrap_uri x86 ${X86_XPAK})
-       )
-       riscv? ( 
https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz
 )
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-       javafx? ( alsa !headless-awt )
-       !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       media-libs/harfbuzz:=
-       media-libs/libpng:0=
-       media-libs/lcms:2=
-       sys-libs/zlib
-       media-libs/libjpeg-turbo:0=
-       systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       javafx? ( dev-java/openjfx:${SLOT}= )
-       system-bootstrap? (
-               || (
-                       dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-                       dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-               )
-       )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-       java-vm-2_pkg_setup
-
-       [[ ${MERGE_TYPE} == "binary" ]] && return
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       if use system-bootstrap; then
-               for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-                       if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-                               java-pkg-2_pkg_setup
-                               return
-                       fi
-               done
-       fi
-}
-
-src_prepare() {
-       use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch
-       default
-       chmod +x configure || die
-}
-
-src_configure() {
-       if ! use system-bootstrap; then
-               local xpakvar="${ARCH^^}_XPAK"
-               export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-       fi
-
-       # Work around stack alignment issue, bug #647954.
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #713180
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, we rely on USE=lto and 
--with-jvm-features=link-time-opt
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       # Enabling full docs appears to break doc building. If not
-       # explicitly disabled, the flag will get auto-enabled if pandoc and
-       # graphviz are detected. pandoc has loads of dependencies anyway.
-
-       local myconf=(
-               --disable-ccache
-               --disable-precompiled-headers
-               --enable-full-docs=no
-               --with-boot-jdk="${JDK_HOME}"
-               --with-extra-cflags="${CFLAGS}"
-               --with-extra-cxxflags="${CXXFLAGS}"
-               --with-extra-ldflags="${LDFLAGS}"
-               --with-freetype="${XPAK_BOOTSTRAP:-system}"
-               --with-giflib="${XPAK_BOOTSTRAP:-system}"
-               --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-               --with-lcms="${XPAK_BOOTSTRAP:-system}"
-               --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-               --with-libpng="${XPAK_BOOTSTRAP:-system}"
-               --with-native-debug-symbols=$(usex debug internal none)
-               --with-vendor-name="Gentoo"
-               --with-vendor-url="https://gentoo.org";
-               --with-vendor-bug-url="https://bugs.gentoo.org";
-               --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-               --with-vendor-version-string="${PVR}"
-               --with-version-pre=""
-               --with-version-string="${PV%_p*}"
-               --with-version-build="${PV#*_p}"
-               --with-zlib="${XPAK_BOOTSTRAP:-system}"
-               --enable-dtrace=$(usex systemtap yes no)
-               --enable-headless-only=$(usex headless-awt yes no)
-               $(tc-is-clang && echo "--with-toolchain-type=clang")
-       )
-       ! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
-       use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-       if use javafx; then
-               # this is not useful for users, just for upstream developers
-               # build system compares mesa version in md file
-               # https://bugs.gentoo.org/822612
-               export LEGAL_EXCLUDES=mesa3d.md
-
-               local 
zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-               if [[ -r ${zip} ]]; then
-                       myconf+=( --with-import-modules="${zip}" )
-               else
-                       die "${zip} not found or not readable"
-               fi
-       fi
-
-       if use !system-bootstrap ; then
-               addpredict /dev/random
-               addpredict /proc/self/coredump_filter
-       fi
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images product-images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/jdk || die
-
-       # Create files used as storage for system preferences.
-       mkdir .systemPrefs || die
-       touch .systemPrefs/.system.lock || die
-       touch .systemPrefs/.systemRootModFile || die
-
-       # Oracle and IcedTea have libjsoundalsa.so depending on
-       # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-       if ! use alsa ; then
-               rm -v lib/libjsound.* || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v lib/src.zip || die
-       fi
-
-       rm -v lib/security/cacerts || die
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-       # must be done before running itself
-       java-vm_set-pax-markings "${ddest}"
-
-       einfo "Creating the Class Data Sharing archives and disabling usage 
tracking"
-       "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking 
|| die
-
-       java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/images/docs/*
-               dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-}

diff --git a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild 
b/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
deleted file mode 100644
index d08c77b3bea7..000000000000
--- a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-       local 
baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap";
-       local suff="tar.xz"
-       local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-       local ver="${2:?${FUNCNAME[0]}: version not specified}"
-       local cond="${3-}"
-       [[ ${cond} == elibc_musl* ]] && local musl=yes
-
-       # here be dragons
-       echo "${kw}? ( ${cond:+${cond}? (} 
${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="
-       
https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-               -> ${P}.tar.gz
-       !system-bootstrap? (
-               $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-               $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-               $(bootstrap_uri x86 ${X86_XPAK})
-               $(bootstrap_uri riscv ${RISCV_XPAK})
-       )
-       riscv? ( 
https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch
 )
-"
-# riscv patch origin:
-# 
https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-       javafx? ( alsa !headless-awt )
-       !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       media-libs/harfbuzz:=
-       media-libs/libpng:0=
-       media-libs/lcms:2=
-       sys-libs/zlib
-       media-libs/libjpeg-turbo:0=
-       systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       javafx? ( dev-java/openjfx:${SLOT}= )
-       system-bootstrap? (
-               || (
-                       dev-java/openjdk-bin:${SLOT}
-                       dev-java/openjdk:${SLOT}
-               )
-       )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-PATCHES=( "${FILESDIR}/openjdk-17.0.6-multihead-fix.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-       java-vm-2_pkg_setup
-
-       [[ ${MERGE_TYPE} == "binary" ]] && return
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       # The nastiness below is necessary while the gentoo-vm USE flag is
-       # masked. First we call java-pkg-2_pkg_setup if it looks like the
-       # flag was unmasked against one of the possible build VMs. If not,
-       # we try finding one of them in their expected locations. This would
-       # have been slightly less messy if openjdk-bin had been installed to
-       # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-       # file but disable it so that it would not normally be selectable.
-
-       local vm
-       for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-               if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-                       java-pkg-2_pkg_setup
-                       return
-               fi
-       done
-}
-
-src_prepare() {
-       use riscv && eapply "${DISTDIR}"/java17-riscv64.patch
-       default
-       chmod +x configure || die
-}
-
-src_configure() {
-       if has_version dev-java/openjdk:${SLOT}; then
-               export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-       elif use !system-bootstrap ; then
-               local xpakvar="${ARCH^^}_XPAK"
-               export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-       else
-               JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-               [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-               JDK_HOME=${JDK_HOME#*/}
-               JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-               export JDK_HOME
-       fi
-
-       # Work around stack alignment issue, bug #647954. in case we ever have 
x86
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #713180
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, we rely on USE=lto and 
--with-jvm-features=link-time-opt
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       # Enabling full docs appears to break doc building. If not
-       # explicitly disabled, the flag will get auto-enabled if pandoc and
-       # graphviz are detected. pandoc has loads of dependencies anyway.
-
-       local myconf=(
-               --disable-ccache
-               --disable-precompiled-headers
-               --disable-warnings-as-errors
-               --enable-full-docs=no
-               --with-boot-jdk="${JDK_HOME}"
-               --with-extra-cflags="${CFLAGS}"
-               --with-extra-cxxflags="${CXXFLAGS}"
-               --with-extra-ldflags="${LDFLAGS}"
-               --with-freetype="${XPAK_BOOTSTRAP:-system}"
-               --with-giflib="${XPAK_BOOTSTRAP:-system}"
-               --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-               --with-lcms="${XPAK_BOOTSTRAP:-system}"
-               --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-               --with-libpng="${XPAK_BOOTSTRAP:-system}"
-               --with-native-debug-symbols=$(usex debug internal none)
-               --with-vendor-name="Gentoo"
-               --with-vendor-url="https://gentoo.org";
-               --with-vendor-bug-url="https://bugs.gentoo.org";
-               --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-               --with-vendor-version-string="${PVR}"
-               --with-version-pre=""
-               --with-version-string="${PV%_p*}"
-               --with-version-build="${PV#*_p}"
-               --with-zlib="${XPAK_BOOTSTRAP:-system}"
-               --enable-dtrace=$(usex systemtap yes no)
-               --enable-headless-only=$(usex headless-awt yes no)
-               $(tc-is-clang && echo "--with-toolchain-type=clang")
-       )
-
-       use riscv && myconf+=( 
--with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-       use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-       if use javafx; then
-               local 
zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-               if [[ -r ${zip} ]]; then
-                       myconf+=( --with-import-modules="${zip}" )
-               else
-                       die "${zip} not found or not readable"
-               fi
-       fi
-
-       if use !system-bootstrap ; then
-               addpredict /dev/random
-               addpredict /proc/self/coredump_filter
-       fi
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images product-images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/jdk || die
-
-       # Create files used as storage for system preferences.
-       mkdir .systemPrefs || die
-       touch .systemPrefs/.system.lock || die
-       touch .systemPrefs/.systemRootModFile || die
-
-       # Oracle and IcedTea have libjsoundalsa.so depending on
-       # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-       if ! use alsa ; then
-               rm -v lib/libjsound.* || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v lib/src.zip || die
-       fi
-
-       rm -v lib/security/cacerts || die
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-       # must be done before running itself
-       java-vm_set-pax-markings "${ddest}"
-
-       einfo "Creating the Class Data Sharing archives and disabling usage 
tracking"
-       "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking 
|| die
-
-       java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/images/docs/*
-               dosym ../../../usr/share/doc/"${PF}" 
/usr/share/doc/"${PN}-${SLOT}"
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-}

diff --git a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild 
b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
deleted file mode 100644
index 88ff848d5927..000000000000
--- a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-       local 
baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap";
-       local suff="tar.xz"
-       local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-       local ver="${2:?${FUNCNAME[0]}: version not specified}"
-       local cond="${3-}"
-       [[ ${cond} == elibc_musl* ]] && local musl=yes
-
-       # here be dragons
-       echo "${kw}? ( ${cond:+${cond}? (} 
${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="
-       
https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-               -> ${P}.tar.gz
-       !system-bootstrap? (
-               $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-               $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-               $(bootstrap_uri x86 ${X86_XPAK})
-               $(bootstrap_uri riscv ${RISCV_XPAK})
-       )
-       riscv? ( 
https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch
 )
-"
-# riscv patch origin:
-# 
https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-       javafx? ( alsa !headless-awt )
-       !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       media-libs/harfbuzz:=
-       media-libs/libpng:0=
-       media-libs/lcms:2=
-       sys-libs/zlib
-       media-libs/libjpeg-turbo:0=
-       systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       javafx? ( dev-java/openjfx:${SLOT}= )
-       system-bootstrap? (
-               || (
-                       dev-java/openjdk-bin:${SLOT}
-                       dev-java/openjdk:${SLOT}
-               )
-       )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-       java-vm-2_pkg_setup
-
-       [[ ${MERGE_TYPE} == "binary" ]] && return
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       # The nastiness below is necessary while the gentoo-vm USE flag is
-       # masked. First we call java-pkg-2_pkg_setup if it looks like the
-       # flag was unmasked against one of the possible build VMs. If not,
-       # we try finding one of them in their expected locations. This would
-       # have been slightly less messy if openjdk-bin had been installed to
-       # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-       # file but disable it so that it would not normally be selectable.
-
-       local vm
-       for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-               if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-                       java-pkg-2_pkg_setup
-                       return
-               fi
-       done
-}
-
-src_prepare() {
-       use riscv && eapply "${DISTDIR}"/java17-riscv64.patch
-       default
-       chmod +x configure || die
-}
-
-src_configure() {
-       if has_version dev-java/openjdk:${SLOT}; then
-               export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-       elif use !system-bootstrap ; then
-               local xpakvar="${ARCH^^}_XPAK"
-               export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-       else
-               JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-               [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-               JDK_HOME=${JDK_HOME#*/}
-               JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-               export JDK_HOME
-       fi
-
-       # Work around stack alignment issue, bug #647954. in case we ever have 
x86
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #713180
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, we rely on USE=lto and 
--with-jvm-features=link-time-opt
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       # Enabling full docs appears to break doc building. If not
-       # explicitly disabled, the flag will get auto-enabled if pandoc and
-       # graphviz are detected. pandoc has loads of dependencies anyway.
-
-       local myconf=(
-               --disable-ccache
-               --disable-precompiled-headers
-               --disable-warnings-as-errors
-               --enable-full-docs=no
-               --with-boot-jdk="${JDK_HOME}"
-               --with-extra-cflags="${CFLAGS}"
-               --with-extra-cxxflags="${CXXFLAGS}"
-               --with-extra-ldflags="${LDFLAGS}"
-               --with-freetype="${XPAK_BOOTSTRAP:-system}"
-               --with-giflib="${XPAK_BOOTSTRAP:-system}"
-               --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-               --with-lcms="${XPAK_BOOTSTRAP:-system}"
-               --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-               --with-libpng="${XPAK_BOOTSTRAP:-system}"
-               --with-native-debug-symbols=$(usex debug internal none)
-               --with-vendor-name="Gentoo"
-               --with-vendor-url="https://gentoo.org";
-               --with-vendor-bug-url="https://bugs.gentoo.org";
-               --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-               --with-vendor-version-string="${PVR}"
-               --with-version-pre=""
-               --with-version-string="${PV%_p*}"
-               --with-version-build="${PV#*_p}"
-               --with-zlib="${XPAK_BOOTSTRAP:-system}"
-               --enable-dtrace=$(usex systemtap yes no)
-               --enable-headless-only=$(usex headless-awt yes no)
-               $(tc-is-clang && echo "--with-toolchain-type=clang")
-       )
-
-       use riscv && myconf+=( 
--with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-       use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-       if use javafx; then
-               local 
zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-               if [[ -r ${zip} ]]; then
-                       myconf+=( --with-import-modules="${zip}" )
-               else
-                       die "${zip} not found or not readable"
-               fi
-       fi
-
-       if use !system-bootstrap ; then
-               addpredict /dev/random
-               addpredict /proc/self/coredump_filter
-       fi
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images product-images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/jdk || die
-
-       # Create files used as storage for system preferences.
-       mkdir .systemPrefs || die
-       touch .systemPrefs/.system.lock || die
-       touch .systemPrefs/.systemRootModFile || die
-
-       # Oracle and IcedTea have libjsoundalsa.so depending on
-       # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-       if ! use alsa ; then
-               rm -v lib/libjsound.* || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v lib/src.zip || die
-       fi
-
-       rm -v lib/security/cacerts || die
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-       # must be done before running itself
-       java-vm_set-pax-markings "${ddest}"
-
-       einfo "Creating the Class Data Sharing archives and disabling usage 
tracking"
-       "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking 
|| die
-
-       java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/images/docs/*
-               dosym ../../../usr/share/doc/"${PF}" 
/usr/share/doc/"${PN}-${SLOT}"
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-}

diff --git a/dev-java/openjdk/openjdk-17.0.7_p7.ebuild 
b/dev-java/openjdk/openjdk-17.0.7_p7.ebuild
deleted file mode 100644
index 9b3e7b1fe8fb..000000000000
--- a/dev-java/openjdk/openjdk-17.0.7_p7.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-       local 
baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap";
-       local suff="tar.xz"
-       local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-       local ver="${2:?${FUNCNAME[0]}: version not specified}"
-       local cond="${3-}"
-       [[ ${cond} == elibc_musl* ]] && local musl=yes
-
-       # here be dragons
-       echo "${kw}? ( ${cond:+${cond}? (} 
${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="
-       
https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-               -> ${P}.tar.gz
-       !system-bootstrap? (
-               $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-               $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-               $(bootstrap_uri x86 ${X86_XPAK})
-               $(bootstrap_uri riscv ${RISCV_XPAK})
-       )
-       riscv? ( 
https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch
 )
-"
-# riscv patch origin:
-# 
https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-       javafx? ( alsa !headless-awt )
-       !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       media-libs/harfbuzz:=
-       media-libs/libpng:0=
-       media-libs/lcms:2=
-       sys-libs/zlib
-       media-libs/libjpeg-turbo:0=
-       systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       javafx? ( dev-java/openjfx:${SLOT}= )
-       system-bootstrap? (
-               || (
-                       dev-java/openjdk-bin:${SLOT}
-                       dev-java/openjdk:${SLOT}
-               )
-       )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-       java-vm-2_pkg_setup
-
-       [[ ${MERGE_TYPE} == "binary" ]] && return
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       # The nastiness below is necessary while the gentoo-vm USE flag is
-       # masked. First we call java-pkg-2_pkg_setup if it looks like the
-       # flag was unmasked against one of the possible build VMs. If not,
-       # we try finding one of them in their expected locations. This would
-       # have been slightly less messy if openjdk-bin had been installed to
-       # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-       # file but disable it so that it would not normally be selectable.
-
-       local vm
-       for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-               if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-                       java-pkg-2_pkg_setup
-                       return
-               fi
-       done
-}
-
-src_prepare() {
-       use riscv && eapply "${DISTDIR}"/java17-riscv64.patch
-       default
-       chmod +x configure || die
-}
-
-src_configure() {
-       if has_version dev-java/openjdk:${SLOT}; then
-               export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-       elif use !system-bootstrap ; then
-               local xpakvar="${ARCH^^}_XPAK"
-               export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-       else
-               JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-               [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-               JDK_HOME=${JDK_HOME#*/}
-               JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-               export JDK_HOME
-       fi
-
-       # Work around stack alignment issue, bug #647954. in case we ever have 
x86
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #713180
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, we rely on USE=lto and 
--with-jvm-features=link-time-opt
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       # Enabling full docs appears to break doc building. If not
-       # explicitly disabled, the flag will get auto-enabled if pandoc and
-       # graphviz are detected. pandoc has loads of dependencies anyway.
-
-       local myconf=(
-               --disable-ccache
-               --disable-precompiled-headers
-               --disable-warnings-as-errors
-               --enable-full-docs=no
-               --with-boot-jdk="${JDK_HOME}"
-               --with-extra-cflags="${CFLAGS}"
-               --with-extra-cxxflags="${CXXFLAGS}"
-               --with-extra-ldflags="${LDFLAGS}"
-               --with-freetype="${XPAK_BOOTSTRAP:-system}"
-               --with-giflib="${XPAK_BOOTSTRAP:-system}"
-               --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-               --with-lcms="${XPAK_BOOTSTRAP:-system}"
-               --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-               --with-libpng="${XPAK_BOOTSTRAP:-system}"
-               --with-native-debug-symbols=$(usex debug internal none)
-               --with-vendor-name="Gentoo"
-               --with-vendor-url="https://gentoo.org";
-               --with-vendor-bug-url="https://bugs.gentoo.org";
-               --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-               --with-vendor-version-string="${PVR}"
-               --with-version-pre=""
-               --with-version-string="${PV%_p*}"
-               --with-version-build="${PV#*_p}"
-               --with-zlib="${XPAK_BOOTSTRAP:-system}"
-               --enable-dtrace=$(usex systemtap yes no)
-               --enable-headless-only=$(usex headless-awt yes no)
-               $(tc-is-clang && echo "--with-toolchain-type=clang")
-       )
-
-       use riscv && myconf+=( 
--with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-       use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-       if use javafx; then
-               local 
zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-               if [[ -r ${zip} ]]; then
-                       myconf+=( --with-import-modules="${zip}" )
-               else
-                       die "${zip} not found or not readable"
-               fi
-       fi
-
-       if use !system-bootstrap ; then
-               addpredict /dev/random
-               addpredict /proc/self/coredump_filter
-       fi
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images product-images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/jdk || die
-
-       # Create files used as storage for system preferences.
-       mkdir .systemPrefs || die
-       touch .systemPrefs/.system.lock || die
-       touch .systemPrefs/.systemRootModFile || die
-
-       # Oracle and IcedTea have libjsoundalsa.so depending on
-       # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-       if ! use alsa ; then
-               rm -v lib/libjsound.* || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v lib/src.zip || die
-       fi
-
-       rm -v lib/security/cacerts || die
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-       # must be done before running itself
-       java-vm_set-pax-markings "${ddest}"
-
-       einfo "Creating the Class Data Sharing archives and disabling usage 
tracking"
-       "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking 
|| die
-
-       java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/images/docs/*
-               dosym ../../../usr/share/doc/"${PF}" 
/usr/share/doc/"${PN}-${SLOT}"
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-}

diff --git a/dev-java/openjdk/openjdk-8.362_p09.ebuild 
b/dev-java/openjdk/openjdk-8.362_p09.ebuild
deleted file mode 100644
index 9b1632baec83..000000000000
--- a/dev-java/openjdk/openjdk-8.362_p09.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere 
else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux 
source"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       virtual/pkgconfig
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       || (
-               dev-java/openjdk-bin:${SLOT}
-               dev-java/icedtea-bin:${SLOT}
-               dev-java/openjdk:${SLOT}
-               dev-java/icedtea:${SLOT}
-       )
-"
-
-BDEPEND="
-       virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} 
icedtea-${SLOT} icedtea-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       java-vm-2_pkg_setup
-       java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # new warnings in new gcc https://bugs.gentoo.org/685426
-       sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-               hotspot/make/linux/makefiles/gcc.make || die
-
-       chmod +x configure || die
-}
-
-src_configure() {
-       # general build info found here:
-       #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-       # Work around stack alignment issue, bug #647954.
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #706638
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, no support in this version.
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-       local myconf=(
-                       --disable-ccache
-                       --disable-freetype-bundling
-                       --disable-precompiled-headers
-                       --enable-unlimited-crypto
-                       --with-boot-jdk="${JDK_HOME}"
-                       --with-extra-cflags="${CFLAGS}"
-                       --with-extra-cxxflags="${CXXFLAGS}"
-                       --with-extra-ldflags="${LDFLAGS}"
-                       --with-freetype-lib="$( $(tc-getPKG_CONFIG) 
--variable=libdir freetype2 )"
-                       --with-freetype-include="$( $(tc-getPKG_CONFIG) 
--variable=includedir freetype2)/freetype2"
-                       --with-giflib=system
-                       --with-jtreg=no
-                       --with-jobs=1
-                       --with-num-cores=1
-                       --with-update-version="$(ver_cut 2)"
-                       --with-build-number="b$(ver_cut 4)"
-                       --with-milestone="fcs" # magic variable that means 
"release version"
-                       --with-vendor-name="Gentoo"
-                       --with-vendor-url="https://gentoo.org";
-                       --with-vendor-bug-url="https://bugs.gentoo.org";
-                       --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-                       --with-zlib=system
-                       --with-native-debug-symbols=$(usex debug internal none)
-                       $(usex headless-awt --disable-headful '')
-                       $(tc-is-clang && echo "--with-toolchain-type=clang")
-               )
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               CONFIG_SHELL="${BROOT}/bin/bash"
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/j2sdk-image || die
-
-       if ! use alsa; then
-               rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-       fi
-
-       # build system does not remove that
-       if use headless-awt ; then
-               rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-               {,jre/}bin/policytool bin/appletviewer || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v src.zip || die
-       fi
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-       java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-       java-vm_set-pax-markings "${ddest}"
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/docs/*
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-       einfo "JavaWebStart functionality provided by icedtea-web package"
-}

diff --git a/dev-java/openjdk/openjdk-8.372_p07.ebuild 
b/dev-java/openjdk/openjdk-8.372_p07.ebuild
deleted file mode 100644
index 06e34fc34a25..000000000000
--- a/dev-java/openjdk/openjdk-8.372_p07.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 
multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release 
tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere 
else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org";
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux 
source"
-
-COMMON_DEPEND="
-       media-libs/freetype:2=
-       media-libs/giflib:0/7
-       sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-       ${COMMON_DEPEND}
-       >=sys-apps/baselayout-java-0.1.0-r1
-       !headless-awt? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXi
-               x11-libs/libXrender
-               x11-libs/libXt
-               x11-libs/libXtst
-       )
-       alsa? ( media-libs/alsa-lib )
-       cups? ( net-print/cups )
-       selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       app-arch/zip
-       media-libs/alsa-lib
-       net-print/cups
-       virtual/pkgconfig
-       x11-base/xorg-proto
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXi
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/libXtst
-       || (
-               dev-java/openjdk-bin:${SLOT}
-               dev-java/icedtea-bin:${SLOT}
-               dev-java/openjdk:${SLOT}
-               dev-java/icedtea:${SLOT}
-       )
-"
-
-BDEPEND="
-       virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-       local M
-       M=2048
-       M=$(( $(usex debug 3 1) * $M ))
-       M=$(( $(usex jbootstrap 2 1) * $M ))
-       M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-       CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-       openjdk_check_requirements
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               has ccache ${FEATURES} && die "FEATURES=ccache doesn't work 
with ${PN}, bug #677876"
-       fi
-}
-
-pkg_setup() {
-       openjdk_check_requirements
-
-       JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} 
icedtea-${SLOT} icedtea-bin-${SLOT}"
-       JAVA_PKG_WANT_SOURCE="${SLOT}"
-       JAVA_PKG_WANT_TARGET="${SLOT}"
-
-       java-vm-2_pkg_setup
-       java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # new warnings in new gcc https://bugs.gentoo.org/685426
-       sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-               hotspot/make/linux/makefiles/gcc.make || die
-
-       chmod +x configure || die
-}
-
-src_configure() {
-       # general build info found here:
-       #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-       # Work around stack alignment issue, bug #647954.
-       use x86 && append-flags -mincoming-stack-boundary=2
-
-       # Work around -fno-common ( GCC10 default ), bug #706638
-       append-flags -fcommon
-
-       # Strip some flags users may set, but should not. #818502
-       filter-flags -fexceptions
-
-       # Strip lto related flags, no support in this version.
-       # https://bugs.gentoo.org/833097
-       # https://bugs.gentoo.org/833098
-       filter-lto
-       filter-flags -fdevirtualize-at-ltrans
-
-       tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-       local myconf=(
-                       --disable-ccache
-                       --disable-freetype-bundling
-                       --disable-precompiled-headers
-                       --enable-unlimited-crypto
-                       --with-boot-jdk="${JDK_HOME}"
-                       --with-extra-cflags="${CFLAGS}"
-                       --with-extra-cxxflags="${CXXFLAGS}"
-                       --with-extra-ldflags="${LDFLAGS}"
-                       --with-freetype-lib="$( $(tc-getPKG_CONFIG) 
--variable=libdir freetype2 )"
-                       --with-freetype-include="$( $(tc-getPKG_CONFIG) 
--variable=includedir freetype2)/freetype2"
-                       --with-giflib=system
-                       --with-jtreg=no
-                       --with-jobs=1
-                       --with-num-cores=1
-                       --with-update-version="$(ver_cut 2)"
-                       --with-build-number="b$(ver_cut 4)"
-                       --with-milestone="fcs" # magic variable that means 
"release version"
-                       --with-vendor-name="Gentoo"
-                       --with-vendor-url="https://gentoo.org";
-                       --with-vendor-bug-url="https://bugs.gentoo.org";
-                       --with-vendor-vm-bug-url="https://bugs.openjdk.java.net";
-                       --with-zlib=system
-                       --with-native-debug-symbols=$(usex debug internal none)
-                       $(usex headless-awt --disable-headful '')
-                       $(tc-is-clang && echo "--with-toolchain-type=clang")
-               )
-
-       (
-               unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-               CFLAGS= CXXFLAGS= LDFLAGS= \
-               CONFIG_SITE=/dev/null \
-               CONFIG_SHELL="${BROOT}/bin/bash"
-               econf "${myconf[@]}"
-       )
-}
-
-src_compile() {
-       # Too brittle - gets confused by e.g. -Oline
-       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-       unset GNUMAKEFLAGS MAKEFLAGS
-
-       local myemakeargs=(
-               JOBS=$(makeopts_jobs)
-               LOG=debug
-               CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-               NICE= # Use PORTAGE_NICENESS, don't adjust further down
-               $(usex doc docs '')
-               $(usex jbootstrap bootcycle-images images)
-       )
-       emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-       local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-       local ddest="${ED}/${dest#/}"
-
-       cd "${S}"/build/*-release/images/j2sdk-image || die
-
-       if ! use alsa; then
-               rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-       fi
-
-       # build system does not remove that
-       if use headless-awt ; then
-               rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-               {,jre/}bin/policytool bin/appletviewer || die
-       fi
-
-       if ! use examples ; then
-               rm -vr demo/ || die
-       fi
-
-       if ! use source ; then
-               rm -v src.zip || die
-       fi
-
-       dodir "${dest}"
-       cp -pPR * "${ddest}" || die
-
-       dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-       java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-       java-vm_set-pax-markings "${ddest}"
-       java-vm_revdep-mask
-       java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-       if use doc ; then
-               docinto html
-               dodoc -r "${S}"/build/*-release/docs/*
-       fi
-}
-
-pkg_postinst() {
-       java-vm-2_pkg_postinst
-       einfo "JavaWebStart functionality provided by icedtea-web package"
-}

Reply via email to