diff options
| -rw-r--r-- | man/emerge.1 | 4 | ||||
| -rw-r--r-- | man/portage.5 | 10 | ||||
| -rw-r--r-- | pym/_emerge/__init__.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 6 |
4 files changed, 6 insertions, 16 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 4b8363eeb..6209832e7 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -105,7 +105,7 @@ setups that the user may wish to run. .BR \-\-depclean Cleans the system by removing packages that are not associated with explicitly merged packages. Depclean works by creating the -full dependency tree from the @system and @world sets, +full dependency tree from the system and world sets, then comparing it to installed packages. Packages installed, but not part of the dependency tree, will be uninstalled by depclean. See \fB\-\-with\-bdeps\fR for behavior with respect to build time dependencies @@ -114,7 +114,7 @@ always be kept. They can be manually added to this set with \fIemerge \-\-noreplace <atom>\fR. As a safety measure, depclean will not remove any packages unless *all* required dependencies have been resolved. As a consequence, it is often necessary to run \fIemerge \-\-update \-\-newuse -\-\-deep @system @world\fR prior to depclean. +\-\-deep world\fR prior to depclean. \fBWARNING:\fR Inexperienced users are advised to use \fB\-\-pretend\fR with this diff --git a/man/portage.5 b/man/portage.5 index 986d6a626..016eaabe6 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -737,16 +737,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 -@system -.fi -.RE .SH "REPORTING BUGS" Please report bugs via http://bugs.gentoo.org/ .SH "AUTHORS" diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 00f963a93..75b9bbe75 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -12036,7 +12036,7 @@ def action_depclean(settings, trees, ldpath_mtimes, msg.append("unless *all* required dependencies have been resolved. As a\n") msg.append("consequence, it is often necessary to run %s\n" % \ good("`emerge --update")) - msg.append(good("--newuse --deep @system @world`") + \ + msg.append(good("--newuse --deep world`") + \ " prior to depclean.\n") if action == "depclean" and "--quiet" not in myopts and not myfiles: diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 05a9803c9..1dd17df68 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -69,8 +69,8 @@ def help(myaction,myopts,havecolor=1): paragraph = "Cleans the system by removing packages that are " + \ "not associated with explicitly merged packages. Depclean works " + \ - "by creating the full dependency tree from the @system and " + \ - "@world sets, then comparing it to installed packages. Packages " + \ + "by creating the full dependency tree from the system and " + \ + "world sets, then comparing it to installed packages. Packages " + \ "installed, but not part of the dependency tree, will be " + \ "uninstalled by depclean. See --with-bdeps for behavior with " + \ "respect to build time dependencies that are not strictly " + \ @@ -79,7 +79,7 @@ def help(myaction,myopts,havecolor=1): "emerge --noreplace <atom>. As a safety measure, depclean " + \ "will not remove any packages unless *all* required dependencies " + \ "have been resolved. As a consequence, it is often necessary to " + \ - "run emerge --update --newuse --deep @system @world " + \ + "run emerge --update --newuse --deep world " + \ "prior to depclean." for line in wrap(paragraph, desc_width): |