[gentoo-commits] repo/gentoo:master commit in: x11-misc/cdm/

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

commit:     3f129436248df4fc168081fbdd1753e8f9c29b81
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 14:57:02 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 14:57:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f129436

x11-misc/cdm: remove consolekit support

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

 x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild | 11 +++--------
 x11-misc/cdm/cdm-0.7.ebuild               | 11 +++--------
 x11-misc/cdm/metadata.xml                 |  3 ---
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
index 9702b5d25cc..880a059eabf 100644
--- a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
+++ b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,24 +12,19 @@ SRC_URI="https://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="pam"
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	dev-util/dialog
 	x11-apps/xdpyinfo
 	x11-apps/xinit
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-libs/pam )"
 
 src_prepare() {
 	default
-	if ! use consolekit; then
-		sed -e 's@consolekit=yes@consolekit=no@' \
+	sed -e 's@consolekit=yes@consolekit=no@' \
 			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
-	fi
 }
 
 src_install() {

diff --git a/x11-misc/cdm/cdm-0.7.ebuild b/x11-misc/cdm/cdm-0.7.ebuild
index ec83965c22f..69859215a89 100644
--- a/x11-misc/cdm/cdm-0.7.ebuild
+++ b/x11-misc/cdm/cdm-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,24 +12,19 @@ SRC_URI="https://github.com/evertiro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="pam"
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	dev-util/dialog
 	x11-apps/xdpyinfo
 	x11-apps/xinit
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-libs/pam )"
 
 src_prepare() {
 	default
-	if ! use consolekit; then
-		sed -e 's@consolekit=yes@consolekit=no@' \
+	sed -e 's@consolekit=yes@consolekit=no@' \
 			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
-	fi
 }
 
 src_install() {

diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml
index 76e6b001343..1f9a6e70a7b 100644
--- a/x11-misc/cdm/metadata.xml
+++ b/x11-misc/cdm/metadata.xml
@@ -13,7 +13,4 @@ or the instability of qingy. Written in pure bash, CDM has no other
 dependencies, yet supports multiple users/sessions and can start
 virtually any DE/WM.
 </longdescription>
-<use> 
-  <flag name="consolekit">Enable native consolekit support</flag>
-</use>
 </pkgmetadata>