From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 883B31390EB for ; Wed, 22 Jul 2015 18:37:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F96CE091A; Wed, 22 Jul 2015 18:37:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D021EE091A for ; Wed, 22 Jul 2015 18:37:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA9D234087C for ; Wed, 22 Jul 2015 18:37:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64862BB for ; Wed, 22 Jul 2015 18:37:04 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1437590188.b24ae1b69140badc0260c75e60fc1c431b7f8806.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: eclass/ X-VCS-Repository: proj/java X-VCS-Files: eclass/java-maven-2.eclass eclass/openoffice-ext.eclass X-VCS-Directories: eclass/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: b24ae1b69140badc0260c75e60fc1c431b7f8806 X-VCS-Branch: master Date: Wed, 22 Jul 2015 18:37:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6aea234c-13a2-483f-b17b-8a6714157ea1 X-Archives-Hash: 3070725c5030f9039029d9d36961db1b commit: b24ae1b69140badc0260c75e60fc1c431b7f8806 Author: Johannes Huber gentoo org> AuthorDate: Wed Jul 22 18:29:22 2015 +0000 Commit: James Le Cuirot gentoo 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