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

Conflicts:
	runtests.sh

diff --cc bin/repoman
Simple merge

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

diff --cc pym/_emerge/EbuildBuildDir.py
index d44eb2a5390eb6497dc7a96733d7795d31fb5822,9773bd79002e754314d3e70f3b16660c761e531b..5e2c0345522780581974667a9da5de4bc47b9b3e
--- 1/pym/_emerge/EbuildBuildDir.py
--- 2/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@@ -2,11 -2,11 +2,12 @@@
  # Distributed under the terms of the GNU General Public License v2
  
  from _emerge.AsynchronousLock import AsynchronousLock
- from _emerge.SlotObject import SlotObject
+ 
  import portage
  from portage import os
 +import sys
  from portage.exception import PortageException
+ from portage.util.SlotObject import SlotObject
  import errno
  
  class EbuildBuildDir(SlotObject):

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

diff --cc pym/portage/dbapi/vartree.py
Simple merge

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

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

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

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

diff --cc runtests.sh
index 1d584a12aa6895795e6cdfb8b87316779ffc19dd,56aa2cc1e312cbd960b86de95028d87e2512f5b0..1c3d3c3f1a4ce543461b67fb3bccab7437def2c7
--- 1/runtests.sh
--- 2/runtests.sh
+++ b/runtests.sh
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 2010-2011 Gentoo Foundation
+ # Copyright 2010-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
- PYTHON_VERSIONS="2.6 2.7 3.1 3.2 3.3"
+ PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 3.1 3.2 3.3"
  
  # has to be run from portage root dir
  cd "${0%/*}" || exit 1