split out user management helpers into a dedicated eclass

3 files changed, 446 insertions, 437 deletions

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 96d562baee8f..4427e7d4e393 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.367 2011/10/26 23:27:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.368 2011/10/27 07:16:08 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -15,7 +15,7 @@
 # Due to the nature of this eclass, some functions may have maintainers
 # different from the overall eclass!
 
-inherit multilib portability
+inherit multilib portability user
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
@@ -531,386 +531,6 @@ emktemp() {
 	fi
 }
 
-# @FUNCTION: egetent
-# @USAGE: <database> <key>
-# @MAINTAINER:
-# base-system@gentoo.org (Linux)
-# Joe Jezak <josejx@gmail.com> (OS X)
-# usata@gentoo.org (OS X)
-# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
-# @DESCRIPTION:
-# Small wrapper for getent (Linux),
-# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
-# and pw (FreeBSD) used in enewuser()/enewgroup()
-egetent() {
-	case ${CHOST} in
-	*-darwin[678])
-		case "$2" in
-		*[!0-9]*) # Non numeric
-			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
-			;;
-		*)	# Numeric
-			nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
-			;;
-		esac
-		;;
-	*-darwin*)
-		local mytype=$1
-		[[ "passwd" == $mytype ]] && mytype="Users"
-		[[ "group" == $mytype ]] && mytype="Groups"
-		case "$2" in
-		*[!0-9]*) # Non numeric
-			dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
-			;;
-		*)	# Numeric
-			local mykey="UniqueID"
-			[[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
-			dscl . -search /$mytype $mykey $2 2>/dev/null
-			;;
-		esac
-		;;
-	*-freebsd*|*-dragonfly*)
-		local opts action="user"
-		[[ $1 == "passwd" ]] || action="group"
-
-		# lookup by uid/gid
-		if [[ $2 == [[:digit:]]* ]] ; then
-			[[ ${action} == "user" ]] && opts="-u" || opts="-g"
-		fi
-
-		pw show ${action} ${opts} "$2" -q
-		;;
-	*-netbsd*|*-openbsd*)
-		grep "$2:\*:" /etc/$1
-		;;
-	*)
-		type -p nscd >& /dev/null && nscd -i "$1"
-		getent "$1" "$2"
-		;;
-	esac
-}
-
-# @FUNCTION: enewuser
-# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
-# @DESCRIPTION:
-# Same as enewgroup, you are not required to understand how to properly add
-# a user to the system.  The only required parameter is the username.
-# Default uid is (pass -1 for this) next available, default shell is
-# /bin/false, default homedir is /dev/null, there are no default groups,
-# and default params sets the comment as 'added by portage for ${PN}'.
-enewuser() {
-	case ${EBUILD_PHASE} in
-		unpack|compile|test|install)
-		eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
-		eerror "Package fails at QA and at life.  Please file a bug."
-		die "Bad package!  enewuser is only for use in pkg_* functions!"
-	esac
-
-	# get the username
-	local euser=$1; shift
-	if [[ -z ${euser} ]] ; then
-		eerror "No username specified !"
-		die "Cannot call enewuser without a username"
-	fi
-
-	# lets see if the username already exists
-	if [[ -n $(egetent passwd "${euser}") ]] ; then
-		return 0
-	fi
-	einfo "Adding user '${euser}' to your system ..."
-
-	# options to pass to useradd
-	local opts=
-
-	# handle uid
-	local euid=$1; shift
-	if [[ -n ${euid} && ${euid} != -1 ]] ; then
-		if [[ ${euid} -gt 0 ]] ; then
-			if [[ -n $(egetent passwd ${euid}) ]] ; then
-				euid="next"
-			fi
-		else
-			eerror "Userid given but is not greater than 0 !"
-			die "${euid} is not a valid UID"
-		fi
-	else
-		euid="next"
-	fi
-	if [[ ${euid} == "next" ]] ; then
-		for ((euid = 101; euid <= 999; euid++)); do
-			[[ -z $(egetent passwd ${euid}) ]] && break
-		done
-	fi
-	opts="${opts} -u ${euid}"
-	einfo " - Userid: ${euid}"
-
-	# handle shell
-	local eshell=$1; shift
-	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
-		if [[ ! -e ${ROOT}${eshell} ]] ; then
-			eerror "A shell was specified but it does not exist !"
-			die "${eshell} does not exist in ${ROOT}"
-		fi
-		if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
-			eerror "Do not specify ${eshell} yourself, use -1"
-			die "Pass '-1' as the shell parameter"
-		fi
-	else
-		for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
-			[[ -x ${ROOT}${shell} ]] && break
-		done
-
-		if [[ ${shell} == "/dev/null" ]] ; then
-			eerror "Unable to identify the shell to use, proceeding with userland default."
-			case ${USERLAND} in
-				GNU) shell="/bin/false" ;;
-				BSD) shell="/sbin/nologin" ;;
-				Darwin) shell="/usr/sbin/nologin" ;;
-				*) die "Unable to identify the default shell for userland ${USERLAND}"
-			esac
-		fi
-
-		eshell=${shell}
-	fi
-	einfo " - Shell: ${eshell}"
-	opts="${opts} -s ${eshell}"
-
-	# handle homedir
-	local ehome=$1; shift
-	if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
-		ehome="/dev/null"
-	fi
-	einfo " - Home: ${ehome}"
-	opts="${opts} -d ${ehome}"
-
-	# handle groups
-	local egroups=$1; shift
-	if [[ ! -z ${egroups} ]] ; then
-		local oldifs=${IFS}
-		local defgroup="" exgroups=""
-
-		export IFS=","
-		for g in ${egroups} ; do
-			export IFS=${oldifs}
-			if [[ -z $(egetent group "${g}") ]] ; then
-				eerror "You must add group ${g} to the system first"
-				die "${g} is not a valid GID"
-			fi
-			if [[ -z ${defgroup} ]] ; then
-				defgroup=${g}
-			else
-				exgroups="${exgroups},${g}"
-			fi
-			export IFS=","
-		done
-		export IFS=${oldifs}
-
-		opts="${opts} -g ${defgroup}"
-		if [[ ! -z ${exgroups} ]] ; then
-			opts="${opts} -G ${exgroups:1}"
-		fi
-	else
-		egroups="(none)"
-	fi
-	einfo " - Groups: ${egroups}"
-
-	# handle extra and add the user
-	local oldsandbox=${SANDBOX_ON}
-	export SANDBOX_ON="0"
-	case ${CHOST} in
-	*-darwin*)
-		### Make the user
-		if [[ -z $@ ]] ; then
-			dscl . create /users/${euser} uid ${euid}
-			dscl . create /users/${euser} shell ${eshell}
-			dscl . create /users/${euser} home ${ehome}
-			dscl . create /users/${euser} realname "added by portage for ${PN}"
-			### Add the user to the groups specified
-			local oldifs=${IFS}
-			export IFS=","
-			for g in ${egroups} ; do
-				dscl . merge /groups/${g} users ${euser}
-			done
-			export IFS=${oldifs}
-		else
-			einfo "Extra options are not supported on Darwin yet"
-			einfo "Please report the ebuild along with the info below"
-			einfo "eextra: $@"
-			die "Required function missing"
-		fi
-		;;
-	*-freebsd*|*-dragonfly*)
-		if [[ -z $@ ]] ; then
-			pw useradd ${euser} ${opts} \
-				-c "added by portage for ${PN}" \
-				die "enewuser failed"
-		else
-			einfo " - Extra: $@"
-			pw useradd ${euser} ${opts} \
-				"$@" || die "enewuser failed"
-		fi
-		;;
-
-	*-netbsd*)
-		if [[ -z $@ ]] ; then
-			useradd ${opts} ${euser} || die "enewuser failed"
-		else
-			einfo " - Extra: $@"
-			useradd ${opts} ${euser} "$@" || die "enewuser failed"
-		fi
-		;;
-
-	*-openbsd*)
-		if [[ -z $@ ]] ; then
-			useradd -u ${euid} -s ${eshell} \
-				-d ${ehome} -c "Added by portage for ${PN}" \
-				-g ${egroups} ${euser} || die "enewuser failed"
-		else
-			einfo " - Extra: $@"
-			useradd -u ${euid} -s ${eshell} \
-				-d ${ehome} -c "Added by portage for ${PN}" \
-				-g ${egroups} ${euser} "$@" || die "enewuser failed"
-		fi
-		;;
-
-	*)
-		if [[ -z $@ ]] ; then
-			useradd -r ${opts} \
-				-c "added by portage for ${PN}" \
-				${euser} \
-				|| die "enewuser failed"
-		else
-			einfo " - Extra: $@"
-			useradd -r ${opts} "$@" \
-				${euser} \
-				|| die "enewuser failed"
-		fi
-		;;
-	esac
-
-	if [[ ! -e ${ROOT}/${ehome} ]] ; then
-		einfo " - Creating ${ehome} in ${ROOT}"
-		mkdir -p "${ROOT}/${ehome}"
-		chown ${euser} "${ROOT}/${ehome}"
-		chmod 755 "${ROOT}/${ehome}"
-	fi
-
-	export SANDBOX_ON=${oldsandbox}
-}
-
-# @FUNCTION: enewgroup
-# @USAGE: <group> [gid]
-# @DESCRIPTION:
-# This function does not require you to understand how to properly add a
-# group to the system.  Just give it a group name to add and enewgroup will
-# do the rest.  You may specify the gid for the group or allow the group to
-# allocate the next available one.
-enewgroup() {
-	case ${EBUILD_PHASE} in
-		unpack|compile|test|install)
-		eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
-		eerror "Package fails at QA and at life.  Please file a bug."
-		die "Bad package!  enewgroup is only for use in pkg_* functions!"
-	esac
-
-	# get the group
-	local egroup="$1"; shift
-	if [ -z "${egroup}" ]
-	then
-		eerror "No group specified !"
-		die "Cannot call enewgroup without a group"
-	fi
-
-	# see if group already exists
-	if [[ -n $(egetent group "${egroup}") ]]; then
-		return 0
-	fi
-	einfo "Adding group '${egroup}' to your system ..."
-
-	# options to pass to useradd
-	local opts=
-
-	# handle gid
-	local egid="$1"; shift
-	if [ ! -z "${egid}" ]
-	then
-		if [ "${egid}" -gt 0 ]
-		then
-			if [ -z "`egetent group ${egid}`" ]
-			then
-				if [[ "${CHOST}" == *-darwin* ]]; then
-					opts="${opts} ${egid}"
-				else
-					opts="${opts} -g ${egid}"
-				fi
-			else
-				egid="next available; requested gid taken"
-			fi
-		else
-			eerror "Groupid given but is not greater than 0 !"
-			die "${egid} is not a valid GID"
-		fi
-	else
-		egid="next available"
-	fi
-	einfo " - Groupid: ${egid}"
-
-	# handle extra
-	local eextra="$@"
-	opts="${opts} ${eextra}"
-
-	# add the group
-	local oldsandbox="${SANDBOX_ON}"
-	export SANDBOX_ON="0"
-	case ${CHOST} in
-	*-darwin*)
-		if [ ! -z "${eextra}" ];
-		then
-			einfo "Extra options are not supported on Darwin/OS X yet"
-			einfo "Please report the ebuild along with the info below"
-			einfo "eextra: ${eextra}"
-			die "Required function missing"
-		fi
-
-		# If we need the next available
-		case ${egid} in
-		*[!0-9]*) # Non numeric
-			for ((egid = 101; egid <= 999; egid++)); do
-				[[ -z $(egetent group ${egid}) ]] && break
-			done
-		esac
-		dscl . create /groups/${egroup} gid ${egid}
-		dscl . create /groups/${egroup} passwd '*'
-		;;
-
-	*-freebsd*|*-dragonfly*)
-		case ${egid} in
-			*[!0-9]*) # Non numeric
-				for ((egid = 101; egid <= 999; egid++)); do
-					[[ -z $(egetent group ${egid}) ]] && break
-				done
-		esac
-		pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
-		;;
-
-	*-netbsd*)
-		case ${egid} in
-		*[!0-9]*) # Non numeric
-			for ((egid = 101; egid <= 999; egid++)); do
-				[[ -z $(egetent group ${egid}) ]] && break
-			done
-		esac
-		groupadd -g ${egid} ${egroup} || die "enewgroup failed"
-		;;
-
-	*)
-		# We specify -r so that we get a GID in the system range from login.defs
-		groupadd -r ${opts} ${egroup} || die "enewgroup failed"
-		;;
-	esac
-	export SANDBOX_ON="${oldsandbox}"
-}
-
 # @FUNCTION: edos2unix
 # @USAGE: <file> [more files ...]
 # @DESCRIPTION:
diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 3269a3c6efdf..5e3cf3a03208 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.17 2010/09/24 14:29:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.18 2011/10/27 07:16:08 vapier Exp $
 #
 # Author: Diego Pettenò <flameeyes@gentoo.org>
 #
@@ -8,6 +8,8 @@
 #
 # NB:  If you add anything, please comment it!
 
+inherit user
+
 # treecopy orig1 orig2 orig3 .... dest
 #
 # mimic cp --parents copy, but working on BSD userland as well
@@ -81,59 +83,6 @@ dlopen_lib() {
 	esac
 }
 
-# Gets the home directory for the specified user
-# it's a wrap around egetent as the position of the home directory in the line
-# varies depending on the os used.
-#
-# To use that, inherit eutils, not portability!
-egethome() {
-	ent=$(egetent passwd $1)
-
-	case ${CHOST} in
-	*-darwin*|*-freebsd*|*-dragonfly*)
-		# Darwin, OSX, FreeBSD and DragonFly use position 9 to store homedir
-		echo ${ent} | cut -d: -f9
-		;;
-	*)
-		# Linux, NetBSD and OpenBSD use position 6 instead
-		echo ${ent} | cut -d: -f6
-		;;
-	esac
-}
-
-# Gets the shell for the specified user
-# it's a wrap around egetent as the position of the home directory in the line
-# varies depending on the os used.
-#
-# To use that, inherit eutils, not portability!
-egetshell() {
-	ent=$(egetent passwd "$1")
-
-	case ${CHOST} in
-	*-darwin*|*-freebsd*|*-dragonfly*)
-		# Darwin, OSX, FreeBSD and DragonFly use position 9 to store homedir
-		echo ${ent} | cut -d: -f10
-		;;
-	*)
-		# Linux, NetBSD and OpenBSD use position 6 instead
-		echo ${ent} cut -d: -f7
-		;;
-	esac
-}
-
-# Returns true if specified user has a shell that precludes logins
-# on whichever operating system.
-is-login-disabled() {
-	shell=$(egetshell "$1")
-
-	case ${shell} in
-		/bin/false|/usr/bin/false|/sbin/nologin|/usr/sbin/nologin)
-			return 0 ;;
-		*)
-			return 1 ;;
-	esac
-}
-
 # Gets the name of the BSD-ish make command (pmake from NetBSD)
 #
 # This will return make (provided by system packages) for BSD userlands,
