diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-07-08 11:35:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-07-08 11:35:01 +0000 |
| commit | 3afdef01dce99f4172c8a8642438167e53f6b608 (patch) | |
| tree | f9b59cf1fd9a621b1da8670ee9ae1ce334f65444 /eclass/java-ant-2.eclass | |
| parent | Adding Francois Bissey's fix for bug 366945 (diff) | |
| download | historical-3afdef01dce99f4172c8a8642438167e53f6b608.tar.gz historical-3afdef01dce99f4172c8a8642438167e53f6b608.tar.bz2 historical-3afdef01dce99f4172c8a8642438167e53f6b608.zip | |
Convert every instance of hasq to has.
Diffstat (limited to 'eclass/java-ant-2.eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index ac845b865508..9d148571a9d7 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -14,7 +14,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.50 2010/10/17 12:55:00 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.51 2011/07/08 11:35:01 ssuominen Exp $ inherit java-utils-2 @@ -62,9 +62,9 @@ JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} # this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 # if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag -if hasq java-pkg-opt-2 ${INHERITED}; then +if has java-pkg-opt-2 ${INHERITED}; then JAVA_ANT_E_DEPEND="${JAVA_PKG_OPT_USE}? ( ${JAVA_ANT_E_DEPEND} )" -elif ! hasq java-pkg-2 ${INHERITED}; then +elif ! has java-pkg-2 ${INHERITED}; then eerror "java-ant-2 eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2" fi @@ -145,7 +145,7 @@ esac # ------------------------------------------------------------------------------ java-ant-2_src_configure() { # if java support is optional, don't perform this when the USE flag is off - if hasq java-pkg-opt-2 ${INHERITED}; then + if has java-pkg-opt-2 ${INHERITED}; then use ${JAVA_PKG_OPT_USE} || return fi @@ -328,7 +328,7 @@ java-ant_bsfix_files() { readonly JAVA_ANT_JAVADOC_OUTPUT_DIR="${WORKDIR}/gentoo_javadoc" mkdir -p "${JAVA_ANT_JAVADOC_OUTPUT_DIR}" || die - if hasq doc ${IUSE}; then + if has doc ${IUSE}; then if use doc; then if [[ -z ${EANT_DOC_TARGET} ]]; then EANT_DOC_TARGET="gentoojavadoc" |