Merged from trunk -r15387:15397

   Merged from trunk -r15387:15397

   | 15388   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

   | 15390   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

   | 15391   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

   | 15392   | Bug #303519 - Call warnings.warn() with stacklevel=2 inside  |
   | zmedico | dep_getkey and dep_getcpv so that the caller is displayed.   |

   | 15393   | Bug #268724 - Show a warning message for --unmerge           |
   | zmedico | operations and suggest --depclean instead.                   |

   | 15394   | Bail out when given an invalid mode.                         |
   | zmedico |                                                              |

   | 15395   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

   | 15396   | Fix deprecated usage of dep_getkey.                          |
   | zmedico |                                                              |

   | 15397   | Use isvalidatom to validate PROVIDE entries.                 |
   | zmedico |                                                              |

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