Fix typo in 90-consolekit, see ChangeLog for details

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

4 files changed, 13 insertions, 7 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index c792b757c198..0c1cb92ec749 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.79 2010/10/27 19:10:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.80 2010/10/28 16:02:49 ssuominen Exp $
+
+*consolekit-0.4.2-r4 (28 Oct 2010)
+
+  28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +consolekit-0.4.2-r4.ebuild, +files/90-consolekit-3:
+  Change variable "STARTUP" to "command" wrt #343033 by Matthew Turnbull.
 
   27 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   consolekit-0.4.2-r3.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 3c91b50b205d..d584a09040b3 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,5 +1,5 @@
 AUX 90-consolekit 272 RMD160 f95a580dda5e8d65713153921cd77f8c064b2357 SHA1 f3e535ae34b9f30ad45c77ceac116ec73572b3d9 SHA256 d372f292f765c1cab533285be8f9af16b0783d7aa44a5e038174396e61c780cc
-AUX 90-consolekit-2 1027 RMD160 c713fd1b11dcee16d92eeb48c0aa64454f426d50 SHA1 456f751789549999a867f58e2379473a334627e2 SHA256 d6c82cca2bb84ec4a1e0e85ae49a1849000e742f615609d16af97dc7d3583a06
+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.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54eb7d42d600f4e1b1 SHA1 ada8d56ab096dc49d609f1d9f44679971936c0df SHA256 9e31ae84ec3d838aaaddaa1fee1b68f7bf02e6c16935ca2a7a3cc086ff868433
@@ -11,6 +11,6 @@ AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81
 DIST ConsoleKit-0.4.1.tar.bz2 398080 RMD160 800076645134ad63d582ea9ffb3ada0113a32db1 SHA1 ab2b8643c1e696df4dc79d9ee0323bdc95aaa6a1 SHA256 f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
 DIST ConsoleKit-0.4.2.tar.bz2 412651 RMD160 cc76cfb1462a238754c7c1ecd7404a0db26c7501 SHA1 fa588abe532c1d55fd98e0cc0178dde3f30266ff SHA256 656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15
 EBUILD consolekit-0.4.1.ebuild 2972 RMD160 1648925c2b711cf51bc874774ea7d5ea783ad60e SHA1 5992cd04c68009be7bf90a50e0d1bdb4899efd18 SHA256 79c062a5c916f369cc6d023024a1ee85f8515f7c36ea032d93e10b660bc1097f
-EBUILD consolekit-0.4.2-r3.ebuild 2767 RMD160 4c9d4fbd2ce82a70031e03c40746381d8e1eeca4 SHA1 073229357e2df43cd6c84b0dfadc5d41f83b1a8e SHA256 7147f2770704c86798bc0f4fa2a680684fcda417258a0e4987e0640f7079c0b2
-MISC ChangeLog 12127 RMD160 2357d4f4f2e1932aca116c87743ad01d47e86149 SHA1 03c2f1f8403782774b3187fd1b0122feef8dc5db SHA256 0a272f65205a5cd8229028c530acc21bacdf3b957135673a2f3a3fbe1551044f
+EBUILD consolekit-0.4.2-r4.ebuild 2767 RMD160 fba67a23d70658ccb1012f6d6e89219eed8ee600 SHA1 250fed97cb5e073e4ad91d82ca658c209d0aa903 SHA256 35bdcf8c236de40b87e602f4213b4e4e7b835082959bc52cce530cc8194a2eb4
+MISC ChangeLog 12347 RMD160 3978bfb2a5c9ac588db53ff5524e99c00e75f9df SHA1 c7c9de824edae8cf82825d142f6f5982e5f36850 SHA256 61e57b0a5982aaa7708f65c8a83a19f00ef0c2f3b63752c0404b4a2c4290c9c2
 MISC metadata.xml 313 RMD160 d6625d48d47f8417bccec2c9ccf0524b5bbd58e5 SHA1 7934855c56b41e669b8070577a7838e3037dd1a1 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b
diff --git a/sys-auth/consolekit/consolekit-0.4.2-r3.ebuild b/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild
index 8254b73c0033..86ca001a997b 100644
--- a/sys-auth/consolekit/consolekit-0.4.2-r3.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.2-r3.ebuild,v 1.2 2010/10/27 19:10:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild,v 1.1 2010/10/28 16:02:49 ssuominen Exp $
 
 EAPI=3
 inherit autotools eutils linux-info multilib pam
@@ -78,7 +78,7 @@ src_install() {
 	keepdir /var/log/ConsoleKit
 
 	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-2 90-consolekit || die
+	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit || die
 
 	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
 	doexe "${FILESDIR}"/pam-foreground-compat.ck || die
diff --git a/sys-auth/consolekit/files/90-consolekit-2 b/sys-auth/consolekit/files/90-consolekit-3
index f0082a7f6445..358fc24f1a72 100644
--- a/sys-auth/consolekit/files/90-consolekit-2
+++ b/sys-auth/consolekit/files/90-consolekit-3
@@ -28,5 +28,5 @@ is_on_console() {
 # calls if we have $GDMSESSION
 if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \
  ( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then
-    STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+    command="$CK_LAUNCH_SESSION $command"
 fi