Adjust news and notes for 2.2 features that are included in 2.1.6.

svn path=/main/branches/2.1.6/; revision=11883

diff --git a/NEWS b/NEWS
index 8284579db0ba52de2b26d7c4cbb230dab5fbbba9..414a55d61fd9b67b041ce8c0e0210a4df4a4133e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 News (mainly features/major bug fixes)
 
-portage-2.2
+portage-2.1.6
 -------------
 
 * Add support for a new EAPI="2" value. For more information about new EAPI
@@ -25,11 +25,9 @@ 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..0911a15903fb3b35f34d74cd4bcee0eb200612a9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,7 +1,7 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
-portage-2.2
+portage-2.1.6
 ==================================
 
 * The python namespace for portage has been sanitized, all portage related code
@@ -15,20 +15,8 @@ portage-2.2
   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
+  features in 2.1.6 make use of or require named repositories. The repository name
   is stored in profiles/repo_name in each repository.
-* Package set support: There are several important notes regarding package sets:
-  - setnames have to be prefixed with @ (exceptions: 'world' and 'system' can be 
-    used without the prefix)
-  - they may currently only include simple and versioned atoms or other sets, use
-    conditionals or any-of constructs aren't possible yet
-  - sets can be referenced either in other file-based sets or as argument to emerge, but
-    not in ebuilds, config files or other tools at this time.
-  - packages won't be unmerged if they are referenced by an installed package
-    set (with the exception of the world set, and installed being determined
-       by the world_sets file).
-* "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.5
 ==================================