From 7ab4d5722a828167dd1bf946b26cfa80808f59fc Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 11 Oct 2011 16:45:46 -0700
Subject: [PATCH] Remove FEATURES=fixpackages support.

This reduces the probability of users encountering issues related to
package moves when they disable --dynamic-deps, and --package-moves=n
can be set in EMERGE_DEFAULT_OPTS if package moves need to be
temporarily avoided for some reason.
---
 cnf/make.globals               |  2 +-
 man/emerge.1                   | 12 +++++-------
 man/make.conf.5                |  5 -----
 pym/portage/_global_updates.py |  3 +--
 pym/portage/const.py           |  2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index fcd0b41da..aef2695fc 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -51,7 +51,7 @@ RESUMECOMMAND_SSH=${FETCHCOMMAND_SSH}
 FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${host##*:} ; host=\\\${host%:*} ; [[ \\\${host} = \\\${port} ]] && port=22 ; exec sftp -P \\\${port} \\\"\\\${host}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" sftp \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 
 # Default user options
-FEATURES="assume-digests binpkg-logs distlocks ebuild-locks fixpackages
+FEATURES="assume-digests binpkg-logs distlocks ebuild-locks
           fixlafiles news parallel-fetch protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
           unmerge-orphans userfetch"
diff --git a/man/emerge.1 b/man/emerge.1
index 10be7895c..6088cdc0d 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -415,13 +415,11 @@ installed packages to vary dynamically when source ebuild dependencies
 are modified. This option is enabled by default.
 
 \fBWARNING:\fR
-If \-\-dynamic\-deps is disabled, then it is necessary to ensure that
-an alternative method is used to handle package moves in dependencies
-of installed packages. Normally, this is handled by
-FEATURES="fixpackages", which is enabled by default and may be
-disabled via \fBmake.conf\fR(5). Alternatively, in order to manually
-apply package moves, run `emaint \-\-fix moveinst` after each
-emerge \-\-sync operation (see \fBemaint\fR(1)).
+If you want to disable \-\-dynamic\-deps, then it may be necessary to
+first run \fBfixpackages\fR in order to get the best results. The
+\fBfixpackages\fR command performs two different operations that can
+also be performed separately by the `emaint \-\-fix moveinst` and
+`emaint \-\-fix movebin` commands (see \fBemaint\fR(1)).
 .TP
 .BR "\-\-emptytree " (\fB\-e\fR)
 Reinstalls target atoms and their entire deep
diff --git a/man/make.conf.5 b/man/make.conf.5
index 6c64686c7..a2221cf45 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -295,11 +295,6 @@ probably also want to enable \fBPORT_LOGDIR\fR in order to save the build log.
 Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the
 \fIfail\-clean\fR feature to be automatically disabled.
 .TP
-.B fixpackages
-Runs the script that will fix the dependencies in all binary packages.  This is 
-run whenever packages are moved around in the portage tree.  Please note that this 
-can take a lot of time.
-.TP
 .B getbinpkg
 Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See 
 \fBmake.conf\fR(5) for more information.
diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index 868d1ee80..be8a73492 100644
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -217,8 +217,7 @@ def _global_updates(trees, prev_mtimes, quiet=False):
 
 			do_upgrade_packagesmessage = False
 			# We gotta do the brute force updates for these now.
-			if mysettings.get("PORTAGE_CALLER") == "fixpackages" or \
-			"fixpackages" in mysettings.features:
+			if True:
 				def onUpdate(maxval, curval):
 					if curval > 0:
 						writemsg_stdout("#")
diff --git a/pym/portage/const.py b/pym/portage/const.py
index e3627ea6e..29c3878a6 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -90,7 +90,7 @@ SUPPORTED_FEATURES       = frozenset([
                            "ccache", "chflags", "clean-logs",
                            "collision-protect", "compress-build-logs",
                            "digest", "distcc", "distcc-pump", "distlocks", "ebuild-locks", "fakeroot",
-                           "fail-clean", "fixpackages", "force-mirror", "getbinpkg",
+                           "fail-clean", "force-mirror", "getbinpkg",
                            "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
                            "metadata-transfer", "mirror", "multilib-strict", "news",
                            "noauto", "noclean", "nodoc", "noinfo", "noman",
-- 
2.26.2