gentoo resync : 25.11.2020

4 files changed, 7 insertions, 13 deletions

diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 9944a9339387..49e7ea443a38 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,6 +1,6 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
 DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0
 DIST mate-screensaver-1.24.1.tar.xz 5073836 BLAKE2B 501c8dffbb5e53b88414c799a6e4d25cf89dfe490e6a902901c339b142e2b687dc2e668f65349a2ff43b6eb44d7721658de771b1a698624f95d1828da2fbda67 SHA512 f7cab280da90623ad265beb84770e48431ae6685fbb1eabc7cd2ad07b0f8ed5da2426017243d83271b969d2e020b8afcc93a6135b4c8e42a29f454a4e826b277
-EBUILD mate-screensaver-1.24.0.ebuild 3080 BLAKE2B 9a7966ce3094c466b4c863167d3f7a50ec44d1674e5c806ec9b84fdb3e1deb11cdc91ddfa0ebe0202bcdfba91e9d29e584ddee11d29554c15d84d69311419f73 SHA512 7ae2ff9ba2e8b08e5fa8b262f24514ae638bf6f65cf3c8f40e142b11b5dac241523ec0851c2130cc18c551ddecb16dd4f3beaaf0599bb108534f2a26541dd3c8
-EBUILD mate-screensaver-1.24.1.ebuild 3082 BLAKE2B 4060cf692693cc4d2538eb7731b54a16d02cc7934a135cfeda31e2d71d8d0c9cf30903a9638bda57fe4418596c452a30494410e13dd92628828c49050151c37b SHA512 027c56f31fec71e0b4540c35735e0f46f678ca8f391855b80d64184880cdf3069cafc8f5c3de1477ee0f88dc6477f79890c4109cf4c29c26d2c962abd66ac8c2
-MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
+EBUILD mate-screensaver-1.24.0.ebuild 3019 BLAKE2B c0733bc666d0a3267afd70e62433761277a29124bd5df24c26a9d4f271b5bd1425a7e1cb4afe086115eea8b7930fafdb5651c346c8b8d51821e0a697c7ed7927 SHA512 5b4f1fe5b6b37b5605eeacdc87233b63bbddde4a66082c6088c386c085f312d6f13befbabb6bf7186ad6b323a9b45f0ad55b40a0da02b66c1ab70a82f4d96985
+EBUILD mate-screensaver-1.24.1.ebuild 3021 BLAKE2B d61744e295fd8001a450ae67858ba2b3add837d9420933cf7b050fdda54841f6e393246d931bd10781d9256acd7b2fcafb7851238e2ba6bef74aedee62a842ef SHA512 4169f1fcb5b42c90e74542834289e672867370396d5b69f065db7d5b7df1bebf1f3659b0915a8779337b16a6528522dbe89da783453a9aa69442d491e13003e8
+MISC metadata.xml 345 BLAKE2B 28455ac89b99bf42e67e5da0bf1efb013c7275aebdd43b3c3c518f86afcd517eb761f9f4ee23a0558dbd797ac3d9a6ef04fc0dcc54666e38a51233742598406c SHA512 d9cd02ca623afdaf1d5edf70bbca3cb7f21e510f3a7f51d7293f104c0e445ec1e1f90c8d3f2ad8493599227ea2a46144b2748db27499d81e4f6d72e1da2cb2cf
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
index 91e4469d03f3..c496eac13b11 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
 
 LICENSE="GPL-2+ HPND LGPL-2+"
 SLOT="0"
-IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
+IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DOC_CONTENTS="
@@ -39,7 +39,6 @@ COMMON_DEPEND="
 	x11-libs/libXxf86vm
 	x11-libs/libxklavier
 	x11-libs/pango
-	consolekit? ( sys-auth/consolekit )
 	libnotify? ( >=x11-libs/libnotify-0.7:0 )
 	opengl? ( virtual/opengl )
 	pam? ( gnome-base/gnome-keyring sys-libs/pam )
@@ -68,8 +67,8 @@ src_configure() {
 		--with-xf86gamma-ext
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
 		$(use_with X x)
-		$(use_with consolekit console-kit)
 		$(use_with elogind)
 		$(use_with libnotify)
 		$(use_with opengl libgl)
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
index 485f4ee1e39c..b17ccf088202 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
 
 LICENSE="GPL-2+ HPND LGPL-2+"
 SLOT="0"
-IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
+IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 	x11-libs/libXxf86vm
 	x11-libs/libxklavier
 	x11-libs/pango
-	consolekit? ( sys-auth/consolekit )
 	libnotify? ( >=x11-libs/libnotify-0.7:0 )
 	opengl? ( virtual/opengl )
 	pam? ( gnome-base/gnome-keyring sys-libs/pam )
@@ -68,8 +67,8 @@ src_configure() {
 		--with-xf86gamma-ext
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
 		$(use_with X x)
-		$(use_with consolekit console-kit)
 		$(use_with elogind)
 		$(use_with libnotify)
 		$(use_with opengl libgl)
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index 4be378966bcd..79f7982345f0 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="consolekit">Enable support for 
-			<pkg>sys-auth/consolekit</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-screensaver</remote-id>
 	</upstream>