Removed keepdir on /var/run/ConsoleKit as per bug 387901

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 135 insertions, 11 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 31f20f451bcb..368b3ec4dc58 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.113 2011/10/14 18:38:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.114 2011/10/20 19:14:47 axs Exp $
+
+*consolekit-0.4.5-r2 (20 Oct 2011)
+
+  20 Oct 2011; Ian Stakenvicius <axs@gentoo.org> +files/consolekit-0.2.rc,
+  +consolekit-0.4.5-r2.ebuild:
+  Removed keepdir on /var/run/ConsoleKit as per bug 387901
 
   14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -consolekit-0.4.4.ebuild,
   -consolekit-0.4.5.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 69343d70e9ae..d4de9961bf42 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 90-consolekit-3 1027 RMD160 79246172e49653eeb6e73c0e26ea33d90d70eb2c SHA1 8195f7c2fc6c25ea940bcc516f705ae363423363 SHA256 91e0900995f7db536220065959d236fb75ec2c77096981a142e2e948518d9761
 AUX consolekit-0.1.rc 586 RMD160 04282efee7a8abb69ddd787ea4b9f180e6954d86 SHA1 4ca9cb3f4d33d08c2dadcd7a9884ed351990376f SHA256 af61c7d61bfda4d7c30f3f4142a9e8dc26bfdd4e14c57d7ff8bfef5febdcee1f
 AUX consolekit-0.2.10-cleanup_console_tags.patch 1728 RMD160 d1fffa6524eec4f3ad8c1412c9ad9bfeae179a1c SHA1 c07d848591fafbe79709a3313bfaffd3e601f309 SHA256 884c8cd1186b26746ec6e4cfdb13771e62e54c892979501e231ba6a6611b5449
+AUX consolekit-0.2.rc 627 RMD160 46f8b6eba63d4957c927b53a5a114512e6163cad SHA1 13a923f4beaf8c534c435a300bd79d45d4446a12 SHA256 da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49
 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.4.5.tar.bz2 425423 RMD160 2eba158e321778a4c17bf765d0106d214b93fe53 SHA1 6f090c1ce0d459dd6904854532554323755bdeca SHA256 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38
 EBUILD consolekit-0.4.5-r1.ebuild 2798 RMD160 63051e68a82ac7d331237f974502026ee2a5df83 SHA1 efbc5866306fcff6b8b4d80ba2160f1482ead335 SHA256 72d761240d0500f40d65fc59c57835b595520571b2b08cc53a2d2e76ddb7e176
-MISC ChangeLog 16247 RMD160 da27a0e6cd6f931531e98c5a2a8c3bda7d228834 SHA1 e1b9bf8e39cbcf75d94e2b3c3055d6d24d90ec83 SHA256 2f23ccfc6cc72ed52143604fdddaddc095ab3f52f2ef4ea9c8b0f4ff5d643624
+EBUILD consolekit-0.4.5-r2.ebuild 2779 RMD160 916895192f1ba797551193783dc487c96f9975d7 SHA1 03c4670e5e675d64cbe9ef4dd836faf1df14e1e2 SHA256 b928f1eac61d1a78b83660d36b810106485b4e2a783e40e339f4ee62f2926255
+MISC ChangeLog 16443 RMD160 64e103960593b26c2f0b7b82e8f8c79827c7c149 SHA1 659859a1d37682e365cc19c59a6eca49b3a9b225 SHA256 c506c8434dbb7aad659b1b9f534a7b5fef10a7515984e14fa5b2c651545bea17
 MISC metadata.xml 313 RMD160 d6625d48d47f8417bccec2c9ccf0524b5bbd58e5 SHA1 7934855c56b41e669b8070577a7838e3037dd1a1 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmIGtAAoJEEdUh39IaPFNR9QH/05TJnlYzHqcEczJx7wSj8cR
-0Pdk+H0CN+ww4NM8wSESWhEMTzUchtDs/jBGZMGOOmM1lXdnjw3B3y5CT0NwvGQs
-Lk4iD/igv8nYFn63gXO/BAIcDDhbXeROee2nkwkfVcOuP5VPipHIB084kDLMOdlW
-vZ/HWOReZrw823r3dbYuDFxawq+H6LiMpiryuiIjCelK/tH4xYUsohNE5bntXi0b
-5BAmNrC+5iVX4VSQPimsF5SasoyH6F1BTN0pACzAOiIvMKVFef3obaE3JlHlMlvr
-3ig28gzUHgX2QHajCgCamzZzcVgNQNTctEiCIH+i85aP3u3kKhSZdml8QfkCWbg=
-=RTGK
+iF4EAREIAAYFAk6gcyIACgkQAJxUfCtlWe1+QgD/bMHSbiAVDjgVOfbVm1naLsjw
+ZozfnoEA8/Yl7FENM3wBAJD+WToxhCDh0FLyJv16q5B4M7yw3BqnR6tQu/Nq+Qzf
+=mLoP
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.5-r2.ebuild b/sys-auth/consolekit/consolekit-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..e5babf82bc8b
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.4.5-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5-r2.ebuild,v 1.1 2011/10/20 19:14:47 axs Exp $
+
+EAPI=4
+inherit autotools eutils linux-info multilib pam systemd
+
+MY_PN=ConsoleKit
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug doc kernel_linux pam policykit test"
+
+RDEPEND=">=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.20:2
+	sys-libs/zlib
+	x11-libs/libX11
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.101-r1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	doc? ( app-text/xmlto )
+	test? ( app-text/docbook-xml-dtd:4.1.2 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# This is required to get login-session-id string with pam_ck_connector.so
+	if use pam && use kernel_linux; then
+		CONFIG_CHECK="~AUDITSYSCALL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
+		"${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
+		"${FILESDIR}"/${PN}-0.4.0-multilib.patch \
+		"${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		XMLTO_FLAGS="--skip-validation" \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable pam pam-module) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-pam-module-dir=$(getpam_mod_dir) \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
+
+	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
+
+	keepdir /usr/$(get_libdir)/ConsoleKit/run-seat.d
+	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
+	keepdir /etc/ConsoleKit/run-session.d
+	keepdir /var/log/ConsoleKit
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
+
+	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
+	doexe "${FILESDIR}"/pam-foreground-compat.ck
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	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"
+}
diff --git a/sys-auth/consolekit/files/consolekit-0.2.rc b/sys-auth/consolekit/files/consolekit-0.2.rc
new file mode 100644
index 000000000000..b20226767525
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.rc
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/consolekit-0.2.rc,v 1.1 2011/10/20 19:14:47 axs Exp $
+
+depend() {
+	need dbus
+	use logger
+}
+
+start() {
+	ebegin "Starting ConsoleKit daemon"
+
+	checkpath -q -d -m 0755 /var/run/ConsoleKit
+
+	start-stop-daemon --start -q \
+		--pidfile /var/run/ConsoleKit/pid \
+		--exec /usr/sbin/console-kit-daemon -- 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ConsoleKit daemon"
+	start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid 
+	eend $?
+}