gentoo Easter resync : 12.04.2020

5 files changed, 125 insertions, 5 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index dca58927fdb9..e31eb77bf4d0 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -2,7 +2,10 @@ AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230
 AUX 0.12.1-meson-0.53-compat.patch 1381 BLAKE2B f1fc6a54113dcac1f3a76970d1b3a2558fa48971e5f7e2ef8723f91aaf423fa383aefb04a833cc507057982e8305475068b58dbcdf1c1ec0711c520ede591bff SHA512 da08c17dc2ada2ef48970f30859f42b7117e765294349137651ccf46006ddd465b89dbacbfd41c6fefb4135f691d37146708250f060e9d4089d4f20c6cbb42fb
 AUX 0.12.1-meson-0.53-compat2.patch 763 BLAKE2B 280b3b9801de593136006c1129a68b05db3e8e551d4286c081906a7c254c1dbebf0afb7a35a4839792b19bdaa620a5b77904e4193bcfeff54edffc821270f21c SHA512 33fd46de823df0f0ad27402b0f69c72f41da6c6f9ecd382dc84454ac413781e884dc349c72c5ee5db0a3b24d4828a70a2af5e0f2574f80f6718a679eccc789b7
 AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df
+AUX 0.13.1-meson-0.53-compat.patch 908 BLAKE2B 2fb471f9f500623565491df116099198be990c4ccf9bc308a2fd0fc2676b81c9f1ae5aa9a6168703066a35a0c3d87d480610d81333da97c1363d87265ccbf998 SHA512 2e4ee26a529d2a854027abb9d0a1414d1059f55fb0ac9ed5edde36049819bcc77f1e971b9b8a98e56db6ab18e6704591f9ea906ecd12f9bbff17816d40f3bc5d
 DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
-EBUILD folks-0.12.1-r1.ebuild 2642 BLAKE2B a7659b25df6c548b8d09d4996008023b78da9a594173bce759b3577c8661c2d02c0695955b2f00d5ea6799408654a87308a7044b12420546f28420dea350c1e4 SHA512 3090da11ad71eb9dbec0a4b43a34de3300e2473e52a792918df3a9ecc22e329dc0902a0c8f4947fd19b81969b3eb9fb9cbcf0ccc7e3f71d7adc86ddd5203e4d7
-EBUILD folks-0.12.1.ebuild 2418 BLAKE2B 5535c5ab78643462090c1613e028f0976d512a837788c3f07347cfefbd7795d5b5c2288d6bd38b0b9c0f8bccba4f7ba63b629fdf8bdc2451c86962964e5b6849 SHA512 9780b550f38d7178a3c4b429db12e505974942a858a3e633a711a67eea4dcc66bb1962c954717f6ea710b182a01a9fc227d7de01badab7e6e19245456643b900
+DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
+EBUILD folks-0.12.1-r1.ebuild 2685 BLAKE2B e022c4fc18fed55dac5983f784644e7fca72b519daca47e6cc77a806a003d57a3bb97b4b105864b4c93a7e60e9cdd9ebb41bef6a244d259f34d7117a4e784f5c SHA512 9fda39a47b741832b7155cd36c1d972d3692f18c9962b22d525551907755ed857f1af4ac76881adfc64a9b7508ba27f719619541ad22d476f9170927cf876e09
+EBUILD folks-0.12.1.ebuild 2461 BLAKE2B 07bf3f5c2228b82778628918c91539b891bb33c165f98c3661a5e68bf689536fe0e6de17ac4a80bb731e138d184d6044c926c9be406cb12700f07e8afd4eed25 SHA512 fbb30f024370c686a821811b5a63bfa7d0086da1ae6744cf1ff079a40e96bdcf557856b277395594f526c062755e5b8fb042a6e7afb2c204ceabf69dc735949f
+EBUILD folks-0.13.1.ebuild 2129 BLAKE2B abed9d09fb8f3029592349bbf1fd346cb4f709656c9f655a57ec2d7c3d50d0ada6bac6ce71cd6a21713dc4ad3ee90419754a79efa150886a539a6ac1226000d4 SHA512 6748ca3829f184bf98a64a8998d6016103881cb346188eba0719cc401396c16b40b6a45cdd86c55a555a9b0955e3ee3fbd7405424d75bac847dfffb57f78fa1c
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch
new file mode 100644
index 000000000000..a31a5c697e2f
--- /dev/null
+++ b/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch
@@ -0,0 +1,31 @@
+From c973f2910322a2b6cfae210730bfd6d3d8259e01 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 1 Mar 2020 10:41:30 +0200
+Subject: [PATCH] meson: Disable unused dbusmock check as tests are commented
+ out
+
+This avoids issues with meson-0.53 like commit 1853567d79024, but
+by just dropping the check, because the 0.13.1 release had tests
+commented out fully anyhow.
+---
+ meson.build | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 8d09149e..8f52bb7e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -123,10 +123,6 @@ endif
+ 
+ if bluez_backend_enabled
+   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
+-  # Needed for the BlueZ tests
+-  pymod = import('python')
+-  py_installation = pymod.find_installation('python3')
+-  python_dbusmock = py_installation.dependency('dbusmock')
+ endif
+ 
+ if import_tool_enabled
+-- 
+2.20.1
+
diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild
index 633ff457fbe2..3ac62a655ba7 100644
--- a/dev-libs/folks/folks-0.12.1-r1.ebuild
+++ b/dev-libs/folks/folks-0.12.1-r1.ebuild
@@ -25,7 +25,9 @@ DEPEND="
 	>=dev-libs/gobject-introspection-1.54:=
 	telepathy? ( >=net-libs/telepathy-glib-0.19.9 )
 	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:= )
+	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=
+		<gnome-extra/evolution-data-server-3.33
+	)
 	dev-libs/libxml2:2
 	utils? ( sys-libs/readline:0= )
 "
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
index 3815c4084e13..95be628d2bca 100644
--- a/dev-libs/folks/folks-0.12.1.ebuild
+++ b/dev-libs/folks/folks-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,9 @@ DEPEND="
 	>=dev-libs/gobject-introspection-1.54:=
 	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
 	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
+	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala]
+		<gnome-extra/evolution-data-server-3.33
+	)
 	dev-libs/libxml2:2
 	utils? ( sys-libs/readline:0= )
 "
diff --git a/dev-libs/folks/folks-0.13.1.ebuild b/dev-libs/folks/folks-0.13.1.ebuild
new file mode 100644
index 000000000000..4c61554a6c76
--- /dev/null
+++ b/dev-libs/folks/folks-0.13.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/25" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy tracker utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="test"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	telepathy? (
+		>=net-libs/telepathy-glib-0.19.9
+		dev-libs/dbus-glib
+	)
+	tracker? ( app-misc/tracker:0/2.0 )
+	eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
+	dev-libs/libxml2:2
+	utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+	bluetooth? ( >=net-wireless/bluez-5[obex] )
+	telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+	>=dev-util/meson-0.49
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+"
+
+PATCHES=(
+	# Alternative to https://gitlab.gnome.org/GNOME/folks/issues/119 as tests are commented out in 0.13.1 release
+	"${FILESDIR}"/${PV}-meson-0.53-compat.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		$(meson_use eds ofono_backend)
+		$(meson_use telepathy telepathy_backend)
+		$(meson_use tracker tracker_backend)
+		-Dzeitgeist=false # last rited package
+		-Dimport_tool=true
+		$(meson_use utils inspect_tool)
+		-Dinstalled_tests=false
+		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}