Adjust the hal/consolekit mess to be more sane.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

4 files changed, 42 insertions, 14 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 50f493168d41..e31aee5578af 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.136 2009/09/17 16:30:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.137 2009/09/19 14:27:21 scarabeus Exp $
+
+  19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  xinit-1.0.8-r7.ebuild, metadata.xml:
+  Adjust the hal/consolekit mess to be more sane.
 
 *xinit-1.0.8-r7 (17 Sep 2009)
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index d7c2e12e8ca2..c237957b59ac 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 AUX chooser.sh 1496 RMD160 4d474c23dc10f2f33006885305002df7fd3197f9 SHA1 7e8f6a8238add6a1501964821d0b3ffd1ad92b80 SHA256 70bde060d86c313b90ab21a8eb9b101b08637297a1a5b4dec13e1c305ec4d1e8
 AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb23aaac97763725891 SHA1 ab0acf592dfbdfe961489f3a417be350aefac1dd SHA256 eb0a88592a22203c9e7cb4ea3051f2b96adb244585ae4b990b384b6d8a35559c
@@ -23,7 +26,14 @@ EBUILD xinit-1.0.5-r2.ebuild 1746 RMD160 787348be67fe9fe57ba22bb05a6e8286f08b777
 EBUILD xinit-1.0.8-r2.ebuild 1795 RMD160 5af656de1216810164bec4e7cfe27337bbe9db37 SHA1 44cbb28758a11741b68c2192a2ccda126f52cc41 SHA256 e3ccfa7db24fea55c14d1e41fb23263f63d2ca0921c6a7e15f7eb29b8c76bb82
 EBUILD xinit-1.0.8-r3.ebuild 1924 RMD160 daea591250fc80d64032be5b32aa641375b91cde SHA1 8982722c65ddcd5f3ac2f39ec587e05c521e5b59 SHA256 2b3da814a3367dbd9b8a53cc61a71adea7b6778d58ac8955a7f31d71b73d5637
 EBUILD xinit-1.0.8-r4.ebuild 2146 RMD160 76cfb718bcfd7ab710a7e3bb609a42c60172654e SHA1 33f000c3b440b517e5a1d5c60e346e6af38874e6 SHA256 ff68cfbbd6f36428a7bfefa0d28e409bdf5492f2df1b309066e46f22543f7cd7
-EBUILD xinit-1.0.8-r7.ebuild 2206 RMD160 12efd0b1ad72a2845d298eb52b1fc3d8146ee824 SHA1 33d7d8f490ec5871202899323bc243be537b0e04 SHA256 b2cd7f8cf1e013427b7b67939b88c254a04d6052774945d910d2dd4ade1f115a
+EBUILD xinit-1.0.8-r7.ebuild 2287 RMD160 c56b47d1524b3c0a47ffd1c3f2cad77dde760296 SHA1 01e8f12ebcab4636116c79197063077fa78c7ff4 SHA256 cceb1c622a01d158d486d2b26a8fbe8bb86ed2edbe7b5e1be47c7b26d948bdd2
 EBUILD xinit-1.0.8.ebuild 1743 RMD160 e69d30cd92810870fbb9bf4f0896778c4e162c30 SHA1 9704fa014525f1e45dddcc658d6d83990e21961a SHA256 8ed635360a4136209fe0249c53bd3254367957dec543a5f1a1f1b06fc8cefd63
-MISC ChangeLog 21713 RMD160 83de549c1a2da103b61926f3afc60f0e7ca178fa SHA1 3e78099c52018f801b64988577616380d4a865fd SHA256 9c5399409a3e416ad038e9a1f95f7cefca0adab99ef96b78a87c1085113f6015
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+MISC ChangeLog 21859 RMD160 3c5dc97e48863b6ce449fa3fd0dfc8bf93d2ae73 SHA1 f555183f1c8dc5b2ce523759cd0d380a3ddb29f6 SHA256 d39ba5fa982705f32ec6b8648767e4d85e0d4a5929b1b78a2bd3fb027ac4171c
+MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq06oAACgkQHB6c3gNBRYfYiwCfS+LL5HPrxmzRlQJ3ODmku3G/
+uiwAnjRlYVwP/EIScYDJ41futlrb5I5c
+=eRHm
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index 01c4c004e735..90d196d68b9c 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+	<herd>x11</herd>
+	<use>
+		<flag name='consolekit'>
+			Enable consolekit integration for the privileges detection.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-apps/xinit/xinit-1.0.8-r7.ebuild b/x11-apps/xinit/xinit-1.0.8-r7.ebuild
index bd8ce378ccca..b88743b77f63 100644
--- a/x11-apps/xinit/xinit-1.0.8-r7.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r7.ebuild,v 1.1 2009/09/17 16:30:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r7.ebuild,v 1.2 2009/09/19 14:27:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,17 +14,26 @@ DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="hal minimal pam"
+IUSE="consolekit hal minimal pam"
 
-RDEPEND="x11-apps/xauth
+RDEPEND="
+	x11-apps/xauth
 	x11-libs/libX11
-	hal? ( sys-auth/consolekit sys-apps/dbus[X] )"
+	hal? ( sys-apps/hal sys-apps/dbus[X] )
+	consolekit? ( 
+		sys-auth/consolekit
+		hal? ( sys-apps/hal[consolekit] )
+	)
+"
 DEPEND="${RDEPEND}"
-PDEPEND="!minimal? ( x11-wm/twm
-				x11-apps/xclock
-				x11-apps/xrdb
-				x11-apps/xsm
-				x11-terms/xterm )"
+PDEPEND="!minimal? (
+		x11-apps/xclock
+		x11-apps/xrdb
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
 
 PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
 	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch