Sync with 2.1.6 branch.

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

diff --git a/NEWS b/NEWS
index da41fdae728dbf5a61edca217e4239bc2d517878..091bfc2658b11a18643598226255dedb2e167264 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,15 @@ News (mainly features/major bug fixes)
 portage-2.2
 -------------
 
+* Add link level dependency awareness to emerge --depclean and --prune actions
+  in order to protect against uninstallation of required libraries.
+  packages in the same way, and also drops any masked packages.
+* Add license visibility filtering (GLEP 23)
+* Add support for generic package sets (also see RELEASE-NOTES)
+
+portage-2.1.6
+-------------
+
 * Add support for a new EAPI="2" value. For more information about new EAPI
   features, refer to the "Ebuild" chapter of the html documentation that is
   installed with portage.
@@ -25,11 +34,7 @@ portage-2.2
   as a decent substitute for module-rebuild.
 * Namespace sanitizing: move all portage related code into portage.* namespace,
   rename portage_foo modules to portage.foo (but keep symlinks for compability)
-* Add license visibility filtering (GLEP 23)
-* Experimental support for preserving old library files on package upgrades
-  based on FEATURES=preserve-libs
 * Add support for news items (GLEP 42)
-* Add support for generic package sets (also see RELEASE-NOTES)
 
 portage-2.1.5
 -------------

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a7ff16ad87de92ab360f60e31d3067943b376ce4..c58d0808f38b07f222319be750df815b3398b9b9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,16 +4,6 @@ Features/major bugfixes are listed in NEWS
 portage-2.2
 ==================================
 
-* The python namespace for portage has been sanitized, all portage related code
-  is now contained within the portage namespace. External script should be updated
-  accordingly, though links exist for backward compability.
-* -* support in package.keywords was changed as it was inconsistent with 
-  ACCEPT_KEYWORDS behavior (also see http://dev.gentoo.org/~genone/docs/KEYWORDS.stupid).
-  Previously having -* in package.keywords matched packages with KEYWORDS="-*", 
-  now it resets the ACCEPT_KEYWORDS list for the given atom like it does when
-  used in ACCEPT_KEYWORDS.
-  For packages that don't specify any other KEYWORDS you can use the new ** token
-  as documented in portage(5) to disable KEYWORDS filtering completely.
 * 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.
@@ -30,6 +20,20 @@ portage-2.2
 * "world" does no longer include "system" unconditionally, but you can add
   "@system" to the world_sets file to restore the old state.
 
+portage-2.1.6
+==================================
+
+* The python namespace for portage has been sanitized, all portage related code
+  is now contained within the portage namespace. External script should be updated
+  accordingly, though links exist for backward compability.
+* -* support in package.keywords was changed as it was inconsistent with 
+  ACCEPT_KEYWORDS behavior (also see http://dev.gentoo.org/~genone/docs/KEYWORDS.stupid).
+  Previously having -* in package.keywords matched packages with KEYWORDS="-*", 
+  now it resets the ACCEPT_KEYWORDS list for the given atom like it does when
+  used in ACCEPT_KEYWORDS.
+  For packages that don't specify any other KEYWORDS you can use the new ** token
+  as documented in portage(5) to disable KEYWORDS filtering completely.
+
 portage-2.1.5
 ==================================
 

diff --git a/man/make.conf.5 b/man/make.conf.5
index 530ef6aeffff45fefb8620e4cd5cab411194dd84..576278996b449f39a7064513ef2aa4ff57d8c581 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -426,9 +426,9 @@ This is the host from which portage will grab prebuilt\-binary packages.
 The list is a single entry specifying the full address of the directory 
 serving the tbz2's for your system.  This is only used when running with 
 the get binary pkg options are given to \fBemerge\fR.  Review \fBemerge\fR(1) 
-for more information.  For versions of portage less that 2.2, this variable
+for more information.  For versions of portage less that 2.1.6, this variable
 should point to the 'All' directory on the host that creates the binary
-packages and not to the root of the \fBPKGDIR\fR.  Starting with portage 2.2,
+packages and not to the root of the \fBPKGDIR\fR.  Starting with portage 2.1.6,
 it should point to a directory containing a 'Packages' index file.  If
 ${PORTAGE_BINHOST}/Packages does not exist then portage will attempt to use
 the older protocol.