gentoo resync : 25.11.2020

4 files changed, 8 insertions, 29 deletions

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 6a7ea7b5f39e..a61e44cd6d58 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,6 +14,6 @@ AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc
 AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-EBUILD slim-1.3.6-r5.ebuild 4180 BLAKE2B 1854668d624da2ceaf421f5cced0e11aa90a1e3dbbab2f1fb7f0527c82eb5ff0eb11bac630834f5d197d82c364dc8b1af85fc8b386d245618feb76b8c3f8ed05 SHA512 9356aab8785b8c6aa63e729772ba129bf828bcabe4df3e709e90c7e48f32330b95746de8551ce722afc357691bb474d3a026ed0bb8db1651be4b9e06ff0f3a69
-EBUILD slim-9999.ebuild 4008 BLAKE2B 2c3fa21ec5c16e4ecf5d46837d67799456f50d02ff919d4b2b39dd33a9c712b77a1e0a9ad2ea54bd9a6aed84959f233ff0473269bf3c5eaf93a27f77787f960c SHA512 68520716656b6f19d112bce9afed4f764b5d26fe200dbd763cad5f64af76a925375e88ca7da1d02f1a3a552d46add95bc723f3308171157413a59afdd82f23b9
-MISC metadata.xml 514 BLAKE2B 30f0fae6144c9bed109df03b4b77c25ddc0b2e8a69b8cecf08eb14ac3ecfa364d206d2b6832892e74986b28e293d51f51f6ae7102348d81f8a0f5594f8f95c94 SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950
+EBUILD slim-1.3.6-r5.ebuild 3827 BLAKE2B d945b687a7c1a18210f355afbfc0d8451b4b6da431c55827cc6a1d994e16236943ebb1b74cdbdb11d3bec47483958e9bd01573e591cef3daed9605c6e8c8b935 SHA512 807d4b74101b27495a0d930f8176fa091b008e9118d028bc4f471115bc33f2933ff8d8599a1f21d2884a68e832bda217b295d5a3f1613ce8df0bccd70ace09f6
+EBUILD slim-9999.ebuild 3664 BLAKE2B 9fe1f1efae07054d5b6a8be8fb95074d3979eac95b202c7c7ace7e3ee9d299ee3366fb2185014b50c509022073b8d909e00768232d402d248ccad51c43bd910b SHA512 4836465fd45a3bbf864890a4a35a8eb1d314a24bccd638d1e8162f9f2d68002401703f99c2773ace13459d0f5200892d510f0bb70bb792f6b9fbbf517f21752a
+MISC metadata.xml 296 BLAKE2B 32be4afe8f62ed7b8f735c21cd70f6f917208e75b2e0dbc953cf1ab25ff43b3c9d4f140beb5b4a49c00311abe6f80b7672cb5f0626539ffcc6c1fe76a59dcef9 SHA512 4c622a7f52bd12997f0fa95135ded68f5f23d2c8b6e7203afd68e57c4c0a849520314f407f69fe20dde03f4690a2fc982856d869fffa59f2b362767ccb4e19b0
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 8f38f154c1b0..bce828f91d88 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -4,13 +4,6 @@
 	<maintainer type="person">
 		<email>axs@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</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 8b894dd5a563..49e2ecab88c2 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 90753c4f0d6f..2a9801204240 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"