1 |
commit: 645a7def930e5891efe2942f7bb29bbfa2e0d7d5 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 30 21:59:58 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 30 21:59:58 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645a7def |
7 |
|
8 |
gnome-base/gnome-settings-daemon: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/gnome-settings-daemon/Manifest | 4 - |
14 |
.../files/3.28.1-fix-non-wayland-build.patch | 88 -------------- |
15 |
.../gnome-settings-daemon-3.26.2-r1.ebuild | 132 --------------------- |
16 |
.../gnome-settings-daemon-3.28.1-r1.ebuild | 132 --------------------- |
17 |
.../gnome-settings-daemon-3.30.2.ebuild | 130 -------------------- |
18 |
5 files changed, 486 deletions(-) |
19 |
|
20 |
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest |
21 |
index 150fea5e155..419a91fa4d5 100644 |
22 |
--- a/gnome-base/gnome-settings-daemon/Manifest |
23 |
+++ b/gnome-base/gnome-settings-daemon/Manifest |
24 |
@@ -1,8 +1,4 @@ |
25 |
DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb |
26 |
DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0 |
27 |
-DIST gnome-settings-daemon-3.26.2-patchset.tar.xz 42408 BLAKE2B 3b54dd1b161f4137eeb7c110be70444e3b8eb602a7d1c12ec6aaa32d887d46c3e1dc61df2a04895b7c6e2d67a68edeced5f758f688533caa9900deace7b6d542 SHA512 3ab36a03e2892ad193f420722025753990158ac450c686b9fba490cda4e7e1be69574dd4d3b9c8ed5e238f23933065abc28aee480ff1e2e5dad28e364c04fc0b |
28 |
-DIST gnome-settings-daemon-3.26.2.tar.xz 1589696 BLAKE2B f1fd18e80caf5badb0da1f07cbe994b73a99ace004bf3b568114d6cd6110ebd092ee3a023a1ec818f3946f6f7cdb7ee21417782e271c8aa9ebd9d1d4c35ea286 SHA512 7785ebcb7df466c50557b75a3092f568e375adcf5a40f73e31d5cc69fa63bc556a4447a96e6e612c3bf523735e67168afae0b9c1fab32912d41014436d33b7ff |
29 |
-DIST gnome-settings-daemon-3.28.1-patchset.tar.xz 5216 BLAKE2B eab85f6475c1da9c8beb1dea7d7d79bdaf2e57ac82e90a4ab877e5ffbd8423df8ed5dbd03ac6586a3aadf2be16b89e2955267be24af71db8c89cc407241e0bc9 SHA512 f56a5d62ba45976a01c8fcab63c4d7afd21dbe7a4c75158cc54fc60552faf875b0ca1be7a882c11d814566e7a4ded63ce52d10d214bd1f7926c2d7b0dbaf1590 |
30 |
-DIST gnome-settings-daemon-3.28.1.tar.xz 1362420 BLAKE2B d809696ea7a2df3b89b1e2badbd015623e624c38f44a087e26d167c7ba9a5499a33e6e4ebb12448f69d8aa645154bc176a156f1b9e4a749684e5a497a7be6fc6 SHA512 22e42ce92a6f3ad67a0ef7d1676a6dd3d533b0bc91193d8b2a19a51d7c9601c87caf391c233bb1b96e8a1270d610aca52523d0ae12a38b0e3911065c3a67e10f |
31 |
DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d |
32 |
DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84 |
33 |
|
34 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch |
35 |
deleted file mode 100644 |
36 |
index dd003d6c069..00000000000 |
37 |
--- a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch |
38 |
+++ /dev/null |
39 |
@@ -1,88 +0,0 @@ |
40 |
-From 91d5e708835b4c7810835d59b8ef5968454cfd0a Mon Sep 17 00:00:00 2001 |
41 |
-From: Ting-Wei Lan <lantw@×××××××××.org> |
42 |
-Date: Fri, 15 Jun 2018 23:05:01 +0800 |
43 |
-Subject: [PATCH 1/2] common: Fix build with wayland disabled on FreeBSD |
44 |
- |
45 |
-HAVE_WAYLAND is always defined. We should check whether it is set to a |
46 |
-non-zero value instead of checking whether it is defined. |
47 |
- |
48 |
-(cherry picked from commit 34199fa54641abae15199a311002ac726f47aa89) |
49 |
---- |
50 |
- plugins/common/gsd-device-manager.c | 2 +- |
51 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
52 |
- |
53 |
-diff --git a/plugins/common/gsd-device-manager.c b/plugins/common/gsd-device-manager.c |
54 |
-index 541f2948..ff72ad69 100644 |
55 |
---- a/plugins/common/gsd-device-manager.c |
56 |
-+++ b/plugins/common/gsd-device-manager.c |
57 |
-@@ -275,7 +275,7 @@ gsd_device_manager_get (void) |
58 |
- manager = g_object_get_data (G_OBJECT (screen), "gsd-device-manager-data"); |
59 |
- |
60 |
- if (!manager) { |
61 |
--#ifdef HAVE_WAYLAND |
62 |
-+#if HAVE_WAYLAND |
63 |
- if (gnome_settings_is_wayland ()) { |
64 |
- manager = g_object_new (GSD_TYPE_UDEV_DEVICE_MANAGER, |
65 |
- NULL); |
66 |
--- |
67 |
-2.17.0 |
68 |
- |
69 |
- |
70 |
-From 218f1ff0a3c6c500fd36601a4db6902fc1c57a43 Mon Sep 17 00:00:00 2001 |
71 |
-From: Marvin Schmidt <marv@×××××××.org> |
72 |
-Date: Fri, 22 Jun 2018 20:12:50 +0200 |
73 |
-Subject: [PATCH 2/2] build: Fix build when wayland support is disabled |
74 |
- |
75 |
-The udev based device manager used for wayland environments was built |
76 |
-based on the state of the gudev option instead of the wayland option. |
77 |
-This resulted in an build error when building with `-Dwayland=false` |
78 |
-since the gdk/gdkwayland.h header file is not present on systems without |
79 |
-gdk-wayland-3.0. |
80 |
- |
81 |
-This patch puts the compilation of the udev based device manager behind |
82 |
-the wayland option and the gdk-wayland-3.0 dependency |
83 |
- |
84 |
-(cherry picked from commit 51088a9c27d713bbe63359b865603c833eb5a930) |
85 |
---- |
86 |
- meson.build | 3 ++- |
87 |
- plugins/common/meson.build | 4 ++-- |
88 |
- 2 files changed, 4 insertions(+), 3 deletions(-) |
89 |
- |
90 |
-diff --git a/meson.build b/meson.build |
91 |
-index 79c493a1..27fdd049 100644 |
92 |
---- a/meson.build |
93 |
-+++ b/meson.build |
94 |
-@@ -129,11 +129,12 @@ if enable_colord |
95 |
- colord_dep = dependency('colord', version: '>= 1.0.2') |
96 |
- endif |
97 |
- |
98 |
--# Check for libwayland-client |
99 |
-+# Check for wayland dependencies |
100 |
- enable_wayland = get_option('wayland') |
101 |
- if enable_wayland |
102 |
- assert(enable_gudev, 'GUDev support is required for wayland support.') |
103 |
- wayland_client_dep = dependency('wayland-client') |
104 |
-+ wayland_gdk_dep = dependency('gdk-wayland-3.0') |
105 |
- endif |
106 |
- config_h.set10('HAVE_WAYLAND', enable_wayland) |
107 |
- |
108 |
-diff --git a/plugins/common/meson.build b/plugins/common/meson.build |
109 |
-index 65a0757c..6bda2d2a 100644 |
110 |
---- a/plugins/common/meson.build |
111 |
-+++ b/plugins/common/meson.build |
112 |
-@@ -42,10 +42,10 @@ if host_is_darwin |
113 |
- ldflags += ['-Wl,-bundle_loader,@0@'.format(join_paths(), meson.build_root(), meson.project_name(), meson.project_name())] |
114 |
- endif |
115 |
- |
116 |
--if enable_gudev |
117 |
-+if enable_wayland |
118 |
- sources += files('gsd-device-manager-udev.c') |
119 |
- |
120 |
-- deps += gudev_dep |
121 |
-+ deps += [wayland_gdk_dep, gudev_dep] |
122 |
- endif |
123 |
- |
124 |
- if enable_wacom |
125 |
--- |
126 |
-2.17.0 |
127 |
- |
128 |
|
129 |
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 |
130 |
deleted file mode 100644 |
131 |
index b7c6a9990f9..00000000000 |
132 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild |
133 |
+++ /dev/null |
134 |
@@ -1,132 +0,0 @@ |
135 |
-# Copyright 1999-2018 Gentoo Authors |
136 |
-# Distributed under the terms of the GNU General Public License v2 |
137 |
- |
138 |
-EAPI=6 |
139 |
-GNOME2_EAUTORECONF="yes" |
140 |
-GNOME2_LA_PUNT="yes" |
141 |
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 |
142 |
-PYTHON_COMPAT=( python2_7 ) |
143 |
- |
144 |
-inherit gnome2 python-any-r1 udev virtualx |
145 |
- |
146 |
-DESCRIPTION="Gnome Settings Daemon" |
147 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
148 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
149 |
- |
150 |
-LICENSE="GPL-2+" |
151 |
-SLOT="0" |
152 |
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland" |
153 |
-REQUIRED_USE=" |
154 |
- ^^ ( elogind systemd ) |
155 |
- input_devices_wacom? ( udev ) |
156 |
- smartcard? ( udev ) |
157 |
- wayland? ( udev ) |
158 |
-" |
159 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
160 |
- |
161 |
-COMMON_DEPEND=" |
162 |
- >=dev-libs/glib-2.53.0:2 |
163 |
- >=x11-libs/gtk+-3.15.3:3[X,wayland?] |
164 |
- >=gnome-base/gnome-desktop-3.11.1:3= |
165 |
- >=gnome-base/gsettings-desktop-schemas-3.23.3 |
166 |
- >=gnome-base/librsvg-2.36.2:2 |
167 |
- media-fonts/cantarell |
168 |
- media-libs/alsa-lib |
169 |
- media-libs/fontconfig |
170 |
- media-libs/libcanberra[gtk3] |
171 |
- >=media-sound/pulseaudio-2 |
172 |
- >=sys-power/upower-0.99:= |
173 |
- x11-libs/cairo |
174 |
- x11-libs/gdk-pixbuf:2 |
175 |
- >=x11-libs/libnotify-0.7.3:= |
176 |
- x11-libs/libX11 |
177 |
- x11-libs/libxkbfile |
178 |
- x11-libs/libXi |
179 |
- x11-libs/libXext |
180 |
- x11-libs/libXfixes |
181 |
- x11-libs/libXtst |
182 |
- x11-libs/libXxf86misc |
183 |
- x11-misc/xkeyboard-config |
184 |
- |
185 |
- >=app-misc/geoclue-2.3.1:2.0 |
186 |
- >=dev-libs/libgweather-3.9.5:2= |
187 |
- >=sci-geosciences/geocode-glib-3.10 |
188 |
- >=sys-auth/polkit-0.103 |
189 |
- |
190 |
- colord? ( |
191 |
- >=media-libs/lcms-2.2:2 |
192 |
- >=x11-misc/colord-1.0.2:= ) |
193 |
- cups? ( >=net-print/cups-1.4[dbus] ) |
194 |
- input_devices_wacom? ( |
195 |
- >=dev-libs/libwacom-0.7 |
196 |
- >=x11-libs/pango-1.20 |
197 |
- x11-drivers/xf86-input-wacom |
198 |
- virtual/libgudev:= ) |
199 |
- networkmanager? ( >=net-misc/networkmanager-1.0 ) |
200 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
201 |
- udev? ( virtual/libgudev:= ) |
202 |
- wayland? ( dev-libs/wayland ) |
203 |
-" |
204 |
-# logind needed for power and session management, bug #464944 |
205 |
-# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter) |
206 |
-RDEPEND="${COMMON_DEPEND} |
207 |
- gnome-base/dconf |
208 |
- elogind? ( sys-auth/elogind ) |
209 |
- systemd? ( sys-apps/systemd ) |
210 |
- !<gnome-base/gnome-session-3.25.4 |
211 |
-" |
212 |
-DEPEND="${COMMON_DEPEND} |
213 |
- test? ( |
214 |
- ${PYTHON_DEPS} |
215 |
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
216 |
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') |
217 |
- gnome-base/gnome-session ) |
218 |
- dev-libs/libxml2:2 |
219 |
- dev-util/glib-utils |
220 |
- sys-devel/gettext |
221 |
- >=dev-util/intltool-0.40 |
222 |
- virtual/pkgconfig |
223 |
- x11-base/xorg-proto |
224 |
-" |
225 |
- |
226 |
-# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.28+ |
227 |
-RESTRICT="!test? ( test )" |
228 |
- |
229 |
-PATCHES=( |
230 |
- # upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf |
231 |
- # Make colord and wacom optional; requires eautoreconf |
232 |
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
233 |
- # Fix build system to require gudev with wayland, bug #627966; requires eautoreconf |
234 |
- "${WORKDIR}"/patches/ |
235 |
- "${FILESDIR}"/glib-2.58-compat.patch # included in 3.29.1+, might be backported to 3.28 too |
236 |
-) |
237 |
- |
238 |
-python_check_deps() { |
239 |
- if use test; then |
240 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
241 |
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
242 |
- fi |
243 |
-} |
244 |
- |
245 |
-pkg_setup() { |
246 |
- use test && python-any-r1_pkg_setup |
247 |
-} |
248 |
- |
249 |
-src_configure() { |
250 |
- gnome2_src_configure \ |
251 |
- --disable-static \ |
252 |
- --with-udevrulesdir="$(get_udevdir)"/rules.d \ |
253 |
- $(use_enable colord color) \ |
254 |
- $(use_enable cups) \ |
255 |
- $(use_enable debug) \ |
256 |
- $(use_enable debug more-warnings) \ |
257 |
- $(use_enable networkmanager network-manager) \ |
258 |
- $(use_enable smartcard smartcard-support) \ |
259 |
- $(use_enable udev gudev) \ |
260 |
- $(use_enable input_devices_wacom wacom) \ |
261 |
- $(use_enable wayland) |
262 |
-} |
263 |
- |
264 |
-src_test() { |
265 |
- virtx emake check |
266 |
-} |
267 |
|
268 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild |
269 |
deleted file mode 100644 |
270 |
index 16058730679..00000000000 |
271 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild |
272 |
+++ /dev/null |
273 |
@@ -1,132 +0,0 @@ |
274 |
-# Copyright 1999-2019 Gentoo Authors |
275 |
-# Distributed under the terms of the GNU General Public License v2 |
276 |
- |
277 |
-EAPI=6 |
278 |
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) |
279 |
- |
280 |
-inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg |
281 |
- |
282 |
-DESCRIPTION="Gnome Settings Daemon" |
283 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
284 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
285 |
- |
286 |
-LICENSE="GPL-2+ LGPL-2+" |
287 |
-SLOT="0" |
288 |
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland" |
289 |
-REQUIRED_USE=" |
290 |
- ^^ ( elogind systemd ) |
291 |
- input_devices_wacom? ( udev ) |
292 |
- wayland? ( udev ) |
293 |
-" |
294 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
295 |
- |
296 |
-# >=polkit-0.114 for ITS translation rules of .policy files |
297 |
-COMMON_DEPEND=" |
298 |
- >=sci-geosciences/geocode-glib-3.10 |
299 |
- >=dev-libs/glib-2.53.0:2 |
300 |
- >=gnome-base/gnome-desktop-3.11.1:3= |
301 |
- >=gnome-base/gsettings-desktop-schemas-3.23.3 |
302 |
- >=x11-libs/gtk+-3.15.3:3[X,wayland?] |
303 |
- >=dev-libs/libgweather-3.9.5:2= |
304 |
- colord? ( |
305 |
- >=x11-misc/colord-1.0.2:= |
306 |
- >=media-libs/lcms-2.2:2 ) |
307 |
- media-libs/libcanberra[gtk3] |
308 |
- >=app-misc/geoclue-2.3.1:2.0 |
309 |
- >=x11-libs/libnotify-0.7.3 |
310 |
- >=media-sound/pulseaudio-2[glib] |
311 |
- >=sys-auth/polkit-0.114 |
312 |
- >=sys-power/upower-0.99:= |
313 |
- x11-libs/libX11 |
314 |
- x11-libs/libXtst |
315 |
- udev? ( virtual/libgudev:= ) |
316 |
- wayland? ( dev-libs/wayland ) |
317 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.7 |
318 |
- >=x11-libs/pango-1.20.0 |
319 |
- x11-libs/gdk-pixbuf:2 ) |
320 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
321 |
- cups? ( >=net-print/cups-1.4[dbus] ) |
322 |
- networkmanager? ( >=net-misc/networkmanager-1.0 ) |
323 |
- media-libs/alsa-lib |
324 |
- x11-libs/libXi |
325 |
- x11-libs/libXext |
326 |
- media-libs/fontconfig |
327 |
-" |
328 |
-# logind needed for power and session management, bug #464944 |
329 |
-# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it) |
330 |
-RDEPEND="${COMMON_DEPEND} |
331 |
- gnome-base/dconf |
332 |
- elogind? ( sys-auth/elogind ) |
333 |
- systemd? ( sys-apps/systemd ) |
334 |
- !<gnome-base/gnome-session-3.27.90 |
335 |
- !<gnome-base/gdm-3.27.90 |
336 |
-" |
337 |
-# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead |
338 |
-DEPEND="${COMMON_DEPEND} |
339 |
- sys-kernel/linux-headers |
340 |
- dev-util/glib-utils |
341 |
- dev-util/gdbus-codegen |
342 |
- x11-base/xorg-proto |
343 |
- ${PYTHON_DEPS} |
344 |
- test? ( |
345 |
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
346 |
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') |
347 |
- gnome-base/gnome-session ) |
348 |
- >=sys-devel/gettext-0.19.8 |
349 |
- virtual/pkgconfig |
350 |
-" |
351 |
- |
352 |
-# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well) |
353 |
-RESTRICT="!test? ( test )" |
354 |
- |
355 |
-PATCHES=( |
356 |
- # upstream gnome-3-28 branch up to its abandonment in August 2018 (small bug fixes) |
357 |
- # Allow disabling udev and networkmanager on Linux |
358 |
- # Make colord and wacom optional |
359 |
- # glib 2.58 compatibility fix; included in 3.29.1+ |
360 |
- "${WORKDIR}"/patches/ |
361 |
- # Fix non-wayland builds; 3.32 won't have this device manager code anymore, so nothing to upstream |
362 |
- "${FILESDIR}"/${PV}-fix-non-wayland-build.patch |
363 |
-) |
364 |
- |
365 |
-python_check_deps() { |
366 |
- if use test; then |
367 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
368 |
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
369 |
- fi |
370 |
-} |
371 |
- |
372 |
-pkg_setup() { |
373 |
- use test && python-any-r1_pkg_setup |
374 |
-} |
375 |
- |
376 |
-src_configure() { |
377 |
- local emesonargs=( |
378 |
- #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss? |
379 |
- -Dudev_dir="$(get_udevdir)" |
380 |
- -Dalsa=true |
381 |
- $(meson_use udev gudev) |
382 |
- $(meson_use colord) |
383 |
- $(meson_use cups) |
384 |
- $(meson_use networkmanager network_manager) |
385 |
- -Drfkill=true |
386 |
- $(meson_use smartcard) |
387 |
- $(meson_use input_devices_wacom wacom) |
388 |
- $(meson_use wayland) |
389 |
- ) |
390 |
- meson_src_configure |
391 |
-} |
392 |
- |
393 |
-src_test() { |
394 |
- virtx meson_src_test |
395 |
-} |
396 |
- |
397 |
-pkg_postinst() { |
398 |
- xdg_pkg_postinst |
399 |
- gnome2_schemas_update |
400 |
-} |
401 |
- |
402 |
-pkg_postrm() { |
403 |
- xdg_pkg_postrm |
404 |
- gnome2_schemas_update |
405 |
-} |
406 |
|
407 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild |
408 |
deleted file mode 100644 |
409 |
index 98e4f1b2b1b..00000000000 |
410 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild |
411 |
+++ /dev/null |
412 |
@@ -1,130 +0,0 @@ |
413 |
-# Copyright 1999-2019 Gentoo Authors |
414 |
-# Distributed under the terms of the GNU General Public License v2 |
415 |
- |
416 |
-EAPI=6 |
417 |
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) |
418 |
- |
419 |
-inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg |
420 |
- |
421 |
-DESCRIPTION="Gnome Settings Daemon" |
422 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
423 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
424 |
- |
425 |
-LICENSE="GPL-2+ LGPL-2+" |
426 |
-SLOT="0" |
427 |
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland" |
428 |
-REQUIRED_USE=" |
429 |
- ^^ ( elogind systemd ) |
430 |
- input_devices_wacom? ( udev ) |
431 |
- wayland? ( udev ) |
432 |
-" |
433 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
434 |
- |
435 |
-# >=polkit-0.114 for ITS translation rules of .policy files |
436 |
-COMMON_DEPEND=" |
437 |
- >=sci-geosciences/geocode-glib-3.10 |
438 |
- >=dev-libs/glib-2.53.0:2 |
439 |
- >=gnome-base/gnome-desktop-3.11.1:3= |
440 |
- >=gnome-base/gsettings-desktop-schemas-3.27.90 |
441 |
- >=x11-libs/gtk+-3.15.3:3[X,wayland?] |
442 |
- >=dev-libs/libgweather-3.9.5:2= |
443 |
- colord? ( |
444 |
- >=x11-misc/colord-1.0.2:= |
445 |
- >=media-libs/lcms-2.2:2 ) |
446 |
- media-libs/libcanberra[gtk3] |
447 |
- >=app-misc/geoclue-2.3.1:2.0 |
448 |
- >=x11-libs/libnotify-0.7.3 |
449 |
- >=media-sound/pulseaudio-2[glib] |
450 |
- >=sys-auth/polkit-0.114 |
451 |
- >=sys-power/upower-0.99:= |
452 |
- x11-libs/libX11 |
453 |
- x11-libs/libXtst |
454 |
- udev? ( virtual/libgudev:= ) |
455 |
- wayland? ( dev-libs/wayland ) |
456 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.7 |
457 |
- >=x11-libs/pango-1.20.0 |
458 |
- x11-libs/gdk-pixbuf:2 ) |
459 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
460 |
- cups? ( >=net-print/cups-1.4[dbus] ) |
461 |
- networkmanager? ( >=net-misc/networkmanager-1.0 ) |
462 |
- media-libs/alsa-lib |
463 |
- x11-libs/libXi |
464 |
- x11-libs/libXext |
465 |
- media-libs/fontconfig |
466 |
-" |
467 |
-# logind needed for power and session management, bug #464944 |
468 |
-# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it) |
469 |
-RDEPEND="${COMMON_DEPEND} |
470 |
- gnome-base/dconf |
471 |
- elogind? ( sys-auth/elogind ) |
472 |
- systemd? ( sys-apps/systemd ) |
473 |
- !<gnome-base/gnome-session-3.27.90 |
474 |
- !<gnome-base/gdm-3.27.90 |
475 |
-" |
476 |
-# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead |
477 |
-DEPEND="${COMMON_DEPEND} |
478 |
- sys-kernel/linux-headers |
479 |
- dev-util/glib-utils |
480 |
- dev-util/gdbus-codegen |
481 |
- x11-base/xorg-proto |
482 |
- ${PYTHON_DEPS} |
483 |
- test? ( |
484 |
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
485 |
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') |
486 |
- gnome-base/gnome-session ) |
487 |
- >=sys-devel/gettext-0.19.8 |
488 |
- virtual/pkgconfig |
489 |
-" |
490 |
- |
491 |
-# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well) |
492 |
-#RESTRICT="!test? ( test )" |
493 |
- |
494 |
-PATCHES=( |
495 |
- # Translation updates from gnome-3-30 branch |
496 |
- # Allow disabling udev and networkmanager on Linux |
497 |
- # Make colord and wacom optional |
498 |
- "${WORKDIR}"/patches/ |
499 |
-) |
500 |
- |
501 |
-python_check_deps() { |
502 |
- if use test; then |
503 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
504 |
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
505 |
- fi |
506 |
-} |
507 |
- |
508 |
-pkg_setup() { |
509 |
- python-any-r1_pkg_setup |
510 |
-} |
511 |
- |
512 |
-src_configure() { |
513 |
- local emesonargs=( |
514 |
- #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss? |
515 |
- -Dudev_dir="$(get_udevdir)" |
516 |
- -Dalsa=true |
517 |
- $(meson_use udev gudev) |
518 |
- $(meson_use colord) |
519 |
- $(meson_use cups) |
520 |
- $(meson_use networkmanager network_manager) |
521 |
- -Drfkill=true |
522 |
- $(meson_use smartcard) |
523 |
- $(meson_use input_devices_wacom wacom) |
524 |
- $(meson_use wayland) |
525 |
- -Dexperimental_suspend_then_hibernate=false |
526 |
- ) |
527 |
- meson_src_configure |
528 |
-} |
529 |
- |
530 |
-src_test() { |
531 |
- virtx meson_src_test |
532 |
-} |
533 |
- |
534 |
-pkg_postinst() { |
535 |
- xdg_pkg_postinst |
536 |
- gnome2_schemas_update |
537 |
-} |
538 |
- |
539 |
-pkg_postrm() { |
540 |
- xdg_pkg_postrm |
541 |
- gnome2_schemas_update |
542 |
-} |