From ba7fd15c1f3e8c0bb3c137186097b7f41f096e3d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 11 Mar 2006 07:14:24 +0000
Subject: Move PORTAGE_INST_UID and PORTAGE_INST_GID from ebuild.sh to
 make.globals so they can be overridden.

svn path=/main/trunk/; revision=2846
---
 bin/ebuild.sh    | 4 ----
 cnf/make.globals | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c4bc9bff5..be68b84ac 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1019,10 +1019,6 @@ dyn_test() {
 	trap SIGINT SIGQUIT
 }
 
-
-PORTAGE_INST_UID="0"
-PORTAGE_INST_GID="0"
-
 dyn_install() {
 	[ -z "$PORTAGE_BUILDDIR" ] && die "${FUNCNAME}: PORTAGE_BUILDDIR is unset"
 	trap "abort_install" SIGINT SIGQUIT
diff --git a/cnf/make.globals b/cnf/make.globals
index 0eb5077cf..2586ca2fa 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -60,6 +60,10 @@ CONFIG_PROTECT="/etc"
 # Disable auto-use
 USE_ORDER="env:pkg:conf:defaults"
 
+# Default ownership of installed files.
+PORTAGE_INST_UID="0"
+PORTAGE_INST_GID="0"
+
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **
 # ***************************************************
-- 
cgit v1.2.3-1-g7c22