Bug #248599 - Remove remaining references to packages sets and preserve-libs.

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

5 files changed, 9 insertions, 30 deletions

diff --git a/man/emerge.1 b/man/emerge.1
index 35627dc2b..cef0a721f 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -4,7 +4,7 @@ emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
 .TP
 .BR emerge
-[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR | \fI@set\fR | \fIatom\fR] ...
+[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR | \fIset\fR | \fIatom\fR] ...
 .TP
 .BR emerge
 \fB\-\-sync\fR | \fB\-\-version\fR
@@ -58,17 +58,14 @@ would like to query the owners of one or more files or directories.
 .TP
 .BR set
 A \fIset\fR is a convenient shorthand for a large group of
-packages.  Two sets are currently always available: \fBsystem\fR
+packages. Two sets are currently available: \fBsystem\fR
 and \fBworld\fR.  \fBsystem\fR refers to a set of packages
 deemed necessary for your system to run properly. \fBworld\fR
 contains all the packages listed in \fB/var/lib/portage/world\fR.  [See
-\fBFILES\fR below for more information.] Other sets can exist depending
-on the current configuration. The default set configuration is located
-in \fB/usr/share/portage/config/sets.conf\fR. 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
-available package sets.
+\fBFILES\fR below for more information.] Currently, the world set
+also includes members of the system set, but later versions of portage
+will have a way to disable this behavior. Note that a \fIset\fR
+is generally used in conjunction with \fB\-\-update\fR. 
 .TP
 .BR atom
 An \fIatom\fR describes bounds on a package that you wish to install.  
@@ -677,9 +674,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.conf
-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/make.conf.5 b/man/make.conf.5
index a3acaf563..be11b5963 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -266,10 +266,6 @@ Fetch in the background while compiling. Run
 `tail \-f /var/log/emerge\-fetch.log` in a
 terminal to view parallel-fetch progress.
 .TP
-.B preserve\-libs
-Preserve libraries when the sonames change during upgrade or downgrade.
-Libraries are preserved only if consumers of those libraries are detected.
-.TP
 .B protect\-owned
 This is identical to the \fIcollision\-protect\fR feature except that files
 may be overwritten if they are not explicitly listed in the contents of a
diff --git a/man/portage.5 b/man/portage.5
index d329d15de..fe8441176 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -81,7 +81,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 
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 9e0867197..f7c5ad032 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -199,7 +199,7 @@ def userquery(prompt, responses=None, colours=None):
 
 actions = frozenset([
 "clean", "config", "depclean",
-"info", "list-sets", "metadata",
+"info", "metadata",
 "prune", "regen",  "search",
 "sync",  "unmerge",
 ])
@@ -13609,10 +13609,6 @@ def emerge_main():
 			break
 
 	root_config = trees[settings["ROOT"]]["root_config"]
-	if myaction == "list-sets":
-		sys.stdout.write("".join("%s\n" % s for s in sorted(root_config.sets)))
-		sys.stdout.flush()
-		return os.EX_OK
 
 	# only expand sets for actions taking package arguments
 	oldargs = myfiles[:]
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 1dd17df68..42783e0c0 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -9,7 +9,7 @@ from portage.output import bold, turquoise, green
 def shorthelp():
 	print bold("emerge:")+" the other white meat (command-line interface to the Portage system)"
 	print bold("Usage:")
-	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] [ "+turquoise("ebuild")+" | "+turquoise("tbz2")+" | "+turquoise("file")+" | "+turquoise("@set")+" | "+turquoise("atom")+" ] [ ... ]"
+	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] [ "+turquoise("ebuild")+" | "+turquoise("tbz2")+" | "+turquoise("file")+" | "+turquoise("set")+" | "+turquoise("atom")+" ] [ ... ]"
 	print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
 	print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
 	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
@@ -20,7 +20,7 @@ def shorthelp():
 	print "          [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + "            ]"
 	print "          [ "+green("--newuse")+"    ] [ "+green("--noconfmem")+"  ] [ "+green("--nospinner")+"  ] [ "+green("--oneshot")+"     ]"
 	print "          [ "+green("--reinstall ")+turquoise("changed-use")+"      ] [ " + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" >         ]"
-	print bold("Actions:")+"  [ "+green("--depclean")+" | "+green("--list-sets")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+"        ]"
+	print bold("Actions:")+"  [ "+green("--depclean")+" | "+green("--search")+" | "+green("--sync")+" | "+green("--version")+"        ]"
 
 def help(myaction,myopts,havecolor=1):
 	# TODO: Implement a wrap() that accounts for console color escape codes.
@@ -112,12 +112,6 @@ def help(myaction,myopts,havecolor=1):
 		print "              make.{conf,globals,defaults} and the environment show up if"
 		print "              run with the '--verbose' flag."
 		print
-		print "       " + green("--list-sets")
-		paragraph = "Displays a list of available package sets."
-
-		for line in wrap(paragraph, desc_width):
-			print desc_indent + line
-		print
 		print "       "+green("--metadata")
 		print "              Transfers metadata cache from ${PORTDIR}/metadata/cache/ to"
 		print "              /var/cache/edb/dep/ as is normally done on the tail end of an"