gentoo auto-resync : 25:10:2022 - 21:54:27

4 files changed, 71 insertions, 6 deletions

diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index e97e5c082670..817f3f73b85d 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,3 +1,5 @@
+AUX libsignon-glib-2.1-docs-optional.patch 693 BLAKE2B 7a03207ee21e674b89e5b6203d000b4657e49283ff4ba28515b7a814092aafa8b6ce373a932d7ba8ce8f11b37ec4923cbe223265eb96093a06a4fc699364f8f6 SHA512 280d54782c2390456caabb6a7a590349d0b4ff29d0490fda6c9b8d140b229548f6a4d4bd3553f16c5bf57055f3bc61996161cce99963d317dc21f82efe6eeeb3
+AUX libsignon-glib-2.1-meson-0.61.patch 1027 BLAKE2B 83f70af857671b42287b556931fa8edc7a2253842868e704b7a0b56e1d538d60e3f81909455a0912256102e80eeac2a72f44c535bef0709953e1bced14187354 SHA512 13ef68824ab388ac20873bfbef61182ee71e5793f9ac19c53bd2c7bf539aec78998786134b2552e99d6c8b6eb546a14dc08836cea797626f01ec97084b66251e
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
-EBUILD libsignon-glib-2.1-r1.ebuild 1996 BLAKE2B 7e4918b0af07a95c45afd7c9f0cb91dd778f226268c9a96bf206d1d45ea998d3af8805a463eaf8bb7f28abd57c71f623ce0ba70079e9155f1a49945b62944f4a SHA512 ea640bb3aa3378052cc5c57e2acc2ea35212da62adf1bf523a36aa5d547325c3244e86f033a8c1df48d3c3d33f7d8be4a57de34a1044e253398d75a0a0867196
+EBUILD libsignon-glib-2.1-r2.ebuild 2055 BLAKE2B 4957dadab3b568e9082bffb22a828f29cf9c823c5e85ef6f47bda6db418e76bd74ccf956220bf45915e47c9812b72150c921a797323cb786eadb605e0f0a9bbd SHA512 e2e10000fa9bfe2874714e94ee09dfe373b02d950e2c37677d14799d1662a34ef23af55a699197d85568f95a4f84d509d79c8887e43a3f06a4bf729e67f0d11e
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
new file mode 100644
index 000000000000..b31bd46a825e
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
@@ -0,0 +1,28 @@
+From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 2 Jan 2021 14:19:18 +0100
+Subject: [PATCH] build: make documentation really optional
+
+Build of the documentation only if the meson option for it is enabled.
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5d0de55..b10f80d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,9 @@ endif
+ root_dir = include_directories ('.')
+ 
+ subdir('libsignon-glib')
+-subdir('docs')
++if get_option('documentation')
++    subdir('docs')
++endif
+ 
+ if get_option('python')
+     subdir('pygobject')
+-- 
+GitLab
+
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
new file mode 100644
index 000000000000..66254e398029
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
@@ -0,0 +1,31 @@
+From 4fae9155a19aca601072f361768e0bf8ed556b1e Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 11 Jan 2022 22:05:11 +0100
+Subject: [PATCH] Fix build with meson >= 0.61.0
+
+Otherwise it fails with "docs/reference/meson.build:21:6: ERROR:
+gnome.gtkdoc keyword argument 'expand_content_files' was of type
+array[File] but should have been array[str]".
+---
+ docs/reference/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/meson.build b/docs/reference/meson.build
+index 654404b..3927109 100644
+--- a/docs/reference/meson.build
++++ b/docs/reference/meson.build
+@@ -47,9 +47,9 @@ gnome.gtkdoc(
+         'libsignon-glib.types',
+     ],
+     content_files: doc_content_files,
+-    expand_content_files: files(
++    expand_content_files: [
+         'migrating-1to2.xml'
+-    ),
++    ],
+     fixxref_args: [
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+-- 
+GitLab
+
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
index 1fee6ac93428..7f697f3474bf 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-r1 vala
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
@@ -38,6 +38,11 @@ BDEPEND="$(python_gen_any_dep)
 	test? ( dev-libs/check )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-docs-optional.patch"
+	"${FILESDIR}/${P}-meson-0.61.patch"
+)
+
 python_check_deps() { return 0; }
 
 pkg_setup() {
@@ -46,9 +51,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	vala_src_prepare
-
-	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
+	vala_setup
 
 	cp libsignon-glib/*.xml libsignon-glib/interfaces || die
 }
@@ -57,6 +60,7 @@ src_configure() {
 	myconfigure() {
 		local emesonargs=(
 			-Ddebugging=$(usex debug true false)
+			-Ddocumentation=$(usex doc true false)
 			-Dintrospection=$(usex introspection true false)
 			-Dpython=$(usex python true false)
 			-Dtests=$(usex test true false)