New version for GNOME 2.28. Clean up old revision. Fix xinitrc script.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

11 files changed, 232 insertions, 366 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 9e43e3a41387..bc15100b1fd1 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.57 2009/10/28 18:20:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.58 2009/10/29 23:33:46 eva Exp $
+
+*consolekit-0.4.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> files/90-consolekit,
+  -consolekit-0.2.3.ebuild, -files/consolekit-0.2.3-freebsd.patch,
+  -consolekit-0.2.10.ebuild, -consolekit-0.2.10-r1.ebuild,
+  -consolekit-0.3.0.ebuild, +files/consolekit-0.4.0-multilib.patch,
+  +files/consolekit-0.4.0-polkit-automagic.patch, +consolekit-0.4.1.ebuild,
+  +files/consolekit-0.4.1-shutdown-reboot-without-policies.patch:
+  New version for GNOME 2.28. Clean up old revision. Fix xinitrc script.
 
   28 Oct 2009; Raúl Porcel <armin76@gentoo.org> consolekit-0.3.0-r2.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #278181
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 8852c5564c8e..63b05970618a 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,21 +1,29 @@
-AUX 90-consolekit 272 RMD160 63bfb8c8320ce5590013848632f4d03bbeecdb90 SHA1 094f29f3efc6523db9d464f1d67e64a87214abbe SHA256 7a133beda59eace7572849ffaff305c3627860d26735bbbd0352620f626f0cb9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 90-consolekit 272 RMD160 f95a580dda5e8d65713153921cd77f8c064b2357 SHA1 f3e535ae34b9f30ad45c77ceac116ec73572b3d9 SHA256 d372f292f765c1cab533285be8f9af16b0783d7aa44a5e038174396e61c780cc
 AUX consolekit-0.1.rc 586 RMD160 04282efee7a8abb69ddd787ea4b9f180e6954d86 SHA1 4ca9cb3f4d33d08c2dadcd7a9884ed351990376f SHA256 af61c7d61bfda4d7c30f3f4142a9e8dc26bfdd4e14c57d7ff8bfef5febdcee1f
 AUX consolekit-0.2.10-cleanup_console_tags.patch 1680 RMD160 1fccda3d4da3197ba9416b12177d05dd4a2e9705 SHA1 a7c0a267ce9950e8e3887abbe7a778e70f24a26b SHA256 1bc8323346d3a58c23d3790a317b7965dbd964b2307ef9bc6a8374f45a34f0f7
 AUX consolekit-0.2.10-directory-leak.patch 270 RMD160 b0fadcdbeb020d31a294f67b1e1c1b456f819ecc SHA1 0d8933736cc72a5fe4501c61ac531e958433f77d SHA256 800f61f49f6df1a6d4d6b9f9d7c08f14483c13bed2089c988d039288f4a66a4b
 AUX consolekit-0.2.10-pam-add-nox11.patch 2258 RMD160 23b77cc0397e08bfc367bbe6683d44d67b9e5a22 SHA1 051973327b7a629d84ecb938980c7bf110c6f8fc SHA256 1e96db20c78b4b983ac89f98ebaeeb5ef08239916ada6e7ecfff3e9c12c8f1ef
 AUX consolekit-0.2.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54eb7d42d600f4e1b1 SHA1 ada8d56ab096dc49d609f1d9f44679971936c0df SHA256 9e31ae84ec3d838aaaddaa1fee1b68f7bf02e6c16935ca2a7a3cc086ff868433
-AUX consolekit-0.2.3-freebsd.patch 2945 RMD160 e1193ba4010daa33c9646ed8a78a374944ea73dc SHA1 10af67cab72a184fbe89ba36330a20020ae60206 SHA256 f17aa9f3229a24d6bd4291c9f249396864eceb9c01ed00e5c97172c1c57932c5
 AUX consolekit-0.3.0-allow-setidle.patch 648 RMD160 03bd610a6d13ece9a1ad46beb43efbc3ac875e61 SHA1 00145467e96ac917e0aa6a756a938f2c62434602 SHA256 693accef2bea6fe62900226075c88b50b6ff541649a86affbebe98ea6134ec08
 AUX consolekit-0.3.0-shutdown.patch 924 RMD160 d0ad31aed472df41f94327c0625b64aee31fc6ed SHA1 f02205b3273047afdfe4438fac4f71f50655112b SHA256 7016cf51e86a5e87104ce960524fa4c75a1f7362d7b3d8d8e0e3e5f8469132ab
 AUX consolekit-0.3.0-skip_xmlto_validation.patch 770 RMD160 b8b229e8d7ab2f2ef2266dc553588f9a1ccf0600 SHA1 5518debddb04d814f12a5377e4b958c8963ffaee SHA256 28e1cb19567d8b57d81aea5c0ed02f998cc7017fe3ada5759574fdaa217653cb
