gentoo resync : 08.09.2019

4 files changed, 158 insertions, 0 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 3a4b54fad919..0552af5ae8ea 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,9 @@
 AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
 AUX 0.11.4-vala-0.42-tests-compat.patch 1445 BLAKE2B 913bb02f130c5f0d0485afa7c270c885cfac6e22d71fd53c0dffb2098659ac0dd27a57fa18641a0cee3b23bf394222a91dfd32c4e7c604e77c6a69ff4fd799f0 SHA512 61c32261a8eaefa381131c4f3115940d72a5b5af451d80a86d2d391b403436466f57d319fac97b4ab1a083c8b87bad656d2dc33f863bc9b0761c9b9275eb7162
+AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230d4e7ab4efeae57af193b4b6310bdaf6239a8341067619c96495a2a81c2868f563d1b0961aa7850b7500f9956043260cf SHA512 6098ea44375d56c3e178e9f3c0cf563ecef5aec5bf2a8e6ec5f0da067b9174b2a0d3cb1f99fac2985976324bca1859429d64545790807f948a5b0b6f8bf071c5
+AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
+DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
 EBUILD folks-0.11.4-r1.ebuild 2563 BLAKE2B d8c4cee6a10be42a91052421d3a3eab4a6a6b67dbc0479dcd8e3f9e71a6d1f0e835f07f0f41e44cf9413f4b9fed7edd7f44c7fd0d8359b127a904337b3a02422 SHA512 84c6923cfc7ab30b27843e5899082a2284c30304b5d3c1353eca590a3729a712f7661365604a862d792fb4d4a0b79a04ea3907c548f90a5396446990d64b3eb2
+EBUILD folks-0.12.1.ebuild 2420 BLAKE2B 1437fc2e207ba25f073ac52479b88e7668e697700f416b0276e4c2cb3810a97313b020551e7a2a412a401ee36a643f175e9b9916e4706d5ba914121553278a36 SHA512 8822622d0f730fecdc585644dde45e7d4caa254e0bf86fc6dd52fb36849b0d914434325f4bcd578080c2fa88c435821b11d2cb49a4230212125a8e46ce4c74a9
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.12.1-conditional-tests.patch b/dev-libs/folks/files/0.12.1-conditional-tests.patch
new file mode 100644
index 000000000000..cde0847fe146
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-conditional-tests.patch
@@ -0,0 +1,40 @@
+From 93c03b9582eb1eac21f084decf86ca5f1340dc53 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 7 Sep 2019 22:16:43 +0300
+Subject: [PATCH] meson: Allow disabling build of tests
+
+---
+ meson.build       | 4 +++-
+ meson_options.txt | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 91800654..37e6b5c2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -219,7 +219,9 @@ subdir('tools')
+ subdir('po')
+ 
+ # Tests
+-subdir('tests')
++if get_option('test')
++  subdir('tests')
++endif
+ 
+ if docs_enabled
+   subdir('docs')
+diff --git a/meson_options.txt b/meson_options.txt
+index 042a72e8..b4552d49 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -9,6 +9,7 @@ option('zeitgeist', type: 'boolean', value: false, description: 'build Zeitgeist
+ option('import_tool', type: 'boolean', value: true, description: 'Enable building the meta-contact import tool')
+ option('inspect_tool', type: 'boolean', value: true, description: 'Enable building the data inspection tool')
+ # Test options
++option('test', type: 'boolean', value: true, description: 'Build test programs')
+ option('installed_tests', type: 'boolean', value: false, description: 'Install test programs')
+ # Docs
+ option('docs', type: 'boolean', value: false, description: 'Enable documentation generation')
+-- 
+2.20.1
+
diff --git a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
new file mode 100644
index 000000000000..3dbfadf7452e
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
@@ -0,0 +1,26 @@
+From b2b0832cf69560bdf0692d275d49d4ed6e293426 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 7 Sep 2019 22:26:38 +0300
+Subject: [PATCH] tests: disable failing tracker tests
+
+All tracker tests fail for me, so disable them for now to at least
+continue testing the rest.
+---
+ tests/meson.build | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 6a7fa29c..2079051b 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -43,7 +43,3 @@ endif
+ if eds_backend_enabled
+   subdir('eds')
+ endif
+-
+-if tracker_backend_enabled
+-  subdir('tracker')
+-endif
+-- 
+2.20.1
+
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
new file mode 100644
index 000000000000..0809549521cd
--- /dev/null
+++ b/dev-libs/folks/folks-0.12.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with v0.12.1
+
+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 test tracker utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	$(vala_depend)
+	>=dev-libs/glib-2.44:2
+	dev-libs/dbus-glib
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=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] )
+	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
+"
+
+# FIXME:
+# test? ( bluetooth? ( dbusmock is missing in the tree ) )
+DEPEND="${COMMON_DEPEND}
+	test? ( sys-apps/dbus
+		bluetooth? ( dev-python/dbusmock ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled
+	"${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removed them for now
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		-Dlibsocialweb_backend=false # not packaged
+		$(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)
+		$(meson_use test)
+		-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
+}