gentoo resync : 16.09.2020

46 files changed, 39 insertions, 530 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 1e3632b5c155..94f3be735305 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/detectindent/Manifest b/app-vim/detectindent/Manifest
index 65ecdc9dd125..52181d976d49 100644
--- a/app-vim/detectindent/Manifest
+++ b/app-vim/detectindent/Manifest
@@ -1,3 +1,3 @@
 DIST detectindent-1.0_p20150908.tar.xz 2788 BLAKE2B fbf27c3d9cbe3c92f96c9ed094cd72a24db948a1eb8abadb5ee3c86c3c118c409ffc02bee5806134e9b217361b9af44a773c6f91c3996a7ab54c7fda6f1341ce SHA512 d828d04871e6eeeaa11c109e137fbe70a3b7fa265f569e45d77b8b185f380a200b009aa0a2f0825afdbf344b12d7b8922050c4788decadcb7640bbe3fe9ca8de
 EBUILD detectindent-1.0_p20150908.ebuild 511 BLAKE2B 9f2cb7a07b9d69603d9987670a553b02bec09dd4c40cdc50d2088f885051da1cb50aff33d8dd4893ee37d37205cb64c0df175031b0b2acbaa5324d31a81973d2 SHA512 c9908c9d0d2bf80c7d9ad77caee4304a78519396ebf8e6a5b2379b900ec478b8dfa46aff8ccda4107a0b45faa1614d0945f4f2571a57f88e6f149bbc7aeef4f1
-MISC metadata.xml 481 BLAKE2B 5220c1a9da2e3f78bb0aafdbb2e3694374ae1158a9051110742e68e43bf22417bf5f51bc09dc06b402e89e4296c67df260825c1deaeda17eafc1c3618799bdfd SHA512 b4dfde13c17bb38d66031284c72288648992cf1157bb253c7cae53ad179d097ee05fde55333b9ac660e748298ab84b767976c5c8bb03a0defb7e37a5087031b2
+MISC metadata.xml 334 BLAKE2B 62049b1053ff14ac7d1c1ad535aa9153dd232fea14ad9f71440188b55281bbde4c1aed42d729825688bba9e4a1baea71138385c85a4e55555ca3c95a2c6fae1b SHA512 b9ab54d2eeab6f3250d48e314dfb959f244107230bc931fce6948fb51f5950b3c048c6d70ab3593110867de1e1ccdab531336cb774b1647cbfed74a4355e4eee
diff --git a/app-vim/detectindent/metadata.xml b/app-vim/detectindent/metadata.xml
index 34279beb870e..240cd5a87f23 100644
--- a/app-vim/detectindent/metadata.xml
+++ b/app-vim/detectindent/metadata.xml
@@ -5,10 +5,6 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim plugin which automatically detects indent settings for files which
-		do not have modelines.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">ciaranm/detectindent</remote-id>
 	</upstream>
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index 08631f60a478..0aee5ee7d3e4 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -1,11 +1,3 @@
-AUX editorconfig-vim-0.3.3-fixes.patch 3434 BLAKE2B 0a8050698e5138282b838ecad598dcda7676ef3210985fb4d1330fd63651b34eb0df5bd20715acceb807f5f5db7a60a0161b03419b880090f0a727e1a9557daa SHA512 3133dc753c46dbb66d833cb58bf464d37cbd05f77fc9a4a29b9fb9b3eea39b990df2020c7604e881031aaa1cc6cf11b0d42b7ac186c56736721341750d15a81b
-AUX editorconfig-vim-0.3.3-max-line-length-off.patch 735 BLAKE2B 3be429d92fefa14a5c483dfdb9e4b10ba18fec0a4b925088995ccf03dcee1534a50aa394c8c37a03ec5e3115a7c0804fdaa2e07f8e39a71f545e485814296087 SHA512 7657b145d71890f0ec12b142c8edc21558171d7cc8f8392912c0fb2e774799d5e57bf06999d48dfce7bb6402bf05ba7a7bd2d613efb5341bebf223a50135ab1d
-AUX editorconfig-vim-0.3.3-python3.patch 5601 BLAKE2B 4a9bee66b7b3b2b016d13a557a71d49e28c098c0be26224f55945ea9950d1f4a1484dba2f3c560d8d0ddb93abd6936b72b2195fec81d0b951a238d2344a2f052 SHA512 10a08c795a667c92e0667f292472c5704c43915868fc8c1f164898feb4c4e7af71ede553f5aa874b19e2b4c48f89313bfb90494e0d5d2dc4b7cbaa049d5df2a3
-AUX editorconfig-vim-1.0.0_beta-wildcard-slash.patch 808 BLAKE2B bc35a580b10a9fcad5916197fb891fa4b9bb8abf7842fbd292b2a91dca60f95282b1bddb365d2286bc2eda4b4a8d922e8aea89312aafbce3a039288adb112e71 SHA512 004f27b01d0f8bd2a71687ce2c09bc70895377034775ee7b2705874d2458cacf36b5d1300d6ed9e1a6925b33428c7a208e223e4f65824cd3bedf56b938c7bd92
-DIST editorconfig-vim-0.3.3.tar.gz 35395 BLAKE2B a7b65c1472024017dd408e5c4ac5048004d0bd55f44c7cfba49b5973cb445125ed89cc3d4363fb902a4c5fbb507f3ee5ed0ca48aece3fb6915e643bae0dbf70c SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1
-DIST editorconfig-vim-1.0.0-beta.tar.gz 31519 BLAKE2B 2d5e8e55e8dccc0b45453b8da9ecad80867a84d1ea20146581886f793c093c201521a7d1d4451122ae441d30f58acec28d29aa20da9de737b5beb7f44d55c0ed SHA512 159e3ca32a7ffe71853ba62a14d0469310b81345b0e704dd6a9f42c56f6f6b9a3f63502ccabcf43a15443acf4acefdaf078063ae747f49315b89f5518d7f9816
 DIST editorconfig-vim-1.1.1.tar.gz 33287 BLAKE2B 4c79ac3bf1f82ca6182480ab2f3c2ee24b8234f5845c63d90434bb57271981554a0651d8bc0314c718ad9700adf7903fed45f5e400d8ae8a0b6d42932e89e071 SHA512 7b94db4b2f641ecd2d2623bf55bf9b457c007b2b5c8553cba5b7a75bc34823d6995d3c9ed13febe0f59de6f87c52eb0367591213c43c6fcd7c331c529126f4d6
-EBUILD editorconfig-vim-0.3.3-r2.ebuild 984 BLAKE2B 4d5151da95882cc23e8d05553e52ec6c926e9d3b8167d6509846bc76f9ebc87b6797c0fe928ec48bae0b711d46fdc416e2de835b0f9ba7a5887b866325899fba SHA512 5b989484463ab68fc9a07d90174a79b7a8cd0d18bf817b2403ff6505d04cdb710f668cec5cbfacdcab8c1a9df10ac3214aa3a651dab5aed0c27520a4c26a84ff
-EBUILD editorconfig-vim-1.0.0_beta.ebuild 781 BLAKE2B 2580c0c64c53203e5e09fe72459239b8992f5f644c6d0af485525fc445417fef88fdd62adb22019066dc6860ae84be82f01a1febbc2742808e6b84e529f4a14f SHA512 eda756f5ae0697fba4cee959571ef3314f575b6d11c1aa1023f71cd3bbed9c147f8d210235ef306af74e6988849cb242d8baf45ceefb19421ccaa0b3eb3ea13d
 EBUILD editorconfig-vim-1.1.1.ebuild 702 BLAKE2B a07d0b978c820c64b687d0a595cc1a0a0340d7d3c11c4345ac5584fd0853cd38a29c087d37a974150cf13f08c6c7a76c5f3f0628aed17ab1bf82d115725dfa03 SHA512 5d278313aa6c3f74998b1dde5961e010864192524f2e7ce7906de7ca1aa2e8b110ff4e2973ee97db50b16ea08093bfeebfeb65086bdbccd2b1b0ec830663472d
 MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