+AUX consolekit-0.4.0-multilib.patch 4378 RMD160 ef80a5e681e7d036be4de1dff40a550c3b422087 SHA1 221d6b04e35fca3bc42ec97f9bccb7c3792a0788 SHA256 1b00d28b62c0c71648978a48e65bd1bac08d230945c933e3f7cfd74cf59f337d
+AUX consolekit-0.4.0-polkit-automagic.patch 841 RMD160 59f6f8d13a6f030107908b5926e2f49439ae2f6e SHA1 6c1442f4cc860bd5e828997a6fb44cc891028e1c SHA256 965ea7e3a2868ae8fa3d0ee6c48a5b06149c08d273e8f4a8e6afa9eec0a26357
+AUX consolekit-0.4.1-shutdown-reboot-without-policies.patch 1166 RMD160 946969cbc2c86bf81f151cbefae022ea95971a57 SHA1 1db7f74e84146c738d5de4b5f835376a1a394280 SHA256 78e7e3b71c34c9a0b2eef58c55c8ac6e34fd4ee0ddb03d20c9adf138d2dafbc9
 AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
-DIST ConsoleKit-0.2.10.tar.gz 521473 RMD160 fa75c371a28803c990c9293732229e2c67625ff6 SHA1 ac4107f2239b072156f4a815609ea1c6fbb5f6cf SHA256 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb
-DIST ConsoleKit-0.2.3.tar.gz 468591 RMD160 457c1a08e9d2fc789537127c9d069088588c035b SHA1 009f731aa4331125ef052e587d7b0583e07ee8aa SHA256 1b9571f958d3c3be464a6261947c6f817948e878166bca4616f4ac3ac9f02e47
 DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 SHA1 e3b6156622cc14ebca7382a55b8ed15f2f2bad98 SHA256 cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
-EBUILD consolekit-0.2.10-r1.ebuild 2774 RMD160 f8559aa2308d13303b175b221c02485e129de2e5 SHA1 a25553eb1ee7d5efd0c124563743651bf1cc467a SHA256 387f4fdb2fcf64e1a4adce25801f8eefc319c24563c80e426f14300c7fd5a337
-EBUILD consolekit-0.2.10.ebuild 1830 RMD160 438ead30e1f6ea4c0866460110ef9cd24b8b7966 SHA1 8760b062e977f7f885c27b063b1c8df7a5187cab SHA256 cb4a08b78fd8cee5cd24a8520abef20015984d2608b7471fb30288c083bb3caa
-EBUILD consolekit-0.2.3.ebuild 1974 RMD160 dc7a31ad67bb006431223c6db2904be818d0cd18 SHA1 d28953c9196c2c21c497169a586a89b5a2595d70 SHA256 86a16b9373650a8b41e45c9187d8007300c86fb3a7f9ed034fcc39d758eb7672
+DIST ConsoleKit-0.4.1.tar.bz2 398080 RMD160 800076645134ad63d582ea9ffb3ada0113a32db1 SHA1 ab2b8643c1e696df4dc79d9ee0323bdc95aaa6a1 SHA256 f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
 EBUILD consolekit-0.3.0-r2.ebuild 3016 RMD160 b203366313069f733ef32938bff68b38942c0ea3 SHA1 54c20dd3da9528f6156c90aed65890b9acac6a23 SHA256 847bfb1c0eee7dc847bbb8c239f97bb1c5f9a544b8f7113d5e040699d79ea1ec
