From aef3658325286fbf2480bccbbece9976d5b2ccc6 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Fri, 29 Mar 2024 16:48:52 +0100 Subject: [PATCH] java-vm-2.eclass: drop EAPI 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Signed-off-by: Miroslav Šulc --- eclass/java-vm-2.eclass | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 336a486c3883c..e5d3159f28544 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,17 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-vm-2.eclass # @MAINTAINER: # java@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Java Virtual Machine eclass # @DESCRIPTION: # This eclass provides functionality which assists with installing # virtual machines, and ensures that they are recognized by java-config. case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -28,10 +28,6 @@ DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip" IDEPEND="app-eselect/eselect-java" -if [[ ${EAPI} == 6 ]]; then - DEPEND+=" ${BDEPEND}" -fi - export WANT_JAVA_CONFIG=2 @@ -98,9 +94,6 @@ java-vm-2_pkg_postinst() { # @RETURN: 0 if >=app-eselect/eselect-java-0.5 is installed, 1 otherwise. has_eselect_java-vm_update() { local has_version_args="-b" - if [[ ${EAPI} == 6 ]]; then - has_version_args="--host-root" - fi has_version "${has_version_args}" ">=app-eselect/eselect-java-0.5" }