gentoo (leap year) resync : 29.02.2020

4 files changed, 168 insertions, 0 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index e3410fa0056c..dca58927fdb9 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,8 @@
 AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230d4e7ab4efeae57af193b4b6310bdaf6239a8341067619c96495a2a81c2868f563d1b0961aa7850b7500f9956043260cf SHA512 6098ea44375d56c3e178e9f3c0cf563ecef5aec5bf2a8e6ec5f0da067b9174b2a0d3cb1f99fac2985976324bca1859429d64545790807f948a5b0b6f8bf071c5
+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
 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
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
new file mode 100644
index 000000000000..56f9543ba40a
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
@@ -0,0 +1,47 @@
+From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001
+From: Niels De Graef <nielsdegraef@gmail.com>
+Date: Mon, 3 Feb 2020 08:57:52 +0100
+Subject: [PATCH] meson: Use python.dependency() correctly
+
+From https://github.com/mesonbuild/meson/issues/6470:
+
+> So, to further clarify, passing an argument to
+> py_installation.dependency() should be an error, since this method
+> will only ever return a python dependency (for embedding python
+> itself, etc.) and not dbusmock or anything else.
+
+Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119
+---
+ meson.build | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d5115e28..f3644457 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('folks', [ 'vala', 'c' ],
+   version: '0.13.2',
+   license: 'LGPL2.1+',
+-  meson_version: '>= 0.49',
++  meson_version: '>= 0.51',
+ )
+ 
+ gnome = import('gnome')
+@@ -132,8 +132,11 @@ 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')
++  py_installation = pymod.find_installation('python3',
++    modules: [
++      'dbusmock',
++    ],
++  )
+ endif
+ 
+ if import_tool_enabled
+-- 
+2.20.1
+
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
new file mode 100644
index 000000000000..40c3ca601f05
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
@@ -0,0 +1,31 @@
+From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 23 Feb 2020 19:28:51 +0200
+Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built
+
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 74320634..64f28d2b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -131,12 +131,14 @@ endif
+ if bluez_backend_enabled
+   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
+   # Needed for the BlueZ tests
++  if get_option('test')
+   pymod = import('python')
+   py_installation = pymod.find_installation('python3',
+     modules: [
+       'dbusmock',
+     ],
+   )
++  endif
+ 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
new file mode 100644
index 000000000000..633ff457fbe2
--- /dev/null
+++ b/dev-libs/folks/folks-0.12.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 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="
+	>=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 )
+	tracker? ( app-misc/tracker:0/2.0 )
+	eds? ( >=gnome-extra/evolution-data-server-3.13.90:= )
+	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
+	test? ( sys-apps/dbus
+		bluetooth? ( dev-python/dbusmock ) )
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+"
+
+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 removes them for now
+	"${FILESDIR}"/${PV}-meson-0.53-compat.patch # https://gitlab.gnome.org/GNOME/folks/issues/119
+	"${FILESDIR}"/${PV}-meson-0.53-compat2.patch # Don't require dbusmock if tests aren't built (with our downstream conditional-tests patch)
+)
+
+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
+}