3 files changed, 111 insertions, 0 deletions
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 3301ddd99bd2..07f618d7c99b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -2,9 +2,11 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f
 AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
 AUX sddm-0.16.0-Xsession.patch 606 BLAKE2B 8d437038be2b5fd3934174320aa14484ddd5de5b3d8529100af2679b4cb8ac2ef846ca2812ac8136b7482cf8010d724e37555636304fbe1e72b3a53c0d6b5b1e SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
+AUX sddm-0.17.0-logind-race.patch 944 BLAKE2B b92897b1d1de88de5f6edf9862221bfa56c1d5294177651431099dd09c25435037e03095ec2fb3f776cb190ca16808a9caea35282045ca9e353176dee75883b8 SHA512 4e4c388529dc898da2b8983f46e809bc2939cef02d4aa605761cc9978b4946121cd2d949353bed3d19a14cafd1628fdae3eb928dd56f81ddc976005cafb4a939
 AUX sddm-0.17.0-switchtogreeter.patch 1873 BLAKE2B b54ec315ceff3f6f2541a1a6436187fc684e347b00fe6141e0b30e580d04e722f96b320677f7b8f7dd5f5bf91492b05f04a81e4ef564c831d9bd84de2ea68988 SHA512 f50b3c23baaaae6bb605cb7b4eb6ff24bbfd3e5771e44a24d54f1843b727f9f02cdd2cb0aacd832e110e4350870e76bd4727492d0b0f58145d739181a1815963
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
 EBUILD sddm-0.17.0-r2.ebuild 2260 BLAKE2B 3534b7fed704f024f923da35bb1768c55a53a375a46d7a45bad31b7fae0ce8d210ee12e4e0d1fc49fa27901b39a056e295f5e876b769fc2f0e139de926ea936b SHA512 dc610ec03262b560f973f59f0a0bd312c992332244620ee7e289286113a6380ccd67b39eb041c8d5b6f7bca72559ab2ca2471d3eb5d85ee12fa51cb58a7edeac
+EBUILD sddm-0.17.0-r3.ebuild 2311 BLAKE2B 39aca6a331d7b3946362cdc236681db3bc157a9383b5567927a5126ac2c4823e85a1b4cd590c33ffcb661f83915711e4dc395da9b8e817503248f3a89b320bcb SHA512 089e9d907cfec936b4f24f51c555b1b0811da2b83a79567b5a39b476e8dd2ef3a51c94f48a5e11fa34f6f56cd2de361a1ebdab7aacf23df990869571704c4dfc
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
new file mode 100644
index 000000000000..a55702061c91
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
@@ -0,0 +1,26 @@
+From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
+Date: Mon, 26 Feb 2018 09:03:05 +0100
+Subject: [PATCH] Fix race between sddm and logind
+
+Make sure sddm is run after logind.
+An explicit dependency will make sddm run after logind every time.
+
+Closes: #978
+---
+ services/sddm.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/sddm.service.in b/services/sddm.service.in
+index df03d92a..9d7618c6 100644
+--- a/services/sddm.service.in
++++ b/services/sddm.service.in
+@@ -2,7 +2,7 @@
+ Description=Simple Desktop Display Manager
+ Documentation=man:sddm(1) man:sddm.conf(5)
+ Conflicts=getty@tty1.service
+-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
++After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+ 
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
new file mode 100644
index 000000000000..623e779a6f1a
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+	"${FILESDIR}/${P}-logind-race.patch" # bug 656286
+	# TODO: not yet upstream
+	"${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	disable_locale() {
+		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+	}
+	l10n_find_plocales_changes "data/translations" "" ".ts"
+	l10n_for_each_disabled_locale_do disable_locale
+
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}