[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, profiles/base/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, profiles/base/

[Mart Raudsepp]

commit:     df83291b6825f78e26c5b8b38df49bc1546e43a7
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 07:14:34 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 07:27:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df83291b

gnome-base/gnome-settings-daemon: handle test restricting via package.use.mask

This allows to keep the deps without commenting them out, but not have them
pulled into deptree, which currently leads to dbusmock keyword trouble

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild | 5 ++---
 profiles/base/package.use.mask                                       | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
index 3534c5fa68f..1b5f1cb13c9 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -96,8 +96,7 @@ DEPEND="${COMMON_DEPEND}
 "
 
 # TypeErrors with python3; weird test errors with python2; all in power component that was made required now
-RESTRICT="test"
-# RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	# Make colord and wacom optional; requires eautoreconf

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8ff8136c352..14dfa34efae 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mart Raudsepp <leio@gentoo.org> (10 Jan 2018)
+# Failing tests, with extra deps that aren't keyworded due to that
+>=gnome-base/gnome-settings-daemon-3.24 test
+
 # Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
 # sys-apps/raidutils is going to be removed (#638634)
 net-analyzer/nagios-plugin-check_raid i2o