From 476f06d82b3a199f651b89b83779c723a6980c2b Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 16 Oct 2009 22:47:55 +0000
Subject: Bug #266454 - Make @world an all-inclusive set once again, like it
 was prior to portage-2.2_rc* releases. In addition to @system, @world now
 includes a @selected set which represents user-selected "world" packages and
 sets that saved in /var/lib/portage/world{,sets}.

svn path=/main/trunk/; revision=14614
---
 doc/config/sets.docbook | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'doc/config/sets.docbook')

diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook
index e50c85cc9..8f93b1df2 100644
--- a/doc/config/sets.docbook
+++ b/doc/config/sets.docbook
@@ -74,9 +74,15 @@
 			<programlisting>
 			# The classic world set
 			[world]
-			class = portage.sets.files.WorldSet
+			class = portage.sets.base.DummyPackageSet
 			world-candidate = False
-			
+			packages = @selected @system
+
+			# The selected set
+			[selected]
+			class = portage.sets.files.WorldSelectedSet
+			world-candidate = False
+
 			# The classic system set
 			[system]
 			class = portage.sets.profiles.PackagesSystemSet
@@ -250,8 +256,8 @@
 			</sect3>
 		</sect2>
 		
-		<sect2 id='config-set-classes-WorldSet'>
-		<title>portage.sets.files.WorldSet</title>
+		<sect2 id='config-set-classes-WorldSelectedSet'>
+		<title>portage.sets.files.WorldSelectedSet</title>
 		<para>
 		A minor variation of <classname>StaticFileSet</classname>, mainly for implementation 
 		reasons. It should never be used in user configurations as it's already configured
@@ -580,8 +586,9 @@
 	The default sets are:
 	</para>
 	<itemizedlist>
+	<listitem><para><varname>world</varname>: uses <classname>DummySet</classname></para></listitem>
+	<listitem><para><varname>selected</varname>: uses <classname>WorldSelectedSet</classname></para></listitem>
 	<listitem><para><varname>system</varname>: uses <classname>PackagesSystemSet</classname></para></listitem>
-	<listitem><para><varname>world</varname>: uses <classname>WorldSet</classname></para></listitem>
 	<listitem><para><varname>security</varname>: uses <classname>NewAffectedSet</classname> with default options</para></listitem>
 	<listitem><para><varname>installed</varname>: uses <classname>EverythingSet</classname></para></listitem>
 	<listitem><para><varname>preserved-rebuild</varname>: uses <classname>PreservedLibraryConsumerSet</classname></para></listitem>
-- 
cgit v1.2.3-1-g7c22