gentoo resync : 25.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
commit: 401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree: c2bef4719f6787550f0916aeaa8f4f403a9296af /app-editors
parent: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)
29 files changed, 1034 insertions, 450 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index cc7b51e46a47..1f828b74c42c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 64693551769c..307a41e977bc 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,4 +1,3 @@
-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
deleted file mode 100644
index d8661773ea0d..000000000000
--- a/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-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/Manifest b/app-editors/gedit/Manifest
index d2c8ed12465e..7504b5766466 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,7 +1,3 @@
-AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
-AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
-AUX 40.1-fix-meson-0.61.patch 904 BLAKE2B acd66d002974c2030408fa32176e327205b8901e1c41ecb409d0fd6d95dd4e9f8ae79093a5a2f782c595189add73abe76e0049632b6e92a51c99a3df5ce164ac SHA512 fab0dc53cbdaa579dc583ce90760fa1fde5a4ab91d35346646c10ff3d1563168bec59f8cda70119d160cec964dba437910c7cc02a63c15a6472760de303f8c49
-AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
 DIST gedit-41.0.tar.xz 6889320 BLAKE2B c4d2b923eab18cd27ffc0ff99882953e952c0956135fa7f6401ef01dd5cd0e1cf9a5a86c5751db9206fd88200c70434710881cd5b934a3620f14130a5066f18f SHA512 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e
 EBUILD gedit-41.0.ebuild 1885 BLAKE2B b0595f782edd0b276965eb4c42d3a73562e12bdbb83775b174f6e26f8befa22238a1e020dc0da55ce5f8fe09f18adda5c42e15d70098a541f82e3af8c105fbc1 SHA512 431b90921835a15040037a89cc9b95d9c9b393bb471fcbf36155e5ef3fd5a51fd18bc28abba269b8e57c54b0ff77797ea2a13af70b5277736909e404b8343daa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch
