gentoo resync : 29.10.2017

3 files changed, 24 insertions, 83 deletions

diff --git a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch b/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
deleted file mode 100644
index 371df93e2b8d..000000000000
--- a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f39c7a91ea4bc9527628adb01cb49173f1e68be Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Fri, 9 Jun 2017 10:13:01 +0200
-Subject: [PATCH] UserModel: Check for duplicates from getpwent()
-
----
- src/greeter/UserModel.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
-index 94c492d0..33114d08 100644
---- a/src/greeter/UserModel.cpp
-+++ b/src/greeter/UserModel.cpp
-@@ -72,6 +72,13 @@ namespace SDDM {
-             if (mainConfig.Users.HideShells.get().contains(QString::fromLocal8Bit(current_pw->pw_shell)))
-                 continue;
- 
-+            // skip duplicates
-+            // Note: getpwent() makes no attempt to suppress duplicate information
-+            // if multiple sources are specified in nsswitch.conf(5).
-+            if (d->users.cend()
-+                != std::find_if(d->users.cbegin(), d->users.cend(), [current_pw](const UserPtr & u) { return u->uid == current_pw->pw_uid; }))
-+                continue;
-+
-             // create user
-             UserPtr user { new User() };
-             user->name = QString::fromLocal8Bit(current_pw->pw_name);
diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
new file mode 100644
index 000000000000..f341e1863f76
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
++++ b/data/scripts/Xsession	2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+     ;;
+ esac
+ 
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$@" ]; then
++if [ -z "$command" ]; then
+     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+ else
+-    exec $@
++    exec $command
+ fi
diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch
deleted file mode 100644
index d1277e9554f3..000000000000
--- a/x11-misc/sddm/files/sddm-enable-elogind.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt	2016-11-10 09:27:03.866358608 +0100
-+++ b/CMakeLists.txt	2016-11-10 10:28:25.384374766 +0100
-@@ -93,7 +93,7 @@
- endif()
- 
- # systemd
--if(NOT NO_SYSTEMD)
-+if(NOT NO_SYSTEMD AND NOT USE_ELOGIND)
-     pkg_check_modules(SYSTEMD "systemd")
- endif()
- 
-@@ -127,12 +127,34 @@
-     set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
- else()
-     set(SYSTEMD_FOUND 0)
-+endif()
-+add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
-+add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
-+# elogind
-+if(NO_SYSTEMD AND USE_ELOGIND)
-+    pkg_check_modules(ELOGIND "libelogind")
-+endif()
-+
-+if(ELOGIND_FOUND)
-+    add_definitions(-DHAVE_ELOGIND)
-+    set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND)
-+
-+    set(MINIMUM_VT 7)
-+    set(HALT_COMMAND "/usr/bin/loginctl poweroff")
-+    set(REBOOT_COMMAND "/usr/bin/loginctl reboot")
-+else()
-+    set(ELOGIND_FOUND 0)
-+endif()
-+add_feature_info("elogind" ELOGIND_FOUND "elogind support")
-+
-+# Default behaviour if neither systemd nor elogind is used
-+if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND)
-     set(MINIMUM_VT 7)
-     set(HALT_COMMAND "/sbin/shutdown -h -P now")
-     set(REBOOT_COMMAND "/sbin/shutdown -r now")
- endif()
--add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
--add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
- 
- # Set constants
- set(DATA_INSTALL_DIR            "${CMAKE_INSTALL_FULL_DATADIR}/sddm"                CACHE PATH      "System application data install directory")
---- a/services/sddm-greeter.pam	2016-06-19 12:24:42.000000000 +0200
-+++ b/services/sddm-greeter.pam	2016-11-02 09:48:18.990032363 +0100
-@@ -14,4 +14,5 @@
- 
- # Setup session
- session		required pam_unix.so
- session		optional pam_systemd.so
-+session		optional pam_elogind.so