[gentoo-commits] repo/gentoo:master commit in: mail-client/geary/

["Mart Raudsepp" <leio@gentoo.org>]

commit:     b7b951e0bd88452d30fc83a719d6019d9edc3175
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 11 12:27:16 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 12:28:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b951e0

mail-client/geary: fix tests and test dep handling

Tests were still failing for me, because root user has a XDG_DATA_DIRS
set now when flatpak is installed, and it can't access those folders
under sandbox to write dconf settings in. Fix it properly by calling
gnome2_environment_reset, which sets it to use the memory backend instead.

Also downgrade gnutls[tools] to a test-only dep, which it is (certtool
called by a unit test only).

Bug: https://bugs.gentoo.org/739524
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 mail-client/geary/geary-40.0.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail-client/geary/geary-40.0.ebuild b/mail-client/geary/geary-40.0.ebuild
index a753ad08078..dee08bf606e 100644
--- a/mail-client/geary/geary-40.0.ebuild
+++ b/mail-client/geary/geary-40.0.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 
 LICENSE="LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, CC licenses for some icons
 SLOT="0"
-IUSE="ytnef"
+IUSE="test ytnef"
+RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 # >=gspell-1.7 dep to ensure all libraries used use enchant:2
@@ -50,7 +51,7 @@ BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	net-libs/gnutls[tools]
+	test? ( net-libs/gnutls[tools] )
 
 	$(vala_depend)
 	x11-libs/gtk+:3[introspection]
@@ -67,7 +68,8 @@ BDEPEND="
 
 src_prepare() {
 	vala_src_prepare
-	xdg_src_prepare
+	gnome2_environment_reset
+	default
 }
 
 src_configure() {
@@ -84,8 +86,6 @@ src_configure() {
 }
 
 src_test() {
-	unset GSETTINGS_BACKEND
-
 	virtx meson_src_test
 }