depclean: adjust failure message wrt --with-bdeps

We need to be more explicit about using --with-bdeps=y, since this
subtlety often leads to confusion.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 6e238b0692ae95eefda87ceb669e71d2decce3f8..5d1823e43629c93baa3eaffba78b2b69db338037 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -786,15 +786,27 @@ def calc_depclean(settings, trees, ldpath_mtimes,
                                msg.append("  %s pulled in by:" % (atom,))
                                msg.append("    %s" % (parent,))
                                msg.append("")
-                       msg.append("Have you forgotten to run " + \
-                               good("`emerge --update --newuse --deep @world`") + " prior")
-                       msg.append(("to %s? It may be necessary to manually " + \
-                               "uninstall packages that no longer") % action)
-                       msg.append("exist in the portage tree since " + \
-                               "it may not be possible to satisfy their")
-                       msg.append("dependencies.  Also, be aware of " + \
-                               "the --with-bdeps option that is documented")
-                       msg.append("in " + good("`man emerge`") + ".")
+                       msg.extend(textwrap.wrap(
+                               "Have you forgotten to do a complete update prior " + \
+                               "depclean? The most comprehensive command for this " + \
+                               "purpose is as follows:", 65
+                       ))
+                       msg.append("")
+                       msg.append("  " + \
+                               good("emerge --update --newuse --deep --with-bdeps=y @world"))
+                       msg.append("")
+                       msg.extend(textwrap.wrap(
+                               "Note that the --with-bdeps=y option is not required in " + \
+                               "many situations. Refer to the emerge manual page " + \
+                               "(run `man emerge`) for more information about " + \
+                               "--with-bdeps.", 65
+                       ))
+                       msg.append("")
+                       msg.extend(textwrap.wrap(
+                               "Also, note that it may be necessary to manually uninstall " + \
+                               "packages that no longer exist in the portage tree, since " + \
+                               "it may not be possible to satisfy their dependencies.", 65
+                       ))
                        if action == "prune":
                                msg.append("")
                                msg.append("If you would like to ignore " + \