Merged from trunk 7284:7306

   Merged from trunk 7284:7306

   +------------------------------------------------------------------------+
   | 7285    | Sort the atoms when writing the world file.                  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7286    | Always be sure to load the latest version of the world file  |
   | zmedico | while it's locked.                                           |
   |---------+--------------------------------------------------------------|
   | 7287    | Revert PackageSet.containsCPV() calls back to                |
   | zmedico | findAtomForPackage() calls so that things like slot atoms    |
   |         | and old-style virtuals are properly supported.               |
   |---------+--------------------------------------------------------------|
   | 7288    | Make sure PackageSet._atoms is always a set.                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7289    | Make sure the atoms are loaded when calling                  |
   | zmedico | PackageSet.findAtomForPackage().                             |
   |---------+--------------------------------------------------------------|
   | 7290    | Don't show the repo display when the package list is empty.  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7292    | When dep_expand throws a ValueError due to an ambiguous      |
   | zmedico | atom, try to expand it against the installed packages in     |
   |         | case it yields a unique match.                               |
   |---------+--------------------------------------------------------------|
   | 7294    | When expanding ambiguous atoms against the vardb, make sure  |
   | zmedico | the the expanded package is also available in the portage    |
   |         | tree.                                                        |
   |---------+--------------------------------------------------------------|
   | 7296    | For bug #185670, make sure package.use.{mask,force} are      |
   | zmedico | properly displayed.                                          |
   |---------+--------------------------------------------------------------|
   | 7298    | Unify USE handling in the depgraph with the other metadata.  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7300    | Use PF in dyn_package. Thanks to swegener.                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7301    | Make PackageSet._updateAtomMap() clear the map in case       |
   | zmedico | something was removed.                                       |
   |---------+--------------------------------------------------------------|
   | 7302    | Use PackageSet.getAtoms() as a wrapper around load() since   |
   | zmedico | load() can trigger unnecessary stat calls.                   |
   |---------+--------------------------------------------------------------|
   | 7303    | Iterate over a list in order to avoid breaking the iterator  |
   | zmedico | when an atom is removed.                                     |
   |---------+--------------------------------------------------------------|
   | 7305    | Use the --depclean algorithm to make --prune safe. The old   |
   | zmedico | unsafe --prune will be used if the --nodeps option is        |
   |         | specified.                                                   |
   |---------+--------------------------------------------------------------|
   | 7306    | Allow atoms to be specified for --depclean so that it can be |
   | zmedico | used to safely unmerge packages if nothing depends on them.  |
   +------------------------------------------------------------------------+

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