From 61f10f985e19dfe20a4d9552902625edd5b6eabb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 21 Jun 2021 17:32:00 +0100
Subject: gentoo resync : 21.06.2021

---
 eclass/java-ant-2.eclass | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'eclass/java-ant-2.eclass')

diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 69e3f7d46d8e..5592186936c0 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -7,6 +7,7 @@
 # @AUTHOR:
 # kiorky <kiorky@cryptelium.net>
 # Petteri Räty <betelgeuse@gentoo.org>
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: eclass for ant based Java packages
 # @DESCRIPTION:
 # Eclass for Ant-based Java packages. Provides support for both automatic and
@@ -15,6 +16,16 @@
 
 inherit java-utils-2 multilib
 
+case ${EAPI:-0} in
+	[567]) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+EXPORT_FUNCTIONS src_configure
+
+if [[ -z ${_JAVA_ANT_2_ECLASS} ]] ; then
+_JAVA_ANT_2_ECLASS=1
+
 # This eclass provides functionality for Java packages which use
 # ant to build. In particular, it will attempt to fix build.xml files, so that
 # they use the appropriate 'target' and 'source' attributes.
@@ -109,11 +120,6 @@ JAVA_ANT_CLASSPATH_TAGS="javac xjavac"
 # @DESCRIPTION:
 # When set, <available> Ant tasks are rewritten to ignore Ant's runtime classpath.
 
-case "${EAPI:-0}" in
-	0|1) : ;;
-	*) EXPORT_FUNCTIONS src_configure ;;
-esac
-
 # @FUNCTION: java-ant-2_src_configure
 # @DESCRIPTION:
 # src_configure rewrites the build.xml files automatically, unless EAPI is undefined, 0 or 1.
@@ -430,3 +436,5 @@ java-ant_rewrite-bootclasspath() {
 	java-ant_xml-rewrite -f "${file}" -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
 		-a bootclasspath -v "${bcp}"
 }
+
+fi
-- 
cgit v1.2.3