Merge from trunk 4723:4726

add make.conf diff for sparc-fbsd arch (from Uberlord)

When unable to navigate around blockers, add them back to the main
digraph so that the --tree display can show them properly.  This fixes
the KeyError reported in comment #15 of bug #151331

svn path=/main/branches/prefix/; revision=4727

diff --git a/bin/emerge b/bin/emerge
index 2035c2d7cbf43fe2642e1a8f6f99302e9196ad9f..4cf92f5bf6389376cdc1046615645082d95e8fb9 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1458,8 +1458,10 @@ class depgraph:
                                                if not myblockers.child_nodes(blocker):
                                                        myblockers.remove(blocker)
 
-               if not myblockers.is_empty():
-                       retlist.extend([node.split() for node in myblockers.root_nodes()])
+               for node in myblockers.root_nodes():
+                       retlist.append(node.split())
+                       for parent in self.blocker_parents[node]:
+                               self.digraph.add(node, parent)
 
                return retlist
 

diff --git a/cnf/make.conf.sparc-fbsd.diff b/cnf/make.conf.sparc-fbsd.diff
new file mode 100644 (file)
index 0000000..b3413da
--- /dev/null
+++ b/cnf/make.conf.sparc-fbsd.diff
@@ -0,0 +1,35 @@
+--- make.conf  2006-10-16 17:06:32 +0100
++++ make.conf.sparc-fbsd       2006-10-16 17:09:22 +0100
+@@ -23,6 +23,13 @@
+ # Example:
+ #USE="X gtk gnome -alsa"
+ 
++# Host Setting
++# ============
++#
++# The version number at the end has to correspond to the version of the
++# profile and of freebsd-lib package.
++CHOST="sparc64-gentoo-freebsd6.2"
++
+ # Host and optimization settings 
+ # ==============================
+ #
+@@ -61,7 +68,7 @@
+ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
+ # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
+ #
+-#ACCEPT_KEYWORDS="~arch"
++ACCEPT_KEYWORDS="~sparc-fbsd"
+ 
+ # Portage Directories
+ # ===================
+@@ -287,7 +294,8 @@
+ #  'notitles'    disables xterm titlebar updates (which contain status info). 
+ #  'parallel-fetch'
+ #                do fetching in parallel to compilation
+-#  'sandbox'     enables sandboxing when running emerge and ebuild.
++#  'sandbox'     enables sandboxing when running emerge and ebuild. Doesn't
++#                work on *BSD-based systems.
+ #  'strict'      causes portage to react strongly to conditions that are
+ #                potentially dangerous, like missing/incorrect Manifest files.
+ #  'userfetch'   when portage is run as root, drop privileges to