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 9680F138247 for ; Wed, 13 Nov 2013 22:24:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FA9BE0B5B; Wed, 13 Nov 2013 22:24:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E39DE0B5B for ; Wed, 13 Nov 2013 22:24:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87EDF33F3AD for ; Wed, 13 Nov 2013 22:24:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3A54BE530A for ; Wed, 13 Nov 2013 22:24:46 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1384381464.6d6dae006ffa71291bf23ed40fd7df8287007f6a.polynomial-c@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/kde-meta.eclass eclass/kde.eclass X-VCS-Directories: eclass/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6d6dae006ffa71291bf23ed40fd7df8287007f6a X-VCS-Branch: master Date: Wed, 13 Nov 2013 22:24:46 +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: b450d400-8af2-47ff-bbb9-fadb1abd6e82 X-Archives-Hash: 8ee7ec61bca8924d136bf508774577bc commit: 6d6dae006ffa71291bf23ed40fd7df8287007f6a Author: Lars Wendler gentoo org> AuthorDate: Wed Nov 13 22:24:24 2013 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Nov 13 22:24:24 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=6d6dae00 Replaced deprecated "hasq" with "has". --- eclass/kde-meta.eclass | 6 +++--- eclass/kde.eclass | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass index 216344e..884ee05 100644 --- a/eclass/kde-meta.eclass +++ b/eclass/kde-meta.eclass @@ -213,8 +213,8 @@ change_makefiles() { # check if the dir is defined as KMEXTRACTONLY or if it was defined is KMEXTRACTONLY in the parent dir, this is valid only if it's not also defined as KMMODULE, KMEXTRA or KMCOMPILEONLY. They will ovverride KMEXTRACTONLY, but only in the current dir. isextractonly="false" - if ( ( hasq "$1" $KMEXTRACTONLYFULLPATH || [[ $2 = "true" ]] ) && \ - ( ! hasq "$1" $KMMODULEFULLPATH $KMEXTRAFULLPATH $KMCOMPILEONLYFULLPATH ) ); then + if ( ( has "$1" $KMEXTRACTONLYFULLPATH || [[ $2 = "true" ]] ) && \ + ( ! has "$1" $KMMODULEFULLPATH $KMEXTRAFULLPATH $KMCOMPILEONLYFULLPATH ) ); then isextractonly="true" fi debug-print "isextractonly = $isextractonly" @@ -230,7 +230,7 @@ change_makefiles() { for directory in $dirlistfullpath; do - if ( hasq "$1" $KMEXTRACTONLYFULLPATH || [[ $2 = "true" ]] ); then + if ( has "$1" $KMEXTRACTONLYFULLPATH || [[ $2 = "true" ]] ); then change_makefiles $directory 'true' else change_makefiles $directory 'false' diff --git a/eclass/kde.eclass b/eclass/kde.eclass index b85a9bb..eb89f30 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -287,7 +287,7 @@ kde_src_configure() { else myconf="$myconf --disable-debug --without-debug" fi - if hasq kdeenablefinal ${IUSE}; then + if has kdeenablefinal ${IUSE}; then myconf="$myconf $(use_enable kdeenablefinal final)" fi if [[ ${ARTS_REQUIRED} == "never" ]]; then @@ -403,7 +403,7 @@ EOF # Visiblity stuff is broken. Just disable it when it's present. export kde_cv_prog_cxx_fvisibility_hidden=no - if hasq kdehiddenvisibility ${IUSE} && use kdehiddenvisibility; then + if has kdehiddenvisibility ${IUSE} && use kdehiddenvisibility; then if [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]]; then if [[ ${PN} != "kdelibs" && ${PN} != "arts" ]] && \ ! fgrep -q "#define __KDE_HAVE_GCC_VISIBILITY" "${KDEDIR}/include/kdemacros.h"; then