From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1618680-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A2FD158041 for <garchives@archives.gentoo.org>; Mon, 8 Apr 2024 07:15:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BBAEE2A76; Mon, 8 Apr 2024 07:15:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E33D0E2A76 for <gentoo-commits@lists.gentoo.org>; Mon, 8 Apr 2024 07:15:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E8B334335B for <gentoo-commits@lists.gentoo.org>; Mon, 8 Apr 2024 07:15:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A74A15DA for <gentoo-commits@lists.gentoo.org>; Mon, 8 Apr 2024 07:15:04 +0000 (UTC) From: "Miroslav Šulc" <fordfrog@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org> Message-ID: <1712560481.aef3658325286fbf2480bccbbece9976d5b2ccc6.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/java-vm-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: aef3658325286fbf2480bccbbece9976d5b2ccc6 X-VCS-Branch: master Date: Mon, 8 Apr 2024 07:15:04 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aff431ea-8e0e-405f-9064-cbd7a075693a X-Archives-Hash: ed6b32631664664cb67dd83386f18e82 commit: aef3658325286fbf2480bccbbece9976d5b2ccc6 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Mar 29 15:48:52 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 8 07:14:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef36583 java-vm-2.eclass: drop EAPI 6 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> 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 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" }