old

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

8 files changed, 19 insertions, 386 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index c83a78265766..b7ec0dba4669 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.131 2012/07/15 17:45:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.132 2012/07/27 18:10:05 ssuominen Exp $
+
+  27 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> -files/consolekit-0.1.rc,
+  -files/consolekit-0.2.10-cleanup_console_tags.patch,
+  -files/consolekit-0.4.0-multilib.patch,
+  -files/consolekit-0.4.0-polkit-automagic.patch,
+  -files/consolekit-0.4.1-shutdown-reboot-without-policies.patch,
+  -consolekit-0.4.5-r1.ebuild:
+  old
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org>
   consolekit-0.4.5_p20120320.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index d5fc03b8e921..e4ad69d5d6e0 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -2,27 +2,24 @@
 Hash: SHA1
 
 AUX 90-consolekit-3 1027 SHA256 91e0900995f7db536220065959d236fb75ec2c77096981a142e2e948518d9761 SHA512 2a1273d775aeb69a3e0873d6a82868d909cdbc3d5003b7625ab12e76ef44f115b464514e7890f7e562c44a92383475e698c3679f6c9f1bf42b5199d03d8c604a WHIRLPOOL 85fd88509ab68a8cdc069e078f4f944c87688fc26b9414ca5556057c90c9ef96382e88f4df3ad1415547cb1abd1f2b4b50518984a314fe1430d4de5d3d63dbd2
-AUX consolekit-0.1.rc 586 SHA256 af61c7d61bfda4d7c30f3f4142a9e8dc26bfdd4e14c57d7ff8bfef5febdcee1f SHA512 a7acaee4604b1ffca38cd2603ee74cf5a6a96c275873bc8cbfa9f05c75c164cce8949dd641228f420f335cecc66068eef72ec0c9f55897222543b7aa3ae63362 WHIRLPOOL 630af00943a61cd5e119bea7c0787abfa59b631b9a8c736163ea9a6c117042eda7748461dd8ea94ed99cce1adfc360d0546e928270ae7657be0275771680937e
-AUX consolekit-0.2.10-cleanup_console_tags.patch 1728 SHA256 884c8cd1186b26746ec6e4cfdb13771e62e54c892979501e231ba6a6611b5449 SHA512 faeabf47e0406b68661ecbbe8174c83e27110c8de9e00b7aac0a33e5ee5cda1076b9f102bdd3db1f7c24647fe9f89b9bb2ab76ddd28113add9cbbea8a2057776 WHIRLPOOL 38a705bb2db7a7995bc003a75e9f27c8446ab5985c4716724b5dfa7b62e10e66e02338bc0f088c75c1db926a62e93d7eb4852320c02e562d6b46af1ed802d979
 AUX consolekit-0.2.rc 627 SHA256 da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49 SHA512 06e7469b379036255833cc9f411cc096013b236042abeae8acaf3c26f4b39f7537779014ab9751ec089bef34420b463553581e022ebf7c291015b509d1d4475c WHIRLPOOL 54d3a4b7eabf9fb35411739936b42d7f681bcaf5fa65f5540750d66f5ee6f07f7e2f0cdfa533d1574a9d5d4aea47dc5ef9c9dcf38b4d535d9c33d2269aea7309
