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 4edf2bc369200dc7667e4b57636678378db18549..858d07c50432baf544cbda9610628b34db7a38ec 100755 (executable)
--- 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 c597a50bef24f1cc51b886a9ec4c67316ad2b2bc..ff1378f6307845a3da9729802735a9d1e8afb99a 100755 (executable)
--- 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 6be994db0ac512c95c9249169341a0a1885f761f..d7218b92fd6d80026e1577dcee14ba40c904336b 100755 (executable)
--- 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 26bff27e61909c38c966a0d5b992e5493bc1bdb9..5fc811e43d356d7f4122de21be3212d4bb5cebeb 100644 (file)
--- 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: