[gentoo-commits] repo/gentoo:master commit in: eclass/

[Patrice Clement]

commit:     850c204eaba318c2b22b1b742082b9dea9782273
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 13:49:08 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 13:49:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850c204e

java-pkg-simple.eclass: Get rid of java-pkg-simple_verbose-cmd function and all 
its calls/references.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 eclass/java-pkg-simple.eclass | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index c06bb11..db1ea66 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -102,16 +102,14 @@ java-pkg-simple_src_compile() {
        classpath=${classpath%:}
        classpath=${classpath#:}
        debug-print "CLASSPATH=${classpath}"
-       java-pkg-simple_verbose-cmd \
-               ejavac -d ${classes} -encoding ${JAVA_ENCODING} \
+       ejavac -d ${classes} -encoding ${JAVA_ENCODING} \
                ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} \
                @${sources}
 
        # javadoc
        if has doc ${JAVA_PKG_IUSE} && use doc; then
                mkdir -p ${apidoc}
-               java-pkg-simple_verbose-cmd \
-                       ejavadoc -d ${apidoc} \
+               ejavadoc -d ${apidoc} \
                        -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset 
UTF-8 \
                        ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- 
-quiet} \
                        @${sources} || die "javadoc failed"
@@ -122,8 +120,7 @@ java-pkg-simple_src_compile() {
        if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
                jar_args="cfm ${JAVA_JAR_FILENAME} 
${classes}/META-INF/MANIFEST.MF"
        fi
-       java-pkg-simple_verbose-cmd \
-               jar ${jar_args} -C ${classes} . || die "jar failed"
+       jar ${jar_args} -C ${classes} . || die "jar failed"
 }
 
 # @FUNCTION: java-pkg-simple_src_install
@@ -136,13 +133,11 @@ java-pkg-simple_src_install() {
        local sources=sources.lst classes=target/classes apidoc=target/api
 
        # main jar
-       java-pkg-simple_verbose-cmd \
-               java-pkg_dojar ${JAVA_JAR_FILENAME}
+       java-pkg_dojar ${JAVA_JAR_FILENAME}
 
        # javadoc
        if has doc ${JAVA_PKG_IUSE} && use doc; then
-               java-pkg-simple_verbose-cmd \
-                       java-pkg_dojavadoc ${apidoc}
+               java-pkg_dojavadoc ${apidoc}
        fi
 
        # dosrc
@@ -159,19 +154,6 @@ java-pkg-simple_src_install() {
                        # take all directories actually containing any sources
                        srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
                fi
-               java-pkg-simple_verbose-cmd \
-                       java-pkg_dosrc ${srcdirs}
+               java-pkg_dosrc ${srcdirs}
        fi
 }
-
-# @FUNCTION: java-pkg-simple_src_install
-# @DESCRIPTION:
-# Print a command before executing it. To give user some feedback
-# about what is going on, where the time is being spent, and also to
-# help debugging ebuilds.
-#
-# @param $@ - command to be called and its arguments
-java-pkg-simple_verbose-cmd() {
-       echo "$*"
-       "$@"
-}