gentoo resync : 25.11.2020

3 files changed, 90 insertions, 0 deletions

diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index fb4861018673..e50a416adc8c 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,5 @@
+AUX libaccounts-glib-1.25-assert-failure.patch 743 BLAKE2B 5f0ebe2754f4d0b03bfabfb83e3c7fbb3f54f117a1548275e8f974d43c92aeaadbae6c22d909127aa4a8c47e806a26f19e6ae598f30c5f34e3e2b48b3a7ff8be SHA512 4a483a915fc72efa42c10947cc399f30f2825a8f2bd59d88afec5da9cb29346572ba80c316ca4de4b21132e8ad34e031cdd735cb3ed0767d51780a15ac086fd7
 DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
 EBUILD libaccounts-glib-1.25-r1.ebuild 1310 BLAKE2B 6c513410dd11fda7262bfe9d5c096ba1121dd0c125eb4dfcdab28a76400028571988dcb1bef8b7b08cb2989c5a8fb4ba5ff1ec8cf86d342469a750dbf89f3dc8 SHA512 a58f84f4f760159b6209d00117d91e8859de258deea787c9c723609fd393193ac8f89b66001b6e8113e140bfb4a7a3e29b345696969e47b4f1d09be98a1aef02
+EBUILD libaccounts-glib-1.25-r2.ebuild 1365 BLAKE2B 207de9315fb812b361104308a250248bba7044bd69bfa77950a2cf1b034277f6913885cf82cf4d7ddac60975b3251b57932dd7c633283745f204144394565f28 SHA512 03b3d286f01151f71dfe48e10f24b383e9fbdb34020489178c451f74ef1687cdd7beb1547f14c8bdaf32cdf161edc9f383f9910a582ad34c942be42c0246dc5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch
new file mode 100644
index 000000000000..f35aee5c6a84
--- /dev/null
+++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch
@@ -0,0 +1,26 @@
+From 29bdc47abe11d3bfcec7a35ed83475eba04bfdaa Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <pekka.vuorela@jolla.com>
+Date: Tue, 7 Jul 2020 12:51:50 +0300
+Subject: [PATCH] Avoid assert failure on ag_provider_get_tags
+
+---
+ libaccounts-glib/ag-provider.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libaccounts-glib/ag-provider.c b/libaccounts-glib/ag-provider.c
+index 93d1541..8a79616 100644
+--- a/libaccounts-glib/ag-provider.c
++++ b/libaccounts-glib/ag-provider.c
+@@ -464,6 +464,9 @@ GList *ag_provider_get_tags (AgProvider *provider)
+ {
+     g_return_val_if_fail (provider != NULL, NULL);
+ 
++    if (G_UNLIKELY (provider->tags == NULL))
++        return NULL;
++
+     return g_hash_table_get_keys (provider->tags);
+ }
+ 
+-- 
+GitLab
+
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
new file mode 100644
index 000000000000..7b08a98a2200
--- /dev/null
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson python-r1 vala
+
+DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
+HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/gobject-introspection:=
+	dev-libs/libxml2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-libs/check
+	doc? ( dev-util/gtk-doc )
+"
+
+# fails
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-VERSION_${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-assert-failure.patch" )
+
+src_prepare() {
+	default
+	vala_src_prepare --ignore-use
+
+	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir meson_src_compile
+}
+
+src_install() {
+	einstalldocs
+	python_foreach_impl run_in_build_dir meson_src_install
+	python_foreach_impl python_optimize
+}