1 |
commit: d9f21e5b0de212546b422d3699901bb8ba9ea56e |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 6 19:35:19 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 6 19:35:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f21e5b |
7 |
|
8 |
x11-misc/light-locker: Drop old |
9 |
|
10 |
Old version referenced consolekit which is now removed from gentoo |
11 |
|
12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
13 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
14 |
|
15 |
x11-misc/light-locker/Manifest | 1 - |
16 |
.../files/light-locker-1.8.0-elogind.patch | 257 --------------------- |
17 |
x11-misc/light-locker/light-locker-1.8.0-r1.ebuild | 74 ------ |
18 |
x11-misc/light-locker/metadata.xml | 2 - |
19 |
4 files changed, 334 deletions(-) |
20 |
|
21 |
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest |
22 |
index cef115de560..f39b02aeefc 100644 |
23 |
--- a/x11-misc/light-locker/Manifest |
24 |
+++ b/x11-misc/light-locker/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5 |
27 |
DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4 |
28 |
|
29 |
diff --git a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch |
30 |
deleted file mode 100644 |
31 |
index 511e730f434..00000000000 |
32 |
--- a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch |
33 |
+++ /dev/null |
34 |
@@ -1,257 +0,0 @@ |
35 |
-diff --git a/README b/README |
36 |
-index 330ec82..d16cc6b 100644 |
37 |
---- a/README |
38 |
-+++ b/README |
39 |
-@@ -34,6 +34,7 @@ Most of these configurations will be enabled automatically when their dependenci |
40 |
- Here is a list of the different dependencies and there configuration flags: |
41 |
- --with-gtk2: This decides between the Gtk+-3.0 and Gtk+-2.0 dependency. |
42 |
- --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed. |
43 |
-+ --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above. |
44 |
- --with-console-kit: This adds the support for ConsoleKit. |
45 |
- --with-upower: This adds the support for UPower. |
46 |
- --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed. |
47 |
-diff --git a/configure.ac.in b/configure.ac.in |
48 |
-index 929befd..8639583 100644 |
49 |
---- a/configure.ac |
50 |
-+++ b/configure.ac |
51 |
-@@ -447,6 +447,42 @@ fi |
52 |
- AC_SUBST(SYSTEMD_CFLAGS) |
53 |
- AC_SUBST(SYSTEMD_LIBS) |
54 |
- |
55 |
-+dnl --------------------------------------------------------------------------- |
56 |
-+dnl elogind |
57 |
-+dnl --------------------------------------------------------------------------- |
58 |
-+ |
59 |
-+AC_ARG_WITH(elogind, |
60 |
-+ AS_HELP_STRING([--with-elogind], |
61 |
-+ [Add elogind support]), |
62 |
-+ [with_elogind=$withval], [with_elogind=auto]) |
63 |
-+ |
64 |
-+if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then |
65 |
-+ AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind]) |
66 |
-+fi |
67 |
-+ |
68 |
-+PKG_CHECK_MODULES(ELOGIND, |
69 |
-+ [libelogind], |
70 |
-+ [have_elogind=yes], [have_elogind=no]) |
71 |
-+ |
72 |
-+if test "x$with_elogind" = "xauto" ; then |
73 |
-+ if test x$have_elogind = xno ; then |
74 |
-+ use_elogind=no |
75 |
-+ else |
76 |
-+ use_elogind=yes |
77 |
-+ fi |
78 |
-+else |
79 |
-+ use_elogind=$with_elogind |
80 |
-+fi |
81 |
-+ |
82 |
-+if test "x$use_elogind" = "xyes"; then |
83 |
-+ if test "x$have_elogind" = "xno"; then |
84 |
-+ AC_MSG_ERROR([Elogind support explicitly required, but elogind not found]) |
85 |
-+ fi |
86 |
-+ AC_DEFINE(WITH_ELOGIND, 1, [elogind support]) |
87 |
-+fi |
88 |
-+AC_SUBST(ELOGIND_CFLAGS) |
89 |
-+AC_SUBST(ELOGIND_LIBS) |
90 |
-+ |
91 |
- dnl --------------------------------------------------------------------------- |
92 |
- dnl UPower |
93 |
- dnl --------------------------------------------------------------------------- |
94 |
-@@ -668,6 +704,7 @@ echo " |
95 |
- systemd: ${use_systemd} |
96 |
- ConsoleKit: ${use_console_kit} |
97 |
- UPower: ${use_upower} |
98 |
-+ elogind: ${use_elogind} |
99 |
- |
100 |
- Features: |
101 |
- --------- |
102 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
103 |
-index 0fa4ef9..7c6a46f 100644 |
104 |
---- a/src/Makefile.am |
105 |
-+++ b/src/Makefile.am |
106 |
-@@ -90,7 +90,8 @@ light_locker_SOURCES = \ |
107 |
- light_locker_LDADD = \ |
108 |
- $(LIGHT_LOCKER_LIBS) \ |
109 |
- $(SAVER_LIBS) \ |
110 |
-- $(SYSTEMD_LIBS) \ |
111 |
-+ $(SYSTEMD_LIBS) \ |
112 |
-+ $(ELOGIND_LIBS) \ |
113 |
- $(NULL) |
114 |
- |
115 |
- light_locker_LDFLAGS = -export-dynamic |
116 |
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c |
117 |
-index cab6a9e..8928cbf 100644 |
118 |
---- a/src/gs-listener-dbus.c |
119 |
-+++ b/src/gs-listener-dbus.c |
120 |
-@@ -47,6 +47,10 @@ |
121 |
- #include <systemd/sd-login.h> |
122 |
- #endif |
123 |
- |
124 |
-+#ifdef WITH_ELOGIND |
125 |
-+#include <elogind/systemd/sd-login.h> |
126 |
-+#endif |
127 |
-+ |
128 |
- #include "gs-listener-dbus.h" |
129 |
- #include "gs-marshal.h" |
130 |
- #include "gs-debug.h" |
131 |
-@@ -82,7 +86,7 @@ struct GSListenerPrivate |
132 |
- char *session_id; |
133 |
- char *seat_path; |
134 |
- |
135 |
--#ifdef WITH_SYSTEMD |
136 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
137 |
- gboolean have_systemd; |
138 |
- char *sd_session_id; |
139 |
- int delay_fd; |
140 |
-@@ -138,7 +142,7 @@ gs_listener_send_switch_greeter (GSListener *listener) |
141 |
- |
142 |
- gs_debug ("Send switch greeter"); |
143 |
- |
144 |
--#ifdef WITH_SYSTEMD |
145 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
146 |
- /* Compare with 0. On failure this will return < 0. |
147 |
- * In the later case we probably aren't using systemd. |
148 |
- */ |
149 |
-@@ -179,7 +183,7 @@ gs_listener_send_lock_session (GSListener *listener) |
150 |
- |
151 |
- gs_debug ("Send lock session"); |
152 |
- |
153 |
--#ifdef WITH_SYSTEMD |
154 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
155 |
- /* Compare with 0. On failure this will return < 0. |
156 |
- * In the later case we probably aren't using systemd. |
157 |
- */ |
158 |
-@@ -363,7 +367,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle) |
159 |
- |
160 |
- gs_debug ("Send idle hint: %d", idle); |
161 |
- |
162 |
--#ifdef WITH_SYSTEMD |
163 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
164 |
- if (listener->priv->have_systemd) { |
165 |
- |
166 |
- if (listener->priv->system_connection == NULL) { |
167 |
-@@ -436,7 +440,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle) |
168 |
- void |
169 |
- gs_listener_delay_suspend (GSListener *listener) |
170 |
- { |
171 |
--#ifdef WITH_SYSTEMD |
172 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
173 |
- DBusMessage *message; |
174 |
- DBusMessage *reply; |
175 |
- DBusError error; |
176 |
-@@ -509,7 +513,7 @@ gs_listener_delay_suspend (GSListener *listener) |
177 |
- void |
178 |
- gs_listener_resume_suspend (GSListener *listener) |
179 |
- { |
180 |
--#ifdef WITH_SYSTEMD |
181 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
182 |
- gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd); |
183 |
- |
184 |
- if (listener->priv->delay_fd >= 0) { |
185 |
-@@ -1112,7 +1116,7 @@ _listener_message_path_is_our_session (GSListener *listener, |
186 |
- return FALSE; |
187 |
- } |
188 |
- |
189 |
--#ifdef WITH_SYSTEMD |
190 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
191 |
- static gboolean |
192 |
- query_session_active (GSListener *listener) |
193 |
- { |
194 |
-@@ -1248,7 +1252,7 @@ query_lid_closed (GSListener *listener) |
195 |
- #endif |
196 |
- #endif |
197 |
- |
198 |
--#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID)) |
199 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID)) |
200 |
- static gboolean |
201 |
- properties_changed_match (DBusMessage *message, |
202 |
- const char *property) |
203 |
-@@ -1343,7 +1347,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, |
204 |
- dbus_message_get_destination (message)); |
205 |
- #endif |
206 |
- |
207 |
--#ifdef WITH_SYSTEMD |
208 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
209 |
- |
210 |
- if (listener->priv->have_systemd) { |
211 |
- |
212 |
-@@ -1963,7 +1967,7 @@ gs_listener_acquire (GSListener *listener, |
213 |
- listener_dbus_system_filter_function, |
214 |
- listener, |
215 |
- NULL); |
216 |
--#ifdef WITH_SYSTEMD |
217 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
218 |
- if (listener->priv->have_systemd) { |
219 |
- dbus_bus_add_match (listener->priv->system_connection, |
220 |
- "type='signal'" |
221 |
-@@ -2075,7 +2079,7 @@ query_session_id (GSListener *listener) |
222 |
- |
223 |
- dbus_error_init (&error); |
224 |
- |
225 |
--#ifdef WITH_SYSTEMD |
226 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
227 |
- if (listener->priv->have_systemd) { |
228 |
- dbus_uint32_t pid = getpid(); |
229 |
- |
230 |
-@@ -2164,7 +2168,7 @@ query_session_id (GSListener *listener) |
231 |
- #endif |
232 |
- } |
233 |
- |
234 |
--#ifdef WITH_SYSTEMD |
235 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
236 |
- static char * |
237 |
- query_sd_session_id (GSListener *listener) |
238 |
- { |
239 |
-@@ -2192,7 +2196,7 @@ init_session_id (GSListener *listener) |
240 |
- listener->priv->session_id = query_session_id (listener); |
241 |
- gs_debug ("Got session-id: %s", listener->priv->session_id); |
242 |
- |
243 |
--#ifdef WITH_SYSTEMD |
244 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
245 |
- g_free (listener->priv->sd_session_id); |
246 |
- listener->priv->sd_session_id = query_sd_session_id (listener); |
247 |
- gs_debug ("Got sd-session-id: %s", listener->priv->sd_session_id); |
248 |
-@@ -2284,7 +2288,7 @@ gs_listener_init (GSListener *listener) |
249 |
- { |
250 |
- listener->priv = GS_LISTENER_GET_PRIVATE (listener); |
251 |
- |
252 |
--#ifdef WITH_SYSTEMD |
253 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
254 |
- /* check if logind is running */ |
255 |
- listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0); |
256 |
- listener->priv->delay_fd = -1; |
257 |
-@@ -2313,7 +2317,7 @@ gs_listener_finalize (GObject *object) |
258 |
- g_free (listener->priv->session_id); |
259 |
- g_free (listener->priv->seat_path); |
260 |
- |
261 |
--#ifdef WITH_SYSTEMD |
262 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
263 |
- g_free (listener->priv->sd_session_id); |
264 |
- #endif |
265 |
- |
266 |
-diff --git a/src/light-locker.c b/src/light-locker.c |
267 |
-index 264b033..79de29a 100644 |
268 |
---- a/src/light-locker.c |
269 |
-+++ b/src/light-locker.c |
270 |
-@@ -144,7 +144,8 @@ main (int argc, |
271 |
- "gtk: %d\n" |
272 |
- "systemd: %s\n" |
273 |
- "ConsoleKit: %s\n" |
274 |
-- "UPower: %s", |
275 |
-+ "UPower: %s\n" |
276 |
-+ "elogind: %s", |
277 |
- GTK_MAJOR_VERSION, |
278 |
- #ifdef WITH_SYSTEMD |
279 |
- "yes", |
280 |
-@@ -160,6 +161,11 @@ main (int argc, |
281 |
- "yes" |
282 |
- #else |
283 |
- "no" |
284 |
-+#endif |
285 |
-+#ifdef WITH_ELOGIND |
286 |
-+ "yes" |
287 |
-+#else |
288 |
-+ "no" |
289 |
- #endif |
290 |
- ); |
291 |
- gs_debug ("Features:\n" |
292 |
|
293 |
diff --git a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild |
294 |
deleted file mode 100644 |
295 |
index 3421ccb6d2d..00000000000 |
296 |
--- a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild |
297 |
+++ /dev/null |
298 |
@@ -1,74 +0,0 @@ |
299 |
-# Copyright 1999-2020 Gentoo Authors |
300 |
-# Distributed under the terms of the GNU General Public License v2 |
301 |
- |
302 |
-EAPI=7 |
303 |
- |
304 |
-inherit autotools gnome2-utils |
305 |
- |
306 |
-DESCRIPTION="A simple locker using lightdm" |
307 |
-HOMEPAGE="https://github.com/the-cavalry/light-locker" |
308 |
-SRC_URI="https://github.com/the-cavalry/light-locker/releases/download/v${PV}/${P}.tar.bz2" |
309 |
- |
310 |
-LICENSE="GPL-2 LGPL-2" |
311 |
-SLOT="0" |
312 |
-KEYWORDS="~amd64 ~x86" |
313 |
-IUSE="consolekit +dpms elogind gtk3 +screensaver systemd +upower" |
314 |
- |
315 |
-BDEPEND="dev-lang/perl |
316 |
- dev-perl/XML-Parser |
317 |
- dev-util/intltool |
318 |
- sys-devel/gettext" |
319 |
-DEPEND="dev-libs/dbus-glib |
320 |
- dev-libs/glib |
321 |
- sys-apps/dbus |
322 |
- x11-libs/cairo |
323 |
- x11-libs/libX11 |
324 |
- x11-libs/pango |
325 |
- x11-libs/libXxf86vm |
326 |
- consolekit? ( sys-auth/consolekit ) |
327 |
- dpms? ( x11-libs/libXext ) |
328 |
- elogind? ( sys-auth/elogind ) |
329 |
- !gtk3? ( x11-libs/gtk+:2 ) |
330 |
- gtk3? ( x11-libs/gtk+:3 ) |
331 |
- screensaver? ( x11-libs/libXScrnSaver ) |
332 |
- systemd? ( sys-apps/systemd ) |
333 |
- upower? ( sys-power/upower )" |
334 |
-RDEPEND="${DEPEND} |
335 |
- x11-misc/lightdm" |
336 |
- |
337 |
-REQUIRED_USE="?? ( consolekit elogind systemd )" |
338 |
- |
339 |
-DOCS=( AUTHORS HACKING NEWS README ) |
340 |
- |
341 |
-PATCHES=( |
342 |
- "${FILESDIR}/${PN}-${PV}-elogind.patch" |
343 |
-) |
344 |
- |
345 |
-src_prepare() { |
346 |
- default |
347 |
- # remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf |
348 |
- sed -si -e "/XDT_I18N/d" configure.ac || die |
349 |
- eautoreconf |
350 |
-} |
351 |
- |
352 |
-src_configure() { |
353 |
- local myeconfargs=( |
354 |
- $(use_with consolekit console-kit) |
355 |
- $(use_with dpms dpms-ext) |
356 |
- $(use_with !gtk3 gtk2) |
357 |
- $(use_with screensaver x) |
358 |
- $(use_with screensaver mit-ext) |
359 |
- $(use_with systemd) |
360 |
- $(use_with elogind) |
361 |
- $(use_with upower) |
362 |
- ) |
363 |
- econf "${myeconfargs[@]}" |
364 |
-} |
365 |
- |
366 |
-pkg_postinst() { |
367 |
- gnome2_schemas_update |
368 |
-} |
369 |
- |
370 |
-pkg_postrm() { |
371 |
- gnome2_schemas_update |
372 |
-} |
373 |
|
374 |
diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml |
375 |
index 3b85524b066..610b2ccac31 100644 |
376 |
--- a/x11-misc/light-locker/metadata.xml |
377 |
+++ b/x11-misc/light-locker/metadata.xml |
378 |
@@ -6,9 +6,7 @@ |
379 |
<name>Denis Dupeyron</name> |
380 |
</maintainer> |
381 |
<use> |
382 |
- <flag name="consolekit">Keep track of the various users, sessions, and seats present on the system.</flag> |
383 |
<flag name="dpms">Turn on the display on screensaver deactivation.</flag> |
384 |
- <flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2.</flag> |
385 |
<flag name="screensaver">Lock the screen on screensaver activation.</flag> |
386 |
</use> |
387 |
<upstream> |