From 6aa0d33a65c735f3148967b62316c2e71f43589a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Jan 2024 14:08:57 +0000 Subject: gentoo auto-resync : 20:01:2024 - 14:08:56 --- eclass/Manifest.gz | Bin 38967 -> 38961 bytes eclass/java-utils-2.eclass | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 43030007be3e..0900808fd723 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 31f7932a16fd..47123287ce70 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -1972,7 +1972,10 @@ etestng() { # src_prepare Searches for bundled jars # Don't call directly, but via java-pkg-2_src_prepare! java-utils-2_src_prepare() { - eapply_user + case ${EAPI} in + [678]) eapply_user ;; + *) default_src_prepare ;; + esac # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then -- cgit v1.2.3