From: Emanuele Giaquinta <exg@gentoo.org>
Date: Tue, 7 Mar 2006 14:26:26 +0000 (-0000)
Subject: Use rootuser/wheelgroup instead of the hardcoded PORTAGE_INST_{U,G}ID.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9f2ae55557c383dc3ba11f4b5b459b8b2c98a223;p=portage.git

Use rootuser/wheelgroup instead of the hardcoded PORTAGE_INST_{U,G}ID.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 5fe63a6c1..a3b252973 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1174,9 +1174,6 @@ dyn_test() {
 }
 
 
-PORTAGE_INST_UID="0"
-PORTAGE_INST_GID="0"
-
 dyn_install() {
 	trap "abort_install" SIGINT SIGQUIT
 	[ "$(type -t pre_src_install)" == "function" ] && pre_src_install
@@ -1355,14 +1352,14 @@ dyn_install() {
 	find "${D}/" -user  @portageuser@ | while read file; do
 		count=$(( $count + 1 ))
 		if [ -L "${file}" ]; then
-			lchown ${PORTAGE_INST_UID} "${file}"
+			lchown @rootuser@ "${file}"
 		else
 			s=$(stat_perms "$file")
 			if [ -z "${s}" ]; then
 				ewarn "failed stat_perm'ing $file.  User intervention during install isn't wise..."
 				continue
 			fi
-			chown ${PORTAGE_INST_UID} "$file"
+			chown @rootuser@ "$file"
 			chmod "$s" "$file"
 		fi
 	done
@@ -1374,14 +1371,14 @@ dyn_install() {
 	find "${D}/" -group @portagegroup@ | while read file; do
 		count=$(( $count + 1 ))
 		if [ -L "${file}" ]; then
-			lchgrp ${PORTAGE_INST_GID} "${file}"
+			lchgrp @wheelgroup@ "${file}"
 		else
 			s=$(stat_perms "$file")
 			if [ -z "${s}" ]; then
 				echo "failed stat_perm'ing '$file' . User intervention during install isn't wise..."
 				continue
 			fi
-			chgrp ${PORTAGE_INST_GID} "$file"
+			chgrp @wheelgroup@ "$file"
 			chmod "$s" "$file"
 		fi
 	done