[gentoo-commits] proj/portage:master commit in: /, cnf/

["Zac Medico" <zmedico@gentoo.org>]

commit:     769b5e5c70eb188b133e294cc47973a6c443fb1b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 02:21:41 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 02:21:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=769b5e5c

make.globals: userpriv + usersandbox, bug #477664

---
 RELEASE-NOTES    | 5 +++++
 cnf/make.globals | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9c616f1..b2781b1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -8,6 +8,11 @@ portage-2.2
   new features in 2.2 make use of or require named repositories. The repository
   name is stored in profiles/repo_name in each repository.
 
+portage-2.1.12.14
+==================================
+
+* FEATURES=userpriv and usersandbox are enabled by default.
+
 portage-2.1.12
 ==================================
 

diff --git a/cnf/make.globals b/cnf/make.globals
index 4b524a1..d690864 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -57,7 +57,7 @@ FEATURES="assume-digests binpkg-logs
           config-protect-if-modified distlocks ebuild-locks
           fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
-          unmerge-orphans userfetch"
+          unmerge-orphans userfetch userpriv usersandbox"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for