Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, profiles/base/
Date: Wed, 10 Jan 2018 07:31:10
Message-Id: 1515569246.df83291b6825f78e26c5b8b38df49bc1546e43a7.leio@gentoo
1 commit: df83291b6825f78e26c5b8b38df49bc1546e43a7
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 10 07:14:34 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 10 07:27:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df83291b
7
8 gnome-base/gnome-settings-daemon: handle test restricting via package.use.mask
9
10 This allows to keep the deps without commenting them out, but not have them
11 pulled into deptree, which currently leads to dbusmock keyword trouble
12
13 Package-Manager: Portage-2.3.19, Repoman-2.3.6
14
15 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild | 5 ++---
16 profiles/base/package.use.mask | 4 ++++
17 2 files changed, 6 insertions(+), 3 deletions(-)
18
19 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
20 index 3534c5fa68f..1b5f1cb13c9 100644
21 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
22 +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -96,8 +96,7 @@ DEPEND="${COMMON_DEPEND}
30 "
31
32 # TypeErrors with python3; weird test errors with python2; all in power component that was made required now
33 -RESTRICT="test"
34 -# RESTRICT="!test? ( test )"
35 +RESTRICT="!test? ( test )"
36
37 PATCHES=(
38 # Make colord and wacom optional; requires eautoreconf
39
40 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
41 index 8ff8136c352..14dfa34efae 100644
42 --- a/profiles/base/package.use.mask
43 +++ b/profiles/base/package.use.mask
44 @@ -7,6 +7,10 @@
45 # This file is only for generic masks. For arch-specific masks (i.e.
46 # mask everywhere, unmask on arch/*) use arch/base.
47
48 +# Mart Raudsepp <leio@g.o> (10 Jan 2018)
49 +# Failing tests, with extra deps that aren't keyworded due to that
50 +>=gnome-base/gnome-settings-daemon-3.24 test
51 +
52 # Pacho Ramos <pacho@g.o> (04 Jan 2018)
53 # sys-apps/raidutils is going to be removed (#638634)
54 net-analyzer/nagios-plugin-check_raid i2o