Merged from trunk -r13764:13774

   Merged from trunk -r13764:13774

   | 13765    | Move "import copy" to the top of the file.                  |
   | zmedico  |                                                             |

   | 13766    | Make --help into an action, and move --help --sync output   |
   | zmedico  | to the actions section. Thanks to Marat Radchenko           |
   |          | <slonopotamusorama@gmail.com> for this patch.               |

   | 13767    | Implement LazyItemsDict.pop() since dict.pop() bypasses our |
   | zmedico  | overridden __getitem__ implementation. This fixes a problem |
   |          | with config.setcpv() failing to set PORTAGE_REPO_NAME when  |
   |          | appropriate. Thanks to Arfrever for reporting.              |

   | 13768    | Don't set RDEPEND=${RDEPEND-${DEPEND}} for EAPI=3 and       |
   | arfrever | simplify setting it for lower EAPIs.                        |

   | 13769    | Bug #275217 - Part 5 - When a slot conflict occurs, mask    |
   | zmedico  | the first package that got pulled in and restart the        |
   |          | calculation. Thanks to Sebastian Mingramm (few)             |
   |          | <s.mingramm@gmx.de> for the initial patch which I added     |
   |          | some additional features to: * display message about missed |
   |          | updates * cache frozen_config instance, to optimize         |
   |          | performance * disable backtracking if it fails, fall back   |
   |          | to a normal dep calculation + error message.                |

   | 13770    | Cleanup spinner before calling depgraph.display_problems(). |
   | zmedico  |                                                             |

   | 13771    | Disable depgraph._show_missed_update() when --quiet is      |
   | zmedico  | enabled and --debug is not enabled.                         |

   | 13772    | Remove the --avoid-update option and make it the default    |
   | zmedico  | behavior when --update is not specified, as suggested by    |
   |          | Allen Brooker (AllenJB) <gentoo-bugs@allenjb.me.uk> in bug  |
   |          | #275945, comment #2.                                        |

   | 13773    | Make LazyItemsDict derive from UserDict instead of dict so  |
   | zmedico  | that we don't have to implement the pop method (and         |
   |          | possibly others such as setdefault).                        |

   | 13774    | Delete runtime_pkg_mask to avoid memory leak.               |
   | zmedico  |                                                             |
   Merged from trunk -r13774:13784

   | 13775   | Don't pass myopts into profile_check() since it's no longer  |
   | zmedico | needed. Thanks to Radchenko <slonopotamusorama@gmail.com>    |
   |         | for this patch.                                              |

   | 13776   | Update help() usage since the myopts parameter is gone.      |
   | zmedico | Thanks to Marat Radchenko <slonopotamusorama@gmail.com> for  |
   |         | this patch.                                                  |

   | 13777   | Correct --help usage since it no longer takes system, world, |
   | zmedico | or --sync as input. Thanks to Marat Radchenko                |
   |         | <slonopotamusorama@gmail.com> for this patch.                |

   | 13778   | Correct --help usage since it no longer takes system, world, |
   | zmedico | or --sync as input. Thanks to Marat Radchenko                |
   |         | <slonopotamusorama@gmail.com> for this patch.                |

   | 13779   | As a performance optimization, use StringIO instead of       |
   | zmedico | _insert_newline_eof to solve bug #228117. Thanks to Marat    |
   |         | Radchenko <slonopotamusorama@gmail.com> for this patch.      |

   | 13780   | Make getconfig() use codecs.option() for py3k compatible     |
   | zmedico | unicode handling.                                            |

   | 13781   | Make code from previous commit safe for empty files.         |
   | zmedico |                                                              |

   | 13782   | Make grablines() use codecs.open() for py3k compatible       |
   | zmedico | unicode handling.                                            |

   | 13783   | Make atomic_ofstream() use codecs.open() for py3k compatible |
   | zmedico | unicode handling when mode does not contain 'b'.             |

   | 13784   | Remove the workaround from bug #263081 since most strings    |
   | zmedico | should be unicode now.                                       |

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