commit: 1b7c8eabafac7b25cd4de87fd307bb9a3dba05bf Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Tue Oct 20 20:58:06 2015 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Tue Oct 20 20:58:06 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7c8eab
java-utils-2.eclass: Remove eend calls. Remove javadoc_executable variable. Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> eclass/java-utils-2.eclass | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 15e4db0..deab51d 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2049,7 +2049,6 @@ ejavac() { ebegin "Compiling" ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed" - eend $? } # @FUNCTION: ejavadoc @@ -2060,8 +2059,6 @@ ejavac() { ejavadoc() { debug-print-function ${FUNCNAME} $* - # TODO: create a java-pkg_get-javadoc function - local javadoc_executable=javadoc local javadoc_args="" if java-pkg_is-vm-version-ge "1.8" ; then @@ -2070,15 +2067,14 @@ ejavadoc() { if [[ -n ${JAVA_PKG_DEBUG} ]]; then einfo "Verbose logging for \"${FUNCNAME}\" function" - einfo "Javadoc executable: ${javadoc_executable}" + einfo "Javadoc executable: javadoc" einfo "Extra arguments: ${javadoc_args}" einfo "Complete command:" - einfo "${javadoc_executable} ${javadoc_args} ${@}" + einfo "javadoc ${javadoc_args} ${@}" fi ebegin "Generating JavaDoc" - ${javadoc_executable} ${javadoc_args} "${@}" || die "ejavadoc failed" - eend $? + javadoc ${javadoc_args} "${@}" || die "ejavadoc failed" } # @FUNCTION: java-pkg_filter-compiler