summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-03 05:15:50 -0700
committerZac Medico <zmedico@gentoo.org>2012-05-14 16:57:26 -0700
commita76ff9bbbb9f7e4c4b4c6e6f07c84907ee48e773 (patch)
tree558b01072994fa9cb69c14e6d565544add7b2cc6
parentc545448bc8993ed27584e636d26b09dae5df9f75 (diff)
downloadportage-a76ff9bbbb9f7e4c4b4c6e6f07c84907ee48e773.tar.gz
portage-a76ff9bbbb9f7e4c4b4c6e6f07c84907ee48e773.tar.bz2
portage-a76ff9bbbb9f7e4c4b4c6e6f07c84907ee48e773.zip
Remove FEATURES=preserve-libs config/docs.
Support for FEATURES=preserve-libs is disabled in the stable branch.
-rw-r--r--cnf/make.globals2
-rw-r--r--man/emerge.120
-rw-r--r--man/make.conf.54
3 files changed, 6 insertions, 20 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index 1717baf68..249e4a640 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -66,7 +66,7 @@ COLLISION_IGNORE="/lib/modules/* *.py[co]"
# 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 7b59040cb..00e0e6c9a 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -124,11 +124,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
@@ -136,7 +132,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
@@ -413,15 +412,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 9897073c6..ed5be2ed4 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -424,10 +424,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