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 2892d50896e8ccbd089b15c77a63d9dcecaa19bc..0be9732ac33cb4ac2f4c6d1a6e2a9467674b25be 100644 (file)
--- 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 4a19bdb269c45588f59e9c3074f6da097d375273..32fb72468a8d5069aae8145a8c21e2538d971668 100644 (file)
--- 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 <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 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 d83258c943a0a70688dcb7dd8b799487000ce9f9..e86dc74465ed62642be4f2bcef9a860aab56dd02 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -397,10 +397,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