gentoo resync : 20.03.2022

3 files changed, 211 insertions, 2 deletions

diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 038602ed4bbc..64693551769c 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,4 @@
-DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
-EBUILD gedit-plugins-40.1.ebuild 2717 BLAKE2B 5ca39394512387999dc672d688372a43f29ba1ce410e8f0c7654a478780caa614a61fb949fff8293d3e58b5c022d8adbc405b7d481bb8924966a32ed4a274c8f SHA512 d79253703e9bfcb340937608c6382131a545735fcd4dbc6a9282a97c914f68a4b1de28c24c7da6a0397681ad04e5376fdbd7c1e974e8896097848b073d7e176b
+AUX gedit-plugins-40.1-meson-0.61.patch 7836 BLAKE2B 07a471c9b270487a10d042d1c0a6084d0f17efb9a697e980110e1256b326b62b52157400fb9cf708758826f9caefa7623de7130c20176d08ae0f4101d557f9f8 SHA512 da912025e69b5f4049382d5a53d505104fa3e0d1163d0ba82d230640ccf5c081d6f1a1569358be81e7e306549cac7fc07d2b705cae1ae41fed089758c40d3a05
+DIST gedit-plugins-41.0.tar.xz 948364 BLAKE2B d5efe779e1f0f70e23a7dadb01b0e5b22c47d3326df6530559698ace274e2a4a3647d34640e89bb250d76bee1f6369d5728316730ce9cf89f3a7db627b3c4d49 SHA512 e0389e8be68406fdcd3c9537b2d2dad0faf19d9a49804a7b5d9cf8e1006254906605dd0b14e2fa1eb7a22d6533d9b55d7f5593fe01a5b412df6361c8b9089f34
+EBUILD gedit-plugins-41.0.ebuild 2717 BLAKE2B 5ca39394512387999dc672d688372a43f29ba1ce410e8f0c7654a478780caa614a61fb949fff8293d3e58b5c022d8adbc405b7d481bb8924966a32ed4a274c8f SHA512 d79253703e9bfcb340937608c6382131a545735fcd4dbc6a9282a97c914f68a4b1de28c24c7da6a0397681ad04e5376fdbd7c1e974e8896097848b073d7e176b
 MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
