doebuild: fix REPLACING_VERSIONS EAPI 5 sub-slot
authorZac Medico <zmedico@gentoo.org>
Thu, 18 Oct 2012 03:43:17 +0000 (20:43 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 18 Oct 2012 03:43:17 +0000 (20:43 -0700)
pym/portage/package/ebuild/doebuild.py

index 650c3633a4c6271a24988c2f13fad7f5d36f5391..0a1f1df0e94251689513ed2d30fecb44d17eacf0 100644 (file)
@@ -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) + \