commit: 63775a9da1649236a5017b45274a8e14e8c5e8c9
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 19:43:07 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 19:43:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63775a9d
x11-misc/slim: remove consolekit support
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
x11-misc/slim/metadata.xml | 3 ---
x11-misc/slim/slim-1.3.6-r5.ebuild | 11 ++---------
x11-misc/slim/slim-9999.ebuild | 13 +++----------
3 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 8f38f154c1b..0d0cf35b340 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -8,9 +8,6 @@
<email>[email protected]</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
- <use>
- <flag name="consolekit">Enable native consolekit support</flag>
- </use>
<upstream>
<remote-id type="sourceforge">slim.berlios</remote-id>
</upstream>
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild
b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 8b894dd5a56..49e2ecab88c 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -12,8 +12,7 @@
SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
RDEPEND="x11-libs/libXmu
x11-libs/libX11
@@ -23,8 +22,6 @@ RDEPEND="x11-libs/libXmu
media-libs/libpng:0=
virtual/jpeg:=
x11-apps/sessreg
- consolekit? ( sys-auth/consolekit
- sys-apps/dbus )
pam? ( sys-libs/pam
!x11-misc/slimlock )"
DEPEND="${RDEPEND}
@@ -64,7 +61,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use pam USE_PAM)
- $(cmake-utils_use consolekit USE_CONSOLEKIT)
+ -DUSE_CONSOLEKIT=OFF
)
cmake-utils_src_configure
@@ -128,10 +125,6 @@ pkg_postinst() {
elog "/usr/share/doc/${PF} and change your login_cmd in
/etc/slim.conf"
elog "accordingly."
elog
- ewarn "Please note that slim supports consolekit directly.
Please do not use any "
- ewarn "old work-arounds (including calls to 'ck-launch-session'
in xinitrc scripts)"
- ewarn "and enable USE=\"consolekit\" instead."
- ewarn
fi
if ! use pam; then
elog "You have merged ${PN} without USE=\"pam\", this will
cause ${PN} to fall back to"
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 90753c4f0d6..2a980120424 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.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
@@ -17,8 +17,7 @@ DESCRIPTION="Simple Login Manager"
HOMEPAGE="https://sourceforge.net/projects/slim.berlios/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
RDEPEND="x11-libs/libXmu
x11-libs/libX11
@@ -28,8 +27,6 @@ RDEPEND="x11-libs/libXmu
media-libs/libpng:0=
virtual/jpeg:=
x11-apps/sessreg
- consolekit? ( sys-auth/consolekit
- sys-apps/dbus )
pam? ( sys-libs/pam
!x11-misc/slimlock )"
DEPEND="${RDEPEND}
@@ -59,7 +56,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DUSE_PAM=$(usex pam)
- -DUSE_CONSOLEKIT=$(usex consolekit)
+ -DUSE_CONSOLEKIT=OFF
)
cmake-utils_src_configure
@@ -126,10 +123,6 @@ pkg_postinst() {
elog "/usr/share/doc/${PF} and change your login_cmd in
/etc/slim.conf"
elog "accordingly."
elog
- ewarn "Please note that slim supports consolekit directly.
Please do not use any "
- ewarn "old work-arounds (including calls to 'ck-launch-session'
in xinitrc scripts)"
- ewarn "and enable USE=\"consolekit\" instead."
- ewarn
fi
if ! use pam; then
elog "You have merged ${PN} without USE=\"pam\", this will
cause ${PN} to fall back to"
