| 1 |
commit: b24ae1b69140badc0260c75e60fc1c431b7f8806 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 22 18:29:22 2015 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 22 18:36:28 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=b24ae1b6 |
| 7 |
|
| 8 |
[eclass] Replace deprecated hasq with has |
| 9 |
|
| 10 |
eclass/java-maven-2.eclass | 6 +++--- |
| 11 |
eclass/openoffice-ext.eclass | 2 +- |
| 12 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/java-maven-2.eclass b/eclass/java-maven-2.eclass |
| 15 |
index f86ce17..e9fadf3 100644 |
| 16 |
--- a/eclass/java-maven-2.eclass |
| 17 |
+++ b/eclass/java-maven-2.eclass |
| 18 |
@@ -317,7 +317,7 @@ java-maven-2_src_unpack() { |
| 19 |
fi |
| 20 |
done |
| 21 |
|
| 22 |
- if hasq doc ${IUSE} && use doc; then |
| 23 |
+ if has doc ${IUSE} && use doc; then |
| 24 |
JAVA_ANT_JAVADOC_INPUT_DIRS="${JAVA_ANT_JAVADOC_INPUT_DIRS} ${JAVA_MAVEN_SRC_DIRS}" |
| 25 |
fi |
| 26 |
# now rewriting all the poms |
| 27 |
@@ -548,10 +548,10 @@ java-maven-2_install_one() { |
| 28 |
# basic src_install which can install in most cases (multi and single project |
| 29 |
# mode) |
| 30 |
java-maven-2_src_install() { |
| 31 |
- hasq doc ${IUSE} && use doc \ |
| 32 |
+ has doc ${IUSE} && use doc \ |
| 33 |
&& [[ -n "${JAVA_ANT_JAVADOC_INPUT_DIRS}" ]] \ |
| 34 |
&& java-pkg_dojavadoc ${JAVA_ANT_JAVADOC_OUTPUT_DIR} |
| 35 |
- if hasq source ${IUSE} && use source; then |
| 36 |
+ if has source ${IUSE} && use source; then |
| 37 |
# JAVA_MAVEN_SRC_DIRS must be maven parent sources dirs like "src/main" |
| 38 |
# install java/* into zip/* and the rest inside zip/subdir/* |
| 39 |
local java_maven_src_dir="${WORKDIR}/mavenjavasrcpack" |
| 40 |
|
| 41 |
diff --git a/eclass/openoffice-ext.eclass b/eclass/openoffice-ext.eclass |
| 42 |
index ec44b68..8ee4419 100644 |
| 43 |
--- a/eclass/openoffice-ext.eclass |
| 44 |
+++ b/eclass/openoffice-ext.eclass |
| 45 |
@@ -68,7 +68,7 @@ _openoffice-utils_pkg_prerm() { |
| 46 |
} |
| 47 |
|
| 48 |
_openoffice-ext_check_use() { |
| 49 |
- return $(hasq ${OPENOFFICE_EXT_OPT_USE} "${IUSE}") |
| 50 |
+ return $(has ${OPENOFFICE_EXT_OPT_USE} "${IUSE}") |
| 51 |
} |
| 52 |
|
| 53 |
if _openoffice-ext_check_use; then |
Archives