[gentoo-commits] repo/gentoo:master commit in: x11-apps/xdm/

[Mikle Kolyada]

commit:     604cb1dde62396b91def09155b927dc39de48b63
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 17:47:11 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 17:47:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604cb1dd

x11-apps/xdm: Remove consolekit support

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

 x11-apps/xdm/metadata.xml      | 3 ---
 x11-apps/xdm/xdm-1.1.12.ebuild | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
index cb9dcdc919b..3e36bc06aa4 100644
--- a/x11-apps/xdm/metadata.xml
+++ b/x11-apps/xdm/metadata.xml
@@ -5,7 +5,4 @@
     <email>x...@gentoo.org</email>
     <name>X11</name>
   </maintainer>
-  <use>
-    <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> 
support</flag>
-  </use>
 </pkgmetadata>

diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index aded1729151..7fa675f5075 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -12,7 +12,7 @@ DEFAULTVT=vt7
 DESCRIPTION="X.Org xdm application"
 
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
+IUSE="ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
        x11-apps/sessreg
@@ -25,7 +25,6 @@ RDEPEND="
        x11-libs/libXdmcp
        x11-libs/libXmu
        x11-libs/libXt
-       consolekit? ( sys-auth/consolekit )
        pam? ( sys-libs/pam )
        systemd? ( >=sys-apps/systemd-209 )
        truetype? (
@@ -40,13 +39,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
        PATCHES=(
-               "${FILESDIR}"/${P}-consolekit.patch
                "${FILESDIR}"/${P}-make-xinerama-optional.patch
        )
 
        XORG_CONFIGURE_OPTIONS=(
                $(use_enable ipv6)
-               $(use_with consolekit)
                $(use_with pam)
                $(use_with systemd systemd-daemon)
                $(use_with truetype xft)
@@ -55,6 +52,7 @@ pkg_setup() {
                --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
                --with-default-vt=${DEFAULTVT}
                --with-xdmconfigdir=/etc/X11/xdm
+               --without-consolekit
        )
 }