From 63eecc79d83c66b8b46b5a808c61bf16686d290d Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 18 Aug 2014 10:38:45 -0700
Subject: [PATCH] portage: fix stage1 builds involving new slot dependencies

Really screwy crud going on here, see the upstream bug for details:
https://bugs.gentoo.org/show_bug.cgi?id=520112
---
 ...ortage-2.2.8-rebuild-in-correct-root.patch | 23 +++++++++++++++++++
 ....2.8-r3.ebuild => portage-2.2.8-r4.ebuild} |  3 +++
 2 files changed, 26 insertions(+)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch
 rename sdk_container/src/third_party/coreos-overlay/sys-apps/portage/{portage-2.2.8-r3.ebuild => portage-2.2.8-r4.ebuild} (99%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch
new file mode 100644
index 0000000000..b57b23da3d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/show_bug.cgi?id=520112
+diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
+index a10297a..2d30966 100644
+--- a/pym/_emerge/depgraph.py
++++ b/pym/_emerge/depgraph.py
+@@ -3496,13 +3496,13 @@ class depgraph(object):
+ 		a favorite list."""
+ 		debug = "--debug" in self._frozen_config.myopts
+ 		onlydeps = "--onlydeps" in self._frozen_config.myopts
+-		myroot = self._frozen_config.target_root
+-		pkgsettings = self._frozen_config.pkgsettings[myroot]
+-		pprovideddict = pkgsettings.pprovideddict
+-		virtuals = pkgsettings.getvirtuals()
+ 		args = self._dynamic_config._initial_arg_list[:]
+ 
+ 		for arg in self._expand_set_args(args, add_to_digraph=True):
++			myroot = arg.root_config.root
++			pkgsettings = self._frozen_config.pkgsettings[myroot]
++			pprovideddict = pkgsettings.pprovideddict
++			virtuals = pkgsettings.getvirtuals()
+ 			for atom in arg.pset.getAtoms():
+ 				self._spinner_update()
+ 				dep = Dependency(atom=atom, onlydeps=onlydeps,
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r4.ebuild
similarity index 99%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r4.ebuild
index c9730596ed..528d44e884 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r4.ebuild
@@ -228,8 +228,11 @@ src_prepare() {
 		fi
 		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
 	fi
+
 	epatch "${FILESDIR}/${P}-add-disabled.patch"
 	epatch "${FILESDIR}/${P}-filter-eroot.patch"
+	epatch "${FILESDIR}/${P}-rebuild-in-correct-root.patch"
+
 	einfo "Setting portage.VERSION to ${PVR} ..."
 	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
 		die "Failed to patch portage.VERSION"