Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-screensaver/
Date: Thu, 08 Oct 2020 19:58:27
Message-Id: 1602187040.82ab22ddd12585c3a852bc2330bedfbb7fcd9cfe.zlogene@gentoo
1 commit: 82ab22ddd12585c3a852bc2330bedfbb7fcd9cfe
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 8 19:57:20 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 8 19:57:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ab22dd
7
8 mate-extra/mate-screensaver: 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 mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild | 5 ++---
14 mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild | 5 ++---
15 mate-extra/mate-screensaver/metadata.xml | 4 ----
16 3 files changed, 4 insertions(+), 10 deletions(-)
17
18 diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
19 index 91e4469d03f..c496eac13b1 100644
20 --- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
21 +++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
22 @@ -13,7 +13,7 @@ DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
23
24 LICENSE="GPL-2+ HPND LGPL-2+"
25 SLOT="0"
26 -IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
27 +IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
28 REQUIRED_USE="?? ( elogind systemd )"
29
30 DOC_CONTENTS="
31 @@ -39,7 +39,6 @@ COMMON_DEPEND="
32 x11-libs/libXxf86vm
33 x11-libs/libxklavier
34 x11-libs/pango
35 - consolekit? ( sys-auth/consolekit )
36 libnotify? ( >=x11-libs/libnotify-0.7:0 )
37 opengl? ( virtual/opengl )
38 pam? ( gnome-base/gnome-keyring sys-libs/pam )
39 @@ -68,8 +67,8 @@ src_configure() {
40 --with-xf86gamma-ext
41 --with-xscreensaverdir=/usr/share/xscreensaver/config
42 --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
43 + --without-console-kit
44 $(use_with X x)
45 - $(use_with consolekit console-kit)
46 $(use_with elogind)
47 $(use_with libnotify)
48 $(use_with opengl libgl)
49
50 diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
51 index 485f4ee1e39..b17ccf08820 100644
52 --- a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
53 +++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
54 @@ -13,7 +13,7 @@ DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
55
56 LICENSE="GPL-2+ HPND LGPL-2+"
57 SLOT="0"
58 -IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
59 +IUSE="X debug elogind kernel_linux libnotify opengl pam systemd"
60 REQUIRED_USE="?? ( elogind systemd )"
61
62 COMMON_DEPEND="
63 @@ -34,7 +34,6 @@ COMMON_DEPEND="
64 x11-libs/libXxf86vm
65 x11-libs/libxklavier
66 x11-libs/pango
67 - consolekit? ( sys-auth/consolekit )
68 libnotify? ( >=x11-libs/libnotify-0.7:0 )
69 opengl? ( virtual/opengl )
70 pam? ( gnome-base/gnome-keyring sys-libs/pam )
71 @@ -68,8 +67,8 @@ src_configure() {
72 --with-xf86gamma-ext
73 --with-xscreensaverdir=/usr/share/xscreensaver/config
74 --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
75 + --without-console-kit
76 $(use_with X x)
77 - $(use_with consolekit console-kit)
78 $(use_with elogind)
79 $(use_with libnotify)
80 $(use_with opengl libgl)
81
82 diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
83 index 4be378966bc..79f7982345f 100644
84 --- a/mate-extra/mate-screensaver/metadata.xml
85 +++ b/mate-extra/mate-screensaver/metadata.xml
86 @@ -5,10 +5,6 @@
87 <email>mate@g.o</email>
88 <name>Gentoo MATE Desktop</name>
89 </maintainer>
90 - <use>
91 - <flag name="consolekit">Enable support for
92 - <pkg>sys-auth/consolekit</pkg></flag>
93 - </use>
94 <upstream>
95 <remote-id type="github">mate-desktop/mate-screensaver</remote-id>
96 </upstream>