diff options
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
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 } |