From: W. Trevor King <wking@tremily.us>
Date: Sat, 9 Mar 2013 12:45:05 +0000 (-0500)
Subject: portage-conf/default/package.use/x: Re-break pambase <-> consolekit loop
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b802f637f9974c3e042c00be3a252ff75a15258;p=catalyst-swc.git

portage-conf/default/package.use/x: Re-break pambase <-> consolekit loop

I's disabled consolekit for pambase in package.use/circular, but this
was re-enabling it (and package.use/x is parsed after
package.use/circular).  This dependency cycle broke the stage3 build,
but was, apparently, needed for some later stage.  If this fix doesn't
work, we can transition to using different portage-conf subdirectories
for different stages.
---

diff --git a/portage-conf/default/package.use/x b/portage-conf/default/package.use/x
index 0a4cce8..ab7190f 100644
--- a/portage-conf/default/package.use/x
+++ b/portage-conf/default/package.use/x
@@ -12,4 +12,6 @@ media-libs/mesa xa
 
 # required by sys-auth/polkit-0.110[pam],
 # required by gnome-extra/polkit-gnome-0.105
-sys-auth/pambase consolekit
+#sys-auth/pambase consolekit
+sys-auth/polkit -pam
+# We can't enable consolekit for pambase (it's a circular dependency)