gentoo resync : 25.11.2020

4 files changed, 12 insertions, 13 deletions

diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 29e56556d58f..c62158b6afc7 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -3,6 +3,6 @@ AUX lxdm-0.5.3-pam.patch 470 BLAKE2B cf386ca0237f7bd4362867083e5c395cdd3e9187ab2
 AUX lxdm-0.5.3-pam_console-disable.patch 307 BLAKE2B 4bf6b05b5b803b582e441cd5b17c43fcde6da2ddafef92898d6bcb92897b274d6c5e76bf716fd1c8435f73094cc2ab3493b30b5c7ff32cb197207c4b2df09170 SHA512 a86c2f706ce0af21e33248cd488eb726033682fdedaa559cce23bb01fda51330d4293927145233c0b6cef3bb547042654ddcb00745d13f1cba2755f53a71a072
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
-EBUILD lxdm-0.5.3-r1.ebuild 1599 BLAKE2B a2d86ca98fcbff414158f6f3fbb257ebd861518640ecc037f02e6ba32cb0a20e2a302eff1ffe7239b61b190aa1f7e8a117a283b85f445a778bd3d16fc80864df SHA512 50781582a10255e4cea25b2136f44eb0d88c2bbd6f2d6c3c7e93576dfe6c18e5197eb258531869afac54d9922e458a28adc5cda70eb6a9d7f235cfecd7745fdc
-EBUILD lxdm-0.5.3-r2.ebuild 1829 BLAKE2B 48d69fc7334bc66fbef29f961b50f150f7addd799c8b6efa3cb3628354d70074ffcff814d16dadd529f218354c2579623fab9584d3a15a0eb89a4cf522d64e82 SHA512 c772cd00e35ea99a11626c460ca601903cf8a54f66740cc7e76811d2e832e35cbaefa230d1386cc05e11b857266f3030013fb7223d0d29aa7595f18fe4c8e37d
-MISC metadata.xml 469 BLAKE2B 2879473a4c0cb37579bbf599519079d068f48a82470a9170c495337d86777c9191a19ae43976b76fd84b946862e9ade051c00c8038973ab3dc5fd78a090c08d2 SHA512 c80bb8e898234d73a9b71b74120503fe9fe3bd36c445d0c0c4290df0cad4f3c1137f8cd37e7400ea8c1b58a41e06f2627dc66d2eed92691e4634197b7c5a9f5e
+EBUILD lxdm-0.5.3-r1.ebuild 1549 BLAKE2B 6a22f765f60efdaa11adc03b6da72f06d5351a4685af43b3e93a342de3fb655192508402a3abec366864873308f8f7e609277da174088bcb17dbbf9916ed7cab SHA512 9e55aca8efaab0d0566da17fbf3a1e2d9992ff54dce4dce728055b4cc705e4f84b59979af20ddfab832b342e3b528d8a8b02b09adb13624095ccdc40559f1e72
+EBUILD lxdm-0.5.3-r2.ebuild 1768 BLAKE2B b271c5f2aca77da353a2b332ff0c36f5cb095a7aff98dffca5b9b47a127020b4bde7407e6163be733e103519b41b84204f1e520be40dbac90da22f5214bf99bd SHA512 f11946b034571a8704c278d28265f36595a829173d75e06e8e34572aea3a13eb51f78a005aa305cc942b977972ae9d1331e830556437c7c20846329916169a95
+MISC metadata.xml 385 BLAKE2B 177f5546a968d34e0c4e91fffab0d4473da28ee5501ec59fad5d351ff6c3e1abdea5da1f5d2f27db1efa4b198363df715d8ed0ad86a9dfe893cefbd68dca6070 SHA512 744589fd0229e035f7b42be3744a9043413cdfb0c1d977fcb6aea67bf0e4c6cc09d4f27b1a33491b51fd9000df32ff7ac5e56c8ab892732fc29852d0dc247332
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
index e40d86c042e7..cc2c819ceecf 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r1.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
@@ -14,9 +14,9 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc x86"
 
-IUSE="consolekit debug gtk3 nls pam"
+IUSE="debug gtk3 nls pam"
 
-RDEPEND="consolekit? ( sys-auth/consolekit )
+RDEPEND="
 	x11-libs/libxcb
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
@@ -52,7 +52,7 @@ src_configure() {
 		--with-x \
 		--with-xconn=xcb \
 		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		$(use_enable consolekit) \
+		--disable-consolekit \
 		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable debug) \
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index 9982e464ec84..177b447fa3c6 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.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
@@ -14,9 +14,9 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc x86"
 
-IUSE="consolekit debug elogind +gtk3 nls pam systemd"
+IUSE="debug elogind +gtk3 nls pam systemd"
 
-DEPEND="consolekit? ( sys-auth/consolekit )
+DEPEND="
 	x11-libs/libxcb
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( x11-libs/gtk+:2 )
@@ -31,7 +31,7 @@ BDEPEND=">=dev-util/intltool-0.40
 	virtual/pkgconfig"
 DOCS=( AUTHORS README TODO )
 
-REQUIRED_USE="?? ( consolekit elogind systemd ) elogind? ( pam ) systemd? ( pam )"
+REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
 
 src_prepare() {
 	# Upstream bug, tarball contains pre-made lxdm.conf
@@ -58,7 +58,7 @@ src_configure() {
 		--with-x \
 		--with-xconn=xcb \
 		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		$(use_enable consolekit) \
+		--disable-consolekit \
 		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable debug) \
diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
index a4646c8be527..f241db24df39 100644
--- a/lxde-base/lxdm/metadata.xml
+++ b/lxde-base/lxdm/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Brian Evans</name>
 	</maintainer>
 	<use>
-		<flag name="consolekit">Enables support for authorization using consolekit</flag>
 		<flag name="gtk3">Use GTK+3 instead of 2</flag>
 	</use>
 	<upstream>