gentoo resync : 20.03.2022

4 files changed, 28 insertions, 14 deletions

diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 890e1e19df99..c7a85cd78a07 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,4 +1,5 @@
-AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
+AUX fix-build-with-meson-0.61.patch 224 BLAKE2B 9c7cd30c4703eab7949ebc6ac771b72c021d0845bf4fedf2aaa046713b174bbe892dd3147fc5583b22ac29a21dbfa4f966e0f4deda189b37adff92b34fcb5b32 SHA512 48ab3d7c9f793d52b1be0f31a46cb81ff66e54a420a12a3b45fadbed1022456c859370a7832f0f2d198ec362d126e83eb888ef8e84534d33c56727deb51a27b7
+AUX gnome-user-share-3.18.1-no-prefork.patch 450 BLAKE2B 2b3f7ae96c09599e67e39bb6fec3085bfee944ef5c01a58517c4f49e8b415c10e6cc2543ca808957dc61afb6e584817a6c369f269f449ac01b707d02155ecbbf SHA512 2707eba2cbbb2cba57562dea3e2bf6ff677669aefe4c4e52c236a9f3b6bb008036ef3eefa1a8f5dc675d2ad2157415816c75817a17daaf9c2398624cd86e3946
 DIST gnome-user-share-3.34.0.tar.xz 109560 BLAKE2B 02d0788ff6b4b1a87ebd1d5dee2a853ce0418a553aa2be262227f0b8984ed8bcf84bec774b43952425e96d8b14f4100fd42e0dbec02cc91e67e0881f9155005d SHA512 7aa5f0cad4b96af41b5e4b4a125cb7a9d7a7c27ba10cdf7c4acd2aaffe5bfb3494c9319b997e547c996017827383f7653905c3e0af67c65922635b7ac49803f5
-EBUILD gnome-user-share-3.34.0.ebuild 1320 BLAKE2B 51d2c7841977a3e2641f0e491f217ab7eb123db3b3aab3ec381b9261ed4fc0741200c6a63643820930ce5863b9aee2ef92cbdc8ff423b16af61158f8fc4c037f SHA512 bf57628bf53b0f814664ebc8612976392df5312d6cd9efe9b249ebf2928957f16000ef69ae8b5dcfd5706ae8cc44ebd686d77086fa40a3b613b116a475553f81
+EBUILD gnome-user-share-3.34.0.ebuild 1366 BLAKE2B 260076c25d789d880b1f0f13e4670ede3af95275339f50c0189d44696a0540ddc292e3b7b8c3e0fd0796c42ab7a774a57e024819816dc310211c17db4081f6d2 SHA512 8c78cc89a475bea9c7fc6f43b85553467c37af02b76cd21c6c4bdde1ade1e4479e2315ec1d6227be8ae1ff30cfc0e7c3554cdf94cdaa1a4c0e7c9ac225bdf051
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..2721f2ac876f
--- /dev/null
+++ b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/831939
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,7 +7,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
index 156721d286cf..ca5eff008aa0 100644
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
@@ -1,10 +1,11 @@
---- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600

-+++ gnome-user-share-3.14.2/data/dav_user_2.4.conf      2015-06-03 20:21:33.588774303 -0600

-@@ -9,7 +9,6 @@

- LimitXMLRequestBody 100000

- 

- LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so

--LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so

- LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so

- LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so

- LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
\ No newline at end of file
+https://bugs.gentoo.org/551012
+--- a/data/dav_user_2.4.conf
++++ b/data/dav_user_2.4.conf
+@@ -9,7 +9,6 @@
+ LimitXMLRequestBody 100000
+ 
+ LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+-LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+ LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
index c3f33f67da0d..d18fc0340e76 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 # FIXME: could libnotify be made optional ?
@@ -33,6 +33,7 @@ PATCHES=(
 	# that is problematic for us (bug #551012)
 	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
 	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+	"${FILESDIR}"/fix-build-with-meson-0.61.patch
 )
 
 src_configure() {