commit:     4f693412522966cc92ccc3a142bf7318f448fd78
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 23:03:28 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 23:13:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f693412

dev-java/openjdk: drop 11.0.15_p10-r1, 11.0.16.1_p1, 11.0.17_p8

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

 dev-java/openjdk/Manifest                      |   3 -
 dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 300 -------------------------
 dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild   | 300 -------------------------
 dev-java/openjdk/openjdk-11.0.17_p8.ebuild     | 300 -------------------------
 4 files changed, 903 deletions(-)

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index a2c842859b15..1d14beb1c78f 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,8 +1,5 @@
 DIST java17-riscv64.patch 2253475 BLAKE2B 
a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de
 SHA512 
06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165
 DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B 
f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650
 SHA512 
32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
-DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B 
a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40
 SHA512 
9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
-DIST openjdk-11.0.16.1_p1.tar.gz 123134756 BLAKE2B 
727294bb9d07193bb74b01a3e3e35f491b54be4cf3b6230e59df56ea7a9166b0b138f82b3d3c302c32b21efa8e9ac71437ca430a68a9ad8b69a7755d289bde17
 SHA512 
c694a8e6b0ff664b2c6a43ef3445d98e3b4ddf59c7fe94a21390b2d7756870ea7c7e34cb99d40bd66708ecaee93ffeb4dfc9ab7e2162bd6fc19479f23963560d
-DIST openjdk-11.0.17_p8.tar.gz 123284789 BLAKE2B 
413f88b1b0e3c26c87d8e9e69468c14cb39e50f193908c029828c7e7f77f3408eef9675860223a8a04f73e4417cedef1f1e23f337c0c9bd00127093cc2a824a8
 SHA512 
d7229bf96591494edcff950a7263a718ef8bb5ce918b1873b7d8987fddfaab0a0955c88cbdc5d09d294e2461c4fefa020d7642c221953ab881e8c642f585c28f
 DIST openjdk-11.0.18_p10.tar.gz 123369840 BLAKE2B 
1fa6a147ac0685f51b82f7b958b81d4ac56dd0d94234dab54d4c3641d4d5b0905b4778fa73f2d8582249f251839dd3ff5b8835c2ff3eb24f402d1399cfc27ffe
 SHA512 
10a48066ad1d2b627cc9be5c6e06a0deef7241f3b95b917b3bf86ffeb53ea043915e0eb7784ea244332d9c3941c8c5056c154e5aff4522b95aca8c8372c19474
 DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 
9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620
 SHA512 
692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445
 DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 
025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b
 SHA512 
3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c

diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild 
b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
deleted file mode 100644
index feaa4c78cbc9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2022 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.14-riscv.patch.xz
 )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
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.14-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
-
-       # 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 )
-
-       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() {
-       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.16.1_p1.ebuild 
b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
deleted file mode 100644
index 055cb96bc4a9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2022 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.14-riscv.patch.xz
 )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
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.14-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
-
-       # 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 )
-
-       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() {
-       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.17_p8.ebuild 
b/dev-java/openjdk/openjdk-11.0.17_p8.ebuild
deleted file mode 100644
index 055cb96bc4a9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.17_p8.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2022 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.14-riscv.patch.xz
 )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap 
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.14-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
-
-       # 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 )
-
-       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() {
-       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
-}

Reply via email to