| 1 |
commit: 63775a9da1649236a5017b45274a8e14e8c5e8c9 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 8 19:43:07 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 19:43:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63775a9d |
| 7 |
|
| 8 |
x11-misc/slim: 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-misc/slim/metadata.xml | 3 --- |
| 14 |
x11-misc/slim/slim-1.3.6-r5.ebuild | 11 ++--------- |
| 15 |
x11-misc/slim/slim-9999.ebuild | 13 +++---------- |
| 16 |
3 files changed, 5 insertions(+), 22 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml |
| 19 |
index 8f38f154c1b..0d0cf35b340 100644 |
| 20 |
--- a/x11-misc/slim/metadata.xml |
| 21 |
+++ b/x11-misc/slim/metadata.xml |
| 22 |
@@ -8,9 +8,6 @@ |
| 23 |
<email>desktop-misc@g.o</email> |
| 24 |
<name>Gentoo Desktop Miscellaneous Project</name> |
| 25 |
</maintainer> |
| 26 |
- <use> |
| 27 |
- <flag name="consolekit">Enable native consolekit support</flag> |
| 28 |
- </use> |
| 29 |
<upstream> |
| 30 |
<remote-id type="sourceforge">slim.berlios</remote-id> |
| 31 |
</upstream> |
| 32 |
|
| 33 |
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild |
| 34 |
index 8b894dd5a56..49e2ecab88c 100644 |
| 35 |
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild |
| 36 |
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild |
| 37 |
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" |
| 38 |
LICENSE="GPL-2" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" |
| 41 |
-IUSE="branding pam consolekit" |
| 42 |
-REQUIRED_USE="consolekit? ( pam )" |
| 43 |
+IUSE="branding pam" |
| 44 |
|
| 45 |
RDEPEND="x11-libs/libXmu |
| 46 |
x11-libs/libX11 |
| 47 |
@@ -23,8 +22,6 @@ RDEPEND="x11-libs/libXmu |
| 48 |
media-libs/libpng:0= |
| 49 |
virtual/jpeg:= |
| 50 |
x11-apps/sessreg |
| 51 |
- consolekit? ( sys-auth/consolekit |
| 52 |
- sys-apps/dbus ) |
| 53 |
pam? ( sys-libs/pam |
| 54 |
!x11-misc/slimlock )" |
| 55 |
DEPEND="${RDEPEND} |
| 56 |
@@ -64,7 +61,7 @@ src_prepare() { |
| 57 |
src_configure() { |
| 58 |
local mycmakeargs=( |
| 59 |
$(cmake-utils_use pam USE_PAM) |
| 60 |
- $(cmake-utils_use consolekit USE_CONSOLEKIT) |
| 61 |
+ -DUSE_CONSOLEKIT=OFF |
| 62 |
) |
| 63 |
|
| 64 |
cmake-utils_src_configure |
| 65 |
@@ -128,10 +125,6 @@ pkg_postinst() { |
| 66 |
elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
| 67 |
elog "accordingly." |
| 68 |
elog |
| 69 |
- ewarn "Please note that slim supports consolekit directly. Please do not use any " |
| 70 |
- ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)" |
| 71 |
- ewarn "and enable USE=\"consolekit\" instead." |
| 72 |
- ewarn |
| 73 |
fi |
| 74 |
if ! use pam; then |
| 75 |
elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" |
| 76 |
|
| 77 |
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild |
| 78 |
index 90753c4f0d6..2a980120424 100644 |
| 79 |
--- a/x11-misc/slim/slim-9999.ebuild |
| 80 |
+++ b/x11-misc/slim/slim-9999.ebuild |
| 81 |
@@ -1,4 +1,4 @@ |
| 82 |
-# Copyright 1999-2019 Gentoo Authors |
| 83 |
+# Copyright 1999-2020 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
EAPI=6 |
| 87 |
@@ -17,8 +17,7 @@ DESCRIPTION="Simple Login Manager" |
| 88 |
HOMEPAGE="https://sourceforge.net/projects/slim.berlios/" |
| 89 |
LICENSE="GPL-2" |
| 90 |
SLOT="0" |
| 91 |
-IUSE="branding pam consolekit" |
| 92 |
-REQUIRED_USE="consolekit? ( pam )" |
| 93 |
+IUSE="branding pam" |
| 94 |
|
| 95 |
RDEPEND="x11-libs/libXmu |
| 96 |
x11-libs/libX11 |
| 97 |
@@ -28,8 +27,6 @@ RDEPEND="x11-libs/libXmu |
| 98 |
media-libs/libpng:0= |
| 99 |
virtual/jpeg:= |
| 100 |
x11-apps/sessreg |
| 101 |
- consolekit? ( sys-auth/consolekit |
| 102 |
- sys-apps/dbus ) |
| 103 |
pam? ( sys-libs/pam |
| 104 |
!x11-misc/slimlock )" |
| 105 |
DEPEND="${RDEPEND} |
| 106 |
@@ -59,7 +56,7 @@ src_prepare() { |
| 107 |
src_configure() { |
| 108 |
local mycmakeargs=( |
| 109 |
-DUSE_PAM=$(usex pam) |
| 110 |
- -DUSE_CONSOLEKIT=$(usex consolekit) |
| 111 |
+ -DUSE_CONSOLEKIT=OFF |
| 112 |
) |
| 113 |
|
| 114 |
cmake-utils_src_configure |
| 115 |
@@ -126,10 +123,6 @@ pkg_postinst() { |
| 116 |
elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
| 117 |
elog "accordingly." |
| 118 |
elog |
| 119 |
- ewarn "Please note that slim supports consolekit directly. Please do not use any " |
| 120 |
- ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)" |
| 121 |
- ewarn "and enable USE=\"consolekit\" instead." |
| 122 |
- ewarn |
| 123 |
fi |
| 124 |
if ! use pam; then |
| 125 |
elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" |
Archives