Change to @rootuser@/@wheelgroup@.

svn path=/main/branches/prefix/; revision=2664

diff --git a/bin/dobin b/bin/dobin
index 79075946aeabaf207301821f547a18b534a70cd1..71374d78182e693c8aed12eb905dfedd3f9134b6 100755 (executable)
--- a/bin/dobin
+++ b/bin/dobin
@@ -12,16 +12,11 @@ if [[ ! -d ${D}${DESTTREE}/bin ]] ; then
        install -d "${D}${DESTTREE}/bin" || exit 2
 fi
 
-case ${CHOST} in
-       *-freebsd*) group=wheel ;;
-       *)          group=root ;;
-esac
-
 ret=0
 
 for x in "$@" ; do
        if [[ -e ${x} ]] ; then
-               install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/bin"
+               install -m0755 -o @rootuser@ -g @wheelgroup@ "${x}" "${D}${DESTTREE}/bin"
        else
                echo "!!! ${0##*/}: ${x} does not exist" 1>&2
                false

diff --git a/bin/dosbin b/bin/dosbin
index 14ff27f158a8dae7cecf218ad0cd04a370944e96..b294114b5898c9a38f58111d193e2730fa228e93 100755 (executable)
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -12,16 +12,11 @@ if [[ ! -d ${D}${DESTTREE}/sbin ]] ; then
        install -d "${D}${DESTTREE}/sbin" || exit 2
 fi
 
-case ${CHOST} in
-       *-freebsd*) group=wheel ;;
-       *)          group=root ;;
-esac
-
 ret=0
 
 for x in "$@" ; do
        if [[ -e ${x} ]] ; then
-               install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/sbin"
+               install -m0755 -o @rootuser@ -g @wheelgroup@ "${x}" "${D}${DESTTREE}/sbin"
        else
                echo "!!! ${0##*/}: ${x} does not exist" 1>&2
                false

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index dd57e2b065145db3d341e1d4a964e3f0755aab64..25286a6c940329273a1e8af175b0013cebd78b34 100755 (executable)
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -51,7 +51,7 @@ fi
 sync_local() {
        echo Syncing local tree...
        if type -p tarsync &> /dev/null; then
-               if ! tarsync "${FILE}" "${PORTDIR}" -v -s 1 -o @portageuser@ -g @portagegroup@ -e /distfiles -e /packages -e /local; then
+               if ! tarsync "${FILE}" "${PORTDIR}" -v -s 1 -o @rootuser@ -g @wheelgroup@ -e /distfiles -e /packages -e /local; then
                        echo "tarsync failed; tarball is corrupt?"
                        exit 1;
                fi