Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
---
eclass/java-utils-2.eclass | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 43d9b749ba3d..50e4e422db1e 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -9,13 +9,12 @@
# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Base eclass for Java packages
# @DESCRIPTION:
-# This eclass provides functionality which is used by java-pkg-2.eclass,
-# java-pkg-opt-2.eclass and java-ant-2 eclass, as well as from ebuilds.
+# This eclass provides functionality which is used by java-pkg-2.eclass and
+# java-pkg-opt-2.eclass as well as from ebuilds.
#
# This eclass should not be inherited this directly from an ebuild. Instead,
# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages
-# that have optional Java support. In addition you can inherit java-ant-2 for -# Ant-based packages.
+# that have optional Java support.

if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then
_JAVA

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
---
eclass/java-utils-2.eclass | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 50e4e422db1e..aa69cce14cae 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -203,9 +203,9 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com
#
# Useful for local testing.
#
-# Use jikes and javac, in that order
+# Use <other compiler> and javac, in that order
# @CODE
-# JAVA_PKG_FORCE_COMPILER="jikes javac"
+# JAVA_PKG_FORCE_COMPILER="<other compiler> javac"
# @CODE

# @ECLASS_VARIABLE: JAVA_PKG_FORCE_ANT_TASKS
@@ -2306,9 +2306,6 @@ java-pkg_init() {

# TODO we will probably want to set JAVAC and JAVACFLAGS

- # Do some QA checks
- java-pkg_check-jikes
-
# Can't use unset here because Portage does not save the unset
# see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11

@@ -2966,12 +2963,6 @@ java-pkg_check-versioned-jar() {
fi