diff --git a/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch b/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch
new file mode 100644
index 000000000000..d8661773ea0d
--- /dev/null
+++ b/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch
@@ -0,0 +1,208 @@
+https://gitlab.gnome.org/GNOME/gedit-plugins/-/merge_requests/27.patch
+https://bugs.gentoo.org/832315
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:10:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+plugins/bookmarks/meson.build:43:0: ERROR: Function does not take positional arguments.
+plugins/bracketcompletion/meson.build:32:0: ERROR: Function does not take positional arguments.
+plugins/charmap/meson.build:28:0: ERROR: Function does not take positional arguments.
+plugins/codecomment/meson.build:32:0: ERROR: Function does not take positional arguments.
+plugins/colorpicker/meson.build:32:0: ERROR: Function does not take positional arguments.
+plugins/colorschemer/meson.build:41:0: ERROR: Function does not take positional arguments.
+plugins/commander/meson.build:37:0: ERROR: Function does not take positional arguments.
+plugins/drawspaces/meson.build:58:0: ERROR: Function does not take positional arguments.
+plugins/findinfiles/meson.build:64:0: ERROR: Function does not take positional arguments.
+plugins/git/meson.build:28:0: ERROR: Function does not take positional arguments.
+plugins/joinlines/meson.build:32:0: ERROR: Function does not take positional arguments.
+plugins/multiedit/meson.build:28:0: ERROR: Function does not take positional arguments.
+plugins/smartspaces/meson.build:36:0: ERROR: Function does not take positional arguments.
+plugins/synctex/meson.build:28:0: ERROR: Function does not take positional arguments.
+plugins/terminal/meson.build:40:0: ERROR: Function does not take positional arguments.
+plugins/textsize/meson.build:28:0: ERROR: Function does not take positional arguments.
+plugins/translate/meson.build:49:0: ERROR: Function does not take positional arguments.
+plugins/wordcompletion/meson.build:57:0: ERROR: Function does not take positional arguments.
+--- a/plugins/bookmarks/meson.build
++++ b/plugins/bookmarks/meson.build
+@@ -41,7 +41,6 @@ bookmarks_plugin = custom_target(
+ )
+ 
+ bookmarks_metainfo = i18n.merge_file(
+-  'gedit-bookmarks.metainfo.xml',
+   input: 'gedit-bookmarks.metainfo.xml.in',
+   output: 'gedit-bookmarks.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/bracketcompletion/meson.build
++++ b/plugins/bracketcompletion/meson.build
+@@ -30,7 +30,6 @@ bracketcompletion_plugin = custom_target(
+ )
+ 
+ bracketcompletion_metainfo = i18n.merge_file(
+-  'gedit-bracketcompletion.metainfo.xml',
+   input: 'gedit-bracketcompletion.metainfo.xml.in',
+   output: 'gedit-bracketcompletion.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/charmap/meson.build
++++ b/plugins/charmap/meson.build
+@@ -26,7 +26,6 @@ charmap_plugin = custom_target(
+ )
+ 
+ charmap_metainfo = i18n.merge_file(
+-  'gedit-charmap.metainfo.xml',
+   input: 'gedit-charmap.metainfo.xml.in',
+   output: 'gedit-charmap.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/codecomment/meson.build
++++ b/plugins/codecomment/meson.build
+@@ -30,7 +30,6 @@ codecomment_plugin = custom_target(
+ )
+ 
+ codecomment_metainfo = i18n.merge_file(
+-  'gedit-codecomment.metainfo.xml',
+   input: 'gedit-codecomment.metainfo.xml.in',
+   output: 'gedit-codecomment.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/colorpicker/meson.build
++++ b/plugins/colorpicker/meson.build
+@@ -30,7 +30,6 @@ colorpicker_plugin = custom_target(
+ )
+ 
+ colorpicker_metainfo = i18n.merge_file(
+-  'gedit-colorpicker.metainfo.xml',
+   input: 'gedit-colorpicker.metainfo.xml.in',
+   output: 'gedit-colorpicker.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/colorschemer/meson.build
++++ b/plugins/colorschemer/meson.build
+@@ -39,7 +39,6 @@ colorschemer_plugin = custom_target(
+ )
+ 
+ colorschemer_metainfo = i18n.merge_file(
+-  'gedit-colorschemer.metainfo.xml',
+   input: 'gedit-colorschemer.metainfo.xml.in',
+   output: 'gedit-colorschemer.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/commander/meson.build
++++ b/plugins/commander/meson.build
+@@ -35,7 +35,6 @@ commander_plugin = custom_target(
+ )
+ 
+ commander_metainfo = i18n.merge_file(
+-  'gedit-commander.metainfo.xml',
+   input: 'gedit-commander.metainfo.xml.in',
+   output: 'gedit-commander.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/drawspaces/meson.build
++++ b/plugins/drawspaces/meson.build
+@@ -56,7 +56,6 @@ install_data(
+ )
+ 
+ drawspaces_metainfo = i18n.merge_file(
+-  'gedit-drawspaces.metainfo.xml',
+   input: 'gedit-drawspaces.metainfo.xml.in',
+   output: 'gedit-drawspaces.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/findinfiles/meson.build
++++ b/plugins/findinfiles/meson.build
+@@ -62,7 +62,6 @@ findinfiles_plugin = custom_target(
+ )
+ 
+ findinfiles_metainfo = i18n.merge_file(
+-  'gedit-findinfiles.metainfo.xml',
+   input: 'gedit-findinfiles.metainfo.xml.in',
+   output: 'gedit-findinfiles.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/git/meson.build
++++ b/plugins/git/meson.build
+@@ -26,7 +26,6 @@ git_plugin = custom_target(
+ )
+ 
+ git_metainfo = i18n.merge_file(
+-  'gedit-git.metainfo.xml',
+   input: 'gedit-git.metainfo.xml.in',
+   output: 'gedit-git.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/joinlines/meson.build
++++ b/plugins/joinlines/meson.build
+@@ -30,7 +30,6 @@ joinlines_plugin = custom_target(
+ )
+ 
+ joinlines_metainfo = i18n.merge_file(
+-  'gedit-joinlines.metainfo.xml',
+   input: 'gedit-joinlines.metainfo.xml.in',
+   output: 'gedit-joinlines.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/multiedit/meson.build
++++ b/plugins/multiedit/meson.build
+@@ -26,7 +26,6 @@ multiedit_plugin = custom_target(
+ )
+ 
+ multiedit_metainfo = i18n.merge_file(
+-  'gedit-multiedit.metainfo.xml',
+   input: 'gedit-multiedit.metainfo.xml.in',
+   output: 'gedit-multiedit.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/smartspaces/meson.build
++++ b/plugins/smartspaces/meson.build
+@@ -34,7 +34,6 @@ smartspaces_plugin = custom_target(
+ )
+ 
+ smartspaces_metainfo = i18n.merge_file(
+-  'gedit-smartspaces.metainfo.xml',
+   input: 'gedit-smartspaces.metainfo.xml.in',
+   output: 'gedit-smartspaces.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/synctex/meson.build
++++ b/plugins/synctex/meson.build
+@@ -26,7 +26,6 @@ synctex_plugin = custom_target(
+ )
+ 
+ synctex_metainfo = i18n.merge_file(
+-  'gedit-synctex.metainfo.xml',
+   input: 'gedit-synctex.metainfo.xml.in',
+   output: 'gedit-synctex.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/terminal/meson.build
++++ b/plugins/terminal/meson.build
+@@ -38,7 +38,6 @@ install_data(
+ )
+ 
+ terminal_metainfo = i18n.merge_file(
+-  'gedit-terminal.metainfo.xml',
+   input: 'gedit-terminal.metainfo.xml.in',
+   output: 'gedit-terminal.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/textsize/meson.build
++++ b/plugins/textsize/meson.build
+@@ -26,7 +26,6 @@ textsize_plugin = custom_target(
+ )
+ 
+ textsize_metainfo = i18n.merge_file(
+-  'gedit-textsize.metainfo.xml',
+   input: 'gedit-textsize.metainfo.xml.in',
+   output: 'gedit-textsize.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/translate/meson.build
++++ b/plugins/translate/meson.build
+@@ -47,7 +47,6 @@ install_data(
+ )
+ 
+ translate_metainfo = i18n.merge_file(
+-  'gedit-translate.metainfo.xml',
+   input: 'gedit-translate.metainfo.xml.in',
+   output: 'gedit-translate.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+--- a/plugins/wordcompletion/meson.build
++++ b/plugins/wordcompletion/meson.build
+@@ -55,7 +55,6 @@ install_data(
+ )
+ 
+ wordcompletion_metainfo = i18n.merge_file(
+-  'gedit-wordcompletion.metainfo.xml',
+   input: 'gedit-wordcompletion.metainfo.xml.in',
+   output: 'gedit-wordcompletion.metainfo.xml',
+   po_dir: join_paths(srcdir, 'po'),
+GitLab
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-41.0.ebuild
index d056232a64b2..d056232a64b2 100644
--- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-41.0.ebuild