On 07/08/2011 01:21 AM, Dane Smith wrote: > All, > In [1] it is noted that the 'useq' and 'hasq' functions are > "Deprecated". If this is the case, do we think it would be pertinent to > have a repoman warning reminding people to switch to 'use' and 'has' > respectively? > > Regards, >
I've just ensured there are 0 ebuilds using useq and hasq left in gentoo-x86. Before I commit this patch into eclass/ directory, I would appericiate ACK or two just to ease my mind. See attachment.
diff -ur /tmp/eclass/apache-2.eclass eclass/apache-2.eclass --- /tmp/eclass/apache-2.eclass 2010-12-22 12:02:05.000000000 +0200 +++ eclass/apache-2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -488,7 +488,7 @@ use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" - if hasq negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then + if has negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then APACHE2_OPTS="${APACHE2_OPTS} -D LANGUAGE" fi diff -ur /tmp/eclass/clutter.eclass eclass/clutter.eclass --- /tmp/eclass/clutter.eclass 2011-02-07 18:50:42.000000000 +0200 +++ eclass/clutter.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -52,7 +52,7 @@ dodoc ${DOCS} || die "dodoc failed" # examples - if hasq examples ${IUSE} && use examples; then + if has examples ${IUSE} && use examples; then insinto /usr/share/doc/${PF}/examples # We use eval to be able to use globs and other bash expressions diff -ur /tmp/eclass/db.eclass eclass/db.eclass --- /tmp/eclass/db.eclass 2010-10-18 20:39:02.000000000 +0300 +++ eclass/db.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -148,7 +148,7 @@ return 0 fi - if useq tcl; then + if use tcl; then einfo "Running sys-libs/db testsuite" ewarn "This can take 6+ hours on modern machines" # Fix stuff that fails with relative paths, and upstream moving files diff -ur /tmp/eclass/enlightenment.eclass eclass/enlightenment.eclass --- /tmp/eclass/enlightenment.eclass 2010-09-18 11:39:07.000000000 +0300 +++ eclass/enlightenment.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -129,7 +129,7 @@ else unpack ${A} fi - hasq src_prepare ${ENLIGHTENMENT_EXPF} || enlightenment_src_prepare + has src_prepare ${ENLIGHTENMENT_EXPF} || enlightenment_src_prepare } enlightenment_src_prepare() { @@ -155,7 +155,7 @@ } enlightenment_src_compile() { - hasq src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure + has src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure emake || die diff -ur /tmp/eclass/eutils.eclass eclass/eutils.eclass --- /tmp/eclass/eutils.eclass 2011-06-16 00:51:12.000000000 +0300 +++ eclass/eutils.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -1715,9 +1715,9 @@ fi for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do if [[ ${op} == "-i" ]] ; then - hasq ${f} ${ls} && newls="${newls} ${f}" + has ${f} ${ls} && newls="${newls} ${f}" else - hasq ${f} ${ls} || newls="${newls} ${f}" + has ${f} ${ls} || newls="${newls} ${f}" fi done ls=${newls} @@ -1729,7 +1729,7 @@ nols="" newls="" for f in ${LINGUAS} ; do - if hasq ${f} ${ls} ; then + if has ${f} ${ls} ; then newls="${newls} ${f}" else nols="${nols} ${f}" diff -ur /tmp/eclass/fox.eclass eclass/fox.eclass --- /tmp/eclass/fox.eclass 2010-12-02 18:11:32.000000000 +0200 +++ eclass/fox.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -89,7 +89,7 @@ unpack ${A} cd "${S}" - hasq src_prepare ${FOX_EXPF} || fox_src_prepare + has src_prepare ${FOX_EXPF} || fox_src_prepare } fox_src_prepare() { @@ -139,7 +139,7 @@ fox_src_compile() { - hasq src_configure ${FOX_EXPF} || fox_src_configure + has src_configure ${FOX_EXPF} || fox_src_configure cd "${S}/${FOX_COMPONENT}" emake || die "compile error" diff -ur /tmp/eclass/gnome2.eclass eclass/gnome2.eclass --- /tmp/eclass/gnome2.eclass 2011-04-22 14:04:13.000000000 +0300 +++ eclass/gnome2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -112,7 +112,7 @@ fi # Prevent a QA warning - if hasq doc ${IUSE} ; then + if has doc ${IUSE} ; then G2CONF="${G2CONF} $(use_enable doc gtk-doc)" fi diff -ur /tmp/eclass/gnome-python-common.eclass eclass/gnome-python-common.eclass --- /tmp/eclass/gnome-python-common.eclass 2010-06-11 11:35:12.000000000 +0300 +++ eclass/gnome-python-common.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -138,7 +138,7 @@ python_execute_function -s gnome2_src_install "$@" python_clean_installation_image - if hasq examples ${IUSE} && use examples; then + if has examples ${IUSE} && use examples; then insinto /usr/share/doc/${PF}/examples for example in ${EXAMPLES}; do diff -ur /tmp/eclass/java-ant-2.eclass eclass/java-ant-2.eclass --- /tmp/eclass/java-ant-2.eclass 2010-10-17 15:55:00.000000000 +0300 +++ eclass/java-ant-2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -62,9 +62,9 @@ # 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 @@ # ------------------------------------------------------------------------------ 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 @@ 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" diff -ur /tmp/eclass/java-pkg-2.eclass eclass/java-pkg-2.eclass --- /tmp/eclass/java-pkg-2.eclass 2010-02-01 11:38:44.000000000 +0200 +++ eclass/java-pkg-2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -93,7 +93,7 @@ [[ "${EANT_FILTER_COMPILER}" ]] && \ java-pkg_filter-compiler ${EANT_FILTER_COMPILER} local antflags="${EANT_BUILD_TARGET:=jar}" - if hasq doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=javadoc}" ]]; then + if has doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=javadoc}" ]]; then antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})" fi local tasks diff -ur /tmp/eclass/java-pkg-simple.eclass eclass/java-pkg-simple.eclass --- /tmp/eclass/java-pkg-simple.eclass 2010-01-16 20:48:39.000000000 +0200 +++ eclass/java-pkg-simple.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -8,7 +8,7 @@ inherit java-utils-2 -if ! hasq java-pkg-2 ${INHERITED}; then +if ! has java-pkg-2 ${INHERITED}; then eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2" fi @@ -128,7 +128,7 @@ @${sources} # javadoc - if hasq doc ${JAVA_PKG_IUSE} && use doc; then + if has doc ${JAVA_PKG_IUSE} && use doc; then mkdir -p ${apidoc} java-pkg-simple_verbose-cmd \ javadoc -d ${apidoc} \ @@ -162,13 +162,13 @@ java-pkg_dojar ${PN}.jar # javadoc - if hasq doc ${JAVA_PKG_IUSE} && use doc; then + if has doc ${JAVA_PKG_IUSE} && use doc; then java-pkg-simple_verbose-cmd \ java-pkg_dojavadoc ${apidoc} fi # dosrc - if hasq source ${JAVA_PKG_IUSE} && use source; then + if has source ${JAVA_PKG_IUSE} && use source; then local srcdirs="" if [[ ${JAVA_SRC_DIR} ]]; then local parent child diff -ur /tmp/eclass/java-utils-2.eclass eclass/java-utils-2.eclass --- /tmp/eclass/java-utils-2.eclass 2011-04-07 21:05:40.000000000 +0300 +++ eclass/java-utils-2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -63,7 +63,7 @@ # 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 @@ # 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_current-vm-matches() { - hasq $(java-pkg_get-current-vm) ${@} + has $(java-pkg_get-current-vm) ${@} return $? } @@ -1683,8 +1683,8 @@ } java-pkg_ensure-test() { - if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \ - && hasq test ${IUSE} && ! use test; + if has test ${FEATURES} && ! hasq -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 @@ 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 @@ # 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-jikes() { - if hasq jikes ${IUSE}; then + if has jikes ${IUSE}; then java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" fi } diff -ur /tmp/eclass/java-vm-2.eclass eclass/java-vm-2.eclass --- /tmp/eclass/java-vm-2.eclass 2010-04-17 11:30:36.000000000 +0300 +++ eclass/java-vm-2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -15,7 +15,7 @@ inherit eutils fdo-mime multilib DEPEND="=dev-java/java-config-2*" -hasq "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1" +has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1" RDEPEND=" =dev-java/java-config-2*" diff -ur /tmp/eclass/kde4-functions.eclass eclass/kde4-functions.eclass --- /tmp/eclass/kde4-functions.eclass 2011-06-16 21:40:18.000000000 +0300 +++ eclass/kde4-functions.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -262,7 +262,7 @@ rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue." fi - if ! hasq kde4-meta ${INHERITED}; then + if ! has kde4-meta ${INHERITED}; then case ${KMNAME} in extragear*|playground*) local scmlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}" diff -ur /tmp/eclass/mozcoreconf-2.eclass eclass/mozcoreconf-2.eclass --- /tmp/eclass/mozcoreconf-2.eclass 2011-07-07 01:47:12.000000000 +0300 +++ eclass/mozcoreconf-2.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -38,7 +38,7 @@ # => ac_add_options --enable-freetype2 # +truetype mozconfig_use_enable() { declare flag=$(use_enable "$@") - mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}" + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" } # mozconfig_use_with: add a line to .mozconfig based on a USE-flag @@ -48,7 +48,7 @@ # => ac_add_options --with-gss-api=/usr/lib # +kerberos mozconfig_use_with() { declare flag=$(use_with "$@") - mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}" + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" } # mozconfig_use_extension: enable or disable an extension based on a USE-flag @@ -57,7 +57,7 @@ # mozconfig_use_extension gnome gnomevfs # => ac_add_options --enable-extensions=gnomevfs mozconfig_use_extension() { - declare minus=$(useq $1 || echo -) + declare minus=$(use $1 || echo -) mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2} } diff -ur /tmp/eclass/multilib.eclass eclass/multilib.eclass --- /tmp/eclass/multilib.eclass 2011-03-19 00:03:25.000000000 +0200 +++ eclass/multilib.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -175,15 +175,15 @@ if [[ ${EMULTILIB_PKG} == "true" ]] ; then for x in ${MULTILIB_ABIS} ; do if [[ ${x} != "${DEFAULT_ABI}" ]] ; then - hasq ${x} ${ABI_DENY} || order="${order} ${x}" + has ${x} ${ABI_DENY} || order="${order} ${x}" fi done - hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}" + has ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}" if [[ -n ${ABI_ALLOW} ]] ; then local ordera="" for x in ${order} ; do - if hasq ${x} ${ABI_ALLOW} ; then + if has ${x} ${ABI_ALLOW} ; then ordera="${ordera} ${x}" fi done diff -ur /tmp/eclass/mysql.eclass eclass/mysql.eclass --- /tmp/eclass/mysql.eclass 2011-05-07 22:16:48.000000000 +0300 +++ eclass/mysql.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -773,7 +773,7 @@ # create new user and group for mysql # warn about deprecated features mysql_pkg_setup() { - if hasq test ${FEATURES} ; then + if has test ${FEATURES} ; then if ! use minimal ; then if [[ $UID -eq 0 ]]; then eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." diff -ur /tmp/eclass/mythtv-plugins.eclass eclass/mythtv-plugins.eclass --- /tmp/eclass/mythtv-plugins.eclass 2010-06-16 08:29:21.000000000 +0300 +++ eclass/mythtv-plugins.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -87,7 +87,7 @@ local myconf="" - if hasq ${PN} ${MYTHPLUGINS} ; then + if has ${PN} ${MYTHPLUGINS} ; then for x in ${MYTHPLUGINS} ; do if [[ ${PN} == ${x} ]] ; then myconf="${myconf} --enable-${x}" @@ -113,7 +113,7 @@ } mythtv-plugins_src_install() { - if hasq ${PN} ${MYTHPLUGINS} ; then + if has ${PN} ${MYTHPLUGINS} ; then cd "${S}"/${PN} else die "Package ${PN} is unsupported" diff -ur /tmp/eclass/pam.eclass eclass/pam.eclass --- /tmp/eclass/pam.eclass 2011-02-06 00:29:40.000000000 +0200 +++ eclass/pam.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -14,7 +14,7 @@ dopamd() { [[ -z $1 ]] && die "dopamd requires at least one argument" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0; fi @@ -32,7 +32,7 @@ newpamd() { [[ $# -ne 2 ]] && die "newpamd requires two arguments" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0; fi @@ -50,7 +50,7 @@ dopamsecurity() { [[ $# -lt 2 ]] && die "dopamsecurity requires at least two arguments" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0 fi @@ -67,7 +67,7 @@ newpamsecurity() { [[ $# -ne 3 ]] && die "newpamsecurity requires three arguments" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0; fi @@ -115,7 +115,7 @@ dopammod() { [[ -z $1 ]] && die "dopammod requires at least one argument" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0; fi @@ -130,7 +130,7 @@ newpammod() { [[ $# -ne 2 ]] && die "newpammod requires two arguements" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0; fi @@ -154,7 +154,7 @@ pamd_mimic() { [[ $# -lt 3 ]] && die "pamd_mimic requires at least three argments" - if hasq pam ${IUSE} && ! use pam; then + if has pam ${IUSE} && ! use pam; then return 0; fi @@ -175,7 +175,7 @@ shift; shift while [[ -n $1 ]]; do - hasq $1 ${authlevels} || die "unknown level type" + has $1 ${authlevels} || die "unknown level type" echo -e "$1${mimic}" >> ${pamdfile} diff -ur /tmp/eclass/pax-utils.eclass eclass/pax-utils.eclass --- /tmp/eclass/pax-utils.eclass 2011-07-07 01:47:12.000000000 +0300 +++ eclass/pax-utils.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -57,7 +57,7 @@ flags=${1//-} shift # Try paxctl, then scanelf. paxctl is preferred. - if type -p paxctl > /dev/null && hasq PT ${PAX_MARKINGS}; then + if type -p paxctl > /dev/null && has PT ${PAX_MARKINGS}; then # Try paxctl, the upstream supported tool. elog "PT PaX marking -${flags}" _pax_list_files elog "$@" diff -ur /tmp/eclass/qt4-build.eclass eclass/qt4-build.eclass --- /tmp/eclass/qt4-build.eclass 2011-03-11 01:45:51.000000000 +0200 +++ eclass/qt4-build.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -174,7 +174,7 @@ # fix libx11 dependency on non X packages if version_is_at_least "4.7.0_beta2"; then local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" - hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 + has ${PN} ${NOLIBX11PKG} && qt_nolibx11 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup fi @@ -601,7 +601,7 @@ # including qconfig_add and excluding qconfig_remove for x in $(sed -n 's/^QT_CONFIG +=//p' \ "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do - hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}" + has ${x} ${qconfig_remove} || qconfig_new+=" ${x}" done # replace the existing QT_CONFIG list with qconfig_new diff -ur /tmp/eclass/ruby.eclass eclass/ruby.eclass --- /tmp/eclass/ruby.eclass 2010-08-03 18:50:02.000000000 +0300 +++ eclass/ruby.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -193,7 +193,7 @@ dohtml -r * fi - if hasq examples ${IUSE} && use examples; then + if has examples ${IUSE} && use examples; then for dir in sample samples example examples; do if [ -d ${dir} ] ; then dodir /usr/share/doc/${PF} diff -ur /tmp/eclass/ruby-ng.eclass eclass/ruby-ng.eclass --- /tmp/eclass/ruby-ng.eclass 2011-04-25 11:37:26.000000000 +0300 +++ eclass/ruby-ng.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -213,7 +213,7 @@ # Add the dependency as a test-dependency since we're going to # execute the code during test phase. DEPEND="${DEPEND} test? ( ${dependency} )" - hasq test "$IUSE" || IUSE="${IUSE} test" + has test "$IUSE" || IUSE="${IUSE} test" } # @FUNCTION: ruby_add_bdepend diff -ur /tmp/eclass/tetex-3.eclass eclass/tetex-3.eclass --- /tmp/eclass/tetex-3.eclass 2010-10-10 20:23:14.000000000 +0300 +++ eclass/tetex-3.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -174,7 +174,7 @@ mv ${D}/etc/texmf/web2c/texmf.cnf ${D}/etc/texmf/texmf.d/00texmf.cnf # xdvi - if useq X ; then + if use X ; then dodir /etc/X11/app-defaults /etc/texmf/xdvi mv ${D}${TEXMF_PATH}/xdvi/XDvi ${D}/etc/X11/app-defaults || die "mv XDvi failed" dosym /etc/X11/app-defaults/XDvi ${TEXMF_PATH}/xdvi/XDvi diff -ur /tmp/eclass/tetex.eclass eclass/tetex.eclass --- /tmp/eclass/tetex.eclass 2009-01-06 21:25:20.000000000 +0200 +++ eclass/tetex.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -115,7 +115,7 @@ local xdvik - if useq X ; then + if use X ; then addwrite /var/cache/fonts xdvik="--with-xdvik --with-oxdvik" #xdvik="$xdvik --with-system-t1lib" @@ -197,7 +197,7 @@ #dodoc BUGS FAQ README* # move docs to /usr/share/doc/${PF} - if useq doc ; then + if use doc ; then dodir /usr/share/doc/${PF} mv ${D}/usr/share/texmf/doc/* \ ${D}/usr/share/doc/${PF} \ diff -ur /tmp/eclass/toolchain.eclass eclass/toolchain.eclass --- /tmp/eclass/toolchain.eclass 2011-06-16 00:51:12.000000000 +0300 +++ eclass/toolchain.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -451,7 +451,7 @@ die "hardened_gcc_stable needs to be called with pie or ssp" fi - hasq $(tc-arch) ${tocheck} && return 0 + has $(tc-arch) ${tocheck} && return 0 return 1 } @@ -481,7 +481,7 @@ die "hardened_gcc_check_unsupported needs to be called with pie or ssp" fi - hasq $(tc-arch) ${tocheck} && return 0 + has $(tc-arch) ${tocheck} && return 0 return 1 } diff -ur /tmp/eclass/vim-plugin.eclass eclass/vim-plugin.eclass --- /tmp/eclass/vim-plugin.eclass 2011-01-16 20:18:13.000000000 +0200 +++ eclass/vim-plugin.eclass 2011-07-08 14:13:59.000000000 +0300 @@ -139,7 +139,7 @@ elog " " fi - if hasq "filetype" "${VIM_PLUGIN_MESSAGES}" ; then + if has "filetype" "${VIM_PLUGIN_MESSAGES}" ; then elog "This plugin makes use of filetype settings. To enable these," elog "add lines like:" elog " filetype plugin on"