[gentoo-commits] proj/java:master commit in: eclass/

[James Le Cuirot]

commit:     b24ae1b69140badc0260c75e60fc1c431b7f8806
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 18:29:22 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 18:36:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=b24ae1b6

[eclass] Replace deprecated hasq with has

 eclass/java-maven-2.eclass   | 6 +++---
 eclass/openoffice-ext.eclass | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/java-maven-2.eclass b/eclass/java-maven-2.eclass
index f86ce17..e9fadf3 100644
--- a/eclass/java-maven-2.eclass
+++ b/eclass/java-maven-2.eclass
@@ -317,7 +317,7 @@ java-maven-2_src_unpack() {
                fi
        done
 
-       if hasq doc ${IUSE} && use doc; then
+       if has doc ${IUSE} && use doc; then
                JAVA_ANT_JAVADOC_INPUT_DIRS="${JAVA_ANT_JAVADOC_INPUT_DIRS} 
${JAVA_MAVEN_SRC_DIRS}"
        fi
        # now rewriting all the poms
@@ -548,10 +548,10 @@ java-maven-2_install_one() {
 # basic src_install which can install in most cases (multi and single project
 # mode)
 java-maven-2_src_install() {
-       hasq doc ${IUSE} && use doc \
+       has doc ${IUSE} && use doc \
        && [[ -n "${JAVA_ANT_JAVADOC_INPUT_DIRS}" ]] \
        && java-pkg_dojavadoc ${JAVA_ANT_JAVADOC_OUTPUT_DIR}
-       if hasq source ${IUSE} && use source; then
+       if has source ${IUSE} && use source; then
                # JAVA_MAVEN_SRC_DIRS must be maven parent sources dirs like 
"src/main"
                # install java/* into zip/* and the rest inside zip/subdir/*
                local java_maven_src_dir="${WORKDIR}/mavenjavasrcpack"

diff --git a/eclass/openoffice-ext.eclass b/eclass/openoffice-ext.eclass
index ec44b68..8ee4419 100644
--- a/eclass/openoffice-ext.eclass
+++ b/eclass/openoffice-ext.eclass
@@ -68,7 +68,7 @@ _openoffice-utils_pkg_prerm() {
 }
 
 _openoffice-ext_check_use() {
-       return $(hasq ${OPENOFFICE_EXT_OPT_USE} "${IUSE}")
+       return $(has ${OPENOFFICE_EXT_OPT_USE} "${IUSE}")
 }
 
 if _openoffice-ext_check_use; then