@@ -180,4 +129,3 @@ get_mounts() {
 		echo "${point// /\040} ${node// /\040} ${fs%% *} ${opts// /\040}"
 	done
 }
-
diff --git a/eclass/user.eclass b/eclass/user.eclass
new file mode 100644
index 000000000000..c2ed2bf6141d
--- /dev/null
+++ b/eclass/user.eclass
@@ -0,0 +1,441 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.1 2011/10/27 07:16:08 vapier Exp $
+
+# @ECLASS: user.eclass
+# @MAINTAINER:
+# base-system@gentoo.org (Linux)
+# Joe Jezak <josejx@gmail.com> (OS X)
+# usata@gentoo.org (OS X)
+# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
+# @BLURB: user management in ebuilds
+# @DESCRIPTION:
+# The user eclass contains a suite of functions that allow ebuilds
+# to quickly make sure users in the installed system are sane.
+
+# @FUNCTION: egetent
+# @USAGE: <database> <key>
+# @DESCRIPTION:
+# Small wrapper for getent (Linux), nidump (< Mac OS X 10.5),
+# dscl (Mac OS X 10.5), and pw (FreeBSD) used in enewuser()/enewgroup().
+egetent() {
+	case ${CHOST} in
+	*-darwin[678])
+		case "$2" in
+		*[!0-9]*) # Non numeric
+			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
+			;;
+		*)	# Numeric
+			nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
+			;;
+		esac
+		;;
+	*-darwin*)
+		local mytype=$1
+		[[ "passwd" == $mytype ]] && mytype="Users"
+		[[ "group" == $mytype ]] && mytype="Groups"
+		case "$2" in
+		*[!0-9]*) # Non numeric
+			dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
+			;;
+		*)	# Numeric
+			local mykey="UniqueID"
+			[[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
+			dscl . -search /$mytype $mykey $2 2>/dev/null
+			;;
+		esac
+		;;
+	*-freebsd*|*-dragonfly*)
+		local opts action="user"
+		[[ $1 == "passwd" ]] || action="group"
+
+		# lookup by uid/gid
+		if [[ $2 == [[:digit:]]* ]] ; then
+			[[ ${action} == "user" ]] && opts="-u" || opts="-g"
+		fi
+
+		pw show ${action} ${opts} "$2" -q
+		;;
+	*-netbsd*|*-openbsd*)
+		grep "$2:\*:" /etc/$1
+		;;
+	*)
+		type -p nscd >& /dev/null && nscd -i "$1"
+		getent "$1" "$2"
+		;;
+	esac
+}
+
+# @FUNCTION: enewuser
+# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
+# @DESCRIPTION:
+# Same as enewgroup, you are not required to understand how to properly add
+# a user to the system.  The only required parameter is the username.
+# Default uid is (pass -1 for this) next available, default shell is
+# /bin/false, default homedir is /dev/null, there are no default groups,
+# and default params sets the comment as 'added by portage for ${PN}'.
+enewuser() {
+	case ${EBUILD_PHASE} in
+		unpack|compile|test|install)
+		eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
+		eerror "Package fails at QA and at life.  Please file a bug."
+		die "Bad package!  enewuser is only for use in pkg_* functions!"
+	esac
+
+	# get the username
+	local euser=$1; shift
+	if [[ -z ${euser} ]] ; then
+		eerror "No username specified !"
+		die "Cannot call enewuser without a username"
+	fi
+
+	# lets see if the username already exists
+	if [[ -n $(egetent passwd "${euser}") ]] ; then
+		return 0
+	fi
+	einfo "Adding user '${euser}' to your system ..."
+
+	# options to pass to useradd
+	local opts=
+
+	# handle uid
+	local euid=$1; shift
+	if [[ -n ${euid} && ${euid} != -1 ]] ; then
+		if [[ ${euid} -gt 0 ]] ; then
+			if [[ -n $(egetent passwd ${euid}) ]] ; then
+				euid="next"
+			fi
+		else
+			eerror "Userid given but is not greater than 0 !"
+			die "${euid} is not a valid UID"
+		fi
+	else
+		euid="next"
+	fi
+	if [[ ${euid} == "next" ]] ; then
+		for ((euid = 101; euid <= 999; euid++)); do
+			[[ -z $(egetent passwd ${euid}) ]] && break
+		done
+	fi
+	opts="${opts} -u ${euid}"
+	einfo " - Userid: ${euid}"
+
+	# handle shell
+	local eshell=$1; shift
+	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
+		if [[ ! -e ${ROOT}${eshell} ]] ; then
+			eerror "A shell was specified but it does not exist !"
+			die "${eshell} does not exist in ${ROOT}"
+		fi
+		if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
+			eerror "Do not specify ${eshell} yourself, use -1"
+			die "Pass '-1' as the shell parameter"
+		fi
+	else
+		for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
+			[[ -x ${ROOT}${shell} ]] && break
+		done
+
+		if [[ ${shell} == "/dev/null" ]] ; then
+			eerror "Unable to identify the shell to use, proceeding with userland default."
+			case ${USERLAND} in
+				GNU) shell="/bin/false" ;;
+				BSD) shell="/sbin/nologin" ;;
+				Darwin) shell="/usr/sbin/nologin" ;;
+				*) die "Unable to identify the default shell for userland ${USERLAND}"
+			esac
+		fi
+
+		eshell=${shell}
+	fi
+	einfo " - Shell: ${eshell}"
+	opts="${opts} -s ${eshell}"
+
+	# handle homedir
+	local ehome=$1; shift
+	if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
+		ehome="/dev/null"
+	fi
+	einfo " - Home: ${ehome}"
+	opts="${opts} -d ${ehome}"
+
+	# handle groups
+	local egroups=$1; shift
+	if [[ ! -z ${egroups} ]] ; then
+		local oldifs=${IFS}
+		local defgroup="" exgroups=""
+
+		export IFS=","
+		for g in ${egroups} ; do
+			export IFS=${oldifs}
+			if [[ -z $(egetent group "${g}") ]] ; then
+				eerror "You must add group ${g} to the system first"
+				die "${g} is not a valid GID"
+			fi
+			if [[ -z ${defgroup} ]] ; then
+				defgroup=${g}
+			else
+				exgroups="${exgroups},${g}"
+			fi
+			export IFS=","
+		done
+		export IFS=${oldifs}
+
+		opts="${opts} -g ${defgroup}"
+		if [[ ! -z ${exgroups} ]] ; then
+			opts="${opts} -G ${exgroups:1}"
+		fi
+	else
+		egroups="(none)"
+	fi
+	einfo " - Groups: ${egroups}"
+
+	# handle extra and add the user
+	local oldsandbox=${SANDBOX_ON}
+	export SANDBOX_ON="0"
+	case ${CHOST} in
+	*-darwin*)
+		### Make the user
+		if [[ -z $@ ]] ; then
+			dscl . create /users/${euser} uid ${euid}
+			dscl . create /users/${euser} shell ${eshell}
+			dscl . create /users/${euser} home ${ehome}
+			dscl . create /users/${euser} realname "added by portage for ${PN}"
+			### Add the user to the groups specified
+			local oldifs=${IFS}
+			export IFS=","
+			for g in ${egroups} ; do
+				dscl . merge /groups/${g} users ${euser}
+			done
+			export IFS=${oldifs}
+		else
+			einfo "Extra options are not supported on Darwin yet"
+			einfo "Please report the ebuild along with the info below"
+			einfo "eextra: $@"
+			die "Required function missing"
+		fi
+		;;
+	*-freebsd*|*-dragonfly*)
+		if [[ -z $@ ]] ; then
+			pw useradd ${euser} ${opts} \
+				-c "added by portage for ${PN}" \
+				die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			pw useradd ${euser} ${opts} \
+				"$@" || die "enewuser failed"
+		fi
+		;;
+
+	*-netbsd*)
+		if [[ -z $@ ]] ; then
+			useradd ${opts} ${euser} || die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			useradd ${opts} ${euser} "$@" || die "enewuser failed"
+		fi
+		;;
+
+	*-openbsd*)
+		if [[ -z $@ ]] ; then
+			useradd -u ${euid} -s ${eshell} \
+				-d ${ehome} -c "Added by portage for ${PN}" \
+				-g ${egroups} ${euser} || die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			useradd -u ${euid} -s ${eshell} \
+				-d ${ehome} -c "Added by portage for ${PN}" \
+				-g ${egroups} ${euser} "$@" || die "enewuser failed"
+		fi
+		;;
+
+	*)
+		if [[ -z $@ ]] ; then
+			useradd -r ${opts} \
+				-c "added by portage for ${PN}" \
+				${euser} \
+				|| die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			useradd -r ${opts} "$@" \
+				${euser} \
+				|| die "enewuser failed"
+		fi
+		;;
+	esac
+
+	if [[ ! -e ${ROOT}/${ehome} ]] ; then
+		einfo " - Creating ${ehome} in ${ROOT}"
+		mkdir -p "${ROOT}/${ehome}"
+		chown ${euser} "${ROOT}/${ehome}"
+		chmod 755 "${ROOT}/${ehome}"
+	fi
+
+	export SANDBOX_ON=${oldsandbox}
+}
+
+# @FUNCTION: enewgroup
+# @USAGE: <group> [gid]
+# @DESCRIPTION:
+# This function does not require you to understand how to properly add a
+# group to the system.  Just give it a group name to add and enewgroup will
+# do the rest.  You may specify the gid for the group or allow the group to
+# allocate the next available one.
+enewgroup() {
+	case ${EBUILD_PHASE} in
+		unpack|compile|test|install)
+		eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
+		eerror "Package fails at QA and at life.  Please file a bug."
+		die "Bad package!  enewgroup is only for use in pkg_* functions!"
+	esac
+
+	# get the group
+	local egroup="$1"; shift
+	if [ -z "${egroup}" ]
+	then
+		eerror "No group specified !"
+		die "Cannot call enewgroup without a group"
+	fi
+
+	# see if group already exists
+	if [[ -n $(egetent group "${egroup}") ]]; then
+		return 0
+	fi
+	einfo "Adding group '${egroup}' to your system ..."
+
+	# options to pass to useradd
+	local opts=
+
+	# handle gid
+	local egid="$1"; shift
+	if [ ! -z "${egid}" ]
+	then
+		if [ "${egid}" -gt 0 ]
+		then
+			if [ -z "`egetent group ${egid}`" ]
+			then
+				if [[ "${CHOST}" == *-darwin* ]]; then
+					opts="${opts} ${egid}"
+				else
+					opts="${opts} -g ${egid}"
+				fi
+			else
+				egid="next available; requested gid taken"
+			fi
+		else
+			eerror "Groupid given but is not greater than 0 !"
+			die "${egid} is not a valid GID"
+		fi
+	else
+		egid="next available"
+	fi
+	einfo " - Groupid: ${egid}"
+
+	# handle extra
+	local eextra="$@"
+	opts="${opts} ${eextra}"
+
+	# add the group
+	local oldsandbox="${SANDBOX_ON}"
+	export SANDBOX_ON="0"
+	case ${CHOST} in
+	*-darwin*)
+		if [ ! -z "${eextra}" ];
+		then
+			einfo "Extra options are not supported on Darwin/OS X yet"
+			einfo "Please report the ebuild along with the info below"
+			einfo "eextra: ${eextra}"
+			die "Required function missing"
+		fi
+
+		# If we need the next available
+		case ${egid} in
+		*[!0-9]*) # Non numeric
+			for ((egid = 101; egid <= 999; egid++)); do
+				[[ -z $(egetent group ${egid}) ]] && break
+			done
+		esac
+		dscl . create /groups/${egroup} gid ${egid}
+		dscl . create /groups/${egroup} passwd '*'
+		;;
+
+	*-freebsd*|*-dragonfly*)
+		case ${egid} in
+			*[!0-9]*) # Non numeric
+				for ((egid = 101; egid <= 999; egid++)); do
+					[[ -z $(egetent group ${egid}) ]] && break
+				done
+		esac
+		pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
+		;;
+
+	*-netbsd*)
+		case ${egid} in
+		*[!0-9]*) # Non numeric
+			for ((egid = 101; egid <= 999; egid++)); do
+				[[ -z $(egetent group ${egid}) ]] && break
+			done
+		esac
+		groupadd -g ${egid} ${egroup} || die "enewgroup failed"
+		;;
+
+	*)
+		# We specify -r so that we get a GID in the system range from login.defs
+		groupadd -r ${opts} ${egroup} || die "enewgroup failed"
+		;;
+	esac
+	export SANDBOX_ON="${oldsandbox}"
+}
+
+# Gets the home directory for the specified user
+# it's a wrap around egetent as the position of the home directory in the line
+# varies depending on the os used.
+#
+# To use that, inherit eutils, not portability!
+egethome() {
+	ent=$(egetent passwd $1)
+
+	case ${CHOST} in
+	*-darwin*|*-freebsd*|*-dragonfly*)
+		# Darwin, OSX, FreeBSD and DragonFly use position 9 to store homedir
+		echo ${ent} | cut -d: -f9
+		;;
+	*)
+		# Linux, NetBSD and OpenBSD use position 6 instead
+		echo ${ent} | cut -d: -f6
+		;;
+	esac
+}
+
+# Gets the shell for the specified user
+# it's a wrap around egetent as the position of the home directory in the line
+# varies depending on the os used.
+#
+# To use that, inherit eutils, not portability!
+egetshell() {
+	ent=$(egetent passwd "$1")
+
+	case ${CHOST} in
+	*-darwin*|*-freebsd*|*-dragonfly*)
+		# Darwin, OSX, FreeBSD and DragonFly use position 9 to store homedir
+		echo ${ent} | cut -d: -f10
+		;;
+	*)
+		# Linux, NetBSD and OpenBSD use position 6 instead
+		echo ${ent} cut -d: -f7
+		;;
+	esac
+}
+
+# Returns true if specified user has a shell that precludes logins
+# on whichever operating system.
+is-login-disabled() {
+	shell=$(egetshell "$1")
+
+	case ${shell} in
+		/bin/false|/usr/bin/false|/sbin/nologin|/usr/sbin/nologin)
+			return 0 ;;
+		*)
+			return 1 ;;
+	esac
+}