1 |
commit: 604cb1dde62396b91def09155b927dc39de48b63 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 6 17:47:11 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 6 17:47:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604cb1dd |
7 |
|
8 |
x11-apps/xdm: 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-apps/xdm/metadata.xml | 3 --- |
14 |
x11-apps/xdm/xdm-1.1.12.ebuild | 6 ++---- |
15 |
2 files changed, 2 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml |
18 |
index cb9dcdc919b..3e36bc06aa4 100644 |
19 |
--- a/x11-apps/xdm/metadata.xml |
20 |
+++ b/x11-apps/xdm/metadata.xml |
21 |
@@ -5,7 +5,4 @@ |
22 |
<email>x11@g.o</email> |
23 |
<name>X11</name> |
24 |
</maintainer> |
25 |
- <use> |
26 |
- <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> support</flag> |
27 |
- </use> |
28 |
</pkgmetadata> |
29 |
|
30 |
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild |
31 |
index aded1729151..7fa675f5075 100644 |
32 |
--- a/x11-apps/xdm/xdm-1.1.12.ebuild |
33 |
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild |
34 |
@@ -12,7 +12,7 @@ DEFAULTVT=vt7 |
35 |
DESCRIPTION="X.Org xdm application" |
36 |
|
37 |
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
38 |
-IUSE="consolekit ipv6 pam systemd truetype xinerama xpm" |
39 |
+IUSE="ipv6 pam systemd truetype xinerama xpm" |
40 |
|
41 |
RDEPEND=" |
42 |
x11-apps/sessreg |
43 |
@@ -25,7 +25,6 @@ RDEPEND=" |
44 |
x11-libs/libXdmcp |
45 |
x11-libs/libXmu |
46 |
x11-libs/libXt |
47 |
- consolekit? ( sys-auth/consolekit ) |
48 |
pam? ( sys-libs/pam ) |
49 |
systemd? ( >=sys-apps/systemd-209 ) |
50 |
truetype? ( |
51 |
@@ -40,13 +39,11 @@ DEPEND="${RDEPEND} |
52 |
|
53 |
pkg_setup() { |
54 |
PATCHES=( |
55 |
- "${FILESDIR}"/${P}-consolekit.patch |
56 |
"${FILESDIR}"/${P}-make-xinerama-optional.patch |
57 |
) |
58 |
|
59 |
XORG_CONFIGURE_OPTIONS=( |
60 |
$(use_enable ipv6) |
61 |
- $(use_with consolekit) |
62 |
$(use_with pam) |
63 |
$(use_with systemd systemd-daemon) |
64 |
$(use_with truetype xft) |
65 |
@@ -55,6 +52,7 @@ pkg_setup() { |
66 |
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
67 |
--with-default-vt=${DEFAULTVT} |
68 |
--with-xdmconfigdir=/etc/X11/xdm |
69 |
+ --without-consolekit |
70 |
) |
71 |
} |