Merged from trunk -r12404:12420

   Merged from trunk -r12404:12420

   | 12405   | Add Blocker -> Blocked Package edges to                      |
   | zmedico | depgraph._unsolvable_blockers since these edges will be      |
   |         | useful for implementing an enhanced blocker display.         |

   | 12406   | Remove unused myblocker_parents variable inside              |
   | zmedico | depgraph._serialize_tasks().                                 |

   | 12407   | Revert r12405 since it will be more convenient to use a      |
   | zmedico | separate graph to store blocked package edges.               |

   | 12408   | When there are unresolved blockers, display the conflicting  |
   | zmedico | packages along with the packages that pulled them in         |
   |         | (similar to the slot conflict display). This is helpful for  |
   |         | troubleshooting cases in which blockers don't solve          |
   |         | automatically and the reasons are not apparent from the      |
   |         | normal merge list display.                                   |

   | 12409   | * Enable the recursive option in profile package.use         |
   | zmedico | parsing. * Enable package.umask in all the same locations as |
   |         | package.mask.                                                |

   | 12410   | Bug #55321 - Add support for package.keywords in profiles.   |
   | zmedico | In profiles, package.keywords modifies effective KEYWORDS    |
   |         | values for a given ebuild. This behavior is notably          |
   |         | different from /etc/portage/package.keywords, which instead  |
   |         | modifies effective ACCEPT_KEYWORDS.                          |

   | 12411   | Enable package.keywords as-directory in profiles.            |
   | zmedico |                                                              |

   | 12412   | Fix broken code inside config._getKeywords().                |
   | zmedico |                                                              |

   | 12413   | Add a new 'metadata.warning' category and a check which      |
   | zmedico | detects local USE descriptions that are not used in any      |
   |         | ebuilds. Thanks to Markus Meier <maekke@g.o> for the initial |
   |         | patch.                                                       |

   | 12414   | Inside config._getKeywords(), ignore -* in KEYWORDS, to      |
   | zmedico | prevent it from causing preceeding values to be discarded.   |

   | 12415   | Use ebegin/eend to indicate when waiting for a lock and when |
   | zmedico | it's acquired. Thanks to Petteri Räty <belegeuse@g.o> for   |
   |         | the suggestion.                                              |

   | 12416   | Add a "quiet" parameter to the EOutput constructor, and also |
   | zmedico | flush stderr/stdout stream in the constructor.               |

   | 12417   | Inside action_sync(), check for the git binary when          |
   | zmedico | necessary and bail out with a helpful message if it doesn't  |
   |         | exist. Thanks to Caleb Cushing <xenoterracide@gmail.com> for |
   |         | the initial patch.                                           |

   | 12418   | Bug #254421 - Make dir_get_metadata() handle 'Connection     |
   | zmedico | refused' socket.error from ftplib connection attempt.        |

   | 12419   | Enable use.{mask,force} and package.use.{mask,forc}          |
   | zmedico | as-directory in profiles.                                    |

   | 12420   | When displaying parents of unsolved blockers, reduce noise   |
   | zmedico | by pruning packages that are only pulled in by other         |
   |         | conflict packages.                                           |

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