From 9eb4e12e7dcb344bf9d1533b1e1ac2a2f5c4e11d Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 21 Oct 2026 21:28:07 +0200 Subject: [PATCH] dev-java/openjdk: drop handling of the gentoo-vm USE flag in slot 17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/2166 Merges: https://codeberg.org/gentoo/gentoo/pulls/2166 Signed-off-by: Miroslav Šulc --- dev-java/openjdk/openjdk-17.0.21.0.2_p1.ebuild | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dev-java/openjdk/openjdk-17.0.21.0.2_p1.ebuild b/dev-java/openjdk/openjdk-17.0.21.0.2_p1.ebuild index 01c48b1a0acbd..9535b73cef018 100644 --- a/dev-java/openjdk/openjdk-17.0.21.0.2_p1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.21.0.2_p1.ebuild @@ -136,22 +136,6 @@ pkg_setup() { 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() {