deleted file mode 100644
index f1197ebb5222..000000000000
--- a/app-editors/gedit/files/3.38-make-gspell-optional.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4f32833325a6c95ec451adf1a8d9691cceb14dd8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:20:31 +0300
-Subject: [PATCH 1/2] build: Make gspell optional
-
----
- meson.build               | 3 ++-
- meson_options.txt         | 4 ++++
- plugins/spell/meson.build | 4 ++++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index acaad0dad..2c5dccb82 100644
---- a/meson.build
-+++ b/meson.build
-@@ -54,7 +54,7 @@ deps_basic_list = [
-   dependency('gobject-introspection-1.0'),
- ]
- 
--gspell_dep = dependency('gspell-1', version: '>= 1.0')
-+gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
- python3 = python.find_installation('python3')
- 
- # Configurations
-@@ -94,3 +94,4 @@ summary('Prefix', get_option('prefix'))
- summary('API documentation', get_option('gtk_doc'))
- summary('User documentation', get_option('user_documentation'))
- summary('Require all tests', get_option('require_all_tests'))
-+summary('Spell checker plugin', get_option('spell').enabled().to_string())
-diff --git a/meson_options.txt b/meson_options.txt
-index 4e842d1ea..bb3923dd1 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -14,6 +14,10 @@ option(
-   description: 'Require that all tests can be run, even those that depend on third party programs'
- )
- 
-+option('spell',
-+       type: 'feature', value: 'enabled',
-+       description: 'Build spell checking plugin')
-+
- # This option exists for the developers, to speed up the install.
- option(
-   'user_documentation',
-diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
-index 8ce7634b7..cccb42fc1 100644
---- a/plugins/spell/meson.build
-+++ b/plugins/spell/meson.build
-@@ -1,3 +1,7 @@
-+if not gspell_dep.found()
-+  subdir_done()
-+endif
-+
- libspell_sources = files(
-   'gedit-spell-app-activatable.c',
-   'gedit-spell-plugin.c',
--- 
-2.26.2
-
diff --git a/app-editors/gedit/files/3.38-make-python-optional.patch b/app-editors/gedit/files/3.38-make-python-optional.patch
deleted file mode 100644
index 7dccb18191cd..000000000000
--- a/app-editors/gedit/files/3.38-make-python-optional.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 9ed333a94ea15f74c420cbb2766909953aa6acb6 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:34:42 +0300
-Subject: [PATCH 2/2] build: Make python optional
-
----
- gedit/meson.build   | 2 ++
- meson.build         | 2 ++
- meson_options.txt   | 4 ++++
- plugins/meson.build | 9 ++++++---
- 4 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/gedit/meson.build b/gedit/meson.build
-index 9fc81468e..5e808a2d8 100644
---- a/gedit/meson.build
-+++ b/gedit/meson.build
-@@ -197,10 +197,12 @@ libgedit_gir = gnome.generate_gir(
-   install_dir_typelib: get_option('libdir') / 'gedit/girepository-1.0',
- )
- 
-+if get_option('python')
- python3.install_sources(
-   'Gedit.py',
-   subdir: 'gi/overrides',
- )
-+endif
- 
- # Vala API
- libgedit_vapi = gnome.generate_vapi(
-diff --git a/meson.build b/meson.build
-index 2c5dccb82..5e1e9340a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -55,7 +55,9 @@ deps_basic_list = [
- ]
- 
- gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
-+if get_option('python')
- python3 = python.find_installation('python3')
-+endif
- 
- # Configurations
- config_h = configuration_data()
-diff --git a/meson_options.txt b/meson_options.txt
-index bb3923dd1..962b82934 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -14,6 +14,10 @@ option(
-   description: 'Require that all tests can be run, even those that depend on third party programs'
- )
- 
-+option('python',
-+       type: 'boolean', value: true,
-+       description: 'Install GIR python overrides and python plugins')
-+
- option('spell',
-        type: 'feature', value: 'enabled',
-        description: 'Build spell checking plugin')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 50bc5d393..63bb7c094 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -18,14 +18,17 @@ msgfmt_plugin_cmd = [
- subdir('docinfo')
- subdir('filebrowser')
- subdir('modelines')
--subdir('pythonconsole')
- subdir('quickhighlight')
--subdir('quickopen')
--subdir('snippets')
- subdir('sort')
- subdir('spell')
- subdir('time')
- 
-+if get_option('python')
- if get_option('plugin_externaltools')
-   subdir('externaltools')
- endif
-+
-+  subdir('pythonconsole')
-+  subdir('quickopen')
-+  subdir('snippets')
-+endif
--- 
-2.26.2
-
diff --git a/app-editors/gedit/files/40.1-fix-meson-0.61.patch b/app-editors/gedit/files/40.1-fix-meson-0.61.patch
deleted file mode 100644
index cac046067cb2..000000000000
--- a/app-editors/gedit/files/40.1-fix-meson-0.61.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch
-https://bugs.gentoo.org/831925
-
-From c6c7c6580bc7f82a7d449b8ee33ae44f8b6f4a1f Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Wed, 15 Dec 2021 07:02:09 +0000
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-The positional argument has been silently ignored for a time. And it causes failure
-with "ERROR: Function does not take positional arguments" since meson 0.60.0
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -4,7 +4,6 @@ install_man('gedit.1')
- 
- appdata = 'org.gnome.gedit.appdata.xml'
- appdata_file = i18n.merge_file(
--  appdata,
-   input: appdata + '.in',
-   output: appdata,
-   po_dir: '../po/',
-@@ -23,7 +22,6 @@ endif
- 
- desktop_file = 'org.gnome.gedit.desktop'
- desktop_output_file = i18n.merge_file(
--  desktop_file,
-   type: 'desktop',
-   input: desktop_file + '.in',
-   output: desktop_file,
-GitLab
diff --git a/app-editors/gedit/files/restore-overlay-scrollbars.patch b/app-editors/gedit/files/restore-overlay-scrollbars.patch
deleted file mode 100644
index 55a353a796bf..000000000000
--- a/app-editors/gedit/files/restore-overlay-scrollbars.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Fri, 20 Mar 2020 11:32:59 -0500
-Subject: [PATCH] Revert "ViewFrame: disable overlay scrolling for the
- GtkScrolledWindow"
-
-This reverts commit 5e0909c19f267b4023131881fac89c58a2a17453.
----
- gedit/resources/ui/gedit-view-frame.ui | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
-index ebf70b013..4c783c711 100644
---- a/gedit/resources/ui/gedit-view-frame.ui
-+++ b/gedit/resources/ui/gedit-view-frame.ui
-@@ -11,7 +11,6 @@
-         <property name="visible">True</property>
-         <property name="hexpand">True</property>
-         <property name="vexpand">True</property>
--        <property name="overlay_scrolling">False</property>
-         <child>
-           <object class="GeditView" id="view">
-             <property name="visible">True</property>
--- 
-2.25.1
-
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index f69b9645a97a..0cdd51afb406 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,3 +1,4 @@
-DIST gnome-text-editor-42.rc1.tar.xz 1093060 BLAKE2B 14bddc82e4dd410b357cff7274ed35c07b13da7648db5840eb2c8dae7c057935b9b6f5f249c8c04f3a8ed27543014de8f7fc38b98985cd481064752f28a0b623 SHA512 debebccceb4bbe2bfc87a1c1f0813b10fc0c565cc89c6b3a826daa0a3344c88b9f20135087335f61d7b736a8c8ada7e2f823795c1e6c8d3d03ac7325afd0a9ae
-EBUILD gnome-text-editor-42_rc1.ebuild 1035 BLAKE2B 8dfae66f2828821092940062df160dac39b838083b95bf386a1285f96c30185b748278bd7d78eab632b00112a7d34120172fbfaa13322009f70d38ee4e94c3f9 SHA512 23da6adfe47b5cb4aef50dbad287a746947f5bab606b8862984acc8b06390ec4b115d29167dcb25cc2e8e527c8111fe420629c44e6e3051aec42af1e134dfc8a
+AUX 42.0-appdata-fix-appstream-validation.patch 712 BLAKE2B d8d19718488343f41c0144a293ff094cb498a44beb57c487601891eb79338fbcaf2991f9fecd75ebe586dcd0fa504a9780e64c1e50afd0352b5c7fb9233b87ad SHA512 6c88ab7162e8e3ae1068da2b9eeb2ada66915edfd153d5911945c88eaee05124893ccc7a7b9447b62d4867d941bd1bc707453da350bfc4f76af7e379f442900c
+DIST gnome-text-editor-42.0.tar.xz 1126224 BLAKE2B 7e02cea493696630284d7994f1d227a5589ad7aa7d7b98e5f67655ebcd69f7e2ded1195368e666ad26621b6b32168c7defde1cd3c2e278ca8741bf572979154e SHA512 4462ef0e0113863e752ce2c4d499386cbf9d72c67126fb60512eea39bd53bed6d56b2a62511e9af62024f9704ba722411ebbd5040aabcefce0b460925b91ad1f
+EBUILD gnome-text-editor-42.0.ebuild 1108 BLAKE2B a27db557a0419cb0ce7797b14e6552f19c4aa98cdd4ade357e9e12d7c3e92b0a1470d20d0f2c1101abb1e3c61bcc24dd741f17fed3aac9a5a58d031b36da61ac SHA512 154f0fc1bd5fe9eb64388b458a6a60d7d97e3c90b9a8805a817cdd4e29d677ffb66fdb710946b74754604aa445b174aeecfe3ad2e800aa62f49095a17819ea24
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch b/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch
new file mode 100644
index 000000000000..d53b8d481ba3
--- /dev/null
+++ b/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch
@@ -0,0 +1,25 @@
+From 985c8dd411a27ad067fe9ac8951d644bad57324a Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Fri, 18 Mar 2022 22:35:37 -0700
+Subject: [PATCH] appdata: fix appstream validation
+
+Fixes #329
+---
+ data/org.gnome.TextEditor.appdata.xml.in.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/org.gnome.TextEditor.appdata.xml.in.in b/data/org.gnome.TextEditor.appdata.xml.in.in
+index f4e751f..3a39a8d 100644
+--- a/data/org.gnome.TextEditor.appdata.xml.in.in
++++ b/data/org.gnome.TextEditor.appdata.xml.in.in
+@@ -45,7 +45,6 @@
+ 
+   <releases>
+     <release version="42.0" date="2022-03-18"/>
+-    <release version="42.rc1" date="2022-03-07"/>
+   </releases>
+ 
+   <kudos>
+-- 
+2.34.1
+
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild
index 7f7de71f724e..c48b7bacaddd 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild
@@ -38,6 +38,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-appdata-fix-appstream-validation.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature spell enchant)
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 75fc3b40d5d1..9c876a5d4de3 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -10,6 +10,7 @@ DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df03
 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
 DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
 DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
+DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6
 EBUILD gvim-8.2.3428-r1.ebuild 10626 BLAKE2B 21872f8aebfe15e9b94620f3a36298a78c54d749dad73aabe5ed01c63e6fe19778e5be9485aa3bd4da440c2e02a82c395f350a643e320bbcd00d8d839e414646 SHA512 c1908d7918609f66d956392d31083a2521cc0ee8178b02af0a5591695772b1e1ff89a5c9cff4f2040b8b7bc1999c776ed633f8e14620a6fd7d28395ed287501f
 EBUILD gvim-8.2.3567.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
@@ -19,5 +20,6 @@ EBUILD gvim-8.2.3741.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007
 EBUILD gvim-8.2.3950.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7
 EBUILD gvim-8.2.4285.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7
 EBUILD gvim-8.2.4328.ebuild 10694 BLAKE2B 5f76cb6574ac71786a47f0f4f8ffe5b44eedc6fbabe6d7685d33999bc2df07a0fa22d3734f2adcf3e4e7e5b3accaa9f1cccb6ad668005ec57edd9b972218215e SHA512 11c9792ae94a79104d3cf8e4ddc105b49fff996938ac4ae03de182066f3bbc8405d4806d0e0569f9e30975f97626ffd49511277df4675a59fc07e45eb0bf5d85
+EBUILD gvim-8.2.4586.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7
 EBUILD gvim-9999.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-8.2.4586.ebuild b/app-editors/gvim/gvim-8.2.4586.ebuild
new file mode 100644
index 000000000000..3600cac317cd
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.4586.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable crypt libsodium)
+		$(use_enable cscope)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command "${PYTHON}")
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	if use lua; then
+		myconf+=(
+			--enable-luainterp
+			$(use_with lua_single_target_luajit luajit)
+			--with-lua-prefix="${EPREFIX}/usr"
+		)
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                         CARBON (not tested)
+	# -aqua gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index d9644eb7171c..0e158abc7bd2 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,5 @@
 DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a
 DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25
 EBUILD okteta-0.26.6.ebuild 1760 BLAKE2B d46526993dd9807d460a3976e77041d782e245d97fc95109c02247f63a2501e8ce80d92cd61db2c625335ff7424155c615576556f7a562a96267bd88adce3dc3 SHA512 5e47fb1cd03eade146322ec5888296d2e00303099f5196577f171a993c96662c347403fcbd1e81d8c83d674a79ba75c43712afe287cb9211ced5911be8f99977
-EBUILD okteta-0.26.7.ebuild 1762 BLAKE2B c5dd1eb6329f206be08bacea292fd3ff2b12da6a1dbfb8674c0cfb4117ee3bb299358fce6c6cba6a54a5b817594851678f5fdfb2fe7ce9b7fd529e47ea6e3cd3 SHA512 443435661b95a9604d6f0a78bc5922774db888a43038180a1c1373001d38a337fd6ea2fa54dfbccc8d3bb6957d327ab06568875471e72d8f6192d2de26337da5
+EBUILD okteta-0.26.7.ebuild 1761 BLAKE2B 80f105872fd67702e757ef4be0b8aa348dd4f1f812f708b0ca5e04f179a5e8ced90c821ecc194db965bd40be9ade57eb943df1d92d37de55828694c11ddaf64b SHA512 79d51724eaad2748fc0c40cdefa0bfe685d41c7a49dfff304816323909340f70fcbf48aa539acbe11a9af8f25d117a9256fef5d4c7d9c21308a57962bc8aca8a
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.7.ebuild b/app-editors/okteta/okteta-0.26.7.ebuild
index cf8171388a8d..fbefa8d222f5 100644
--- a/app-editors/okteta/okteta-0.26.7.ebuild
+++ b/app-editors/okteta/okteta-0.26.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 5227788a44ae..15d433548184 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -11,6 +11,7 @@ DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df03
 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
 DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
 DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
+DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 EBUILD vim-core-8.2.0814.ebuild 7300 BLAKE2B aa73cad9bed04545abbfa8924022ec5e9a796b0f02f838bd5284d2da95de34b7665d24078a94e35e9d04bafcc2fa33a923c96c9a087081cb4d690fed25a6c3f5 SHA512 09b438dece9441fde5509fdc1091deccb4c5c90b12a71036eb71cdd45c320f50bb6abc6746b04eedf640e101c30c0c84cda9dbf3727c55254c1a5c448283db7e
 EBUILD vim-core-8.2.3428.ebuild 7366 BLAKE2B c6a15417c64899f67f0b0d2f24e1aca6926567bf06aa0a3ad02b6d4e4e97b2a18a2519bd33a90812cbd74edee79771897d5c36a12e4e693279e5ba260f9f81a8 SHA512 9d7ba3b42a87e3b73a089e43befb8db1d6cf0319de605bcee5296feb83c516a32890409ed47caf20ede9593e1cf16f190f9c2d77a211f1398b0d71cdcad0047f
 EBUILD vim-core-8.2.3567.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
@@ -19,6 +20,7 @@ EBUILD vim-core-8.2.3669.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84
 EBUILD vim-core-8.2.3741.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7
 EBUILD vim-core-8.2.3950.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
 EBUILD vim-core-8.2.4285.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
-EBUILD vim-core-8.2.4328-r1.ebuild 7141 BLAKE2B 5dbd10e1b6301b82b99b047e17e60b21941ba9aebbf8ad4b3fc1a09ca0665aed704abdb58d388079a548a5cc6ae8bfa2313aa287f864f9871bc31152241ff210 SHA512 e45fbae1333a3704169896d29605603250746300a5d27955401832650722ada8a7a274c2de3abdcd332c85caf0067f3c3c8e7a837d82618d85cb578dd44a353f
+EBUILD vim-core-8.2.4328-r1.ebuild 7140 BLAKE2B 093fc33e2b30e6f09f5d4b6482b178332fa06b7a4b93eb050f16c9b38d8dec2c478b1db65cd925600dd85bb145bb694ff0f3b436be0128d1f869a2b6f9e55979 SHA512 e38b568ed73d6ea120c597a62c622618125dfcbd614cb1b0c58d696ebf7d5ff4ea98ecc62d0c57b0ba156e172773aac172ab2d7a66ac45d96e045a384df0a331
+EBUILD vim-core-8.2.4586.ebuild 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575
 EBUILD vim-core-9999.ebuild 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
index 09a0e4d7f51c..995864198e71 100644
--- a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild
new file mode 100644
index 000000000000..37b1be63841c
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="8.2"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
+RDEPEND="!!<app-editors/gvim-8.1.0648
+	!<app-editors/vim-8.2.4328-r1"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See bug #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug #18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		# Delete skip_defaults_vim config not supported by vim[minimal]
+		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 858901ed49e2..5b35642505ac 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -9,6 +9,7 @@ DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df03
 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
 DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
 DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
+DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 EBUILD vim-8.2.0814-r100.ebuild 9496 BLAKE2B 77b6188e1c207b82cb341659ad28b8179bfef3d431126caeaa8eb32500b927d9e63caf606e63890597d47959ec5ed29af40c3e8c0130486c90ce2016515cd742 SHA512 da1b4a8c8e07d5dee976d36a523788f74aa7bbf10b99bc2f7e3dfe66a93bde46999c39f10466b9a3f72fef927743fe63f16883874dfdcc31fa8d1a5b0606e393
 EBUILD vim-8.2.3428-r1.ebuild 10185 BLAKE2B 2db77b2dae20412a5e2ea1d2a0192b49312619518114ae9de7dd1436d24f4f0ce8f86e49b125605396e8128050f46d69fa539c8194838a784418356cd1cb0a80 SHA512 f58dcfe5f137f712f205691f67302fad5e4e72a5836cc5e64713b26a1a44ee1d4ed4862f8bb17938a1639e27edc25605efd7d3d2cbd1bc92fd95cde294664fcd
 EBUILD vim-8.2.3567.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
@@ -17,6 +18,7 @@ EBUILD vim-8.2.3669.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb
 EBUILD vim-8.2.3741.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38
 EBUILD vim-8.2.3950.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
 EBUILD vim-8.2.4285.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
-EBUILD vim-8.2.4328-r1.ebuild 10089 BLAKE2B 3f7ec30b849bb9457e0ff55223913269c76cf4ed7aba2e2da29b50ea3c9bb269430dc93accab5df62cdf0959e9c12ab89e7772f8f2fd2b68586b3c2308fa053a SHA512 3347ed62ff99bc7d039f26a7bb7ea2975af9ebb5076493b17e10b41465aade46492a09b986d92f9ab39ce58652f6b2e7431e479d73eb8c12166715cc73e328b9
+EBUILD vim-8.2.4328-r1.ebuild 10088 BLAKE2B eff32a51d283241fa1fe756e85fbe3a942e22767b3a0a90529a1723467a5b0a91e04519ceee963b32dcd83dbbfa4878fc0e7ac92ad1a12eed1a2893df4e97c93 SHA512 9069af977387576132b2db142611ece7feb1f0424977dc1953e313cd50602d0d17d4822c4b65839382bb6c93d30e66c0882823fbffeda14c4d208bfa41bab947
+EBUILD vim-8.2.4586.ebuild 10094 BLAKE2B 525197248b7938f4c79481cc3fa4a5920119e7c966a36b8d7d436e4f08aa8611e5c02c67ffdc182e662263348afd936c39f7ea7d508325c5e7ae0085f7cd4975 SHA512 d0187a2b5294cd1acc36f4324fb16199fecc7e3e02a8ea6d798d8b7b0233caa987f97a284df344b944235e06e3cecb39d66938e98241f71561bf4cc2d12494d9
 EBUILD vim-9999.ebuild 10094 BLAKE2B 525197248b7938f4c79481cc3fa4a5920119e7c966a36b8d7d436e4f08aa8611e5c02c67ffdc182e662263348afd936c39f7ea7d508325c5e7ae0085f7cd4975 SHA512 d0187a2b5294cd1acc36f4324fb16199fecc7e3e02a8ea6d798d8b7b0233caa987f97a284df344b944235e06e3cecb39d66938e98241f71561bf4cc2d12494d9
 MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
diff --git a/app-editors/vim/vim-8.2.4328-r1.ebuild b/app-editors/vim/vim-8.2.4328-r1.ebuild
index 67b5a1185774..f63872a37305 100644
--- a/app-editors/vim/vim-8.2.4328-r1.ebuild
+++ b/app-editors/vim/vim-8.2.4328-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.4586.ebuild b/app-editors/vim/vim-8.2.4586.ebuild
new file mode 100644
index 000000000000..5d9a0aae046a
--- /dev/null
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? ( ${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	~app-editors/vim-core-${PV}
+	!<app-editors/vim-core-8.2.4328-r1
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable crypt libsodium)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command "${PYTHON}")
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		if use lua; then
+			myconf+=(
+				--enable-luainterp
+				$(use_with lua_single_target_luajit luajit)
+				--with-lua-prefix="${EPREFIX}/usr"
+			)
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	# - Test_spelldump_bang
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 94ba98750fe3..bdd3428b48d0 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,9 +16,9 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r3.ebuild 7095 BLAKE2B 0621c6ebb2fdff80e33642638c76af9e0df48bfa53614d61e37e8b3ff3e24c4d0ad199d3c577f4e6f456a69bdb7a99c6c9dfb69a4d344bacbd5b41a006a46892 SHA512 ed40badb583205ca5e82e0c8bac5b643f8645d47f810ba6232ca00b49c62fdfdc341b34561ed9ad3a6567e18b8f4ced2a4e1bf79fc01eba7a196a9a22e3d3ee5
-EBUILD xemacs-21.4.24-r4.ebuild 7120 BLAKE2B cc4c006ecbfb5c61564aad4bb2eb94db33f1eda9269c06110dc29d9143ce9e6caac814c559e5fc68172589fbe54e44e90e1178657a5868497003c397d346d97c SHA512 5d9e915364e74f3151d09aef9805e3855e72fb16358295140203f58b2243b496d1f3944aebad4d07ce4f027663c42c7212a30b1249596264ec6ccdb38a125bce
-EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173
-EBUILD xemacs-21.5.34-r7.ebuild 7214 BLAKE2B 56ad56cfc2e4de8e0921093ae9bcf99071fca3eed7c39bce28124175b93aa7d37cc8fbcd589bf0752aa274a9c38f0e7f20f3fc39cb5e1f8d5f25baa2a765c9dd SHA512 32dea813c9ba64e33a3e04d2864e7363a520adfc9e33de509607fdec57512fef3d5980f772d4a1693f3260218ef4de5c88df30f38082409a29425e5b0ee458c4
-EBUILD xemacs-21.5.9999.ebuild 7205 BLAKE2B fb003fd2ebb04236e2ca17c1a6ac7b6a99bd91ece52a54f87f6bc89e16934fc7f8ea20dfc9b3fdbf875e604490e12158a7d542b2d2d18d16d4a8d1963e7b88ff SHA512 0b69df0d74dd3e98f29ed72b40be881dec8be02cf1504f64e735d520e5e2939e46e1c23f297eaff07b80661e5cf6ea585ae7a1d96ca2ec054b284983b0a211b3
+EBUILD xemacs-21.4.24-r5.ebuild 7100 BLAKE2B fc97b2c21a462aec173566002cf359400a8bbe2a9bd89aced81e2dfeb976504c285c547ef297ccc208a97b33cf6b182512847b882e947fc55cc0977f5e3a4683 SHA512 a6e0685614c85a3b8a15d42dc63f7572f05705adedcb7c40654c19bf0e99c7527e02c0f432888d564e8a33be939c1f8ace9afd6e2be04260e0741939704b14f1
+EBUILD xemacs-21.4.24-r6.ebuild 7125 BLAKE2B d55c2f8794c77d4e63d87ebf54235c17db9c8757f328f54ae52bb719ea633aeced8be84101b2d8c7df45267be3fac77022695e9a5500edae37a9b2b7b3517f91 SHA512 18cd08f620a2ea69b342c06aaa30cfc2e7b2721c0b65112b56071ac4d7d79d2c56800ac11245b61f911af99da4ad9d770f2bf2ca70cedd19b6710db8bd9a5596
+EBUILD xemacs-21.5.34-r8.ebuild 7325 BLAKE2B 700d5570cfce62735d320b1dcec6ba6f95c2629b6e600ee10ef5dba01584f687f8571d55af24e14d6b385ea611055b7c7ac57ad49e64108758a66bec2e24c43a SHA512 dc733c1f1f87b087710814f60fd0678a6fb539d76b39c3703c2cb31de6aab2e375e29853ce1f6dcb73ee26c9e5b5fc456726157ea977327e31848625f58118f8
+EBUILD xemacs-21.5.34-r9.ebuild 7219 BLAKE2B bb1c0946b059fb890d28ea2fce3ec175d5a85e662bac0c35caba615e32fae8a1bcb5811404a68c4e0b43c30b4622d1d189000c90f4eff72b5030893d496b5341 SHA512 a43e5517273245629785caf4f8393b89d7ec539a6c7e029b894d317a8082d4db58348197aa7fee3dae021f097efd5d3a1a4f45eb162fc10fb67a9470abd8ebac
+EBUILD xemacs-21.5.9999.ebuild 7210 BLAKE2B e0934ecd0ae85019ada5c29aa444bcd122160ab8a9621311fe5ee76ae576edb70a6520b08aeec5297165cfcd786a42ca9b90c4a02647bb06fe3ce167af39a438 SHA512 5a36af701e613e37f03a24d861aa4677ac1fded17ba9af75c1f2ee41cf5702485dcda0e87ef89de02fecfd631749d2332ec47f80f2eb1d52780c5d8e41de38b3
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
index a0b28559a0a5..2f9a674f7c59 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
@@ -23,13 +23,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
+	>=dev-libs/openssl-0.9.6:0=
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
 	dnd? ( x11-libs/dnd )
diff --git a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
index ad783065d393..5944c3fd65be 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
@@ -23,13 +23,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
+	>=dev-libs/openssl-0.9.6:0=
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
 	dnd? ( x11-libs/dnd )
diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
index b1ec1ecf51e1..bef802bacbd6 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r8.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
 
 # Note: xemacs currently does not work with position independent code
@@ -22,13 +22,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
 	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
+	>=dev-libs/openssl-0.9.6:0=
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index 44896cf0be0a..e204ae47e03b 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.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
 
 # Note: xemacs currently does not work with position independent code
@@ -22,13 +22,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
 	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
+	>=dev-libs/openssl-0.9.6:0=
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 7b3921f0a4d4..53538cb13840 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.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
 
 # Note: xemacs currently does not work with position independent code
@@ -23,13 +23,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
 	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
+	>=dev-libs/openssl-0.9.6:0=
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 943bf5bce912..de6e10ba7f60 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -1,5 +1,5 @@
 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
 DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
 EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d
-EBUILD zile-2.6.2-r1.ebuild 1176 BLAKE2B 8223428bc7394d28e4eaa0bbfc95eb68a2dcbe1f0cf1f76ea2ae3380c5c702eff9257fa32983e63ca0371916bf970753a9a2751bc7de6510db2203a6f6b8b0be SHA512 b7e0d7e9fc225e04ec40aa4c9ef19d89019df4affe1c4d6eb758c4b943b05341e7ed6100ac5dcf2b7aa96050aa45fda202da26432522d1d488c9afb9c456bb91
+EBUILD zile-2.6.2-r2.ebuild 1163 BLAKE2B 5ee7a62b91c4580a19294f8ea140319aede9ba1ea07cca00572818cced8a1d8816184230dd8f4b28f99914d3c32f74404a0abe0a65372ea8daa4bb947dc0e450 SHA512 e0b58ed8733c116dc58d4288fa4e8341240b8dc71b6354258df0bd14569a885070ccf4171e8e3a9271c4fcbe6ad57b575ad482061bcbd57a1283274df5ef9aac
 MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424
diff --git a/app-editors/zile/zile-2.6.2-r1.ebuild b/app-editors/zile/zile-2.6.2-r2.ebuild
index b7fa5c7239ff..397db8e3c0d1 100644
--- a/app-editors/zile/zile-2.6.2-r1.ebuild
+++ b/app-editors/zile/zile-2.6.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libgee:0.8=
@@ -30,12 +30,9 @@ DOCS="README THANKS"
 
 QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
 
-pkg_setup() {
-	vala_setup
-}
-
 src_prepare() {
 	default
+	vala_setup
 	rm *_vala.stamp || die
 }
author	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
commit	401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree	c2bef4719f6787550f0916aeaa8f4f403a9296af /app-editors
parent	4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)