Move PORTAGE_INST_UID and PORTAGE_INST_GID from ebuild.sh to make.globals so they...

svn path=/main/trunk/; revision=2846

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c4bc9bff5fcb24de6521eb6d714b3c7c5d542e46..be68b84ac3f4d99f3ff854216f93ebe8165c894b 100755 (executable)
--- 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 0eb5077cf35690a1b8b059428ccd49beb668764e..2586ca2fa16f03d34521ad8f35276a49d51c4c60 100644 (file)
--- 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  **
 # ***************************************************