eclass/java-utils-2.eclass: Convert the few remaining bits to EAPI 6.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 21 Feb 2017 23:20:37 +0000 (00:20 +0100)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 22 Feb 2017 22:17:17 +0000 (23:17 +0100)
eclass/java-utils-2.eclass

index d2af9f292a37de32dc16f3462a3bb3b2cdc5cb09..503aae35cab8ef74f2f95281eb7f0d0688d5fb6c 100644 (file)
@@ -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