Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/
Date: Tue, 06 Oct 2020 18:06:37
Message-Id: 1602007530.4f026f91e125252d215d94d48d528ff5ab50fd91.zlogene@gentoo
1 commit: 4f026f91e125252d215d94d48d528ff5ab50fd91
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 6 18:05:30 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 18:05:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f026f91
7
8 lxde-base/lxdm: 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 lxde-base/lxdm/lxdm-0.5.3-r1.ebuild | 8 ++++----
14 lxde-base/lxdm/lxdm-0.5.3-r2.ebuild | 10 +++++-----
15 lxde-base/lxdm/metadata.xml | 1 -
16 3 files changed, 9 insertions(+), 10 deletions(-)
17
18 diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
19 index e40d86c042e..cc2c819ceec 100644
20 --- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
21 +++ b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2019 Gentoo Authors
24 +# Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -14,9 +14,9 @@ LICENSE="GPL-3"
29 SLOT="0"
30 KEYWORDS="amd64 ~arm ~ppc x86"
31
32 -IUSE="consolekit debug gtk3 nls pam"
33 +IUSE="debug gtk3 nls pam"
34
35 -RDEPEND="consolekit? ( sys-auth/consolekit )
36 +RDEPEND="
37 x11-libs/libxcb
38 gtk3? ( x11-libs/gtk+:3 )
39 !gtk3? ( x11-libs/gtk+:2 )
40 @@ -52,7 +52,7 @@ src_configure() {
41 --with-x \
42 --with-xconn=xcb \
43 --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
44 - $(use_enable consolekit) \
45 + --disable-consolekit \
46 $(use_enable gtk3) \
47 $(use_enable nls) \
48 $(use_enable debug) \
49
50 diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
51 index 9982e464ec8..177b447fa3c 100644
52 --- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
53 +++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
54 @@ -1,4 +1,4 @@
55 -# Copyright 1999-2019 Gentoo Authors
56 +# Copyright 1999-2020 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 EAPI=7
60 @@ -14,9 +14,9 @@ LICENSE="GPL-3"
61 SLOT="0"
62 KEYWORDS="amd64 ~arm ~ppc x86"
63
64 -IUSE="consolekit debug elogind +gtk3 nls pam systemd"
65 +IUSE="debug elogind +gtk3 nls pam systemd"
66
67 -DEPEND="consolekit? ( sys-auth/consolekit )
68 +DEPEND="
69 x11-libs/libxcb
70 gtk3? ( x11-libs/gtk+:3 )
71 !gtk3? ( x11-libs/gtk+:2 )
72 @@ -31,7 +31,7 @@ BDEPEND=">=dev-util/intltool-0.40
73 virtual/pkgconfig"
74 DOCS=( AUTHORS README TODO )
75
76 -REQUIRED_USE="?? ( consolekit elogind systemd ) elogind? ( pam ) systemd? ( pam )"
77 +REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
78
79 src_prepare() {
80 # Upstream bug, tarball contains pre-made lxdm.conf
81 @@ -58,7 +58,7 @@ src_configure() {
82 --with-x \
83 --with-xconn=xcb \
84 --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
85 - $(use_enable consolekit) \
86 + --disable-consolekit \
87 $(use_enable gtk3) \
88 $(use_enable nls) \
89 $(use_enable debug) \
90
91 diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
92 index a4646c8be52..f241db24df3 100644
93 --- a/lxde-base/lxdm/metadata.xml
94 +++ b/lxde-base/lxdm/metadata.xml
95 @@ -6,7 +6,6 @@
96 <name>Brian Evans</name>
97 </maintainer>
98 <use>
99 - <flag name="consolekit">Enables support for authorization using consolekit</flag>
100 <flag name="gtk3">Use GTK+3 instead of 2</flag>
101 </use>
102 <upstream>