1 |
commit: beb7ce2ab6614f65fadb09ff19af813a87633b07 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 27 21:42:47 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 27 21:42:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=beb7ce2a |
7 |
|
8 |
gnome-base/gnome-settings-daemon: remove, moved to ::gentoo |
9 |
|
10 |
.../files/3.24.2-udevrulesdir-configure.patch | 48 ------ |
11 |
.../files/3.24.3-fix-wayland-build.patch | 53 ------- |
12 |
.../files/3.26.1-optional.patch | 169 --------------------- |
13 |
.../gnome-settings-daemon-3.26.2-r1.ebuild | 131 ---------------- |
14 |
gnome-base/gnome-settings-daemon/metadata.xml | 13 -- |
15 |
5 files changed, 414 deletions(-) |
16 |
|
17 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch |
18 |
deleted file mode 100644 |
19 |
index 16988f94..00000000 |
20 |
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch |
21 |
+++ /dev/null |
22 |
@@ -1,48 +0,0 @@ |
23 |
-From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001 |
24 |
-From: Mart Raudsepp <leio@g.o> |
25 |
-Date: Mon, 29 May 2017 00:38:57 +0300 |
26 |
-Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config |
27 |
- |
28 |
-Use the standard way to find the udev rules directory via pkg-config by default, |
29 |
-and support specifying it, should it be necessary. |
30 |
-This is the same logic as in colord. |
31 |
---- |
32 |
- configure.ac | 9 +++++++++ |
33 |
- plugins/rfkill/Makefile.am | 1 - |
34 |
- 2 files changed, 9 insertions(+), 1 deletion(-) |
35 |
- |
36 |
-diff --git a/configure.ac b/configure.ac |
37 |
-index 1107578..475821d 100644 |
38 |
---- a/configure.ac |
39 |
-+++ b/configure.ac |
40 |
-@@ -104,6 +104,15 @@ fi |
41 |
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) |
42 |
- |
43 |
- dnl --------------------------------------------------------------------------- |
44 |
-+dnl - Where to install udev rules |
45 |
-+dnl --------------------------------------------------------------------------- |
46 |
-+AC_ARG_WITH([udevrulesdir], |
47 |
-+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), |
48 |
-+ [], |
49 |
-+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) |
50 |
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir]) |
51 |
-+ |
52 |
-+dnl --------------------------------------------------------------------------- |
53 |
- dnl - ALSA integration (default enabled) |
54 |
- dnl --------------------------------------------------------------------------- |
55 |
- ALSA_PKG="" |
56 |
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am |
57 |
-index 3c5ec47..bfc34c6 100644 |
58 |
---- a/plugins/rfkill/Makefile.am |
59 |
-+++ b/plugins/rfkill/Makefile.am |
60 |
-@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
61 |
- org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile |
62 |
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ |
63 |
- |
64 |
--udevrulesdir = $(prefix)/lib/udev/rules.d |
65 |
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules |
66 |
- |
67 |
- EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) |
68 |
--- |
69 |
-2.10.2 |
70 |
- |
71 |
|
72 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch |
73 |
deleted file mode 100644 |
74 |
index 4a06889a..00000000 |
75 |
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch |
76 |
+++ /dev/null |
77 |
@@ -1,53 +0,0 @@ |
78 |
-From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001 |
79 |
-From: Gilles Dartiguelongue <eva@g.o> |
80 |
-Date: Fri, 18 Aug 2017 09:42:56 +0200 |
81 |
-Subject: [PATCH] Fix build issue when gudev is detected in the absence of |
82 |
- wayland |
83 |
- |
84 |
-See https://bugs.gentoo.org/show_bug.cgi?id=627966 |
85 |
---- |
86 |
- configure.ac | 5 +++++ |
87 |
- plugins/common/Makefile.am | 2 +- |
88 |
- 2 files changed, 6 insertions(+), 1 deletion(-) |
89 |
- |
90 |
-diff --git a/configure.ac b/configure.ac |
91 |
-index 908b3a3a..c89d5e2d 100644 |
92 |
---- a/configure.ac |
93 |
-+++ b/configure.ac |
94 |
-@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland, |
95 |
- AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]), |
96 |
- enable_wayland=$enableval, enable_wayland=auto) |
97 |
- if test x$enable_wayland != xno; then |
98 |
-+ AS_IF([test "$have_udev" = no], |
99 |
-+ [AC_MSG_ERROR([udev is required for Wayland support])]) |
100 |
-+ |
101 |
- PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no) |
102 |
- if test x$have_wayland = xyes; then |
103 |
- AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available]) |
104 |
-+ GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0" |
105 |
- else |
106 |
- if test x$enable_wayland = xyes; then |
107 |
- AC_MSG_ERROR([Wayland enabled but not found]) |
108 |
- fi |
109 |
- fi |
110 |
- fi |
111 |
-+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes) |
112 |
- |
113 |
- dnl ================================================================ |
114 |
- dnl Plugins |
115 |
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am |
116 |
-index 107e4d3b..760f3198 100644 |
117 |
---- a/plugins/common/Makefile.am |
118 |
-+++ b/plugins/common/Makefile.am |
119 |
-@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \ |
120 |
- gsd-shell-helper.c \ |
121 |
- gsd-shell-helper.h |
122 |
- |
123 |
--if HAVE_GUDEV |
124 |
-+if HAVE_WAYLAND |
125 |
- libcommon_la_SOURCES += \ |
126 |
- gsd-device-manager-udev.c \ |
127 |
- gsd-device-manager-udev.h |
128 |
--- |
129 |
-2.14.1 |
130 |
- |
131 |
|
132 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch |
133 |
deleted file mode 100644 |
134 |
index 608784c4..00000000 |
135 |
--- a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch |
136 |
+++ /dev/null |
137 |
@@ -1,169 +0,0 @@ |
138 |
-From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001 |
139 |
-From: Ole Reifschneider <mail@×××××××××××××××××.de> |
140 |
-Date: Tue, 15 Aug 2017 18:51:42 +0200 |
141 |
-Subject: [PATCH 1/6] Make colord and wacom support optional |
142 |
- |
143 |
-Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
144 |
-Signed-off-by: Timo Tambet <ttambet@×××××.com> |
145 |
-Signed-off-by: Yuh-Horng Chen <yhchens@×××××.com> |
146 |
---- |
147 |
- configure.ac | 54 ++++++++++++++++++++++++++++++---------------- |
148 |
- plugins/Makefile.am | 9 ++++++-- |
149 |
- plugins/common/Makefile.am | 7 ++++-- |
150 |
- plugins/dummy/Makefile.am | 5 ++++- |
151 |
- 4 files changed, 52 insertions(+), 23 deletions(-) |
152 |
- |
153 |
-diff --git a/configure.ac b/configure.ac |
154 |
-index 73fe91e6..d8778c93 100644 |
155 |
---- a/configure.ac |
156 |
-+++ b/configure.ac |
157 |
-@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, |
158 |
- gtk+-x11-3.0 |
159 |
- x11) |
160 |
- |
161 |
--PKG_CHECK_MODULES(COLOR, |
162 |
-- colord >= 1.0.2 |
163 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
164 |
-- libcanberra-gtk3 |
165 |
-- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION |
166 |
-- lcms2 >= $LCMS_REQUIRED_VERSION |
167 |
-- libnotify) |
168 |
-+AC_ARG_ENABLE([color], |
169 |
-+ AS_HELP_STRING([--disable-color], |
170 |
-+ [turn off color plugin]), |
171 |
-+ [], |
172 |
-+ [enable_color=yes]) |
173 |
-+ |
174 |
-+AS_IF([test "$enable_color" = "yes"], |
175 |
-+ [PKG_CHECK_MODULES(COLOR, |
176 |
-+ colord >= 1.0.2 |
177 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
178 |
-+ libcanberra-gtk3 |
179 |
-+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION |
180 |
-+ lcms2 >= $LCMS_REQUIRED_VERSION |
181 |
-+ libnotify) |
182 |
-+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) |
183 |
-+ ]) |
184 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") |
185 |
- |
186 |
- PKG_CHECK_MODULES(DATETIME, |
187 |
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION |
188 |
-@@ -268,23 +278,31 @@ case $host_os in |
189 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
190 |
- have_wacom=no |
191 |
- else |
192 |
-- if test x$enable_gudev != xno; then |
193 |
-- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" |
194 |
-- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
195 |
-- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) |
196 |
-- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
197 |
-- else |
198 |
-- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
199 |
-- fi |
200 |
-- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
201 |
-- have_wacom=yes |
202 |
-+ have_wacom=no |
203 |
-+ AS_IF([test "$enable_gudev" != "no"], |
204 |
-+ [AC_ARG_ENABLE([wacom], |
205 |
-+ AS_HELP_STRING([--disable-wacom], |
206 |
-+ [turn off wacom plugin]), |
207 |
-+ [], |
208 |
-+ [enable_wacom=no]) dnl Default value |
209 |
-+ AS_IF([test "$enable_wacom" = "yes"], |
210 |
-+ [ |
211 |
-+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
212 |
-+ PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) |
213 |
-+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
214 |
-+ have_wacom=yes |
215 |
-+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
216 |
-+ ]) |
217 |
-+ ], [ |
218 |
-+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
219 |
-+ ]) |
220 |
- fi |
221 |
- ;; |
222 |
- *) |
223 |
- have_wacom=no |
224 |
- ;; |
225 |
- esac |
226 |
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) |
227 |
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) |
228 |
- |
229 |
- dnl --------------------------------------------------------------------------- |
230 |
- dnl - common |
231 |
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
232 |
-index 9324b406..ee78d6d0 100644 |
233 |
---- a/plugins/Makefile.am |
234 |
-+++ b/plugins/Makefile.am |
235 |
-@@ -4,7 +4,6 @@ enabled_plugins = \ |
236 |
- a11y-keyboard \ |
237 |
- a11y-settings \ |
238 |
- clipboard \ |
239 |
-- color \ |
240 |
- datetime \ |
241 |
- dummy \ |
242 |
- power \ |
243 |
-@@ -22,13 +21,19 @@ enabled_plugins = \ |
244 |
- |
245 |
- disabled_plugins = $(NULL) |
246 |
- |
247 |
-+if BUILD_COLOR |
248 |
-+enabled_plugins += color |
249 |
-+else |
250 |
-+disabled_plugins += color |
251 |
-+endif |
252 |
-+ |
253 |
- if SMARTCARD_SUPPORT |
254 |
- enabled_plugins += smartcard |
255 |
- else |
256 |
- disabled_plugins += smartcard |
257 |
- endif |
258 |
- |
259 |
--if HAVE_WACOM |
260 |
-+if BUILD_WACOM |
261 |
- enabled_plugins += wacom |
262 |
- else |
263 |
- disabled_plugins += wacom |
264 |
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am |
265 |
-index 239c6015..65de4007 100644 |
266 |
---- a/plugins/common/Makefile.am |
267 |
-+++ b/plugins/common/Makefile.am |
268 |
-@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \ |
269 |
- -I$(top_builddir)/gnome-settings-daemon \ |
270 |
- -I$(top_srcdir)/data/ |
271 |
- |
272 |
--libcommon_la_CFLAGS = $(COMMON_CFLAGS) |
273 |
-+libcommon_la_CFLAGS = \ |
274 |
-+ $(COMMON_CFLAGS) \ |
275 |
-+ $(LIBWACOM_CFLAGS) |
276 |
- |
277 |
- libcommon_la_LDFLAGS = \ |
278 |
- $(GSD_PLUGIN_LDFLAGS) |
279 |
- |
280 |
- libcommon_la_LIBADD = \ |
281 |
- $(top_builddir)/gnome-settings-daemon/libgsd.la \ |
282 |
-- $(COMMON_LIBS) |
283 |
-+ $(COMMON_LIBS) \ |
284 |
-+ $(LIBWACOM_LIBS) |
285 |
- |
286 |
- libexec_PROGRAMS = gsd-test-input-helper |
287 |
- |
288 |
-diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am |
289 |
-index cb5856cf..d8e8bc4e 100644 |
290 |
---- a/plugins/dummy/Makefile.am |
291 |
-+++ b/plugins/dummy/Makefile.am |
292 |
-@@ -25,7 +25,10 @@ desktop_DATA = |
293 |
- if !SMARTCARD_SUPPORT |
294 |
- desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop |
295 |
- endif |
296 |
--if !HAVE_WACOM |
297 |
-+if !BUILD_COLOR |
298 |
-+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop |
299 |
-+endif |
300 |
-+if !BUILD_WACOM |
301 |
- desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop |
302 |
- endif |
303 |
- if !BUILD_PRINT_NOTIFICATIONS |
304 |
--- |
305 |
-2.14.1 |
306 |
- |
307 |
|
308 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild |
309 |
deleted file mode 100644 |
310 |
index 0d45c1d0..00000000 |
311 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild |
312 |
+++ /dev/null |
313 |
@@ -1,131 +0,0 @@ |
314 |
-# Copyright 1999-2018 Gentoo Authors |
315 |
-# Distributed under the terms of the GNU General Public License v2 |
316 |
- |
317 |
-EAPI=6 |
318 |
-GNOME2_EAUTORECONF="yes" |
319 |
-GNOME2_LA_PUNT="yes" |
320 |
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 |
321 |
-PYTHON_COMPAT=( python2_7 ) |
322 |
- |
323 |
-inherit gnome2 python-any-r1 udev virtualx |
324 |
- |
325 |
-DESCRIPTION="Gnome Settings Daemon" |
326 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
327 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
328 |
- |
329 |
-LICENSE="GPL-2+" |
330 |
-SLOT="0" |
331 |
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland" |
332 |
-REQUIRED_USE=" |
333 |
- ^^ ( elogind systemd ) |
334 |
- input_devices_wacom? ( udev ) |
335 |
- smartcard? ( udev ) |
336 |
- wayland? ( udev ) |
337 |
-" |
338 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
339 |
- |
340 |
-COMMON_DEPEND=" |
341 |
- >=dev-libs/glib-2.53.0:2 |
342 |
- >=x11-libs/gtk+-3.15.3:3[X,wayland?] |
343 |
- >=gnome-base/gnome-desktop-3.11.1:3= |
344 |
- >=gnome-base/gsettings-desktop-schemas-3.23.3 |
345 |
- >=gnome-base/librsvg-2.36.2:2 |
346 |
- media-fonts/cantarell |
347 |
- media-libs/alsa-lib |
348 |
- media-libs/fontconfig |
349 |
- media-libs/libcanberra[gtk3] |
350 |
- >=media-sound/pulseaudio-2 |
351 |
- >=sys-power/upower-0.99:= |
352 |
- x11-libs/cairo |
353 |
- x11-libs/gdk-pixbuf:2 |
354 |
- >=x11-libs/libnotify-0.7.3:= |
355 |
- x11-libs/libX11 |
356 |
- x11-libs/libxkbfile |
357 |
- x11-libs/libXi |
358 |
- x11-libs/libXext |
359 |
- x11-libs/libXfixes |
360 |
- x11-libs/libXtst |
361 |
- x11-libs/libXxf86misc |
362 |
- x11-misc/xkeyboard-config |
363 |
- |
364 |
- >=app-misc/geoclue-2.3.1:2.0 |
365 |
- >=dev-libs/libgweather-3.9.5:2= |
366 |
- >=sci-geosciences/geocode-glib-3.10 |
367 |
- >=sys-auth/polkit-0.103 |
368 |
- |
369 |
- colord? ( |
370 |
- >=media-libs/lcms-2.2:2 |
371 |
- >=x11-misc/colord-1.0.2:= ) |
372 |
- cups? ( >=net-print/cups-1.4[dbus] ) |
373 |
- input_devices_wacom? ( |
374 |
- >=dev-libs/libwacom-0.7 |
375 |
- >=x11-libs/pango-1.20 |
376 |
- x11-drivers/xf86-input-wacom |
377 |
- virtual/libgudev:= ) |
378 |
- networkmanager? ( >=net-misc/networkmanager-1.0 ) |
379 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
380 |
- udev? ( virtual/libgudev:= ) |
381 |
- wayland? ( dev-libs/wayland ) |
382 |
-" |
383 |
-# logind needed for power and session management, bug #464944 |
384 |
-# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter) |
385 |
-RDEPEND="${COMMON_DEPEND} |
386 |
- gnome-base/dconf |
387 |
- elogind? ( sys-auth/elogind ) |
388 |
- systemd? ( sys-apps/systemd ) |
389 |
- !<gnome-base/gnome-session-3.25.4 |
390 |
-" |
391 |
-DEPEND="${COMMON_DEPEND} |
392 |
- test? ( |
393 |
- ${PYTHON_DEPS} |
394 |
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
395 |
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') |
396 |
- gnome-base/gnome-session ) |
397 |
- dev-libs/libxml2:2 |
398 |
- dev-util/glib-utils |
399 |
- sys-devel/gettext |
400 |
- >=dev-util/intltool-0.40 |
401 |
- virtual/pkgconfig |
402 |
- x11-base/xorg-proto |
403 |
-" |
404 |
- |
405 |
-# TypeErrors with python3; weird test errors with python2; all in power component that was made required now |
406 |
-RESTRICT="!test? ( test )" |
407 |
- |
408 |
-PATCHES=( |
409 |
- # upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf |
410 |
- # Make colord and wacom optional; requires eautoreconf |
411 |
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
412 |
- # Fix build system to require gudev with wayland, bug #627966; requires eautoreconf |
413 |
- "${WORKDIR}"/patches/ |
414 |
-) |
415 |
- |
416 |
-python_check_deps() { |
417 |
- if use test; then |
418 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
419 |
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
420 |
- fi |
421 |
-} |
422 |
- |
423 |
-pkg_setup() { |
424 |
- use test && python-any-r1_pkg_setup |
425 |
-} |
426 |
- |
427 |
-src_configure() { |
428 |
- gnome2_src_configure \ |
429 |
- --disable-static \ |
430 |
- --with-udevrulesdir="$(get_udevdir)"/rules.d \ |
431 |
- $(use_enable colord color) \ |
432 |
- $(use_enable cups) \ |
433 |
- $(use_enable debug) \ |
434 |
- $(use_enable debug more-warnings) \ |
435 |
- $(use_enable networkmanager network-manager) \ |
436 |
- $(use_enable smartcard smartcard-support) \ |
437 |
- $(use_enable udev gudev) \ |
438 |
- $(use_enable input_devices_wacom wacom) \ |
439 |
- $(use_enable wayland) |
440 |
-} |
441 |
- |
442 |
-src_test() { |
443 |
- virtx emake check |
444 |
-} |
445 |
|
446 |
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml |
447 |
deleted file mode 100644 |
448 |
index 5e2d0958..00000000 |
449 |
--- a/gnome-base/gnome-settings-daemon/metadata.xml |
450 |
+++ /dev/null |
451 |
@@ -1,13 +0,0 @@ |
452 |
-<?xml version="1.0" encoding="UTF-8"?> |
453 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
454 |
-<pkgmetadata> |
455 |
- <maintainer type="project"> |
456 |
- <email>gnome@g.o</email> |
457 |
- <name>Gentoo GNOME Desktop</name> |
458 |
- </maintainer> |
459 |
- <use> |
460 |
- <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag> |
461 |
- <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag> |
462 |
- <flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag> |
463 |
- </use> |
464 |
-</pkgmetadata> |