gentoo resync : 12.05.2022

4 files changed, 121 insertions, 2 deletions

diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 9227bb8a1ca9..ea3717ac505d 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,5 +1,8 @@
 AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e
 AUX gcr-3.40.0-meson-0.61-build.patch 1634 BLAKE2B 99593b9614831a4a2a47ff4890d1f3a92ceb3fe861bdcd3fa748b51b19645196392e6482dea8bb4330bd39484ecddb74dd8d6dea17beb26f87bb05727b506ee3 SHA512 343c02730611ac4792e572dbfbd14bee5525c9ac00f739b12ce1711b059f00a3c9869e60db33e0dd7010b78dd4bb5309c1cecb29052d97fe68429d0118b98ecc
+AUX gcr-3.41.0-Unbreak-build-without-systemd.patch 766 BLAKE2B 005ba225708f0a676be937e809511e7e478ec16610d1bf068ca9e01c210e3d2567e8a3cdbf513c51b3cff57ad0834526e22f17490432dd7c6fa80a16dec4351a SHA512 2192e3556fb134ebbf0bab7e23f6d3b12da601286532e8a5c8fa52d69ac31a1ec3d8e941ff4d5d91737001306aa594996de58449498b2c93d07f53dec83a8401
 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
-EBUILD gcr-3.40.0.ebuild 1842 BLAKE2B b9d91ce7515920993d3fd2f6adb2d3ac0c91411786f06bd0e5bbe4f1f9a672c03f65066ac2a7422d988f2c1f1848168ec69f1e9df81620754e2e083595e6b3ff SHA512 dbb13ce757a0ea6fce9af7c9949c63948694b609b5cccf4d458a9e9d95205d090bb84feaaf7e1b8f055b5ebcb7e1056d0f3efa8a5b3f496e593aec96fbe9b377
+DIST gcr-3.41.0.tar.xz 1039744 BLAKE2B c646a04168310051d5b582a9d2f7ab9da89eef095e856e56b8d730600debead051ad8bb40eddb7457b1be2be3e092227dd886f647258a9c6a81d4bab728245f7 SHA512 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e
+EBUILD gcr-3.40.0.ebuild 1836 BLAKE2B 5e1af281d3dca4ec8d807a14efe4a3e274a156c9ed00d718788a72ed715e3b981c44b16959fabab67e91414de14d3ce47745483fd081dbe44aff0900b5a89338 SHA512 7f5cb00872a3a5c2e7c2b66b0d3368dc173ab6243039dcc39a4ca65e682c3e6e4f369277c5730a26062c156414228e51299643918861921e814446ce5a3fecab
+EBUILD gcr-3.41.0.ebuild 2005 BLAKE2B 07cea180c588b3b17b0b09b086a7b7244474b5743b26d60458115ba42c70d7d742947bf0953bb16859167e6a3e1d4f11983e7310334aa95cc6591ef864986ea9 SHA512 b354604c63af598162d5bfb239d68e6a7bf3e8687d0b33eea39cb4225626f6f0200047a5f86591605eee4f74193141fbce0e20881b7bfe37224062e5ef67f8b0
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch
new file mode 100644
index 000000000000..eac12c0a34a2
--- /dev/null
+++ b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch
@@ -0,0 +1,27 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
+-- 
+2.35.1
+
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild
index 3a367dc36429..e3ac13de0bef 100644
--- a/app-crypt/gcr/gcr-3.40.0.ebuild
+++ b/app-crypt/gcr/gcr-3.40.0.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gcr/gcr-3.41.0.ebuild b/app-crypt/gcr/gcr-3.41.0.ebuild
new file mode 100644
index 000000000000..6a5988f3730b
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.41.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
+
+IUSE="gtk gtk-doc +introspection systemd test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=app-crypt/p11-kit-0.19.0
+	>=app-crypt/libsecret-0.20
+	systemd? ( sys-apps/systemd:= )
+	gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] )
+	>=sys-apps/dbus-1
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="app-crypt/gnupg"
+BDEPEND="
+	${PYTHON_DEPS}
+	gtk? ( dev-libs/libxml2:2 )
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=sys-devel/gettext-0.19.8
+	test? ( app-crypt/gnupg )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.38.0-optional-vapi.patch
+	"${FILESDIR}"/${PN}-3.40.0-meson-0.61-build.patch
+	"${FILESDIR}"/${P}-Unbreak-build-without-systemd.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use gtk)
+		$(meson_use gtk-doc gtk_doc)
+		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
+		-Dssh_agent=true
+		$(meson_feature systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}