-EBUILD consolekit-0.3.0.ebuild 3001 RMD160 f363e675bca2730de53557468c987460c4d956dd SHA1 0474b904f7b81420e4cb0f94a17e64e63b56b873 SHA256 edac31ab2222276780aeaefd0ddba0995baf2242b7b9e02e7016d62efb64aa7d
-MISC ChangeLog 8621 RMD160 590c18595a9fc9cc995df6e3b71081129532a4df SHA1 3a7431ef75a244e78cc07ccb76aa643d1dc5b2fc SHA256 58cf330e608257f8db80be9a2a951c9b86d3258ee9eb821543815ee0237100cf
+EBUILD consolekit-0.4.1.ebuild 2847 RMD160 d38f56d9c44a64a58ea0673be178c7dfa6e27c89 SHA1 6d9c622da4c2df3babd9000ede8e74066367fd4a SHA256 5e41bb2055ac68a7d5ac8b30c3d8ae5a608305b91e74096c313dbcc91881c152
+MISC ChangeLog 9135 RMD160 8c6b74e83e1e0fce3a7d0af393e4702269eb985d SHA1 5e76a21dfd2b078a60ed9007c07cfcdbbc27f37d SHA256 8adf8ea7332533154d6f3c479793015b80f691da6374983983d9305ac3952acb
 MISC metadata.xml 316 RMD160 0d18a4fee930a899bcd1eeff6fc7fe4de491f71b SHA1 0643d12b32e383861623f4f257f9d5b1446a90da SHA256 d026b12ac11b38e175987871769588146cf0c587a1462559cd1581ae05aaa83d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqJl8ACgkQ1fmVwcYIWAZd/QCghZeBG2OZmWrlNPZB42EMV98q
