[gentoo-commits] proj/kde-sunset:master commit in: eclass/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     6d6dae006ffa71291bf23ed40fd7df8287007f6a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 22:24:24 2013 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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