--- eclass/pam.eclass	2011/02/05 22:29:40	1.19
+++ eclass/pam.eclass	2011/07/08 11:35:01	1.20
@@ -1,7 +1,7 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.19 2011/02/05 22:29:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.20 2011/07/08 11:35:01 ssuominen Exp $
 #
 # This eclass contains functions to install pamd configuration files and
 # pam modules.
@@ -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}