From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Dec 2007 20:14:05 +0000 (-0000)
Subject: As suggested by grobian, treat Darwin just like USERLAND=gnu
X-Git-Tag: v2.2_pre1~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ae7f766207f539d04b5293daab8e1a251831eb3;p=portage.git

As suggested by grobian, treat Darwin just like USERLAND=gnu
since they seem to be switching commands to gnu anyway.

svn path=/main/trunk/; revision=9118
---

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 4edf2bc36..858d07c50 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -50,8 +50,7 @@ get_date_part() {
 	local utc_time_in_secs="$1"
 	local part="$2"
 
-	if	[[ ${USERLAND} == BSD ]] || \
-		[[ ${USERLAND} == Darwin ]] ; then
+	if	[[ ${USERLAND} == BSD ]] || ; then
 		date -r ${utc_time_in_secs} -u +"${part}"
 	else
 		date -d @${utc_time_in_secs} -u +"${part}"
diff --git a/bin/etc-update b/bin/etc-update
index c597a50be..ff1378f63 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -401,8 +401,7 @@ Please select from the menu above (-1 to exit, losing this merge): "
 			my_input=$(read_int)
 			case ${my_input} in
 				1) echo "Replacing ${ofile} with ${mfile}"
-				   if  [[ ${USERLAND} == BSD ]] || \
-				       [[ ${USERLAND} == Darwin ]] ; then
+				   if  [[ ${USERLAND} == BSD ]] ; then
 				       chown "$(stat -f %Su:%Sg "${ofile}")" "${mfile}"
 				       chmod $(stat -f %Mp%Lp "${ofile}") "${mfile}"
 				   else
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6be994db0..d7218b92f 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -380,9 +380,6 @@ if [[ -z ${USERLAND} ]] ; then
 	*BSD|DragonFly)
 		export USERLAND="BSD"
 		;;
-	Darwin)
-		export USERLAND="Darwin"
-		;;
 	*)
 		export USERLAND="GNU"
 		;;
@@ -391,7 +388,7 @@ fi
 
 if [[ -z ${XARGS} ]] ; then
 	case ${USERLAND} in
-	BSD|Darwin)
+	BSD)
 		export XARGS="xargs"
 		;;
 	*)
diff --git a/pym/portage/data.py b/pym/portage/data.py
index 26bff27e6..5fc811e43 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -13,15 +13,13 @@ ostype=os.uname()[0]
 userland = None
 if ostype == "DragonFly" or ostype.endswith("BSD"):
 	userland = "BSD"
-elif ostype == "Darwin":
-	userland = "Darwin"
 else:
 	userland = "GNU"
 
 lchown = getattr(os, "lchown", None)
 
 if not lchown:
-	if userland == "Darwin":
+	if ostype == "Darwin":
 		def lchown(*pos_args, **key_args):
 			pass
 	else: