Pass Xsession arguments to xinitrc.d/80-dbus. Bug #533456. Thanks to Joakim Tjernlund <Joakim.Tjernlund@transmode.se> for the patch

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

3 files changed, 28 insertions, 19 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 261f7ce5f1b0..f3a019bf14a2 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.103 2015/01/11 11:54:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.104 2015/01/12 19:49:26 hwoarang Exp $
+
+  12 Jan 2015; Markos Chandras <hwoarang@gentoo.org> files/Xsession:
+  Pass Xsession arguments to xinitrc.d/80-dbus. Bug #533456. Thanks to Joakim
+  Tjernlund <Joakim.Tjernlund@transmode.se> for the patch
 
   11 Jan 2015; Markos Chandras <hwoarang@gentoo.org> lightdm-1.13.0.ebuild:
   Amend fix from bug #524792 to lightdm-greeter as well
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 8dde42490100..905bf60b0dfd 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX README.gentoo 494 SHA256 6192d8d9db26d97404860f891ba8a1f3aa623ac72df2b23c2939344b6960dda8 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c WHIRLPOOL 7032d5d76eac0c94f8e5be5d7dd517b5b5569179eed04d398736ea75fff0eacdcfd4ab43c34aedb203c2fbc2d6ac0661f21d90b4a09e6bfd1d4cf9fa290dce3b
-AUX Xsession 1641 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9 SHA512 c2e524f51854acba61dc604dff603ad22390d99e0b1b8726af1ad3421f0180e970e021742a8060251dbb3e8ecec815163858a2b0aa9b7b6a16d3c999828291ad WHIRLPOOL b30f652b1031006fa75c5be6714a9017eda0f2a301da580bdc1d6d973e1b05e4f60d26aba576c9c2ecc9d2981f31c0cbff4e52465d0c619f6234a28e3456e2ad
+AUX Xsession 1821 SHA256 1955275a3e597974ab6284f4e2b4e5f59baf74f0ca9f72dac21df386ff689a4d SHA512 a269a99cdbe7b22bebf3e7f5a54ccd32889b2e3ed45cf4f3220ac6921fe2f63808b2d4c4686d592f364c91e6847f6e173bc3a8f8c155c26c17fe01dcf13a3128 WHIRLPOOL d5cc2d32c331d86e802d8a17b32e4eb6801ba64635882f4921de7ff2ec37d0819a9ee7c630db357dfa19b18c7e188a183a0357897da4dfe85558265c9c9f73fe
 AUX lightdm 257 SHA256 c43240d1fbdb76d219d11ffbb8ad406bcbd7c78c8eba9c03c0feb353b6671c27 SHA512 b7d08013758d8755eb015e64dc67d58cfe13006c4ccfa7f22d795233b932888a36fb2ede938db619f718769cb4c836e960385c21a5a16df5e7235550148eb6f3 WHIRLPOOL 6dea823ce65d5e3c98409907460466eaafda6f928f0207055ee5b2747ed1bc065f1678bf8ba4981160c4f0fcf68380bfb664518bb428531d484c56c97eddec5a
 AUX lightdm-1.2.0-fix-configure.patch 333 SHA256 da47ccb4a9be4c5daf7c132d0141c268692c37e60120adc60e132f522d992b56 SHA512 53c7c5c9d5050526c45f1631e255720df7b9add67de44960c232ae8bb269e7b39d4b58dd853ce995b1a3f4eb98b9792d4ce2813a0271430f094b41a50b3f9a87 WHIRLPOOL a500847160742927736643dba51a13ae2c47e6189d6e9ebbafbaa74360e930e73dda5c4f972595fc1a2a3ef265dba39d039b57fd87474f457c1ba205e4aa49d1
 AUX lightdm-1.7.7-session-wrapper.patch 414 SHA256 9eca582d4682ee02a66ce1c507cb1f172a31043b22aa4335033aafd249dc4546 SHA512 13cf737ea86848fc04c48842f5228661a2111257720f221336dd7a528edf7934a95f115a6e8d8a3feecd6522536c37b1e6c965a56f707619191ade46304b3149 WHIRLPOOL 15c4a8fb2a86a93f1145cef1d10bbba8829ff633d370e2879a88886b21df937b90c6dc46ebc880c9d705636fc7dfe26e26102b18b2f341e22700fb1b79ee46a3
@@ -22,24 +22,24 @@ EBUILD lightdm-1.11.9.ebuild 3314 SHA256 d751381830378f07e3fb7d7e6234d86579bfffc
 EBUILD lightdm-1.12.2.ebuild 3397 SHA256 6b475601530f4cedefd3652f4ffd9af7cc3168d66d05a8eb230331376fd71a65 SHA512 7be17eb76186b45c4f7f9da55d8caff189a1cb5a8f1d7f1ff018d940e9779077fb4eddbaca8c1c4f2b2aa4424dbe6be02fcbe686273a822c70b89e07bfa52489 WHIRLPOOL 20d4997f63030adb81671338d0f60cea8f68106cd0e281cb8d7f4f664c4a66c8558aa198805d1f5f7725bf033f6986c322272b8500d4458b5f819be113ff5112
 EBUILD lightdm-1.13.0.ebuild 3598 SHA256 ac6f2a35dc6f0fb4ef390f8e542b64d2473e3344d29b2d7372219e04eef3ce05 SHA512 6c3675097a66ec06ea2035fc54a6f996d37e20b2d1b3c5c255890ba080c334828da44fb066d85c43ee8cdcc380a3e66ddc4fe237e31c2f65d2155bb0cd16519c WHIRLPOOL ea6a57e5790f663c28a59912356db13da01e53d8b4a1fb2dbc84521d233ab590230e61336a56527b7c541a941291f62e1caa677538b3ea261b1161c79d3661eb
 EBUILD lightdm-1.8.5.ebuild 2803 SHA256 8f9329140c76835a3450966fce40e4def32ebf0ef81f8a79ce78a6723d6a3e3d SHA512 3cf035301b67292dddba3bfa1e348f72044da8f1cd87171bec2f44da64e17aa625be8a0e5540b184f3464d4a0e305c06f9c4c7c44d627cfc013ccc02d6c5e4a4 WHIRLPOOL b8c42bf4ea1d8f9f2e0c282778a84532060ce481d679c56e9d8facde20a6d0462e8b5385f9571ae9dec4fbb1bbdebf81faddb92d51ba099b2c44644328a0d1f4
-MISC ChangeLog 16963 SHA256 16279e5ad4b50d9b3c07538b7897be22f15cde72f801a6d111d2a23d9db017f4 SHA512 33549bbb41549fd9365e56b5ce582b5a5e01c28173e39bde8b97b8a23cf0b091c7d939b5dc8fb2270671a1b852d8f1a6c03e3fdf39c48600d64b91001da313a2 WHIRLPOOL 346ebe5ef43fc85c90099e5e4ed70f49bae4bdc4f73924eb61544d266ac4fcf13602a5949b4be636fc883e0f1c62897bb26592d34f1a68ec49ef4e33358f12b7
+MISC ChangeLog 17169 SHA256 0ebeb43c243c366fb491f4ddd3ae946f44b52a5ac186d4a258b4bf65daddc843 SHA512 ca29c611689f5c0fb018a66d566469322ecde3294364fd01f6ce55ab0d2267a6ba6b92c763179b83a00f53bec7bc4cd4794178263ba20bd35831e7a37f6617b7 WHIRLPOOL 4a79a3b83cf3250a27b7853094d79ae9197e2c1a02efde8e513e7df30be14769850885803c5118cccc3447694167719e56bb7a9e2922653c2dd50f155b9c1a7d
 MISC metadata.xml 534 SHA256 cc20c58e04e520dc9e21c7a75d92e2714d94b1c1cdfddc94e8694c40af0d9597 SHA512 141fa9fde06c409a2d5ab3bc2f91c6d0a61568e1e94cdc417e530124487ef9f51141eeb74bc6e9ff957ae0f1f166a799634fca5a99995fdec920c3c858300863 WHIRLPOOL ff63e4220de78992417e5f8ecbe5b00b90f54a98bcd8c0dd6c9025db749213534a0b3e79d51a8f958f463726efee952eb8c31d2a161a77637f5eb6fd565f66c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUsmSPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUtCVMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun885/cQAJqAlUzcT/LgCGTS7LFwi9Yd
-Ut9S9934KOkWpQyPts2af5B4EANW51pAnSjN1RbGgw9y1DwH8hVw3/toOJ7Ia77U
-i/61S7vx2o6n6urOBx1w5H21YnyZvKdi8Zu+KVuEY1fOQqw1qVf7RgM/2uD0Virz
-SEsbuR2aXuZkaNEhxrXcXcSL0Oq+nYO59ZfIwCIaGFlaCvA3Jp/E0xFFYf6xXZAf
-SlyFEUVXnAJOyKMw7IsfQ3/ThhREQqYLKBMWJ8ckUVFl8cDKN5MsN/GlPLeNGuO2
-2AXmxqjvWNQgSZ/fxjTl0Q7qCErgFyKH3SQi7a9Wn9m3QLL2YwixDvQ8solF6dNZ
-lNltuiWj0B08Uq8wcGpXSSfsIDNhiPraYlMi0Mmu3iKHQolqGPlm3Lkn8rQW4zpe
-KcehU58jic6N8cYXMEKhF0nzDcbyVYms3Jh4XNYBRhGC8qTzwEH7IqOkmLhZoW6B
-OYMTBLDs4ACJqLG0FcQ5OS8tt3QOIUKgnNtQCQbaG8hcrEwf0ks2fR3+pP9MgNyp
-Jcflqq37+wgyOo5lzax5GwzHOlbIGvIWE+z+AbHIwUtfcOAEzFe25N9HUBO+6viJ
-AgfUMGKHOpecRN3d01OHKmd6CO16yNzPuUzi/R7lrP+pEG2C/rIhQ/F7kaQnCOHg
-hqu00B+UsXOCjytv5Pvj
-=9LFl
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun880FkP/RZQn1VpjiAS7IQxkh65IuEI
+t88Ou1BAYb8YCnaZkJgwRqmQ68mOdThJsO1xRQQEk+rGqzK6JbXK2/AEyM1xshNK
+fNXBYLdB4DlDDPNWFDN3lekvanqdg8IhUmqUtLYeTXNxJe3m0KNZQPYoFF492K8w
+jK9Y86K6vLsdjCqT7L0IwxLbzIgc1Gca5e753RAK/iaR+JuutW9awPezvLndvVZC
+gbRpFzmvoUKWz2PXScwPPHT+YWkDsCqSz9/xW/ntBvQpxuzr9xLD9HaxAAD7VC8q
+y++SACLCrlkMylu83+lE2JRgMRHBEZogOklsL/aAhAK4nYmyL0+vEDX83ORlw5So
+Fda4U9wswGm3Zr45IOsNjExsH2A71R4C1m9OZR5y+S+5ns9xDl2aN5CetNMtFdO3
+eezD2YIr567aJOY6tmueHSdm1bhSTuWjZEYNZOkrVT9Z4+HMutQ5XmtVSgEqYFKB
+a0PcIbsT0Q2H69E+mjxYhq/cVXqpuccp89+14cPCeS7QjdOwNe3/iClEio51vNev
+SPfeeGiIjxPnOdF758FKXKZvA1GQ98kGhz+g0RkZARh0HQ7lcAq1mW8n9fbjfSe9
+uy5cGpnJuyDnCbnt4xXoyJabUcRDCd7cpMwX3HzVeAP4A6YBwzbCrlrKeaARnrQw
+By/izWP0rJJxfWoeiD3h
+=YDa6
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
index 5da041e6d7ec..2169aefc0af3 100644
--- a/x11-misc/lightdm/files/Xsession
+++ b/x11-misc/lightdm/files/Xsession
@@ -27,7 +27,7 @@ for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
         setxkbmap `cat "$file"`
         XKB_IN_USE=yes
     fi
-done    
+done
 
 # Load xmodmap if not using XKB
 if [ -z "$XKB_IN_USE" ]; then
@@ -41,6 +41,11 @@ fi
 
 unset XKB_IN_USE
 
+# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be
+# set to the Xsession arguments. So make it happy. See
+# https://bugs.gentoo.org/show_bug.cgi?id=533456
+command="$@"
+
 # Run all system xinitrc shell scripts.
 xinitdir="/etc/X11/xinit/xinitrc.d"
 if [ -d "$xinitdir" ]; then
@@ -66,4 +71,4 @@ fi
 
 echo "X session wrapper complete, running session $@"
 
-exec $@
+exec "$command"