Revert r3339 because r3301 makes it unnecessary. See bug #133055.

svn path=/main/trunk/; revision=3341

diff --git a/pym/portage.py b/pym/portage.py
index d10bf54a3737305952ac1635e47c5f03dd9e42c6..fb7679d59e7f6736e6ef9845b649f6ee8e8eeb9a 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6601,9 +6601,6 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
        origdir=getcwd()
        os.chdir(pkgloc)
 
-       # Need slot for slot-based collision detection.
-       mysettings["SLOT"] = xptbz2.getfile("SLOT").strip()
-
        mysettings.configdict["pkg"]["CATEGORY"] = mycat;
        # Eventually we'd like to pass in the saved ebuild env here.
        # Do cleanup=1 to ensure that there is no cruft prior to the setup phase.