From c82dbc27b24510ab3493fcf88174d092d3284cac Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 3 Jun 2011 05:15:50 -0700 Subject: [PATCH] Remove FEATURES=preserve-libs config/docs. Support for FEATURES=preserve-libs is disabled in the stable branch. --- cnf/make.globals | 2 +- man/emerge.1 | 20 +++++--------------- man/make.conf.5 | 4 ---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/cnf/make.globals b/cnf/make.globals index fcd0b41da..df40d6e02 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -63,7 +63,7 @@ COLLISION_IGNORE="/lib/modules" # Enable preserve-libs for testing with portage versions that support it. # This setting is commented out for portage versions that don't support it. -FEATURES="${FEATURES} preserve-libs" +#FEATURES="${FEATURES} preserve-libs" # Default chunksize for binhost comms PORTAGE_BINHOST_CHUNKSIZE="3000" diff --git a/man/emerge.1 b/man/emerge.1 index f7ad3ed5a..9a0f33994 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -120,11 +120,7 @@ always be kept. They can be manually added to this set with \fIemerge \-\-noreplace \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 @world\fR prior to depclean. Also note that -depclean may break link level dependencies, especially when the -\fB\-\-depclean\-lib\-check\fR option is disabled. Thus, it is -recommended to use a tool such as \fBrevdep-rebuild\fR(1) -in order to detect such breakage. +\-\-deep @world\fR prior to depclean. \fBWARNING:\fR Inexperienced users are advised to use \fB\-\-pretend\fR with this @@ -132,7 +128,10 @@ option in order to see a preview of which packages will be uninstalled. Always study the list of packages to be cleaned for any obvious mistakes. Note that packages listed in package.provided (see \fBportage\fR(5)) may be removed by -depclean, even if they are part of the world set. +depclean, even if they are part of the world set. Also note that +depclean may break link level dependencies. Thus, it is +recommended to use a tool such as \fBrevdep-rebuild\fR(1) +in order to detect such breakage. Depclean serves as a dependency aware version of \fB\-\-unmerge\fR. When given one or more atoms, it will @@ -379,15 +378,6 @@ listed in the dependencies of a package. Also see \fB\-\-with\-bdeps\fR for behavior with respect to build time dependencies that are not strictly required. .TP -.BR "\-\-depclean\-lib\-check [ y | n ]" -Account for library link-level dependencies during -\fB\-\-depclean\fR and \fB\-\-prune\fR actions. This -option is enabled by default. In some cases this can -be somewhat time\-consuming. This option is ignored -when FEATURES="preserve\-libs" is enabled in -\fBmake.conf\fR(5), since any libraries that have -consumers will simply be preserved. -.TP .BR "\-\-emptytree " (\fB\-e\fR) Reinstalls target atoms and their entire deep dependency tree, as though no packages are currently diff --git a/man/make.conf.5 b/man/make.conf.5 index 3f3efae8b..6ad0237c8 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -409,10 +409,6 @@ useful only if \fBprelink\fR(8) is installed and accurate checksums (despite prelinking) are needed for some reason such as for checking the integrity of installed files or because the \fIunmerge\-orphans\fR feature is disabled. .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 -- 2.26.2