diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-02-15 19:16:09 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-02-17 09:03:37 +0100 |
| commit | ca1a249079d0c8fa4a42339b3db3e432c7fc8dee (patch) | |
| tree | 7ad7ba1e4844ae55ee4032bccd07ef62d979f27a /eclass/java-utils-2.eclass | |
| parent | java-pkg-2.eclass: drop support for EAPI 5 (diff) | |
| download | gentoo-ca1a249079d0c8fa4a42339b3db3e432c7fc8dee.tar.gz gentoo-ca1a249079d0c8fa4a42339b3db3e432c7fc8dee.tar.bz2 gentoo-ca1a249079d0c8fa4a42339b3db3e432c7fc8dee.zip | |
java-utils-2.eclass: drop support for EAPI 5
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29556
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 07dfbd45bdf6..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 |