From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 21 Feb 2017 23:20:37 +0000 (+0100)
Subject: eclass/java-utils-2.eclass: Convert the few remaining bits to EAPI 6.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=225641306851ae7d035dcadad342b110ce76f32a;p=gentoo.git

eclass/java-utils-2.eclass: Convert the few remaining bits to EAPI 6.
---

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index d2af9f292a37..503aae35cab8 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -590,13 +590,13 @@ java-pkg_sointo() {
 java-pkg_dohtml() {
 	debug-print-function ${FUNCNAME} $*
 
-	[[ ${#} -lt 1 ]] &&  die "At least one argument required for ${FUNCNAME}"
+	[[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
 
-	# from /usr/lib/portage/bin/dohtml -h
-	#  -f   Set list of allowed extensionless file names.
-	dohtml -f package-list "$@"
+	# Do away with dohtml and rely on dodoc instead to do the deed.
+	docinto html
+	dodoc "$@"
 
-	# this probably shouldn't be here but it provides
+	# This probably shouldn't be here but it provides
 	# a reasonable way to catch # docs for all of the
 	# old ebuilds.
 	java-pkg_recordjavadoc