* Rename @live-ebuilds to @live-rebuild, for consistency with the other

  *-rebuild sets.
* Document the new sets.

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

diff --git a/cnf/sets.conf b/cnf/sets.conf
index ea2f3d5c3119cddba35b37ea1fa2b794a7d9bf96..eda003f438f2a6a6111007ffb7b1e0e790cee155 100644 (file)
--- a/cnf/sets.conf
+++ b/cnf/sets.conf
@@ -43,7 +43,7 @@ class = portage.sets.libs.PreservedLibraryConsumerSet
 world-candidate = False
 
 # Installed ebuilds that inherit from known live eclasses.
-[live-ebuilds]
+[live-rebuild]
 class = portage.sets.dbapi.InheritSet
 world-candidate = False
 inherits = cvs darcs git mercurial subversion

diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook
index b284f5e2ac795d1fe60de470479c3a5d8ce2502c..45c7db653b4aaee9a456f665fe2065158290969f 100644 (file)
--- a/doc/config/sets.docbook
+++ b/doc/config/sets.docbook
@@ -453,6 +453,28 @@
                        </para>
                        </sect3>
                </sect2>
+               <sect2 id='config-set-classes-InheritSet'>
+               <title>portage.sets.dbapi.InheritSet</title>
+               <para>
+               This class supports the following options:
+               <itemizedlist>
+               <listitem><varname>inherits</varname>: Required. A list of eclass names
+               which should be used to create the package set.
+               </listitem>
+               </itemizedlist>
+               </para>
+               </sect2>
+               <sect2 id='config-set-classes-OwnerSet'>
+               <title>portage.sets.dbapi.OwnerSet</title>
+               <para>
+               This class supports the following options:
+               <itemizedlist>
+               <listitem><varname>files</varname>: Required. A list of file paths
+               that should be used to create the package set.
+               </listitem>
+               </itemizedlist>
+               </para>
+               </sect2>
                <sect2 id='config-set-classes-PreservedLibraryConsumerSet'>
                <title>portage.sets.libs.PreservedLibraryConsumerSet</title>
                <para>
@@ -490,6 +512,8 @@
        <listitem><varname>security</varname>: uses <classname>NewAffectedSet</classname> with default options</listitem>
        <listitem><varname>everything</varname>: uses <classname>EverythingSet</classname></listitem>
        <listitem><varname>preserved-rebuild</varname>: uses <classname>PreservedLibraryConsumerSet</classname></listitem>
+       <listitem><varname>live-rebuild</varname>: uses <classname>InheritSet</classname></listitem>
+       <listitem><varname>module-rebuild</varname>: uses <classname>OwnerSet</classname></listitem>
        </itemizedlist>
        Additionally the default configuration includes a multi set section based on
        the <classname>StaticFileSet</classname> defaults that creates a set for each