-AUX consolekit-0.4.0-multilib.patch 4378 SHA256 1b00d28b62c0c71648978a48e65bd1bac08d230945c933e3f7cfd74cf59f337d SHA512 8e3022c7b84ad74b698c2cdfe3dcf4753968a99f7e48ca22c7705015040050faf4d5f6841f311d6010502c5903c0cf1cc92aa23a6394d37d07ae12d07bf89a42 WHIRLPOOL 12dd5db11167b998a619366a026599bd900004a1a2e50ba90e6e23ed9b2e46e984e312c47885afb9ec63ca7d89bbc2cc68d9fb27f4e593f2e6753cf7b7ecae42
-AUX consolekit-0.4.0-polkit-automagic.patch 841 SHA256 965ea7e3a2868ae8fa3d0ee6c48a5b06149c08d273e8f4a8e6afa9eec0a26357 SHA512 b088c3841c249e1ec7b93a5053287b771ac5eca4f881bcc7d18c60bf34f63a7d0b703fdeb37725e69a08600498a06cdfd93569436bfd0b8b4dd6bece657819e4 WHIRLPOOL e303faedf6f2cf594af5235639bda9ae490294cff8bb6ae3d554ac32eddf6e28cbac8a143b7866405136ae582f15d15c755ecb4c7f07e8ddc806ce9454ac59af
-AUX consolekit-0.4.1-shutdown-reboot-without-policies.patch 1166 SHA256 78e7e3b71c34c9a0b2eef58c55c8ac6e34fd4ee0ddb03d20c9adf138d2dafbc9 SHA512 efbe0d233bd0959c993dff565608acc7b4072ee3c4a48198c0ab4b75b0448048764396c94af5b7a7acb1371688bd825dbc0a73b50a1c44b13e064f40edc10085 WHIRLPOOL 08171e7726e84554133af0e97bb2b92b6f7d4ca9664f15f1ce4070848c4f682cf62ac23bb33fc4b4c38157f6347c1c599d0cac89bce15b28f9765dcabb309068
 AUX consolekit-0.4.5-polkit-automagic.patch 870 SHA256 7cd8e4ecc868b0d2566cc0d0b7b3d13a006fe55ff425314d15ecff83e550d184 SHA512 50c2bafe2bf995bd5ef863557a1783211e172d77d819c8001c9007b4833b4e6b3ccfa7c04bf6811086dff6371be488411fdd23a49cecec3f545c388a0bbd61ab WHIRLPOOL 5611fdb8f17afd662ce0f745334dcbbb606fb8247ae18f914ae233cb7c024f418b94b4e353d6513c67c4346475af98d02d5551b4cb88e511df21eb765cbd1cb7
 AUX consolekit-cleanup_console_tags.patch 1596 SHA256 178d25a93bc04b070840650b6f847b018796186d2a54a3be7b0a6df75e8f501c SHA512 8639c45baefc5fa4751654345225029b455e9a5ee5be5835c69ff0d6bf3532fc1ccf606fdb0cd29849071a26ab3defff8f7e31d19e83117dfe467b6209a37a77 WHIRLPOOL 2bf35176a05687402b333d74497dd3d2340ede2d55fe068926d3267d921adeef7f5333435f34d9eec1813c1fc0f8fcdc0b0ee979439f6f27ef86aeae620e96fb
 AUX consolekit-shutdown-reboot-without-policies.patch 924 SHA256 cd9a2aa582644ad50fb98e4580b9cf889c71a40f637eb0beb0eaab96d3ad9a47 SHA512 7bca0a448329cabbaa42028e212edc4ae242dcef9947cc2d49e66280cfae1193aedcac9921be90b9dd24265c17c3c53876bbea1ca223906a20252d94c4d65a9c WHIRLPOOL 56aa6327a226255ae01cc2c0298b658daf1f21dc8d54269b105aa6b490f815df0aac02604a82c01c2c4fd3d3f7899482df1596dffa10b6aa7b13b136fa3fcb3c
 AUX consolekit-udev-acl-install_to_usr.patch 750 SHA256 823316f6898eaab0744e42fa11b1631f64187aebca35baa5aeab09279820bedd SHA512 d2d6fcedea5e72f5a1b387f411ac62a59fd3c9e90a318bd85c35d210b89b18f01511f6b05352c1a4a9508622f0b9242c1b9c15d5ae4f8adf2819b6c3a0ff5ac9 WHIRLPOOL a9b8f48c5dddabfa28c2a65ac99c10dd7cba41d8bdcdc1fac4a0932391a81d9ed87f34115d7a43611d2cd126d10a5378edb8e734c888d529eca4b0d20dd15ac1
 AUX pam-foreground-compat.ck 389 SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9 SHA512 3cabd23ff7dc5de0a86284c3a3d3ff923228969cc954a1036290d4f7f6d58646ea6ea1445f472476b6f319df4dcd22f71e5e0f5cc8c845cd7e0b148af689ce5a WHIRLPOOL a8e36292dc094e107492e65efd147b35e217c652c8bcc52c768942b15660ff7d251e55ee038ce326905f5dc8f17857b62725768d60c3d5c93927550c8ff47db2
