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 | baadba17c7b0a2506516dfbdaaa2657ba382e134 (patch) | |
| tree | 4d099c7da5d73a6ca9073754ca3713eee085e3dd /eclass/java-utils-2.eclass | |
| parent | Adding Francois Bissey's fix for bug 366945 (diff) | |
| download | gentoo-2-baadba17c7b0a2506516dfbdaaa2657ba382e134.tar.gz gentoo-2-baadba17c7b0a2506516dfbdaaa2657ba382e134.tar.bz2 gentoo-2-baadba17c7b0a2506516dfbdaaa2657ba382e134.zip | |
Convert every instance of hasq to has.
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index b97e46f1026a..260ff412a2b1 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.140 2011/04/07 18:05:40 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.141 2011/07/08 11:35:01 ssuominen Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -63,7 +63,7 @@ export WANT_JAVA_CONFIG="2" # portage with phase hooks support but now we use a version with proper env # saving. For EAPI 2 we have new enough stuff so let's have cleaner deps. # ----------------------------------------------------------------------------- -hasq "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" +has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" # ----------------------------------------------------------------------------- # @variable-internal JAVA_PKG_E_DEPEND @@ -73,7 +73,7 @@ hasq "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" # so that ebuilds can use new features without depending on specific versions. # ----------------------------------------------------------------------------- JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}" -hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" +has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" # ----------------------------------------------------------------------------- # @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH @@ -1558,7 +1558,7 @@ java-pkg_get-current-vm() { } java-pkg_current-vm-matches() { - hasq $(java-pkg_get-current-vm) ${@} + has $(java-pkg_get-current-vm) ${@} return $? } @@ -1683,8 +1683,8 @@ java-pkg_ensure-gcj() { } java-pkg_ensure-test() { - if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ - && hasq test ${IUSE} && ! use test; + if has test ${FEATURES} && ! has -test ${FEATURES} \ + && has test ${IUSE} && ! use test; then eerror "You specified FEATURES=test, but USE=test is needed" eerror "to pull in the additional dependencies for testing" @@ -1924,7 +1924,7 @@ eant() { java-utils-2_src_prepare fi - if ! hasq java-ant-2 ${INHERITED}; then + if ! has java-ant-2 ${INHERITED}; then local msg="You should inherit java-ant-2 when using eant" java-pkg_announce-qa-violation "${msg}" fi @@ -2644,7 +2644,7 @@ java-pkg_switch-vm() { # useful for debugging bugs on bugzilla. # ------------------------------------------------------------------------------ #register_die_hook java-pkg_die -if ! hasq java-pkg_die ${EBUILD_DEATH_HOOKS}; then +if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" fi @@ -2790,7 +2790,7 @@ java-pkg_check-versioned-jar() { } java-pkg_check-jikes() { - if hasq jikes ${IUSE}; then + if has jikes ${IUSE}; then java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" fi } |