Remove FEATURES=preserve-libs config/docs.

Support for FEATURES=preserve-libs is disabled in the stable branch.

diff --git a/cnf/make.globals b/cnf/make.globals
index dad28118c2a4f5265bdd804d42fe693a312ee2cf..08c8c1d8ed0dfe46506b60ce618753ac8157c4e6 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -68,7 +68,7 @@ UNINSTALL_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 a25c573bb70113cb6dde19d0d02dbed646fbdd46..0bc74ccf0c785f90b0d1b5e08b36dc7e9c64c1b1 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -126,11 +126,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 @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 or \fB\-\-ask\fR
@@ -138,7 +134,10 @@ with this 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
@@ -422,15 +421,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 "\-\-dynamic\-deps < y | n >"
 In dependency calculations, substitute the dependencies of installed
 packages with the dependencies of corresponding unbuilt ebuilds from

diff --git a/man/make.conf.5 b/man/make.conf.5
index e2a16a51dd657244aaafc8b1916efc463a4a695c..950355130107be33a51db0473a130fab35996cfd 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -433,10 +433,6 @@ feature isn't required either. Undoing prelinking while merging is
 only required when using tools like \fBquickpkg\fR(1) which can cause
 already prelinked files to be merged.
 .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