Remove extended package set configuration docs.v2.1.10.4

Extended package sets configuration is disabled in the stable branch.

4 files changed, 9 insertions, 25 deletions

diff --git a/doc/config.docbook b/doc/config.docbook
index 88009dfc6..c5326b363 100644
--- a/doc/config.docbook
+++ b/doc/config.docbook
@@ -1,5 +1,5 @@
 <part id='config'>
 <title>Configuration</title>
 &config_bashrc;
-&config_set;
+<!--&config_set;-->
 </part>
diff --git a/man/emerge.1 b/man/emerge.1
index 09902daec..c05b6361a 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -62,14 +62,11 @@ would like to query the owners of one or more files or directories.
 A \fIset\fR is a convenient shorthand for a large group of
 packages. Three sets are currently always available: \fBselected\fR,
 \fBsystem\fR and \fBworld\fR. \fBselected\fR contains the user-selected
-"world" packages that are listed in \fB/var/lib/portage/world\fR,
-and nested sets that may be listed
-in \fB/var/lib/portage/world_sets\fR. \fBsystem\fR refers to a set of
+"world" packages that are listed in \fB/var/lib/portage/world\fR.
+\fBsystem\fR refers to a set of
 packages deemed necessary for your system to run properly. \fBworld\fR
 encompasses both the \fBselected\fR and \fBsystem\fR sets. [See
-\fBFILES\fR below for more information.] Other sets can exist depending
-on the current configuration. The default set configuration is located
-in the \fB/usr/share/portage/config/sets\fR directory. Note that a \fIset\fR
+\fBFILES\fR below for more information.] Note that a \fIset\fR
 is generally used in conjunction with \fB\-\-update\fR. When used as 
 arguments to \fBemerge\fR sets have to be prefixed with \fB@\fR to be
 recognized. Use the \fB\-\-list\-sets\fR action to display a list of
@@ -949,9 +946,6 @@ Zac Medico <zmedico@gentoo.org>
 Here is a common list of files you will probably be interested in.  For a 
 complete listing, please refer to the \fBportage\fR(5) man page.
 .TP
-.B /usr/share/portage/config/sets/
-Contains the default set configuration.
-.TP
 .B /var/lib/portage/world
 Contains a list of all user\-specified packages.  You can safely edit
 this file, adding packages that you want to be considered in \fBworld\fR
diff --git a/man/portage.5 b/man/portage.5
index b2b0eb12c..c062b0cc2 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -111,7 +111,6 @@ database to track installed packages
 .nf
 config
 world
-world_sets
 .fi
 .SH "GLOSSARY"
 In the following sections, some terminology may be foreign to you or used 
@@ -1041,15 +1040,6 @@ games\-misc/fortune\-mod\-gentoo\-dev
 dev\-libs/uclibc
 app\-cdr/cdemu
 .fi
-.TP
-.BR world_sets
-This is like the world file but instead of package atoms it contains
-packages sets which always begin with the @ character.
-
-.I Example:
-.nf
-@kde
-.fi
 .RE
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
diff --git a/pym/portage/tests/resolver/test_multirepo.py b/pym/portage/tests/resolver/test_multirepo.py
index 34c6d45a0..558487956 100644
--- a/pym/portage/tests/resolver/test_multirepo.py
+++ b/pym/portage/tests/resolver/test_multirepo.py
@@ -71,11 +71,11 @@ class MultirepoTestCase(TestCase):
 				success = True,
 				check_repo_names = True,
 				mergelist = ["dev-libs/A-1::repo1"]),
-			ResolverPlaygroundTestCase(
-				["@multirepotest"],
-				success = True,
-				check_repo_names = True,
-				mergelist = ["dev-libs/A-1"]),
+			#ResolverPlaygroundTestCase(
+			#	["@multirepotest"],
+			#	success = True,
+			#	check_repo_names = True,
+			#	mergelist = ["dev-libs/A-1"]),
 
 			#Packages in exactly one repo
 			ResolverPlaygroundTestCase(