-DIST ConsoleKit-0.4.5.tar.bz2 425423 SHA256 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38 SHA512 9f969aeb2199810f73cdf111c7af38231d09b1c04d71209b2fa9c3ab7d39e3ca018b6aa0088abf1fafbf19550d2f844eeee8b3e298970959af1c88a7b366be80 WHIRLPOOL 522d52849af2e48eef50bbeb9fc41330bfd003f96e5debcbf454d5035cf7a6de5dfd836fec59ec065e407a7ff87b03e6139274cac993689c807eac2e88059358
-DIST ConsoleKit-0.4.5_p20120320.tar.xz 103424 SHA256 f85abe0644f4e9314bd33411aebceef662e482c02ab70635426996f743e2bbe3
-EBUILD consolekit-0.4.5-r1.ebuild 2852 SHA256 9faefeb17b47681effa5ef233f94dc884b6e37e259f433eb47f6cfddc9948149 SHA512 92de697ea2602a0793e9726f6ef9d696bece7883b7c88384a5d054a79b463f67396ca4041f54297b622a800a8af451c4770c048388f7bfd2c45447ca0cbcd3a5 WHIRLPOOL 7533063532989d00615202d41d341195f40742530f7cb73f830a187d423e85d0a99eee9aedb71203a75f69a6910cae0271edd8e77c6d3229bc8e7ee4c674ee80
+DIST ConsoleKit-0.4.5_p20120320.tar.xz 103424 SHA256 f85abe0644f4e9314bd33411aebceef662e482c02ab70635426996f743e2bbe3 SHA512 17ca572b49f175c3bb4e296927e8b2d5bb5c9af04c26175cc40b84ce8273aec2ff744df64089003ac79bf7a415b69a4fd7753a0bc65ff33bc99d6c79890e9fe3 WHIRLPOOL b8d66d91de932a0d9a6ca16d39bd1d301823531d55f0a9a98672408752458c5c55044eeed1ade37c58dfd67db61bcd30ab6919fd4fee878f949928feda8075ba
 EBUILD consolekit-0.4.5_p20120320.ebuild 2987 SHA256 818101525498816a7ba73ec49dbbfae71ed5e85da5215a17013e76b3a4c85019 SHA512 b4aded6a704ff14eb848a4b483c1b0b49e57d0a896ea31b0ba42948fc62548e23e26216d29073e9bde062884b70341b49e5eefd294d3ba3ac1dfbb0c57c41338 WHIRLPOOL f32e0add2c575e2d66342df0d7a0a500f038c721d51b9909351d2a477a2cd9788ee844bdf1336435eb0272dcd6f7a0f49576db9c47cd5140866b4f313573de9c
-MISC ChangeLog 19421 SHA256 5792c0e8f58f4afb4654520602a569c96604bbb386ecb0945f823d1aaa3d9dd0 SHA512 bbbb29db3350b387a4566734069adc2b6abb6bd09cc33f48bef045fab20946ca50deb610792030c603549a8d9b68d05a8410c6b9de1c0ab1458d9d4afa5cc1a4 WHIRLPOOL cc4d2711bade0eede21a562d710bcc4d940ad1366d5f79213b185c79524d7d1f1bac687b274ba9c4902defde046470943d6a8118a862f91c13b610ec1d26aded
+MISC ChangeLog 19754 SHA256 3dd3ee80c9a844c27931769ed217fbbc159d92c8b566e7cda5835985d50f16ca SHA512 b11fb4fda6343e46b230d7c43e1afdd5f7cc7c0b2bf8c28dcbf5861c87f80f5b67365a22586d6a26bb5cc89edf0929e5803c8d511cd90ab9bb4bd6366d0cac44 WHIRLPOOL 0e188fca518c21a00e16f3f4b765d4c6b6fb2ffd3efa91434dab7893ead799ffedc662a011bfb2d594bb60b541063d5313769996d37ca2fb211ce2dcbf67c0ae
 MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlADAdYACgkQuQc30/atMkAhIwCfeIBoOQi/YgTcPr61Fo/V1+r1
