1 |
commit: 1c515d4701933133b8cc338f7d138659aba82a29 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 8 19:23:03 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 8 19:23:03 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c515d47 |
7 |
|
8 |
sys-apps/qingy: 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 |
sys-apps/qingy/Manifest | 1 - |
14 |
sys-apps/qingy/metadata.xml | 1 - |
15 |
sys-apps/qingy/qingy-1.0.0-r4.ebuild | 13 +++---------- |
16 |
3 files changed, 3 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest |
19 |
index d9ed9eafa5d..94c7f6f964a 100644 |
20 |
--- a/sys-apps/qingy/Manifest |
21 |
+++ b/sys-apps/qingy/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1bcbe7741adb94e8486b81ccb4f9289f6aca7c33081b950f282e6aa0a68b2d23e6235918931faaf05666a4226666600f6b19d3d SHA512 e69743173ea0ff27265dca789f4203b58c271ec6acfeac1ffd87738a3a693f1393778ca70be5d0c8a3e461edfa350047cef3941d8e85679f7c930f3b63c1eeb1 |
24 |
DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64 |
25 |
DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54 |
26 |
DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd |
27 |
|
28 |
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml |
29 |
index a5a65bc91a7..6d78e724dd6 100644 |
30 |
--- a/sys-apps/qingy/metadata.xml |
31 |
+++ b/sys-apps/qingy/metadata.xml |
32 |
@@ -6,7 +6,6 @@ |
33 |
<name>Gentoo Base System</name> |
34 |
</maintainer> |
35 |
<use> |
36 |
- <flag name="consolekit">Enable native consolekit support</flag> |
37 |
<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag> |
38 |
</use> |
39 |
<upstream> |
40 |
|
41 |
diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild |
42 |
index 5bdb362f4cc..2aae7adf571 100644 |
43 |
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild |
44 |
+++ b/sys-apps/qingy/qingy-1.0.0-r4.ebuild |
45 |
@@ -1,4 +1,4 @@ |
46 |
-# Copyright 1999-2019 Gentoo Authors |
47 |
+# Copyright 1999-2020 Gentoo Authors |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
|
50 |
EAPI=6 |
51 |
@@ -10,13 +10,12 @@ DESCRIPTION="A DirectFB getty replacement" |
52 |
HOMEPAGE="http://qingy.sourceforge.net/" |
53 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 |
54 |
mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2 |
55 |
- https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz |
56 |
- https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz" |
57 |
+ https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz" |
58 |
|
59 |
LICENSE="GPL-2" |
60 |
SLOT="0" |
61 |
KEYWORDS="amd64 ppc x86" |
62 |
-IUSE="consolekit crypt emacs gpm opensslcrypt pam static X" |
63 |
+IUSE="crypt emacs gpm opensslcrypt pam static X" |
64 |
|
65 |
RDEPEND=" |
66 |
>=sys-libs/ncurses-5.7-r7:= |
67 |
@@ -34,9 +33,6 @@ DEPEND="${RDEPEND} |
68 |
virtual/pkgconfig |
69 |
" |
70 |
RDEPEND="${RDEPEND} |
71 |
- consolekit? ( |
72 |
- sys-auth/consolekit |
73 |
- sys-apps/dbus ) |
74 |
pam? ( sys-auth/pambase ) |
75 |
" |
76 |
|
77 |
@@ -46,8 +42,6 @@ src_prepare() { |
78 |
eapply "${FILESDIR}"/${P}-tinfo.patch |
79 |
# bug #359637 and bug #462634 - fixes from upstream |
80 |
epatch "${DISTDIR}"/${P}-screensavers.patch.gz |
81 |
- # bug #372675 - fix from upstream |
82 |
- epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz |
83 |
default |
84 |
mv configure.in configure.ac || die |
85 |
eautoreconf |
86 |
@@ -72,7 +66,6 @@ src_configure() { |
87 |
--disable-optimizations \ |
88 |
--disable-static \ |
89 |
--disable-DirectFB-support \ |
90 |
- $(use_enable consolekit) \ |
91 |
$(use_enable pam) \ |
92 |
$(use_enable static static-build) \ |
93 |
$(use_enable gpm gpm-lock) \ |