gentoo resync : 15.10.2017

3 files changed, 88 insertions, 0 deletions

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 96ee32199d96..303016075d9d 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -3,6 +3,7 @@ AUX sddm-0.13.0-pam_kwallet.patch 391 SHA256 dc46a0132cf0ea722a69cff45ed1ded3c93
 AUX sddm-0.14.0-avatars.patch 1470 SHA256 b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b SHA512 09a2b487767c4d84e9bb1225d27e21a6716c7c299b5f3aff5fb4934d1ddc3659658eaffcf30dd60f2c83389a461b4fe91c23cab4646c740ef5eec658e14a1eac WHIRLPOOL e84ffc8ad6c6d40df7dad24ae60d5a7c0a387c5ad0dfa93d29cc307cedd541180398d7caf1925177e43fbff093dbc1fc36f872e40c57dcd80bf12ca2910355eb
 AUX sddm-0.14.0-consolekit.patch 322 SHA256 a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a WHIRLPOOL f438b0ceb638a4d6fc0d2999771a1c6dad280f4dbb263d73d458e32c09bb6884b32efac24e92001b4abc324e4e347a3360b533beab82c06022cebeb6edc7d6c1
 AUX sddm-0.14.0-nsswitch_conf.patch 1158 SHA256 8b31740cdfcc540c81dba5e190482b1ccdb29dbf2c7d14225ddfda701c3730c8 SHA512 9449c0ddb984e685c6440a9b8537cc57410df8092d549851a8285546ee0541fd3ac2eae7a62fe57a670006e930fa2cc54bb9671ba373fef914f34a9b219d4529 WHIRLPOOL 2341cd5f142fcb76b4319fc05992da0e4055e273a433d47b7b040cd7f9a99584927b2ad07636e5b390e401a09262f147eca0dc3595ed1013f86af7f63c6fc30e
+AUX sddm-0.16.0-ck2-revert.patch 918 SHA256 450679a1ca87e6694c1ae0c626660b35d831f16f6ccb1a1fe491271a0b7cfb3a SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60 WHIRLPOOL e6c700e24562387c58237bcdb384928f385d68462b5948bae2bfd6bc189190ec1a671de7d0e6eb7bb33522fcb2c773b95ff4d970bb4bf349be24229065cd8e12
 AUX sddm-enable-elogind.patch 1754 SHA256 b216976029dc425bc05486ebe276ce65b8d188ebd142856f13f44904ed733a4c SHA512 457a49650b07df2edd836201f00858245b1567476e7e1f6cb4e74e80deea404588504d1895d050cab4278ed3273e71131d70226867e5cf8846a7472f98f23ffe WHIRLPOOL 6d88e1c7eb4bcff23805fffe5b164462f43727059b0058a22140a953dbdf3c153e526513c2ce656f9894cc58eab22c1914e2a30b209dfa75388c05e09373420e
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 WHIRLPOOL 48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
@@ -10,6 +11,7 @@ DIST sddm-0.16.0.tar.gz 3523735 SHA256 f7f73c6dd6d544ec2c5e4657e181f60467ec31d84
 EBUILD sddm-0.14.0-r2.ebuild 2332 SHA256 1a0083b134f33feb4b1014a2c3a5227a569ac6a2904feeabf3a09e41564c223c SHA512 b67ed7c8582b205972ebe2847d87a08cd24c3c9c2d6f77bd81bc89503e49cc380c6fa7af6722639cf92df1414d96a21bafd4978b0b08127c37e2419651e6bd71 WHIRLPOOL 1dc114783af75071c4e174897eb1deaa0c0e0db45aaae378d4ccce83f61707e1885a0a8e915e1b40f30ebc28d15877ab810b530028a4f9d749eb66aa11e1ba60
 EBUILD sddm-0.14.0-r4.ebuild 2542 SHA256 58114e9adf0f20ccb18e573a02164c4c3a9745c83dad1f3b83655ffc440769f3 SHA512 2cc87d0c84fda296121afd7c8fefc8c237f8c4ce682e6f552d861f3dc6a318c105e0cfc6066c87fe9be1142cef9ad83125e9b393f0c17f0a51a81e31d82e39f9 WHIRLPOOL 5393d4e0510c45a8de9bbd5a39b287af11ae06697003664e7060e0e40b06a2e269aa20aa0bb84517bbea2da950b0e5fb7095658e95bd27eafdad520cef5d9489
 EBUILD sddm-0.15.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
+EBUILD sddm-0.16.0-r1.ebuild 1628 SHA256 e976e4e79e0f9448b0fa645b78fd82cee9a469510500d7b75aedb3f16a989f1e SHA512 fa13f0f94e8eec28d8851ef6963acbaf188d96e8f365b940e2efc2110ac0376903f14b7a311ba30ee0598222f93083235cdb299db617ac620bc6a6a7666573db WHIRLPOOL a93d7a20fd1971c30fcb1c29af1149ccd7d41bcc9d02e0a206fad16fcdf492fdaa1cbb2cbc65d07825ba57e7fa4f146744d3f5dfd46ff36320d5cfeadb9b7ca4
 EBUILD sddm-0.16.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
 MISC ChangeLog 9132 SHA256 b3c4811eab359e67c259d59550832dcb14fb4ab3ddeb71d23edc2207bda83c15 SHA512 32fc4d222b2316a4247cee25798050094983b69873e3358611d908ec030ab7c5b43c64c92a59e88aa37ba2c3ce97556ff1e03d33c6f0b90a0fdcec0a9825c2dc WHIRLPOOL c427eb05f0f819c4d6cff7d007e8d9ab7816e1fe9462af81f688bac0f649028b2137798ef40553b69d2be032a3eff971ac7875065eaf2d73759bd23e29bcb390
 MISC ChangeLog-2015 3391 SHA256 3512268a5a75b764800ce67e516270f4482390a1f9ab958ec0627dc4403889e8 SHA512 3ec070987205570ba6efa11b7feca3fa42a96d2ae4997dab21c713eab043c883d9f6b7073c8572314fc6793374a6061dfa9c0eba812de21de7869c284e5b3a6d WHIRLPOOL 440c4354b7e61f5022f1f728d3a1346b8cea88eeeade570f9b3ba83a67faf26987e532e5566f272df49d3af30c7fc745983273b1cb8733625690e5fa1a6776a1
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
new file mode 100644
index 000000000000..bbe2a272840c
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+-        available = true;
++        available = false;
+         serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+         managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+         managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
diff --git a/x11-misc/sddm/sddm-0.16.0-r1.ebuild b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..3aaacde32ab8
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtdeclarative-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
+	>=dev-qt/qttest-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${P}-ck2-revert.patch" #bug 633920
+)
+
+src_prepare() {
+	use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
+	cmake-utils_src_prepare
+}
+
+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
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}