diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39627 -> 39626 bytes | |||
| -rw-r--r-- | eclass/java-vm-2.eclass | 13 |
2 files changed, 3 insertions, 10 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex bff7832f31c0..4a68a5d512e0 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 336a486c3883..e5d3159f2854 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" } |