Merged from trunk -r15417:15421

   Merged from trunk -r15417:15421

   | 15418   | Bug #299095 - Add a deprecation warning for check_license    |
   | zmedico | calls with EAPI >= 3 since it is superceded by LICENSE       |
   |         | masking.                                                     |

   | 15419   | Use lazy import for the portage.dbapi module.                |
   | zmedico |                                                              |

   | 15420   | Don't import the portage.dbapi.dbapi class as portage.dbapi  |
   | zmedico | anymore, since it results in a strange namespace collision   |
   |         | (portage.dbapi is both a class and a module). Hopefully this |
   |         | won't break any api consumers since it's a pure virtual      |
   |         | class anyway.                                                |

   | 15421   | Create a directory for splitting the portage.util module     |
   | zmedico | into smaller files.                                          |

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