Merged from trunk -r14256:14270

   Merged from trunk -r14256:14270

   | 14259   | Use a regular expression for cpv_getkey(), and fall back to  |
   | zmedico | legacy code if no match is found.                            |

   | 14261   | Insice match_from_list(), use remove_slot() instead of       |
   | zmedico | dep_getcpv() where appropriate.                              |

   | 14262   | Make dep_getcpv() use Atom, and fall back to legacy code for |
   | zmedico | backward compat.                                             |

   | 14264   | Simplify cpv_getkey() by just calling dep_getkey('=' +       |
   | zmedico | mycpv).                                                      |

   | 14269   | Reimplement the code from bug #283795 so that indirect deps  |
   | zmedico | are preserved for later use. TODO: Write code to add         |
   |         | selected indirect virtual deps to the graph. This will take  |
   |         | advantage of circular dependency avoidance that's done by    |
   |         | dep_zapdeps.                                                 |

   | 14270   | When _expand_new_virtuals() is called by repoman, skip       |
   | zmedico | expansion of new-style virtuals.                             |

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