Default FEATURES=preserve-libs for portage-2.1.12

diff --git a/NEWS b/NEWS
index bd76bd8ca385812650b3cadb2559916f9318bd24..f57c6c2c6475753b6d08345e990e31cd69baa22b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ News (mainly features/major bug fixes)
 
 portage-2.2
 -------------
-* FEATURES=preserve-libs is enabled by default.
+
 * Add extended set configuration via /etc/portage/sets.conf. See
   /usr/share/portage/config/sets/portage.conf for examples.
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4b516dc7dcd6d23a3755c23f423ca7b2ac804fa2..2b8c6749dbd4aad716ca6ca1e4cd25bafcd391b4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,11 +4,15 @@ Features/major bugfixes are listed in NEWS
 portage-2.2
 ==================================
 
-* FEATURES=preserve-libs is enabled by default.
 * Portage now warns if an ebuild repository does not have a name, as several
   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
+==================================
+
+* FEATURES=preserve-libs is enabled by default.
+
 portage-2.1.11
 ==================================
 * User-defined package sets can now be created by placing files in the

diff --git a/cnf/make.globals b/cnf/make.globals
index 6dd350992e9bfe6ad99e3773baa72fc27a532987..5f5098b0657f28582c497db9eb76767308c8d702 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -54,7 +54,7 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho
 # Default user options
 FEATURES="assume-digests binpkg-logs
           config-protect-if-modified distlocks ebuild-locks
-          fixlafiles merge-sync news parallel-fetch protect-owned
+          fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
           unmerge-orphans userfetch"