commit:     0797194e79ed2f95153a66e2e1f897c6e90c5435
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Mar  9 09:33:30 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 14:29:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0797194e

dev-java/openjdk: drop 21.0.1_p12

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

 dev-java/openjdk/Manifest                  |   1 -
 dev-java/openjdk/openjdk-21.0.1_p12.ebuild | 323 -----------------------------
 2 files changed, 324 deletions(-)

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 7e056ff06db0..9ca436122e65 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -4,7 +4,6 @@ DIST openjdk-11.0.20.1_p1.tar.gz 116165519 BLAKE2B 
3f3627d6535770c6654226ca2c188
 DIST openjdk-11.0.22_p7.tar.gz 116235391 BLAKE2B 
50b845b8f1e316da37e45c94a1890939659b554a314a1a455903e8cc58465cd69cd485548b6b42c445150187e37df5cf946d52bca754236a198f6aa10d7de37e
 SHA512 
b88d0db9750d8201dfb4b027045de4023be766e42cca7a3ff5e0cb28db4c6da3f146a57819a6b81cb33e5837726986bcc3780ecf88bf525f445c2cd35a3993d8
 DIST openjdk-17.0.10_p7.tar.gz 106398664 BLAKE2B 
48cb2bc7d063da25a62834734ba4a887d26a27a8d84c535255df67419bf4f6d8b060c48ef37bd7324e14e957a141791380d4d9e42335a90f72dc34bc7b1d12fe
 SHA512 
c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426
 DIST openjdk-17.0.8.1_p1.tar.gz 105878760 BLAKE2B 
e4d752dc87717855bfe4bd84c97056f0d93b554c67bdbb3e750e20479e2156628c85aea7b404577ea6ff40d49669d5f53aab06d0c4cf9aa926b060a0cd93cd03
 SHA512 
0d8e9e54173be855c15d121d4d6cd36996700e1e2fb194ad93ba8ad794a342c87b7d2f81a32d0bb215e45f1dc1f4efdfe1be5e8de99395730902d443ac773813
-DIST openjdk-21.0.1_p12.tar.gz 112241360 BLAKE2B 
68a542a1dd65cf74b826e255d08350ec662c37337e45aec18d91e0dbdcce5c6e50172ad482cc21f1aacbf356722e009d4b6431aecf5a1d6b67b74a5007ca702a
 SHA512 
def4b6688f063758235bc454bbbdb4caefa45d2724a9f2296af11d684801f05f1375f0be771b52d9235676e7f89dec816a34b3a1a1cc972662ee50de89600455
 DIST openjdk-21.0.2_p13.tar.gz 112252812 BLAKE2B 
a7cbdc67d05a4e7db75ddb7043f06928c599139bd6eab02a23749194eb340f82038061036e84961ed124b8c8a0320bc3a2a890100b643765e1a87b8b129f30f9
 SHA512 
01a2f57dc432ea31f64d79092ae722f752e7ff111291cb5fb874046079a0fee985ede9d3aac991d946c9c6e712854827dd45284ff4cf39592add3629dbb94ace
 DIST openjdk-8.402_p06.tar.gz 93136112 BLAKE2B 
023422ca2b4dfc08fd3642e3cb3ec0503d57d09dbcb54841e4a04f67a6cd118712cba90b7760eaf9135f9f001f7c15221c4bcb19986547fb2b6b3fb852bb8af4
 SHA512 
476d195ef500d8dd2013b17de0669a77ef8076b55c2753eb88b1a13f7a48526b1be7a1befabd284eb9ee8411df19ab1f39c81287ab659984d2d67e8aa7192d79
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 
5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d
 SHA512 
732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e

diff --git a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild 
b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
deleted file mode 100644
index 8a14694848ca..000000000000
--- a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2024 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
-PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
-X86_XPAK="21.0.0_p35"
-
-# 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 ppc64 ${PPC64_XPAK} big-endian)
-               $(bootstrap_uri x86 ${X86_XPAK})
-       )
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~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 )
-       !system-bootstrap? ( || ( ppc64 x86 ) )
-"
-
-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-debug/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() {
-       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
-
-       # bug 906987; append-cppflags doesnt work
-       use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-       # 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-jvm-feature-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
-}
-
-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
-}

Reply via email to