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

Conflicts:
	bin/ebuild
	bin/fixpackages
	bin/repoman

diff --cc bin/ebuild
index c64e8858236d3dbaa4dd59190687207e29f689da,771ccb51c3e558479fb48477c4d2e0cae5b2249a..a27b049d363419486dbb98e59337e416b48d1c00
--- 1/bin/ebuild
--- 2/bin/ebuild
+++ b/bin/ebuild
@@@ -56,15 -56,12 +56,14 @@@ parser.add_option("--skip-manifest", he
  
  opts, pargs = parser.parse_args(args=sys.argv[1:])
  
- os.environ["PORTAGE_CALLER"]="ebuild"
 -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
 +# for an explanation on this logic, see pym/_emerge/__init__.py
 +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"))
++    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 +import portage
  
  portage.dep._internal_warnings = True
  from portage import os

diff --cc bin/egencache
Simple merge

diff --cc bin/fixpackages
index a60852a023c4b9cbae60b10a07f7a03108b5a786,dc43ed2b352c32166524b296333698cdd3f99a6a..57b6db3b22639941e9e268ce5c2c9e981846b6be
--- 1/bin/fixpackages
--- 2/bin/fixpackages
+++ b/bin/fixpackages
@@@ -1,11 -1,18 +1,20 @@@
 -#!/usr/bin/python
 +#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 1999-2006 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function
  
- import os,sys
- os.environ["PORTAGE_CALLER"]="fixpackages"
+ import os
+ import sys
+ 
 -try:
 -      import portage
 -except ImportError:
 -      from os import path as osp
++# for an explanation on this logic, see pym/_emerge/__init__.py                                                                                                                                                                                                                                                                                                                                                                       
++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
++import portage
  
  from portage import os
  from portage.output import EOutput

diff --cc bin/repoman
index 6d1164ad8446910fdb3dc6f313af9f9a1b8b24f5,b1a2ac3fad11d81210a399453ee6fc582124455d..1f4175bd8b8e0f68aece502f7f1cd6844e76811d
--- 1/bin/repoman
--- 2/bin/repoman
+++ b/bin/repoman
@@@ -77,10 -75,7 +77,8 @@@ from portage.output import bold, create
  from portage.output import ConsoleStyleFile, StyleWriter
  from portage.util import cmp_sort_key, writemsg_level, writemsg_stdout
  from portage.package.ebuild.digestgen import digestgen
- from portage.eapi import eapi_has_slot_deps, \
-       eapi_has_use_deps, eapi_has_strong_blocks, eapi_has_iuse_defaults, \
-       eapi_has_required_use, eapi_has_use_dep_defaults
+ from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
 +from portage.const import EPREFIX
  
  if sys.hexversion >= 0x3000000:
        basestring = str

diff --cc pym/portage/package/ebuild/_config/special_env_vars.py
Simple merge

diff --cc pym/portage/package/ebuild/config.py
Simple merge