1 |
commit: c2fe1fc086817154aab8344fbc8ec9b9dca11191 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 28 13:12:30 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 28 15:24:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fe1fc0 |
7 |
|
8 |
gnome-base/gnome-settings-daemon-3.24: some dependency fixes, disable failing tests |
9 |
|
10 |
Tests now hard require dbusmock; kbproto and gtk+[X] seem required per pkgconfig checks |
11 |
|
12 |
.../gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild | 7 +++++-- |
13 |
1 file changed, 5 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
16 |
index e6ce7e8faeb..b2b2e7cdcd8 100644 |
17 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
18 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
19 |
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu |
20 |
|
21 |
COMMON_DEPEND=" |
22 |
>=dev-libs/glib-2.44.0:2[dbus] |
23 |
- >=x11-libs/gtk+-3.15.3:3 |
24 |
+ >=x11-libs/gtk+-3.15.3:3[X] |
25 |
>=gnome-base/gnome-desktop-3.11.1:3= |
26 |
>=gnome-base/gsettings-desktop-schemas-3.23.3 |
27 |
>=gnome-base/librsvg-2.36.2:2 |
28 |
@@ -76,7 +76,6 @@ RDEPEND="${COMMON_DEPEND} |
29 |
!<gnome-base/gnome-session-3.23.2 |
30 |
" |
31 |
# xproto-7.0.15 needed for power plugin |
32 |
-# FIXME: tests require dbus-mock |
33 |
DEPEND="${COMMON_DEPEND} |
34 |
cups? ( sys-apps/sed ) |
35 |
test? ( |
36 |
@@ -89,9 +88,13 @@ DEPEND="${COMMON_DEPEND} |
37 |
virtual/pkgconfig |
38 |
x11-proto/inputproto |
39 |
x11-proto/xf86miscproto |
40 |
+ x11-proto/kbproto |
41 |
>=x11-proto/xproto-7.0.15 |
42 |
" |
43 |
|
44 |
+# FIXME: tests require dbus-mock |
45 |
+RESTRICT="test" |
46 |
+ |
47 |
PATCHES=( |
48 |
# Make colord and wacom optional; requires eautoreconf |
49 |
"${FILESDIR}"/${P}-optional.patch |