+34gAn2iedrCZWAqIdOBzW+4CksGRFtJw
+=nefr
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.2.10-r1.ebuild b/sys-auth/consolekit/consolekit-0.2.10-r1.ebuild
deleted file mode 100644
index 012ce85db251..000000000000
--- a/sys-auth/consolekit/consolekit-0.2.10-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.2.10-r1.ebuild,v 1.2 2009/03/17 22:48:43 loki_val Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib pam
-
-MY_PN="ConsoleKit"
-MY_PV="${PV//_pre*/}"
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug pam"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=dev-libs/dbus-glib-0.61
-	>=x11-libs/libX11-1.0.0
-	pam? ( virtual/pam )
-	elibc_glibc? ( !=sys-libs/glibc-2.4* )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_prepare() {
-	# Fix directory leaks, bug #258685
-	epatch "${FILESDIR}/${P}-directory-leak.patch"
-
-	# Clean up at_console compat files, bug #257761
-	epatch "${FILESDIR}/${P}-cleanup_console_tags.patch"
-
-	# Add nox11 option to no interfere with Xsession script, bug #257763
-	epatch "${FILESDIR}/${P}-pam-add-nox11.patch"
-
-	# Fix automagic dependency on policykit
-	epatch "${FILESDIR}/${P}-polkit-automagic.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam pam-module) \
-		--disable-polkit \
-		--with-pam-module-dir=/$(getpam_mod_dir) \
-		--with-pid-file=/var/run/consolekit.pid \
-		--with-dbus-services=/usr/share/dbus-1/services/ \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# crappy Redhat init script
-	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
-
-	# Portage barfs on .la files
-	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
-
-	# Gentoo style init script
-	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-
-	# Some PM drop empty dirs, bug #257164
-	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/run/ConsoleKit
-	keepdir /var/log/ConsoleKit
-
-	insinto /etc/X11/xinit/xinitrc.d/
-	doins "${FILESDIR}/90-consolekit" || die "doins failed"
-
-	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d/
-	doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You need to restart ConsoleKit to get the new features."
-	ewarn "This can be done with /etc/init.d/consolekit restart"
-	ewarn "but make sure you do this and then restart your session"
-	ewarn "otherwise you will get access denied for certain actions"
-
-	ewarn
-	ewarn "You need to chmod +x /etc/X11/xinit/xinitrc.d/90-consolekit"
-	ewarn "to benefit of consolekit if you are not using gdm or pam integration."
-}
diff --git a/sys-auth/consolekit/consolekit-0.2.10.ebuild b/sys-auth/consolekit/consolekit-0.2.10.ebuild
deleted file mode 100644
index dd518fd53734..000000000000
--- a/sys-auth/consolekit/consolekit-0.2.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.2.10.ebuild,v 1.11 2009/05/17 01:02:38 vapier Exp $
-
-inherit eutils autotools multilib pam
-
-MY_PN="ConsoleKit"
-MY_PV="${PV//_pre*/}"
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug pam"
-
-# Not parallel make safe
-MAKEOPTS="$MAKEOPTS -j1"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=dev-libs/dbus-glib-0.61
-	>=x11-libs/libX11-1.0.0
-	pam? ( virtual/pam )
-	elibc_glibc? ( !=sys-libs/glibc-2.4* )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_compile() {
-	econf $(use_enable debug) \
-	$(use_enable pam pam-module) \
-	--with-pam-module-dir=/$(getpam_mod_dir) \
-	--with-pid-file=/var/run/consolekit.pid \
-	--with-dbus-services=/usr/share/dbus-1/services/ \
-	|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	#crappy Redhat init script
-	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
-	rm -r "${D}/etc/rc.d/"
-
-	#Portage barfs on .la files
-	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
-
-	# Gentoo style init script
-	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You need to restart ConsoleKit to get the new features."
-	ewarn "This can be done with /etc/init.d/consolekit restart"
-	ewarn "but make sure you do this and then restart your session"
-	ewarn "otherwise you will get access denied for certain actions"
-	ewarn
-}
diff --git a/sys-auth/consolekit/consolekit-0.2.3.ebuild b/sys-auth/consolekit/consolekit-0.2.3.ebuild
deleted file mode 100644
index 9c4c6d019536..000000000000
--- a/sys-auth/consolekit/consolekit-0.2.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.2.3.ebuild,v 1.13 2008/03/29 02:50:32 vapier Exp $
-
-inherit eutils autotools multilib pam
-
-MY_PN="ConsoleKit"
-MY_PV="${PV//_pre*/}"
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug pam"
-
-# Not parallel make safe
-MAKEOPTS="$MAKEOPTS -j1"
-
-RDEPEND=">=dev-libs/glib-2.7
-	>=dev-libs/dbus-glib-0.61
-	>=x11-libs/libX11-1.0.0
-	pam? ( virtual/pam )
-	elibc_glibc? ( !=sys-libs/glibc-2.4* )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Work around an apparent FreeBSD kernel bug
-	use x86-fbsd && epatch "${FILESDIR}/${P}"-freebsd.patch
-}
-
-src_compile() {
-	econf $(use_enable debug) \
-	$(use_enable pam pam-module) \
-	--with-pam-module-dir=/$(getpam_mod_dir) \
-	--with-pid-file=/var/run/consolekit.pid \
-	--with-dbus-services=/usr/share/dbus-1/services/ \
-	|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	#crappy Redhat init script
-	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
-	rm -r "${D}/etc/rc.d/"
-
-	#Portage barfs on .la files
-	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
-
-	# Gentoo style init script
-	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You need to restart ConsoleKit to get the new features."
-	ewarn "This can be done with /etc/init.d/consolekit restart"
-	ewarn "but make sure you do this and then restart your session"
-	ewarn "otherwise you will get access denied for certain actions"
-	ewarn
-}
diff --git a/sys-auth/consolekit/consolekit-0.3.0.ebuild b/sys-auth/consolekit/consolekit-0.4.1.ebuild
index 64d2d42b95ba..807477727021 100644
--- a/sys-auth/consolekit/consolekit-0.3.0.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.1.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/sys-auth/consolekit/consolekit-0.3.0.ebuild,v 1.2 2009/03/17 22:48:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.1.ebuild,v 1.1 2009/10/29 23:33:46 eva Exp $
 
 EAPI="2"
 
@@ -8,21 +8,23 @@ inherit autotools eutils multilib pam
 
 MY_PN="ConsoleKit"
 MY_PV="${PV//_pre*/}"
+MY_P="${MY_PN}-${MY_PV}"
 
+# FIXME: Report on upstream for patch about policies ? (probably upstream devs wanted this behaviour as default...)
 DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc pam policykit"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=dev-libs/dbus-glib-0.61
 	>=x11-libs/libX11-1.0.0
 	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/policykit-0.7 )
