summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-01-20 14:08:57 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-01-20 14:08:57 +0000
commit6aa0d33a65c735f3148967b62316c2e71f43589a (patch)
tree4ddfb479a93b928f4ad0507a58e779e6de3eb403 /eclass
parenta332b8e207ac6a51fa349c699b486d870c9cdc70 (diff)
gentoo auto-resync : 20:01:2024 - 14:08:56
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin38967 -> 38961 bytes
-rw-r--r--eclass/java-utils-2.eclass7
2 files changed, 5 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 43030007be3e..0900808fd723 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files 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