deleted file mode 100644
index 006508da113a..000000000000
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python3_6)
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: Support EditorConfig files "
-HOMEPAGE="https://editorconfig.org/"
-SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/editorconfig-core-py[${PYTHON_MULTI_USEDEP}]
-	')
-	|| (
-		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3.patch"
-	"${FILESDIR}/${P}-max-line-length-off.patch"
-	"${FILESDIR}/${P}-fixes.patch"
-)
-
-VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
-
-src_prepare() {
-	default
-
-	rm LICENSE mkzip.sh .editorconfig .gitignore .travis.yml || die
-	rm -r tests plugin/${PN%-vim}-core-py || die
-}
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-1.0.0_beta.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-1.0.0_beta.ebuild
deleted file mode 100644
index 7afd3f83e137..000000000000
--- a/app-vim/editorconfig-vim/editorconfig-vim-1.0.0_beta.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="vim plugin: Support EditorConfig files "
-HOMEPAGE="https://editorconfig.org/"
-SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2 PSF-2"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
-
-PATCHES=(
-	"${FILESDIR}/editorconfig-vim-1.0.0_beta-wildcard-slash.patch"
-)
-
-src_prepare() {
-	default
-
-	rm LICENSE LICENSE.PSF \
-		mkzip.sh .editorconfig \
-		.git{ignore,modules} \
-		.{travis,appveyor}.yml || die
-}
-
-src_install() {
-	# we don't want to install the tests
-	rm -r tests || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch
deleted file mode 100644
index 955560088735..000000000000
--- a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/doc/editorconfig.txt b/doc/editorconfig.txt
-index bd6173b..3b32012 100644
---- a/doc/editorconfig.txt
-+++ b/doc/editorconfig.txt
-@@ -79,7 +79,8 @@ empty. There are 3 modes currently: "external_command", "python_builtin",
- "python_external".
- 
-     python_builtin:     Use the vim built-in python to run the python version
--                        EditorConfig Core.
-+                        EditorConfig Core. In this mode, Python 2.5 or higher
-+                        is required.
-     python_external:    Use an external python interpreter to run the python
-                         version EditorConfig Core.
-     external_command:   Run external EditorConfig Core.
-diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
-index af4f630..9abd008 100644
---- a/plugin/editorconfig.vim
-+++ b/plugin/editorconfig.vim
-@@ -121,15 +121,15 @@ function! s:FindPythonFiles() " {{{1
- 
-     let l:python_core_files_dir = fnamemodify(
-                 \ findfile(g:EditorConfig_python_files_dir . '/main.py',
--                \ ','.&runtimepath), ':p:h')
-+                \ fnameescape(','.&runtimepath)), ':p:h')
- 
-     if empty(l:python_core_files_dir)
-         let l:python_core_files_dir = ''
-     else
- 
--    " expand python core file path to full path, and remove the appending '/'
--    let l:python_core_files_dir = substitute(
--                \ fnamemodify(l:python_core_files_dir, ':p'), '/$', '', '')
-+        " expand python core file path to full path, and remove the appending '/'
-+        let l:python_core_files_dir = substitute(
-+                    \ fnamemodify(l:python_core_files_dir, ':p'), '/$', '', '')
-     endif
- 
-     let &shellslash = l:old_shellslash
-@@ -247,7 +247,7 @@ function! s:InitializePythonBuiltin(editorconfig_core_py_dir) " {{{2
-     " The following line modifies l:ret. This is a bit confusing but
-     " unfortunately to be compatible with Vim 7.3, we cannot use pyeval. This
-     " should be changed in the future.
--    execute s:pyfile_cmd s:pyscript_path
-+    execute s:pyfile_cmd fnameescape(s:pyscript_path)
- 
-     return l:ret
- endfunction
-@@ -327,14 +327,19 @@ endif
- 
- function! s:UseConfigFiles()
- 
-+    let l:buffer_name = expand('%:p')
-     " ignore buffers without a name
--    if empty(expand('%:p'))
-+    if empty(l:buffer_name)
-         return
-     endif
- 
-+    if g:EditorConfig_verbose
-+        echo 'Applying EditorConfig on file "' . l:buffer_name . '"'
-+    endif
-+
-     " Ignore specific patterns
-     for pattern in g:EditorConfig_exclude_patterns
--        if expand('%:p') =~ pattern
-+        if l:buffer_name =~ pattern
-             return
-         endif
-     endfor
-@@ -386,8 +391,8 @@ endfunction
- function! s:UseConfigFiles_Python_External() " {{{2
- " Use external python interp to run the python EditorConfig Core
- 
--    let l:cmd = s:editorconfig_python_interp . ' ' .
--                \ s:editorconfig_core_py_dir . '/main.py'
-+    let l:cmd = shellescape(s:editorconfig_python_interp) . ' ' .
-+                \ shellescape(s:editorconfig_core_py_dir . '/main.py')
- 
-     call s:SpawnExternalParser(l:cmd)
- 
-@@ -445,6 +450,11 @@ function! s:SpawnExternalParser(cmd) " {{{2
-             return
-         endif
- 
-+        if g:EditorConfig_verbose
-+            echo 'Output from EditorConfig core executable:'
-+            echo l:parsing_result
-+        endif
-+
-         for one_line in l:parsing_result
-             let l:eq_pos = stridx(one_line, '=')
- 
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch
deleted file mode 100644
index be5d736a385c..000000000000
--- a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 6e7011712398e53671e5a44edefeb68914562a3a
-Author: Hong Xu <hong@topbug.net>
-Date:   Wed Apr 6 00:34:26 2016 -0700
-
-    Support max_line_length=off to leave the decision to the editor settings.
-
-diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
-index 9abd008..0e9d647 100644
---- a/plugin/editorconfig.vim
-+++ b/plugin/editorconfig.vim
-@@ -563,7 +563,8 @@ function! s:ApplyConfig(config) " {{{1
-     endif
- 
-     " highlight the columns following max_line_length
--    if has_key(a:config, 'max_line_length')
-+    if has_key(a:config, 'max_line_length') &&
-+                \ a:config['max_line_length'] != 'off'
-         let l:max_line_length = str2nr(a:config['max_line_length'])
- 
-         if l:max_line_length >= 0
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch
deleted file mode 100644
index 848582ab02e2..000000000000
--- a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-commit c2b7a104b826b7ff9283d32cb95a039ddccde79b
-Author: Shunsuke Shimizu <grafi@grafi.jp>
-Date:   Sun Jan 10 00:12:10 2016 -0800
-
-    Make the plugin to be compatible with Python 3.
-    
-    Squashed commit of the following:
-    
-    commit 0973c5179e504ffbd74a38d6557bb49fe3bf8b5d
-    Author: Hong Xu <hong@topbug.net>
-    Date:   Sun Jan 10 00:11:11 2016 -0800
-    
-        Some minor corrections
-    
-    commit ca17e97e86bd6379bcf3782adfa200c1589cab69
-    Author: Shunsuke Shimizu <grafi@grafi.jp>
-    Date:   Sun Jan 10 15:24:13 2016 +0900
-    
-        vim 7.3 support by using `py[3]` command instead of `py[3]eval()` function
-    
-    commit c51ae80ce0ca8fe24c014a7c2d54a85d604d3c88
-    Author: grafi <grafi@grafi.jp>
-    Date:   Sun Jan 10 14:42:38 2016 +0900
-    
-        use print_function on python2
-    
-    commit 401a9486bba7528aa4d54b06b8ef3ace582829c9
-    Author: grafi <grafi@grafi.jp>
-    Date:   Sun Jan 10 14:33:25 2016 +0900
-    
-        assure that sys.path is cleaned
-    
-    commit f3bf442429d9579a336a1bb8f98fee82710fbd1e
-    Author: grafi <grafi@grafi.jp>
-    Date:   Sun Jan 10 14:22:45 2016 +0900
-    
-        python3 style print
-    
-    commit 8e059379328b23e4253f76cbd72d3ef484501d42
-    Author: Shunsuke Shimizu <grafi@grafi.jp>
-    Date:   Sat Dec 26 07:54:49 2015 +0900
-    
-        Support python3
-
-diff --git a/plugin/editorconfig.py b/plugin/editorconfig.py
-new file mode 100644
-index 0000000..21ea9c7
---- /dev/null
-+++ b/plugin/editorconfig.py
-@@ -0,0 +1,42 @@
-+from __future__ import print_function
-+
-+try:
-+    try:
-+        import vim
-+        import sys
-+    except:
-+        vim.command('let l:ret = 2')
-+        raise
-+
-+    try:
-+        sys.path.insert(0, vim.eval('a:editorconfig_core_py_dir'))
-+
-+        import editorconfig
-+        import editorconfig.exceptions as editorconfig_except
-+    except:
-+        vim.command('let l:ret = 3')
-+        raise
-+    finally:
-+        del sys.path[0]
-+
-+    # `ec_` prefix is used in order to keep clean Python namespace
-+    ec_data = {}
-+
-+    def ec_UseConfigFiles():
-+        ec_data['filename'] = vim.eval("expand('%:p')")
-+        ec_data['conf_file'] = ".editorconfig"
-+
-+        try:
-+            ec_data['options'] = editorconfig.get_properties(ec_data['filename'])
-+        except editorconfig_except.EditorConfigError as e:
-+            if int(vim.eval('g:EditorConfig_verbose')) != 0:
-+                print(str(e), file=sys.stderr)
-+            vim.command('let l:ret = 1')
-+            return
-+
-+        for key, value in ec_data['options'].items():
-+            vim.command("let l:config['" + key.replace("'", "''") + "'] = " +
-+                "'" + value.replace("'", "''") + "'")
-+
-+except:
-+    pass
-diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
-index a21b103..af4f630 100644
---- a/plugin/editorconfig.vim
-+++ b/plugin/editorconfig.vim
-@@ -36,6 +36,8 @@ let g:loaded_EditorConfig = 1
- let s:saved_cpo = &cpo
- set cpo&vim
- 
-+let s:pyscript_path = expand('<sfile>:p:r') . '.py'
-+
- " variables {{{1
- if !exists('g:EditorConfig_exec_path')
-     let g:EditorConfig_exec_path = ''
-@@ -231,48 +233,23 @@ function! s:InitializePythonBuiltin(editorconfig_core_py_dir) " {{{2
- 
-     let s:builtin_python_initialized = 1
- 
--    let l:ret = 0
--
--    if !has('python')
-+    if has('python')
-+        let s:pyfile_cmd = 'pyfile'
-+        let s:py_cmd = 'py'
-+    elseif has('python3')
-+        let s:pyfile_cmd = 'py3file'
-+        let s:py_cmd = 'py3'
-+    else
-         return 1
-     endif
- 
--    python << EEOOFF
--
--try:
--    import vim
--    import sys
--except:
--    vim.command('let l:ret = 2')
--
--EEOOFF
--
--    if l:ret != 0
--        return l:ret
--    endif
--
--    python << EEOOFF
--
--try:
--    sys.path.insert(0, vim.eval('a:editorconfig_core_py_dir'))
--
--    import editorconfig
--    import editorconfig.exceptions as editorconfig_except
--
--except:
--    vim.command('let l:ret = 3')
--
--del sys.path[0]
--
--ec_data = {}  # used in order to keep clean Python namespace
--
--EEOOFF
--
--    if l:ret != 0
--        return l:ret
--    endif
-+    let l:ret = 0
-+    " The following line modifies l:ret. This is a bit confusing but
-+    " unfortunately to be compatible with Vim 7.3, we cannot use pyeval. This
-+    " should be changed in the future.
-+    execute s:pyfile_cmd s:pyscript_path
- 
--    return 0
-+    return l:ret
- endfunction
- 
- " Do some initalization for the case that the user has specified core mode {{{1
-@@ -388,41 +365,22 @@ augroup END
- function! s:UseConfigFiles_Python_Builtin() " {{{2
- " Use built-in python to run the python EditorConfig core
- 
--    let l:config = {}
--    let l:ret = 0
--
-     " ignore buffers that do not have a file path associated
-     if empty(expand('%:p'))
-         return 0
-     endif
- 
--    python << EEOOFF
--
--ec_data['filename'] = vim.eval("expand('%:p')")
--ec_data['conf_file'] = ".editorconfig"
--
--try:
--    ec_data['options'] = editorconfig.get_properties(ec_data['filename'])
--except editorconfig_except.EditorConfigError as e:
--    if int(vim.eval('g:EditorConfig_verbose')) != 0:
--        print >> sys.stderr, str(e)
--    vim.command('let l:ret = 1')
-+    let l:config = {}
- 
--EEOOFF
-+    let l:ret = 0
-+    execute s:py_cmd 'ec_UseConfigFiles()'
-     if l:ret != 0
-         return l:ret
-     endif
- 
--    python << EEOOFF
--for key, value in ec_data['options'].items():
--    vim.command("let l:config['" + key.replace("'", "''") + "'] = " +
--        "'" + value.replace("'", "''") + "'")
--
--EEOOFF
--
-     call s:ApplyConfig(l:config)
- 
--    return 0
-+    return l:ret
- endfunction
- 
- function! s:UseConfigFiles_Python_External() " {{{2
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-1.0.0_beta-wildcard-slash.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-1.0.0_beta-wildcard-slash.patch
deleted file mode 100644
index d3dc81241a5e..000000000000
--- a/app-vim/editorconfig-vim/files/editorconfig-vim-1.0.0_beta-wildcard-slash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8b533e933f1e4904daae72e9d84f939cd18ffca8 Mon Sep 17 00:00:00 2001
-From: Chris White <cxwembedded@gmail.com>
-Date: Sat, 20 Jul 2019 13:14:57 -0400
-Subject: [PATCH] '?' wildcard does not match '/' (fixes #124)
-
----
- autoload/editorconfig_core/fnmatch.vim | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/autoload/editorconfig_core/fnmatch.vim b/autoload/editorconfig_core/fnmatch.vim
-index 14833bf0..6f60db5d 100644
---- a/autoload/editorconfig_core/fnmatch.vim
-+++ b/autoload/editorconfig_core/fnmatch.vim
-@@ -199,7 +199,7 @@ function! editorconfig_core#fnmatch#translate(pat, ...)
-             endif
- 
-         elseif l:current_char ==# '?'
--            let l:result .= '\_.'
-+            let l:result .= '\_[^/]'
- 
-         elseif l:current_char ==# '['
-             if l:in_brackets
diff --git a/app-vim/matrix/Manifest b/app-vim/matrix/Manifest
index 3f4c2500ae8e..cb877de0c39e 100644
--- a/app-vim/matrix/Manifest
+++ b/app-vim/matrix/Manifest
@@ -1,3 +1,3 @@
 DIST matrix-1.10.tar.bz2 3365 BLAKE2B 71c8d4fe2117b4fa8fb31ba880b3af456f046d6f78bcec54107dab58bee1b733887752aba06f17fc6b4196ada40cc1ba7c5a7e4ddeafeeb5630f6ee1d8e44627 SHA512 9c268ced7b0a7e3117c88bfe005236f1fc61cfd74fa10d46318b739fe61a97f7bd856d125d69cf599a79efb8fb181d8876641cda65ae5dc80e4c650e7430fa85
 EBUILD matrix-1.10-r1.ebuild 431 BLAKE2B 5540aa537722fd860ea9bbc3ff4ebfaba11765d31148c5bcc0070d07a405ff66cb9402f9ffc6cbb3a3f19efa729ecb1ea70d7c2fb1ed9955701c3f50393cd5db SHA512 6c4fffbd235db17b2f593dd2e56b20d10ce2c42c285128c18b8f45251ffd0ebcfe191812a7b53426935a4e52d5f435dcd3872105a3c28c33dcc860cd5d4fc839
-MISC metadata.xml 401 BLAKE2B e62a9d3baf82371cfe83d16b48ff30e1e064087e79fad1afeee30e07f1e195e5142ee7364cd267eaea1967a34dbff097cd6033ea47e3db32c85f92cf6de88df5 SHA512 62867793f995b355e1dbb336bb5e2f2622ed6ee9467dead5b813c29c5667e4e1888c6c3ce09a2896acf31e95f0a849bce49529c959a4a209a871497fa8a9b614
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/matrix/metadata.xml b/app-vim/matrix/metadata.xml
index 185b552dd34c..5c000c763084 100644
--- a/app-vim/matrix/metadata.xml
+++ b/app-vim/matrix/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		A Vim plugin which displays a screensaver based upon the falling green
-		symbols seen in the Matrix.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
index ff3be219f23b..267f69397cbd 100644
--- a/app-vim/pyclewn/Manifest
+++ b/app-vim/pyclewn/Manifest
@@ -1,3 +1,3 @@
 DIST pyclewn-2.1.tar.gz 129697 BLAKE2B 0dfef92cb36ea9fa89c7f0d85ed45e21c634732fc2d3d888dd792de22529bea86719f8ac8ed870dd5ab00efbfdb08011013a36880781abf9e0c64a62b2aa301a SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b
-EBUILD pyclewn-2.1-r2.ebuild 1043 BLAKE2B 8486be082ed725b74a9201ec5cff0e8f426841819f661b345a47a887997d752fba66288e16cffaeef59fcb1f79637ea59841158587d261b7447f0bd019cbb82e SHA512 d65597aa71406e979c0f2b134c225e9fd9092eebf14a12566dac4ba47b5389061bc55c99ffefb48aa38c70ef94f9f921fd59049b1e8d2dddffce2894c34c5f41
+EBUILD pyclewn-2.1-r2.ebuild 1054 BLAKE2B 16603ed0d7ba1cd1b15046b3dc0dfa7957b1ce28dd3a04adf7bac04fe7c317610b17162c062bb63e8dd9b6a7a096d0aa4f199d9c0d77507e34adaa57c157c5e2 SHA512 f427034f0a4bf1177a7e6c9a9a20d893d38a85d73934f87b1a9377aec21d8c374b92396cb860248a130435ddcf3f74c85ab46b8edf9c50c69b221f1feb107e5a
 MISC metadata.xml 499 BLAKE2B 4955bd7a080dc2ae909143477040d191cb48ab4badfd47b6b7c11fd4686139bbbe77475f005e10c3b2bba50d0615b94600a55cda57a7d02ecaaffe1e504219dd SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81
diff --git a/app-vim/pyclewn/pyclewn-2.1-r2.ebuild b/app-vim/pyclewn/pyclewn-2.1-r2.ebuild
index e57e74a67364..58c07d63d75c 100644
--- a/app-vim/pyclewn/pyclewn-2.1-r2.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit vim-plugin distutils-r1
+inherit vim-plugin distutils-r1 optfeature
 
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index 97c213ee4d0a..3b4c9932be2e 100644
--- a/app-vim/pydoc/Manifest
+++ b/app-vim/pydoc/Manifest
@@ -1,3 +1,4 @@
 DIST pydoc-2.0.tar.gz 2795 BLAKE2B d780265c474081431e43076db9e5bc244677d9deaaa44bbd6ba2c2bdce7e88b8e2f0c6a9e14ca5a3a4bda7925b5c5bc108a34d5d6fecaabe9f0a025774b101ca SHA512 bea2e0dcb82090803b45e0cbccf5ad610a39f22d04c099e5e946e2b3707c9cbd69b85e3f1024a73760d1ff81a0199aeeb3bab20546307676953156eff7185214
 EBUILD pydoc-2.0-r1.ebuild 614 BLAKE2B cd87b0a6112f5bd0be740bcd15c447e88085f01724c9d18e10d3193aed1876bceeb52d0399c6b1e7a9eba22c41533cd858607cd84d2a81fb1275eb5bb900e677 SHA512 401a98cb758108ca8655fc9a930af9c511331f77ad603dcc936ddc3159ed9ffcdb9adaf5e49c629a725c0b9c31961adcdbb7452ea4f9bbe49efd456e78150bb4
+EBUILD pydoc-2.0-r2.ebuild 588 BLAKE2B c84da43bb3eb3d2dcb7d7b0102f77b07fe500c3d2e44850417a5a6962e756341ae22a7372d8763b3198f13a7c67b42150d125d088ff09f07338cf9405fdaa20b SHA512 ebf8f10ec8e24237d26629f77ffb99abcc2ec101ebb7fa97502bd4077b1cde0435dd51784b082696d29dc17f5ffc5bafbdd67695b3466d9e11ca6d8ca8fafa3e
 MISC metadata.xml 424 BLAKE2B cd8fb601b39c8ff1247498a196bf776d70b0765661f866b355675b5d8ac76a713bf007b8aafa503d438ac7fb49295e6f09df9d4b1d9d7fc1cba323fd139eea12 SHA512 b64ab21cb93c8d24a87fc0434baac17c21ef9a4a23d4d2622d6c733a043d84aab2c3cb00acc41edd9c61e8599cfcfddeb50025ea0135f9f10c0f5ee243f61dab
diff --git a/app-vim/pydoc/pydoc-2.0-r2.ebuild b/app-vim/pydoc/pydoc-2.0-r2.ebuild
new file mode 100644
index 000000000000..3105dd0dc42a
--- /dev/null
+++ b/app-vim/pydoc/pydoc-2.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: integrates python documentation view and search tool"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
+SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
diff --git a/app-vim/udev-syntax/Manifest b/app-vim/udev-syntax/Manifest
index 932894f72f29..cf91c269298a 100644
--- a/app-vim/udev-syntax/Manifest
+++ b/app-vim/udev-syntax/Manifest
@@ -1,4 +1,4 @@
 AUX udev-syntax-20051016-ftdetect.patch 371 BLAKE2B aeeba09718dd8292ff9a7c8092597eacf422bd49c703e526158c1130e436fe6c342e08cd4c974e762ba8b1dba45166437831806e7c889d5656b7ab6d78b382ef SHA512 41369f811f4ce28f182ac61c3113f38248aee839a9d52ee6ba83a48d3689873b9afe69bc938d2c40c06d2fa94b72c2e904a4b338dc24d6131492eb05192395cd
 DIST udev-syntax-20051016.tar.bz2 1161 BLAKE2B c8274fbe552bdf54f5d241b270512df8d95f43ccd4da2e9c794d7470e77d5399dc35ba396b2beddf752e656cd889107fa10d792be11c4dccba0adea4f8418727 SHA512 3952cddd2598eb4e09fd6bc7538419c9dbb3eb94d55a81418fc66b5c3fb46f34853d4b97a5475f3330b752d4dbdd3bcf22a3f47c73d1d3e18b5efcc2b4696e34
 EBUILD udev-syntax-20051016-r2.ebuild 565 BLAKE2B ad3bd36adc6b52cdf45675b9c79dc37b6ae1f7548f7d0d11440c1c2aa0b0ed1e607185fecbb7f2971012d95a959051286a893ae450c6dd15ab27ce0fe4ecf968 SHA512 53ede205780703bd3ee80f174cc6d0cc7f355ee1c4c658326e66088067705e7bdedeb69e2e92fe5efaf66afc9f1babfb00416a8bd6b3d24e5c7b6b985ae9d8af
-MISC metadata.xml 346 BLAKE2B 28b85271f3e53d5f31591cdae5ae0fd675c580019a44b0c769f32aa09da0324a8fd35787f5802747d721f5cac91a94ecb97976faa668c4859627d016efaf99c0 SHA512 c9cf56d93687fad1a2ae0d37518f46704a481a5ed288baf5e714ee4898f1ef304101453e2f53a05e5e079bd2e042ee403546e8f8c2787a92852910162c3150f0
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/udev-syntax/metadata.xml b/app-vim/udev-syntax/metadata.xml
index 77e95b35d8e7..5c000c763084 100644
--- a/app-vim/udev-syntax/metadata.xml
+++ b/app-vim/udev-syntax/metadata.xml
@@ -5,7 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim syntax highlighting for udev.rules files.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-cs/Manifest b/app-vim/vim-spell-cs/Manifest
index 3fa59c80b30d..607d2582467b 100644
--- a/app-vim/vim-spell-cs/Manifest
+++ b/app-vim/vim-spell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-cs-20061021.tar.bz2 1320356 BLAKE2B 0583ecb357ab3180c637211c6565e5e8e61e2739e41b25a3a704944d7216b8c54ebc249734af25d92de1c9a69bc9021d538df78953773570d7f84f70ff6705a9 SHA512 cb9cae6dab11c5cbbe16e0902b18cdbea81dbd7844eda4774f45c6e5a5f3eebb09e062a37845a0e6ff5bc5c0abf7219001824768c0e058998a7c922790006e99
 EBUILD vim-spell-cs-20061021-r1.ebuild 258 BLAKE2B 8d974edbce8a3d4c63c31c9e974a4fe3abd402d1f488ef6d96ad5d140cfdcb8040dbc2820b50392aeb483e1c565fcc117c7daceaabfd92e69849c94f3fa107d7 SHA512 b352e663756e3b175b151479f15bc95e93ff6ab8234196c79e176dc3ad242aa8361340454dc9eba80837d207987914dae2434a7b2f7e4bb913fd7c84954d8bda
-MISC metadata.xml 635 BLAKE2B a5c4352453a9744b9a580993e6f535445d1d2198778546e029e78bd871b9c2024e782b90d3d092b18cc1176f0703bf517e68e69b83ddbcfc7f371fb583d861b2 SHA512 10959e90745e992de4f48937f07ae9e37f6344327eb0b704c11f0cbc0af2744ff4abf45868a706825f53db65c8661e269998db8e83f049390da811abb5b98728
+MISC metadata.xml 349 BLAKE2B 74bc6bb21eb1bc08b3a62dcdf4bd3e13b2f30c28447c3fb14cac799167960497ee4430425c346b806d27de72827fff2ecd7b2cacb94ecca509b2db369c474b78 SHA512 0093e07644bbddb71569e9758f6c488f90992a396aecc3a48983cf6bd716ee88c3a83e1ecd37af8ed9b0fa8e9796e465e3a28cabf4fa51d5363539058e608aed
diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
index ca2f9ddd03e8..b791ab7b1eb7 100644
--- a/app-vim/vim-spell-cs/metadata.xml
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -9,12 +9,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for Czech (cs). Supported character sets are cp1250,
-		iso-8859-2, and UTF-8.
-	</longdescription>
-	<longdescription lang="cs">
-		Kontrola českého pravopisu pro Vim. Podporuje kódování cp1250,
-		iso-8859-2 a UTF-8.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-da/Manifest b/app-vim/vim-spell-da/Manifest
index df5f56efff4e..d5418e08ec16 100644
--- a/app-vim/vim-spell-da/Manifest
+++ b/app-vim/vim-spell-da/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-da-20060116.tar.bz2 629196 BLAKE2B fd8829e2920514ddd2e6c224521d6337b3e18d0cec1bfbfa89ff93aac35fa22d9a908ea353b969c0cd3e6c86bbee8bca58fa5e80c01141aa74c6a54dd016214c SHA512 0d055972b15acdd2ea7166711e344b1718975f7de6a49653240fb2e1bb31a82a8174e46de83f38d93d226782b97e2c58aff50cc0efab95dcde3d53b80205f444
 EBUILD vim-spell-da-20060116-r1.ebuild 276 BLAKE2B e3e21ed341a4c999d68ac4c3e0e047001189df6f12d065e7622abb14a8adae1f00eadfd254bcbc952c86ef05be4911ef8fea97ac0d97cc800d7bf7c51858bbf6 SHA512 50ca2086b9f15a81705fb8f4005befea20f14b3a4b6fd8356b94418db89bb8c7508cd3ef3383d6efc37da1d147be2408f0691fcf7f87e4678e9abca75fb3b7e9
-MISC metadata.xml 380 BLAKE2B 9663ddc26c4b2e454365796824d351e6b35410e8eccd8bdec574e17d6fa4b3b6207e24cc4867324b6a0fbe18d2dc1626a0c565f25703bb1a8337d3ffb3ec879d SHA512 0e165d32c9cc2878b696b33ab8a9d1cac4e41ae0e45a019075be7ea8057acff4a40ec947a74c5edb42e31fb0357f284260efcb30914bfd1fe27aed1f5ff54f9a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-da/metadata.xml b/app-vim/vim-spell-da/metadata.xml
index a27b65aadec6..5c000c763084 100644
--- a/app-vim/vim-spell-da/metadata.xml
+++ b/app-vim/vim-spell-da/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for Danish (da). Supported character sets are UTF-8,
-		latin-1.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-de/Manifest b/app-vim/vim-spell-de/Manifest
index cdaaff0a8db7..7b71e958b693 100644
--- a/app-vim/vim-spell-de/Manifest
+++ b/app-vim/vim-spell-de/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-de-20080213.tar.bz2 11171578 BLAKE2B ac344c6d9d72fabe9f950859bc6e7f880b72484622dda12ac5b9e59e485a158a4d9d4948210aa96031328fd446abdd9ff786dad7b6b8c1f8dfc185cc2b35fea6 SHA512 6b18d527a61573f865dc51bad1c8f4aca17453c2605c390e330a52f041f1392c438190dcc6168803bf415b4e9e470055a52013ee16ea32c7a8c42b2843fb3698
 EBUILD vim-spell-de-20080213-r1.ebuild 311 BLAKE2B 13e7f128644e35b8d802bf0dffbb197b28efb979aab8d871f66b1022aee164d17877cd9840a5305a14f8dcbeb912295172f47daf059b714ca3163e1cfacdc519 SHA512 acb7b68341245cd02e3c70fbcca3036ca59b1ea4accf08893e3f9d3a19635366fae34a8fc8688500eac61a42dab511920ec7cd7b8a33867e73223afc37eb4cd5
-MISC metadata.xml 383 BLAKE2B 918dbe67b13e140ec5a9c848d95261d93d2c0295d0202625dbe8749357082803a1846df04eb309fb23c2777e8be1c17974b425bbdf0a1b7424256b5099f4597d SHA512 ada270f71eeddd0c7395561b48093bf12933507593334d74e33999432cb2c4665d3f7008779141dab56f4d33e8e6bd08805a125d9643a0cc493025c8fea6784f
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-de/metadata.xml b/app-vim/vim-spell-de/metadata.xml
index 25210cdaf8e5..5c000c763084 100644
--- a/app-vim/vim-spell-de/metadata.xml
+++ b/app-vim/vim-spell-de/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for German (de). Supported character sets are UTF-8
-		and latin-1.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-el/Manifest b/app-vim/vim-spell-el/Manifest
index 164350408740..d5f9ef0947a8 100644
--- a/app-vim/vim-spell-el/Manifest
+++ b/app-vim/vim-spell-el/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-el-20080402.tar.bz2 3360601 BLAKE2B a3ab008a4786838aa6b85c061d899e8348ff19cf8aa1763b8661715c5017486363d03be1431f7dd228a6ce5a7ee8b85bd98a8cd8e2fd44e91d0751dd206a1d10 SHA512 5cf68b43e213c3d6f36c96c7414927314e25bd45283759490628cd40c6b4052e6f4c7b43db27e9a3393dc32c8960452f94ba42e279c4dad4a5a5520e338d38e9
 EBUILD vim-spell-el-20080402-r1.ebuild 252 BLAKE2B 662207fc1364605006efeddf71548332d9e8601a9f79ce94e3ac8e702adefc161da364a7fd9142f5901038ad927ec7750b3b34f581d655fe83901d6cfe9a31c1 SHA512 952a3d19ac0b16cff7372f90bc1c245c5f765e8840df478043cd190c510ee5f3c19616bff33b2437911418bf29ddd500621cf7c7bef60753032e8f8212287978
-MISC metadata.xml 375 BLAKE2B d67b18ff863f2ecf420be84cb28a759568282416897059913915d5c4126bb3b29c625d0d7c679800a1e5a109612d6fba64caeb033719c59018b3ca13f6d876c6 SHA512 bea1fc36ab389418f57fc9d66dc6c2c4a20da1b11fdb4ab6e412dea40a8c0ec4dc58525cd1d0e6839c257ffa61f4859079f3dc3df28e028f0b6482e0eda6e220
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-el/metadata.xml b/app-vim/vim-spell-el/metadata.xml
index 8202659c959a..5c000c763084 100644
--- a/app-vim/vim-spell-el/metadata.xml
+++ b/app-vim/vim-spell-el/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription>
-		Vim spell files for Greek (el). Supported character sets are UTF-8 and
-		ISO-8859-7.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-en/Manifest b/app-vim/vim-spell-en/Manifest
index 6b65754443c0..9949f9b83ee9 100644
--- a/app-vim/vim-spell-en/Manifest
+++ b/app-vim/vim-spell-en/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-en-20060123.tar.bz2 1819791 BLAKE2B 943265e3db6f0c47ed71381e12bcc23cc0f8636b40c5a694d49064a5f27a845b37810cc5468fcfcebbf9f37537ab574467fd6cc25a3e61966b2851d3d4353a34 SHA512 145a4cbf976b5472b2474f9d84978e9907f0dabdee05fa55b0b4ce5f56dc27ef568e8c28fe67d9d8b86a33e0392b1fc6af6f44d6f147ce894070b58e40109dc0
 EBUILD vim-spell-en-20060123-r1.ebuild 343 BLAKE2B 39b82e33d8b909aa8c47283e4f2bab756903ac0f48f5b0ec2dfb552411a92baeac9f590df719af54f6417a663255f7e15d9485aca0ca469315ddc8c59bbd9af4 SHA512 7c917329462c25c39b043e06c5eb7372fccd51dc6fc8c8af04319e9e003b1482a498ee2bd155516cab94e2d230d153b271f9dc8ccd73fc403b5538f809f009f7
-MISC metadata.xml 391 BLAKE2B 4a8585e7b3e3e7e6507b50f5d236d92f90e3bf8739940de0aea3298a845cb694d2a8df0239ab48f6aa7f2dc6145a9bf2c0efba1395fb81b03f53b34d776bb9e8 SHA512 365599ae6c6ab09d6efb59870c5a640cac2442fe1c3c584c94a4218baaeb4905540e9572e650ee808b15070e4860fa286224c5cd68dfd0bbc1de675113919425
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-en/metadata.xml b/app-vim/vim-spell-en/metadata.xml
index 2011f80d0660..5c000c763084 100644
--- a/app-vim/vim-spell-en/metadata.xml
+++ b/app-vim/vim-spell-en/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for English (en). Supported character sets are UTF-8,
-		latin-1 and ASCII.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-es/Manifest b/app-vim/vim-spell-es/Manifest
index 21f0cd635b51..239ef77658ad 100644
--- a/app-vim/vim-spell-es/Manifest
+++ b/app-vim/vim-spell-es/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-es-20060208.tar.bz2 2417510 BLAKE2B a10bde19d08b272576b06cc6c78234b1c6218b44eea9a16cbe3a43935f1f80f2910ebb04e5efdf85e55dfe510d9cf4943b027249b138d4cb37499c67b3d4ce55 SHA512 e035e587191eabc78672ff4cb72c637e8f582480c67ab79b93879de6791d09484108ddd213213186a0fef02869012d28d31793274a638ac7c87fe9e2aeeadec2
 EBUILD vim-spell-es-20060208-r1.ebuild 271 BLAKE2B 7f76e09acb97dad4fcfcd1e1a1b74242b8190e298dc7756d4b2541b78b69c136366834784d149e593eeed32127cf6374a14ecbdb1704234bcb165f3e4931005a SHA512 3fbec6df33ed0c804715a1b8cf3778d344a1c2ff062beafe8f6690bc8b0f22f85aa62ac728125c33e545277643fc018211702bcdf8a2c82fbb2fdd5db41859a7
-MISC metadata.xml 395 BLAKE2B 1ce23cc85056f6787000ae66a1254e10e44372b48f78790a990b886921349deecba27e2450d60e590f7265b0fc77298fee525f725798e01d4ba8c6bf3ca4cec8 SHA512 a495a85b7630e9f0849fd15c7a1d7809e547a2851c556771b79d56980621666d8eced0fad73cd6caba8a9405456b273dc7fd2161d4189dde25a679ded94aeaaa
+MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-vim/vim-spell-es/metadata.xml b/app-vim/vim-spell-es/metadata.xml
index b02d68b4342b..84f8f1cf6bcb 100644
--- a/app-vim/vim-spell-es/metadata.xml
+++ b/app-vim/vim-spell-es/metadata.xml
@@ -5,8 +5,4 @@
     <email>vim@gentoo.org</email>
     <name>Gentoo Vim Project</name>
   </maintainer>
-  <longdescription lang="en">
-    Vim spell files for Spanish (es). Supported character sets are UTF-8 and
-    latin1.
-  </longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-fr/Manifest b/app-vim/vim-spell-fr/Manifest
index 52f2f0620129..d347a42555be 100644
--- a/app-vim/vim-spell-fr/Manifest
+++ b/app-vim/vim-spell-fr/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-fr-20060121.tar.bz2 408587 BLAKE2B 9a3678b2aa4e8e7c9a4c56e0e856dc2892ef00c58c2442b196e257db11c63032bce4e69c934c47a9a91296cbb44bd2c3921ae191f4b982ff80c1532b313daeef SHA512 2f826751d450bae22aff918004e980fb3f9065fdf418bc0071510b8b0fa2d4bae3d4c9563231e4e6be8320a39018d8b2bee0ea06c6206c3b5a60b6c3d4db2575
 EBUILD vim-spell-fr-20060121-r1.ebuild 263 BLAKE2B 1c3cc0241c3071ab360006e44617ab56aa5f7a499c15cca5dce4b68c5d34b5b781def2def531af0890b4b562f8f93ce11f6b479e101f8b7c1fabea3a4cac9f54 SHA512 744a8f2787325054c15f5552e3571392549c14673a40bc93ebd9de7aa704316fd8d57fb99779b4cf4c09424cfb1cf6f73f24f56321a46fc2dff456ffcb1d015e
-MISC metadata.xml 390 BLAKE2B 3b7b0c0100aea76040496fb026d8ad1ef851b61a8a06ed2183eb5bf72fa9120ea1a6f06be8538c5e7f61e9cad1f6caaa253b8ca079012233ab09b2cebe118d39 SHA512 8cf1056f85a5012b21bbd8607791a9c5924b30e7468e253dded8cadbf54e48b83c1d60d6e39a62b79cd443efd06cc30429ba06b4f0c3818a1627e9ccf1b2adc8
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-fr/metadata.xml b/app-vim/vim-spell-fr/metadata.xml
index 9664b0a03706..5c000c763084 100644
--- a/app-vim/vim-spell-fr/metadata.xml
+++ b/app-vim/vim-spell-fr/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for French (fr). Supported character sets are UTF-8,
-		latin-1 and ASCII.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-he/Manifest b/app-vim/vim-spell-he/Manifest
index 434b677a6727..d17e04c9e20f 100644
--- a/app-vim/vim-spell-he/Manifest
+++ b/app-vim/vim-spell-he/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-he-20100312.tar.bz2 177495 BLAKE2B d85d2fbd2d7b66c6d8bd1fa5447107f9411ef0bdf191eb8fc094d5de85abab39b22c83e6626e580ac722fe75ee807ba7d728eccad1941ea5d52e8190639d9697 SHA512 c6cb7c7eca7b842ceb0aa8b62e0afb215403004fb76d11ef2bfd55398657799e92dfc7d6ed3802008bd7f5bc3caf8cf15697fbfb64f935361c6958d26c7e5775
 EBUILD vim-spell-he-20100312-r1.ebuild 253 BLAKE2B 41f92dd04d16c566cbc919b87509b87c8d01f2570a833c6892685362ecd428a695e8c9a7b621ed3b4127d0996a9a5618a3177d9e56711fb22d2c26756c73db0b SHA512 ac9284a440a8777237dd0f94b2443ad711719004f19d4679ea12c8df9a3bd00a29cbbc0c208816ea3686b0c104e53f01356475707176c93705df62cd6c1757f5
-MISC metadata.xml 376 BLAKE2B cda25b90973d1eaf622ffba511191bf2038f41cdac97096ca3942321d586f0c44aac490e4342a435d8e4e88b4957af25c50c8ead1a2e68757a8b424dfe45bd48 SHA512 aa8a05990413c093f8e9b7ea7e99a8701a3127492362690cc9ab273a23a83ab71f113d03680fac4d23d65968fa48709740726ca6c73ae71f2afcf7437f74857c
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-he/metadata.xml b/app-vim/vim-spell-he/metadata.xml
index 22067f199f87..5c000c763084 100644
--- a/app-vim/vim-spell-he/metadata.xml
+++ b/app-vim/vim-spell-he/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription>
-		Vim spell files for Hebrew (he). Supported character sets are UTF-8 and
-		ISO-8859-8.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-hu/Manifest b/app-vim/vim-spell-hu/Manifest
index d8a9fdcf522d..c368d2723b0c 100644
--- a/app-vim/vim-spell-hu/Manifest
+++ b/app-vim/vim-spell-hu/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-hu-20100312.tar.bz2 2516564 BLAKE2B 34fba5a304a6761024312783b575cc6264ed82dcb132db514bac2d357e3c811ce9b3e953d572bd19cd190ef1578f14f91b09affb972250c35982624c9f6d8621 SHA512 44c94f84c3edd94020fdae430723b2e264113d29f5e295e6593274741ef094a8fe1dfa1d692cddc266f2cb3d58fa5601f80576d4ca55fd185c1213e983a3fb99
 EBUILD vim-spell-hu-20100312-r1.ebuild 256 BLAKE2B d068473605ce5343131ca9605aaf378e2caf2c6993a56b8442afd08ad49da9589021af2728255b3ebdfe9b04d4aa1ff9d6eb57f3856bad28debf1b4815e35f91 SHA512 84ef71dd81356e4a6060febb4dd483cfdb68715083ecb9d75e6d044264130496df25a41be9eb0e83d3f12a9e9f612cd92c8e0853dec8da60b82dc1df80f80111
-MISC metadata.xml 388 BLAKE2B 39e8cc1509905f5035aa99bbd75496fe59ae7074ce8d1c8239dda901a8c982aac645a9b1d760b16661d7840b15aa51df6ec0bffe802d40d5a6455c363d88ec16 SHA512 83b6bd49cfe90820c36e56f4b2e822ec58f7dcaca24c2194877f516f09ec82d460bf201d702468d74d9218e9bab19e42fe66ee9af49b8be5adbf54e590170179
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-hu/metadata.xml b/app-vim/vim-spell-hu/metadata.xml
index b6bfa7f4fd95..5c000c763084 100644
--- a/app-vim/vim-spell-hu/metadata.xml
+++ b/app-vim/vim-spell-hu/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription>
-		Vim spell files for Hungarian (hu). Supported character sets are UTF-8,
-		ISO-8859-2 and CP-1250.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-it/Manifest b/app-vim/vim-spell-it/Manifest
index 0a1901fff1ac..58dc3c4cc54a 100644
--- a/app-vim/vim-spell-it/Manifest
+++ b/app-vim/vim-spell-it/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-it-20100312.tar.bz2 874072 BLAKE2B 44f84ffccc7195345a0981e3de0506869db6414e83cf87b55d759ab54eac8633cb5049683ddd023c8b7272912b492e14cbbbb600af6556b725405ef6c8756c9f SHA512 7f215d65a798c64c33f38c52205f5c15ce132361d078eb0c48ea5058c97da21b25c24952b15a2737b6b8d1de1d5bb6fbbc880acb57834e6d00773ce97c80de5d
 EBUILD vim-spell-it-20100312-r1.ebuild 254 BLAKE2B a95d57d3f55cd5c87cb068e37c783e91381dc8e26894b151c8101a721b93d42930e4b482e91ab0acd627b1fc2a2488bb35ebc50f357906a93b37aefb3e7d49da SHA512 b119201093a06b330d68813e366bff0625ef95bc6b82915e88eb57fe6da28d7aedf7060ca9f2372935e42cfd56fdea50bba5b50d8c81cbebfc8ae7e4a68f45e5
-MISC metadata.xml 373 BLAKE2B af050e4ef54517b5319be6d2de77c42cdd4011f094d649e6717e7cd31945b28a77ca6ae4c3d058721d2ce94d477d47630caf68c8934f8671c1215d7c83dd8d8a SHA512 24301bc530f8b8d182f8a2ac5d0ba705e7d46af37f989a62e73ed46e08d32b2b36c7c4ba6a6308ae26b8c7a4502104664318e6546d5cf2bb2ba34b7c1d04bb30
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-it/metadata.xml b/app-vim/vim-spell-it/metadata.xml
index cd13f1a69e42..5c000c763084 100644
--- a/app-vim/vim-spell-it/metadata.xml
+++ b/app-vim/vim-spell-it/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription>
-		Vim spell files for Italian (it). Supported character sets are UTF-8 and
-		latin1.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-nl/Manifest b/app-vim/vim-spell-nl/Manifest
index 14dc1c6648c8..ba9765189f85 100644
--- a/app-vim/vim-spell-nl/Manifest
+++ b/app-vim/vim-spell-nl/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-nl-20051007.tar.bz2 670750 BLAKE2B c9597f3a5eeabd8550e1974d52720fa11b37ac29b3fa6e8fa5ad79a67ab945c25e07d1a546f6dd4aafec66664376fef7c94085cfbaef983352769df8af1bcd39 SHA512 5d62c84178c91e139516181e35c6e2802aaeb1897e70f50dcad93f7ad7efad1e9f983334bc7d3a3a3355e20a535c2e81096583a3ee11aab0f49698f4dee03c5e
 EBUILD vim-spell-nl-20051007-r1.ebuild 297 BLAKE2B c5e516c2d7a1ecf4e7cfe271e33e618c76f0d54ca84f960b02f1bf994cc36f207472b34d04607b1e4bbd7a785fe116c84f1a77a79ce99377534286fb654409d3 SHA512 9e462eb73ceab0a04942ccf4d801d5612fe41e08fbf32be6c4af8c5e41f39538877a20fc49b0f44fd9718565e6188b9ebe3f0dcc9ca7e26796476d42c5c3f39d
-MISC metadata.xml 383 BLAKE2B 1f7c4b912918c7d7b9bdfb700d094d612847cbedc808e0d24047355e5cc1607810a5bb3fb79c724332d781794c8187db4c5c8287695001df09e185a0df8fa0d1 SHA512 fc8b540bcdfff4d5eb72d82cefc763fe8186cf43be7a80057d7ea2942739fb665eac6694352eb3d46bc7ffb1a153dafee1f64e417ac09875c75244129c97c35a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-nl/metadata.xml b/app-vim/vim-spell-nl/metadata.xml
index 756e08e56d3e..5c000c763084 100644
--- a/app-vim/vim-spell-nl/metadata.xml
+++ b/app-vim/vim-spell-nl/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for Dutch (nl). Supported character sets are UTF-8,
-		and latin-1.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-pl/Manifest b/app-vim/vim-spell-pl/Manifest
index 379665edca74..973663655ae5 100644
--- a/app-vim/vim-spell-pl/Manifest
+++ b/app-vim/vim-spell-pl/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-pl-20060218.tar.bz2 1489524 BLAKE2B ca0fcea6fc9f876a896f80f572d734ea12299e57a1c3b861e24aa8f287a061a2f5f1351ac9f57177b3c2ccde00f3fedb8321749135ef1b03da23b9f7670a848f SHA512 a83900e0cf0702c70498bbf47c9db5048205d0a70ed8fcd7c984353987fa5a97334093cce7844ad639a80a910bdfa644302191d8f27d465af4a53bcaa42acde0
 EBUILD vim-spell-pl-20060218-r1.ebuild 270 BLAKE2B 694399ba1acaf6093006d1d6491713b259d65333006136d76e0b1bf5509a62e48687dc78e6c6e11b8bd9f4f616484edf7ae3898947111c3665c77291612f2ae3 SHA512 816a13ced155545d386d65a8551988074baa629721e88d8147dcd0eb10f55631a9d8e3353aa8c6e593faa8ad95968faab1e6dd9bc887bc31354b9ddb23793b51
-MISC metadata.xml 394 BLAKE2B 88a722af4733a7323ba8dc451a6869cbe4e8c45689cf0bd98234f140425a7d2c1b5790111620ad6cd88589d38ba24a33ecf466c4280273439b152a48c176d64e SHA512 a26bef5bdb42cda8e3f34937de3294d6c792ba8e575d2ab69b3b2e0caa2e9856e6de1f0a1453d08829fbc76f96c3babcdafc414737ec47c5b6672fe304d32c65
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-pl/metadata.xml b/app-vim/vim-spell-pl/metadata.xml
index 91a799e6df0a..5c000c763084 100644
--- a/app-vim/vim-spell-pl/metadata.xml
+++ b/app-vim/vim-spell-pl/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for Polish (pl). Supported character sets are UTF-8,
-		ISO-8859-2 and CP1250.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-pt/Manifest b/app-vim/vim-spell-pt/Manifest
index dba322ac2c5a..e4c0cd4233d3 100644
--- a/app-vim/vim-spell-pt/Manifest
+++ b/app-vim/vim-spell-pt/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-pt-20100312.tar.bz2 2018267 BLAKE2B 98875d8d7fa0bc1a0a2ef5f9cd2b2fd1d85f50236491c965055f6edf2220f06bf98669c497ff67458aeeafa77a19cfd034dd4200c9689fc40eb5d6806a9605c2 SHA512 0bd90524a4066f1b7d29ad85389557718cae5d3b6815a0037e2ca55987658278f0a1aa5e02614fc84a5862721a58404d8582d62ee6e8d15ef954e004481af49e
 EBUILD vim-spell-pt-20100312-r1.ebuild 274 BLAKE2B c70d29ec0550c295fa5a62075759ed42fdba60ed4578b109083cdaf664b1687b4a637329bf34968a8e113b5a9d04f00a02f4aeb1b7c2e35a62adfb2cff59e162 SHA512 889a0d5822a04da186f7c46aca8aac14ba29e47031c5dbd9a4095d5b40ed3fe6e66ae03f969a19176e1ef1bf2ecd99aa9488f5fa0da8b17be9c4b75fecf12cc0
-MISC metadata.xml 376 BLAKE2B 7a05f508873c90b43b6673f5f20cd95aa1fd209119c73b9560dc4a90f3e1a275e2d3a19a380cf0558887e2d4875296678ce7dedf4f0108057e9a2e021fd9e25b SHA512 da8126fd7b6d5a92d2c53dd678194071cb0b26d550a58ae2439a820be573b92fddca9522f0fe4d99724b0960aa7f2b9fa075589f44ad73bfe55741ece6d94340
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-pt/metadata.xml b/app-vim/vim-spell-pt/metadata.xml
index 8cf406951664..5c000c763084 100644
--- a/app-vim/vim-spell-pt/metadata.xml
+++ b/app-vim/vim-spell-pt/metadata.xml
@@ -5,8 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription>
-		Vim spell files for Portuguese (pt). Supported character sets are UTF-8
-		and latin1.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-vim/vim-spell-ru/Manifest b/app-vim/vim-spell-ru/Manifest
index c8f2ed305042..6429bd86cdeb 100644
--- a/app-vim/vim-spell-ru/Manifest
+++ b/app-vim/vim-spell-ru/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-ru-20070506.tar.bz2 7232867 BLAKE2B 7d2ffed642764ea9dde8464d1dd1135a24ff60b6279995a27e17b32e70fd3ed9bc0d8ad2f7864d6ffbbcef5f83c03ec01f9b59f9afd9dc9f2a35ef175c40c0d4 SHA512 268ff4c56299ed06e329c8342c3d9ec567278c8a8c0a90d56f6320052d7ee38b17b1724e0f8fbf72d616285a9d7ba3a8e7a1f5f4d78ff8bdc41c73655eebdf33
 EBUILD vim-spell-ru-20070506-r1.ebuild 289 BLAKE2B d552f171a2ea777873f46c00d5dfa0df6d8898e0be69dc880f73e155d67b835acdbcf71511e295dc40d888c24b1c99e232f63abcbf1d3215dfbae3a631869c67 SHA512 d14149ce7743ae908d56419c2897bb6c9b7b14547cff1f7854831bd5e5666143c0e2fadc8d268e262bc416c92c5adff6b4893bfead5853e3212e8ead8814d6ee
-MISC metadata.xml 645 BLAKE2B 7c27a6e05d833918d690715157f2cda87e95646a99ce50cfed9480c2a8c6c436fd7fe2c570b5f757aaffc8f8f1fed2f603b8c09f852ef87b00655d03516aea24 SHA512 dea1e29b3b235ccc9f3cbda4d057ed8bf77c7df394631f89095a674f17760f6b051738e9e2bc4db2d63b49d900a5a8f3db4447fb6feaa419b5b459c983fd3891
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-ru/metadata.xml b/app-vim/vim-spell-ru/metadata.xml
index 9575a80b2219..5c000c763084 100644
--- a/app-vim/vim-spell-ru/metadata.xml
+++ b/app-vim/vim-spell-ru/metadata.xml
@@ -5,12 +5,4 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Vim spell files for Russian (ru). Supported character sets are UTF-8,
-		koi8-r and cp1251.
-	</longdescription>
-	<longdescription lang="ru">
-		Файлы необходимые для проверки правописания Русского языка (ru) в vim'е.
-		Поддерживаемые кодировки UTF-8, koi8-r and cp1251.
-	</longdescription>
 </pkgmetadata>