From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 18 Oct 2012 03:43:17 +0000 (-0700)
Subject: doebuild: fix REPLACING_VERSIONS EAPI 5 sub-slot
X-Git-Tag: v2.2.0_alpha141~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c48158a4af685e64d05a29fb54f43974c93ff3f;p=portage.git

doebuild: fix REPLACING_VERSIONS EAPI 5 sub-slot
---

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 650c3633a..0a1f1df0e 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -900,9 +900,8 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
 			else:
 				vardb = vartree.dbapi
 				cpv = mysettings.mycpv
-				cp = portage.versions.cpv_getkey(cpv)
-				slot = mysettings["SLOT"]
-				cpv_slot = cp + ":" + slot
+				cpv_slot = "%s%s%s" % \
+					(cpv.cp, portage.dep._slot_separator, cpv.slot)
 				mysettings["REPLACING_VERSIONS"] = " ".join(
 					set(portage.versions.cpv_getversion(match) \
 						for match in vardb.match(cpv_slot) + \