gentoo resync : 25.11.2020

3 files changed, 5 insertions, 14 deletions

diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index ee7c4d4476b8..db0d204d9dce 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -2,9 +2,8 @@ AUX 50qingy-gentoo.el 241 BLAKE2B 951d9c06cb1b31be819cf687f6bd02fca29fcb35d482cf
 AUX qingy-1.0.0-tinfo.patch 1581 BLAKE2B 4e1dc1328a322b8c2a2b9e7abc05eaad4ba6ba8b208dda28a7648908c6670864fd23f2a7d0472b42ea79521b532e21dc92449ef47c9f7d788342c21ba0fd8001 SHA512 f9ac5d0dba7473de113a360f02f7eeefbb5af70db2c282741697316ddcc81ecc01e2341436e6a6fcb9f43170a4297b2b12aeec352a271ce12b97e6aaf593bac1
 AUX qingy-logrotate 75 BLAKE2B 2c61e97469a1911a3c711321a202b5276a41bf607e4361ef2acf2f2225e6f5752f33d9e8130f5fef682fb0a19f04bb2e2b056904cb24a9daca8f199a921c2850 SHA512 3b22cac09fc7394a4a4aa5a786309378cd769c351eed1e2813b84230c6ec74f7c30bfec9c6a03682b2ad5063a30bbdaac679f9e07bab2cee75ec73dd137aca01
 AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c6eba34ebaa6c3dc9bc5b6f943234c2220dfef8c16fa2bb498ab929ca1c712ecf653664d7372ade7de SHA512 bbbfaea129f8b0ff89a66873f3d2ee2b774ce6f59adfb5efdd7bbaaf7d602a6933e888b68b73bf378864799088bf7f4e645785cbc16c51621bf2fed11a4cc55a
-DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1bcbe7741adb94e8486b81ccb4f9289f6aca7c33081b950f282e6aa0a68b2d23e6235918931faaf05666a4226666600f6b19d3d SHA512 e69743173ea0ff27265dca789f4203b58c271ec6acfeac1ffd87738a3a693f1393778ca70be5d0c8a3e461edfa350047cef3941d8e85679f7c930f3b63c1eeb1
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r4.ebuild 4044 BLAKE2B 63ece0686d4cba32ce9772d5370c5e847cd6bf866a3bacdd51e941c6617ff5b6aad1a4b1e2423ddf5b26e3f17fa02345dd8f471673aaa52fc1c51cf40e8cbbe4 SHA512 8865f6a30c5bad554ae5399c58d0e18f5a0716583c9b2e40c501525200f1f56b405716b3d9058739f1f1e978359b1b8a252690f634ccf2f3095249abb88e4bf6
-MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485
+EBUILD qingy-1.0.0-r4.ebuild 3778 BLAKE2B bf32ab97caf57825efcdcbff9cdf48948d6b56bddd4a4d893377fe86cc6ecf1061795db0f212ef611981da915e647210d4385f0ea1115e3a2dbc01b544a9edf5 SHA512 4d1e326896a4717d0b097ddc8e8c42060eefd144a084cc00c7bc6a92a311e738fccef140fd04bc3e0c0b0738588bd60f4827f8d7ab1c9c8d2807d515a9b4d185
+MISC metadata.xml 455 BLAKE2B 1f5c9e9578a79b34f81001fe4123f9027bd1c08f669359992ec7f046ecbdefc0da541d0c72091c2ae51c1ff4e920f7d7f2c32bc6d7d9feef1c7d587fb3f18e20 SHA512 4f6eed8a90fb3b6dd96a3e7036aeead5b9bb550b92f5b3d519461775a6d1c710e0a3434b31b9e371392c2219e952419a38c1b90edb1f4ddc450281b165a0934b
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index a5a65bc91a7e..6d78e724dd63 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="consolekit">Enable native consolekit support</flag>
 	<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
 </use>
 <upstream>
diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 5bdb362f4cc5..2aae7adf571d 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r4.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
@@ -10,13 +10,12 @@ DESCRIPTION="A DirectFB getty replacement"
 HOMEPAGE="http://qingy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 	mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2
-	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz
-	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz"
+	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
+IUSE="crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:=
@@ -34,9 +33,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${RDEPEND}
-	consolekit? (
-		sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-auth/pambase )
 "
 
@@ -46,8 +42,6 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-tinfo.patch
 	# bug #359637 and bug #462634 - fixes from upstream
 	epatch "${DISTDIR}"/${P}-screensavers.patch.gz
-	# bug #372675 - fix from upstream
-	epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz
 	default
 	mv configure.in configure.ac || die
 	eautoreconf
@@ -72,7 +66,6 @@ src_configure() {
 		--disable-optimizations \
 		--disable-static \
 		--disable-DirectFB-support \
-		$(use_enable consolekit) \
 		$(use_enable pam) \
 		$(use_enable static static-build) \
 		$(use_enable gpm gpm-lock) \