Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/
Date: Sun, 11 Jul 2021 12:31:43
Message-Id: 1626006486.b7b951e0bd88452d30fc83a719d6019d9edc3175.leio@gentoo
1 commit: b7b951e0bd88452d30fc83a719d6019d9edc3175
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 11 12:27:16 2021 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 11 12:28:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b951e0
7
8 mail-client/geary: fix tests and test dep handling
9
10 Tests were still failing for me, because root user has a XDG_DATA_DIRS
11 set now when flatpak is installed, and it can't access those folders
12 under sandbox to write dconf settings in. Fix it properly by calling
13 gnome2_environment_reset, which sets it to use the memory backend instead.
14
15 Also downgrade gnutls[tools] to a test-only dep, which it is (certtool
16 called by a unit test only).
17
18 Bug: https://bugs.gentoo.org/739524
19 Package-Manager: Portage-3.0.20, Repoman-3.0.2
20 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
21
22 mail-client/geary/geary-40.0.ebuild | 10 +++++-----
23 1 file changed, 5 insertions(+), 5 deletions(-)
24
25 diff --git a/mail-client/geary/geary-40.0.ebuild b/mail-client/geary/geary-40.0.ebuild
26 index a753ad08078..dee08bf606e 100644
27 --- a/mail-client/geary/geary-40.0.ebuild
28 +++ b/mail-client/geary/geary-40.0.ebuild
29 @@ -11,7 +11,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
30
31 LICENSE="LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, CC licenses for some icons
32 SLOT="0"
33 -IUSE="ytnef"
34 +IUSE="test ytnef"
35 +RESTRICT="!test? ( test )"
36 KEYWORDS="~amd64 ~arm64 ~x86"
37
38 # >=gspell-1.7 dep to ensure all libraries used use enchant:2
39 @@ -50,7 +51,7 @@ BDEPEND="
40 dev-util/itstool
41 >=sys-devel/gettext-0.19.8
42 virtual/pkgconfig
43 - net-libs/gnutls[tools]
44 + test? ( net-libs/gnutls[tools] )
45
46 $(vala_depend)
47 x11-libs/gtk+:3[introspection]
48 @@ -67,7 +68,8 @@ BDEPEND="
49
50 src_prepare() {
51 vala_src_prepare
52 - xdg_src_prepare
53 + gnome2_environment_reset
54 + default
55 }
56
57 src_configure() {
58 @@ -84,8 +86,6 @@ src_configure() {
59 }
60
61 src_test() {
62 - unset GSETTINGS_BACKEND
63 -
64 virtx meson_src_test
65 }