1 |
commit: 9b32ce88c3b0d50f2183e75b0ef62dbbc68d51a2 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 28 15:34:40 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 28 15:35:20 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b32ce88 |
7 |
|
8 |
gnome-base/gnome-settings-daemon: fixup python_check_deps |
9 |
|
10 |
Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 |
11 |
|
12 |
.../gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild | 4 +++- |
13 |
.../gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild | 7 +++++-- |
14 |
2 files changed, 8 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild |
17 |
index c0268205f73..b748cd5fa44 100644 |
18 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild |
19 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild |
20 |
@@ -101,7 +101,9 @@ PATCHES=( |
21 |
) |
22 |
|
23 |
python_check_deps() { |
24 |
- use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
25 |
+ if use test; then |
26 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
27 |
+ fi |
28 |
} |
29 |
|
30 |
pkg_setup() { |
31 |
|
32 |
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 |
33 |
index 29d5996402c..640a918763b 100644 |
34 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
35 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
36 |
@@ -95,6 +95,7 @@ DEPEND="${COMMON_DEPEND} |
37 |
|
38 |
# TypeErrors with python3; weird test errors with python2; all in power component that was made required now |
39 |
RESTRICT="test" |
40 |
+# RESTRICT="!test? ( test )" |
41 |
|
42 |
PATCHES=( |
43 |
# Make colord and wacom optional; requires eautoreconf |
44 |
@@ -104,8 +105,10 @@ PATCHES=( |
45 |
) |
46 |
|
47 |
python_check_deps() { |
48 |
- use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" \ |
49 |
- && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
50 |
+ if use test; then |
51 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
52 |
+ has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
53 |
+ fi |
54 |
} |
55 |
|
56 |
pkg_setup() { |