| 1 |
commit: 4c2c73b5f641f7cee794c01f754334a9d405eb8e |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 6 18:19:57 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 6 18:20:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2c73b5 |
| 7 |
|
| 8 |
x11-misc/sddm: remove consolekit support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-misc/sddm/files/sddm-0.14.0-consolekit.patch | 9 --------- |
| 14 |
x11-misc/sddm/metadata.xml | 1 - |
| 15 |
x11-misc/sddm/sddm-0.15.0.ebuild | 6 ++---- |
| 16 |
x11-misc/sddm/sddm-0.18.1-r1.ebuild | 3 +-- |
| 17 |
x11-misc/sddm/sddm-0.18.1-r3.ebuild | 3 +-- |
| 18 |
5 files changed, 4 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index 64ea0648286..00000000000 |
| 23 |
--- a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,9 +0,0 @@ |
| 26 |
---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 |
| 27 |
-+++ b/data/scripts/Xsession 2016-08-28 14:53:07.157184480 +0200 |
| 28 |
-@@ -91,5 +91,5 @@ |
| 29 |
- if [ -z "$@" ]; then |
| 30 |
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." |
| 31 |
- else |
| 32 |
-- exec $@ |
| 33 |
-+ exec ck-launch-session $@ |
| 34 |
- fi |
| 35 |
|
| 36 |
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml |
| 37 |
index c5bfbd1e394..9d1e3774b72 100644 |
| 38 |
--- a/x11-misc/sddm/metadata.xml |
| 39 |
+++ b/x11-misc/sddm/metadata.xml |
| 40 |
@@ -10,7 +10,6 @@ |
| 41 |
<name>Gentoo KDE Project</name> |
| 42 |
</maintainer> |
| 43 |
<use> |
| 44 |
- <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag> |
| 45 |
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> |
| 46 |
</use> |
| 47 |
<longdescription lang="en"> |
| 48 |
|
| 49 |
diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild |
| 50 |
index 9dde4b79612..115926b2651 100644 |
| 51 |
--- a/x11-misc/sddm/sddm-0.15.0.ebuild |
| 52 |
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2017 Gentoo Foundation |
| 55 |
+# Copyright 1999-2020 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -12,7 +12,7 @@ KEYWORDS="amd64 ~arm ~arm64 x86" |
| 60 |
|
| 61 |
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
| 62 |
SLOT="0" |
| 63 |
-IUSE="consolekit elogind +pam systemd" |
| 64 |
+IUSE="elogind +pam systemd" |
| 65 |
|
| 66 |
REQUIRED_USE="?? ( elogind systemd )" |
| 67 |
|
| 68 |
@@ -24,7 +24,6 @@ RDEPEND=" |
| 69 |
>=dev-qt/qtnetwork-5.6:5 |
| 70 |
>=x11-base/xorg-server-1.15.1 |
| 71 |
x11-libs/libxcb[xkb] |
| 72 |
- consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
| 73 |
elogind? ( sys-auth/elogind ) |
| 74 |
pam? ( sys-libs/pam ) |
| 75 |
systemd? ( sys-apps/systemd:= ) |
| 76 |
@@ -41,7 +40,6 @@ DEPEND="${RDEPEND} |
| 77 |
PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" ) |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
- use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch" |
| 81 |
cmake-utils_src_prepare |
| 82 |
} |
| 83 |
|
| 84 |
|
| 85 |
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild |
| 86 |
index bb3da55d933..a413e69e420 100644 |
| 87 |
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild |
| 88 |
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild |
| 89 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" |
| 90 |
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
| 91 |
SLOT="0" |
| 92 |
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" |
| 93 |
-IUSE="consolekit elogind +pam systemd test" |
| 94 |
+IUSE="elogind +pam systemd test" |
| 95 |
RESTRICT="!test? ( test )" |
| 96 |
|
| 97 |
REQUIRED_USE="?? ( elogind systemd )" |
| 98 |
@@ -32,7 +32,6 @@ RDEPEND=" |
| 99 |
>=dev-qt/qtnetwork-5.9.4:5 |
| 100 |
>=x11-base/xorg-server-1.15.1 |
| 101 |
x11-libs/libxcb[xkb] |
| 102 |
- consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
| 103 |
elogind? ( sys-auth/elogind ) |
| 104 |
pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 ) |
| 105 |
systemd? ( sys-apps/systemd:= ) |
| 106 |
|
| 107 |
diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild b/x11-misc/sddm/sddm-0.18.1-r3.ebuild |
| 108 |
index 9b168d277fe..b2925b5571e 100644 |
| 109 |
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild |
| 110 |
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild |
| 111 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" |
| 112 |
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
| 113 |
SLOT="0" |
| 114 |
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" |
| 115 |
-IUSE="consolekit elogind +pam systemd test" |
| 116 |
+IUSE="elogind +pam systemd test" |
| 117 |
RESTRICT="!test? ( test )" |
| 118 |
|
| 119 |
REQUIRED_USE="?? ( elogind systemd )" |
| 120 |
@@ -32,7 +32,6 @@ RDEPEND=" |
| 121 |
>=dev-qt/qtnetwork-5.9.4:5 |
| 122 |
>=x11-base/xorg-server-1.15.1 |
| 123 |
x11-libs/libxcb[xkb] |
| 124 |
- consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
| 125 |
elogind? ( sys-auth/elogind ) |
| 126 |
pam? ( sys-libs/pam ) |
| 127 |
systemd? ( sys-apps/systemd:= ) |
Archives