diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-17 20:08:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-17 20:08:44 +0000 |
| commit | 6554f04b9a44e1ffe5d2f614201c11deed2703bd (patch) | |
| tree | 4a6f98988d23282385c916fa1c677b094d10461a /eclass | |
| parent | 7c9730bcb62df7cbf8248c5db9a478aac52c60ea (diff) | |
gentoo auto-resync : 17:02:2023 - 20:08:44
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37531 -> 37520 bytes | |||
| -rw-r--r-- | eclass/java-utils-2.eclass | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 77b7819908f4..0c0f6a359111 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index ef72635cd965..c1f42408e462 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1933,7 +1933,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:-0} in + [678]) eapply_user ;; + *) default_src_prepare ;; + esac # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then @@ -2944,7 +2947,7 @@ is-java-strict() { java-pkg_clean() { NO_DELETE=() for keep in ${JAVA_PKG_NO_CLEAN[@]}; do - NO_DELETE+=( '!' '-wholename' ${keep} ) + NO_DELETE+=( '!' '-path' ${keep} ) done find "${@}" '(' -name '*.class' -o -name '*.jar' ${NO_DELETE[@]} ')' -type f -delete -print || die } |