Merged from trunk -r11755:11768

   Merged from trunk -r11755:11768

   | 11756   | Bug #244975 - Don't allow the user to make portage unmerge   |
   | zmedico | itself since there's never any valid reason to do so.        |

   | 11758   | Use portage.const.PORTAGE_PACKAGE_ATOM where appropriate.    |
   | zmedico |                                                              |

   | 11759   | Pass a Package instance into the config.setcpv() call.       |
   | zmedico |                                                              |

   | 11760   | Fix broken stuff to avoid tracebacks when running in commit  |
   | zmedico | mode with --pretend and no vcs.                              |

   | 11761   | Remove unused conditional_disabled and conditional_enabled   |
   | zmedico | attributes from _use_dep.__slots__.                          |

   | 11762   | Bug #244947 - Add repoman support for checking masked and    |
   | zmedico | forced flags when verifying USE deps. Thanks to Brian        |
   |         | Harring for reporting.                                       |

   | 11763   | Revert previous commit since it doesn't properly calculate   |
   | zmedico | masked and forced flags for the package being matched (it    |
   |         | erroneously uses the masked and forced flags from the parent |
   |         | package).                                                    |

   | 11764   | Bug #236609 - Fix columns calculation for TERM="dumb".       |
   | zmedico | Thanks to Ulrich Müller <ulm@g.o> for the patch.            |

   | 11765   | In dblink._collision_protect(), remove redundant             |
   | zmedico | self.isowner() calls since self hasn't yet been merged and   |
   |         | therefore has no CONTENTS file for ownership checks. Also,   |
   |         | remove redundant isprotected() calls.                        |

   | 11766   | Bug #243178 - Handle file collisions with preserved libs by  |
   | zmedico | allowing the current package to assume ownership and         |
   |         | unregistering the preserved libraries.                       |

   | 11767   | Eliminate duplicate code by calling equivalent               |
   | zmedico | dblink._clear_contents_cache().                              |

   | 11768   | Bug #244947 - Add basic repoman support for checking masked  |
   | zmedico | and forced flags when verifying USE deps. TODO: Add repoman  |
   |         | support in dep_check() for evaluation of conditional USE     |
   |         | deps based on forced/masked flags. masked flags, so that     |
   |         | repoman can also                                             |
   Merged from trunk -r11768:11776

   | 11769   | Bug #244947 - Add repoman support for checking masked and    |
   | zmedico | forced flags on conditional USE deps.                        |

   | 11770   | Bug #244792 - Remove confcache support.                      |
   | zmedico |                                                              |

   | 11771   | Bug #241906 - Handle InvalidAtom exception raised from       |
   | zmedico | vardbapi.match().                                            |

   | 11772   | Bug #240295 - When emake is called, echo the make command    |
   | zmedico | similar to the way that econf echoes the configure command.  |

   | 11773   | Filter PORTAGE_VERBOSE in save_ebuild_env().                 |
   | zmedico |                                                              |

   | 11774   | Remove unused imports.                                       |
   | zmedico |                                                              |

   | 11775   | Define __all__ and remove unused import.                     |
   | zmedico |                                                              |

   | 11776   | Define __all__ and remove unused imports.                    |
   | zmedico |                                                              |

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