Use the (correct) pid file to control ConsoleKit start/stop. Also, do a blank -r2 bump so users get the new init script.

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

4 files changed, 18 insertions, 18 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 08dcbbc6b467..77810e778a47 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2009/06/11 23:00:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.49 2009/09/12 19:46:18 nirbheek Exp $
+
+*consolekit-0.3.0-r2 (12 Sep 2009)
+
+  12 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  files/consolekit-0.1.rc, -consolekit-0.3.0-r1.ebuild,
+  +consolekit-0.3.0-r2.ebuild:
+  Use the (correct) pid file to control ConsoleKit start/stop. Also, do a
+  blank -r2 bump so users get the new init script.
 
   12 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
   consolekit-0.3.0-r1.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index d8ea6ff65791..baa39b730bbd 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 90-consolekit 272 RMD160 63bfb8c8320ce5590013848632f4d03bbeecdb90 SHA1 094f29f3efc6523db9d464f1d67e64a87214abbe SHA256 7a133beda59eace7572849ffaff305c3627860d26735bbbd0352620f626f0cb9
-AUX consolekit-0.1.rc 540 RMD160 0db24125d14b177ac54819f4d57fcac589a86bf3 SHA1 e1001914190b644d1557034f5534ba412e4ead57 SHA256 53510ed5f365af2f5fc760fb9462aea660ba54cbbd5f4c6be8d3bc75c4c399c8
+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
@@ -18,14 +15,7 @@ DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fca
 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
-EBUILD consolekit-0.3.0-r1.ebuild 3024 RMD160 a459cd119e14363472652ac3dfbd0f0fc144bcdc SHA1 96df17e9e4f6bbd1dfac3719537abdf2bba1d4d4 SHA256 0445128119e13cfbdef5ecfc61427febd44e59bf87da626c0c1897f804802001
+EBUILD consolekit-0.3.0-r2.ebuild 3029 RMD160 83e1afd73d61f0aa25178169f91b2f27d7786213 SHA1 86541d1a86582faccfa655e181988c758068d80c SHA256 e2aa882b853c25d7a8266a7e89bf8179edbb4b8acd502d107da63007a57f717f
 EBUILD consolekit-0.3.0.ebuild 3001 RMD160 f363e675bca2730de53557468c987460c4d956dd SHA1 0474b904f7b81420e4cb0f94a17e64e63b56b873 SHA256 edac31ab2222276780aeaefd0ddba0995baf2242b7b9e02e7016d62efb64aa7d
-MISC ChangeLog 7447 RMD160 591e41680a295729662249710c4cd803581d62af SHA1 b74129671eae913e16269460b2d517eb85ec69ec SHA256 8433dd1a9d9396609bd4e93e6d4d3d855aa1bc4e1ce6e83237c54614592a11d8
+MISC ChangeLog 7755 RMD160 07a8b1f8351be220551b65e9d292bc7d4ae8fd28 SHA1 9782980ef84bf5ed752d0972894bc2b59a226eb5 SHA256 e0563106d6be1d5a1e85333b9bab0e86fbd99f06a7c13acff917b3e5e83291af
 MISC metadata.xml 316 RMD160 0d18a4fee930a899bcd1eeff6fc7fe4de491f71b SHA1 0643d12b32e383861623f4f257f9d5b1446a90da SHA256 d026b12ac11b38e175987871769588146cf0c587a1462559cd1581ae05aaa83d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoxqJcACgkQ1fmVwcYIWAY3JQCgrCwwr1Szw7xS9Yqm+FIipQ1T
-/i4AnRntTuB+gjGATGUxxHfG3D/jGMJk
-=2Vvo
------END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild b/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild
index ed7a8d4a90b6..824cd4ece4ab 100644
--- a/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.3.0-r2.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-r1.ebuild,v 1.3 2009/06/11 23:00:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild,v 1.1 2009/09/12 19:46:18 nirbheek Exp $
 
 EAPI="2"
 
diff --git a/sys-auth/consolekit/files/consolekit-0.1.rc b/sys-auth/consolekit/files/consolekit-0.1.rc
index e2db136ff731..d469b46343ef 100644
--- a/sys-auth/consolekit/files/consolekit-0.1.rc
+++ b/sys-auth/consolekit/files/consolekit-0.1.rc
@@ -1,7 +1,7 @@
 #!/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.1 2007/03/24 17:09:06 steev Exp $
+# $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
@@ -11,12 +11,14 @@ depend() {
 start() {
 	ebegin "Starting ConsoleKit daemon"
 
-	start-stop-daemon --start -q --exec /usr/sbin/console-kit-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 
+	start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid 
 	eend $?
 }