Merge remote branch 'overlays-gentoo-org/master' into prefix

diff --cc bin/quickpkg
index 4d8b5bfb8e9d34fece28fe793b0bc487f5b44f73,911c8c46893a72dad59bdfeb74c849646d6d4dc9..2b177e75959284070e507024305ecea235073ba7
--- 1/bin/quickpkg
--- 2/bin/quickpkg
+++ b/bin/quickpkg
@@@ -5,29 -5,30 +5,31 @@@
  from __future__ import print_function
  
  import errno
+ import math
+ import optparse
  import signal
  import sys
+ import tarfile
  
 -try:
 -      import portage
 -except ImportError:
 -      from os import path as osp
 -      sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 -      import portage
 +from os import environ as ose
 +from os import path as osp
 +if ose.__contains__("PORTAGE_PYTHONPATH"):
 +    sys.path.insert(0, ose["PORTAGE_PYTHONPATH"])
 +else:
 +    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.                    realpath(__file__))), "pym"))
 +import portage
  
  from portage import os
+ from portage import xpak
+ from portage.dbapi.dep_expand import dep_expand
+ from portage.dep import flatten, paren_reduce, use_reduce
+ from portage.exception import InvalidAtom, InvalidData, InvalidDependString, PackageSetNotFound
+ from portage.util import ConfigProtect, ensure_dirs
+ from portage.dbapi.vartree import dblink, tar_contents
+ from portage.checksum import perform_md5
+ from portage.sets import load_default_config, SETPREFIX
  
- def quickpkg_main(options, args, eout):
-       from portage import catsplit, flatten, isvalidatom, xpak
-       from portage.dbapi.dep_expand import dep_expand
-       from portage.dep import use_reduce, paren_reduce
-       from portage.util import ConfigProtect, ensure_dirs
-       from portage.exception import InvalidAtom, InvalidData, InvalidDependString
-       from portage.dbapi.vartree import dblink, tar_contents
-       from portage.checksum import perform_md5
-       import tarfile
-       import portage
+ def quickpkg_atom(options, infos, arg, eout):
        root = portage.settings["ROOT"]
        trees = portage.db[root]
        vartree = trees["vartree"]

diff --cc pym/_emerge/actions.py
Simple merge

diff --cc pym/portage/__init__.py
Simple merge