Merged from trunk -r14354:14358

   Merged from trunk -r14354:14358

   | 14355    | Use next(iterator) instead of iterator.next() for           |
   | arfrever | compatibility with Python 3. (2to3-3.1 -f next -nw          |
   |          | ${FILES})                                                   |

   | 14357    | Decode database name passed to                              |
   | arfrever | portage.cache.sqlite.database._db_module.connect() for      |
   |          | compatibility with Python 3.                                |

   | 14358    | Use input() instead of raw_input() when Python 3 is used.   |
   | arfrever |                                                             |

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