gentoo resync : 02.02.2022

3 files changed, 39 insertions, 2 deletions

diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index b28760afab03..46673afd2e5a 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,3 +1,4 @@
+AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1
 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
-EBUILD entangle-3.0.ebuild 1634 BLAKE2B 5f22a861ef53689b4165f032617f25b5b22568a4abdd1225bbb2c141e5ce4bdabafeb1bbfe18a5c7a737833c4ff2f76afbb7c8dbe91215c2474a3b6a45839ea5 SHA512 c26f758dc92410e43c72b8c8c316c11391c95c83c180f237a957e70b3ca2ecd0b74dcf944c7e467dd8359fa7adaee7f378d3a5f18299d6c4b1c6e09685467e7f
+EBUILD entangle-3.0.ebuild 1694 BLAKE2B ff360a0323773c177c889d45d50ab899e1d0bde23177e9811dfe8585eae54c01d40233531403760ff6d2eb6496e2f19f1a1d8ad8a490df0e56b86ce3dff96448 SHA512 b01561a66afe3c0b8f4d4bc5dff077d48c6c90d3f031dcdfe2584734a59205a85b752930811a6b2d43444163e6efcb233fdc7b454e7776ff0f1bfc7b2ea2b7b0
 MISC metadata.xml 447 BLAKE2B dd2c9401bd2d866158d724e74423fe837963707e1aeaef52ee3a611b66f60e5388a43d5491f41036997e8115dc7569ca92fdd3f3ea58b89bbac82f9ff836b286 SHA512 eb9dfef9d08aaadb9767cd2793722c304350a3cdcd71d80fa7b6fbf3eb52c8eb7669575e4a25d3debc95b184f138656190fe1a340e6370cef7623a6ec70bd443
diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0.ebuild
index a86a9e92e53b..cc06e89278bc 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.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
@@ -45,6 +45,10 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)
+
 src_compile() {
 	# prevent gst from loading system plugins which causes
 	# sandbox violations on device access
diff --git a/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..ba2d1addfb13
--- /dev/null
+++ b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch
+https://bugs.gentoo.org/831581
+
+From: EorlBruder <eorl@bruder.space>
+Date: Wed, 12 Jan 2022 11:27:50 +0100
+Subject: [PATCH] meson: fix build for meson >=0.60.0
+
+Replaced the positional arguments in i18n.merge_files with the
+data_dirs-keyword
+
+Fixes #67
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -40,7 +40,7 @@ appname = 'org.entangle_photo.Manager'
+ desktop = appname + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
++  data_dirs: desktop,
+   type: 'desktop',
+   input: desktop,
+   output: desktop,
+@@ -60,7 +60,7 @@ metainfotmp = custom_target('gen-metadata',
+ 		 '@INPUT@', '@OUTPUT@'])
+ 
+ i18n.merge_file(
+-  metainfo,
++  data_dirs: metainfo,
+   input: metainfotmp,
+   output: metainfo,
+   install: true,
+GitLab