gentoo resync : 02.02.2022

3 files changed, 60 insertions, 1 deletions

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 2628b6318ca3..3e8d63daa3f6 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,7 @@
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
+AUX 41.3-fix-build-with-meson-0.61.1.patch 1385 BLAKE2B 70740f1424234b056537cd2781aed5c9b114aa6eaa629d48a24022de0a6ec789630a8ab32b8451655b049e3b55db88895654cdd78cee89d4d91858cb60237a47 SHA512 588b93f599b31cd80ada5b599b267ba9eced928b3b9597c43dc1319f41996df056704860cbf7ebe1815b0e91ffd467fb019d7ec64eb09f08d1a969fbea55f46e
 DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
 DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
 EBUILD evince-40.4.ebuild 3156 BLAKE2B 73037ed0f0b38c1cc0e0ae2d8609d543b120de95c94a9d73ba85c1c8d8a7dcf8f1446d5fc8c23badb791c2e273f8b45c4dc43f011e7773c79a47d3c2d7df8813 SHA512 2c50a03f52775b4d43cf75b05d850e6948bba51107d4e367fbff1024f23367b3f854462722f11231de3de201b746829546999bb32086cc79e112535b699b83cd
-EBUILD evince-41.3.ebuild 3029 BLAKE2B a001190d9841d95938ca70dcbf05e62e9d2869ac1d2ad03ffa1f5365c297803267fe98d26fa8807ffe340253f403177d17934f2e8c5277abaf1e5bb67cde75a1 SHA512 0b63a3e6184d757d5f04e982cbf8613c2444b832b7ca8494900abf07d9bdbaa2c24beb0df82eac4b3d6ba2256920a2883a08429cbb3f07a12ea62576ea6068d8
+EBUILD evince-41.3.ebuild 3097 BLAKE2B 7c1a45a85dd0e95cb8be16edd96d3d52f1e6a4461d1c84cbceaba7dfc750ca7674a935bb805ae0e71011adebfa93d184adce810f98b3b551127de0b07e19a29f SHA512 4306ed1b6232731acd0e8dbd7e77f3815353027acaf68714d07ca7984b67de05a2b2c15547f97fd65d62d179347f3a85028dd999d0a3cf62074923bc288da596
 MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f
diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild
index 11777c63ccda..75e615774832 100644
--- a/app-text/evince/evince-41.3.ebuild
+++ b/app-text/evince/evince-41.3.ebuild
@@ -67,6 +67,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 
diff --git a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..fa0a5cd82914
--- /dev/null
+++ b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,54 @@
+https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54
+https://bugs.gentoo.org/831853
+
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for
+a time and explicitly rejects with error since meson 0.60.0
+---
+ backend/meson.build | 1 -
+ data/meson.build    | 1 -
+ meson.build         | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
+   )
+ 
+   i18n.merge_file(
+-    appstream,
+     input: appstream_in,
+     output: appstream,
+     po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index 8a308b853..afc302098 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,6 @@ foreach desktop: desktops
+   )
+ 
+   i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+diff --git a/meson.build b/meson.build
+index 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+