[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     4c2c73b5f641f7cee794c01f754334a9d405eb8e
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 18:19:57 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 18:20:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2c73b5

x11-misc/sddm: remove consolekit support

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 x11-misc/sddm/files/sddm-0.14.0-consolekit.patch | 9 ---------
 x11-misc/sddm/metadata.xml                       | 1 -
 x11-misc/sddm/sddm-0.15.0.ebuild                 | 6 ++----
 x11-misc/sddm/sddm-0.18.1-r1.ebuild              | 3 +--
 x11-misc/sddm/sddm-0.18.1-r3.ebuild              | 3 +--
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch
deleted file mode 100644
index 64ea0648286..00000000000
--- a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession	2016-08-28 14:53:07.157184480 +0200
-@@ -91,5 +91,5 @@
- if [ -z "$@" ]; then
-     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
- else
--    exec $@
-+    exec ck-launch-session $@
- fi

diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index c5bfbd1e394..9d1e3774b72 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -10,7 +10,6 @@
     <name>Gentoo KDE Project</name>
   </maintainer>
   <use>
-    <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
     <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
   </use>
   <longdescription lang="en">

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index 9dde4b79612..115926b2651 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+IUSE="elogind +pam systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
@@ -24,7 +24,6 @@ RDEPEND="
 	>=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:= )
@@ -41,7 +40,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
 
 src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
 	cmake-utils_src_prepare
 }
 

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index bb3da55d933..a413e69e420 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -32,7 +32,6 @@ RDEPEND="
 	>=dev-qt/qtnetwork-5.9.4: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-1.3.1_p20200128-r1 )
 	systemd? ( sys-apps/systemd:= )

diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
index 9b168d277fe..b2925b5571e 100644
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -32,7 +32,6 @@ RDEPEND="
 	>=dev-qt/qtnetwork-5.9.4: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:= )