-NhIAnjHJ84fzosACOZc7lhA4iF2+SB3H
-=hvU/
+iQEcBAEBAgAGBQJQEtlnAAoJEEdUh39IaPFNy4oH+gJE4u3aRICBHqx6abIa7/F5
+WZHIbtD/jw2R0+ZAUBeYlnaQ8fV+EkSnuNzF01rQMN+a5WjMC4n8quKDynV7T22v
+q+Q4Kz7vDbatejwiX89ESiXbT6Q0x+lDJvwESrtZzTyF1IVWbhTgWKpqjZvh+ypH
+41MMUI6qFC+hVwQ/AF1gqw5dCcr/tcCqzckqNQrSKyky0/GFxFN1bMx0Y2qqlUSB
+1cEuGoAA8FZMKUYJCxXEVV3bo23Wv6aAo51geP0fs1k1NpZ9Vgt6e/TOBJPv58I7
+3DbVrOaJWe6XiuuLDLYybYAUOGPYxLeBGzlIXiuFIdA9Jw6ZIxSyCfF5jmFOHmc=
+=UMeb
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.5-r1.ebuild b/sys-auth/consolekit/consolekit-0.4.5-r1.ebuild
deleted file mode 100644
index ca39d964d8bb..000000000000
--- a/sys-auth/consolekit/consolekit-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.10 2012/06/30 10:35:54 swift 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 selinux 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 )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${RDEPEND}
-	virtual/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.1.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/run/ConsoleKit
-	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.1.rc b/sys-auth/consolekit/files/consolekit-0.1.rc
deleted file mode 100644
index d469b46343ef..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.1.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 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.1.rc,v 1.2 2009/09/12 19:46:19 nirbheek Exp $
-
-depend() {
-	need dbus
-	use logger
-}
-
-start() {
-	ebegin "Starting ConsoleKit daemon"
-
-	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 $?
-}
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch b/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch
deleted file mode 100644
index 4dbd62575949..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-# Clean up at_console compat files, bug #257761
-# http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/0.2.10-1ubuntu9/
---- a/src/main.c	2008-07-25 03:19:34.000000000 +0200
-+++ b/src/main.c	2008-07-26 00:25:13.000000000 +0200
-@@ -149,6 +149,43 @@
-         unlink (CONSOLE_KIT_PID_FILE);
- }
- 
-+#define CONSOLE_TAGS_DIR "/var/run/console"
-+
-+static void
-+delete_console_tags (void)
-+{
-+	GDir *dir;
-+	GError *error = NULL;
-+	const gchar *name;
-+
-+	g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
-+
-+	dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
-+	if (dir == NULL) {
-+		g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
-+		           error->message);
-+		g_error_free (error);
-+		return;
-+	}
-+	while ((name = g_dir_read_name (dir)) != NULL) {
-+		gchar *file;
-+		file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
-+
-+		g_debug ("Removing tag file: %s", file);
-+		if (unlink (file) == -1) {
-+			g_warning ("Couldn't delete tag file: %s", file);
-+		}
-+		g_free (file);
-+	}
-+}
-+
-+static void
-+cleanup (void)
-+{
-+	delete_console_tags ();
-+	delete_pid ();
-+}
-+
- /* copied from nautilus */
- static int debug_log_pipes[2];
- 
-@@ -229,7 +266,7 @@
-                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
-                 written = write (pf, pid, strlen (pid));
-                 close (pf);
--                g_atexit (delete_pid);
-+                g_atexit (cleanup);
-         } else {
-                 g_warning ("Unable to write pid file %s: %s",
-                            CONSOLE_KIT_PID_FILE,
-@@ -312,6 +349,8 @@
- 
-         g_debug ("initializing console-kit-daemon %s", VERSION);
- 
-+	delete_console_tags ();
-+
-         create_pid_file ();
- 
-         manager = ck_manager_new ();
diff --git a/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch b/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
deleted file mode 100644
index b898353d8f2e..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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
deleted file mode 100644
index d068ca23798d..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 3183f11ece08..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-