From dea25514cb0b3333d83c991343ff51a3f152eee2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 3 Jun 2011 05:15:50 -0700 Subject: 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 0f6f54165..a960a0c56 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 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 \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 e8777c840..999355396 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -422,10 +422,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 -- cgit v1.2.3-1-g7c22