From 10851aff31035277ed3bc8a185107ebc936f83a5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:57 +0000 Subject: [PATCH] eclass/java-utils-2: Sync with Gentoo It's from Gentoo commit f007377cffdcdc04c349494481be5dc01ce313f9. --- .../third_party/portage-stable/eclass/java-utils-2.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass index 31f7932a16..47123287ce 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass +++ b/sdk_container/src/third_party/portage-stable/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