+	policykit? ( >=sys-auth/polkit-0.92 )
 	elibc_glibc? ( !=sys-libs/glibc-2.4* )
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
@@ -30,29 +32,27 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/xmlto )"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+S=${WORKDIR}/${MY_PN}-${MY_PV}
 
 src_prepare() {
-	# Fix directory leaks, bug #258685
-	epatch "${FILESDIR}/${PN}-0.2.10-directory-leak.patch"
-
 	# Clean up at_console compat files, bug #257761
 	epatch "${FILESDIR}/${PN}-0.2.10-cleanup_console_tags.patch"
 
-	# Add nox11 option to no interfere with Xsession script, bug #257763
-	epatch "${FILESDIR}/${PN}-0.2.10-pam-add-nox11.patch"
-
 	# Fix automagic dependency on policykit
-	epatch "${FILESDIR}/${PN}-0.2.10-polkit-automagic.patch"
+	epatch "${FILESDIR}/${PN}-0.4.0-polkit-automagic.patch"
+
+	# Fix multilib support
+	epatch "${FILESDIR}/${PN}-0.4.0-multilib.patch"
 
-	# Fix inability to shutdown/restart
-	epatch "${FILESDIR}/${P}-shutdown.patch"
+	# Be able to shutdown or reboot even without polkit or RBAC supports
+	epatch "${FILESDIR}/${P}-shutdown-reboot-without-policies.patch"
 
 	eautoreconf
 }
 
 src_configure() {
 	econf \
+		XMLTO_FLAGS="--skip-validation" \
 		$(use_enable debug) \
 		$(use_enable doc docbook-docs) \
 		$(use_enable pam pam-module) \
@@ -80,11 +80,11 @@ src_install() {
 	keepdir /var/run/ConsoleKit
 	keepdir /var/log/ConsoleKit
 
-	insinto /etc/X11/xinit/xinitrc.d/
-	doins "${FILESDIR}/90-consolekit" || die "doins failed"
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/90-consolekit" || die "doexe failed"
 
 	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d/
-	doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed"
+	doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed"
 }
 
 pkg_postinst() {
@@ -93,8 +93,4 @@ pkg_postinst() {
 	ewarn "This can be done with /etc/init.d/consolekit restart"
 	ewarn "but make sure you do this and then restart your session"
 	ewarn "otherwise you will get access denied for certain actions"
-
-	ewarn
-	ewarn "You need to chmod +x /etc/X11/xinit/xinitrc.d/90-consolekit"
-	ewarn "to benefit of consolekit if you are not using gdm or pam integration."
 }
diff --git a/sys-auth/consolekit/files/90-consolekit b/sys-auth/consolekit/files/90-consolekit
index c25e8b49cfbc..309471498e48 100644
--- a/sys-auth/consolekit/files/90-consolekit
+++ b/sys-auth/consolekit/files/90-consolekit
@@ -7,6 +7,6 @@
 CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
 
 if [ -z "$XDG_SESSION_COOKIE" ] && [ -x "$CK_LAUNCH_SESSION" ]; then
-	STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+	command="$CK_LAUNCH_SESSION $command"
 fi
 
diff --git a/sys-auth/consolekit/files/consolekit-0.2.3-freebsd.patch b/sys-auth/consolekit/files/consolekit-0.2.3-freebsd.patch
deleted file mode 100644
index 2e5744092817..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.2.3-freebsd.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c

-index 0001b6b..bcdfb21 100644

---- a/src/ck-sysdeps-unix.c

-+++ b/src/ck-sysdeps-unix.c

-@@ -267,7 +267,13 @@ ck_wait_for_active_console_num (int   console_fd,

-                         g_debug ("Interrupted waiting for native console %d activation: %s",

-                                   num,

-                                   errmsg);

-+#if !defined(__FreeBSD__)

-+			/* We don't want to retry on FreeBSD since getting

-+			 * EINTR means we are terminating, and we don't want

-+			 * to keep restarting our active VT check.

-+			 */

-                        goto again;

-+#endif

-                 } else {

-                         g_warning ("Error waiting for native console %d activation: %s",

-                                    num,

-diff --git a/src/main.c b/src/main.c

-index 11b6f2e..af2998b 100644

---- a/src/main.c

-+++ b/src/main.c

-@@ -245,6 +245,27 @@ setup_debug_log_signals (void)

- }

- 

- static void

-+terminate (int sig __unused)

-+{

-+        return;

-+}

-+

-+static void

-+setup_termination_signals (void)

-+{

-+        struct sigaction sa;

-+

-+        sa.sa_handler = terminate;

-+        sigemptyset (&sa.sa_mask);

-+        sa.sa_flags = 0;

-+

-+        sigaction (SIGTERM, &sa, NULL);

-+        sigaction (SIGQUIT, &sa, NULL);

-+        sigaction (SIGINT,  &sa, NULL);

-+        sigaction (SIGHUP,  &sa, NULL);

-+}

-+

-+static void

- setup_debug_log (gboolean debug)

- {

-         ck_log_init ();

-@@ -300,6 +321,8 @@ main (int    argc,

- 

-         setup_debug_log (debug);

- 

-+        setup_termination_signals ();

-+

-         connection = get_system_bus ();

-         if (connection == NULL) {

-                 goto out;

-diff --git a/src/test-vt-monitor.c b/src/test-vt-monitor.c

-index c445865..e31b24e 100644

---- a/src/test-vt-monitor.c

-+++ b/src/test-vt-monitor.c

-@@ -30,6 +30,7 @@

- #include <fcntl.h>

- #include <pwd.h>

- #include <string.h>

-+#include <signal.h>

- #include <errno.h>

- 

- #include <locale.h>

-@@ -47,6 +48,12 @@ activated_cb (CkVtMonitor *monitor,

-         g_message ("VT %u activated", num);

- }

- 

-+static void

-+terminate (int sig __unused)

-+{

-+        return;

-+}

-+

- int

- main (int argc, char **argv)

- {

-@@ -55,12 +62,22 @@ main (int argc, char **argv)

-         GError           *error;

-         guint             num;

-         gboolean          res;

-+        struct sigaction  sa;

- 

-         if (! g_thread_supported ()) {

-                 g_thread_init (NULL);

-         }

-         g_type_init ();

- 

-+        sa.sa_handler = terminate;

-+        sigemptyset (&sa.sa_mask);

-+        sa.sa_flags = 0;

-+

-+        sigaction (SIGINT,  &sa, NULL);

-+        sigaction (SIGTERM, &sa, NULL);

-+        sigaction (SIGQUIT, &sa, NULL);

-+        sigaction (SIGHUP,  &sa, NULL);

-+

-         if (! ck_is_root_user ()) {

-                 g_warning ("Must be run as root");

-                 exit (1);

diff --git a/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch b/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
new file mode 100644
index 000000000000..b898353d8f2e
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
@@ -0,0 +1,120 @@
+From c4ba8b276bf95faf2f643e42988709ed6cb0b2f0 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 18 Oct 2009 23:30:36 +0200
+Subject: [PATCH] respect multilib
+
+---
+ src/Makefile.am           |    4 ++--
+ src/ck-manager.c          |    4 ++--
+ src/ck-seat.c             |    2 +-
+ src/ck-session.c          |    2 +-
+ tools/freebsd/Makefile.am |    2 +-
+ tools/linux/Makefile.am   |    2 +-
+ tools/solaris/Makefile.am |    2 +-
+ 7 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6ab05c8..d6fb810 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -204,8 +204,8 @@ MAINTAINERCLEANFILES =			\
+ 
+ install-data-local:
+ 	-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
+-	-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
++	-mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d
+ 	-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
+-	-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
++	-mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
+ 	-mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
+ 	-mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit
+diff --git a/src/ck-manager.c b/src/ck-manager.c
+index 99693a3..e65e25b 100644
+--- a/src/ck-manager.c
++++ b/src/ck-manager.c
+@@ -1083,7 +1083,7 @@ do_restart (CkManager             *manager,
+         log_system_restart_event (manager);
+ 
+         error = NULL;
+-        res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart",
++        res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart",
+                                           &error);
+         if (! res) {
+                 GError *new_error;
+@@ -1164,7 +1164,7 @@ do_stop (CkManager             *manager,
+         log_system_stop_event (manager);
+ 
+         error = NULL;
+-        res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-stop",
++        res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop",
+                                           &error);
+         if (! res) {
+                 GError *new_error;
+diff --git a/src/ck-seat.c b/src/ck-seat.c
+index af7db59..d089f29 100644
+--- a/src/ck-seat.c
++++ b/src/ck-seat.c
+@@ -1278,7 +1278,7 @@ ck_seat_run_programs (CkSeat    *seat,
+         g_assert(n <= G_N_ELEMENTS(extra_env));
+ 
+         ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
+-        ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env);
++        ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
+ 
+         for (n = 0; extra_env[n] != NULL; n++) {
+                 g_free (extra_env[n]);
+diff --git a/src/ck-session.c b/src/ck-session.c
+index d8db9dd..c2fc320 100644
+--- a/src/ck-session.c
++++ b/src/ck-session.c
+@@ -1287,7 +1287,7 @@ ck_session_run_programs (CkSession  *session,
+         g_assert(n <= G_N_ELEMENTS(extra_env));
+ 
+         ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env);
+-        ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env);
++        ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env);
+ 
+         for (n = 0; extra_env[n] != NULL; n++) {
+                 g_free (extra_env[n]);
+diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am
+index f668722..d25930e 100644
+--- a/tools/freebsd/Makefile.am
++++ b/tools/freebsd/Makefile.am
+@@ -6,7 +6,7 @@ NULL =
+ SUBDIRS = \
+ 	$(NULL)
+ 
+-scriptdir = $(prefix)/lib/ConsoleKit/scripts
++scriptdir = $(libdir)/ConsoleKit/scripts
+ script_SCRIPTS =			\
+ 	ck-system-stop			\
+ 	ck-system-restart		\
+diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
+index 5a95942..51196c0 100644
+--- a/tools/linux/Makefile.am
++++ b/tools/linux/Makefile.am
+@@ -6,7 +6,7 @@ NULL =
+ SUBDIRS = \
+ 	$(NULL)
+ 
+-scriptdir = $(prefix)/lib/ConsoleKit/scripts
++scriptdir = $(libdir)/ConsoleKit/scripts
+ script_SCRIPTS =			\
+ 	ck-system-stop	\
+ 	ck-system-restart		\
+diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am
+index f668722..d25930e 100644
+--- a/tools/solaris/Makefile.am
++++ b/tools/solaris/Makefile.am
+@@ -6,7 +6,7 @@ NULL =
+ SUBDIRS = \
+ 	$(NULL)
+ 
+-scriptdir = $(prefix)/lib/ConsoleKit/scripts
++scriptdir = $(libdir)/ConsoleKit/scripts
+ script_SCRIPTS =			\
+ 	ck-system-stop			\
+ 	ck-system-restart		\
+-- 
+1.6.5.rc1
+
diff --git a/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch b/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch
new file mode 100644
index 000000000000..d068ca23798d
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch
@@ -0,0 +1,31 @@
+Automagic polkit
+
+---
+--- configure.ac
++++ configure.ac
+@@ -55,10 +55,21 @@
+   gthread-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+ 
+-PKG_CHECK_MODULES(POLKIT,
+-  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
+-  have_polkit=yes,
+-  have_polkit=no)
++AC_ARG_ENABLE([polkit],
++  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
++  enable_polkit=$enableval,
++  enable_polkit=auto)
++
++if test "x$enable_polkit" != "xno"; then
++  PKG_CHECK_MODULES(POLKIT,
++    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
++    have_polkit=yes,
++    have_polkit=no)
++  if test "x$enable_polkit"  = "xyes" -a "x$have_polkit" = "xno"; then
++    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
++  fi
++fi
++
+ if test "x$have_polkit" = "xyes" ; then
+        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
+ fi
diff --git a/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch b/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch
new file mode 100644
index 000000000000..3183f11ece08
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch
@@ -0,0 +1,35 @@
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Sat, 24 Oct 2009 18:43:43 +0200
+Subject: [PATCH] Be able to shutdown or reboot even without polkit or RBAC supports
+
+Ck does NOTHING at the origin if its built without polkit or RBAC supports, except
+display a warning using g_warning() (which does not make sense).
+The trick is to to call do_stop()/do_restart() in the #else directive :)
+
+---
+ src/ck-manager.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/ck-manager.c b/src/ck-manager.c
+index 99693a3..181df0d 100644
+--- a/src/ck-manager.c
++++ b/src/ck-manager.c
+@@ -1129,6 +1129,7 @@ ck_manager_restart (CkManager             *manager,
+         check_rbac_permissions (manager, context, do_restart);
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
++        do_restart(manager, context);
+ #endif
+ 
+         return TRUE;
+@@ -1200,6 +1201,7 @@ ck_manager_stop (CkManager             *manager,
+         check_rbac_permissions (manager, context, do_stop);
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
++        do_stop(manager, context);
+ #endif
+ 
+         return TRUE;
+-- 
+1.6.5.1
+