diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-17 14:07:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-17 14:07:47 +0000 |
| commit | 7c9730bcb62df7cbf8248c5db9a478aac52c60ea (patch) | |
| tree | 3521ee333c83fb6c7ff14d0a0a2d742464e88767 /eclass/java-utils-2.eclass | |
| parent | 29394d0921808a94a409f01eff49f681651de5d5 (diff) | |
gentoo auto-resync : 17:02:2023 - 14:07:46
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 7641f9f40290..ef72635cd965 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # java@gentoo.org # @AUTHOR: # Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Base eclass for Java packages # @DESCRIPTION: # This eclass provides functionality which is used by java-pkg-2.eclass, @@ -18,7 +18,7 @@ # Ant-based packages. case ${EAPI:-0} in - [5678]) ;; + [678]) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -27,7 +27,7 @@ _JAVA_UTILS_2_ECLASS=1 # EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses. # Keep versionator inheritance in case consumers are using it implicitly. -[[ ${EAPI} == [56] ]] && inherit eapi7-ver eutils multilib versionator +[[ ${EAPI} == 6 ]] && inherit eapi7-ver eutils multilib versionator # Make sure we use java-config-2 export WANT_JAVA_CONFIG="2" @@ -1933,14 +1933,7 @@ etestng() { # src_prepare Searches for bundled jars # Don't call directly, but via java-pkg-2_src_prepare! java-utils-2_src_prepare() { - case ${EAPI:-0} in - 5) - java-pkg_func-exists java_prepare && java_prepare ;; - *) - java-pkg_func-exists java_prepare && - eqawarn "java_prepare is no longer called, define src_prepare instead." - eapply_user ;; - esac + eapply_user # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then @@ -1955,6 +1948,12 @@ java-utils-2_src_prepare() { find "${WORKDIR}" -name "*.class" echo "Search done." fi + + # Delete bundled .class and .jar files. + case ${EAPI:-0} in + [678]) ;; + *) java-pkg_clean ;; + esac } # @FUNCTION: java-utils-2_pkg_preinst |