mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 06:37:10 -08:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user