From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 8 Jul 2011 16:54:09 +0000 (-0700)
Subject: Invert has/hasq and use/useq implementations.
X-Git-Tag: v2.2.0_alpha44~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cff6e7888af31d1db2519ce17d5b30baf5270002;p=portage.git

Invert has/hasq and use/useq implementations.

We need to migrate away from hasq and useq since they are deprecated
(bug #199722).
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8c301d8c9..f9a87afe5 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -127,19 +127,19 @@ esyslog() {
 	return 0
 }
 
-use() {
-	useq ${1}
+useq() {
+	use ${1}
 }
 
 usev() {
-	if useq ${1}; then
+	if use ${1}; then
 		echo "${1#!}"
 		return 0
 	fi
 	return 1
 }
 
-useq() {
+use() {
 	local u=$1
 	local found=0
 
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 24443ac1b..a4bd0a95c 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -511,19 +511,19 @@ if [[ -z ${XARGS} ]] ; then
 	esac
 fi
 
-has() {
-	hasq "$@"
+hasq() {
+	has "$@"
 }
 
 hasv() {
-	if hasq "$@" ; then
+	if has "$@" ; then
 		echo "$1"
 		return 0
 	fi
 	return 1
 }
 
-hasq() {
+has() {
 	[[ " ${*:2} " == *" $1 "* ]]
 }