From: Kito <kito@gentoo.org>
Date: Sun, 5 Feb 2006 04:33:02 +0000 (-0000)
Subject: Change to @rootuser@/@wheelgroup@.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3b3ce24d18b977f7495511ab1d15e889ffc753ba;p=portage.git

Change to @rootuser@/@wheelgroup@.

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

diff --git a/bin/dobin b/bin/dobin
index 79075946a..71374d781 100755
--- 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 14ff27f15..b294114b5 100755
--- 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 dd57e2b06..25286a6c9 100755
--- 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