summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2024-03-29 16:48:52 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2024-04-08 09:14:41 +0200
commitaef3658325286fbf2480bccbbece9976d5b2ccc6 (patch)
treeba8e583b563aad2de33e7e3f8d329cf582a097d7 /eclass
parentdev-java/javacc: returned versioned dependency on ant to 7.0.13 (diff)
downloadgentoo-aef3658325286fbf2480bccbbece9976d5b2ccc6.tar.gz
gentoo-aef3658325286fbf2480bccbbece9976d5b2ccc6.tar.bz2
gentoo-aef3658325286fbf2480bccbbece9976d5b2ccc6.zip
java-vm-2.eclass: drop EAPI 6
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-vm-2.eclass13
1 files changed, 3 insertions, 10 deletions
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"
}