From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 19 Feb 2012 09:57:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f0978d957aa3ad2a3e9806bde34947b167ae554;p=portage.git

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

Conflicts:
	runtests.sh
---

5f0978d957aa3ad2a3e9806bde34947b167ae554
diff --cc pym/_emerge/EbuildBuildDir.py
index d44eb2a53,9773bd790..5e2c03455
--- a/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 runtests.sh
index 1d584a12a,56aa2cc1e..1c3d3c3f1
--- a/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