gentoo auto-resync : 15:09:2023 - 04:49:10

author: V3n3RiX <venerix@koprulu.sector> 2023-09-15 04:49:10 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-09-15 04:49:10 +0100
commit: efca79f216bfeffd55e7731fbf24126d093e1084 (patch)
tree: f19ba31d8686b3de4192db3e4c4dc9f3d9af54b5
parent: ea7f3f690b55cdfa8b2d350b03c1dfc0c8357a51 (diff)
354 files changed, 2845 insertions, 866 deletions
diff --git a/Manifest b/Manifest
index ee24a78995c6..43b9388c7363 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29275 BLAKE2B 4b90fada7c1247a9cde0c16bed6c2acbb6679ecdffa9720e1d4866d32a330a8fdb2b751bc4b33910e072176a191ffb9178737bd7f2d6ae6fdf100df3efcdec73 SHA512 092c8fe6b65c61877d762c60749f6585342bf91719e1c76be9b86998dacaf9f3f86fb270189c15ec24797f79ddc18dd96495fc7a418f87aa69e0bc3fea0d461e
-TIMESTAMP 2023-09-14T21:09:57Z
+MANIFEST Manifest.files.gz 29284 BLAKE2B 55fa59b2c21b8d96bf1112edf0a6ca394ff97c9e5998730da400f002a84d8c153d5d001d4832764540cb6587cd22d934f892b6080b3434296b3dc61a2a67e311 SHA512 ecba1fdb2186863d8443856a65cac5c6364ebc80c2f622d3fda3c9e2553eb16206018c1fdeea71e4cc9a46c19784171c60b0e461c48cbc1de5ac9101eb36c6a1
+TIMESTAMP 2023-09-15T03:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDdqVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDywhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA1sA//ZFvjjPxQJrdIXCiyzSctvZVtTRO6dv6kTCAhIQCnlJDeAOmmdLmcpSUU
-Mz9Ih8mOReSBpw0NP2vcDaMwPC2xn8Xz2W0sXv2uTUHptstgloSTCRpNnzlAN4kN
-fT7vsiE/5UpdOtknFmJe8M+KBe8qfxkONAVt8Chb7GegNilfq0A15MHlCXOvmHuY
-Xo9wFoBi5vR98e9GIvVwdkav68qLr0h8dMrS2aEzJdrHGtpeLwzVcYrmeidLo7k3
-tlUuYvr57Q4V4PKH+c4fZDhkva/ii4uZVnAsoTRdpLpirpt23iZeC/Kcl8Jt9eJw
-eMLqhHsdjfw1ABLwsbhWXSAUWXXEt2le0HAcHtpW5yGdQWbK9Y5fw2qFkNgrn7XV
-LzDWwgMTtTV6X/xMybXOVA9cH81Pks+Rk67piKyPka6l17Ym7hTJFlnO1fozRfrG
-hQItezr8r3G3nZicJcofjz+b4PJumeEOheg9qVxIckfNKo1zcxLkW0N+htR16kPX
-DmNla2hEBPXkUrTfmwmwGddXiFUNxW42QDLurB49W/hbgI7EBotycYECdkVwYv43
-LktTmFKSSYlGs40xpeX9PIVECf/P1mEia6nhW41CKbaLk0iBqQQYA5UocdzTzoax
-jeb79KDBKZ5nJBv3nVm9GbyD8iPV9LiY3anooUdg97bSScO36pY=
-=T8JZ
+klAY8RAAmnyyBFzrS5hZWgbSaePPy5kyW3SfMPesLDeyG/8cuHqTQL7/DdDP2YU0
+nerGiUL5p1Gg9WA8R/NsOxNB6hOKz6qCa92FNZILw6yeofO9B3feuybb8Fks25wY
+I2Ck380q+8PJZhiEMxmFSkkkNvPCgQexstkfGlVTeDGQhZutZbfn60O7NM0BNM1t
+tEcXVaHjh8JmID9cTafd0Y35QayY7B1MYQlW2I+G7SdHoFibTHKP5CPS8GRGtejs
+qafhfufPCEYBAXCDUp8P1kiz7qaEBvciEUJDrsnGwWyCM5hUK13cYVBehxG8hLB5
+DahVQ+Rn5OWnWQDeK1idfGpB94RYoLajHMGsIgFZvZsSz93Mg69fKhRm3ojwxE/u
+O6rdRGJurDoSv+cYKkt7NL/xm4b+0I1SXFiXvf+abz2cTEull+blRSUNAHmyInRq
+//pAKbsDciRg8IEGKf1E4vO2+gX3QoKqFtvHcy0/yt+Mub+kQGDdpLYwTuZ1U9kj
+LWOH/BfauQpG7KoF2vyqL99iRFFJY2Uzac2py7yatxWVIvgMHgBtbVnLBPmFuA+X
+wFur+qUXLG1lhz92C9QA9ViHJYt24tpFouN5hJOUV5pVZvhviedsbDqbEEYIvoYn
+sNLpG88fpqrHh0uAbT34HRB2S20j+7L1VtNS9rRvP89H+8zBwkg=
+=upSh
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 480fa91e10d8..3d2bc7d38c7f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 08697d0a2ef7..698e0a6dba4a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index e742fc71136d..b25f8f1c4d5e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -7,6 +7,6 @@ DIST sudo-1.9.14p3.tar.gz 5232320 BLAKE2B 702d0c5489658dfd35c5a57977431343d29e6c
 DIST sudo-1.9.14p3.tar.gz.sig 566 BLAKE2B 61ea3ca0e6032ddabbfd7e5b56881f0e800b49eed0404738c1a28687160917a8ddde91378b915cb81c9576732629d398790eac31d300e536e117fa9bbf5b1f4a SHA512 e1723f589eb3b758bd7e7e0da158d21e9315976320f8d39159a97e801c9745768b42b7b16c697cdbb3917a3f3def0125acf868dc343b062834f9f0818d741608
 EBUILD sudo-1.9.13_p3-r1.ebuild 7466 BLAKE2B 6c880d950c1bc21c99e8e186b4602fc91b5511aa1bca7dcc1e21eeb93f39d8c802b7b5c1ddabc49ce9f42db9de05791c434574fb9bcca0a09868ca9135ef8db7 SHA512 4828c4aa791be701398466f7bf186321e6d1eca2eefa85142669ea6271563b566db334d2c77ad82746c0b36932b632e80a51bef861a222d55f6d0fd88c50b53e
 EBUILD sudo-1.9.14_p2.ebuild 7396 BLAKE2B 6d606110b6b40f981b71a7b3101be0edb44c95e86dcc0b9017d5825cb2c821c72fcace7f35a7b48ff58e57a7af9165dbb2eebb4b88b677bc693ded9faec367b2 SHA512 7105c5fe4180cc5fcd634cb6e4aef382e0b1993c03179ffcf32fc6508171540e5688987b5a7b8f119eca83f4b8825e57423e67939900ddb6046c6c716789c7ba
-EBUILD sudo-1.9.14_p3.ebuild 7399 BLAKE2B aeb24f1e01bd940e8c4a9ca003cbd996bf947976c029e46761b4144e6061fee86e3a92230451d0da4979ca9fbf2652935f829855fb4232fca66d89979174cb9c SHA512 5da9714dd5ea1b492997befe62b8a290652c37b883455e18409c1803712befa0c03f13b09dca7d89f2fbdf93b329663769fbf217496df218ba92e8f8c756096e
+EBUILD sudo-1.9.14_p3.ebuild 7398 BLAKE2B 8ff7609e8270b44690fe9e593473f4662c85fe696e4afae40d3b5a38d1184a3b9c4f06f2134c95c950feb7b6534a260e9efa23fc67490a5e235e9544681d8182 SHA512 b3a70ddd9f13ac5e2ddbfa798020174a97eaeec220ab1fac99716abd298d810954c0a58540e161df34a14e37ce40704bb97ef40fd2d25b971443e51a042c765a
 EBUILD sudo-9999.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.14_p3.ebuild b/app-admin/sudo/sudo-1.9.14_p3.ebuild
index 210962cb90bd..8aae967ffb70 100644
--- a/app-admin/sudo/sudo-1.9.14_p3.ebuild
+++ b/app-admin/sudo/sudo-1.9.14_p3.ebuild
@@ -33,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 765febbc628b..36e23fe2e64b 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index 2850778e7979..5465528de0bb 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -2,4 +2,5 @@ AUX alternate-2.18-hh-cc-alternation.patch 918 BLAKE2B 0362420f64fdd1607529842d9
 DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
 EBUILD alternate-2.18-r2.ebuild 995 BLAKE2B 96fdeff6a4d502b7c368643cdc3fd8388892003613908f7408b3cc8be896bba3911cd0e129b82006c678c1fb162dd6d197ebc67252d856e9f1cf59142319b720 SHA512 2f4e22cc32f3c1cb80edebcfebef3db3d133bb5f451e043d3d9c25d83f14b579883d0a408486d691d3ce0d4f6f10f54b2e96980c8a585f6226056ca6e66eb365
+EBUILD alternate-2.18-r3.ebuild 1000 BLAKE2B 9cca092871ee1e67a0175d6f89a5d014b58f124133b81de2d9f1766e9ed318933018a0c59fe8de021e3583d1468b09871ef1035ceb56a101f8aa5cdd0a658774 SHA512 48d3dd18a4e3c161971264f93bcc24774a6c8f39bf0b49bdc3ed8e35ee6693e8cac16efe339f0a1309bd9c1a405578a74682d62ee9fdc16d205537fe3b4d7c32
 MISC metadata.xml 332 BLAKE2B c54e6ef20fbf88e7ce67a793b3914a64dbd291129c186527a23412941ad882e492a4b10692bbacdc8b1718b15ce53e31057cf1237d264ba9259105143fb24468 SHA512 0e9f477bc091e9be6585d40eb298f24cba09b8adbf742915dc56ebe779c62863168327163004e462c5b0259cc6f0deef26d6a1c78d39d87f081845e3692bcbf5
diff --git a/app-vim/alternate/alternate-2.18-r3.ebuild b/app-vim/alternate/alternate-2.18-r3.ebuild
new file mode 100644
index 000000000000..7588fe2d8ab9
--- /dev/null
+++ b/app-vim/alternate/alternate-2.18-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: quickly switch between .c and .h files"
+HOMEPAGE="
+	https://github.com/vim-scripts/a.vim
+	https://www.vim.org/scripts/script.php?script_id=31"
+SRC_URI="
+	https://github.com/vim-scripts/a.vim/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt"
+S="${WORKDIR}/a.vim-${PV}"
+
+LICENSE="alternate"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a new :A command which will switch between a .c
+file and the associated .h file. There is also :AS to split windows and
+:AV to split windows vertiically."
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hh-cc-alternation.patch
+)
+
+src_prepare() {
+	default
+	mkdir -p "${S}/doc" || die
+	cp "${DISTDIR}/${PN}.txt" "${S}/doc" || die
+}
diff --git a/app-vim/bnf-syntax/Manifest b/app-vim/bnf-syntax/Manifest
index 37e759bc4008..21f5df5793af 100644
--- a/app-vim/bnf-syntax/Manifest
+++ b/app-vim/bnf-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST bnf-syntax-1.2.tar.bz2 887 BLAKE2B 11923f80153d760e92577e461fb912a13ea6ac1ab8c48b6371362d9f5e6ddacf520608626ecb2020f0bc043106241a818b53131be43c991720ae37df8ec40132 SHA512 e073866a8dd41bc0ab982e250bf2a803d78916dbdaafabe504a6854f67255fe4ed84a4db426f1cbde77c9b0a059070fda666338c53b6ddcc7e46f04d9f0265d6
 EBUILD bnf-syntax-1.2-r2.ebuild 555 BLAKE2B fbef88cbfb05b199a2b8c921f28727e09422843527a93690279bcd39ac9fc534a77e3fb4f3779b48bc81e19126dddf0d0cf4c00ae224f9f97d05fdd243182e9e SHA512 e5c795abc8b800d309df34e686c1c7325b4401cbc752ceb24cf4b8585d7e9eed12f4b5f44c0cd4fab444217323f2ec0c1e6eb46d2efc3b4bf67c02dd503ec60a
+EBUILD bnf-syntax-1.2-r3.ebuild 553 BLAKE2B c757a0d40d6ecbf194ca681f097859afeb59807d2caeb3b945a14529b9e5b4a8898c57cd930eb6b02cf84d964ba4470f11b991b37e4b02c0d8015f298c3fdeb5 SHA512 982f6d5639d374e1406a69593bf8d95647f53b9116d2095f03b1540a22d54a06f9d38c5cc8f0fc8c9a9e56452684cda2d2e028a3f078d9fe595993c954a4ef5f
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild b/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild
new file mode 100644
index 000000000000..8e08807acb05
--- /dev/null
+++ b/app-vim/bnf-syntax/bnf-syntax-1.2-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BNF file syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=250"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for BNF files."
+
+src_prepare() {
+	default
+	# fix hi link to use def, bug #101790.
+	sed -i -e 's,hi link,hi def link,g' syntax/bnf.vim || die "sed failed"
+}
diff --git a/app-vim/bufexplorer/Manifest b/app-vim/bufexplorer/Manifest
index 409618cd81fb..e27cd923e58f 100644
--- a/app-vim/bufexplorer/Manifest
+++ b/app-vim/bufexplorer/Manifest
@@ -1,4 +1,5 @@
 DIST bufexplorer-7.4.19.tar.gz 25679 BLAKE2B 814adb79fc196174a9915643a3617e3c324f963792a2706f59f35699289524d0b93e7337ec3697d03e3a98b9f15018d40dbf9c0d4f35d6cebde8ea6de4cf1b23 SHA512 d38bcb52a50cfcf6d0b66ca6f1290a6be53d5cee98b3d2d7a93e01b5ef904af53c6cc8256e667bdeeb23a58344f5d69838bb7b5d71d225a83d1e173b99344888
+DIST bufexplorer-7.4.25.tar.gz 26548 BLAKE2B fec01693a75a904fa056c268156cc475a694c39a0350e1365a4837e7f97b7b3c69de40e7a0bf7f55c19f8be3d576dc7672ecf74cd4092552182e378602795ba4 SHA512 5e90e5c1d7dc32b4a94a31e9a08d3be466fd8d000916385d2e8b6962df24ada713d2a3f7b8fb15ec0e3e7d4f5ab13954f4728d4956b99dfb7b5cf0bcf9e26022
 EBUILD bufexplorer-7.4.19.ebuild 444 BLAKE2B fd391756996afa118b82cce6cba18a49066ce56def48be44372e1aa7e67e60a2dc08c8ef2f93ce5017b72668d4788d606fe0860a0b3c9bf011cf4629030ae5dd SHA512 0554f2f8f3518c435533d045f9774850a437c8383f46f9f91cf37d33789a54b79c713f44219afde5113025169dfc43ad84a2fffc7b8c12fb6600348f78085769
-EBUILD bufexplorer-9999.ebuild 569 BLAKE2B 8ce5867845652e8b16207b4e033e85f51bac58a06f2704eb008ca48f086d4807f9f02f95fff232f2fb7c111140f91e4f54a73641bbcefa251649d33ad693979f SHA512 08b8393501eddcefc4f767956f9b4cdae8e706dfecba9b266e506a2f3f1795381e7e47cb2d6eea52967d68b15e5aafe478367386efa334e99891ca05d0127d70
+EBUILD bufexplorer-7.4.25.ebuild 483 BLAKE2B 31d763a301fb7d7ead658d6ac448c57a69a625a25a8b715a2c43f6f91838932af4107cdf830d9a35bdba0b12059a08ca2649d2a6086c71a505b3173a5fe40138 SHA512 17ef0f67a25c5caf892a8742c67a6ba8be6640796dee88075cdc72e01954f7003436f168882957a7c1ad0acfba58a8ecd01c2b3941ea96158ebc89e87c2ed3e7
 MISC metadata.xml 338 BLAKE2B 1f048a8446ff62013ddfbdc5ff33bb5f601217dc8613b92e68697cd419c25e244535b618492356ebf7058c544cacdb496fabe14e00e09fc505bf032940d4084d SHA512 dc558d6361db980d7d604a6602790cee0a618a1fdf3edf4fb51bf4b99b0227f22dd2cf3210deef34089b2f7cbaa492b8caf3b240570ebef18679e7c0eb4c9330
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.25.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.25.ebuild
new file mode 100644
index 000000000000..a16466d00d83
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-7.4.25.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="
+  https://www.vim.org/scripts/script.php?script_id=42
+  https://github.com/jlanzarotta/bufexplorer"
+SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-v.${PV}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/bufexplorer/bufexplorer-9999.ebuild b/app-vim/bufexplorer/bufexplorer-9999.ebuild
deleted file mode 100644
index 1af404d2cee6..000000000000
--- a/app-vim/bufexplorer/bufexplorer-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jlanzarotta/bufexplorer.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="vim plugin: easily browse vim buffers"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
-LICENSE="BSD"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/calendar/Manifest b/app-vim/calendar/Manifest
index 431409eddf70..0b5fa6c36186 100644
--- a/app-vim/calendar/Manifest
+++ b/app-vim/calendar/Manifest
@@ -1,3 +1,4 @@
 DIST calendar-2.9.tar.bz2 11070 BLAKE2B 9c137d6975f3978776e8739dfa0697a6fd9f1828c0903ec529008d6c272e2226418e7f175149f048feecd405235501a88967fd6fa4dc6413eabec4021d675bca SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07
 EBUILD calendar-2.9-r1.ebuild 317 BLAKE2B ff18c838ae0fb02963871931c9b820ddd6be4770edbe5e3104842305d0264360feb6fd84b897b3898c28dcc8b96b22cf545957ead046e5c468a579d91d12455b SHA512 47ed341fd029d23442a243d2d4d71eedeaf696a383daa55a21ff2d0f4a8be7f1105d09fef1d1fac4cc9df004812760c11e968327e72626fc5fd9bf334382bf00
+EBUILD calendar-2.9-r2.ebuild 321 BLAKE2B 461118ba8972735e344021378b3ba925ae643af025f2ed330e6efdb3781de560ed1032f72bde735789190ff9986944b7b9ea941818956e91820d00347bd8b991 SHA512 559ed6b87b6e159a149961c23bd12795f97f223cd7ba19f8d15771390114044bdc1dbb13666fd83274ea46a6e50d1239265daa51e3e70475ca438c10c3268479
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/calendar/calendar-2.9-r2.ebuild b/app-vim/calendar/calendar-2.9-r2.ebuild
new file mode 100644
index 000000000000..44b3e1cb9e36
--- /dev/null
+++ b/app-vim/calendar/calendar-2.9-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: calendar window"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=52"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/cctree/Manifest b/app-vim/cctree/Manifest
index 9500fc48cb9e..ee84781478b9 100644
--- a/app-vim/cctree/Manifest
+++ b/app-vim/cctree/Manifest
@@ -1,3 +1,4 @@
 DIST cctree-1.61.tar.bz2 23243 BLAKE2B ba39d476ed68109a614cf5f626a44010aaa7e6154edf0c05f87973c46d95957a46fa22e29d73b0d3d602bae78039fd0bf6ef356d94f6570e0cea205bb6335572 SHA512 9d29c573ef3cdcde1ec91ca34684c84c8beb3b89669654b1f9dafab928a11d8f1df77294af06c7612ba8aa7d65dfba69352f3f74dd11c98d22a300907d8a6b0e
 EBUILD cctree-1.61-r1.ebuild 804 BLAKE2B 5aaf44b8cbfcc0dee1470e55b2a946f796456707474c5ce433db2c6c4579ca31f04ff18b22e99cbb07d27115b9aa4224cbb606ab23694544b71f95f91789c252 SHA512 0eb287aa4d494e57248350888c311ebdb92dc4e86c3bb79b45da4e25fc9313dd115717a7f9e8522f254293ef64ef9446dd19689eff66a679798ebcf687b0aebc
+EBUILD cctree-1.61-r2.ebuild 796 BLAKE2B f2dd68b21fbe9676d94758098a5db5a337d153577f0a2919cedad47d7ee7d63d44b47edca5eed4b4032efb63e938bfaf85915a469fd5d9e8d6658f27088d0330 SHA512 ca4395ba5b80a342e012b44d862338c54ff7612cd5b1437e4a7cfdc3b5d158fcf54c7a507076cfa182dcd4515511a47f1525bc87fe24b9dbf939f6f3c25a0fb3
 MISC metadata.xml 333 BLAKE2B c02947972a5dce67e6ef8dd7a24fcae5c16f2a1359e0eabe699ac2c031889abfbe440b2bc897a126f5f2de4c5e4aaf8c0e7a4c4e5577a8679c0f8a00a4440d53 SHA512 b13d0108b1f4c8077a5d3f5a1e1d36c6a66f05da4f6e83df4f63e13ae9df957ce83a901eeabeb51a10eea5e2b729477e3dee047522c17f67e4d70c9bc93a0d98
diff --git a/app-vim/cctree/cctree-1.61-r2.ebuild b/app-vim/cctree/cctree-1.61-r2.ebuild
new file mode 100644
index 000000000000..5f3cc27fb666
--- /dev/null
+++ b/app-vim/cctree/cctree-1.61-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
+HOMEPAGE="https://sites.google.com/site/vimcctree/"
+
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-util/cscope"
+
+src_prepare() {
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	mkdir doc || die
+	sed -e '/" Name Of File/,/".\+Community/!d' -e 's/^" \?//' \
+		-e 's/\(Name Of File: \)\([^.]\+\)\.vim/\1*\L\2.txt*/' \
+		ftplugin/${PN}.vim > doc/${PN}.txt || die
+
+	default
+}
diff --git a/app-vim/closetag/Manifest b/app-vim/closetag/Manifest
index 1165c6283f14..0241f6a75f1b 100644
--- a/app-vim/closetag/Manifest
+++ b/app-vim/closetag/Manifest
@@ -1,3 +1,4 @@
 DIST closetag-0.9.1.tar.bz2 4717 BLAKE2B e5324bf5b6017d7a1116c3d9dafb24aeb3151dc772250282be6897d9032412e47e09e7841c70a0703baa0aeae549a6fc15ec1547c1babbea08adbfbe3568425b SHA512 67e10871c98716bf65c1c1f3e07cb65ebd158fb058ee4e51e189703a5848e5f35066fa492c9614703936add21fbb34a387e9cf4a82043d794f3abb62d6c3ff38
 EBUILD closetag-0.9.1-r1.ebuild 417 BLAKE2B f5c539f182965fa2909d734bc2d5abe08c703b667d8b713d106d58ff972977b1e150a38996da557b2d3da0e8c33698aa018dfab87483caef993d24bfb9de1ecc SHA512 0cffbc60d5316e1d2e83db8b51cc6d96910f90c7460a7b69618103b647d943b26764d31ab27875614d096199698e73c77daaee6260234b7cc894713b71f2d3fc
+EBUILD closetag-0.9.1-r2.ebuild 413 BLAKE2B 1f45410f35da6ebdb2f373887e64f545f171202d1db495ee20ccadd64baa85d1a6aab4ec72d3a05e8440f5ccc1569b28a393719d19c4ab6e385160b032f5c724 SHA512 1dfc5b027c8c2125b03a52d3daabf94546111249b9721069fbd88927ede64ff0f108e3c14a4e13d96b0cd154c80230785bd6f0603e45957f3128e898698a68c7
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/closetag/closetag-0.9.1-r2.ebuild b/app-vim/closetag/closetag-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..d3cf6bc2e000
--- /dev/null
+++ b/app-vim/closetag/closetag-0.9.1-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: close HTML/XML tags quickly"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=13"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a <ctrl-_> mapping for closing HTML / XML tags."
diff --git a/app-vim/cmdalias/Manifest b/app-vim/cmdalias/Manifest
index eb07bbfe274e..a1acc817ece9 100644
--- a/app-vim/cmdalias/Manifest
+++ b/app-vim/cmdalias/Manifest
@@ -1,3 +1,4 @@
 DIST cmdalias-3.0.tar.bz2 2601 BLAKE2B 89b36b2bd638dbdc454739e1f9a3cd61715faa5c392bf3a85c937a0ec179f4e35485ac3137fdb84c2d66ba235e44af84d1ce42ca7e8f212438e88eb91f691570 SHA512 a29b8b588c662ca48e8208422e4592e4d2a2908f23ed123b0b2aa639e6c05725dcc6ee0179418dbfdc39108953de064f5da5eec4261f7e9db5efea0d91fe58aa
 EBUILD cmdalias-3.0-r1.ebuild 441 BLAKE2B 7b1ef147bace1db80c8e7235b6d09ccb5b81b6fa20a610178277d2636b6f4b3084b842976667f462ce7169b033ec0b7592ed19df62ea07314e72f9a8a181bcfb SHA512 33c186706c0109d5719ff8d676175decafcb7f0ce23640239c5e9642381cc06558029a400a5cd6c38be720d6e9d0027d3290061854cc73ab38cdd0ef24e3c145
+EBUILD cmdalias-3.0-r2.ebuild 438 BLAKE2B 3e655c111060f35d69a0f871034dc3cc7b64e9b61f51c0bef788a70d85bbe9d0962d25ec1787d4b90e00944d8858b4a4940957e6eb3f72b3ae4e0bae1011f732 SHA512 83f68dcb89a3384ae63243b5deeec20a837039bf397566e076ba18c4ed78ccb99df0b1f0072c8993a7a6bd87d3aebffd772bd48bf2815be20e118c79d065f140
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/cmdalias/cmdalias-3.0-r2.ebuild b/app-vim/cmdalias/cmdalias-3.0-r2.ebuild
new file mode 100644
index 000000000000..ad85aa02aab7
--- /dev/null
+++ b/app-vim/cmdalias/cmdalias-3.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for alias creation"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=746"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
index 91343b873330..0283f87cfbc4 100644
--- a/app-vim/csound-syntax/Manifest
+++ b/app-vim/csound-syntax/Manifest
@@ -1,4 +1,5 @@
 AUX csound-syntax-doc.patch 388 BLAKE2B ec94940f41e3e9b891f4d70488bfc17b00e8f95a8efa989bb040261ccee8fca60b21e1a6f80c5b9189473ea73a46b3fb1f30d6f384607a97db89cf2d7c51aeb5 SHA512 a05e5bdb3165bdb3c86fd963e9767eaaca7c7047dffd73d239fa58248ad24f78667ebea6106777123ea1e366ba4c72387b5765ead760acbfc881d581691920bc
 DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
-EBUILD csound-syntax-20160804.ebuild 360 BLAKE2B 9fc9921f35051d80a81d321315e6e94f3f95590d29f7427f37bc313682ab10b31fe6edb0421a97f7ea2d7699912ddf0eaf52f74aef9c99912f017e87c4ce36af SHA512 b65b7f1f086554d25f46e1f21dde5aa6d228735ed470c30ab6b2f284b516de3d834814500a0ae14a961db06961d420022fe003404c2d1ffc0efda9aa75e185ad
+EBUILD csound-syntax-20160804-r1.ebuild 367 BLAKE2B 895fbf3a1f6edd7abddc051e674689801f661ab1ded54b79e515ef194af8e0b884a08598acdff739743c02efaca8cc901fe9005091e5accbc20397b0a9d86be8 SHA512 52ab505a63970eba67ad776430c7b154bc38c1bcef9a2e390e1b6fa7d8d69383b273effe3a6de5fabadb5ba8d508be95f9687f8411c17dd57a03d1c6be6f4c8a
+EBUILD csound-syntax-20160804.ebuild 365 BLAKE2B d3711e677e8c34c70e7a15b4ec303558f0f261c5b94e567251c986e9e3ff5acf570806295c1e1842a7c9322ff8ef88478eb1e0b13071a6de0fa48eb5b8e62e23 SHA512 738f9e812b0efd0846127cdbbb08b278c2b32023c315a4e08d905d37519fee35ba9a69de2ea992dea13c88396f4f3209542645e44b355b259f365e8ccc57f884
 MISC metadata.xml 330 BLAKE2B 1dbf9776a5ac0cc2a4ff1f40f121d405d3122f453c23a4c2b794606ba87ad9d9f6b1bf6dfcb2f0def4696bcd3a46317825e187dd23b98bb88edf90aa2e10c46b SHA512 c6e324c27a076e931d8ca121334cf45cd9f0abb71bd01708844d831121432d7d5d0e84a3db408f9b2290b89f9af03918d2777bde0d93c4ac4e975627f5c9931e
diff --git a/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild b/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild
new file mode 100644
index 000000000000..5da0b220f740
--- /dev/null
+++ b/app-vim/csound-syntax/csound-syntax-20160804-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
+HOMEPAGE="https://github.com/luisjure/csound-vim"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-doc.patch" )
diff --git a/app-vim/csound-syntax/csound-syntax-20160804.ebuild b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
index bc9c952892c7..b7f2b810a8fa 100644
--- a/app-vim/csound-syntax/csound-syntax-20160804.ebuild
+++ b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,8 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
-HOMEPAGE="https://github.com/luisjure/csound"
+HOMEPAGE="https://github.com/luisjure/csound-vim"
+
 LICENSE="MIT"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/csscomplete/Manifest b/app-vim/csscomplete/Manifest
index 96a5eec5c660..ec1bd0050398 100644
--- a/app-vim/csscomplete/Manifest
+++ b/app-vim/csscomplete/Manifest
@@ -1,3 +1,4 @@
 DIST csscomplete-1.0.tar.gz 16621 BLAKE2B d05f7f781fdbb26f1672ab47dc01345be3fd78a3cf57e7f746453fd437f1b387a24969fb3de7cb23163abe098a670cc36ac989e2a1285de6c7499ec41ea59a0e SHA512 adbc2634534c3f0f8b3ea2389950d37540a2f5c7b4756e428cf50d6086fef5706aa5cde9b3cfd1fa87a9b6f07fddb26be75bf32f7ffc4193d5f0813dccf84c0b
+EBUILD csscomplete-1.0-r1.ebuild 440 BLAKE2B e3cb14bd45e1a07163777d0e961c82752fb63bea7af814b7d81b831214b589ca43f2df7c85b34504171377c0b48f4bef994f3db32cbff3fb6a1a8d4c0266a9b4 SHA512 0fe2bbce32ff30394030b70846d99611f6662d97ee83a3a2eedbee864d303d035987d181d38c6689e23e3d6328f4640e43460e3be66d37abebc6caf398840c2d
 EBUILD csscomplete-1.0.ebuild 462 BLAKE2B 4a234b63f98bfcb4356e0d6295db28e6f33cfafc9caa1eec5c65c84c0b3876c33a1df5799a043d048726eb4f7bbc85c604780a08f24900a1f9e8ce8f7f220136 SHA512 bd65d4b3655cd194b29c9d8a337a00bb4079aa29799dfaeccd435ddadce0d75f1e6a45a9c5bbef2bba2c4965cddb7160a36399d88743d2d358b5ecae970cc162
 MISC metadata.xml 432 BLAKE2B b69d23f26e33c438510a8b9e3758258863393678971be387530f3fde369ef7757686aafc93c7847137662fde6f5fe3f5e9bbff9995ae1528d0dbe028a2016e72 SHA512 be8823a80fabf1f587cb58e0852e6130577c9d2702d0f7653a3d093e2c9a17af007a22c370529823a76824e1a5ffb008ea2868e532dd9dc7d690c93d45c1208b
diff --git a/app-vim/csscomplete/csscomplete-1.0-r1.ebuild b/app-vim/csscomplete/csscomplete-1.0-r1.ebuild
new file mode 100644
index 000000000000..148ed99b34e9
--- /dev/null
+++ b/app-vim/csscomplete/csscomplete-1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CSS 3 omni complete function"
+HOMEPAGE="https://github.com/othree/csscomplete.vim"
+SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+LICENSE="vim.org"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+src_compile() {
+	:;
+}
diff --git a/app-vim/csv/Manifest b/app-vim/csv/Manifest
index 15bbc98e3890..016f1a294e2b 100644
--- a/app-vim/csv/Manifest
+++ b/app-vim/csv/Manifest
@@ -1,3 +1,4 @@
 DIST csv-0.31.tar.bz2 38537 BLAKE2B cc148b084b6b139646b4bbb0a907830b02343e3ed6f55cab0c7f0864124705df31c71e2eee976b5bad340400e033e9da303f9c1e972185dca2164701ecf38ae8 SHA512 1d0716765e3268e20ef7b2ed822e7322febbe2c9e9b775e79a2628c4641f157084b6b24d999b051657881acaee5ae8dd36a558ef31e5985bf7bf14ac894d5677
 EBUILD csv-0.31-r1.ebuild 325 BLAKE2B c552086da2673808ec74f62635d10d20346c37d9836884edb91cbd01887a7707a502cd6e11525b031b1364d2b4beb6463c99d21472813d77f0c656a1e1a14003 SHA512 9ef6f9f5e85cf6a9104913824a2bbcebff63ee51ce4f58089e44a4d792c46e70deb721b3b0b0edc78a1f5fc5584576824fe859e5a8546058bedcf1f9d39f7cfd
+EBUILD csv-0.31-r2.ebuild 325 BLAKE2B 70ca2aa78a4c8ee678e0dfcc01f33f392849f31491b77aa20b7d09efafc636d3f51901f90169a4623c24cdfaf83b1c518570f02049d63a1f450cd4af36bd450b SHA512 de8e63e2b9687ff509f9e9eec07e4b89ee45cf606d8014629197805f16be0ee41ad0811bf29dbc50582400c4fa7e8a1fe66020c24480be5a3f25550a52e96a3c
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/csv/csv-0.31-r2.ebuild b/app-vim/csv/csv-0.31-r2.ebuild
new file mode 100644
index 000000000000..b66e0423a79c
--- /dev/null
+++ b/app-vim/csv/csv-0.31-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display and alter csv files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2830"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="ft-csv.txt"
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
index 6e2ed5e85c73..c1d8ccfa720c 100644
--- a/app-vim/ctrlp/Manifest
+++ b/app-vim/ctrlp/Manifest
@@ -1,3 +1,4 @@
 DIST ctrlp-1.80_p20180418.tar.gz 76376 BLAKE2B 2ae3e85eac29bb07bfafcc60b879b506b57b7874ee9798d4fc0e420e06283ceca4cfe4d282fb9552c1971db48de25dc8df03d3e20d85ae1bbfc72f1162cc1fba SHA512 08a566087e0be0496c3dd1d60e24d65421b7fc758c95d3959181293502dd1e3581066bebea58cc1ef85f2a7cba76b45eee2e5ff2c522e27523ea31bebe4a36d5
+EBUILD ctrlp-1.80_p20180418-r1.ebuild 539 BLAKE2B 7d6d616eacd82e4dea7e8c0e75e632cd2fea872145938e7535b79359613261b9797d19d4beb91f11511fdbac570e7c76b19a02b4ffc3abf06064b98b83fb9ba8 SHA512 c48a91b98350de3d44d305a7b7da1f907e03db19b5a5f0429d305137a0bbd175e2e8727aaf831f805c10aed17f4d00329fbcd7cb59a35ea59f800d22c64bbec5
 EBUILD ctrlp-1.80_p20180418.ebuild 536 BLAKE2B 5cf16efcc11ed2154e4e6fc4a05c2093aa05dcc26595a3883f5438850750f4d64dacee6f555bdfdcccd1bf9b606b6c1fa2a414a91d4a20fba35088ab06ff3f99 SHA512 7a2b87e55f6e9d6109b6f4d0c1678eac47eec87aafed9a1d0c65562a8bf5d2b0a61f5cf5a3c553b0d9a23b19c77ea1cc82ec0b04711a6ea0ab223daf137a95f5
 MISC metadata.xml 339 BLAKE2B 710de3e33829b4786f7edfda6e5e6ffbfb5790832c5d5ae125e219628925112b5f8588d012bd734057a88e4d60b42672419e44161e8a75d2015f9fdba169f7d9 SHA512 e8ae7a6d0a98c4d73a8b9ee1b4fa36f8f203663ec1e3f6a309a34d17487b60ed7ffe4e0178c12ea1a4b384cf9003f2c1538f560e5ebc5a937ad951db5c420338
diff --git a/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild b/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild
new file mode 100644
index 000000000000..83360a00f25b
--- /dev/null
+++ b/app-vim/ctrlp/ctrlp-1.80_p20180418-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 18 Apr 2018
+COMMIT="4b9e7cac612902a25498cca49f13475fe1a821a4"
+
+DESCRIPTION="vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support"
+HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
+SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DOCS=( readme.md )
diff --git a/app-vim/curcmdmode/Manifest b/app-vim/curcmdmode/Manifest
index 8ac333519673..e467d62553d9 100644
--- a/app-vim/curcmdmode/Manifest
+++ b/app-vim/curcmdmode/Manifest
@@ -1,3 +1,4 @@
 DIST curcmdmode-1.0.tar.bz2 3566 BLAKE2B 138c7b9b84d69a40df731dc633dd7b7e2b2859af70d8418a5760a7b6016dd61f3401bd7bd1bb7854e500c744cabb8f0c65a89fe2ee37ffbe0a3117909c232491 SHA512 eae4e7cc92ae3838ffbdb507fd51174daf2fcd05d23f418555ac9ea3dde5562e49c67ee7b27dfcf6bf2088dd335ca97165835919dd804a86fca581b4d6bc0ea2
 EBUILD curcmdmode-1.0-r1.ebuild 486 BLAKE2B 32e11dc24bc17d1c51a2d6f8b9f3ec8cdbe279e14abb09671628f53aa099c5ca7eac7900bf90cf07943cd315791c3e1a800a478ff613b116f740cb8a0dc65a67 SHA512 8bde9866683542c0a61afc2acef05a11a48b24b16ff587dc1b20975d25e8e40fe7e065ba335bd702e7dc0b4622e3812438c86af0d892140ab6c433cc0b7dac23
+EBUILD curcmdmode-1.0-r2.ebuild 483 BLAKE2B 00a1814064d091c54793d0097be7626706931e290b13e41efebd50c5041ea59824d46aed7edd6ee5abe037bed35e546976c1b2fe28cb3409167414817499a8d3 SHA512 5caa62440a08bb356bd786d67f3426cbbedb08038b7a67c84fe0b63e35224940d5c90cce4cd44f072081e3de2db16add0511313c8f2fd49961217b486c3d3bcc
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild b/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild
new file mode 100644
index 000000000000..73c3b850195f
--- /dev/null
+++ b/app-vim/curcmdmode/curcmdmode-1.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for extending vim's mode() function"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=745"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="app-vim/genutils"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/cvsmenu/Manifest b/app-vim/cvsmenu/Manifest
index 9911d59065d7..b1c590a0b2fb 100644
--- a/app-vim/cvsmenu/Manifest
+++ b/app-vim/cvsmenu/Manifest
@@ -1,3 +1,4 @@
 DIST cvsmenu-1.147.tar.bz2 16440 BLAKE2B 509b5240232b8bc2770a49e9b7814ce5783114108d22f2ae80de04c19ff037fed7c76479b3c783407c753c5d7b7f58a51df455dc4e9f7d4472e607d8b1e3f5d1 SHA512 ca25c4b6d50d0d82ce179a76a8993b1a7a5ef72d032639ec9cf16fbdeafd87eddf7f89214fa8d370d330f5f7501e1265f1c5635153cc387e23191ab81ce56c8b
 EBUILD cvsmenu-1.147-r1.ebuild 480 BLAKE2B 88e2005a772fdbd4f2e77fe4a71661aaa8f3da768d78a298563e99949e9afc49d918efab4c79439908e01fa3552b75682f201f4843b7184b6f9d303edf23db2b SHA512 30cf8e0e0aafe85c21b8fd745ab9179b45e016f1df6167738493d7c56a912cdb723c982dd22e1ffa72c7445cea653d5ba70db019f69d55821877fe3892f6754e
+EBUILD cvsmenu-1.147-r2.ebuild 473 BLAKE2B a4d7b5b74839d782f9abc662a397d0cec8f8555e8b62b0d141125a7bf716024d1cd3f969fd70228bd9554b432f02217f000ee0c4ffa91eae6316ce1c71c25a75 SHA512 267e068b90d524348f5388bc75de76a2165e1b1c9c53663bf9bca3482937354992b29a60297d123fd1ea305fcd7e0cbb2b101be5ae658ade310aee4458d97a64
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild b/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild
new file mode 100644
index 000000000000..93ff89281d19
--- /dev/null
+++ b/app-vim/cvsmenu/cvsmenu-1.147-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CVS(NT) integration script"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1245"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Note, this comes from CVS on sf.net
+# http://ezytools.cvs.sourceforge.net/*checkout*/ezytools/VimTools/cvsmenu.txt
+VIM_PLUGIN_HELPFILES="cvsmenu.txt"
+
+RDEPEND="dev-vcs/cvs"
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
index b965752dffaf..dc4ffea5d44f 100644
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@@ -1,3 +1,4 @@
 DIST dbext-26.00.tar.bz2 109724 BLAKE2B 01f1378514836ac43cbdf9ca6087377ce83118b95fba04d530854a268f22dc2dc78a5f163c75c35ed9bf76514b3889c5f420b704f105dbd88bffc17f3d3c1bd3 SHA512 02d0f75443d91d32f8a6423712fb7eebde7659b986fcca2ddfef6458a5fd5caea3c73ba21ecd7a0fd57793f0a6fbc71d81c2ee6db3b82a9d98fd84572b1df18b
+EBUILD dbext-26.00-r1.ebuild 334 BLAKE2B 1df9a000a515a384a6ecdc17cf0067c757bbab0ef61227662eb4a804d5ec69710c00be99bca710ff804fb351e6f6920c99da26506c0de48b4c8a365b6182cd29 SHA512 c8bb69d3b4367100f9f7b8e7b0b5f83aa47af9872d0e4cb5a0ccc6c3b972f60d541ae41a55c8689f6e05dabf4d5c7d6fb6d0edc1cef104ed242abe86af76e5df
 EBUILD dbext-26.00.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/dbext/dbext-26.00-r1.ebuild b/app-vim/dbext/dbext-26.00-r1.ebuild
new file mode 100644
index 000000000000..21bb9268b3c9
--- /dev/null
+++ b/app-vim/dbext/dbext-26.00-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy access to databases"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index 0213898fc5bb..dfa8bd9796fd 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,4 +1,5 @@
 AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
 DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
 EBUILD dhcpd-syntax-20030825-r1.ebuild 507 BLAKE2B b697110484076e0f9836fae5b64a5cd19eadba6902b669037b82a577abe434e38135e09c2e27b813391bbe35b08e576fc4db1dcb84e020c10b44d86cc5c2b34a SHA512 646c2d19dd82b9d2b0577162b5df93959519a88e53e2c3e75ec6cf45f29cec757884ac24829b706d1a8990d0e4beaf39f414a259a867e476440312ff0110d53d
+EBUILD dhcpd-syntax-20030825-r2.ebuild 517 BLAKE2B a8c1643ba02b62cfbc3fcdbb3ad36d4252e03c55512024867817839db0a5e6cf4d0daa74d0758e4304783dfc98ae61ff29ffa0c9d490ed75fc7007e5c33e9759 SHA512 6e9c0e525442b58ee80873f8504c9568d17a6c967508370c3b8408513ca89b5a8fd72a5a99b90c1be98ccd5b84093d548332743cc2069fa495d0adf61012bd53
 MISC metadata.xml 452 BLAKE2B cfd0bc494a065a27c24589f6b815b0377f597bf10863652e52ca37faa6e9004637a86c7d0fc68231cf99445a5df67763d33ec22edd563c7e4f902d611b0e2f9b SHA512 34cfab0ef96a5719c51d2b2f5881ca643672bc38abc70bbdd1556f3d10a6eb188ce1ac24654e5542d98837cc60aede9fb024d6b9cdae15b9de2f9ecae1194c3b
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild
new file mode 100644
index 000000000000..52fbd526f0ae
--- /dev/null
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
+
+PATCHES=( "${FILESDIR}"/"${P}"-multiple-addresses.patch )
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
index e14deb29bca4..4085e0cfa822 100644
--- a/app-vim/dirdiff/Manifest
+++ b/app-vim/dirdiff/Manifest
@@ -1,3 +1,4 @@
 DIST dirdiff-1.1.5.tar.bz2 11131 BLAKE2B 17a7adaa67f90c2e23ada8a53b10c5b50db3039bb17b7a32797870072b1b06ff14cc8b1b41106d0eadbfc9ac4dfabf1bb4e925a39ca2ab2a8b4444e64d7acc66 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87
 EBUILD dirdiff-1.1.5-r1.ebuild 365 BLAKE2B 0796cb8b400c02bf77fbb12f6d3f619abc54624c8b84088a444b7de517028ff21cda6f0f89475367132e6d8c3766f1be2a971d7df465e2f84ee0b8ccabd807b0 SHA512 ca1f498b21d711495d171008a0976bae20563f3c461b284023755f9c377f52d07d759700adddc6d3df8e8af924be93816a7c84af709abae2e16351169fc06581
+EBUILD dirdiff-1.1.5-r2.ebuild 368 BLAKE2B fdb3d3dd32163dd9f08f0e62bb69f771c6915a159a8af343d41b7a855db941e82f75a2de93f7d32f758305cf17aceac50ef987e1db1442e4c31853bd28d624cd SHA512 39694c92aca0e235a7382f73bde6f643c88fd444cd36c891b98ac06bb2b6186373099085f6890d1babdfaf8fd34ab43c3e033f97e0b838a34b8cf07b56f93266
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild b/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..29ba9cdc2dc2
--- /dev/null
+++ b/app-vim/dirdiff/dirdiff-1.1.5-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: diff and merge two directories recursively"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=102"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-apps/diffutils"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/easy-align/Manifest b/app-vim/easy-align/Manifest
index 83d6b476b62a..83d1e829d9a2 100644
--- a/app-vim/easy-align/Manifest
+++ b/app-vim/easy-align/Manifest
@@ -1,3 +1,4 @@
 DIST easy-align-2.10.0.tar.gz 20056 BLAKE2B 3319cfc84147a3cfb0c7109dbb9116c94b734da528623944e2546667ac45e5d912e404c8c94df963002e7789760ba8fa7023e98cf22c1201bedbe8f667b1d13d SHA512 4a6a46db96b78d830fc0191b77b2226e9c1a2de585b731d1997f69ee31c8c76038ceb14f18e13f30fee00b5ce9ca7aed4241db06cac303b8ae903a856e4baabd
 EBUILD easy-align-2.10.0-r1.ebuild 557 BLAKE2B d939303b32c8172c73517c55e829195404a872b77fdb8cf7c8715a80a08ef378a6e4ace0aff893e71ddb32cdfdc0b4aed110405192a078083aefd08b2cd19db9 SHA512 dabb5b12dee983d13187c4aa70b159476a9fa907cac74fae76e066d0b6edc4337fc20834b1cd2ec66db601c0faeebf5889135354e9834c234360883e144c68d2
+EBUILD easy-align-2.10.0-r2.ebuild 565 BLAKE2B 4b2560ae2e840ebf9e7a26f7bf06ffac1161baf2041a61601a8f1c8b19d993548cc76837a0cc1ad75adcf170c83b0949e32c4fb3a72f0b2889306b80c6a07914 SHA512 f65d7f2199bef3e661a414a9a5c505bf09184255aea806ccf24d9e6bb66be45cd9851c48ca6f0a52c4a98d1038cea8b0b090cf8a9a1efbb4f8e5d001260547f2
 MISC metadata.xml 348 BLAKE2B 97e42b8671b9bbab3c14e206d26658b784826a5100bcebcdf9bb2a62b2d98a3882bcac7871c4e1a6d56ba0b93679adebde4e4e61ea04457635c7f8e2e0781223 SHA512 1b10b0b775d94f63d0a54960c8fe31c9e4997949c6774fa97e1439cc12abc756ec77f793aa211812af9a2848b6605ccb16c273507d3348d643bca4223c862d61
diff --git a/app-vim/easy-align/easy-align-2.10.0-r2.ebuild b/app-vim/easy-align/easy-align-2.10.0-r2.ebuild
new file mode 100644
index 000000000000..05c1978fbbdc
--- /dev/null
+++ b/app-vim/easy-align/easy-align-2.10.0-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="vim-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: a simple alignment plugin"
+HOMEPAGE="https://github.com/junegunn/vim-easy-align
+	https://www.vim.org/scripts/script.php?script_id=4520"
+SRC_URI="https://github.com/junegunn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+	rm -rv test || die
+}
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
index bf0f8d12f2e2..03a432e9f1a4 100644
--- a/app-vim/ebnf-syntax/Manifest
+++ b/app-vim/ebnf-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST ebnf-syntax-1.1.tar.bz2 981 BLAKE2B 5ab1916fc909f8b6b4fc139fd34c5c982f2bfac3f4ccfa53f13945787db6b9c6b5531cb805d4a0feea5f3165259cd3a033951fd9074344e62657e067571e5300 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083
 EBUILD ebnf-syntax-1.1-r2.ebuild 581 BLAKE2B 0b6933ab5ecd0c7935717df68050288240342240ec53483882db356077c19b33f7712739c1042299bb75451302e0928e1f0ec656b76d483bae4f6b02314de275 SHA512 7b2f8c953d6bede17b69d26fbfaaa52a099d32695b36593f4da931a225e195945836e120556552718fd9bce356f04ba9d8f09b47f0717856ccfee07e30071615
+EBUILD ebnf-syntax-1.1-r3.ebuild 579 BLAKE2B ad319147fa4fd1f68c04389b325dfcef3532e97bc69eaf058fa488f66ca365f8f15683a6e4aae3d8205dcc80f14bb5bce406554053ac6b964a266ac2d5980f71 SHA512 a7074684e79a323443bb45407ee2f04ced8fcf1b2c56b8708080651255e9cb5e52239080e2f954e34505bab71311b152ede54c9d6e93bb33a6efefc3f05457ff
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild
new file mode 100644
index 000000000000..c657db10f5a8
--- /dev/null
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=545"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
+
+src_prepare() {
+	default
+
+	# don't use hi link, bug #101799.
+	sed -i -e 's,hi link,hi def link,' syntax/ebnf.vim || die "sed failed"
+}
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
index de4a4838d7a2..5ae9499fda93 100644
--- a/app-vim/emmet/Manifest
+++ b/app-vim/emmet/Manifest
@@ -1,4 +1,4 @@
 DIST emmet-0.85.tar.bz2 31274 BLAKE2B ffba1130c7c51144524a9da6f1477f1c836b7f16b19c669050139540beaf933382b62a4a7784cf4e90703b153f53e2da8416126f606c6fd572e73efe7b09e9b4 SHA512 567f79c43ac0d5560dea2130e6fb6d32f25d35b20c3bbf8fc40b7cdc8c20e2d9352b9e1c03e57de2077ac192915ab174a6bee442d5311f01cc79c3fe6e10af56
 EBUILD emmet-0.85-r1.ebuild 375 BLAKE2B d44eed4306f223fc2301cd8d32ce89851d16fbd116bad66181c8bd733d824c184442a2e25920e1b5fdd981c9064578d3488f0ef24e4b4d8cc395ae6718c7b323 SHA512 9afe6bbc7f2a81f9602b8bc1379eb321b06f420c0ef36f67cab4494dd7a63c66d400a5cb9c62a8e3f9e691e3b30e35d48d11357d60af9c3e5203177847fd310a
-EBUILD emmet-9999.ebuild 360 BLAKE2B f5aec8ce781ac38df2bd22ac221af1ef7ab0391c18ddae49eabb4f6eda16948afe29a6ca45617b69bd9e1b5a43e9453954619d6e3c827a67399b19469cdecea8 SHA512 c4a71da333a7e2dfa33a9cb73be661b605795c498be3bc1e72f2ec7c2759b572f5cef131e31fce8d58771af3c3946f08dcf2fa28288c18893229bbd2f0f13b9b
+EBUILD emmet-0.85-r2.ebuild 378 BLAKE2B 2c1027ef939231a35b01a36c6bfb2c5860ce1dc2b716550228612e6720daca1e0474c35839eb89465ee1c13554653c65967a2c3cc07b55f71b70eeb9a5dfc9a4 SHA512 51aafa4090118931fef8e64c944a926dc62d602cb113ab94f6905a6bd7758a3a7be2cc77f76f2f6bb5a249ee385c1d9ffad4ab2d44c214fc3095982570681db2
 MISC metadata.xml 246 BLAKE2B 410fd0eb2d2b412bb4ca13905fea3351e818dbeed07d7063df2ebfe9000dd45ba7ac827a33c8961913ac567db7caa61646229e43b527edbd704795cc09ba3c94 SHA512 2c66e46cc1cc61356d6784064205b832cd2854c3dbfb6dc79ba55b968d1886e2063a7bdb4b2541651e4f289c09bd344cd4eb7d48b2bda67c955b09f142b63c55
diff --git a/app-vim/emmet/emmet-0.85-r2.ebuild b/app-vim/emmet/emmet-0.85-r2.ebuild
new file mode 100644
index 000000000000..62e982a78a3d
--- /dev/null
+++ b/app-vim/emmet/emmet-0.85-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/emmet/emmet-9999.ebuild b/app-vim/emmet/emmet-9999.ebuild
deleted file mode 100644
index 8fec04106c27..000000000000
--- a/app-vim/emmet/emmet-9999.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin git-r3
-
-DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
-HOMEPAGE="https://mattn.github.io/emmet-vim https://emmet.io"
-LICENSE="BSD"
-EGIT_REPO_URI="https://github.com/mattn/emmet-vim.git"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/enhancedcommentify/Manifest b/app-vim/enhancedcommentify/Manifest
index ab1fbb951484..65e8a76bddd2 100644
--- a/app-vim/enhancedcommentify/Manifest
+++ b/app-vim/enhancedcommentify/Manifest
@@ -2,4 +2,5 @@ AUX enhancedcommentify-2.1-extra-ft-support.patch 665 BLAKE2B f9afbc2602b1f7b215
 AUX enhancedcommentify-2.1-gentooisms.patch 808 BLAKE2B 6802720fdc4883629a2e180461982ea9f6d51886d882895a4aa962b4a407e096811473e97b9fd6b502d4d2aa0da076625fd758c6b108c930e8596059a7fb8084 SHA512 974ae98fedbc4c3ea75499d615066efaef5dd8e03ebe00bb20a5fdc6dd8d5cc7ebd0f34e86cb587175f0c3e26d04bed4d09561216dedcc7757d1e9266dff0046
 DIST enhancedcommentify-2.3.tar.bz2 17005 BLAKE2B cad7f66092a9c54535226616dc2da8c13b9fcc1ae8cb2a5077462e0138345033ccd756556b640ee6e4569a1ba2037b98138ad84f9d44d9466a3955f3ef0ea12e SHA512 673cb42fcc5a2d23ae404bbfa4664f388901249d3ed8315f77227f3fa42f3c267d69eda7554347b4e70de81c9bd58437c243a42d62218444063d5235fe22a171
 EBUILD enhancedcommentify-2.3-r1.ebuild 533 BLAKE2B 1d58da77caa2e13a1966578006eba674f1e4e07f9741515b4b6d69434e810d0c9b23c196bbca2163eda2752d4b02c338d9f1f6a31bc005d04b2046384968f6a5 SHA512 51a7a1a27df1ce6f6fb9a5664b30f6244aad495113875f05c8920ba35a8f061f2a072218f9a9b009c336f704116cf2e0b01df44ed0e362e428625bf02a396493
+EBUILD enhancedcommentify-2.3-r2.ebuild 537 BLAKE2B 9bfa96e467a31c5517ef8d95bd3582134b5ab9e7a4939e8e42fa5f9979839906fccd3b82d78b2c02e70d2365d486da7de4bdfe5629e62b664b44bbc3fc19d645 SHA512 d8117679e28cdb84dc9544ee3bffacd954efc089e670b5e62d17b74435baa2bffcc37430723385468629b7ed3f372b560ee6bbc66a8d281ab77c36a65acdfd85
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.ebuild
new file mode 100644
index 000000000000..c1d5b6079805
--- /dev/null
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced comment creation"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=23"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPFILES="EnhancedCommentify"
+
+# See bug #74897.
+RDEPEND="
+	${DEPEND}
+	!app-vim/ctx"
+
+PATCHES=(
+	# See bug #79185.
+	"${FILESDIR}"/${PN}-2.1-gentooisms.patch
+	"${FILESDIR}"/${PN}-2.1-extra-ft-support.patch
+)
diff --git a/app-vim/errsign/Manifest b/app-vim/errsign/Manifest
index d4a9e5c82b4d..cccb61e7710c 100644
--- a/app-vim/errsign/Manifest
+++ b/app-vim/errsign/Manifest
@@ -1,3 +1,4 @@
 DIST errsign-0.1.tar.bz2 599 BLAKE2B 85b6589da0cad1827d16d33e1e38c7b533c3ab3caa985bb77bdb5cc8f96fbc1e29daa6d925ff30be69e8810bf7ea8148d0c4340144743f6cdc50d2c9110ce9fe SHA512 ccf1136043b5a54614ef90190c157c02fa5470bd79159b8ba6f7a7cd95bdd0c0dcc41eb993d8a26d2b308012cd400f4d3168f4e7dde7bbdbe8dcedcfe5d1c929
 EBUILD errsign-0.1-r1.ebuild 547 BLAKE2B cfd72d55618541be62f2427e63c8580db1a9647b50b42364edd4294663594a7abdabea4df23fc464d31835fa7dc56965dad6faf5886db51f329bd32881d71593 SHA512 53f16a7fb0f80282566202906b7ed2f8bbc24cd7dbde34c5677ad1809745c20e4b8a75784f10ec066c81fc7d183f6d6b94065de2679c661075f4a620c2ccfd59
+EBUILD errsign-0.1-r2.ebuild 543 BLAKE2B a64f4db5d72bd4fda29a3df7c4be8961019bd79004871e13fb944896e914a5c0c01c6b11b5ccb8a82c7bcc6f26d1eced9f840c03d07fe11abda2db9c4d5d4c58 SHA512 f6ee64382e20c04d50b92f98b103cb894df2bcc242543d79cc48bd06f0c9f2bd56104e31be6cff67068cb92aca6e232f7a5ca7b050a7f0151fd0f4d71b4bcac3
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/errsign/errsign-0.1-r2.ebuild b/app-vim/errsign/errsign-0.1-r2.ebuild
new file mode 100644
index 000000000000..0349bcfda883
--- /dev/null
+++ b/app-vim/errsign/errsign-0.1-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display marks on lines with errors"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1027"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+'To use this plugin, simply type \\\\es in normal mode and any lines which
+have been marked as errors (for example, via :make) will be indicated with
+a >> mark on the left of the window.'
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
index bae8db95aa0b..346cc01c9907 100644
--- a/app-vim/eruby-syntax/Manifest
+++ b/app-vim/eruby-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
 EBUILD eruby-syntax-2.0-r2.ebuild 508 BLAKE2B 667ccf36a52872f96ab636fc74785abec5928756fba543ffb2a03c8034f75e8543bcd023cc7c8bcfdd2a101ce0f8282ac244b1d4b46a2a10752d20a2044df023 SHA512 7bc24fa9a4c78276e23a6ae6ee15574b826252f034a3a6d83d1a26e4fddb17cbcc0219511bfc44903d8b7544e8dfbd4f12a749ebd9ef143350c6860d787c6c1d
+EBUILD eruby-syntax-2.0-r3.ebuild 514 BLAKE2B 8d037c09fdd51aac9c2b4a27e1c9e18a900f0ef1400f905bb3ccf14a0c25a7f6e028dbb7e3066ee671e5f090aca2b78aff4e0ae98936d04030e74e22dace4739 SHA512 0b49ee5c9b968c1deeab3758b3c53531c4ec9ea6d7b6464635a0d3678da1df4279501687e337d6dd2e6622fba9f6fc229dbb929f9c82e067e595d61705c2eead
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild
new file mode 100644
index 000000000000..2bf72a0fb743
--- /dev/null
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for eruby"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
+
+src_prepare() {
+	default
+	sed -i -e 's#hi link#hi def link#' syntax/eruby.vim || die "sed failed"
+}
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index d89d43a8912d..69722800a9ae 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
 EBUILD eselect-syntax-20070506-r2.ebuild 517 BLAKE2B 4b079d32aed9351a703d75b568cc6fb389ab43f8c453740d99cc5db7882d11bc3dbe6d1a2e2acf054aba66e2b1a54d249416ca45f2e0799537d2aa410a57e509 SHA512 4ba69e6bee7b196a733683702c4fbb26b649126646e1aa76ee1b06ff12f03f1a2aa3c0736a43760c0596e1f3ad47f86ca4194ab133833519c7b7caa563086c17
+EBUILD eselect-syntax-20070506-r3.ebuild 485 BLAKE2B 7b97582da3af2dc6f997a3849d99e5d3348385adcde3f1d30ad913451134c0657e74b3dea80ef27ce270a447458f4005754342ce99c5e462f665013615330d7f SHA512 43cafce77be0358c18da38cdf81030d3b31ec5595f4e944dd6f888fcb2e3794e8f25723ea8e133a5a6758f6856c0066de5c2713d01beb58a903e296f872add7d
 MISC metadata.xml 274 BLAKE2B bfa9b39d4cd1b8163066648034a81b6c9fc23284334d76cbf3b71711a9548646a095d1fefa5e68455645867b5b0c1a7de96e106949b58e1e2ef7cf788ca28bf4 SHA512 aca1820afddcb39050481e3b3ea0310dc197f723ddb1130abaad0ade665062ac12c3f4bc4dda016e1fc9767f15c2fa484dca08a8bca2860107ae82345dcdd63b
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
new file mode 100644
index 000000000000..d2dd907dfe0d
--- /dev/null
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
index ab0f0ab7ab75..5cda4d041ebe 100644
--- a/app-vim/fluxbox-syntax/Manifest
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
 EBUILD fluxbox-syntax-1.5-r1.ebuild 886 BLAKE2B f59b53cdcae36d9dfe27e6d6ff1b3353ae7a567a95093220127b27717585b0719062bddd485a63cb5586b95b7630c945f119419d15ac4a7d7a1f99a58af7fd79 SHA512 51697c27f4c28d7313d0f6dc72aa4ef0fd549b78c7ad30796dc98798924f2aa4b12aac94fc64f47e016ca703d3fa23b98646680a431ce7ae0ff49439c064dabb
+EBUILD fluxbox-syntax-1.5-r2.ebuild 894 BLAKE2B 80164500b1b6150906445f1b027d48d049ec1c5136f1e02e794b77baac01010453bc8acffeaf2bf6e28e3509cf37ee0d807241343c2eadd8a64952ae7587750b SHA512 c2c0b5361f4a1cb724c5b712638bcceb3888bdbc50c47739352935cb1694d1a3b16bde61dd7624718ce7ae1c346d59ec7a5f7502e73c0474c03e9c2cebf23ccb
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
new file mode 100644
index 000000000000..28e337173b22
--- /dev/null
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fluxbox files syntax and indent"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=679"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="app-vim/genindent"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting and indent settings for fluxbox
+menus and similar files. Upstream don't provide us with an ftdetect file,
+but a simple one has been created for you by this ebuild. You can manually
+set the filetype using :set filetype=fluxbox if necessary."
+
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	mkdir ftdetect || die
+	echo "au BufNewFile,BufRead /*/*fluxbox/*menu set filetype=fluxbox" \
+		> ftdetect/fluxbox.vim || die
+}
diff --git a/app-vim/foldutil/Manifest b/app-vim/foldutil/Manifest
index 3e95cb5a159d..1c311f8aaf12 100644
--- a/app-vim/foldutil/Manifest
+++ b/app-vim/foldutil/Manifest
@@ -1,3 +1,4 @@
 DIST foldutil-3.0.tar.bz2 7323 BLAKE2B de59313da23a277a2eb3e971b3033202001cd1304058b5e096e33e7c28f95326169754c0e0062120099677e567c6bd79b265a69524c8b8fe55a9666ab6bde23f SHA512 a38561c4530333f5a56596b2fe19a2892f58b4fd35229536c054578b199e9b6b19c18d255aa1b078d51ac4f610d4ca49b205d1929e8be51299bee527058b3452
 EBUILD foldutil-3.0-r1.ebuild 547 BLAKE2B de6fe80efb4800fd32d0d87037ee2a211fdc53a600951a9e06c0124a8514c4b6e44399d6d8002d44c81bcedba704188580f0bdae69b4e0365c7b1d93243a6867 SHA512 9989b62e275c9a288a29f9cad66174ccaa83a3210e5cb4f0f2faf0f307f336bec0a2ef8ba1598aae14bee36af17aaaed17775a6dcb0ad68de44014a4217d0881
+EBUILD foldutil-3.0-r2.ebuild 544 BLAKE2B 28d5d8404fc8a8758c2de216245c9dfd944cf3be34a48ace7e6c1f5ff6f7333d6cd7ab051fd109ffdd320c5eb3c0ba22440faaac293e3af30fc6b242318152e3 SHA512 778f26f90b22ba4db0c4f747a71c6648468c928eb215781bdf0f51311f1ac83942d526f5cc0921b2150b1c1b50c06fa10bacf7157b3fea953be0d67d22b7365c
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/foldutil/foldutil-3.0-r2.ebuild b/app-vim/foldutil/foldutil-3.0-r2.ebuild
new file mode 100644
index 000000000000..24e498bbfa3e
--- /dev/null
+++ b/app-vim/foldutil/foldutil-3.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fold creation utility"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=158"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND=">=app-vim/genutils-2.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a number of commands for working with folds:
+\    :FoldNonMatching [pattern] [context]
+\    :FoldShowLines   {lines} [context]
+\    :FoldEndFolding"
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
index 2fefd30515f2..0577510f4265 100644
--- a/app-vim/genindent/Manifest
+++ b/app-vim/genindent/Manifest
@@ -1,3 +1,4 @@
 DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
 EBUILD genindent-1.1-r1.ebuild 496 BLAKE2B e77ee2e71a083141e84394f7b54cbb2b7064eceb4a62b39f250429173e35befb682c4e0acd5ffa2a94b6ea38581c83abb2765346a81e9a25638589b0e65eab55 SHA512 5d1decdc5458bdff167cf954fdbff5656b2406f8feb87fe1562f451161cee728433b18335e0f038bb94b9c5b250f7810a7e1f505acada2baf2e6e3548b1a7b4a
+EBUILD genindent-1.1-r2.ebuild 495 BLAKE2B fa377079f6ff74cc2d5cfec363ad2b4843027b98889e3119ff07c253ca2c65e3b037ceba10800dd384b7606e8e01747c32256d69b4989818931aeecce0f3b540 SHA512 2d70f3c69026465ea9ae7c3d2ecca9e6721fed93ff65b6ded3bf7c4cf40398f39a3bd9fabd834f3912658521117e7df2ed641f9101a95b3a9133acd29a80564d
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/genindent/genindent-1.1-r2.ebuild b/app-vim/genindent/genindent-1.1-r2.ebuild
new file mode 100644
index 000000000000..070c24fbee40
--- /dev/null
+++ b/app-vim/genindent/genindent-1.1-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for simplifying indent files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
index 930de2c936f8..4d58980602e2 100644
--- a/app-vim/genutils/Manifest
+++ b/app-vim/genutils/Manifest
@@ -1,3 +1,4 @@
 DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
 EBUILD genutils-2.5-r1.ebuild 569 BLAKE2B fe1a6f05048c98482437be078fdea6b9c01b8716949e169accd3e44e3d9cf88e54412cabb46fdd84b6f6577ddc116b90b9edbd9d6637666d146aa9d751f233f7 SHA512 238315ea42e5aab7aa9c05a5b7093762efddca524c25956594926c15f27c339c7a09a97149da55c94c7d4c129e63f70157623679207c06b2977eb874426f40ba
+EBUILD genutils-2.5-r2.ebuild 572 BLAKE2B 32bab5c0d375b2a61d6be45df79fefd418142ab8a07eca15836e6c8711a42e1e247c243bcca0250965a0a9c318f9424d1ddf1cb9118573b02b0753959df7e71d SHA512 24759228e66b0d963784a75aae8d98f4c793143ef3dcfb81f9ebfec1990c6aaf7bdeadadc6e0a5eee19c2cfb84297b13d507b5c7a2ab69a30523d5957ed265ac
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/genutils/genutils-2.5-r2.ebuild b/app-vim/genutils/genutils-2.5-r2.ebuild
new file mode 100644
index 000000000000..afead7157d7c
--- /dev/null
+++ b/app-vim/genutils/genutils-2.5-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library with various useful functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
+
+DEPEND="app-arch/unzip"
diff --git a/app-vim/gist/Manifest b/app-vim/gist/Manifest
index d48a591ab641..35da83377ffb 100644
--- a/app-vim/gist/Manifest
+++ b/app-vim/gist/Manifest
@@ -1,3 +1,4 @@
 DIST gist-7.3.tar.gz 18170 BLAKE2B a6f281f92944203c17037a8ab9cd7e202ad491a11f7e79cf89794bfd94f188ac056c25c138fa98a9d50ebb38223e679b334c79705bf1d063e54f43297db6da40 SHA512 dbd3f638a365c8ee419140d9a934dd2c80fed181910137f61cec3c2d8d61300c21cabc9fdf85d83caa185cf78edb92990e04d49d937cd3fc546b6ae889e5cbb8
-EBUILD gist-7.3.ebuild 592 BLAKE2B 9ef115f51c72a14dc37b59550cef1830412b305bf90738d4ffdee98a0b3df13a461c8dc6b6a4504f4610454ed16e470382f5ced4586892fa4f6524487615ba1b SHA512 457e415760b8152a7feaa385b48344820648cc90cb8b2b9ce8857e247b5ecb34660e3f8469c0d7c17352d601d547c3995c027374aa28cebf3bc6a3726a4967b0
+EBUILD gist-7.3-r1.ebuild 601 BLAKE2B cfc4d0ea1575c856f664422ed79b4bbae1e30bb003bec352d18b3e6c68a39cff3e00862a14caa1afef69503a42957c878bd54813dc854b6f98769bbc2bf9aa82 SHA512 22bbbfe4a1313cccdb036e52e7b3ef1b4849e4646d204cab375baf58750b81a533011d7c0345cbcdb83c1ca5d0dc080dfa4f621792b16b08aa33ed5a2b451879
+EBUILD gist-7.3.ebuild 592 BLAKE2B 9e78b6a346b20b8e903f2ce6bb782a2a19e686a37c9b90d3735c634c6efd605763b61699f04b03d648ae10e07e87f18416b2c56b81ea5bb9d5f21743c27cf6a3 SHA512 c51310701a98482a34f5eeb11c3d5cd01fbd899fe9925cf656b6ab233551f8942ff1faf97611b5bfd3fc48748ea45b37d0e012518a2ce340fcb57b8c72823f0f
 MISC metadata.xml 329 BLAKE2B 3adfb9fe58d4dddc733866aeec7969910555328e9a23342b4ad0457405948a83cad44cf856a3a6a303e089e6e784dd38285abba002906ee5057af757159b15ee SHA512 d4f0f838ab90bef7c9178f65d45f4f9d97f0d4c8feb7af29dd70bc2c19af370130d5003ffcf7c4450b4172b4189a58c0645cf5953fc05e5f6bc91951ba59d141
diff --git a/app-vim/gist/gist-7.3-r1.ebuild b/app-vim/gist/gist-7.3-r1.ebuild
new file mode 100644
index 000000000000..73379f7be49d
--- /dev/null
+++ b/app-vim/gist/gist-7.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="gist-vim"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: interact with gists (gist.github.com)"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2423
+	https://github.com/mattn/vim-gist"
+SRC_URI="https://github.com/mattn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND="
+	app-vim/webapi
+	net-misc/curl
+	dev-vcs/git
+"
+
+VIM_PLUGIN_HELPFILES="Gist.vim"
+
+src_compile() { :; }
diff --git a/app-vim/gist/gist-7.3.ebuild b/app-vim/gist/gist-7.3.ebuild
index 64f66578feae..7581070f2196 100644
--- a/app-vim/gist/gist-7.3.ebuild
+++ b/app-vim/gist/gist-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PN=gist-vim
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: interact with gists (gist.github.com)"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/vim-gist"
 SRC_URI="https://github.com/mattn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 x86 ~x64-macos"
diff --git a/app-vim/gitlog/Manifest b/app-vim/gitlog/Manifest
index 1254e0e657b7..f56211531d7d 100644
--- a/app-vim/gitlog/Manifest
+++ b/app-vim/gitlog/Manifest
@@ -1,4 +1,4 @@
 DIST gitlog-6.0.0.tar.gz 33956 BLAKE2B 5a7472db7cbf03396e3ed4e7eea417e44e538946d9432b4d94c3114b59bfeb961c6e0df4137c116f152b57986b7cbaa1aeacd59df33d709f2794f5d2607693c4 SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069
+EBUILD gitlog-6.0.0-r1.ebuild 503 BLAKE2B 1c38b71251cb215be5c070922a56ea38cdf62b48f1dfbca01869c81bb52457c327e746c0b58e1ab3db5c540c06bcda7d19d7ba08cab99784b819133a7f22cc55 SHA512 0c62fc63c112ebc1b737179fe4f0583c7cec2395fea534ef6c4a68c492c248ef5a58c810900fd37b31665d855036a2837e290498b443f4c538685bd9bf053694
 EBUILD gitlog-6.0.0.ebuild 616 BLAKE2B f9a96e2db1a7d68426f0a80ee950811326c5873e240302ddca95d42044a8f55d1701bdeeafdd5028b50e17e266c374ad9e5d2d3fde9e2e738befe804b4a3f407 SHA512 911a6eab4bb9c8ce03fb3077c793a09980bf4f58cb009bf88bf4b534c602589f1d9beb6e7b309b7c6acc9473260f6dd6d7fdcfa6f580136d77f23e9bc4146e2c
-EBUILD gitlog-9999.ebuild 621 BLAKE2B 9f0c0cbe917d08f9e3a75e2ca9921007e41ca3eec8a111d7497ac0e411c858a209bcf0420b7e8e03d145419cc7d22bb1960df1ddde43a439079ef2e197acb111 SHA512 144f2c24bed882dfecd15538eb467e10ae29f29c04380b237725b808a19fe31a5fe4596a9f00a2e6e1a477921c52bcc18752f86b27f76afd7489e2994ec35fde
 MISC metadata.xml 343 BLAKE2B d526b979ef691b242cae34c108fc8818cf06d7dc70d177171ecfcb0e67fccc1adaeefee3bd17ad0c16440790ea55923f3d50e73c8fa163423feaa2f20efc3dea SHA512 8ca39ec24f03a434a674c1cff7ddc88b5aa028fd06dbe9fe34cf3d3c2efe9b147d9da279b6ae95358f6ff3d0bbc99b6910d57cd7779b48115f146a0948a58a3f
diff --git a/app-vim/gitlog/gitlog-6.0.0-r1.ebuild b/app-vim/gitlog/gitlog-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..f089417b9cc9
--- /dev/null
+++ b/app-vim/gitlog/gitlog-6.0.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294
+	https://github.com/PAntoine/vimgitlog/"
+SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim${PN}-version_${PV}"
+
+LICENSE="Artistic"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitlog/gitlog-9999.ebuild b/app-vim/gitlog/gitlog-9999.ebuild
deleted file mode 100644
index 658a3cb149c8..000000000000
--- a/app-vim/gitlog/gitlog-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/vim${PN}-version_${PV}
-fi
-
-DESCRIPTION="vim plugin: git log and diff plugin for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
-LICENSE="Artistic"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitv/Manifest b/app-vim/gitv/Manifest
index d032cc18830a..e3e35cf176b1 100644
--- a/app-vim/gitv/Manifest
+++ b/app-vim/gitv/Manifest
@@ -1,4 +1,4 @@
 DIST gitv-1.3.1.tar.gz 553719 BLAKE2B 0d775f3bb05b3a49b69c5717f13a0f923fc5e0b5366c217042ac75e13c01080828ae4cd3e759e7dca44556c2b07aafa42cf8661a3ad0f52152c5cb8f4db294ed SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc
+EBUILD gitv-1.3.1-r1.ebuild 545 BLAKE2B 95b1ef7c9f7cbd408dac7ba02f4a63e8e97ed122fae5fe8df92ee48350059426211fa24fb015ec61c428f407271acf9b54af5b1983799a6017a84736258971ba SHA512 df7a52a6f75bb31f0fadc84384541033904c594295091d409456549e988d98093670508ae59b0c2fcaee9d14620b5331eac157b6bad4520d761186fe2e482639
 EBUILD gitv-1.3.1.ebuild 654 BLAKE2B 5c9f903d09816b8fdfec4775736601edff78658165598f83e699d1b3b78b66ca9da714114e03a2c744b510ad563d9e9b1650c023f5122e39caf23cc66a9a3795 SHA512 0bbb35f1841d27c115248bb1d580c7b5db8f12f551db2956f3fb70b292aad1702548c034163ed23787e868b5581fad0ea1648eda22f48dd7aeab44bef331a3da
-EBUILD gitv-9999.ebuild 683 BLAKE2B e2ceb93cb9bbd70a5764b7f93342e878caa463f639cb7ebf907ec230d1107977537df3298ec0d25d826330aa95aa4ebff6d3a5026fe49632b3d6d5eb74c0d651 SHA512 d42619dd5673761810cc3c5ceb434c9eaeb8bf5f39e5ea4e5909387a8cd79699320217a02edc14230a5b425683ece201fefcbdfa080842da87aca415ac842dd5
 MISC metadata.xml 340 BLAKE2B b1c28fd897ce61f3a49a17bf5ee05a4754a08fa9aae3fa99da56135450953e58126eeb237c60664e800ac434331881a88fb8f7d794715738a2c8ecf4ac53173a SHA512 be9ae917520a64b167b5a957de77ed0261448bccef97285c0b6cbba59e4c3969fd459e78d04a7aa41d632b5b1dfe9268a74008ed7443b0cd9db509dfc617afc1
diff --git a/app-vim/gitv/gitv-1.3.1-r1.ebuild b/app-vim/gitv/gitv-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..967936be8c8d
--- /dev/null
+++ b/app-vim/gitv/gitv-1.3.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="
+	dev-vcs/git
+	app-vim/fugitive"
+
+src_prepare() {
+	rm -f doc/tags || die
+	rm -r img || die
+	default
+}
diff --git a/app-vim/gitv/gitv-9999.ebuild b/app-vim/gitv/gitv-9999.ebuild
deleted file mode 100644
index 665594feb07b..000000000000
--- a/app-vim/gitv/gitv-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gregsexton/gitv.git"
-else
-	SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="vim plugin: gitk for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="gitv"
-
-RDEPEND="dev-vcs/git
-	app-vim/fugitive"
-
-src_prepare() {
-	rm -f doc/tags addon-info.json roadmap.md || die
-	rm -r img || die
-	default
-}
diff --git a/app-vim/greputils/Manifest b/app-vim/greputils/Manifest
index fb403c9570c7..0d3693344932 100644
--- a/app-vim/greputils/Manifest
+++ b/app-vim/greputils/Manifest
@@ -1,3 +1,4 @@
 DIST greputils-2.8.tar.bz2 11886 BLAKE2B 7c1a8c08393d50d044203b8190c5ce35fa75b5ab6e2b18a6e5ad2eb679ac4685c92c336fe347e03db230a6f3a459d7acfac9f4e0161ca4adb17ee90192b38641 SHA512 07a7b22a900860b982bb0596232892ad056472fa48447131ba56083caef00318886719f379c9f9296fc00fd54575ab16aae71b3d1adf2af5d05a11a45a2bd7f9
 EBUILD greputils-2.8-r1.ebuild 479 BLAKE2B 9bbbf15c3096b85c090b3fe0d3d2241baa95413c5c41a1020b3ad6ec0d8ec9263207d15b48d4997325e8adfd41f309c03e5bbe89b502471a987715d042a45392 SHA512 f52982d70f6d1d2500630978cd142e1db6d3f21b5066076f0ae1874da3911bd1277d1950cb091f99e9feb4b43c4b00d8f67b6ee382985e54af900119e964e4b1
+EBUILD greputils-2.8-r2.ebuild 476 BLAKE2B 5ca081f6ad3d2477278285e9395c839648557a66027032aec6d0edae6f541f4ec0ef49a870de775773c1686a0a1b7f3388ffc0094fa936e203224daf98846a95 SHA512 285fdc988e175e9de2dc62efe9b9b3755194dc9e3a0e3a7363637e3c182c699c855e62a38df69df8f929dedd48a733e6935f586348a1f601b0d44f6a5f57297f
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/greputils/greputils-2.8-r2.ebuild b/app-vim/greputils/greputils-2.8-r2.ebuild
new file mode 100644
index 000000000000..eb0e1b50bf42
--- /dev/null
+++ b/app-vim/greputils/greputils-2.8-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface with grep, find and id-utils"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1062"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPURI="${HOMEPAGE}"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	>=app-vim/genutils-1.18
+	>=app-vim/multvals-3.6.1
+	>=app-vim/cmdalias-1.0"
diff --git a/app-vim/increment/Manifest b/app-vim/increment/Manifest
index 18d9b69c24b3..cb4be6e1d482 100644
--- a/app-vim/increment/Manifest
+++ b/app-vim/increment/Manifest
@@ -1,3 +1,4 @@
 DIST increment-1.1.tar.bz2 3058 BLAKE2B d079e0fa180b68a0616ffdf5b2ca86496f7aca2ab2e69e27e16a56dda49c96eed0ad7c53e0a0aabc9b29fcb0895247987afb28282477247046e07bb3f01630b6 SHA512 eae4fd492c02e83556646df35c57a50c07a09ea3c9cca0c8d8e15b8a49b621007e3952c23dc997d99d22dd8352852d98332180aa299ecdd4e53ffdafdc6b7a30
 EBUILD increment-1.1-r1.ebuild 378 BLAKE2B 904d88d9617df66a19a11ab7e7c2bac4bf486e4bb20676eb3597f0ad4cb963482f4047235f3cb6d7f07bc3e7e4bb6dec6a065e66375e59b07745dbb01ae6ad5a SHA512 971d97f5d0710e5dd637ea024dda05f6cb55fd6b8e9efdcffe3c5d1aceae6f1e56e782d210a358c4444f1d6c49274a83f71eb2167320bef166daf8f44e11e420
+EBUILD increment-1.1-r2.ebuild 374 BLAKE2B c254ae2de95ba5e6f06c9f86f31a5bfe3c50a101008196eb2bb849dfa93b3f159ab4323a4a12ee091a1b1e30d44ac04cbcd9dfbb128c5eeb00ca6afdc7f4e30a SHA512 c3ebc4a864bb1b040755f4f43e5aa9b2a4f4690b5faaee3919bc93b02a719fb95c45a1d53b62dd60cf5b24e4abafb0c9d22e004a8fa6b42d2b2bca4443c8234f
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/increment/increment-1.1-r2.ebuild b/app-vim/increment/increment-1.1-r2.ebuild
new file mode 100644
index 000000000000..af33ffcf7a1f
--- /dev/null
+++ b/app-vim/increment/increment-1.1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily create sequences of incremented values"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=842"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPFILES="increment.txt"
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
index a866ee70176a..ec9ae117e5bd 100644
--- a/app-vim/indentpython/Manifest
+++ b/app-vim/indentpython/Manifest
@@ -1,3 +1,4 @@
 DIST indentpython-0.3.tar.gz 2305 BLAKE2B 080224b87a10d1a7cd87523b37257b099efc873a954a5af63d8046351ad67fa6a58c6d84405ca50416b735f52835029e2fe653a24cd80d66dfb851f050b2421c SHA512 a3750ad7f935be914821cdff6b55b9bca1fe4d076d6c364be3854679c8c3466f14a4df486258fbee5a24d58373bc6258080e598992b22a0897e18a170555ebd6
+EBUILD indentpython-0.3-r1.ebuild 432 BLAKE2B 3e5b5ff04c2b8ec4e3042dcc0561b8af87a9762033623d762205b7e8fb10398b8f4055befe2b786cf457e8314202b7ceab05138922ceb23f3db2893618f36d58 SHA512 646f4b84a66508f86a8dd088aaf52f0e3b3011765ca01b2386e07181c548a50809574f81f1233e109b824a66fe23609696c868d3c654be973bda8a708f5eac8b
 EBUILD indentpython-0.3.ebuild 431 BLAKE2B 50793b88fb7e1d5e03782ad8383cc02da2199048cabd15799f21ba805d3f034adcf871244d6f356249dfc020ccb9b5380e949c810af0bfb6d47fc4d0a8d31925 SHA512 80710b0d87c4e1ca973be6c8c00274d9e23b0346662201f54c6e9aa443f65cbfa0fed107c8a1df63a7b46ab8d47d6bfaff2771d5722807aab131b340fb45de5c
 MISC metadata.xml 438 BLAKE2B 1785b8aa441b5842a5c590e3fe9f0d14abf44b028972125554fe429d99f6f4feaccac4d33599d3b25ad56ba912d21484f6c93be64cec5435e2dd80fa3edf0f19 SHA512 bb145aae339b9cc3761067f6c6336637eac6961e10cf65a714e17544baa621d335085f9fb163b29ff68a64c7d38c3cc3fa90494d06fa468e6e6702c75bd7d928
diff --git a/app-vim/indentpython/indentpython-0.3-r1.ebuild b/app-vim/indentpython/indentpython-0.3-r1.ebuild
new file mode 100644
index 000000000000..8d60d7933396
--- /dev/null
+++ b/app-vim/indentpython/indentpython-0.3-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Indent Python code according to PEP8"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=974"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
index 3fbdd5bce1ab..477d0d3d83b6 100644
--- a/app-vim/info/Manifest
+++ b/app-vim/info/Manifest
@@ -1,3 +1,4 @@
 DIST info-1.7.tar.bz2 3958 BLAKE2B 23c8f8e06e923adc6d97ac578331cd5669dfe54ba7dc470c07426dbcf475cab4cf66ceb60a1f1b79c0fc12109db4ed3fee575bde56de221a9ebf8fe99dca9d63 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e
 EBUILD info-1.7-r2.ebuild 636 BLAKE2B 682bede432915cb5eb2d65fccf5fe35e544f01182053dcb3ac4e8c5164aa4eddc5b301bfd4767faa5eb36513ef32b11e9e021ee36c48d73443b53a3e8b8ffc21 SHA512 42ac2c88b6a80336c6784ebdd48ee099eeda231781d225d7de7e7262c656ae1c8c9570959ae560e0d932367bc53e0f08b80acc5309c5ebfa3300ee71c03bf275
+EBUILD info-1.7-r3.ebuild 633 BLAKE2B a5e27617e32050a6d22c83784cc1c7cd5eafada8901579e3959d6aade0f8646fabb25146aed74a1b9fec362fce5380963457ccbd3caf4b1cf1710b2a4e1d3ef0 SHA512 d389ba0b904a56b6ddd7235760e4c4f35c4d9c65e66ae9c16e3ae4a9154b4f21768953d6e8b239361e41780206242a446d3bf69b7c5b5413450cfe7c3414764c
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/info/info-1.7-r3.ebuild b/app-vim/info/info-1.7-r3.ebuild
new file mode 100644
index 000000000000..5b11956b2c7a
--- /dev/null
+++ b/app-vim/info/info-1.7-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: GNU info documentation browser"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=21"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
+
+src_prepare() {
+	default
+
+	# The 'h' key is a bad choice for help.  'H' would have been a
+	# much better choice.  I sent this suggestion to the maintainer,
+	# but no reply.
+	sed -i 's/\(noremap <buffer> \)h/\1H/' plugin/info.vim || die 'sed failed'
+}
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
index 72d62deac983..847be2d37890 100644
--- a/app-vim/languagetool/Manifest
+++ b/app-vim/languagetool/Manifest
@@ -1,4 +1,4 @@
 AUX languagetool-1.29-script.patch 1413 BLAKE2B 23aa4adc8c59689fcb18ff9b6fa0068035eaf212aedc9920d87a729cc7e4b34a32e11524cec1785d23cb08cbf9b1fe5ec5315ef4c7fdc2eb96324f06caac5c3b SHA512 b4e25e527a8af3ea5fe649bd31aa0ecf0f073a0852f1f155ecf2cbdc58d105ce114db8a12dc56ee086a9076cb15e5bde61e7340e570fff59093ed2f266247564
 DIST languagetool-1.30.tar.bz2 8089 BLAKE2B 518036b68b80bbc083718a23c3aa07e9d118b8c6dc4f69cfa289566924ac2bd218b45ca53e850244676351b1566b580c6fac909376087d8274c289ab20727e49 SHA512 c04115752f8a601e85b718ea8d68cbdaa7628d14c252b4bb5bd11449ae2c5558ddee3d0f3a1bc2db84364e127fc211a0c4fe51e4ff9b442ebe99aa4f9d1db935
-EBUILD languagetool-1.30.ebuild 429 BLAKE2B e35861f3e843871d7a907d479d26c55a9960031d419b84bc66a46fba084c666f5981be96de5cee576fd0115ec397da27a9ac5e3aab8b98078135b463c71494ae SHA512 62e72ae65074c28d0fdbe4abbe1cb925571eec89967f32f67491e9666f24d9d77130367453a97ba1dad383bacd1999677ea50def95e4d58051fd490b6d407018
+EBUILD languagetool-1.30.ebuild 433 BLAKE2B fb053d81f6887b60f7478690741ae7e31717e9f4bac83914d92790d59c53d1b9a87ac23babc460d09881be28f91ab0a1699b5036fbda2e3c5026e566f16c55c2 SHA512 dd17e8ba86b5ea81f9f3ae43e4e27f1c237f071bb57096c5f0efa7147d27d9d7f3d29461e34e41eb325278b99c91a81961be0fbf7510bf4159ec51d059b91648
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-vim/languagetool/languagetool-1.30.ebuild b/app-vim/languagetool/languagetool-1.30.ebuild
index 63d0ccabc6ab..315953f9b1bf 100644
--- a/app-vim/languagetool/languagetool-1.30.ebuild
+++ b/app-vim/languagetool/languagetool-1.30.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit vim-plugin
 
-MY_PN=LanguageTool
+MY_PN="LanguageTool"
 DESCRIPTION="grammar checker for various languages"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3223"
+
 LICENSE="vim"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
diff --git a/app-vim/locateopen/Manifest b/app-vim/locateopen/Manifest
index 14cf968c6b27..2f09128bee34 100644
--- a/app-vim/locateopen/Manifest
+++ b/app-vim/locateopen/Manifest
@@ -1,3 +1,4 @@
 DIST locateopen-1.3.tar.bz2 1925 BLAKE2B fe9b4c7abc0fb26eaa75298368ae7b9440a2c6d7d25e94da80693de0f61517b50fb200536b488f485cfd3c4b243bb8abe5606dda12e07a8f6246bd644d74e8de SHA512 93d1f89eef3b877830a01a0fa609855108e3415836128d27f3b66fa6e3c57614a81e0cbcc984e39e0353883b7d8fec86c73f77a4c3f10a1cb8183b8be21a6dbe
 EBUILD locateopen-1.3-r1.ebuild 788 BLAKE2B 90163c2322ed0faf7f13aea967fd75d7e2119736bbffb532702cb288f7929e1f9e4348321a6e3dee41b56176dfb91f200d283941788738a096f80b80c17632c5 SHA512 1335dea394142b2ebd472e7afd9cbc7f5faff1c5fa539d5b22053163136e0447ae8b9e8028aeb7d983bc48ca1ba66ccdda27e0ff697edc62e7fe9c6eee93b634
+EBUILD locateopen-1.3-r2.ebuild 770 BLAKE2B b59da416618a584a301e042e035f6a17546452bc826f4b2f2c620c664eeac09d5ca008a1692ccd74244e3ca904442b5a99b19c0b461364f4526c1e6a4d3dd6c8 SHA512 ed75cde620bc0f0c1a396204ee4e06d7d4582bd56edfdd689337ad70f0aa9701eb2e0ec1a28c04e97b86b1fe918274643e0be2170ea14dc6e782e359d2b244da
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/locateopen/locateopen-1.3-r2.ebuild b/app-vim/locateopen/locateopen-1.3-r2.ebuild
new file mode 100644
index 000000000000..620fa6113d63
--- /dev/null
+++ b/app-vim/locateopen/locateopen-1.3-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: open a file without supplying a path"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=858"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="sys-apps/mlocate"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides commands that hook vim into mlocate:
+\    :LocateEdit   filename
+\    :LocateSplit  filename
+\    :LocateSource filename
+\    :LocateRead   filename
+To configure:
+\    :let g:locateopen_ignorecase = 1    \" enable ignore case mode
+\    :let g:locateopen_smartcase = 0     \" disable smart case mode
+\    :let g:locateopen_alwaysprompt = 1  \" show menu for one match"
diff --git a/app-vim/matrix/Manifest b/app-vim/matrix/Manifest
index 8fb5a64b0c11..d9baf2c10ce3 100644
--- a/app-vim/matrix/Manifest
+++ b/app-vim/matrix/Manifest
@@ -1,3 +1,4 @@
 DIST matrix-1.10.tar.bz2 3365 BLAKE2B 71c8d4fe2117b4fa8fb31ba880b3af456f046d6f78bcec54107dab58bee1b733887752aba06f17fc6b4196ada40cc1ba7c5a7e4ddeafeeb5630f6ee1d8e44627 SHA512 9c268ced7b0a7e3117c88bfe005236f1fc61cfd74fa10d46318b739fe61a97f7bd856d125d69cf599a79efb8fb181d8876641cda65ae5dc80e4c650e7430fa85
 EBUILD matrix-1.10-r1.ebuild 431 BLAKE2B 5540aa537722fd860ea9bbc3ff4ebfaba11765d31148c5bcc0070d07a405ff66cb9402f9ffc6cbb3a3f19efa729ecb1ea70d7c2fb1ed9955701c3f50393cd5db SHA512 6c4fffbd235db17b2f593dd2e56b20d10ce2c42c285128c18b8f45251ffd0ebcfe191812a7b53426935a4e52d5f435dcd3872105a3c28c33dcc860cd5d4fc839
+EBUILD matrix-1.10-r2.ebuild 424 BLAKE2B 7dc1c04f8259fd5d4bc4568ad70565bf19a4681378f09161ad0f3927ab67b1f1bc72e27713cef7f972e3d55ceb3294be695ea9124fae80bd24e794144438a30c SHA512 a070ca739f2a297fcfe94bcbf309099ddb7633ea419fa2f1d1d8a948239868b1ed91910c50efd91381f331038174d6f250c4705a9151b5b27e874834251d957a
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/matrix/matrix-1.10-r2.ebuild b/app-vim/matrix/matrix-1.10-r2.ebuild
new file mode 100644
index 000000000000..d52456bb444a
--- /dev/null
+++ b/app-vim/matrix/matrix-1.10-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Screensaver inspired by the Matrix"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1189"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides the :Matrix command. To exit the screensaver,
+press a key."
diff --git a/app-vim/minibufexpl/Manifest b/app-vim/minibufexpl/Manifest
index c329400ec7a8..afa173dce47f 100644
--- a/app-vim/minibufexpl/Manifest
+++ b/app-vim/minibufexpl/Manifest
@@ -1,3 +1,4 @@
 DIST minibufexpl-6.5.2.tar.gz 32119 BLAKE2B 01809246c81fcc2b346e7bdc2dc114c5a80cae2e58bce54c1d2f9411980d31e4a5d0a8d434dff58d284555084e95d90079492c8ad956ad2aab9dabf03186bbf3 SHA512 325fb58b025392c5484574c4988ec95eb7374a10b67a4abe28857a0ae8d768316ef4d477b51bf442ffc1bcfb5f68dfd0c924731291b155192731055fed3569d1
+EBUILD minibufexpl-6.5.2-r1.ebuild 471 BLAKE2B bc2d7b5451c09cecefdbf620ae2971201154659bd4f9663e6e832bf539db8fd73ed981361773afab7a0ed8b5a02e7cac02136cbc6d43c1db3711ea98ec354c5a SHA512 d9d914158991b5b2d6e70dcb6ae03db196e417b8575ff8cd755e6804f29f775d72f5ff27283af66d89c3beb816c32c8d55a1be0a75b21d9db09c412bf662c7ca
 EBUILD minibufexpl-6.5.2.ebuild 466 BLAKE2B accf8d664221edcec2cb915ea6729aaa5fb8e8bc2c38c9dd165a88fc6163636b88e4a27bfeb39ee533b146ca36a8444b4f7df20fcfeb60f7cc6465af6cd77b75 SHA512 c04d04879f0ee2ba1818dfc8e2ce6c2fdda55625d75aa93c1596bc86b8f60f502df3875ef5705f8d9c84e15c93621e8c2e3e10efde6f6a40f42eff6eae1ae2a1
 MISC metadata.xml 349 BLAKE2B 6da63a8d73fde8af3d6f6623028cbba80ee2a5e0e5a7583d1affc8e249a1f8a3b98920409977fcebe03642ea467855048b294cff9a09f497aedca464d9ef7eec SHA512 ac05cd974aa87477501f2b027bdd735969c099ede8714e8b5d919040a92f634da3961f1c39f1f9131920e73198d56800d5f98700eac5ff17f2a9d18b075cb0d2
diff --git a/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild b/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..e0f6c6b22ab3
--- /dev/null
+++ b/app-vim/minibufexpl/minibufexpl-6.5.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="${PN}.vim"
+DESCRIPTION="vim plugin: easily switch between buffers"
+HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
+SRC_URI="https://github.com/fholgado/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/molokai/Manifest b/app-vim/molokai/Manifest
index c01501bd2706..5814fa8a7e02 100644
--- a/app-vim/molokai/Manifest
+++ b/app-vim/molokai/Manifest
@@ -1,3 +1,4 @@
 DIST molokai-0.1_p20151115.tar.gz 3817 BLAKE2B 595691992ab2e1820afa105ee23a123f28db7c5bca80e5b99e87b7b3b081d1d1e10f9db81686bcc98ef79042118f119b0ae191ca9e7a7b8004b95267f35dfef8 SHA512 8ba5821dfae8c723185999d038142b2061b01ec8c9c6340fd082bac0bdf78d2fcc21a8e3103f20b58bc60c38ed62966376903e85f5b9b49947d38c8c34d14908
+EBUILD molokai-0.1_p20151115-r1.ebuild 411 BLAKE2B 40dfabb107f68ad769815ded24da754f7a0eb38c1354ecf71bdc6bf2e58b6b91ed585091d3f8629d5e3effea6b698375b9fa15ee7118808722793292b9dbaeb9 SHA512 7aa4ca5ddbb3701b0c405d5c5670430a863fecc604c90d6ced24db0c76fcf1cb4c86c4a158a77915ab36838e3f9989a3a3a6028c1397e4f0bc6cd15fb83e0409
 EBUILD molokai-0.1_p20151115.ebuild 413 BLAKE2B 5612f0535876b2bb160dc63e4fd323d4ea5c804f1db8a3d9eba470e51a859ec6927a055ff0416ad1bfe623f6cb2c5e9fade311e8e77edbe9ca5f5fbb87b24194 SHA512 164b52b698b44b950402d16e401670b06c99bfe98d592cd2b03a14bbe1f686edefd53be09081477bdcb093687c2f670b5d882b5fc73de57777adfb284b4d1138
 MISC metadata.xml 329 BLAKE2B 8be00b93f53b01cf113ba208132f48349639c8ce9aa77179ad80c33580a2ee67412e1af67f60e86f0109971bd4375746345c66844872c8326f345b853038c6c3 SHA512 a2c6cfd27bc598520757b8bf220e1957fb4d67b14ba6170fafaadb5f4a3d998705f781a959764702fd504636566bffa3396955775ab6093821893bd750bd0f99
diff --git a/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild b/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild
new file mode 100644
index 000000000000..e64205210f5f
--- /dev/null
+++ b/app-vim/molokai/molokai-0.1_p20151115-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin vcs-snapshot
+
+COMMIT="c67bdfcdb31415aa0ade7f8c003261700a885476"
+
+DESCRIPTION="vim plugin: molokai color scheme"
+HOMEPAGE="https://github.com/tomasr/molokai"
+SRC_URI="https://github.com/tomasr/molokai/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/multvals/Manifest b/app-vim/multvals/Manifest
index 2c6856cc17d6..84b565cd3ad6 100644
--- a/app-vim/multvals/Manifest
+++ b/app-vim/multvals/Manifest
@@ -1,3 +1,4 @@
 DIST multvals-3.10.tar.bz2 12299 BLAKE2B 83a38101e7f43768af2682187279456ee3c131acb78b1d152de7978ebfea183cec86239a7cf2d76d1602a593f3c46f709b2194f7d2783dbe7fea636f7db3c262 SHA512 6003b7fd2c16ae7b6ee400482aead44a5b7867d9e010d689b1b25452f78f4a84335a257eef56deba241fae8967e57b877132693b1ded1b4b01c0248da472152f
 EBUILD multvals-3.10-r1.ebuild 446 BLAKE2B f5967d4ad703d8121360598019201e799262c95d5f8e1d019741e374fd13228970f894793d43171b01ed23a38e2ba01b5708af4314cfcee5dbbf82e95432e6ef SHA512 42ca07dddb3cf245c5264514027a3f3da8bd2da14ed7a6cb3aea25bfd2b11aae0c89e3d9d0f832951fb6b894b83cf88422eebd7810b35015f6fcc8bf361e2783
+EBUILD multvals-3.10-r2.ebuild 443 BLAKE2B 1f684e788f4015593620096dc964f845ad92915ec48ef9d168c2cf686027a8966459a255d32973940df124e4590f5d61cd27d447754a70d911657aa9fcf6b174 SHA512 c3d8d7e64138728ac04de7ad6a4cce30744422afcfaa20e3331210785060a0fd7a0ef7f2e015ae37947eb80d056e4f7e2ebcd313ede76205f6f5455f2a9461c8
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/multvals/multvals-3.10-r2.ebuild b/app-vim/multvals/multvals-3.10-r2.ebuild
new file mode 100644
index 000000000000..1be9bea496b8
--- /dev/null
+++ b/app-vim/multvals/multvals-3.10-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for helping with arrays"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=171"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
index 5c98ba289a70..02a99d918e34 100644
--- a/app-vim/nagios-syntax/Manifest
+++ b/app-vim/nagios-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-syntax-1.8.tar.gz 1737 BLAKE2B 73f3b40b4e79d3449cc0f62e88efa5e7d2085db6050f05a5dd774a375a477f22844c8b5603fd89aa676bc26e90d4ad21ebc377c11c05a67909d0b65e1861983e SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f
+EBUILD nagios-syntax-1.8-r1.ebuild 560 BLAKE2B a8ac71607937e217f77e93d086bf66958e6a48188b5bcc853ddb811eebd5de49f1444ad6347876c839a47cb38cdfdc210804a02ce5a91b02767ebb1b662bcc01 SHA512 5d3d37690d2931f7c18e7eeb5e146690607de635225b293816af7a50fad6e964ed3ea89193fff3c946985896ac5b434aad766e30401686bef2299bac2ef8c76b
 EBUILD nagios-syntax-1.8.ebuild 554 BLAKE2B 6c6fffa8f2b28b8c5b6d9d9bfecaed41ac1a961a63f9b1aa4b279bfd87082b568a0b353ad1f62f46c927544e1684f31cad30e651735136ecec192dbe0a571b39 SHA512 b3b941d466de458147882a868b6bb70bce6314fb6e57d72e5b2ed4748d2e0393273ce18d9f9c05c4f07b6447cc3fd8fe96ffc3ded44a0bd6c4a9eb0a9dbefcc4
 MISC metadata.xml 453 BLAKE2B 02b397e4f390b40b821f31169c840a60f1b57572de434cf19834d6be612796243a314be081205530dbed8f6bcd72e5521429e33226f954a69a98b34f97532b94 SHA512 7fb595040603bf41105b782649293badc1a51ac2a2c3fbb8986b7937c4654f58b7814169d0c11d5183aa1a3e3129febe2d7b990fd18efd48d6ab8d62c99757b9
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8-r1.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8-r1.ebuild
new file mode 100644
index 000000000000..81df74e6db27
--- /dev/null
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nagios configuration files syntax"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2261"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Nagios configuration
+files. Detection is by filename (/etc/nagios/)."
diff --git a/app-vim/neocomplcache/Manifest b/app-vim/neocomplcache/Manifest
index 765cb679512d..1c32f5182873 100644
--- a/app-vim/neocomplcache/Manifest
+++ b/app-vim/neocomplcache/Manifest
@@ -1,3 +1,4 @@
 DIST neocomplcache-7.1.tar.bz2 73724 BLAKE2B 16c04762164c6b086b4683bba71073eaed0a21b003f7d42bb7e4d5a7a1767f982b80840c229402312622e2f9b3f5c9a0759bfc8ece3b320ab38d94c406453cf9 SHA512 1ed17243722055a08bfda6b3e5524870d55377dd5998cbc5677f673974eebf5ee4019975e6b66c12c8ce5ff804d5c1512e69b7f53f56c1bb6f87638025a3210b
 EBUILD neocomplcache-7.1-r1.ebuild 409 BLAKE2B 1bb35645109e95df34c0c24ada5194543bb25ed73cbbe790ce79420bbd1e96681081b5a7acdf0a7a7d72b2cbac21d6d0742c168d6cccee32acf93998eb24e17f SHA512 5ece8cdef88464189bc80fd269898e659c487fe0e382eb90ccd1ec5aaa54a76c2665782e4e6c69f3bae89a7e0677239d6adb4085ad2b7bad7b9c0027ceb0ed76
+EBUILD neocomplcache-7.1-r2.ebuild 412 BLAKE2B 75605127be4fc3f0303a2c3090fcd0baad83f4df45741080975643b92f3ce1262e8f2ab3008639660fe0c6f2ac045545b73ee8c78481f49a9d4ae45e88c81a2b SHA512 e2b3d0b8bf2ff2517b477579edcd4345e9a3887a9c311be4b10b4199dcd7745d568ba6ecdf64b9e235df3dd51585048bdde869a4685c59190b8fef4976e78591
 MISC metadata.xml 350 BLAKE2B 0e43ce33753d40cebd877d546f27d79fe57e5a8584a94801860b4da00577bdcf96d0362a7042887795f96a20f5a704822025a5b0bd073d2de42e597ae2232c7c SHA512 a86b87584f9544073e49f2561a94518e66bb0ab5053893a7739b791027911048f3aa44c1317bb577369e82c97a692869220273a52d59e32644b87478ef5be76c
diff --git a/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild b/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild
new file mode 100644
index 000000000000..ee52f7f69d36
--- /dev/null
+++ b/app-vim/neocomplcache/neocomplcache-7.1-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ultimate auto completion system"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2620"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	mv autoload/vital.vim "autoload/${PN}vital.vim" || die
+}
diff --git a/app-vim/nerdtree-tabs/Manifest b/app-vim/nerdtree-tabs/Manifest
index 65c49eca1d7b..1bcc17ce5ee6 100644
--- a/app-vim/nerdtree-tabs/Manifest
+++ b/app-vim/nerdtree-tabs/Manifest
@@ -1,3 +1,4 @@
 DIST nerdtree-tabs-1.4.7.tar.gz 11135 BLAKE2B 0c2e5a5616a7e4a22600d20f0d759e95755194a3d867034e3c1f66025f3e19c1df0b38f34f99f7ba2a2ba640000543db5e29096b705d51f5c98098965fa9c562 SHA512 f11172f0f64628752c7b523c7f65864a35b57ac83c966dd765402489c52b78c6a86bca65b99f788f2abf0b3d489e188dcfc9e75b342818dacbae221930aa6449
+EBUILD nerdtree-tabs-1.4.7-r1.ebuild 480 BLAKE2B 8ca2bcf7eae165938fdf1e0347bdd3faf17bc20af9536d0c5f1761e7fc93f18ac4d5d3ae3bb67004e74811b6d247d3358c5ead0642864ff525551502f187db84 SHA512 cb827ab5a6280d471c092611205f498be3edec6df464e4b23523b4d4c677d2a18580be38817d7e4dc573271100593c17aa926efb73ac6e1027950b85f016483b
 EBUILD nerdtree-tabs-1.4.7.ebuild 478 BLAKE2B 3d46488b0ff0b79d3b13180ae6202fb85e901df1d6be4ddf776746801132debcd5b4ac8af0715eb6e8d7177e717a8ff2381ef3991334985c6094f651622db798 SHA512 79976817e2e36c9236204cf61cdb5c7643d47509d382fe61b1265e49607a997050448424412b5601a9c1e555d684355fa2ffc0a189fe3b7cac646822f326789b
 MISC metadata.xml 433 BLAKE2B 9e902d815235643adc6b4aa98d42be74ea34fc488d883740b2edeee9868e7106523a51c10d59ff1954174ef50d2342555b58159d3334c086219c5e3a9cab5aff SHA512 87d89bbf0f673948a8ae827e8be27c76901641b425d8ff919224e1939b93a82a2449de729c1a44db35f5c01057d668d368a728512473358880d05f46824f46d1
diff --git a/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..4db2fd61abbf
--- /dev/null
+++ b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: NERDTree and tabs in vim"
+HOMEPAGE="https://github.com/jistr/vim-nerdtree-tabs"
+SRC_URI="https://github.com/jistr/vim-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${P}"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-vim/nerdtree"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index 494dbfad8a58..b0eded57e209 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
 EBUILD ntp-syntax-20031001-r1.ebuild 443 BLAKE2B b105d1bfc0a191e9cb2150bc329990f218cb3465dfbc5e42c4f8082cf36916aa2e25945a75a14eec6ad3ea982292df5b6e0e3dc6f79f6780af8cdc43c7f977bb SHA512 0b4fa877b7b1ff76c1815a3786e9c5224c4820d2797eeb10bc6d91632c08c0b6a49bdf239b1cfd41b4872cef1937a63f6cd0a9607a70e5930d6374e47e5d454e
+EBUILD ntp-syntax-20031001-r2.ebuild 450 BLAKE2B fc15d3d5c9c82c99bf61a9ab378a0f5003568785decbef2f5724fb68ade510401efbe3a989537debe7f914d3759c4187db9281a984878aa4e5397186a21151ab SHA512 221db7bf8f8f4d9c30e8a60b162de859062bb2dfa90e5e056e5ba8acf4989b55308e3db8095d040184b40163e2002fd17658ebce223360c437b2c0da4829c02a
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r2.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r2.ebuild
new file mode 100644
index 000000000000..b42383124d36
--- /dev/null
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/omnicppcomplete/Manifest b/app-vim/omnicppcomplete/Manifest
index 7f8bbdb509ad..fa1dec25d958 100644
--- a/app-vim/omnicppcomplete/Manifest
+++ b/app-vim/omnicppcomplete/Manifest
@@ -1,3 +1,4 @@
 DIST omnicppcomplete-0.41.zip 38331 BLAKE2B bc85f1a90edbb837363a09d28db6c36842a90952f8965ee9005dff0aeea1e63bf68ff8ce37f09da36f245f3ef3aca36b9cbc5439d0c1c2c6c759fb0d4b276cfd SHA512 565703f0e21f818308dbfbfaaec981eb522621568dee5b021bb8fe243da464b1d7defa45dc1cc2ac3370b3b3c67fb39dcb0dd7a1535a4dfe2ad81218f4ac71f3
+EBUILD omnicppcomplete-0.41-r1.ebuild 532 BLAKE2B 4cbaa83f18bbb7474d63aa181822d248b94cfd8d2b50b80ed4b1f519f5bfc1da12d7e1eb135c9e9afc553f74972da68b5889178de61bb72fdea9e7669f830bfd SHA512 0756c2bddc30a4f3b6ff74e123fef50cdbdb88e1d8cc05c59538ff97c520306615de774d218dbaffaae5872430d5694bcef9e5c74f62009a1b70ba0ed5e66366
 EBUILD omnicppcomplete-0.41.ebuild 537 BLAKE2B c33544b7270be70f0ce7d671d92ac5db567cd5c123851b6723cf9a381526c4f18b357158a1cf6552a7e88d0e694d5483200c453140835d35feb8c0fc615a4c1e SHA512 23931326c6b7c1dc8e34d94b12133e6cc28a3847c3d18be4afdc6771840b453d77c1f7802169a8953a910e095bd8b38bf60376d4932859adf4a94724d44c55a6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild b/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild
new file mode 100644
index 000000000000..c68d0db8cdeb
--- /dev/null
+++ b/app-vim/omnicppcomplete/omnicppcomplete-0.41-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIM_PLUGIN_VIM_VERSION="7.0"
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++ omni-completion with ctags database"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1520"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=7722 -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-util/ctags-5.7"
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
index b0f6f206bb96..89e98dc314a0 100644
--- a/app-vim/pathogen/Manifest
+++ b/app-vim/pathogen/Manifest
@@ -1,3 +1,4 @@
 DIST pathogen-2.4.tar.gz 6458 BLAKE2B ce28371994938ab4386a6e0a45a9b096443129b7e8de47c92a4c1fa819b7c2aef1e32153866fd1d86a60f7ee2fe2c59ae972700cc22dec263364ef8f51ebe24c SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe
 EBUILD pathogen-2.4-r1.ebuild 448 BLAKE2B db9b9189458ff3b7feafd8287223113b656bb97865a9b958395e8b5b1062a2cf6f8f9c2c1559ae78534a8db8195ee7c222bd8cb676b15fbb2133caf00d2f0e5f SHA512 28864afe4b2eeb7f4670f487db6b055b3014184913db9a8e9864bee713f5913c63008972ecd3e0655c7527af3d11eb3e86b74e4a438ade21fe1ec57d275b1ba9
+EBUILD pathogen-2.4-r2.ebuild 447 BLAKE2B 77a4f41647619a969c0c664499c2dd830940cd94c791e6a3d4a877631354c1407bb41d0537a6084e60cda54762c526e197cf783dbbb4440bd3e8f30cebcf3d03 SHA512 38c35ed6efe73d3dfc51f645bdb1b67ca7212712ce80476eb124c3ea598aa3b3b67cbb9fada84e0500789900285ecfb64c81892c13457f53de370341a095c12e
 MISC metadata.xml 343 BLAKE2B 0c9004a4447321dcac607e35991a59cafd08ede04d3cc6ab3b4b3804d23a3735ae5eb9bf3497362756b619d679625848c691c0d91945e2de31fbf3859ff481aa SHA512 4bc1d4eaa4c8535fb02a3bfd363ae7e988040d603bdad7dc8c22996bb7ffd341365394ed16588bd85ba3cb51bd48a2a1d6b676e0ae28e824a96f9280698d5f22
diff --git a/app-vim/pathogen/pathogen-2.4-r2.ebuild b/app-vim/pathogen/pathogen-2.4-r2.ebuild
new file mode 100644
index 000000000000..bc7c022bf56f
--- /dev/null
+++ b/app-vim/pathogen/pathogen-2.4-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: manage your runtimepath"
+HOMEPAGE="https://github.com/tpope/vim-pathogen/
+  https://www.vim.org/scripts/script.php?script_id=2332"
+SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${P}"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
diff --git a/app-vim/pdv/Manifest b/app-vim/pdv/Manifest
index d1617ff27704..55334576cbd9 100644
--- a/app-vim/pdv/Manifest
+++ b/app-vim/pdv/Manifest
@@ -1,3 +1,4 @@
 DIST pdv-1.0.1.tar.bz2 4473 BLAKE2B f0f41f97730e3a9b5b7f29228652e11eb1f6dafd37e349653c2ec511e84719c615d15ed692ed60f8928a98388614682da009fb1b704bbbeade13523754a5eeaf SHA512 4d7cff977b690d6bf54885aeeff201033b3445aa118c4cf57ebde9cd71ea6e0e548d6c3419e7344aecfe4ca54de01f306406fe3d2aadc7d05d010093792b679c
 EBUILD pdv-1.0.1-r1.ebuild 539 BLAKE2B 8dcf066de9c56b547e08991b0709d41f31eaeb4ef1853b462989fce802b5c2f784a4db3589c4b23d7086c1929ff4d6d18960e6bce8dda3f989fa2691ed8ea8ca SHA512 fccfe55173ec6745572a341e1a44c1fccc3aaea88a6937c6837a98aa5f43ee0eeb9802032ed718163c63e9680f3962bc164b7de4ad3aa19e8a330f2167a8ea93
+EBUILD pdv-1.0.1-r2.ebuild 531 BLAKE2B dfd676e9d5ffb779a7e110bd1a7a4f7fa9d4c88a4c5da06107d9888ce783e8f5e4cad8e015c224195763ae2c23b998194e55cf47e0803e9c0e8d1942451b0572 SHA512 fe4139f0436dfd5cca74197502c1f9e75d29a064515bf08206d63f8b60527b7714ad5fb19e344548f4b2cbdaaaffe27a6cb468401e5f2373eb4da44e25b2a3f6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/pdv/pdv-1.0.1-r2.ebuild b/app-vim/pdv/pdv-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..a8a2a1562d1b
--- /dev/null
+++ b/app-vim/pdv/pdv-1.0.1-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PDV (phpDocumentor for Vim)"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1355"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPTEXT="To use this plugin, you should map the PhpDoc() function
+to something. For example, add the following to your ~/.vimrc:
+
+imap <C-o> ^[:set paste<CR>:exe PhpDoc()<CR>:set nopaste<CR>i
+
+For more info, see:
+${HOMEPAGE}"
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
index b30aa808f37f..20606d2b4eb6 100644
--- a/app-vim/perlomni/Manifest
+++ b/app-vim/perlomni/Manifest
@@ -1,3 +1,4 @@
 DIST perlomni-2.5.tar.gz 20152 BLAKE2B ccba727b3ed2317a2f1983202eda97dac38080ee0e79173a402f45956c713741acebe9c79ab8321bd5b3c23481bb02963fe93edc26d022ccf29d3724a704f006 SHA512 5a7eb10233d620db73387d79801b451183e1a00f3086f4667cfaa871e6cdd43b1c978beca8eec28050148709d98e8f55be048806f111fb4bdee16a4e22786bb8
+EBUILD perlomni-2.5-r1.ebuild 486 BLAKE2B 9701a7e636367c8ebe4b4c3d71875fcac8e85b9004df22ae06ec9d980ee9a3a00393d4b933b9d4805b62ba840a33dd10ff0745cd6669e566dacc669b51645f84 SHA512 f54c99a1719dff74dde1c1ba3d6b5e68874420552706894a7bccd917ef93fad98e0f79d7cbd4749a449329171e65c2b10f9ba66c5cc89300d96d8ebf7a0e12b3
 EBUILD perlomni-2.5.ebuild 501 BLAKE2B ca6f5252171334a66a8db60fd1375d3d69f27de6b79254acf6e96363c4507cd68297033b59ebcfc61ab7cbbdc1baf9967e6c3496becae2b5bbd21bb90152ee4e SHA512 2911f98f026336cc01569b340e39351d364e01d64edf4c80f4a6252ba0605a39ae6b8b2f9722406bb001a270217ed44788d3ccd6b7c98286d20b07dfa4aa5ca2
 MISC metadata.xml 426 BLAKE2B 8812688fddd7b4c8866d9b9d158d380477b4004ce5bb4628759bff08e3c4aaa75e9373896eca7fc29ffb67aaeb92cc0e7b86370984af77f32dfc42adc174d217 SHA512 9aca7dd978539c36113dee4f6ef4568e13fa4e4428e8bf9f14c3e684df364dfec6b4da83399baeb7d6b80e6e6b56ca3f2bd41faeaa3724abf4990bcfe8984f05
diff --git a/app-vim/perlomni/perlomni-2.5-r1.ebuild b/app-vim/perlomni/perlomni-2.5-r1.ebuild
new file mode 100644
index 000000000000..fbaa53b23584
--- /dev/null
+++ b/app-vim/perlomni/perlomni-2.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a vim plugin with Perl omni completion functions"
+HOMEPAGE="https://github.com/c9s/perlomni.vim"
+SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_compile() { :; }
diff --git a/app-vim/pfsyntax/Manifest b/app-vim/pfsyntax/Manifest
index cb3e2970b62c..dfea3d7c54d8 100644
--- a/app-vim/pfsyntax/Manifest
+++ b/app-vim/pfsyntax/Manifest
@@ -1,3 +1,4 @@
 DIST pfsyntax-1.3.tar.gz 1540 BLAKE2B fd590d18815d947a20f76fa5b4d197131f1fa9170ef7b0b2409c2782188706a300cebda20c89f90f861836ae440f509f10588eac4bb947fda14043d3eff44819 SHA512 6967cee9a039f405a4b42a44678d5c632eb93ef48486c03a6929991d31ac03677cba4223f49c14e6c9d73b15db9469b3fa3c0f2586b4994d25634d0885121c5b
+EBUILD pfsyntax-1.3-r1.ebuild 407 BLAKE2B a53918a3a6a7a8cb6a51422d2283bd4e7250fa77e3920b0961d09ae21b604215ed86c5f3c16ab79094ab93a3a033decf0b7ae7a983bcd6155fbe8074bfa01632 SHA512 f351a926c277a905fd168e8de4182c0e2e2234af204f0ac9ec2452d7abfb843e11f31835b2af7faa34b75618d3753138ad116f1ff083f3139911a798775e6fb5
 EBUILD pfsyntax-1.3.ebuild 408 BLAKE2B fc31fbd6f8e65d1ac9d502133b18ea9b22371c8b719c31de7a0c45a5c22d52a6342c048d64ed601e070e52d3e8fd79a2148863714b2520880c096e142e6e8030 SHA512 e2f853e414ac2feb140983c28fc53392f0a928a0c86666371df1555e595a1e2a29c59e85ef80795df23a92822bc202d5b0f4b35b530506f168094056b116b22d
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild b/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild
new file mode 100644
index 000000000000..7bbe1ace8e51
--- /dev/null
+++ b/app-vim/pfsyntax/pfsyntax-1.3-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="pf.vim"
+
+DESCRIPTION="vim plugin: pf syntax highlighting for vim"
+HOMEPAGE="https://github.com/vim-scripts/pf.vim"
+SRC_URI="https://github.com/vim-scripts/pf.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/phpdocs/Manifest b/app-vim/phpdocs/Manifest
index 0886344aa6ba..78217c939491 100644
--- a/app-vim/phpdocs/Manifest
+++ b/app-vim/phpdocs/Manifest
@@ -1,3 +1,4 @@
 DIST phpdocs-0.26.tar.bz2 3772 BLAKE2B e14b0a2ddce2ab375adf845e06f9d760bb09611a930d5a2988d1e33bcf2d2890c5be81b1d148f48d8fc96a87b871a19abdb1223a00a13b611b6ba2dbc62d44fe SHA512 625717ce5e8cfe8ee6fb76611df28838f6bdf54905af138dccf6e2870c29c36f6c618872d81990833c06d30ab3f010445d2d31fb4173eb8b245113f8b5c87bcc
 EBUILD phpdocs-0.26-r1.ebuild 504 BLAKE2B 7afe5e96fd0c3fefc36bdcb916f13734dcafbb8698035a07002d823a3469c6cb1ade593e9196654fd872e346b97c2d16979bd1a382e2be9b2eeb17a43aee841b SHA512 fb61413a458d8f13fe49a23dfba7d091e54f977a6b9c967d41d392f4be7b2ed7af30f098136cfd8f3db1177e866fc44906804256f3a232352b67462bd28a3839
+EBUILD phpdocs-0.26-r2.ebuild 509 BLAKE2B 6cddac286c7418e73b5e5557658027c9c1a6463a773bbb49afc1b1754c4bdae3676ed13e6261e4ee6c44917e79766e77720918be34b00bf1ec2d00f63ed7e140 SHA512 312ea59ec87d707b20a64d3f0d4e317778d944dd6d19bbc8fbb4e99f21da924a2b89ecaebc2d9db5f1fac1bb87c6011061c2649d1bcc4991b281a4278eb9e8e4
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/phpdocs/phpdocs-0.26-r2.ebuild b/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
new file mode 100644
index 000000000000..6309b5e44090
--- /dev/null
+++ b/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PHPDoc Support in VIM"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=520"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=520"
+
+src_prepare() {
+	default
+	sed -i 's/\r$//' "${S}"/plugin/phpdoc.vim || die "sed failed"
+}
diff --git a/app-vim/pushpop/Manifest b/app-vim/pushpop/Manifest
index bf2b618b53e4..e389e333412b 100644
--- a/app-vim/pushpop/Manifest
+++ b/app-vim/pushpop/Manifest
@@ -1,3 +1,4 @@
 DIST pushpop-4.0.tar.bz2 7486 BLAKE2B 6f0a4d7f91d1e7c4c2409485784070efa99257f3f96c257a23f9f444fe4e08307fb3e1dd695ba6a205e290fa1f15768bdd9c6346c9b52cd6151cb83eb6b1ea10 SHA512 84f61908ab25ea6028c0f77d935286ffe3b8905400e455e1d123ca6e53cca2422e066adfcd8e75d2ad1d63d7e01524fea286a2eeeda3dd0968076be6a4229684
 EBUILD pushpop-4.0-r1.ebuild 514 BLAKE2B 743f1c2432c92ae1ac6d16347a635d66194c365ae0c86316e5c3abcb16829249e03a438ef2e40c846c1e5bd9fd19289897aa1173dff0cc2952ee70418b3ed281 SHA512 c618c2cc11307a2bb105caad5dc3380c5e4017272538046cd037da7d903fc9240f744760416fefeb6da06840025594002e8b370ca63c03cbbc3e669ad5a55899
+EBUILD pushpop-4.0-r2.ebuild 511 BLAKE2B aff0b625c1cf61c4d0f901bb4e3ed5dfeab5fa8fa64457c82445c1ddef0e892e8a5d665b60820f7681c696e7faf60418a41baef19c41ba3559f686030e1acfcf SHA512 9998a29e3e4a4bfc0cc66dcc226343f86c8422b9d935040dff6f5ee04e167ae30624af73c3f104e980bccc2f0d6d3c8e96d69ae70c1b6b450cd97a7819b9b3c6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/pushpop/pushpop-4.0-r2.ebuild b/app-vim/pushpop/pushpop-4.0-r2.ebuild
new file mode 100644
index 000000000000..0e1f79e43ff9
--- /dev/null
+++ b/app-vim/pushpop/pushpop-4.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: pushd / popd from the vim commandline"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=129"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=app-vim/genutils-1.1
+	>=app-vim/cmdalias-1.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides :Pushd and :Popd commands which emulate bash's pushd
+and popd functions."
diff --git a/app-vim/pytest/Manifest b/app-vim/pytest/Manifest
index 051fa7a520b7..278555c4c417 100644
--- a/app-vim/pytest/Manifest
+++ b/app-vim/pytest/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-1.1.4.tar.gz 10550 BLAKE2B 3da7659db866c25c57ba74f9db40c161faea228b389cc06be973778c5c389ac5ba6d46d16c2d47a4e9640e92b68344d7896400ae1b795725c95410013df55da5 SHA512 94240b763c332e5cd46169af86c6e775993a8ec48e5ad4138cda1dcc5798e2f40f61c484a04a91f9d7a351f3f583c72e56254bda9af8843b2a99aa451d1a8930
-EBUILD pytest-1.1.4.ebuild 498 BLAKE2B baff4400e53a36763028b567fd83186ff36670d36273c6ae80916c2cfff88e4661f684542a07cb057b22dd90fe4db7e8099e0e593cb2fdf32aac9fd44a2880cb SHA512 229083fb4672c3e068df4f48aaeb56ae34aeaba73565b29a03ca1722ba2f51cfae6b62af0af307a5540803e8cc7025fc6911c10a9102a1245e8a5b40eb828c95
+EBUILD pytest-1.1.4.ebuild 487 BLAKE2B b68abb5a65d99149dbfca15d7ea1d2cabdf5ffbab53012ef86bf6b68176f600f112fb84a684e9daf871b87a16bd25a60debd991bc73b0060c38f4ac610b70e42 SHA512 ebd2cdc7fcb3dd4b99015621b023aef70e61420bb4ea4c0c7de78f717db20d27cf2efd9d8a24b4876ccbfc935a36ca42d7079750a100f0576cee9ea8dbd5131c
 MISC metadata.xml 341 BLAKE2B 8f71baea12031c28f182d6756ee35380a259376c642512f048f4d9190875d3258be79284f70370e6df0a0acd1f292f00ba2a3ad3eb32e450b654c8260b19f8fc SHA512 15fffe8780d54b877138c30eb55ce8d26f8c66b3298f25035d91453c2ef9599141bfd0eba600b05f560beae39f43e58e3baf2e62b3aba3c2c7faa2d8a5655b74
diff --git a/app-vim/pytest/pytest-1.1.4.ebuild b/app-vim/pytest/pytest-1.1.4.ebuild
index f037f84ce118..abdc02ea5ab2 100644
--- a/app-vim/pytest/pytest-1.1.4.ebuild
+++ b/app-vim/pytest/pytest-1.1.4.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: run tests with py.test from within vim"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3424"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=18178 -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.vim"
+
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 RDEPEND="dev-python/pytest"
-
-S="${WORKDIR}/${PN}.vim"
diff --git a/app-vim/rainbow_parentheses/Manifest b/app-vim/rainbow_parentheses/Manifest
index ba7f49432387..326914243b68 100644
--- a/app-vim/rainbow_parentheses/Manifest
+++ b/app-vim/rainbow_parentheses/Manifest
@@ -1,3 +1,4 @@
 DIST rainbow_parentheses-1.0.zip 2827 BLAKE2B 655905c1b54d5c885e1a06fe4403786b76958ba47d0facae3d3a1e657ae0a702b3f939383e2f617f5bdca9b33193dd52196eff5915236180e0d9d4a6a4e22e79 SHA512 326310058a7dd25fbd47105334cc1a6a059d40842afe48164922b7869af344dc230a5f3b329c13d5d0ae9779814507defa8d0ff56b951556e8f2bd685313e569
+EBUILD rainbow_parentheses-1.0-r1.ebuild 488 BLAKE2B d01322bf2518d2fad2c4a2ac44debd056cf28c4fcb9ff1527252eeeec972070f2d9f4d20b2c5b0d98c67b0d2e6381896c60915c38c3c9182e69a622326ec3caa SHA512 9c0f94b2c9e430e6e845386686d83cbb18decb0985c5a0e50a038b73cb9f1a0d6cf5daaf71fe2536f38f330572c7fcd6846b0b1be9dfcb03cbf79478e81e7983
 EBUILD rainbow_parentheses-1.0.ebuild 484 BLAKE2B df16ed8822c049554d108fd53f79d2ebe5fa7f0fce4e263248d4d5ef4a936b790ec52722aed8bc69b9763ee9ba361846b64b51b4f857967a97c5958d87ae3b04 SHA512 8ba476b0f9c3339c225103375fbef9a1f669a83e2bcb79595b5aeafa7957d58668de4d85f87af4c8c9d77a1b5d1f82a7a1dd836e4a222df32a28d78e454981f5
 MISC metadata.xml 455 BLAKE2B aa896d9c77a04ee7aef89371d37e85d4618761cb58cb8987e0f4569f452b089ce3e1dbce9ec6782890d7be1f9ae6cc206b6a09d15f72f7f8e1dd3c36b22e42b3 SHA512 5b71c496aad67e89c23b98aa31114a7912dcbdd11b866a76ff0a313c957e0eaaae5a75dc3cbb734f22241505203841116f3020e642cacd90f75d52dccf1d0dcd
diff --git a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild
new file mode 100644
index 000000000000..88b4d3611f30
--- /dev/null
+++ b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Colour parentheses to differentiate nest levels"
+HOMEPAGE="https://github.com/kien/rainbow_parentheses.vim"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+S="${WORKDIR}/${PN}.vim-master"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+DOCS=( readme.md )
diff --git a/app-vim/reload/Manifest b/app-vim/reload/Manifest
index 04af68929aa5..4c4aa8199f2e 100644
--- a/app-vim/reload/Manifest
+++ b/app-vim/reload/Manifest
@@ -1,3 +1,4 @@
 DIST reload-0.6.17.tar.gz 7028 BLAKE2B bb8e843e1092c7e155546da5aea67280ca4b028c037547434f00e15bed29d7fae062289bc8ca506ed9be17674ce63494f72273797ff7022aa95b46405b0a4a63 SHA512 639ffcea9bf94b0a8346850078f59ff332ff6180b042d2c22662d5c637307969644607ca3f19e2648a1ef9a019788ef1f83be52b627ca6784e16d1b7bddc39cd
 EBUILD reload-0.6.17-r1.ebuild 456 BLAKE2B 3a91603ba9d6802e14eee4e30f0d9f66015c51cf38b51fe9ae0b0b39e86e9edf2f6fad384a8bfe58c3dbc24ab80207f524b1d581659d8e40035cdd140e851169 SHA512 17e223eddf17fa8cabdfbb73ad5d5f80ef31a1c3bd919dbbeb6680ea872eac6e90738340b719a06b9313600857f4bea059fec002f428c42da8427698b5f90c3d
+EBUILD reload-0.6.17-r2.ebuild 459 BLAKE2B 74ee8462a5185ab1329dee7b55f7897c1f83737d413502d5a96c592e180c8ae3ba68c77f7e10203acb13c376548d1e23c01f23eac6d4b03c82b0eba9af82373a SHA512 c9de9be0d2ec38ccfd5338fc22816ff2f2689807c6806b78ac58f02784d02d330ec7aaf80920e8fc79a22012e9b8b9031fe7daa978f01b91b781b49a29d09f20
 MISC metadata.xml 341 BLAKE2B d208aa92af6bbdd5fd65713daab4c7a01497f5cab6ee50db69ef6075e0fef5ebc400d589614f3c47c6793570171b05d49308efc89bdb67f89845a3f25f1d7919 SHA512 7c1e22a8026da62e3e83d537989f2d0f977ee47525c610a0ca3cda0bb86dad37395db653110dec9619ca2ec19dea0ea43d74d90a8fc4b1728bc4d428fc49b56e
diff --git a/app-vim/reload/reload-0.6.17-r2.ebuild b/app-vim/reload/reload-0.6.17-r2.ebuild
new file mode 100644
index 000000000000..31d71cda3268
--- /dev/null
+++ b/app-vim/reload/reload-0.6.17-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatic reloading of vim scripts"
+HOMEPAGE="https://peterodding.com/code/vim/reload/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${P}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-vim/vim-misc-1.8.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/searchcomplete/Manifest b/app-vim/searchcomplete/Manifest
index d093d33dbb0c..5c134f410b51 100644
--- a/app-vim/searchcomplete/Manifest
+++ b/app-vim/searchcomplete/Manifest
@@ -1,3 +1,4 @@
 DIST searchcomplete-1.1.tar.bz2 1204 BLAKE2B 0259eea8117d2e27eb939b1d8f5a05d4d2d6b9b6b493372c5d15a7a2a379b112e7eb2c385392e37d5ef3ac2d1e77fdaa7640a6579af3c4e55a1dea8e63b4ce64 SHA512 8c30b446c330665d303935f07566aa0b3ac8bbb89a3068d5da40209f3a4d17dc3371245dd7bef567030b1a33653f9c481cd1165ee200b0c73723da5f5aea2043
 EBUILD searchcomplete-1.1-r1.ebuild 392 BLAKE2B 37177f2e5049219fb4200b89c7ed36f752fa485f9b842986ccfc20028abf4a8028e8bd34263d0acb745c5c494a2cdad069fb3c6998bac5acb7e56ac7a489d0b7 SHA512 090b2abb7c2aa56ea8710f9329937d4a6c87e3cec9c3a087e171144c6dce1791b07d205a578af1ec2e90dce822542b13c989c2bb2b43dca8fc1739084c075078
+EBUILD searchcomplete-1.1-r2.ebuild 389 BLAKE2B a6bce9fa04133946cf7edc4d6e3046bdf49319b541ef453cb3acb421d2f7da9319e0673ccec61cae86e4c050e6aa499fa011bfdbbe2411ca21df72d1597c38c4 SHA512 a3e5be158c3e1d530280877275d21ee822df919db74f8348de2fbcf130000f57a3b382cd9bd63da5f307bba2a0653752e2cf6246a1a65661cd476f85afcad7c6
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild b/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild
new file mode 100644
index 000000000000..3c81583ac01c
--- /dev/null
+++ b/app-vim/searchcomplete/searchcomplete-1.1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: tab completion in searches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=474"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=474"
diff --git a/app-vim/session/Manifest b/app-vim/session/Manifest
index ccdd59ea6c58..5bc961f81a9c 100644
--- a/app-vim/session/Manifest
+++ b/app-vim/session/Manifest
@@ -1,3 +1,4 @@
 DIST session-2.13.1.tar.gz 79688 BLAKE2B 772350bd96bea4ef0fd83e0eac214d308c6c40965b3236c8b8c645bc59058ac0a78427563174f4dcf7d88d2514d1437d825f1486693ea52adc281a393de95b9a SHA512 44a7ca107da6710f70705646b4ace26a92abfd56802dc38e22e620f4155c3752d4c880b0055089d85d52b54e34a5c7b47bfc4c39721bd3569ec335c4d3a91efe
+EBUILD session-2.13.1-r1.ebuild 462 BLAKE2B 99536cd72ead11a791f00af8f03a535d9f2226fd200c118df7ac9242f16016f7a32f6229fd8d5af3685c0dcd867bee0b2d1571da6583bda32d5a39e87a2940a2 SHA512 c4584a5a6b50f465861ff02458138e489a65ec1c3888913d67b840b307781b29a48d3db042dd455c9a85cb23298d6697606339a8a370ed644fc167f4dea04548
 EBUILD session-2.13.1.ebuild 457 BLAKE2B c000d62748951c453db0c4b1af245eff0e751de518aa819143461fbc1818a4f4c2615ba4d34d1d3ad74ef756655df88dd26eec958dd168c9ba8d87ed01b2f2ab SHA512 cc959ab1f5e65e8d13ab2bb884ed2522c8330451a3b75e4a9013bfcedd96bd7599f7e976e8914c7c3ac46ca2240fb016197633073b1e8e286a8b8c475822c410
 MISC metadata.xml 342 BLAKE2B aec8c720569eee58c95dcce4f9cc6a55279c94f94f1292bd593143ef6e19edb34bfe8a3c4bb3d821c7f94167d82fc7272c514d7b6fee12c7d194e328d1372561 SHA512 fbb5bce889142f593dcdac30dca2fa3c2e1562e3748588aaed66a624afa1c82c2143f19ab9845e9ec00fd00fe8526b7c8393a4574e7f09ed87c2d81efdb2a49a
diff --git a/app-vim/session/session-2.13.1-r1.ebuild b/app-vim/session/session-2.13.1-r1.ebuild
new file mode 100644
index 000000000000..f4da87a6223c
--- /dev/null
+++ b/app-vim/session/session-2.13.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: extended session management for vim"
+HOMEPAGE="https://peterodding.com/code/vim/session/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${P}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND=">=app-vim/vim-misc-1.17.6"
diff --git a/app-vim/showmarks/Manifest b/app-vim/showmarks/Manifest
index fd56a207f56e..0bc8292d910f 100644
--- a/app-vim/showmarks/Manifest
+++ b/app-vim/showmarks/Manifest
@@ -1,3 +1,4 @@
 DIST showmarks-2.2.tar.bz2 8195 BLAKE2B 2be7ef6fc040fcc6d808771ac45523148685b466b5eb7ffc6c5b31f4a2387375c84aae931ffcb6494ecaa9cd9713567e9f7fa19981678cdffaecc38aa9f27bdf SHA512 0121070d8b8c51b3b31c1d052b368fac304ee38e413881e67e2b9336b1edcae6af165c592d592f42c502834856d2c097b575571286574ba83a51d4fc9964b7a3
 EBUILD showmarks-2.2-r1.ebuild 836 BLAKE2B 4db0ebf081f3cc2ab83f7d15b18106f3eda8c3056a9af6b3d13675d2216e8eea5dd4f82d070936ad45cd99fe7ac310789f60484a34ef8b10800eb7b536709e5c SHA512 369ad4a48d68132bc31a7d0a8a2ab1f3610a5985399b17e2ed7d02b9b16305ed04f05e81b3e28b703568cec282923685b6815df68166a20de450bc5f1cd07b7f
+EBUILD showmarks-2.2-r2.ebuild 832 BLAKE2B f3aabedc5f48259f8a87bbbbc7177306b1ed62c62416b73d1e0352e00c3f0f253a9b1fa72308cba729171babdb568878cfae65aad4762a009b4774ef3485c525 SHA512 d3a27a24008eafac77eed26cac698bd476008b6725aea964ddbad68cb3647078e3c7514fb2245c5a3182a02dc027b1d215f3b64ebc0dcc997bf360d80e87c504
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/showmarks/showmarks-2.2-r2.ebuild b/app-vim/showmarks/showmarks-2.2-r2.ebuild
new file mode 100644
index 000000000000..247c654173bb
--- /dev/null
+++ b/app-vim/showmarks/showmarks-2.2-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: show location marks visually"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=152"
+
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPFILES="showmarks.txt"
+
+src_prepare() {
+	default
+
+	mkdir "${S}"/doc || die "can't make doc dir"
+
+	# This plugin uses an 'automatic HelpExtractor' variant. This causes
+	# problems for us during the unmerge. Fortunately, sed can fix this
+	# for us.
+	sed -e '1,/^" HelpExtractorDoc:$/d' \
+		"${S}"/plugin/showmarks.vim > "${S}"/doc/showmarks.txt \
+		|| die "help extraction failed"
+	sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/showmarks.vim \
+		|| die "help extract remove failed"
+}
diff --git a/app-vim/tasklist/Manifest b/app-vim/tasklist/Manifest
index 97e06cdfc86b..1564c7d81960 100644
--- a/app-vim/tasklist/Manifest
+++ b/app-vim/tasklist/Manifest
@@ -1,3 +1,5 @@
+DIST tasklist-1.0.1-r1.tar.gz 4051 BLAKE2B a74081063f4c0e25bc05534098fbbc77069e2df9be848df9342e26d8466b0d20cf3fb1daae133e4d8043447f3788da96ff4f18a976869006aca9a56f0488a0f1 SHA512 46ab07f5618e37a99eb3d8268adbc3d2aea278e320f43092601b7c6179ece7811610f1857ff01a950aa526905dbad72a412413e7793ce6e150db3a65e8c0e519
 DIST tasklist-1.0.1.tar.gz 4066 BLAKE2B d55e12f28546f400b34e11636814205e94c3c82656a068c9774fb23fcfd336fae059efcf307043b6bcbaccb939a4a4ed8d02c9a5944381bece096c57f6092ade SHA512 623ec5b147e485abe3e246796a6ed67dd8325ef37708e589c4568897da10ba70076eb5dffd9fb9333fc29d045c316cf382950de13f616873334fc734875600b9
+EBUILD tasklist-1.0.1-r1.ebuild 407 BLAKE2B 0ea741fe1871087841549b6607e2e4d03fe7658eebb35b963cb48000396a75a19449c2ef7d943e7331013355081ef730483aa8d6b4d33c1b83582b485b035f55 SHA512 2d8885e1f8568cca7e87bf72cf353b340c6716e20615fb6301e89c62b3f6613c05ff4c06745984ecb365a747cea2e88163582a6d9fc5ddac6e249fa489280f20
 EBUILD tasklist-1.0.1.ebuild 397 BLAKE2B f0baba7365c46c2120083d8ad37ed1fdcd21e447c7d64ee6fa332701b8fa33dba64cc73f93d06321cb3292fbc5c945ecfc512beb5a9a5a9aeb36ada412770f48 SHA512 647a2728b9115728ffee66484604ce46c618635bde9dbe4f36674360930911c1cc2933d2801fb5fcadf128fb4bcae5225d9fe8122d36a7041ede0649175bd76c
 MISC metadata.xml 451 BLAKE2B b554332b2427e5363ed10499b21a233d81695c43e39fb000cff2d961be7b8102f5037d1ca11d8037dc1f258014941e7a7296786da5f6df9d44eabab00180796f SHA512 5982e7e9773cb4a0a3187a411db82b70f276d0b89ffa0b466a67627603c70ca7d5fd527ff48ef7ed477ba6aaac77133aac4746e7d957b52fbaef9bc2a433c3b6
diff --git a/app-vim/tasklist/tasklist-1.0.1-r1.ebuild b/app-vim/tasklist/tasklist-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..6c8b33fc5db3
--- /dev/null
+++ b/app-vim/tasklist/tasklist-1.0.1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin vcs-snapshot
+
+DESCRIPTION="Highlight FIXME/TODO/CUSTOM keywords in a separate list"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2607"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/tcomment/Manifest b/app-vim/tcomment/Manifest
index ba009183d101..613a63d993fe 100644
--- a/app-vim/tcomment/Manifest
+++ b/app-vim/tcomment/Manifest
@@ -1,4 +1,5 @@
 DIST tcomment-3.08.1.tar.gz 49918 BLAKE2B df63a01432101e018a39f7b54dec0b91b415263e2b6c0f3e63521e1abe2247a005a1fc900cd6d18cfd908f75ae4b5767a5f7dc21ae620985d3465676c456a389 SHA512 609d5eb1e7785fb1af829000ab27ab63ac2bb7550bcd0f91c7c35f0a8c4b879e5348745f57b11d1e24d37920056ca55da8863e15e40d6fe289617d5d898a4177
+DIST tcomment-4.00.tar.gz 58709 BLAKE2B 64285c64d65e7308e3cb34494f1b49584f54707ba9f4e86a40a72c1434670819c412b68e4a30f296ce531913b054d482f5743ee7e6fd81baa5c3ee1d46dc8d01 SHA512 b072ec4b136ef6ea14e91883a77b036a26b2e2c0f6cabdce70e4aea2cf37a2c4b7becc0770ddfc8b7260a52cda729a0e4b8ff4a067c81bcbbe0f0e896b9e66c4
 EBUILD tcomment-3.08.1.ebuild 718 BLAKE2B 48529193db40c3ac956c74783f9357bc4b43addcadd4e07017570781fe0ee5f480e174fcea0a0cbb084e7261284ed40519a8880b3eb0e2ac6533f1bb0c764ee7 SHA512 2f2d941989a22a4df80a3c1751edf377386fdcf4ee8165a5cbad84bc18cb89f230ac9c44f5b6532a8fcd81c6c0a83adaece09bde23788c48267cdc4a8f8824cf
-EBUILD tcomment-9999.ebuild 720 BLAKE2B 9b364afe92d824cb99cbe6bed8a7278c8d3abfdb1deacba54d4a56ec3acea74ac31e6978ea7ed927c2e227ae2cbabe8748092ec879bce10b843c70bf26c58544 SHA512 0754fe5b7c770757d1112182f93d41ccb34184192894105a53c6f42b6890fd54c35d4c06dd746ac17e2fc6ed38f45b8aeccbb3579fb13d5c1f4a304186761374
+EBUILD tcomment-4.00.ebuild 602 BLAKE2B beb7a5991e9dbe896c1604fa04a871dbc6284d998f32023cfb55a09c317cc864cc36326597e7fbffba9e412c696899e16ba1e9508fd92b8422c31cc65cabc403 SHA512 14c19be1e750faf8feb083e0f549e0697fce48911b02db3660be86d6eb69d5bb958d1351fa504fd6d44a087f6bde7569629f09dc35770726769f97eaff3531b3
 MISC metadata.xml 344 BLAKE2B 00d1070b4a88d315b50e0651832e4431ca1819fe4da87119fc7015bafa9a2b53ea9442e75e7675fbe5425bf9cdbbf2c2001837c0ef052276c6f8e252ed7863a0 SHA512 8e018a6fe184a49f874e6c4349d8bf2e356a0260e90d2637981fdd2360d7e29ab5c9d91bd62a37706f9221c11b17f44bdabf6ed322e964fb3872336bba94c775
diff --git a/app-vim/tcomment/tcomment-4.00.ebuild b/app-vim/tcomment/tcomment-4.00.ebuild
new file mode 100644
index 000000000000..be5dacfaeb75
--- /dev/null
+++ b/app-vim/tcomment/tcomment-4.00.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="tcomment_vim"
+
+DESCRIPTION="vim plugin: an extensible and universal comment toggler"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1173
+	https://github.com/tomtom/tcomment_vim"
+SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DOCS=( CHANGES.TXT README )
+
+src_prepare() {
+	default
+	rm -r etc spec addon* || die
+}
diff --git a/app-vim/tcomment/tcomment-9999.ebuild b/app-vim/tcomment/tcomment-9999.ebuild
deleted file mode 100644
index 123c92cde935..000000000000
--- a/app-vim/tcomment/tcomment-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN="tcomment_vim"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/tomtom/tcomment_vim.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="vim plugin: an extensible and universal comment toggler"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
-LICENSE="GPL-3"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-DOCS=( CHANGES.TXT README )
-
-src_prepare() {
-	default
-	rm -r etc spec addon* || die
-}
diff --git a/app-vim/thlnk/Manifest b/app-vim/thlnk/Manifest
index c1642efa2b3b..00bac65de275 100644
--- a/app-vim/thlnk/Manifest
+++ b/app-vim/thlnk/Manifest
@@ -1,3 +1,4 @@
 DIST thlnk-1.2.1.tar.bz2 35428 BLAKE2B 0121b4e6a949ad1dd447560052479de8a62248098ffd6397d49b94c33e1a19d4a76c9ed63b3306cc6e484dd8efbd7434f52c2fbed741c976526d620c278fde98 SHA512 c3de0452a5a5d068f9c64d7ef1f7e390a3f870546a7ab2daec41d301c19f57d4a0e254fd45de4775455746312f48f3223b6ddbaa80159a0ff56cf707b9cc0945
 EBUILD thlnk-1.2.1-r1.ebuild 365 BLAKE2B b9dd0e53f81dc1f72e8afcfa7133a3315bb208f45ae58890524e63777a2485d42121e03f6da67b4d6fd1e7759a4b83e5b31784a3de298eeed842017a4761848e SHA512 40a590976e3be23ed082aef137ee1dc588a209ac2c7ffadbb74f42ead5e10c4d426c796db0381ab3b33bd95afe20351f2a49e174a09959b0fdb709d8867f6eae
+EBUILD thlnk-1.2.1-r2.ebuild 362 BLAKE2B 6f3072f53988c7709af9a2df0f43fd3111e397852238a98070f1b5c455514199aea22609acece46a4b74a8937481f2fdcb55fb52f00ba819cac25037916c478b SHA512 3e606c6e438aa55dc8480cb9d2d1df8f65066b222c30006c67aec15c2ca1aae98480e028bec96673b0107a1eeb89550e7f9d7a5ae7583e49f2f2217ac8beba3b
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/thlnk/thlnk-1.2.1-r2.ebuild b/app-vim/thlnk/thlnk-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..258496c59aa3
--- /dev/null
+++ b/app-vim/thlnk/thlnk-1.2.1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: linking in plaintext"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=293"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPFILES="thlnk thlnk-reference-manual"
diff --git a/app-vim/tmpl/Manifest b/app-vim/tmpl/Manifest
index ab133a38d174..ddf83d3df1e8 100644
--- a/app-vim/tmpl/Manifest
+++ b/app-vim/tmpl/Manifest
@@ -1,3 +1,4 @@
 DIST tmpl-0.1.tar.bz2 1165 BLAKE2B f7b5d2d79fdefe9c46c544fb9d98e0b76586d05a43ac49947278dfd43b8c9dc19eda0876b3c9f4e8e8a068cc89e011ec2ee5fe4afee142a759d8b33822dbae76 SHA512 c50d15be556224544ae99bb1a4ec78fca6d0cc4c1df11c4ef5302ce851b8f92baca04e498774cd1352ca3f1a8789498e7f47bb371828da13a7703a2f654ab51c
 EBUILD tmpl-0.1-r1.ebuild 403 BLAKE2B d72ee821c4125d9bc408ddfa24be21f30ea2c630d6dfc8f96b283fcd213bbb624dd737c02044b20beebb95512a9b433cf3e4d7d958363a738920c818bcc7011f SHA512 9f1706793ea8ff522b75e42b21ab0c129b612648b7516a5c3e6a09513c0ff23a3dea89f29cee5bca59a607e379c51d47ab048a113020db91a10885a06192e0d6
+EBUILD tmpl-0.1-r2.ebuild 400 BLAKE2B 218195940ccfba0ec846343b2bdaf52b6db9e47be4d0a79dc7ade8c0af497406c6f5093c3bc2f63b77cdfa546d6a82c74d3167db9b588bfcd6531bcb6bdb15ca SHA512 ef54c47dd018d9f5095d8758769b46045c0ca8608483eaf396aca1067b8186009f8ad538736e83b00fd9ff933d58d0005176ff8892236b17841a2957d3e01f1d
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/tmpl/tmpl-0.1-r2.ebuild b/app-vim/tmpl/tmpl-0.1-r2.ebuild
new file mode 100644
index 000000000000..4a613dbd5bb0
--- /dev/null
+++ b/app-vim/tmpl/tmpl-0.1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax for Sam Tregar's HTML::Template"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=254"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPURL="https://www.vim.org/scripts/script.php?script_id=254"
diff --git a/app-vim/toggle/Manifest b/app-vim/toggle/Manifest
index fb4f804b24d4..5837d039a04a 100644
--- a/app-vim/toggle/Manifest
+++ b/app-vim/toggle/Manifest
@@ -1,3 +1,4 @@
 DIST toggle-0.5.tar.bz2 2790 BLAKE2B 365bffd541cfb40c7fea59049a4b7ef0caf0ef105a5ab382e740f3400b399715227d2d5433875583dfb31ac847c0a90d5436e6ef2aa1f8327eebc868484146c6 SHA512 bac60e8e09cb3d82ba1569c333174fa58596fcd009181a56feabeeba4590942805a14cf08c3ff3dc7920e8481d14b3bb659bb85ad1c8bd85ca66a5d491dae05c
 EBUILD toggle-0.5-r1.ebuild 443 BLAKE2B 53e645f0c331423c907b4c24a1f10d7a51635abdb46ef7d191183dee824945374396fd1283117e03d4c86bed8a6ab16cc0637dfeb452a337b55fb119a65101c7 SHA512 106f10470443088f75c959c5f30c9767223260972c74fa148e92f80233f991a9537f39a6b71a3ace0c9b5cc097d550b563b02929c6d98d331b9a861a72a70cf2
+EBUILD toggle-0.5-r2.ebuild 440 BLAKE2B aafafa04c9d2b785552a43656c9ae80ffa2cb021db49ac1db3fc632589ffb27d7d389b199449581568ddc87d53dc78ff6707559076fc28b59fe7c673e8dfa93c SHA512 299342dc10782021dcaa90e8d6e907f7598ff80eca33dfecd307465b4865d10ed022d0bad10a10adfe51abadd767b8e37f513039f72690ceab23dc63576d030e
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/toggle/toggle-0.5-r2.ebuild b/app-vim/toggle/toggle-0.5-r2.ebuild
new file mode 100644
index 000000000000..d907ae933d66
--- /dev/null
+++ b/app-vim/toggle/toggle-0.5-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: quickly toggle boolean-type keywords"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=895"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin will toggle true/false, on/off, yes/no and so on when <C-T>
+is pressed."
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
index 6305cb3e3930..cc91647a02dc 100644
--- a/app-vim/tt2-syntax/Manifest
+++ b/app-vim/tt2-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
 EBUILD tt2-syntax-1.13-r1.ebuild 511 BLAKE2B 223e07f8e7b67231a0a52daa06cb97c315b72be95cb70ac75f3bfde5580ad85df423172f9d9ce701033be4f2d8930629f329cdafb031c4e9d28eca26033731e6 SHA512 1433134b22a0af4bf081c3bf0690a2e394d02d854cadbdfb483f5c331aa6b99618f849e0b7d75823ab9cf06bd293b531c44bfecb85ba7d8be8c63126dac46c34
+EBUILD tt2-syntax-1.13-r2.ebuild 503 BLAKE2B 86483ade32d7ea96862e6095ec9807b0f23a0cbfcbbca034224da6589b17ed4440dd5aa00367adc89e6ab22b6a0ad3ccbb765a011a76f35cf630156db28f6b47 SHA512 f430441ff7695d5564119f69a06bfccc0040ec65111a50ddc203386778e997d46a8a91af581aa082073548a97852968e0a9bab020d71fdf6af4b6650e2e9e713
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
new file mode 100644
index 000000000000..e09e421a7db1
--- /dev/null
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for perl module Template-Toolkit"
diff --git a/app-vim/txtfmt/Manifest b/app-vim/txtfmt/Manifest
index 7df7794eed56..2ef00ae63a09 100644
--- a/app-vim/txtfmt/Manifest
+++ b/app-vim/txtfmt/Manifest
@@ -1,3 +1,3 @@
 DIST txtfmt-3.1.tar.gz 172348 BLAKE2B aa44aef49665f034dcb0528bc6795f716540088b59e026bb079e49e5d2b9f6034f99afa220cb63b7e534257e2fc249c779b2ad0fb8ef01d3fa99e609b70e059e SHA512 bdef5350626ee5251fbf3cb4a4270e72f0b8ab29948f0469cfadbcf0735ccd7c104b34a25e43d4ff147ed48de3667fba472080f81f72d5a4687467e5c44af5d1
-EBUILD txtfmt-3.1.ebuild 435 BLAKE2B ebc96503e742dcb1a83cadd2464cb51c1d4819692de1d813f1f5a25b45a588dbd9e667c2147486fd014f2b0db538124dd3948114cf2708cd71c1170478c14092 SHA512 f5c6d167f0a95e40ec128f4852561ff59e7f3aaa2fcfa7a11a82e10619193336d4a438ef721a826f836725a2d869e7b8fa3b7d585056242a1fa14feb3cdd7f9b
+EBUILD txtfmt-3.1.ebuild 437 BLAKE2B 191f8d9e0748ad99611e0c4c44aa56742acb3be1395293921af7d80065193a9332684be86465cf796db6fb3c5f0ef3bd1ad1807a2316506c4a047443d0c76bb0 SHA512 d25259470b90079b2dbda1fd2bbe55c536d586b720e9cf261bf76d866a5e2f9c85e058158ba6c46ab52407167f29b914da4d597f2923ff4fbf828e8fca566b98
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/txtfmt/txtfmt-3.1.ebuild b/app-vim/txtfmt/txtfmt-3.1.ebuild
index fecf4ab91e7f..5efa61dab90e 100644
--- a/app-vim/txtfmt/txtfmt-3.1.ebuild
+++ b/app-vim/txtfmt/txtfmt-3.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: rich text highlighting in vim"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2208"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=24489 -> ${P}.tar.gz"
+S="${WORKDIR}"
+
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}
diff --git a/app-vim/udev-syntax/Manifest b/app-vim/udev-syntax/Manifest
index 36a0e5c1fa03..51c4238db0df 100644
--- a/app-vim/udev-syntax/Manifest
+++ b/app-vim/udev-syntax/Manifest
@@ -1,4 +1,5 @@
 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
+EBUILD udev-syntax-20051016-r3.ebuild 570 BLAKE2B b1d69d7ed26109fb0357977f8c8152a70b3d7933f2ba2a5dc36c181adc1ddcb599388bcf7bf41ec8907f4a47f1029c327d6b3a59bda117368e1496f0ef4a3e54 SHA512 ceac2d7b3c19461acd899c5b5c9aabcf2d24da907ae70c029bca609fe29d7770fa3a8676e5c4992a257a736f05fddaca3e31655013301d79e3344abdb926f999
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild b/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild
new file mode 100644
index 000000000000..392ff5a1d0f8
--- /dev/null
+++ b/app-vim/udev-syntax/udev-syntax-20051016-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for udev rules files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1381"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for udev.rules files. These files
+are automatically detected by filename; manual loading is also possible,
+via :set filetype=udev"
+
+PATCHES=( "${FILESDIR}/${P}-ftdetect.patch" )
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
index 0228c19d5fc2..18dfb1667e22 100644
--- a/app-vim/undotree/Manifest
+++ b/app-vim/undotree/Manifest
@@ -1,4 +1,5 @@
 DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49
+DIST undotree-6.1.tar.gz 18489 BLAKE2B 4570dbfd8f4f03e51bfb59587872993fed01d7e572dc517255c663ddfb3df8be04a5a7232175998889fea032faaf47f7eb6a9be6bbc46d1e644be1370ae54da5 SHA512 ed2831fee148b6a0cb78ea528db9b6a217da67fb74d95e00034671ecd7d0bef397077a7e96c29697d372a2bd1d0a6865e210cece57c4cccd97a0cf3e0b486ec2
 EBUILD undotree-6.0.ebuild 426 BLAKE2B 3d21aacddc751d54a9364240461fbb89ef6dc75aaec4fb4bab469f4569b200a1e0db3ba4ac86bfdf70703ceb72a231ad2339beef0548259f64355316e831e485 SHA512 ec70c0a62068b92bcd0e68a651967474ae609984e934fea98d610b7a7efba5b9714ca4a0aaedad324b243f9291457fd8265f3e464a56f7e410f6260136b86d40
-EBUILD undotree-9999.ebuild 375 BLAKE2B 8f9af682845764821ef513fbb6073ada622d71db6613535025b79a04403bebea5a20fce419472b0034908376ae24e58cd3e5647a87e132256734477251fcd34b SHA512 f9ab75289ae10de12e2a53fdf9db5df5d21dd316e9802ec4a9a946436e4c9e684910562c5b72d5a66602fcbcd45ff0087909ca27852087528f90bada84d27fd2
+EBUILD undotree-6.1.ebuild 431 BLAKE2B f7f33a04113dca5fbe611e3d19180857ccf7af79385772a6222b8b4dfe95a7a7686e1ddd52936d8f2c36ac05a38ef4cb35880381cee020f46f1c945eec1454b5 SHA512 10e95b93a531a96910c4e09d7997a5a2fac8eba13978d2016a7057666c09d7f60c13904b963b16325b490cac9878a8d110a79622f34eacc4bae3fb9dd7cb5e8e
 MISC metadata.xml 340 BLAKE2B 35772d489b713635ad37ec4c81848f4f1b00610ab8ee4bd09bf0d52b99ced98067680d5675b34f599623a47516274df94bbfbfd422ea807d4a403834d3b3362d SHA512 2af43c1d140bd31c542e34071b99c2e4101135b957804400bacec05db48f7fb70d92c06e415cc734c384b4b36d1b3c2345137bccaf2a7958dd68083bb7657701
diff --git a/app-vim/undotree/undotree-6.1.ebuild b/app-vim/undotree/undotree-6.1.ebuild
new file mode 100644
index 000000000000..15a7431dc300
--- /dev/null
+++ b/app-vim/undotree/undotree-6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin vcs-snapshot
+
+DESCRIPTION="vim plugin: display your undo history in a graph"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177
+  https://github.com/mbbill/undotree"
+SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/undotree/undotree-9999.ebuild b/app-vim/undotree/undotree-9999.ebuild
deleted file mode 100644
index af6935936207..000000000000
--- a/app-vim/undotree/undotree-9999.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin git-r3
-
-EGIT_REPO_URI="https://github.com/mbbill/undotree.git"
-DESCRIPTION="vim plugin: display your undo history in a graph"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
-LICENSE="BSD"
diff --git a/app-vim/unite/Manifest b/app-vim/unite/Manifest
index e82b6fae3e70..1073c17188ef 100644
--- a/app-vim/unite/Manifest
+++ b/app-vim/unite/Manifest
@@ -1,3 +1,4 @@
 DIST unite-4.1.tar.bz2 85622 BLAKE2B 58f4d4ac86fcf588ab0e3ecdb45dd67d0c16c67be2f6daff21f9d4451b94c9094671f4248cc6f4b39e5a292418908536cb222288dd344d56f9b98b09f5263eb3 SHA512 1fb19cfaf1b49843c79e2b9ff8e318b950dc1b65144f83a76776963a598e666f3094dc7f65f2708d7e074f8197121cee77e028a07c5735998f73f2d52d08c9ca
+EBUILD unite-4.1-r1.ebuild 348 BLAKE2B adde5b9c283d90026d7b45e9763006de4e52d93a96e10d2931f87f302c5a8ce164ffc0a7dc902d2ad1027f8e062c89866433df5fe5e112c60b26e7efbf093c9e SHA512 7f0a0094a7100c35056f891abb3d101bcdc02248a53274c798e19fcc8cfffc32f96e7cc896ddafb36ad5232ac3efccc8dbb2be93f5142699da2e99780cfb5a22
 EBUILD unite-4.1.ebuild 345 BLAKE2B 91e98d5b33d7dc474054542493920035148a364e298466224d8ead6da20e649a646d13c78afbf1f8bfb3166260db64cbe27db97f4921ec8e00a7411529ec5b15 SHA512 3cba959a0f7e565f0cf1c246aaa8d1349c474c9cc306c5965fc0ea514705276f68ab5b827b4ea5f7a1ede097ba83bd240ca8792e35bcef35cbc8b5f3e3f51e25
 MISC metadata.xml 670 BLAKE2B 49e44cd5459e80ef088874b9ed62b81705c381b9ad4e7fb9e0f31b607ab1b26ab6bb92c46cf365d37d78e2fe776700a3b2cb13515053ad5e65453a8cd2ef82e4 SHA512 a40bc0a6f5614994c0594221a7cbd3723a0cc136b114a7a7e6ebc6254b0aad35584c3eb8f14a00e84d477c2c22b2536223cd9ddabe20e8d5e90900c516449275
diff --git a/app-vim/unite/unite-4.1-r1.ebuild b/app-vim/unite/unite-4.1-r1.ebuild
new file mode 100644
index 000000000000..4cc8c13450b8
--- /dev/null
+++ b/app-vim/unite/unite-4.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: unite all sources"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3396"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="!app-vim/neocomplcache"
diff --git a/app-vim/uptime/Manifest b/app-vim/uptime/Manifest
index 47452a5c9ae7..26cab8df66d5 100644
--- a/app-vim/uptime/Manifest
+++ b/app-vim/uptime/Manifest
@@ -1,3 +1,4 @@
 DIST uptime-1.3.tar.bz2 2315 BLAKE2B d0237ff2b22820de85d4f0e4e7a85bff082cfe24af61b00b523a2df6db0bb22943303bf2ed09796f50ba7a49a16cce6d06b3ff06cc26cc8a7d4802693412bcf9 SHA512 42291261eb9f7246b68c32bef08599f604a5e1186eccff0b4ea118bb336e79a5c84cfbc2a834d5e50db3c2341c95c05f2961589efc3e459d3c6dac5f5baf50e4
 EBUILD uptime-1.3-r1.ebuild 346 BLAKE2B fa0b2a1798f5c8834050c2f55eec60cf868f2cf7ccd1637e307478625094d117d5b0b3de0d2e0a998cdf0145cefe363961db58b58ca1b8b9ba0fccf3daa66e50 SHA512 7e66009e6bd16afda2405c95ca05635ba9fefb73d7a60371110c693b694f69f25e0ddc5a5a825aa063921573ef4f67623c40b88f19ef764209338c7ff86779ba
+EBUILD uptime-1.3-r2.ebuild 343 BLAKE2B e595f36bfc44221cd38366328e2faf100c88293b3c0e6546420d982b396a4e8b9739a0442d1598c51ba6cd7a025e94ef255602be32e1241ff7ed25889a9ce350 SHA512 afda238766faac4d4a6efa59d2fca09a6c14a907e7656321dfc7d3f2a80a74fb87c538876aa6a4a7aef4c12c4350027bdbb322366a00040b115ac6692c64020b
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/uptime/uptime-1.3-r2.ebuild b/app-vim/uptime/uptime-1.3-r2.ebuild
new file mode 100644
index 000000000000..790476e3b0c7
--- /dev/null
+++ b/app-vim/uptime/uptime-1.3-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display vim uptimes"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=965"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/vim-autoclose/Manifest b/app-vim/vim-autoclose/Manifest
index 7389e98ce109..fb0cbf4bb4a7 100644
--- a/app-vim/vim-autoclose/Manifest
+++ b/app-vim/vim-autoclose/Manifest
@@ -1,3 +1,4 @@
 DIST vim-autoclose-2.0.tar.gz 35779 BLAKE2B bf1536b3cdeecfc261ee30687d53ac2dd7632e21e877a67a99aa21e1d9e4389e3d1d3de764c76d94a8d97fa2bad1c7877276a5defa6b2ca137f1a8e866e902b0 SHA512 2604c2c16f25eb60bf660ba4f80d40d9aa51af38cc59a2727f0c705ba2abe5302a58dc60a71c791cc6aa002477587d1dadcc8a9269a93c5a9405a86251f4fcd9
+EBUILD vim-autoclose-2.0-r1.ebuild 422 BLAKE2B 34ed5f384bba9c9c5579cb57ae402ce2e7271e0c609024a1301c795bd336cef0c6879930dfc32f32ddda58b7e5955bcf51bcac6b2083c536ff81ad9bbd5a2762 SHA512 e4371d198832d89f1a2ffb205339767e82f8d6d2e097ad0c935583266a901e7cc5b471e22e3595130b753768ccbb2be82893d7a360a51a4a7b21197c49a5c3fd
 EBUILD vim-autoclose-2.0.ebuild 422 BLAKE2B b85ef4d43f1b22764ee2f4f5bcabfe005ef735ddeac66525efbd67718ff115b336cd2e590a7f094916a1cf6a7550a45f54ad6e1c7518a3a55e827595ebed7bdb SHA512 eae60fbbf7b3af4dddb73ba0169005a7d9222a6fe8040cd2046e99f9172d44d23a5df4a9dc7e0e2e55048b9ccf8c11df71e0647555b37d14d10333a871e8e3e6
 MISC metadata.xml 446 BLAKE2B 143d89603e02e51fdff64833b1ec062d711fe6be8cd08f835e6ccb4034724fae782bf399de8ea71f201b352f16511277b2e0ffbb3933fb50415e6ffd3ab1fba4 SHA512 11a452914fa674b91c16555a8dc41ec3b7563e0b18fb5f960249683cf72433deb7d1eb2cd6a1677b6631b7a26abbb8659569e160838b87e85a78bd6c94c502a7
diff --git a/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild b/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild
new file mode 100644
index 000000000000..256532012217
--- /dev/null
+++ b/app-vim/vim-autoclose/vim-autoclose-2.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: open-close pair of characters"
+HOMEPAGE="https://github.com/Townk/vim-autoclose"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.txt AUTHORS.txt )
+
+src_unpack() {
+	default
+	mv * "${P}" || die
+}
diff --git a/app-vim/vim-commentary/Manifest b/app-vim/vim-commentary/Manifest
index ca1fe9bdd28b..bbc23001f1e2 100644
--- a/app-vim/vim-commentary/Manifest
+++ b/app-vim/vim-commentary/Manifest
@@ -1,3 +1,3 @@
 DIST vim-commentary-1.3_p20180530.tar.gz 3062 BLAKE2B 72018b6e84313a5c7f44b994f1892724155bcecb14f3142d83a5b10ba8e8b813859bf3af660ebea840c196a6c9bd40c6daccfcdbfef47967be83a19201b65ce0 SHA512 a2aa9db16f12006842aaa61b69c1279bca046f840de9342cb0a3d0af7fc7a5bf0905ea87762f7519e858d4e04d4fea8b0e4efca7d4bc346ce2c5b76fa78d321f
-EBUILD vim-commentary-1.3_p20180530.ebuild 441 BLAKE2B 41fc32d94bcd6f499ddac3f730f845fedeb5cd6ae7525c679b6d7adf4151a5761a05e01c66c79b466f216f6f2111c1da9df9a86dc7ee53ddea2b3ab170a4cfde SHA512 eecdbab7ab1cbe5d36a9a4515da0566cef11ad273c570a51f425fad8d3b513ad12dc55f414c5ab8c5e1304ebe3673476d4e250cdb0241473e4d9b9332cee73d7
+EBUILD vim-commentary-1.3_p20180530.ebuild 438 BLAKE2B ea5cb3bad21d6e1d36c9782592f61f9b1da6e808e0b2400c731cf211289da5584f490c72929cbd87683c00b15c6baaa193c28b943a0cf0c93a565ba14b419637 SHA512 e7dfeb324337588487412a9f6a151405a95299cbe51afa9cf74579e0a3598cce128f49f1b162a40db0775e5ea3ae718c4d22a5437aef1409df44fd6feb90926c
 MISC metadata.xml 335 BLAKE2B 14be008a28d098b460aebfc21b6c8178e26414727a7771a0edb6f5a8fa6ccfa128d7cddf918093a4b534186503d884711d0a23fd65cb930b7f2c50f05d3b131e SHA512 96fc400b54fa0e48db470e6e942430ff69473924712a54303097bd412e9bcf68cfb07f773de8a5ec7819e751a55e989f014c7862259dd8a2c3c0605c4ff71ffd
diff --git a/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
index a717143cd472..e9d710309ccd 100644
--- a/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
+++ b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin vcs-snapshot
 
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
index 31df2af97260..416d5fb696a2 100644
--- a/app-vim/vim-flake8/Manifest
+++ b/app-vim/vim-flake8/Manifest
@@ -1,5 +1,6 @@
 DIST vim-flake8-1.6.tar.gz 5345 BLAKE2B dd726798a49231841f9fcb915999cf965a42b8b5f593a66f97268bc6d7993584d5f9ed0cfc50508bc57d60c5dcd19c8476e86ae26fb8be9c1dcf7007db2d0323 SHA512 a4208478f9754ef2d188a51e3262c449ef16b48fc0208425795d71c304118c129ae20a723fff96863291bae66237f1479a591cc23e5ec90222e0614d2dcccce9
 DIST vim-flake8-1.7.tar.gz 6080 BLAKE2B bf78e2c4e9976fc148cf18fc5ec58c2807a9c82a6893160ca4a107664d438fc955c2eac3e41373529cc1dc5295acab06c7c9007c1ad72095548362e903d7d31a SHA512 c29cfc00e4fd94128be02e003116647819cd3b39916527b70a7684c19ef4184bce1c1556051fc269bde4696a98b752fb7b4e081c2aac46cdcdfdf35735ec76b0
+EBUILD vim-flake8-1.6-r1.ebuild 404 BLAKE2B 808c29a7d61e5a21db39e7f29908d70293e1650c7f11f3a0d56c8d6fa5a54d96d949bb58df2bbe0de96eb51e6e63525aecae64b614409ef1d81cc42ca32dc482 SHA512 3af79467629bd7e9a2754fd309505fa4c3c60d7d8ce85b16f957d5e461317ba0e69415ae3bc1d0311547f81bffa0621008dab23f60ddeb518417e441d38398b6
 EBUILD vim-flake8-1.6.ebuild 402 BLAKE2B eb5c93251f30ef79ce9d76954d24f739e7dc4465ffdf9d6fae92747b065e058b5bb0e89961d77d526039f0bc023d47d19e8bfb50b3c7d07a02877c7c6b5e825e SHA512 e597905db4f37dc796bdd01cb6d2e5e5c121c6483347a7189dcfd16e36445636bbd8cadb3182fb3be9e14493bb9a44a8cf1569d9587e6a8806412698b76d8c6f
 EBUILD vim-flake8-1.7.ebuild 410 BLAKE2B 057067c8c005775fb906f9b36f787c95c774e226ced3cf2fbd0ced247f1c00c8dd402146f380f1b0bfac161ce57efe875511023d1124bc591964344528029d59 SHA512 354cc033c9c3122e5bb031d9cc5b1636c71ec8b4f61c1ed49015153b3bf48b5abe6a7a719fedaafc9b9d5b9cce66bc710caf1423f2c45c868a00d2badc9a04f6
 MISC metadata.xml 425 BLAKE2B fe6405fddd4b3528e2ff64a024a5a2ddc8eda7bededdf26b1a6067cb87a806bcd0bec9fbc135538353095e89826e4a695e0ccd8bca127c3a7985b4779c64f21f SHA512 c877d1d17104e63075f9459f856d4b381a2b7b1fbae0476a3f393cb03912f7d1118da99d8dcb341453394a2ec92ed8098c5c4e1818c1ef80e67bfc65bd010dd4
diff --git a/app-vim/vim-flake8/vim-flake8-1.6-r1.ebuild b/app-vim/vim-flake8/vim-flake8-1.6-r1.ebuild
new file mode 100644
index 000000000000..a0e086fe68fb
--- /dev/null
+++ b/app-vim/vim-flake8/vim-flake8-1.6-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: runs the currently open file through flake8"
+HOMEPAGE="https://github.com/nvie/vim-flake8"
+SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-python/flake8"
diff --git a/app-vim/vim-hoogle/Manifest b/app-vim/vim-hoogle/Manifest
index 62a7438f9788..a2836b89d914 100644
--- a/app-vim/vim-hoogle/Manifest
+++ b/app-vim/vim-hoogle/Manifest
@@ -1,3 +1,3 @@
 DIST vim-hoogle-1.3.tar.gz 3337 BLAKE2B 2c80577171535aa45609f84e66cb3efc52a7028638075260aea8c1ee35839d79ab834e55f30f3401a3eb4b5daa24ba358d01b9edd1203779043db2fb2133077d SHA512 ea0d2b723e913836dbff5947e7de4fb5dda19ab1d3bd51cd315b28499f1b6c771b037b16eec6a88862d27f675a9ddac11eb5d8d5a5b3ee3e2eeb7620ed4d565a
-EBUILD vim-hoogle-1.3.ebuild 478 BLAKE2B ea79729ca6fedef925abac88da8b43c81cc295c6b982a4eb53963d2241cda212b69c4ea5c93f9353f3e927c797c6835ae31a467cfa0f2252982e7024926a2e03 SHA512 b62c15abf6b0b4c67aa6ede9ee4f9021ea97ef6c97a40c2a44fa4b5cd679b851c2ad473ddd9b2912e2c14e17a8d3514a7fd775679908383a5b2ba300a86e0f15
+EBUILD vim-hoogle-1.3.ebuild 475 BLAKE2B 1bcc8cfe41ad8bd7ee380d4aa297f8f97cc75035538641866ef2d33531b395776860fb8e778c8e0631e52d5dfe397cc4a73dec91958f67cf9380ca77cbe1a824 SHA512 ed670296d9a6bf0908141ddc67a79992b74c4745e6a4e298373bd1d5bce0f7febc5227c9cbce8d0f649dcf20ae5e448ba91e534f58ec1c04f73c46061e724853
 MISC metadata.xml 334 BLAKE2B 53b8599cc41f92a80096e845a6c8b5207c5f79fbaeab230305fa9227577a471c29327ce84d87ba3b84b61fddd8bc047c44843551d0509c7c4b7276f4048414f5 SHA512 dfc97b9a60a53d971a8f78c1b91a974304cac5fc63ffed4d3b145b0f73ee7978ea7308ff95d76f8e48be754f6bc8958f1dc9855b1a320e497743f3ca87b67098
diff --git a/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild b/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
index 1dee86affdcf..cf970fad0782 100644
--- a/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
+++ b/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
@@ -10,7 +10,7 @@ MASTER_COMMIT_HASH="31823f830843385f53a3da7a5bfaf678494383c4"
 DESCRIPTION="vim plugin: use hoogle within vim"
 HOMEPAGE="https://github.com/Twinside/vim-hoogle"
 SRC_URI="https://github.com/Twinside/${PN}/archive/${MASTER_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MASTER_COMMIT_HASH}"
+
 LICENSE="vim.org"
 KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-${MASTER_COMMIT_HASH}"
diff --git a/app-vim/vim-rest-console/Manifest b/app-vim/vim-rest-console/Manifest
index b04f51795fb1..6c1512a06d42 100644
--- a/app-vim/vim-rest-console/Manifest
+++ b/app-vim/vim-rest-console/Manifest
@@ -1,3 +1,3 @@
 DIST vim-rest-console-2.6.0.tar.gz 15935 BLAKE2B 93c9d9637b67c5fd3b7a765b2bddb2942798d93605f2e558abc95d338116d9325e08b1717c8326824c915f71388af84d70ac8ddea1baead12137c7564da57ddf SHA512 d75b9071eed1bdae604c3fc3457c319a8893ba01001c6b27b8bbea038e9964597bb1a7a2e03ac1d6d9e35e9d96ee350f1eaf6c12f2e8f53929f3f511a470170d
-EBUILD vim-rest-console-2.6.0.ebuild 451 BLAKE2B 931d1f46d7e9ce904f76fac687438a2247be585f18df1b089bfd521c14988e1c704275833968fa4b9b6d92d87def7fbb2ae2f05a7a1d88c179081f0720fb7b4c SHA512 088219265036ee3061873685baea1714463e719d39851ebb8b6a6be5eb71fa2d89217c0dd8acaead321a69be74498529d9a60541b37997d983d29bf9ba32ede4
+EBUILD vim-rest-console-2.6.0.ebuild 466 BLAKE2B 697626d25f213c46f11a1a7e96f5e118a655c02c04d349f65745233915f52ecfebe6688682178c78b235ee72211240c268818e49a25c0389e74339e7d4292302 SHA512 5d58656a9ecc34e5efa9002ce926c7edd3890b6870d37461b909e4b0b0a291e626eacaec273d62eabe92cca247c10c067f660140c79a5a355e93b3e2244d159e
 MISC metadata.xml 347 BLAKE2B a82a42fbf269e2e78f4883efe3485f5cda8dfb87b8eb3fce7e1a7f2e8b76fe7de45de6bee3cf480cf1eee160c2c8367e6df261acf33d7ee43e333d38c72b2f9f SHA512 997e618acc5685d55a78dfac540a927fa792bf5d2e1958dc2b721b3ea44160081c57b8eff2a771164b4d6edf066a56e51e81c3a9201b26096c5da993dbdee3a9
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
index a47e6a71cd0e..512566d85a77 100644
--- a/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
+++ b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
-DESCRIPTION="a REST console for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+DESCRIPTION="vim plugin: a REST console for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182
+  https://github.com/diepm/vim-rest-console"
 SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
index 15f8c79a7e18..ef36502284c0 100644
--- a/app-vim/vim-tmux/Manifest
+++ b/app-vim/vim-tmux/Manifest
@@ -1,3 +1,4 @@
 DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
+EBUILD vim-tmux-3.0.0-r1.ebuild 478 BLAKE2B 39fbccb839bc8da81734c091f695c7ff25f987d368afc51b96ff8439b322c6c4000f93ec16a54d49f154f783b6d0fc73da79aef8c333c2f0364c32b0be538556 SHA512 fe5a1bc5f886da851f8777fd45a283b58b0cdf740dc0d1e75f95550398dccf8c9e67da4a96cc4fe05d680492c247b5f54ccb43aa992b37f0c4dcaa636fe46429
 EBUILD vim-tmux-3.0.0.ebuild 470 BLAKE2B 1549007f485f9ddf9624f1827497a96c2231fa669a45f133fa270e2aab5284e2a12da3ef5a187020f488e6380395c264dbfdd0a79e63e21d26fc7b15332257a9 SHA512 7c2e882107445025a4458cac8e0aaad87defc5bf9d6b03241f8d903f10f7363c825ef32b444edf5d0c7453f22acfbeb67d6e8bc3c368aa04089717b1a4f47f28
 MISC metadata.xml 582 BLAKE2B 387d6ae7826bf20c8c012e3e17daeab4b56c4ea467ec28ed7c52b0acb50010c1797ab016def8ce78f8b3df9842bfe1eb696b2f1f42b9a71c49803dfb5d932430 SHA512 5df59ff16a42e4e55c2656f38f01aad140729df2e61620971078ad950d80ac5e6c066bc7c35b20fddbf1f8ccd08515e55bf3460599fa1e428a7be595308f69dd
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0-r1.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..61fb101ceab3
--- /dev/null
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: tmux support for vim"
+HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
+SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DOCS=( README.md CHANGELOG.md )
diff --git a/app-vim/vim2hs/Manifest b/app-vim/vim2hs/Manifest
index 76b68feb18e0..33f76b81d0c4 100644
--- a/app-vim/vim2hs/Manifest
+++ b/app-vim/vim2hs/Manifest
@@ -1,3 +1,3 @@
 DIST vim2hs-0.1_p20171106.tar.gz 259627 BLAKE2B 48a6bd773709ea1df0efcd3fe580cec353ef3c3ae7aadd4693313c3bc294238d5f73ccc84c32f75edd3e708a2be74c22efbe077d448b1dd3102e89c0ded6efe6 SHA512 835ea1344f055af06843a327bf7294ae9fe0e735455b3c21d4fba56eab75f19b578ff8cd962f6527efee0e0f89084c9c2cd86d3944e0ac35b89b33a6047df4a0
-EBUILD vim2hs-0.1_p20171106.ebuild 663 BLAKE2B 6af8233fead7dacf920a4578dcfb4b26ff0deb7ace8f833c3da4d9b03e3d2493b5a0109349490eed526baf3e49c7763eb33d704f785d6b085728ae5e1f0e4173 SHA512 b4f1e04861efcc67e0d9c678a6dc2d9dc75c872ba1961702825cb2f146f75b3eab80c0992cf14b444ac4fdeca5f084a92f2c543156ed5b1416e5900b86cf71cb
+EBUILD vim2hs-0.1_p20171106.ebuild 660 BLAKE2B e8d801856f4c4d80ceeb8bfb15ad28c3da3dc1bb698dab8ce83f085d1bd93714a1224a9aba96b4fc082e357760aeaf54cda081b1c8eddb7d883c68aab75d377f SHA512 ec9a283df0267fdf127bb490b8e3d3cbfbd523fe8683ec0be4960d96f9b81f89de7461cb3dc75cd92d33096254297e0b0ad408264abcc5bb277c78e3ffece98d
 MISC metadata.xml 325 BLAKE2B fe389bc4e82969fde2f295cb9ea9e1da63efbf5ee165d067455349008d6d8ea2c8358d7f4c755aa92f3bd4b87cba0bd56e379508535e931d59cde7073940074d SHA512 47b77c24391c06723d56e9553792ba268b5acd3b5c32eacf6eaebd0c3e61be767113079aec71f3d43efeb1d2a9f5b3ae35d001f1b8c795df4f94af246a9f0fd5
diff --git a/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild b/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
index 9b0f7392446e..9ff6a9a37eba 100644
--- a/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
+++ b/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin vcs-snapshot
 
diff --git a/app-vim/vimagit/Manifest b/app-vim/vimagit/Manifest
index 1fd8fa8eb6c5..608e19757663 100644
--- a/app-vim/vimagit/Manifest
+++ b/app-vim/vimagit/Manifest
@@ -1,4 +1,3 @@
 DIST vimagit-1.7.3.tar.gz 42325 BLAKE2B cad2adc5b61dd2abbfa2cdb58c11e293d2a0d03fd5d08c8f4a08140e5bc397ad6949a20b1c4b3076537dcf8b1b4b2f00f0a90ff62dc8a858ff5b37e0e3b257e0 SHA512 bfc0d49892fdb5c5dfc3ca971bc676081ba820420ad358a888299eb5b92e13f185b0acc6c636a493faef3dc10c7a8b56b7dc4393a08cb5b7012619234782b158
-EBUILD vimagit-1.7.3.ebuild 555 BLAKE2B abe58d38355dfc6070ca926ee670cc0db9586cb78caf2574198ce1190cba3eafed19084ea799b9e8668d9eded62009b15e4d6c78053fedf33fdbf2f935c5ce50 SHA512 0dcf84f52e898a6a4bbbabdcc6dbbc85de4eeb1657625ae27055e5420eec2cd954409bf431a76a32ba3258e742f0fd287541036232e5285182082db0f26957bb
-EBUILD vimagit-9999.ebuild 555 BLAKE2B abe58d38355dfc6070ca926ee670cc0db9586cb78caf2574198ce1190cba3eafed19084ea799b9e8668d9eded62009b15e4d6c78053fedf33fdbf2f935c5ce50 SHA512 0dcf84f52e898a6a4bbbabdcc6dbbc85de4eeb1657625ae27055e5420eec2cd954409bf431a76a32ba3258e742f0fd287541036232e5285182082db0f26957bb
+EBUILD vimagit-1.7.3.ebuild 443 BLAKE2B e0b1121ed15c67f3f1ddaedb98e5373a81607f8e5690a8eb9d1668bbb3d30e4a80d81cdcc516e3e4c5245d460ed645f2035a55c8616ad8281d665288c64c3bb0 SHA512 b72ffc36d8e5817b4e0b5bbdb92ec62ce63c8966e3aec966e2ff15dbfc1780232c575e540e4df14a778bdd1b4533fe23dc5f61881135713c23871c37e4fff57c
 MISC metadata.xml 341 BLAKE2B 91b9d5cf2b4855e00a5bb5edc44ddba7c200796d4b4e65fece75b93de985adb3afbf4db3fd09ca8bb35ea04828a247ace86a6220132a55e87ba05826b1d5f47a SHA512 3a6d13cb21772ec983edd6ee31b07c9a7825622336c134491fa2ab0e556b952f95b942a7b165527fab5515a99224ba5c8b06da2f9d85779b134b046c52831d81
diff --git a/app-vim/vimagit/vimagit-1.7.3.ebuild b/app-vim/vimagit/vimagit-1.7.3.ebuild
index b62d380b1309..fbf952912166 100644
--- a/app-vim/vimagit/vimagit-1.7.3.ebuild
+++ b/app-vim/vimagit/vimagit-1.7.3.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit vim-plugin
+EAPI=8
 
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
-else
-	SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: ease your git workflow within vim"
 HOMEPAGE="https://github.com/jreybert/vimagit"
+SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
 VIM_PLUGIN_HELPFILES="${PN}"
 
 RDEPEND="dev-vcs/git"
diff --git a/app-vim/vimagit/vimagit-9999.ebuild b/app-vim/vimagit/vimagit-9999.ebuild
deleted file mode 100644
index b62d380b1309..000000000000
--- a/app-vim/vimagit/vimagit-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vim-plugin
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
-else
-	SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="vim plugin: ease your git workflow within vim"
-HOMEPAGE="https://github.com/jreybert/vimagit"
-LICENSE="vim"
-VIM_PLUGIN_HELPFILES="${PN}"
-
-RDEPEND="dev-vcs/git"
-
-DOCS=( README.md Changelog )
diff --git a/app-vim/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
index 289cc3927bba..06bcd4aea2a8 100644
--- a/app-vim/vimbuddy/Manifest
+++ b/app-vim/vimbuddy/Manifest
@@ -1,3 +1,4 @@
 DIST vimbuddy-0.9.2.tar.gz 1152 BLAKE2B cc7ea6fcffa05bacbcbcab2850486c648cc9dd4fe2d7896865ef17acef6c9cf8b05ee33a14fd212b156b4ee9c4c04a8abb764c320a74b0cfead545f1ab3f9636 SHA512 feca2b303e677cdc0ed1a02e92c54ae293ccd380006667ea49c93ea804975bf8c40044c11e2599ad3e81062a453465249120fc7daaf2eea994d8d81d3d2f87cb
 EBUILD vimbuddy-0.9.2-r1.ebuild 515 BLAKE2B a48fbfccc37773c3db406389d9ea454f1dbc53496802894e1e7908a95565f85a6737dfb4e916a9eb8585b85357a492fbffd420f7831eb0a4f2d95dc593ddd048 SHA512 2fa54fd67a50f4b6ff51a4759163e867b89eaf5276af5990f4dad333d789b178c1c52b555dcce10000bb835179b0d7f32addecf38b2ab591ebb0702f02903244
+EBUILD vimbuddy-0.9.2-r2.ebuild 518 BLAKE2B 318e8f2443bea8896a823b3679dfa5d9e6edd95d7100b9f3bf24ca641820d91244b3eaa55388ce2d07ff9e06fea753ab69d557dace47130deba1c244c64abb0e SHA512 f431ed61fc0aee1e58427d701a1c4fae2ec6df41c85309d90db21853c28a609768cc3bf464ded979fe2e1b0d585fb8e64f9a291936a0f5b9f776856dc89cb502
 MISC metadata.xml 339 BLAKE2B fd18d17a5ab124cf6df3c4602a7b28834f910085ddb085e4a5dfd39bdd7c003d23fc4573478ef0cd5e49492897bf5335c53386c07f658c77fd041b8f7310af82 SHA512 1a7df9c0cf01eeee768e6fd1745824b7982cf9e559a5dd6e6e480167b801276ad81434a2374574f601a32e6ec733caa79e4653c3d1619321343ecabf55bcaafc
diff --git a/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild b/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..c1cc4e08520b
--- /dev/null
+++ b/app-vim/vimbuddy/vimbuddy-0.9.2-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: vimbuddy for the status line"
+HOMEPAGE="https://github.com/vim-scripts/vimbuddy.vim"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=8"
diff --git a/app-vim/vimcdoc/Manifest b/app-vim/vimcdoc/Manifest
index e4435e56bd46..7b09aa9791d2 100644
--- a/app-vim/vimcdoc/Manifest
+++ b/app-vim/vimcdoc/Manifest
@@ -1,3 +1,5 @@
 DIST vimcdoc-2.1.0.tar.gz 2228306 BLAKE2B 099727487067f5ff1e28ab1d8562edc6377984e557c9fa8b467102cd7df069f6bfed7d2149c59f8b5d8aa6e2352905533cdc6c6c1869a8e2494c4b1601df6056 SHA512 31df2f9b37d0fe00205afc66a920633fae770bca569c3d71376cc4b27af42f6f8bd6aa9f997b5007bad65ca4525a1847e396b64083ca7dd12748153e4d216096
-EBUILD vimcdoc-2.1.0.ebuild 332 BLAKE2B 4148d5f0345255a6d7b8d8205289a307e9bcad5487d1efaf66bd92cbbb16ee2a78f7cb609b1b0a9c893bfc543ca54fc1f1d5c90200fbcec83a41343c96c00724 SHA512 e078268c7d1d113c4e995a3a18389314f6c0df6f8ab278ae550c8a10c31408fa6e925137fb8a39ad1ae32b0e617e0fecd0fc14a7b114bcff5a4825998b5e10bb
+DIST vimcdoc-2.4.0.tar.gz 2962880 BLAKE2B bdc649e67efce685632fd90764037d37084920909c34c6c001afa32d8176211d941369aafcccd1dc2a3839d4f075b3ca73e970327124a7f3f159a0e320f3d8c5 SHA512 f38d93370cdb746b841ff327d39a343fab34f4489045ca4235703c8d7b6a48c7959699afaaf3ee5dc9141867c594e72b3a3f811fb4d20b961a7d535cb6a57c3f
+EBUILD vimcdoc-2.1.0.ebuild 331 BLAKE2B 2fcaee941a67164fb811d2ec31ee3b384728cc295625e66c42f79a69e1f85d1bcbb38aa517f0612ddd9b06c447a329f76b8e62fa8dabd5af3cdc85f87a65274c SHA512 a498034b39e413ac07d0f22193a1f6aec220235431ad06de8364cd55c94e5ced27c1369a78846cdf7806cedbbb68d17a6d10dd2abe5627a38d41059fe6e4f6e1
+EBUILD vimcdoc-2.4.0.ebuild 331 BLAKE2B 2fcaee941a67164fb811d2ec31ee3b384728cc295625e66c42f79a69e1f85d1bcbb38aa517f0612ddd9b06c447a329f76b8e62fa8dabd5af3cdc85f87a65274c SHA512 a498034b39e413ac07d0f22193a1f6aec220235431ad06de8364cd55c94e5ced27c1369a78846cdf7806cedbbb68d17a6d10dd2abe5627a38d41059fe6e4f6e1
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild b/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild
index 5eec3b7044fb..11597914b55c 100644
--- a/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild
+++ b/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
 DESCRIPTION="online vim documentation translated into Chinese"
-HOMEPAGE="http://vimcdoc.sourceforge.net/"
+HOMEPAGE="https://vimcdoc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="vim.org"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vimcdoc/vimcdoc-2.4.0.ebuild b/app-vim/vimcdoc/vimcdoc-2.4.0.ebuild
new file mode 100644
index 000000000000..11597914b55c
--- /dev/null
+++ b/app-vim/vimcdoc/vimcdoc-2.4.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="online vim documentation translated into Chinese"
+HOMEPAGE="https://vimcdoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
index 954f5b02cd4a..5d30e5ddf0a4 100644
--- a/app-vim/webapi/Manifest
+++ b/app-vim/webapi/Manifest
@@ -1,3 +1,4 @@
 DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
+EBUILD webapi-0.3-r1.ebuild 436 BLAKE2B 5044d90830238ac22d6a34925caa07c2922c8e79b10e2075569e3261a2da0b2b3cfe58793eb4f33db0082c4329f10097f5c36c166171612c136dc0186f08bf39 SHA512 a5970288d3a2bf2b053951245341d55b09cffcf7743bc5db0e9d8cc8d1a6e0a5fe0cafdab67fc3ace6d32b535eda55a5b89a6379c62d9ea3280fe56d30677971
 EBUILD webapi-0.3.ebuild 434 BLAKE2B a41c1ad0d3d1190a499ec3b172cdff0b1fcad3bc22c3c30efbbc97453a912d0738de1bcff74b2e44dd9f1c9628dbb235dc0d3ebb0b2ed5727bbe08106c17c5e5 SHA512 6f873f3fb085fdbebdc0bca0448f30d24097b328dc84b973b28c21c3e4929c375e2b022b65994acb4905f02f60fcfb8f48d83b29d6dc6581fa83cf91f297e612
 MISC metadata.xml 246 BLAKE2B 410fd0eb2d2b412bb4ca13905fea3351e818dbeed07d7063df2ebfe9000dd45ba7ac827a33c8961913ac567db7caa61646229e43b527edbd704795cc09ba3c94 SHA512 2c66e46cc1cc61356d6784064205b832cd2854c3dbfb6dc79ba55b968d1886e2063a7bdb4b2541651e4f289c09bd344cd4eb7d48b2bda67c955b09f142b63c55
diff --git a/app-vim/webapi/webapi-0.3-r1.ebuild b/app-vim/webapi/webapi-0.3-r1.ebuild
new file mode 100644
index 000000000000..83e5160ae527
--- /dev/null
+++ b/app-vim/webapi/webapi-0.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface to Web APIs"
+HOMEPAGE="https://github.com/mattn/webapi-vim"
+SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-vim-${PV}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND="net-misc/curl"
+
+src_compile() { :; }
diff --git a/app-vim/wikipedia-syntax/Manifest b/app-vim/wikipedia-syntax/Manifest
index c808e57ca279..48590ba5dba5 100644
--- a/app-vim/wikipedia-syntax/Manifest
+++ b/app-vim/wikipedia-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST wikipedia-syntax-20101113.tar.bz2 3463 BLAKE2B ee37c972eaf884e6c5130356638c7309481f4e37b7c08056770d9600e35ef67b1480fd0b8f4eb68a10df9caf8f4152e325d501d752e799eb5b43de8f5b012ce4 SHA512 e0e52d4cf6e6e5a3f6cb32b0dc22c91c6b3b58292f1e0d67cb4de4ed2675d7f6bbb069d37e6a59b0cfad201c082322e3cb5300639e39447bbcda22d99c88b4b4
 EBUILD wikipedia-syntax-20101113-r1.ebuild 500 BLAKE2B 9679b5ab081ec14e73f67d2768de12273fa00bf0f1f6c78dab3460907ce0219ae3d3c22f72fe993f8758051bb140dc67a4dfcf9e70dcceb79c6bda79ce777c95 SHA512 390b1a88860f5c548060a080d3006e31afffabf6571e8c8a9dca11d68d54c097484daed7be109d0fd2a91fd149751e112a0258e017a157cfdbd51ffe12122e91
+EBUILD wikipedia-syntax-20101113-r2.ebuild 497 BLAKE2B 7afdd33d62a405e1c4a081bfe9629c693a30f0761b4e17075f993a16e472449461943f8a4509ec3b62e24da393ca77dab036fe0c86a57a01ba709a8e143ae7f3 SHA512 64322aa28ffe23816eca8393d1b92105162fd29523910dc6c24c3f65712d0dc1c31e62140d950e60b94ddf423a0182f29022d7ab184f763eb105616078facd3a
 MISC metadata.xml 442 BLAKE2B 06dbacb19bd4ab9c07afde7ec0ab3d561620b915a2e9cb9fd28efd9d7e4c605d2597889a8710c44258c5753f3e3297865108a978eb2eaaa10d0eb9852af2187d SHA512 e7d614d001f41434d8cd12109c72f8a32067efd23bf462b0d635b9e3f0e5aed13b1ca9be65c109f137b85ac71a66ef5bad494123e2b265dc8311ca93bdde0a78
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild
new file mode 100644
index 000000000000..6465867f2187
--- /dev/null
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
+HOMEPAGE="https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
+
+LICENSE="CC-BY-SA-3.0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Wikipedia article
+files. Detection is by filename (*.wiki)."
+
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/xquery-syntax/Manifest b/app-vim/xquery-syntax/Manifest
index cf7376710c04..c96062ccf830 100644
--- a/app-vim/xquery-syntax/Manifest
+++ b/app-vim/xquery-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST xquery-syntax-0.1.tar.bz2 1552 BLAKE2B e33f5359d3059c7558516939e2ce14c906f12fd4b7c5d035cdbadc9485e1fc992e50a2c38685d27ffae40dc7b22375c6825ae414131846ff0c19d68484750ad0 SHA512 277503e2d7089702c58b2e04a48345e579b6cfdee5042da90e8401b914c1d515c811cbf71f6dedbeee4a21e7a4807bd0d694323ddb2bd6b9437edaaba5a0f2fd
 EBUILD xquery-syntax-0.1-r2.ebuild 583 BLAKE2B 3500a35d9720521e83d4ea76924f4bb1e6e761687524e609bfd7cfe4211ddd93192177b8505c473a2596ae577b12a8e66e551644ad7b1eebc7f461b9d02add1e SHA512 0ae5642c93bde2f87120f34f098868e36a534dfadaa6bbc571106f5c4ecea2ec04379d1849ad80e663ba91925870017f622d2f9bfbb365d1ce9835820c742936
+EBUILD xquery-syntax-0.1-r3.ebuild 580 BLAKE2B 978465b3de1004305005dec5639afbfb569811943f26cfa6563e9d06f3d74440131498425df0b9dd3943110c710d6abd3671c277e83177eec4533dc61f15ebec SHA512 736d283f26afbce52eb794ca4c0294e43e02ad81c4f27a2a8a08f6479f36f37150a116e8f2ae7f12c20741d24fcd77d9ffccef817eae95f43e066dfa11bb5748
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/xquery-syntax/xquery-syntax-0.1-r3.ebuild b/app-vim/xquery-syntax/xquery-syntax-0.1-r3.ebuild
new file mode 100644
index 000000000000..a1bc0756a5d8
--- /dev/null
+++ b/app-vim/xquery-syntax/xquery-syntax-0.1-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: XQuery syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=803"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for XQuery files."
+
+src_prepare() {
+	default
+	# use hi def link. Bug #101788, bug #101804.
+	sed -i -e 's,^hi\(ghlight\)\? link,hi def link,' syntax/xquery.vim \
+		|| die "sed failed"
+}
diff --git a/app-vim/xsl-syntax/Manifest b/app-vim/xsl-syntax/Manifest
index 4e7efa8896ff..ace84f20d038 100644
--- a/app-vim/xsl-syntax/Manifest
+++ b/app-vim/xsl-syntax/Manifest
@@ -1,3 +1,4 @@
 DIST xsl-syntax-0.3.11.tar.bz2 5770 BLAKE2B d7d06bf7e2537c8c6c1419f557e4c29042a1af6dd31850c28feccbd342a1beb60dded565f48b715d021ebe3279e0d4a75daa3063e7e8347a1977f97947a0a92a SHA512 e09f0f6ebe023a681560a12e919c9573abc2bf0f1a6fe1bda233ca296fa4fa81bead99aeb7eafb387f04e199f7601d8ce6593c767be1b3e94ff73135ea0f4361
 EBUILD xsl-syntax-0.3.11-r2.ebuild 564 BLAKE2B b25dd8ec8b9b0bc662594c5dcbeb014066b50236151fd5848fd78923ecf5138d2e6b0db0ff3f53c770b113d66f45f0ffa8d9b234215d06e97899d6b5085ca3c2 SHA512 4a0a7a429ed815f1b3bba6147cc50b2c3915b8fce2a5d2a6fcc33573871115e597735439ba735c17314dab84d40a63596113cc8fb628ecadbf8ec1b295033e1e
+EBUILD xsl-syntax-0.3.11-r3.ebuild 563 BLAKE2B 7c09dbd0d00334473ac05145c28848da8334532d392d6a65c0bf8569d2f1d1d77d74ceaac7479b6b57c003e2d1000eea7f843d28780355fbf429a953223e3748 SHA512 fc2d8044d20f6d7c2e6e553610dfee9a948885938dfe66f3d39b8a17761a38ee8611d63ef991649c2ef5e131a4dace9b70778340fc863ddb02b508ab4a0f8187
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild
new file mode 100644
index 000000000000..fb380c5d310a
--- /dev/null
+++ b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax for XSLT (with HTML and others)"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=257"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=257"
+
+src_prepare() {
+	default
+	# hi link is evil. See bug #101787, bug #101804.
+	sed -i -e 's,^hi link,hi def link,' syntax/xsl.vim || die "sed failed"
+}
diff --git a/app-vim/zenburn/Manifest b/app-vim/zenburn/Manifest
index 8375313e7ca3..28ab21572085 100644
--- a/app-vim/zenburn/Manifest
+++ b/app-vim/zenburn/Manifest
@@ -1,3 +1,4 @@
 DIST zenburn-2.25.tar.gz 7361 BLAKE2B 728930ddfeca46d7e020882fde92841a0ed9c889504686589a5028b1b373bc3b7c862d8fcc0740731738416057f4c99533e835594e8ce01029174d74f446bab3 SHA512 e3d222b66696ce24ff6ce8ccda201a15ee27d868581c311b8c31e7eeada4a2fe3ca395d53fc42245b1dfe4b68394cd22f23203dbd6366298adc7a9d6428af683
+EBUILD zenburn-2.25-r1.ebuild 432 BLAKE2B b630977ad5c98d98878673bba9538e5eed40c904d0ba6cf23f2b78bfce86ae26346770020b82165192135d1ac597452b41968e8fffe4a7b5f09385aaaa1174ed SHA512 e6a27eba08abe3d199c78ba537e4b03f4c5a2982217a496ea4c7ad2b44a522585ac8ddf30727d8b616e4b621568b582020c6a25e46dd7c7fd2dabc7186095531
 EBUILD zenburn-2.25.ebuild 417 BLAKE2B 1bf1b095ae48e66c7316dad62ae51e7389791a0996323c478038771298f688118ff4e6d5380cfa05dc60b510c8bda3bb8a108ca26fdce425b2c6c87fa1b1ec2b SHA512 b72d16822f01bd64b4802766861ba6cfe9ac637b06d52f5efba948483fc988502bd1c2d0125a0aa71f159f2a8e37dc7ff047131763c439c235d45cd768c18a2d
 MISC metadata.xml 426 BLAKE2B 28b2c848f25bee349d8989f99b78e02873af559f96bb06e186660e456ca4fdbec5be6418aa9be6b0830de1cecaf2d5048c08afc49d2b367ebab5ff2bffcbcf5f SHA512 ff1d80a03076e5faf82eb332be1d523f6d19c25e9f8999757b9849aecedee5b96b27ec40ff31080ea479e951bc4afcf6cfe62fb98ff818f89ab4f132093ec08e
diff --git a/app-vim/zenburn/zenburn-2.25-r1.ebuild b/app-vim/zenburn/zenburn-2.25-r1.ebuild
new file mode 100644
index 000000000000..9d9803a96546
--- /dev/null
+++ b/app-vim/zenburn/zenburn-2.25-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+MY_PN="Zenburn"
+
+DESCRIPTION="vim plugin: Low-contrast color scheme for Vim"
+HOMEPAGE="https://github.com/jnurmine/Zenburn"
+SRC_URI="https://github.com/jnurmine/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
diff --git a/app-vim/zoomwin/Manifest b/app-vim/zoomwin/Manifest
index 11d8bf2b4e17..55b28fb4b5c4 100644
--- a/app-vim/zoomwin/Manifest
+++ b/app-vim/zoomwin/Manifest
@@ -1,3 +1,4 @@
 DIST zoomwin-24.tar.bz2 7928 BLAKE2B fc841f859635c58738a52ed55fdea997eaaaa867984347a0977c0818a24517ad580bbc3386567304d5812e20fa0015fbf3cbc116b50b7a56f361d5140a25e8ab SHA512 fb20958813c1cd956c25f34c9355454b5003cf1a2d3582149c07ea3cdb4630a0407f2407f3a8f96abec37659e75facef13094d6d1ec2972b937dab8bdf9d61a9
-EBUILD zoomwin-24-r1.ebuild 345 BLAKE2B 89a1b1b0662feb94e4724ee6fd5597c16b3e3ff4018351195074e4bbe3ceac0bb7041b6d282c9d7000374c729964027292c65e7c25a493363da5d93cbaf1e872 SHA512 8af9e7ed1bd7a94eb7d2851051a7e9f05ea7bc9901713217036d124bb43d173b12b679a5817bd3df73c29fcec3fdd0d5cf0eef59b99cd1da275d78c9775cb290
+EBUILD zoomwin-24-r1.ebuild 346 BLAKE2B 4163e5bb5ac76ae94623fd53aaa00b75802abd2da09c5cc976dc753330347db55ff70237e907f0b6840bee1a79cf0b5ab499f4244161a8c08c6437f765ecb439 SHA512 2173e64673076fdfa5ddb3da50adf027ca21699214517b0b5606335fbe638f0a765f06efe920216f9d6aebed1f534f3b40e942ee1bc45eff9204e2d6905d6015
+EBUILD zoomwin-24-r2.ebuild 351 BLAKE2B 03fc141fb18f935c1520eace6112514ddf4a3bf54d4a0e36704f68919d54052261fafcbccae700ad5ee178b7e7c5f60664d4d593ab9fa9eb1d6cd525f931e319 SHA512 15efdebfc7d47e9d5e58fe92286361e91ee23c1eb10a0ac33eec223737289204bacc89ed7f5692d8b8ba60a35e46131e258d29c2165d9f6ff61ed0d6e87f088b
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/zoomwin/zoomwin-24-r1.ebuild b/app-vim/zoomwin/zoomwin-24-r1.ebuild
index 3e3acd746ed8..17cc4eca072b 100644
--- a/app-vim/zoomwin/zoomwin-24-r1.ebuild
+++ b/app-vim/zoomwin/zoomwin-24-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: brief-style window zooming"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=508"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=508"
 LICENSE="vim"
 KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 
diff --git a/app-vim/zoomwin/zoomwin-24-r2.ebuild b/app-vim/zoomwin/zoomwin-24-r2.ebuild
new file mode 100644
index 000000000000..174c3aa672cf
--- /dev/null
+++ b/app-vim/zoomwin/zoomwin-24-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: brief-style window zooming"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=508"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPFILES="zoomwin"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2669c493e363..37b61a756b6a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 2987216b1752..48cc5094f517 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -27,7 +27,7 @@ EBUILD openssl-1.0.2u-r1.ebuild 9993 BLAKE2B 2128588b25f90830c4b9120a0e5aa079b12
 EBUILD openssl-1.1.1u.ebuild 8043 BLAKE2B 6c19ba4e37ff0942992c2fd639840301900ff3c68dfb8f3c0ce295e58aa1717c4ed68f620e7fb29ec4fdc8f05c3ae8ff36bdb4e41ad55a19d8ca1de018e7401f SHA512 db2d39ab22c9a2e35497b74cde43c656c78e3e8015eaff5598b2a56100d8ba236a05d98945253ebcdd90b56a93fd2895d96f205bfc66f3b7c89a6b26f4b16a28
 EBUILD openssl-1.1.1v.ebuild 8051 BLAKE2B 27fa7e805f68c0e8e0c4e50df1f5a4097c08af675b0456ef2852816a665eebbcac37533fa1044093d0712efd93cd2b156cc51232397d44ba4462e4068f9c642e SHA512 70c85b6028ea7ee19227527379e5ec91ef47390faaedf6b06165634b00742d42ae6961786056dd557da98f2b4cae5e879a3331b4846b14eed4528885eec20bca
 EBUILD openssl-1.1.1w.ebuild 8051 BLAKE2B 27fa7e805f68c0e8e0c4e50df1f5a4097c08af675b0456ef2852816a665eebbcac37533fa1044093d0712efd93cd2b156cc51232397d44ba4462e4068f9c642e SHA512 70c85b6028ea7ee19227527379e5ec91ef47390faaedf6b06165634b00742d42ae6961786056dd557da98f2b4cae5e879a3331b4846b14eed4528885eec20bca
-EBUILD openssl-3.0.10.ebuild 8528 BLAKE2B 7074b28566098cfa40e433c6029de2e0c96521483b5177e8ccf6d4779412d2fe4b532f9f09f7401a538ca75cd6059aa8cec44775099b3af589239d8905fd42d8 SHA512 007401c0fe6fe14bd3d701a2e8a5cf5b2dfdb202fe8d6328ee95eb5342598489d0800aa8042050c4057c0760b773adea826c670939830d5e061b41349c3f52df
+EBUILD openssl-3.0.10.ebuild 8527 BLAKE2B 710ffdc29955f16aa63bf279cddddfeb9ad255b5a56b784bd4722d54771c8afba84e2a3d4b9d1a006814a7e411e1f22865d7e789e8d8e44f0ccc9337e4b44584 SHA512 b401a0ca412a4c00b8b5d99f7fd1dce2519b9fb2d9311c17b9cf04848f4026075bed9094dae4158bf75b76d80daf4ef27b10bbf4a382114a159254541ce59146
 EBUILD openssl-3.0.9-r1.ebuild 8490 BLAKE2B ba9e5ee5633b3c1bb2b9129142757cff35eaf28183d118a0339c617e520f0c86fca9cd6f4f2696c9bd35c860e10b7e6e56d91d4d43e5e1fdb91a2b0fff8a3afd SHA512 67401d7cbffd2c2b53dcf9e3ac076fa15f4c3051f7d4be1d914220b79d1818eb860e136c96b4a3c742dcd27df8ec21ec52b3658efb91c17732e6e7a6248ddaad
 EBUILD openssl-3.0.9-r2.ebuild 8583 BLAKE2B 8d1ced5dffdabbe0f63ac79b4e3739a61e7c7f534d3f2d7d26f9818ee3dadd87fa26ec4c81066af3f9128e8ee6d4b802844a5c3f641a1eea546c92712f9c2aa3 SHA512 5bca3c8df0d3d2f36fca349fa2901990ba6e5a120aded696093afa5cadcdfb3e550512b9bd58b2ac014508c80dff2464fbcb74659e997c3eabac7d0c8da5bfbb
 EBUILD openssl-3.1.1-r1.ebuild 8531 BLAKE2B 67643a995e293072f9c30787d95dd4f67a28a5d96c7e771b94c58df59cc6d1bbedd1c982bf6dfa27394a8285f1d5d854ac49d5c39f86127d52e620fa03a58b7b SHA512 7cbab87a59866ee6dc0f3660ddecf62d149e707ca8ea0c7627c40ceda02260cbe4ca63ff169f88c3070278d8d79be2b117910ef27bff2293dab076853a8667b9
diff --git a/dev-libs/openssl/openssl-3.0.10.ebuild b/dev-libs/openssl/openssl-3.0.10.ebuild
index efea69f19611..c82e32cd37e4 100644
--- a/dev-libs/openssl/openssl-3.0.10.ebuild
+++ b/dev-libs/openssl/openssl-3.0.10.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b342985a8638..2b0b516e8d76 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index e85860c6ee06..a4e1b0f804db 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,8 +1,8 @@
 DIST qtcharts-everywhere-opensource-src-5.15.10.tar.xz 4254496 BLAKE2B 9a163371a6360fb39f57d08e282f4bca79c4839ebbb105ebb37f32797d72faac73cdf832eb64cb4d76196447f5feb3089287e98f6979e0bd6b2fba5f7e0d28a7 SHA512 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961
 DIST qtcharts-everywhere-src-6.5.2.tar.xz 4667940 BLAKE2B 36a24659e09e8f6d19c14683e86781ceb04efa80c9dc44e666202507b5d1a0586c1265ed6d5deecbdd18b4d7c0f0d539d9e829f90419ddb05a323ce389bb455c SHA512 913362f21668a81b82eff5125991b0b53ff9eeaf93dc6bf17539d4cffdc60e639a4e3490edec793d02ff942174ea3036854cdc8801382f4b8af341f8cbc3a1f1
 EBUILD qtcharts-5.15.10.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
-EBUILD qtcharts-6.5.2-r1.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a
-EBUILD qtcharts-6.5.9999.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a
-EBUILD qtcharts-6.6.9999.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a
-EBUILD qtcharts-6.9999.ebuild 521 BLAKE2B 79384c43fefef5c84f76547ec6e683e835cb69c734efa01030aae57c67feb2c446cf8b1c69d2b6806ca265f220ae2a30341652d4728fe3a1791cd8eaa92b8c3c SHA512 aff7decf450409a48238e35851b6088131dcbdd6a8c49307c3b0c750da46e0ce702f4287c26678c942a3fa9eb66d6e752266ba1a4f39f6bd81b2344f43bda07a
+EBUILD qtcharts-6.5.2-r1.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
+EBUILD qtcharts-6.5.9999.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
+EBUILD qtcharts-6.6.9999.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
+EBUILD qtcharts-6.9999.ebuild 529 BLAKE2B 3262b212cf9caf4059720a7f7c884759dceb4a4936869d7be9b38357f6b2be7e5d22775159bab9f8a48042875585b52e71d2f68f7076a4a3c4f5b81ae5711894 SHA512 50a76440d405d2a2a4916558b53c4ba19c0a7e509cb4c36f12941a420382e17d2dd10eb05bd0e662eca869490880fabde6369ad64546a5b5896a8b0d8378935d
 MISC metadata.xml 613 BLAKE2B 693aba98343908132ab23149d09ca0e9a99c3af498ac177469d63fb87a5f782b31f92a70941c33bd9f5d82cd0dccb2a2fe7ddf9321f9644401b0603cd99fd21e SHA512 33ee8e1edf4e713a4081af40e7d1b17ae1dcfa390bb6b2dc908d4c1e0ad010b588f65ce1f592bbccaeda21fbab70aaa777d6809ad75e15238c27f40421a78e77
diff --git a/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild b/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild
index 9f2d54c39e93..cbd5653b3a93 100644
--- a/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.5.2-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="gles2-only qml"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild
index 9f2d54c39e93..cbd5653b3a93 100644
--- a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="gles2-only qml"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild
index 9f2d54c39e93..cbd5653b3a93 100644
--- a/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.6.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="gles2-only qml"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtcharts/qtcharts-6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.9999.ebuild
index 9f2d54c39e93..cbd5653b3a93 100644
--- a/dev-qt/qtcharts/qtcharts-6.9999.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="gles2-only qml"
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 1dc3df41c45c..d778cdddb0c7 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
deleted file mode 100644
index 6003b5c86f62..000000000000
--- a/gnome-extra/synapse/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX synapse-0.2.99.4-ayatana-indicator.patch 1189 BLAKE2B 09a0aa7cfc3499848190cdd3e1b60cb48b743b5d9890496c1bc8900aff611b98a9eaf0575de4aafe6f8078dcca54c4d1c5740b37080a98fc3aab1d4f81189cb6 SHA512 23963249934b7bff306be3b5f270e62d3af17b968801e4657ed1d6749cb719dfadf48f78bb0b4f83f8c3545590065519c9d47537591bba93ceaec5b973c37730
-AUX synapse-0.2.99.4-mate.patch 7393 BLAKE2B a870333c03bf02454fed6a371425eb86cd13f20506603bac3b05273551b590830354cb6c7df41ae779101dcf13eb9d17a18cb63dfb975f4e678a6fe97028539c SHA512 122649ebd2c7185d0ba5e8f9e6ff0fee85c4a54ddc8e7cfc361e2655abb2de447cca98f2ecf38602bc00bd26a1a3cd7f98c9372b7b40ca23ae6a8928b8f2df81
-DIST synapse-0.2.99.4.tar.xz 538476 BLAKE2B 27de41362ca53c06ba70d9b0df728aa64e72f19b726b5e5cb4797c85bf296c43969b58491430c585887e0a74339c49399bbe415c13827fa2b0243e8b1bdd8598 SHA512 d9668fb9dd18d97da89bf5f0a9864f843c629f91751b326b4e97de74c6db64a59dbcd221f1b6ed0fc199a683ed511d86f280756fe4c21195d6169d2977315325
-EBUILD synapse-0.2.99.4-r2.ebuild 1241 BLAKE2B 8ef13912c4c893db2f37549857024aa479e189b18f53cbb0921efac3fe87c00ccc2090402f738adb4641005d8381306c499ee2692d5a568db9ab41b46077458c SHA512 feba8c4468e75c9148059333a92ede71cb265cc258cf3b02658526c4366ff96d1e5c5b352146e54616a1afc62112583f4ab379c6badc3d935f25efb0e6b431a4
-MISC metadata.xml 353 BLAKE2B 96a45dd6dc53b24747d482385937e694de7b82b5e630880dd9bdde480463797f648135bfed321e7005703d4b078fac201f3f29eb84089de50b8cb9f093b53af2 SHA512 0d95f2ce7f9807badfde517e783c5ac13a0f608d8e783e66379e97dd3a1ab02365345ffcbb88041db5e5cdbeeaa212199d6f4ce044301a7e7e50e3ac0a20e670
diff --git a/gnome-extra/synapse/files/synapse-0.2.99.4-ayatana-indicator.patch b/gnome-extra/synapse/files/synapse-0.2.99.4-ayatana-indicator.patch
deleted file mode 100644
index ee11befc29cd..000000000000
--- a/gnome-extra/synapse/files/synapse-0.2.99.4-ayatana-indicator.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --color -ur synapse-0.2.99.4.orig/configure.ac synapse-0.2.99.4/configure.ac
---- synapse-0.2.99.4.orig/configure.ac	2018-04-08 20:52:10.000000000 +0200
-+++ synapse-0.2.99.4/configure.ac	2021-11-24 16:47:10.073022755 +0100
-@@ -110,16 +110,16 @@
- AM_CONDITIONAL(HAVE_ZEITGEIST, test "x$enable_zeitgeist" = "xyes")
- 
- if test "x$enable_indicator" = "xauto" ; then
--	PKG_CHECK_EXISTS([appindicator3-0.1],
-+	PKG_CHECK_EXISTS([ayatana-appindicator3-0.1],
- 	                 enable_indicator="yes",
- 	                 enable_indicator="no")
- fi
- 
- if test "x$enable_indicator" = "xyes" ; then
--	PKG_CHECK_EXISTS([appindicator3-0.1],,
--	                 AC_MSG_ERROR([appindicator3-0.1 is not installed]))
--	PKG_CHECK_MODULES(APP_INDICATOR, appindicator3-0.1)
--	APP_INDICATOR_VALAFLAGS=" --pkg appindicator3-0.1 -D HAVE_INDICATOR"
-+	PKG_CHECK_EXISTS([ayatana-appindicator3-0.1],,
-+	                 AC_MSG_ERROR([ayatana-appindicator3-0.1 is not installed]))
-+	PKG_CHECK_MODULES(APP_INDICATOR, ayatana-appindicator3-0.1)
-+	APP_INDICATOR_VALAFLAGS=" --pkg ayatana-appindicator3-0.1 -D HAVE_INDICATOR"
- 	AC_SUBST(APP_INDICATOR_VALAFLAGS)
- 	AC_DEFINE(HAVE_INDICATOR, 1, [Have AppIndicator])
- fi
diff --git a/gnome-extra/synapse/files/synapse-0.2.99.4-mate.patch b/gnome-extra/synapse/files/synapse-0.2.99.4-mate.patch
deleted file mode 100644
index 9703c13aed5d..000000000000
--- a/gnome-extra/synapse/files/synapse-0.2.99.4-mate.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -urN synapse-0.2.10.orig/src/plugins/Makefile.am synapse-0.2.10/src/plugins/Makefile.am
---- synapse-0.2.10.orig/src/plugins/Makefile.am	2013-08-18 18:33:35.710536590 +0200
-+++ synapse-0.2.10/src/plugins/Makefile.am	2013-08-18 18:33:44.427203171 +0200
-@@ -45,6 +45,7 @@
- 	hybrid-search-plugin.vala \
- 	launchpad-plugin.vala \
- 	locate-plugin.vala \
-+	mate-session-plugin.vala \
- 	opensearch.vala \
- 	pass-plugin.vala \
- 	pastebin-plugin.vala \
-diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.10/src/plugins/mate-session-plugin.vala
---- synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala	1970-01-01 01:00:00.000000000 +0100
-+++ synapse-0.2.10/src/plugins/mate-session-plugin.vala	2013-08-18 18:33:44.427203171 +0200
-@@ -0,0 +1,196 @@
-+/*
-+ * Copyright (C) 2010 Michal Hruby <michal.mhr@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
-+ *
-+ * Authored by Michal Hruby <michal.mhr@gmail.com>
-+ *
-+ */
-+
-+namespace Synapse
-+{
-+  [DBus (name = "org.mate.SessionManager")]
-+  public interface MateSessionManager: Object
-+  {
-+    public const string UNIQUE_NAME = "org.mate.SessionManager";
-+    public const string OBJECT_PATH = "/org/mate/SessionManager";
-+
-+    public abstract bool can_shutdown () throws IOError;
-+    public abstract void shutdown () throws IOError;
-+    public abstract void request_reboot () throws IOError;
-+    public abstract void logout (uint32 mode = 0) throws IOError;
-+  }
-+
-+  public class MateSessionPlugin: Object, Activatable, ItemProvider
-+  {
-+    public bool enabled { get; set; default = true; }
-+
-+    public void activate ()
-+    {
-+      
-+    }
-+
-+    public void deactivate ()
-+    {
-+      
-+    }
-+
-+    private class ShutDownAction: ActionMatch
-+    {
-+      public ShutDownAction ()
-+      {
-+        Object (title: _("Shut Down"),
-+                description: _("Turn your computer off"),
-+                icon_name: "system-shutdown", has_thumbnail: false);
-+      }
-+      
-+      public override void do_action ()
-+      {
-+        try
-+        {
-+          MateSessionManager dbus_interface = Bus.get_proxy_sync (BusType.SESSION,
-+                                                   MateSessionManager.UNIQUE_NAME,
-+                                                   MateSessionManager.OBJECT_PATH);
-+
-+          dbus_interface.shutdown ();
-+        }
-+        catch (IOError err)
-+        {
-+          warning ("%s", err.message);
-+        }
-+      }
-+    }
-+
-+    private class RebootAction: ActionMatch
-+    {
-+      public RebootAction ()
-+      {
-+        Object (title: _("Restart"),
-+                description: _("Restart your computer"),
-+                icon_name: "system-shutdown", has_thumbnail: false);
-+      }
-+      
-+      public override void do_action ()
-+      {
-+        try
-+        {
-+          MateSessionManager dbus_interface = Bus.get_proxy_sync (BusType.SESSION,
-+                                                   MateSessionManager.UNIQUE_NAME,
-+                                                   MateSessionManager.OBJECT_PATH);
-+
-+          dbus_interface.request_reboot ();
-+        }
-+        catch (IOError err)
-+        {
-+          warning ("%s", err.message);
-+        }
-+      }
-+    }
-+
-+    private class LogOutAction: ActionMatch
-+    {
-+      public LogOutAction ()
-+      {
-+        Object (title: _("Log Out"),
-+                description: _("Close your session and return to the login screen"),
-+                icon_name: "gnome-logout", has_thumbnail: false);
-+      }
-+      
-+      public override void do_action ()
-+      {
-+        try
-+        {
-+          MateSessionManager dbus_interface = Bus.get_proxy_sync (BusType.SESSION,
-+                                                   MateSessionManager.UNIQUE_NAME,
-+                                                   MateSessionManager.OBJECT_PATH);
-+
-+          /*
-+           * 0: Normal.
-+           * 1: No confirmation inferface should be shown.
-+           * 2: Forcefully logout. No confirmation will be shown and any inhibitors will be ignored.
-+           */
-+          dbus_interface.logout (1);
-+        }
-+        catch (IOError err)
-+        {
-+          warning ("%s", err.message);
-+        }
-+      }
-+    }
-+    
-+    static void register_plugin ()
-+    {
-+      PluginRegistry.get_default ().register_plugin (
-+        typeof (MateSessionPlugin),
-+        "MATE Session",
-+        _ ("Log out from your session."),
-+        "mate-session-logout",
-+        register_plugin,
-+        DBusService.get_default ().name_has_owner (MateSessionManager.UNIQUE_NAME),
-+        _ ("MATE Session Manager wasn't found")
-+      );
-+    }
-+
-+    static construct
-+    {
-+      register_plugin ();
-+    }
-+
-+    private bool session_manager_available = false;
-+    private Gee.List<Match> actions;
-+
-+    construct
-+    {
-+      var cache = DBusService.get_default ();
-+      session_manager_available = cache.name_has_owner (MateSessionManager.UNIQUE_NAME);
-+      message ("%s %s available", MateSessionManager.UNIQUE_NAME,
-+        session_manager_available ? "is" : "isn't");
-+      
-+      actions = new Gee.LinkedList<Match> ();
-+      actions.add (new LogOutAction ());
-+      // TODO: add a config option to enable these actions (for example when ConsoleKit is not available)
-+      //actions.add (new RebootAction ());
-+      //actions.add (new ShutDownAction ());
-+    }
-+    
-+    public async ResultSet? search (Query q) throws SearchError
-+    {
-+      if (!session_manager_available) return null;
-+     // we only search for actions
-+      if (!(QueryFlags.ACTIONS in q.query_type)) return null;
-+
-+      var result = new ResultSet ();
-+
-+      var matchers = Query.get_matchers_for_query (q.query_string, 0,
-+        RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS);
-+
-+      foreach (var action in actions)
-+      {
-+        foreach (var matcher in matchers)
-+        {
-+          if (matcher.key.match (action.title))
-+          {
-+            result.add (action, matcher.value - MatchScore.INCREMENT_SMALL);
-+            break;
-+          }
-+        }
-+      }
-+
-+      q.check_cancellable ();
-+
-+      return result;
-+    }
-+  }
-+}
-diff -urN synapse-0.2.10.orig/src/ui/synapse-main.vala synapse-0.2.10/src/ui/synapse-main.vala
---- synapse-0.2.10.orig/src/ui/synapse-main.vala	2013-08-18 18:33:35.710536590 +0200
-+++ synapse-0.2.10/src/ui/synapse-main.vala	2013-08-18 18:33:44.427203171 +0200
-@@ -165,6 +165,7 @@
-         typeof (HybridSearchPlugin),
-         typeof (GnomeBookmarksPlugin),
-         typeof (GnomeSessionPlugin),
-+        typeof (MateSessionPlugin),
-         typeof (ScreenSaverPlugin),
-         typeof (SystemManagementPlugin),
-         typeof (CommandPlugin),
diff --git a/gnome-extra/synapse/metadata.xml b/gnome-extra/synapse/metadata.xml
deleted file mode 100644
index d99db8b438b7..000000000000
--- a/gnome-extra/synapse/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="plugins">Build support for plugins using <pkg>net-libs/rest</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">synapse-project</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/synapse/synapse-0.2.99.4-r2.ebuild b/gnome-extra/synapse/synapse-0.2.99.4-r2.ebuild
deleted file mode 100644
index c987df1e8cb4..000000000000
--- a/gnome-extra/synapse/synapse-0.2.99.4-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools vala xdg
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator nls plugins"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	dev-libs/json-glib
-	dev-libs/keybinder:3
-	dev-libs/libgee:0.8
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	appindicator? ( dev-libs/libayatana-appindicator )
-	nls? ( virtual/libintl )
-	plugins? ( >=net-libs/rest-0.7:0.7 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# From PLD Linux
-	"${FILESDIR}/${P}-mate.patch"
-	"${FILESDIR}/${P}-ayatana-indicator.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_setup
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable appindicator indicator) \
-		$(use_enable nls) \
-		$(use_enable plugins librest yes) \
-		--disable-zeitgeist
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e3cb4a10b631..69bcca12cc88 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 68ec422560eb..f1303ef00011 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Sep 2023 21:09:52 +0000
+Fri, 15 Sep 2023 03:09:55 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index bab03ebf9090..544d9c04057f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546444 BLAKE2B 427e6ba70311c66f33f8718c9e5205812a06f7180945f95cd2cc13a642ebd00b8ab6bde2ebd1ac16f0013a5d2c65c3729739daaa24b9e4c70888d6626437692d SHA512 666ed25ec3b20188903cb612d27562ec06741fff2c9cc4ee150980ae0801d6b66d3d117a8d3df13d953f8c0975e6b4fd3d287a501bb281b5093186361d8515d8
-TIMESTAMP 2023-09-14T21:09:57Z
+TIMESTAMP 2023-09-15T03:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDdqVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDywdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB/Vg/+PctLLZn5AV6E0rUdvuziKJS79VH24u0A3YCLtK4X7XtntZxlPVzV6z7M
-JEZdR86ToH68vmHkTr0oSL4VBKBLmBL/EFosJVbKWUFeBVIokd9p4SagBM90W80k
-6mU3pPIPn/v7HqGiQ+cpzIy9J0PuqLmY/ABWdEOAlYok8uZtfO1Z4W25e+t+/S/w
-G8EOyYJlYZQDmiTH+XgQbtzDulCKGZXfxA6ZXVf8cTAc+EvXkguXswSsOzyWhTYN
-frxUICbB9AbeKUiitNbzIGE/BNhV5gb8QAvHVZiaMAZ+XxFeRBEl3DisJ6FtGaAd
-FWu6PklcBFxlSF1dGQsoztutBQk2uw9JX+Qesyc+tzOSVwSoBjXeqII8Dr81zrMX
-IxKdsZyhRcHpOu/Iz8fkuxaQFj4zdDU3M/ipks28QzrswZbCFoNBsjQRV2ahc7ob
-PYpl1b0UTU3C2qEIP76hLFQrICyK071YQTciGqjdwUhQFUtDmQLEmBuUIvYtlFeM
-mMc+Q3kCGDgzY0GmHmHsMMwP4hNSqr/hoxvOBlb1u/D+sYWiK/tbz9gX+cXZ3fX3
-eM1aQggOWcErq0l24PtbCP/oQTEPOZKnq0xPsx648Bs+OKP2apZVSvOF6mYladFx
-hKzvu5RaXLcdt2wOdV7Ccudbw9Ny+d5T9UJQSPe/wqFTWcFoo3w=
-=nmME
+klCNzg/+OjrF6f3Mn3B71DHeU9n2Wk1QFYZ7o9M7na6S6CuibJYwmZbH17Ya0I5v
+AdvqBBqjXya4kt9KO4YJby7Ru6WZ1z7ESMTJQb5rULNsswu3qhOh3RS3qB2eAIaX
+xT+7IPTMmeYygaQRJJ7kVuDtuGW/1cOqv5h8DxEKogVkkEPJASMUKm3/OAd9RS28
+MqzZwUKmVgR0pxd3hRZwcOfyVMg9MHjD8ufBR4Fx1FOlWgsAa+TaBy0g8KIsBmpu
++HWqItio/Y0PgQ1rN6pPfZad60FYI2/tvjOsb7oa7azTbann/62A93U6c1KV9cIX
+KmFscbiQhu+lHj7BKojMBSXTmsnNrB1OJ0aXJh2lu1Be6DpzRLQR8X+N5NfEpOqJ
+QUQW6PuQ+wi459RQaSfvG5ir/j4+gMKJn3uXXQUnSck0qxo3yiS6SK32UpoLdbS8
+nI+cnJbw/SorqC9zb1D7PbT2v2D+wMG3Br7v328846MgbRWU3MpMEDWJA9lclG0U
+7iLw+tMfXPYQeMAEk2x6Y8hseWZ4F5aOqOA3D1hv+N3khLxGgXNkAx0xQkG4Ogul
+6TaAwVW75EWX3TQr1w1oCkc4w6zBx8YfLVzmmUnoyQaF360hBZDngiCcxYqkxitV
+9BEwaOgfwOhSt65bV75J6I4iFwjDGmoTa4BHWZK0xcV+SlKNt+s=
+=GitM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8788168f49df..f1303ef00011 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Sep 2023 21:09:53 +0000
+Fri, 15 Sep 2023 03:09:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 417c73b18cfc..c902d0ae9dbc 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c3a9c601d160..2f663f95c82f 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.14_p3 b/metadata/md5-cache/app-admin/sudo-1.9.14_p3
index a2947822ecc2..69a74b3c1239 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.14_p3
+++ b/metadata/md5-cache/app-admin/sudo-1.9.14_p3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.sudo.ws/
 INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.14p3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.14p3.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.14p3.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.14p3.tar.gz.sig )
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
-_md5_=3ddd2a70da4083c2aaa524422234b7e2
+_md5_=9a60db6480c8ad3194a23ba7af4ea671
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index cfc2ede26e0f..b04580ee2579 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r3 b/metadata/md5-cache/app-vim/alternate-2.18-r3
new file mode 100644
index 000000000000..8d1cd868c2d0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: quickly switch between .c and .h files
+EAPI=8
+HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=alternate
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.gz -> alternate-2.18.tar.gz https://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=fa3db222fdf0d62eb713b4bf4a6885a3
diff --git a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r3 b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r3
new file mode 100644
index 000000000000..3b1893c71a5f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: BNF file syntax highlighting
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=250
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/bnf-syntax-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bnf-syntax-1.2.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=048718d7ea7c4ca3b8777a79d8bd51e1
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.25 b/metadata/md5-cache/app-vim/bufexplorer-7.4.25
new file mode 100644
index 000000000000..c74f6e4d433c
--- /dev/null
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: easily browse vim buffers
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v.7.4.25.tar.gz -> bufexplorer-7.4.25.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=8480fac812d1c15136d6797e3c199432
diff --git a/metadata/md5-cache/app-vim/bufexplorer-9999 b/metadata/md5-cache/app-vim/bufexplorer-9999
deleted file mode 100644
index 6c50bb72950d..000000000000
--- a/metadata/md5-cache/app-vim/bufexplorer-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: easily browse vim buffers
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
-INHERIT=vim-plugin git-r3
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=3b1a339b61d9f025f7d045e08a350d0e
diff --git a/metadata/md5-cache/app-vim/calendar-2.9-r2 b/metadata/md5-cache/app-vim/calendar-2.9-r2
new file mode 100644
index 000000000000..2fdc126c1aad
--- /dev/null
+++ b/metadata/md5-cache/app-vim/calendar-2.9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: calendar window
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=52
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/calendar-2.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/calendar-2.9.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=11216da0dcb7b48f84a89079e5396272
diff --git a/metadata/md5-cache/app-vim/cctree-1.61-r2 b/metadata/md5-cache/app-vim/cctree-1.61-r2
new file mode 100644
index 000000000000..a5e6b40c0127
--- /dev/null
+++ b/metadata/md5-cache/app-vim/cctree-1.61-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Cscope based source-code browser and code flow analysis tool
+EAPI=8
+HOMEPAGE=https://sites.google.com/site/vimcctree/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=bufexplorer.vim
+RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/cctree-1.61.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cctree-1.61.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=f2af4ddd1e211c52e3ce8081b5bcb1b9
diff --git a/metadata/md5-cache/app-vim/closetag-0.9.1-r2 b/metadata/md5-cache/app-vim/closetag-0.9.1-r2
new file mode 100644
index 000000000000..45e8d3cfa7a1
--- /dev/null
+++ b/metadata/md5-cache/app-vim/closetag-0.9.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: close HTML/XML tags quickly
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=13
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/closetag-0.9.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/closetag-0.9.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=7681c2a234cf6877ac7677bf8104250e
diff --git a/metadata/md5-cache/app-vim/cmdalias-3.0-r2 b/metadata/md5-cache/app-vim/cmdalias-3.0-r2
new file mode 100644
index 000000000000..7d61cc998b76
--- /dev/null
+++ b/metadata/md5-cache/app-vim/cmdalias-3.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: library for alias creation
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=746
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=67f20feb0b68976921a5d61f0d90057d
diff --git a/metadata/md5-cache/app-vim/csound-syntax-20160804 b/metadata/md5-cache/app-vim/csound-syntax-20160804
index 7753c4d46f8e..be98d99f32b6 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-20160804
+++ b/metadata/md5-cache/app-vim/csound-syntax-20160804
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
 EAPI=6
-HOMEPAGE=https://github.com/luisjure/csound
+HOMEPAGE=https://github.com/luisjure/csound-vim
 INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=f21217d805d5f392f3c51cb25924012c
+_md5_=4ff611961f1e000d14d9db9dfdb35a5a
diff --git a/metadata/md5-cache/app-vim/csound-syntax-20160804-r1 b/metadata/md5-cache/app-vim/csound-syntax-20160804-r1
new file mode 100644
index 000000000000..69a55a74c345
--- /dev/null
+++ b/metadata/md5-cache/app-vim/csound-syntax-20160804-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
+EAPI=8
+HOMEPAGE=https://github.com/luisjure/csound-vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=354e5f84c8bd0aeb732de399cd5af6b0
diff --git a/metadata/md5-cache/app-vim/csscomplete-1.0-r1 b/metadata/md5-cache/app-vim/csscomplete-1.0-r1
new file mode 100644
index 000000000000..816ba1c43db5
--- /dev/null
+++ b/metadata/md5-cache/app-vim/csscomplete-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: CSS 3 omni complete function
+EAPI=8
+HOMEPAGE=https://github.com/othree/csscomplete.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.tar.gz -> csscomplete-1.0.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=64330fb9b8546b3e295ba492f77c190e
diff --git a/metadata/md5-cache/app-vim/csv-0.31-r2 b/metadata/md5-cache/app-vim/csv-0.31-r2
new file mode 100644
index 000000000000..7fe5dafbfd8c
--- /dev/null
+++ b/metadata/md5-cache/app-vim/csv-0.31-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: display and alter csv files
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2830
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=4acea2c69d4643f4160757992013e8f5
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418-r1 b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418-r1
new file mode 100644
index 000000000000..368074142eba
--- /dev/null
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
+EAPI=8
+HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
+INHERIT=vim-plugin vcs-snapshot
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/4b9e7cac612902a25498cca49f13475fe1a821a4.tar.gz -> ctrlp-1.80_p20180418.tar.gz
+_eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=87a1285262dce37f126c3b873cb81f4c
diff --git a/metadata/md5-cache/app-vim/curcmdmode-1.0-r2 b/metadata/md5-cache/app-vim/curcmdmode-1.0-r2
new file mode 100644
index 000000000000..7001767d6e3d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/curcmdmode-1.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: library for extending vim's mode() function
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=745
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-vim/genutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/curcmdmode-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/curcmdmode-1.0.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=6cd5e0eccbc13d6694775fee0718befe
diff --git a/metadata/md5-cache/app-vim/cvsmenu-1.147-r2 b/metadata/md5-cache/app-vim/cvsmenu-1.147-r2
new file mode 100644
index 000000000000..6378f0b6064b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/cvsmenu-1.147-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: CVS(NT) integration script
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1245
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-vcs/cvs || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/cvsmenu-1.147.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cvsmenu-1.147.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=731c4fa37cd771bf0cd381da41d8cccc
diff --git a/metadata/md5-cache/app-vim/dbext-26.00-r1 b/metadata/md5-cache/app-vim/dbext-26.00-r1
new file mode 100644
index 000000000000..e7807ae6c0df
--- /dev/null
+++ b/metadata/md5-cache/app-vim/dbext-26.00-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: easy access to databases
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/dbext-26.00.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-26.00.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=0b53c44f5984c1eb0152b9883dad5933
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r2 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r2
new file mode 100644
index 000000000000..71e616e7a707
--- /dev/null
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: syntax highlighting for dhcpd.conf
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=744
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=8dd0a5f2a0c2d22fe0b97914acd8bda5
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5-r2 b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r2
new file mode 100644
index 000000000000..4a0e31038eb2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: diff and merge two directories recursively
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=102
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=0c1dd734071472ab08bb45386d514cc5
diff --git a/metadata/md5-cache/app-vim/easy-align-2.10.0-r2 b/metadata/md5-cache/app-vim/easy-align-2.10.0-r2
new file mode 100644
index 000000000000..ce7cb118d58e
--- /dev/null
+++ b/metadata/md5-cache/app-vim/easy-align-2.10.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a simple alignment plugin
+EAPI=8
+HOMEPAGE=https://github.com/junegunn/vim-easy-align https://www.vim.org/scripts/script.php?script_id=4520
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/junegunn/vim-easy-align/archive/2.10.0.tar.gz -> easy-align-2.10.0.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=6b2db659b7322a51014967de85af57f9
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r3 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r3
new file mode 100644
index 000000000000..42da96a32cf0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=545
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=e99ede93b30f34cf7a9e0532ff702aa2
diff --git a/metadata/md5-cache/app-vim/emmet-0.85-r2 b/metadata/md5-cache/app-vim/emmet-0.85-r2
new file mode 100644
index 000000000000..5481bfb4507b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/emmet-0.85-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d681f7ce84a50dc63828fe13d8664497
diff --git a/metadata/md5-cache/app-vim/emmet-9999 b/metadata/md5-cache/app-vim/emmet-9999
deleted file mode 100644
index 6246710a909e..000000000000
--- a/metadata/md5-cache/app-vim/emmet-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
-EAPI=6
-HOMEPAGE=https://mattn.github.io/emmet-vim https://emmet.io
-INHERIT=vim-plugin git-r3
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=a7e0fb8e9922aa58df99b1fad811f2dd
diff --git a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r2 b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r2
new file mode 100644
index 000000000000..6099d66d79dc
--- /dev/null
+++ b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: enhanced comment creation
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=23
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=!app-vim/ctx || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/enhancedcommentify-2.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/enhancedcommentify-2.3.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=526b55476ea8766fe00c9a40d3c9a14c
diff --git a/metadata/md5-cache/app-vim/errsign-0.1-r2 b/metadata/md5-cache/app-vim/errsign-0.1-r2
new file mode 100644
index 000000000000..fee3444c8684
--- /dev/null
+++ b/metadata/md5-cache/app-vim/errsign-0.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: display marks on lines with errors
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1027
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/errsign-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/errsign-0.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=be3d745ab02c7e87c2f6a6aa611983a5
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r3 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r3
new file mode 100644
index 000000000000..f72dbfecacd4
--- /dev/null
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: syntax highlighting for eruby
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=403
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=fff1cc5343fcba22274e5f3679a58482
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r3 b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r3
new file mode 100644
index 000000000000..c8431697444d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: eselect syntax highlighting, filetype and indent settings
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eselect-syntax-20070506.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=4e29352c4bd03cc17e14c67f0ecc855b
diff --git a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r2 b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r2
new file mode 100644
index 000000000000..1a54c28bcff0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: fluxbox files syntax and indent
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=679
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=vim
+RDEPEND=app-vim/genindent || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/fluxbox-syntax-1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/fluxbox-syntax-1.5.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=7a688509b0b9d2f36aae677878d362fc
diff --git a/metadata/md5-cache/app-vim/foldutil-3.0-r2 b/metadata/md5-cache/app-vim/foldutil-3.0-r2
new file mode 100644
index 000000000000..22d139c7658b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/foldutil-3.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: fold creation utility
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=158
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-vim/genutils-2.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/foldutil-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/foldutil-3.0.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d01ce0b13d04e1809330b2300bd24f46
diff --git a/metadata/md5-cache/app-vim/genindent-1.1-r2 b/metadata/md5-cache/app-vim/genindent-1.1-r2
new file mode 100644
index 000000000000..884c373c5cf0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/genindent-1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: library for simplifying indent files
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=678
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=9272d4e724547caf4d61cfcab4fe6e7a
diff --git a/metadata/md5-cache/app-vim/genutils-2.5-r2 b/metadata/md5-cache/app-vim/genutils-2.5-r2
new file mode 100644
index 000000000000..0524a8002491
--- /dev/null
+++ b/metadata/md5-cache/app-vim/genutils-2.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: library with various useful functions
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=942ffe4e2f02328625f984acd1250beb
diff --git a/metadata/md5-cache/app-vim/gist-7.3 b/metadata/md5-cache/app-vim/gist-7.3
index 40e6382c9e87..a904fc396af6 100644
--- a/metadata/md5-cache/app-vim/gist-7.3
+++ b/metadata/md5-cache/app-vim/gist-7.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interact with gists (gist.github.com)
 EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/vim-gist
 INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=ap
 SLOT=0
 SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=4ad74697a065dd6df3bde149c5bef28e
+_md5_=eb346e0605220e535a155953bff1541d
diff --git a/metadata/md5-cache/app-vim/gist-7.3-r1 b/metadata/md5-cache/app-vim/gist-7.3-r1
new file mode 100644
index 000000000000..6b4d0a60aa85
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gist-7.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: interact with gists (gist.github.com)
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/vim-gist
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=e0f57bb4e8b3223e493eb43b598b8124
diff --git a/metadata/md5-cache/app-vim/gitlog-6.0.0-r1 b/metadata/md5-cache/app-vim/gitlog-6.0.0-r1
new file mode 100644
index 000000000000..9a9a45689887
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gitlog-6.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: git log and diff plugin for vim
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_6.0.0.tar.gz -> gitlog-6.0.0.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=a37b21d4143506fed2af365034b8c930
diff --git a/metadata/md5-cache/app-vim/gitlog-9999 b/metadata/md5-cache/app-vim/gitlog-9999
deleted file mode 100644
index 77c785da1f69..000000000000
--- a/metadata/md5-cache/app-vim/gitlog-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: git log and diff plugin for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
-INHERIT=vim-plugin git-r3
-LICENSE=Artistic
-PROPERTIES=live
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitv-1.3.1-r1 b/metadata/md5-cache/app-vim/gitv-1.3.1-r1
new file mode 100644
index 000000000000..23001786ca4f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gitv-1.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: gitk for vim
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86 ~ppc-macos
+LICENSE=vim
+RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.1.tar.gz -> gitv-1.3.1.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=b66570a6b44cbb00983ed769861f33d6
diff --git a/metadata/md5-cache/app-vim/gitv-9999 b/metadata/md5-cache/app-vim/gitv-9999
deleted file mode 100644
index bab991a3d201..000000000000
--- a/metadata/md5-cache/app-vim/gitv-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: gitk for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
-INHERIT=vim-plugin git-r3
-LICENSE=vim
-PROPERTIES=live
-RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=b52cd7c6207c5e1990dfea4b48677507
diff --git a/metadata/md5-cache/app-vim/greputils-2.8-r2 b/metadata/md5-cache/app-vim/greputils-2.8-r2
new file mode 100644
index 000000000000..c23af2d87384
--- /dev/null
+++ b/metadata/md5-cache/app-vim/greputils-2.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: interface with grep, find and id-utils
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1062
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-vim/genutils-1.18 >=app-vim/multvals-3.6.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/greputils-2.8.tar.bz2 https://dev.gentoo.org/~radhermit/vim/greputils-2.8.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=cac50f7572f154b43b80f81002cb8904
diff --git a/metadata/md5-cache/app-vim/increment-1.1-r2 b/metadata/md5-cache/app-vim/increment-1.1-r2
new file mode 100644
index 000000000000..3bb3bee65581
--- /dev/null
+++ b/metadata/md5-cache/app-vim/increment-1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: easily create sequences of incremented values
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=842
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/increment-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/increment-1.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=2e2506bd40c5faf6d8ef3c95f667ae80
diff --git a/metadata/md5-cache/app-vim/indentpython-0.3-r1 b/metadata/md5-cache/app-vim/indentpython-0.3-r1
new file mode 100644
index 000000000000..bc95c227ca3f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/indentpython-0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Indent Python code according to PEP8
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=974
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.tar.gz -> indentpython-0.3.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d5dbc362e5242111c99a179f7612e3a5
diff --git a/metadata/md5-cache/app-vim/info-1.7-r3 b/metadata/md5-cache/app-vim/info-1.7-r3
new file mode 100644
index 000000000000..3d3e32124809
--- /dev/null
+++ b/metadata/md5-cache/app-vim/info-1.7-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: GNU info documentation browser
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=21
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=6265f94fc026e5f8f2baf035c0f96175
diff --git a/metadata/md5-cache/app-vim/languagetool-1.30 b/metadata/md5-cache/app-vim/languagetool-1.30
index f8775634f891..88e879234296 100644
--- a/metadata/md5-cache/app-vim/languagetool-1.30
+++ b/metadata/md5-cache/app-vim/languagetool-1.30
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=grammar checker for various languages
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3223
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~arm64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3
 SLOT=0
 SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=59b8f1e8ede143a8fd7f891304608747
+_md5_=7ee450b8b44af580a822d6429a1a7cc5
diff --git a/metadata/md5-cache/app-vim/locateopen-1.3-r2 b/metadata/md5-cache/app-vim/locateopen-1.3-r2
new file mode 100644
index 000000000000..c20097f092d7
--- /dev/null
+++ b/metadata/md5-cache/app-vim/locateopen-1.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: open a file without supplying a path
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=858
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=sys-apps/mlocate || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/locateopen-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/locateopen-1.3.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=1156d398ab19930c0f992ffdc59f7143
diff --git a/metadata/md5-cache/app-vim/matrix-1.10-r2 b/metadata/md5-cache/app-vim/matrix-1.10-r2
new file mode 100644
index 000000000000..bc1e27e7fc1f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/matrix-1.10-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Screensaver inspired by the Matrix
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1189
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/matrix-1.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/matrix-1.10.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=49f90177314ee97528c07db575033d4a
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.5.2-r1 b/metadata/md5-cache/app-vim/minibufexpl-6.5.2-r1
new file mode 100644
index 000000000000..4fa853248d60
--- /dev/null
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.5.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: easily switch between buffers
+EAPI=8
+HOMEPAGE=https://github.com/fholgado/minibufexpl.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=bufexplorer.vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/fholgado/minibufexpl.vim/archive/v6.5.2.tar.gz -> minibufexpl-6.5.2.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=c38e1972844c963cb38854441e1e3cd3
diff --git a/metadata/md5-cache/app-vim/molokai-0.1_p20151115-r1 b/metadata/md5-cache/app-vim/molokai-0.1_p20151115-r1
new file mode 100644
index 000000000000..e0595ded5e35
--- /dev/null
+++ b/metadata/md5-cache/app-vim/molokai-0.1_p20151115-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: molokai color scheme
+EAPI=8
+HOMEPAGE=https://github.com/tomasr/molokai
+INHERIT=vim-plugin vcs-snapshot
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tomasr/molokai/archive/c67bdfcdb31415aa0ade7f8c003261700a885476.tar.gz -> molokai-0.1_p20151115.tar.gz
+_eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=1965ae3b29b38fe732bdb569b0a18b61
diff --git a/metadata/md5-cache/app-vim/multvals-3.10-r2 b/metadata/md5-cache/app-vim/multvals-3.10-r2
new file mode 100644
index 000000000000..149ec400ef77
--- /dev/null
+++ b/metadata/md5-cache/app-vim/multvals-3.10-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: library for helping with arrays
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=171
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/multvals-3.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/multvals-3.10.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=4f120d22fcb6eea2dff040c3fa7557a0
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-1.8-r1 b/metadata/md5-cache/app-vim/nagios-syntax-1.8-r1
new file mode 100644
index 000000000000..f53fe9107589
--- /dev/null
+++ b/metadata/md5-cache/app-vim/nagios-syntax-1.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Nagios configuration files syntax
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2261
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=8a0a3ef493398ae691403bc0a6b1e181
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1-r2 b/metadata/md5-cache/app-vim/neocomplcache-7.1-r2
new file mode 100644
index 000000000000..62ee7fd7e07f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/neocomplcache-7.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: ultimate auto completion system
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2620
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=486c3d1c4dbc708e8965af17069696d7
diff --git a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7-r1 b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7-r1
new file mode 100644
index 000000000000..1d932f764f1c
--- /dev/null
+++ b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: NERDTree and tabs in vim
+EAPI=8
+HOMEPAGE=https://github.com/jistr/vim-nerdtree-tabs
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-vim/nerdtree || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/jistr/vim-nerdtree-tabs/archive/v1.4.7.tar.gz -> nerdtree-tabs-1.4.7.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=82a04e789d9e692a701856625008a2af
diff --git a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r2 b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r2
new file mode 100644
index 000000000000..23c44c430911
--- /dev/null
+++ b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: ntp.conf syntax highlighting
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=778
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/ntp-syntax-20031001.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ntp-syntax-20031001.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=02d831c9c64876b1c951e7fbf98e54be
diff --git a/metadata/md5-cache/app-vim/omnicppcomplete-0.41-r1 b/metadata/md5-cache/app-vim/omnicppcomplete-0.41-r1
new file mode 100644
index 000000000000..f991a9591789
--- /dev/null
+++ b/metadata/md5-cache/app-vim/omnicppcomplete-0.41-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=app-arch/unzip || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+DESCRIPTION=vim plugin: C/C++ omni-completion with ctags database
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1520
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=vim.org
+RDEPEND=>=dev-util/ctags-5.7 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=7722 -> omnicppcomplete-0.41.zip
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=cec6e37ee59108879f3c49dd35ca53a8
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4-r2 b/metadata/md5-cache/app-vim/pathogen-2.4-r2
new file mode 100644
index 000000000000..3806f99318d1
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pathogen-2.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: manage your runtimepath
+EAPI=8
+HOMEPAGE=https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=ed4cda6edb5954a1860e750a5fe2f2c4
diff --git a/metadata/md5-cache/app-vim/pdv-1.0.1-r2 b/metadata/md5-cache/app-vim/pdv-1.0.1-r2
new file mode 100644
index 000000000000..923041e78eb9
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pdv-1.0.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: PDV (phpDocumentor for Vim)
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1355
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/pdv-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pdv-1.0.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=f66428d187d3a875bc44dd76bb407025
diff --git a/metadata/md5-cache/app-vim/perlomni-2.5-r1 b/metadata/md5-cache/app-vim/perlomni-2.5-r1
new file mode 100644
index 000000000000..62826b52eab3
--- /dev/null
+++ b/metadata/md5-cache/app-vim/perlomni-2.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a vim plugin with Perl omni completion functions
+EAPI=8
+HOMEPAGE=https://github.com/c9s/perlomni.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=vim.org
+RDEPEND=dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.tar.gz -> perlomni-2.5.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=f11f8fb8b41b5f9588e828af9aa395e1
diff --git a/metadata/md5-cache/app-vim/pfsyntax-1.3-r1 b/metadata/md5-cache/app-vim/pfsyntax-1.3-r1
new file mode 100644
index 000000000000..566b3c73b3fd
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pfsyntax-1.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: pf syntax highlighting for vim
+EAPI=8
+HOMEPAGE=https://github.com/vim-scripts/pf.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/vim-scripts/pf.vim/archive/1.3.tar.gz -> pfsyntax-1.3.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=b172203ff40160e18597d9a00e9c9ef6
diff --git a/metadata/md5-cache/app-vim/phpdocs-0.26-r2 b/metadata/md5-cache/app-vim/phpdocs-0.26-r2
new file mode 100644
index 000000000000..95d0c361bfae
--- /dev/null
+++ b/metadata/md5-cache/app-vim/phpdocs-0.26-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: PHPDoc Support in VIM
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=520
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/phpdocs-0.26.tar.bz2 https://dev.gentoo.org/~radhermit/vim/phpdocs-0.26.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=5fb6ee53df9ec0121ee86699817bcb90
diff --git a/metadata/md5-cache/app-vim/pushpop-4.0-r2 b/metadata/md5-cache/app-vim/pushpop-4.0-r2
new file mode 100644
index 000000000000..96d0a5b7a82d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pushpop-4.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: pushd / popd from the vim commandline
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=129
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-vim/genutils-1.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/pushpop-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pushpop-4.0.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=55034368d18c1a33455ddcced01f36ca
diff --git a/metadata/md5-cache/app-vim/pytest-1.1.4 b/metadata/md5-cache/app-vim/pytest-1.1.4
index ac2867afeb89..1ea72a2d1220 100644
--- a/metadata/md5-cache/app-vim/pytest-1.1.4
+++ b/metadata/md5-cache/app-vim/pytest-1.1.4
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: run tests with py.test from within vim
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3424
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=dev-python/pytest || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=18178 -> pytest-1.1.4.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=d03a3b652c5d1e2354aa2ed9a31837b0
+_md5_=adafd48d7bc31c763b1c98abef45f3a1
diff --git a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0-r1 b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0-r1
new file mode 100644
index 000000000000..67a841ca7afc
--- /dev/null
+++ b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Colour parentheses to differentiate nest levels
+EAPI=8
+HOMEPAGE=https://github.com/kien/rainbow_parentheses.vim
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~monsieurp/packages/rainbow_parentheses-1.0.zip
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=001044051d39453b90103213ae0153a1
diff --git a/metadata/md5-cache/app-vim/reload-0.6.17-r2 b/metadata/md5-cache/app-vim/reload-0.6.17-r2
new file mode 100644
index 000000000000..d7c715f1f9b4
--- /dev/null
+++ b/metadata/md5-cache/app-vim/reload-0.6.17-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: automatic reloading of vim scripts
+EAPI=8
+HOMEPAGE=https://peterodding.com/code/vim/reload/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-vim/vim-misc-1.8.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/xolox/vim-reload/archive/0.6.17.tar.gz -> reload-0.6.17.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=75073654f230b009d978fca462627f2e
diff --git a/metadata/md5-cache/app-vim/searchcomplete-1.1-r2 b/metadata/md5-cache/app-vim/searchcomplete-1.1-r2
new file mode 100644
index 000000000000..a250c4c3ede3
--- /dev/null
+++ b/metadata/md5-cache/app-vim/searchcomplete-1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: tab completion in searches
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=474
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=4ec8eab78fdb926505a1922e711bd2a9
diff --git a/metadata/md5-cache/app-vim/session-2.13.1-r1 b/metadata/md5-cache/app-vim/session-2.13.1-r1
new file mode 100644
index 000000000000..c428724d45a8
--- /dev/null
+++ b/metadata/md5-cache/app-vim/session-2.13.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: extended session management for vim
+EAPI=8
+HOMEPAGE=https://peterodding.com/code/vim/session/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/xolox/vim-session/archive/2.13.1.tar.gz -> session-2.13.1.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=71e0d0976babbd38f10aab0da377ece9
diff --git a/metadata/md5-cache/app-vim/showmarks-2.2-r2 b/metadata/md5-cache/app-vim/showmarks-2.2-r2
new file mode 100644
index 000000000000..627320fbdc2a
--- /dev/null
+++ b/metadata/md5-cache/app-vim/showmarks-2.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: show location marks visually
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=152
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=public-domain
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=2f74dc04c53ff565cbf7b494695faaa7
diff --git a/metadata/md5-cache/app-vim/tasklist-1.0.1-r1 b/metadata/md5-cache/app-vim/tasklist-1.0.1-r1
new file mode 100644
index 000000000000..0dbcd707543a
--- /dev/null
+++ b/metadata/md5-cache/app-vim/tasklist-1.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=Highlight FIXME/TODO/CUSTOM keywords in a separate list
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2607
+INHERIT=vim-plugin vcs-snapshot
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/vim-scripts/tasklist.vim/archive/1.0.1.tar.gz -> tasklist-1.0.1-r1.tar.gz
+_eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d929deedaa451c5c444f7265b0afe228
diff --git a/metadata/md5-cache/app-vim/tcomment-4.00 b/metadata/md5-cache/app-vim/tcomment-4.00
new file mode 100644
index 000000000000..e6ad365d76a8
--- /dev/null
+++ b/metadata/md5-cache/app-vim/tcomment-4.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: an extensible and universal comment toggler
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tomtom/tcomment_vim/archive/4.00.tar.gz -> tcomment-4.00.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=7e879e8b69272abc449c45ff6b2bf281
diff --git a/metadata/md5-cache/app-vim/tcomment-9999 b/metadata/md5-cache/app-vim/tcomment-9999
deleted file mode 100644
index 1f3aac267b27..000000000000
--- a/metadata/md5-cache/app-vim/tcomment-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: an extensible and universal comment toggler
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim
-INHERIT=vim-plugin git-r3
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=67a9d0e025cefdd6fd8646ed1b9f6847
diff --git a/metadata/md5-cache/app-vim/thlnk-1.2.1-r2 b/metadata/md5-cache/app-vim/thlnk-1.2.1-r2
new file mode 100644
index 000000000000..6b2f53195013
--- /dev/null
+++ b/metadata/md5-cache/app-vim/thlnk-1.2.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: linking in plaintext
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=293
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/thlnk-1.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/thlnk-1.2.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=9ba8e9c76763d0f5f6ce3c3b4a2ad6aa
diff --git a/metadata/md5-cache/app-vim/tmpl-0.1-r2 b/metadata/md5-cache/app-vim/tmpl-0.1-r2
new file mode 100644
index 000000000000..f21f6df5e8c2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/tmpl-0.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Syntax for Sam Tregar's HTML::Template
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=254
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/tmpl-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tmpl-0.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=6198bdc9ae3ef2cbf30b0170e5d6a1f6
diff --git a/metadata/md5-cache/app-vim/toggle-0.5-r2 b/metadata/md5-cache/app-vim/toggle-0.5-r2
new file mode 100644
index 000000000000..dc0bf4e3c737
--- /dev/null
+++ b/metadata/md5-cache/app-vim/toggle-0.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: quickly toggle boolean-type keywords
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=895
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/toggle-0.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/toggle-0.5.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d0d9d0b42921141215befdd4690e138a
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r2 b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r2
new file mode 100644
index 000000000000..cc3f09749fef
--- /dev/null
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: syntax highlighting for perl module Template-Toolkit
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=830
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=f72bbf36a21bb4b5b27ed6f141002d1c
diff --git a/metadata/md5-cache/app-vim/txtfmt-3.1 b/metadata/md5-cache/app-vim/txtfmt-3.1
index 16b57d79113b..332f01e77939 100644
--- a/metadata/md5-cache/app-vim/txtfmt-3.1
+++ b/metadata/md5-cache/app-vim/txtfmt-3.1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: rich text highlighting in vim
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2208
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24489 -> txtfmt-3.1.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=58b0140f5a38d187fda7f862a2260e41
+_md5_=39d77eb8f65cd207969330ffbfbea529
diff --git a/metadata/md5-cache/app-vim/udev-syntax-20051016-r3 b/metadata/md5-cache/app-vim/udev-syntax-20051016-r3
new file mode 100644
index 000000000000..9b277641ad5f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/udev-syntax-20051016-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: syntax highlighting for udev rules files
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1381
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/udev-syntax-20051016.tar.bz2 https://dev.gentoo.org/~radhermit/vim/udev-syntax-20051016.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d219a3abf1c2877e98716959a7f077da
diff --git a/metadata/md5-cache/app-vim/undotree-6.1 b/metadata/md5-cache/app-vim/undotree-6.1
new file mode 100644
index 000000000000..9dcbf9eac482
--- /dev/null
+++ b/metadata/md5-cache/app-vim/undotree-6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: display your undo history in a graph
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
+INHERIT=vim-plugin vcs-snapshot
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/mbbill/undotree/archive/rel_6.1.tar.gz -> undotree-6.1.tar.gz
+_eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=700f2538d8bc49e6d9e45e7837d1d70a
diff --git a/metadata/md5-cache/app-vim/undotree-9999 b/metadata/md5-cache/app-vim/undotree-9999
deleted file mode 100644
index 96db7337f417..000000000000
--- a/metadata/md5-cache/app-vim/undotree-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: display your undo history in a graph
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
-INHERIT=vim-plugin git-r3
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=bc6b5d2995b36f175e7d2eb1667a5b27
diff --git a/metadata/md5-cache/app-vim/unite-4.1-r1 b/metadata/md5-cache/app-vim/unite-4.1-r1
new file mode 100644
index 000000000000..3a8a28c63a09
--- /dev/null
+++ b/metadata/md5-cache/app-vim/unite-4.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: unite all sources
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3396
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/unite-4.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=04d0a54aecc6eb54a1c2fa7377244835
diff --git a/metadata/md5-cache/app-vim/uptime-1.3-r2 b/metadata/md5-cache/app-vim/uptime-1.3-r2
new file mode 100644
index 000000000000..3275fb601d28
--- /dev/null
+++ b/metadata/md5-cache/app-vim/uptime-1.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: display vim uptimes
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=965
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/uptime-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/uptime-1.3.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=5a328412202e27aedae68d7c2d392ac0
diff --git a/metadata/md5-cache/app-vim/vim-autoclose-2.0-r1 b/metadata/md5-cache/app-vim/vim-autoclose-2.0-r1
new file mode 100644
index 000000000000..0764ff98c3f9
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-autoclose-2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: open-close pair of characters
+EAPI=8
+HOMEPAGE=https://github.com/Townk/vim-autoclose
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~monsieurp/packages/vim-autoclose-2.0.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=e83a854fe21cfad914c4b327747e78a9
diff --git a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530 b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
index 34fe839ece32..bf88ce1b7a2c 100644
--- a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
+++ b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm unpack
+DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: comment stuff out
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/tpope/vim-commentary
 INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-commentary/archive/7f2127b1dfc57811112785985b46ff2289d72334.tar.gz -> vim-commentary-1.3_p20180530.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=bbbf5e12023dd203cd58d2587a656a66
+_eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=9e94ecb5dce9632d5c03a05caaebfc0b
diff --git a/metadata/md5-cache/app-vim/vim-flake8-1.6-r1 b/metadata/md5-cache/app-vim/vim-flake8-1.6-r1
new file mode 100644
index 000000000000..c9528b64d6bc
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-flake8-1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: runs the currently open file through flake8
+EAPI=8
+HOMEPAGE=https://github.com/nvie/vim-flake8
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.tar.gz -> vim-flake8-1.6.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=a362039c0c5dffe13e753f249d651356
diff --git a/metadata/md5-cache/app-vim/vim-hoogle-1.3 b/metadata/md5-cache/app-vim/vim-hoogle-1.3
index 24b0c4067645..23d59bd75f6e 100644
--- a/metadata/md5-cache/app-vim/vim-hoogle-1.3
+++ b/metadata/md5-cache/app-vim/vim-hoogle-1.3
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: use hoogle within vim
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/Twinside/vim-hoogle
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/Twinside/vim-hoogle/archive/31823f830843385f53a3da7a5bfaf678494383c4.tar.gz -> vim-hoogle-1.3.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=fc27d8bf42c1250e323cdb11fae79600
+_md5_=b63b6a9e86f549405f85d7e0384ea47d
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
index 3a47509f9dba..5043250a4d4d 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=a REST console for vim
-EAPI=6
+DESCRIPTION=vim plugin: a REST console for vim
+EAPI=8
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.6.0.tar.gz -> vim-rest-console-2.6.0.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=fff42e8716c08800e0f7d3b0ed3bb92c
+_md5_=75bd0c7fc925fa43a9a5297d5bcae86c
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0-r1 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0-r1
new file mode 100644
index 000000000000..db6c119d1c35
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: tmux support for vim
+EAPI=8
+HOMEPAGE=https://github.com/tmux-plugins/vim-tmux
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.tar.gz -> vim-tmux-3.0.0.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=dfc35aed8b1b7abe2a9262d48cfd3e50
diff --git a/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106 b/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
index 57029498e3c2..7181ccfb89ab 100644
--- a/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
+++ b/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install postinst postrm unpack
+DEFINED_PHASES=compile install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: collection of vimscripts for Haskell development
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/dag/vim2hs
 INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ghc || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/dag/vim2hs/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vim2hs-0.1_p20171106.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=136d66c3be6e260b9d18e8a72ef71dbc
+_eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=91d8f043c1fc9b2b7d7f60408ef6a03c
diff --git a/metadata/md5-cache/app-vim/vimagit-1.7.3 b/metadata/md5-cache/app-vim/vimagit-1.7.3
index 38e81a742baa..f1cb6a542d0d 100644
--- a/metadata/md5-cache/app-vim/vimagit-1.7.3
+++ b/metadata/md5-cache/app-vim/vimagit-1.7.3
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ease your git workflow within vim
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/jreybert/vimagit
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.3.tar.gz -> vimagit-1.7.3.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=0b438af6f1c1b734f8cf6c2af9e96774
+_md5_=814950fbe561ee8460535a00a38c1736
diff --git a/metadata/md5-cache/app-vim/vimagit-9999 b/metadata/md5-cache/app-vim/vimagit-9999
deleted file mode 100644
index a30daf8f4c46..000000000000
--- a/metadata/md5-cache/app-vim/vimagit-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: ease your git workflow within vim
-EAPI=6
-HOMEPAGE=https://github.com/jreybert/vimagit
-INHERIT=vim-plugin git-r3
-LICENSE=vim
-PROPERTIES=live
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=0b438af6f1c1b734f8cf6c2af9e96774
diff --git a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r2 b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r2
new file mode 100644
index 000000000000..85171cb8152e
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: vimbuddy for the status line
+EAPI=8
+HOMEPAGE=https://github.com/vim-scripts/vimbuddy.vim
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=public-domain
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/vim-scripts/vimbuddy.vim/archive/0.9.2.tar.gz -> vimbuddy-0.9.2.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=08c6e9a7b74080ff0d529488883f6f20
diff --git a/metadata/md5-cache/app-vim/vimcdoc-2.1.0 b/metadata/md5-cache/app-vim/vimcdoc-2.1.0
index 5570306a243a..c20c416c8c1f 100644
--- a/metadata/md5-cache/app-vim/vimcdoc-2.1.0
+++ b/metadata/md5-cache/app-vim/vimcdoc-2.1.0
@@ -1,8 +1,8 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=online vim documentation translated into Chinese
-EAPI=6
-HOMEPAGE=http://vimcdoc.sourceforge.net/
+EAPI=8
+HOMEPAGE=https://vimcdoc.sourceforge.net/
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim.org
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-2.1.0.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=cb77845350d433bf01c2fa789c0569bb
+_md5_=c68053ed201cbb718bbf7fd3bc7ca5f0
diff --git a/metadata/md5-cache/app-vim/vimcdoc-2.4.0 b/metadata/md5-cache/app-vim/vimcdoc-2.4.0
new file mode 100644
index 000000000000..35d9c16f3cf2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimcdoc-2.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=online vim documentation translated into Chinese
+EAPI=8
+HOMEPAGE=https://vimcdoc.sourceforge.net/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-2.4.0.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=c68053ed201cbb718bbf7fd3bc7ca5f0
diff --git a/metadata/md5-cache/app-vim/webapi-0.3-r1 b/metadata/md5-cache/app-vim/webapi-0.3-r1
new file mode 100644
index 000000000000..0f3eed30dae2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/webapi-0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: interface to Web APIs
+EAPI=8
+HOMEPAGE=https://github.com/mattn/webapi-vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/mattn/webapi-vim/archive/0.3.tar.gz -> webapi-0.3.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=9f905dbd9bbef8a69589ed2bc4688942
diff --git a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r2 b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r2
new file mode 100644
index 000000000000..8218bbc43efd
--- /dev/null
+++ b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Wikipedia syntax highlighting
+EAPI=8
+HOMEPAGE=https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=CC-BY-SA-3.0
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/wikipedia-syntax-20101113.tar.bz2 https://dev.gentoo.org/~radhermit/vim/wikipedia-syntax-20101113.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=ac68ce5ec11229355c67929748d3802c
diff --git a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r3 b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r3
new file mode 100644
index 000000000000..e7ad8aa5021a
--- /dev/null
+++ b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: XQuery syntax highlighting
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=803
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/xquery-syntax-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xquery-syntax-0.1.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d6dc011f544a7347b22b18b9aebe93ed
diff --git a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r3 b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r3
new file mode 100644
index 000000000000..b72587105b53
--- /dev/null
+++ b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Syntax for XSLT (with HTML and others)
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=257
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/xsl-syntax-0.3.11.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xsl-syntax-0.3.11.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=d19331f0b2736eb04f06a1877f553fd6
diff --git a/metadata/md5-cache/app-vim/zenburn-2.25-r1 b/metadata/md5-cache/app-vim/zenburn-2.25-r1
new file mode 100644
index 000000000000..38b5225cb881
--- /dev/null
+++ b/metadata/md5-cache/app-vim/zenburn-2.25-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Low-contrast color scheme for Vim
+EAPI=8
+HOMEPAGE=https://github.com/jnurmine/Zenburn
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-1
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.tar.gz -> zenburn-2.25.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=7147d0b90bf92e29e8b8744193c60960
diff --git a/metadata/md5-cache/app-vim/zoomwin-24-r1 b/metadata/md5-cache/app-vim/zoomwin-24-r1
index 99473a5ce15f..69339e47aa2d 100644
--- a/metadata/md5-cache/app-vim/zoomwin-24-r1
+++ b/metadata/md5-cache/app-vim/zoomwin-24-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: brief-style window zooming
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=508
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=508
 INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/zoomwin-24.tar.bz2 https://dev.gentoo.org/~radhermit/vim/zoomwin-24.tar.bz2
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=d24cde21087aa219ce0c5fe66b690c6c
+_md5_=6c8b45609c5dc5c430014b4fa82de28f
diff --git a/metadata/md5-cache/app-vim/zoomwin-24-r2 b/metadata/md5-cache/app-vim/zoomwin-24-r2
new file mode 100644
index 000000000000..e000c8f9e641
--- /dev/null
+++ b/metadata/md5-cache/app-vim/zoomwin-24-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: brief-style window zooming
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=508
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/zoomwin-24.tar.bz2 https://dev.gentoo.org/~radhermit/vim/zoomwin-24.tar.bz2
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=7b52bcca5fc8a7abeac03d840152014a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 72687910a83a..44fb5974275a 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.10 b/metadata/md5-cache/dev-libs/openssl-3.0.10
index 46b183a33e50..efa14d358c9c 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.10
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib multilib-minimal multiprocessing preserve-libs verify-sig
 IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.10.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.10.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
-_md5_=c18c2f05994ea0c1d9664e9273e5c753
+_md5_=d1edca1e92de5655b41af60615095632
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 27a3cbb461dd..ea977c7cc41d 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
index 46fa46562611..401d8d692dde 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.2:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
+DEPEND=~dev-qt/qtbase-6.5.2:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.2:6[opengl] )
 DESCRIPTION=Chart component library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,9 +8,9 @@ INHERIT=qt6-build
 IUSE=gles2-only qml test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtbase-6.5.2:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
+RDEPEND=~dev-qt/qtbase-6.5.2:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.2:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d6d174f1cd6ddf3babaaeba8c4582af
+_md5_=b1ff7fb48c687d933f12e0f5cc1fba17
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.5.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.5.9999
index c1fc0fc43e82..b73c0fd06a31 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.5.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
+DEPEND=~dev-qt/qtbase-6.5.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6[opengl] )
 DESCRIPTION=Chart component library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=gles2-only qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.5.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
+RDEPEND=~dev-qt/qtbase-6.5.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.5.9999
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d6d174f1cd6ddf3babaaeba8c4582af
+_md5_=b1ff7fb48c687d933f12e0f5cc1fba17
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.6.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.6.9999
index a667b1167d4d..ca16fb313179 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.6.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.6.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.6.9999:6 )
+DEPEND=~dev-qt/qtbase-6.6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.6.9999:6[opengl] )
 DESCRIPTION=Chart component library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=gles2-only qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.6.9999:6 )
+RDEPEND=~dev-qt/qtbase-6.6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.6.9999:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.6.9999
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d6d174f1cd6ddf3babaaeba8c4582af
+_md5_=b1ff7fb48c687d933f12e0f5cc1fba17
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.9999
index 054df7f71f6c..86f04afc8d00 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
+DEPEND=~dev-qt/qtbase-6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.9999:6[opengl] )
 DESCRIPTION=Chart component library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=gles2-only qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
+RDEPEND=~dev-qt/qtbase-6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.9999:6[opengl] )
 RESTRICT=!test? ( test )
 SLOT=6/6.9999
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	582d1721f5561e4973cf8ec31d1eea6d	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d6d174f1cd6ddf3babaaeba8c4582af
+_md5_=b1ff7fb48c687d933f12e0f5cc1fba17
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 57d1f97e30f8..6c792e0603da 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r2 b/metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r2
deleted file mode 100644
index b8c4f57a2ee9..000000000000
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.0:3 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme appindicator? ( dev-libs/libayatana-appindicator ) nls? ( virtual/libintl ) plugins? ( >=net-libs/rest-0.7:0.7 )
-DESCRIPTION=A program launcher in the style of GNOME Do
-EAPI=8
-HOMEPAGE=https://launchpad.net/synapse-project/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools vala xdg
-IUSE=appindicator nls plugins
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.0:3 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme appindicator? ( dev-libs/libayatana-appindicator ) nls? ( virtual/libintl ) plugins? ( >=net-libs/rest-0.7:0.7 )
-SLOT=0
-SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.4/+download/synapse-0.2.99.4.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	vala	db97951caa799e73a831a5f48e717da8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4428bad533cfb1295969391a3bfa76da
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 846fe5f9184e..a609ba62404d 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/nodejs-20.6.1 b/metadata/md5-cache/net-libs/nodejs-20.6.1
index 91fe1e6a03f5..ee8fb155cea0 100644
--- a/metadata/md5-cache/net-libs/nodejs-20.6.1
+++ b/metadata/md5-cache/net-libs/nodejs-20.6.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://nodejs.org/dist/v20.6.1/node-v20.6.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bfac3a2a052f683021edae2912919391
+_md5_=02691e51c560518b48989dd7dd61cbb8
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1-r1 b/metadata/md5-cache/net-libs/rest-0.8.1-r1
deleted file mode 100644
index 4051cccb8b28..000000000000
--- a/metadata/md5-cache/net-libs/rest-0.8.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.40 virtual/pkgconfig test? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-DESCRIPTION=Helper library for RESTful services
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Librest
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 multilib-minimal virtualx
-IUSE=+introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0.7
-SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.tar.xz
-_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=81d1463e072338b27d327a0259d0f237
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index dcf7a69a11da..5aee5c230dc1 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-connectors-20141023 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-connectors-20141023
index 8507fc42226f..c9cc7026b38f 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-connectors-20141023
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-connectors-20141023
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used by commons.apache.org
+DESCRIPTION=OpenPGP keys used by tomcat-connectors
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/download-native.cgi
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://downloads.apache.org/tomcat/tomcat-connectors/KEYS -> openpgp-keys-apache-tomcat-connectors-20141023-KEYS.asc
-_md5_=e30f344e62fca8dc3f640b377ea2ff38
+_md5_=2a4025c72d8f448adf1b8cc077d864bb
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230801 b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230801
index 2fe4e879b76d..7e62d8142bde 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230801
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230801
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by OpenSSL
 EAPI=8
 HOMEPAGE=https://www.openssl.net/
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-8657ABB260F056B1E5190839D9C4D26D0E604491.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230801-EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5.asc
-_md5_=3850506dd93bdc10b78e6b0af48b1b4b
+_md5_=07fb60e0a80c2a229a44b64b40bec3ad
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 9a919efd8cc4..b87f7d5fd702 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20230914 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20230914
new file mode 100644
index 000000000000..8dce955aff9c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20230914
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gcc/snapshots/11-20230914/gcc-11-20230914.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-10.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	a53583543a0ba0ed9dccd711b9b65bff	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=35b2fba1731799fb85abfa2903332da0
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 9560f56f91c2..5b9cebbcf360 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.36 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.36
index 7d2728d84dc2..d8b1f0c020b8 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.36
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.36
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/besser82/libxcrypt
 INHERIT=multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
 IUSE=+compat split-usr static-libs +system test headers-only abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ public-domain BSD BSD-2
 RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) elibc_musl? ( sys-libs/musl[-crypt(+)] !sys-libs/musl[crypt(+)] ) )
 REQUIRED_USE=split-usr? ( system )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.36-autotools.tar.xz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fd3c928d4e16502d1a3babdd078ee549
+_md5_=576b618b167a854dcbe3a8bb4c698de1
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index b65b2e3a991f..cc778395ba99 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.49 b/metadata/md5-cache/www-apache/mod_jk-1.2.49
index 3908fa02546c..6fa9735fe908 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.49
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.49
@@ -1,14 +1,15 @@
-BDEPEND=dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare setup
+BDEPEND=dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
 DEPEND=dev-libs/apr:1= =www-servers/apache-2*
 DESCRIPTION=Provides an AJP Apache2-JK-connector for the Tomcat servlet engine
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/connectors-doc/
-INHERIT=apache-module autotools
+INHERIT=apache-module autotools verify-sig
+IUSE=verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= =www-servers/apache-2*
 SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.49-src.tar.gz
-_eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	autotools	6ae9a4347149b19a112caa1182d03bde	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d0e682088631a79872c65fb7410d394c
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.49-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.49-src.tar.gz.asc )
+_eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	autotools	6ae9a4347149b19a112caa1182d03bde	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	90255aaab6156b22ee05150fe5ffbe6b
+_md5_=270abdb1ca5d3ff814b4a43fdeb27a72
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ff5e46d6a556..8f72ed5ccf64 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-09-14T21:09:57Z
+TIMESTAMP 2023-09-15T03:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDdqVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUDywdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDvTw/+KEv3ZhzvkXNsfrL43C5JCeG1KRrAIcZwrnubikYwXSsuVhD0C+5FqSSg
-BthdBVDJH/o1YaOiTVyRbJIelOekbAdsK9AUf4L4OzBrmlaNLYOOB9HSeiKD6ZMJ
-pfRxMahk3eZ/Oq4P6Kblk76zyf3cqrF21H3TXidYpFalK5itoB0SPh/clRpry8yD
-YoZ5anU/3HGe3r+XECxybEJrmTgzz9K6ME12rTYz2+aE3Vsd0Wt+A94Cstdjlplu
-a4qmkH82DKAYletbJStOL1SYczSzbu7wZoUndSLxohlj3f1Ad2KdVFQWGFagFVbC
-Nk7nFNFKDK61rzt5dDZrSrQhUNx1AYK7Yehxn1ntO0m1ERX+dmHsswh8W/CZbLzK
-iRNQE0FHvd7Wn9VOi6sKXaIq58OxI47u+99hbgUH5ac9R/pTywnh5rFJnUYPR3SI
-crTea1rTj/ALzDzQyryFcacHzPZD8vS6liDKVdjY6oS3l5nUEjj2f9Dr6oofSECP
-yoCikvdqODJX4shfYODbKMfWYVj+kK9DQsYnftpPhk/UeTog/s4oojAFuhKGuXh1
-r3n/yxgMLx6S7IxcMQmBkdNXnj0fwPatUAmxBO4CNoOPLbnmxRmhxsHs2HhmBNZ4
-37R2NRqfgMu6mxGQ/Xy3ErGfesGnMdUpmhmaH7dMH217b9PlzUQ=
-=QZkH
+klAwaxAAjVz3uOX5gzNU3lf3Qof/GBI5ButNloc/iWPEc3UqravmW65h9vZQ+uLE
+ztAfkuGDtnpU1sDaUEyy0oIrJpiRcU85JstwvgjayPT8nyEXm9a9M0gYbtmW3cv/
+zZ5XxbMgGohIDncDn3vx1LlDh7NC5Z5au14mUu4OJ1cSdC9aTCRv2X67aWkjQ6O5
+KV+J/p1YHhLtbHXepLaC2lUPNn5xxQgNt4R6KA5T6v9xFuRisUEPcibgoM9Ue1zo
+5SXNdnh6GCIG1LgPe8n8y4w2fPp3Tprd7O+9bE3k67voRLxvizaMizWUcWr7PsG+
+J538Ld6tDmVdugJj71xpiWHBOr7h65tuafHZddzuCs5d4mLy9ZYS652ZNRRKn+29
+2lFJpSaOurhwGtKKqh6kTkMlZvm4CIEFIcdxpSZ6h5BICU+OAtnO/pCbwFdDDbAX
+9Bd/icvCWEvH8aqyqcgV6O3QqVJuhSMRzvGCYTJjfajW9TyNefeMMgkwKkdSt+/t
+AIYrV1ofCFSpli1oSGkQOFQSYfBcA+66y5q6exdVR7pHVpQpYcZrsH7aE8sFxQII
+E+WrGBYRq/fHSP4/7MUPUui6Twuirr0b/uBgishmi8oM4zTsYzoXKYEH9WuGxD1f
+yx/lHfQRSIqzlAc6Ilm+C+EliwkNQchyv92yQmERw3nkPU5amro=
+=KyPy
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8788168f49df..f1303ef00011 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Sep 2023 21:09:53 +0000
+Fri, 15 Sep 2023 03:09:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 98ff72b83436..be8945735ca8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Sep 14 09:09:52 PM UTC 2023
+Fri Sep 15 03:09:55 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 82130fd4310f..a88f12bb80e7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Sep 2023 21:15:01 +0000
+Fri, 15 Sep 2023 03:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b45b8d6d8762..97ae7ba86881 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c87fddc6fa9bc08438b8302dc32ed2270241ed05 1694725235 2023-09-14T21:00:35+00:00
+f1515d619ced146bfadc7d15d6d9970ecc1c0390 1694742137 2023-09-15T01:42:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 54c831f6ffab..c8c67c8a562f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1694725801 Thu 14 Sep 2023 09:10:01 PM UTC
+1694747401 Fri 15 Sep 2023 03:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8788168f49df..f1303ef00011 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Sep 2023 21:09:53 +0000
+Fri, 15 Sep 2023 03:09:55 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 95a4895903a5..70ef95aba1ff 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 93489c158f00..2e2705f9e408 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,7 @@
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9
 AUX nodejs-20.3.0-gcc14.patch 1119 BLAKE2B 6be4d981ce94f618aa4a07766e8fa1c99e3825cee7374cae5c76264c961083604ce408a7847de54ae6c72d36c6b0cbe34921e69a800ebebc5553cdaead2cbaa5 SHA512 8137b7ac6b5920c7f16b6409923092f3eb3c4f81887035e1840ae61deb61090d88d6184c36db4bcf7249fa6d7a21687788616b2aee51cb6bdc08cb78ed656e5d
+AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8
 DIST node-v16.20.2.tar.xz 36834468 BLAKE2B 88bd0d91a6b69f7e5fba2b087684b07b8986fd1492f51f6fdccc02f043970303808c0cc1eeda29670aacddd4234ec3181752c916fefee060624b0462dff8cbcf SHA512 c7953630b7d0eb832ab5a4b839c07e6505cf5f4e37853f59cd0ffc6b8742ac2ecaba20bfb47d8995ef88f3c7005bb456c1eb70cb2fc6b6fc506e1d8b81f25cb4
 DIST node-v18.17.1.tar.xz 40788836 BLAKE2B 50e0dc0eecd68620ffa7457319e71124bbba302f6acff79286a30cf97442fb09a96cf8781456bafd5c2e497ba88cf392c141f0e221683da421b87f653b1ad7ca SHA512 fd6f586447ecd44ac6738da1cf7d54e74bd33ffd1ee1acc2e0e1bdaf0031bcaef85751d3dd590bb278eb502daf9c77f0763b5a181a30ee4cf537aef254629622
 DIST node-v20.5.1.tar.xz 41532256 BLAKE2B b26fbe8be7e3330b69ae0f630cabba7dee7879ae829c2c743491d26d9623c3170de85e4e7c0629993257935841978343c1ded2870ece24365784581c8be0143b SHA512 2828930bf2df0769ec7116fc6b89c7069294426b937ce38543426e0108a8c953301c523eb03419e35a993773895d74b28838bec96ffc01ab0e138a4b2a52737d
@@ -10,6 +11,6 @@ EBUILD nodejs-16.20.2.ebuild 6492 BLAKE2B dfe025a55b69ff058e890fd743d968ea298aac
 EBUILD nodejs-18.17.1.ebuild 7464 BLAKE2B e43f7c5e5a74460dfe517e443eda9349aeb1aa17fc4db719ef1f68d2d6b560f9fa33f06a7900d918db5912475c47192380d2ec6d0437e1583c0fab2c105b96b9 SHA512 9af59096060b0291aea6fb97d7c87e961e2e1315e5345503c629518d35335db6f5d15ba25f0d0af6f47074cfb72d7ec8a59b1a6fbf042ccbd0d4cd6ec98ef66d
 EBUILD nodejs-20.5.1.ebuild 7442 BLAKE2B 74548b5481ca33fe976e63a1436b395114875bca3d37c5f64b9aa7a8cbb86c45abe96cf17518a41e517ec12d840db7ef91b30aac7a9cce5451a5c3c0bfd6d173 SHA512 46a4771c4ec467884a2e1abd3f1ef864259cde863547ce73dfa98239a28495583b523958f183ac8cafaf56035e1263cff4dfb3eefb0c254478ec9c19ba4b8152
 EBUILD nodejs-20.6.0.ebuild 7486 BLAKE2B 6ea11def13407f00e99a182f094ae14faff86fe3bb3e6683add7479da017732bd0ab32de91762360a6cb9d911d8f4aef541ade41e42be07a39430fa07a24ca52 SHA512 da4374b8e9263b0693423359add241663842825c5b0820d7fe842d2fcf658b3df5f4987e615bbea64c59ea7c52b83f305c77486353e80c2e884385a4d0fba229
-EBUILD nodejs-20.6.1.ebuild 7486 BLAKE2B 6ea11def13407f00e99a182f094ae14faff86fe3bb3e6683add7479da017732bd0ab32de91762360a6cb9d911d8f4aef541ade41e42be07a39430fa07a24ca52 SHA512 da4374b8e9263b0693423359add241663842825c5b0820d7fe842d2fcf658b3df5f4987e615bbea64c59ea7c52b83f305c77486353e80c2e884385a4d0fba229
+EBUILD nodejs-20.6.1.ebuild 7485 BLAKE2B 9391bf2a61da2e8667f33a7f042b51955c4e352b5d2a872e3dc7e48d03ff7f2eebe5cf334e3f43ba288a28cce5b5bcbcd0a2c7542182acb803812705fe4302fe SHA512 4d7f415d5f38b074a121e7bc26145b9cd9ed1fbdcad13519659c0e139f1cc12dcb1e61a4abf744939b8e117ac18ed171e327832cfc616827fda3bf83896e5730
 EBUILD nodejs-99999999.ebuild 7391 BLAKE2B 9036b0461f447aee6e75723085bae591264f0bb20aa33480398b5f17458912e2a8f75a6c76c3761879e216e437a0cb2c9eda8aeb84c3f65fd0c1ce590cc6c7b5 SHA512 ea53f8f425b2ea902d6e1b2e24ce9eaab9b290e672d432241a22dbd7ca23c8357e5f9cb438da16f5aa3cb6d9cb0cf7e1af426e1c733f0631b560e0b758d21ded
 MISC metadata.xml 986 BLAKE2B 67133c97db85eced638323a93514e084da381b7cbebcab2f0f2ce2781cf0da02be705ab5781c18205a8d4e8b679b6f77f3c9e97ea6ef72b36b6a8a854a39617d SHA512 3f749720ea0623fefa703f8b4563ebabfd5e4aeff4f2e8998576860177d3b1a075afaabc2aa0dc5100df59b3cb787d70d44284976bad3409966b68c11ec64d7a
diff --git a/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch
new file mode 100644
index 000000000000..32fbe2d1d00a
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch
@@ -0,0 +1,88 @@
+diff --git a/node.gyp b/node.gyp
+index 49e39c3ce8..767ebc4e5f 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -369,6 +369,7 @@
+       'src/quic/transportparams.h',
+     ],
+     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)',
+     'conditions': [
+       ['GENERATOR == "ninja"', {
+@@ -626,11 +627,25 @@
+           'conditions': [
+             ['node_snapshot_main!=""', {
+               'actions': [
++                {
++                  'action_name': 'run_pax_mksnapshot',
++                  'inputs': [
++                    '<(node_mksnapshot_exec)',
++                  ],
++                  'outputs': [
++                    '<(node_mksnapshot_u_exec)',
++                  ],
++                  'action': [
++                    'bash',
++                    '-c',
++                    'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
++                  ],
++                },
+                 {
+                   'action_name': 'node_mksnapshot',
+                   'process_outputs_as_sources': 1,
+                   'inputs': [
+-                    '<(node_mksnapshot_exec)',
++                    '<(node_mksnapshot_u_exec)',
+                     '<(node_snapshot_main)',
+                   ],
+                   'outputs': [
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index f822c056e5..8b2820abf7 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -9,6 +9,7 @@
+     'v8_vector_stores%': 0,
+     'v8_embed_script%': "",
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
+     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -1520,7 +1521,7 @@
+       ],
+     },  # bytecode_builtins_list_generator
+     {
+-      'target_name': 'mksnapshot',
++      'target_name': 'mksnapshot_u',
+       'type': 'executable',
+       'dependencies': [
+         'v8_base_without_compiler',
+@@ -1545,6 +1546,27 @@
+           'ldflags': [ '-fno-lto' ],
+         }],
+       ],
++    },  # mksnapshot_u
++    {
++      'target_name': 'mksnapshot',
++      'type': 'none',
++      'dependencies': ['mksnapshot_u'],
++      'actions': [
++        {
++          'action_name': 'paxmark_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'action': [
++            'bash',
++            '-c',
++            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
++          ],
++        },
++      ],
+     },  # mksnapshot
+     {
+       'target_name': 'torque',
diff --git a/net-libs/nodejs/nodejs-20.6.1.ebuild b/net-libs/nodejs/nodejs-20.6.1.ebuild
index a70dfde5f996..ad9c3ca7ca9d 100644
--- a/net-libs/nodejs/nodejs-20.6.1.ebuild
+++ b/net-libs/nodejs/nodejs-20.6.1.ebuild
@@ -108,7 +108,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
 
 	default
 }
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index a5ccc5d3e27a..a69d00cc73fe 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,7 +1,5 @@
 AUX 0001-rest_proxy_call_sync-bail-out-if-no-payload.patch 1498 BLAKE2B be8a629fb8fb01a909a05d5c2ae14fe9eb1ec508e18f58691ec65979c5cc72b7f5298912e5aba42669c840c627f467aa938171c51b838e360efe8f13fd98a5db SHA512 72c7e8750802b5a5cb99e45cb68a6419c6794a88b858c9729a3317db07def03351c2ec5b13dac17e495c9b84871f97401d61a573b2896d9c981b96a3f898d070
 AUX 0002-Handle-some-potential-problems-in-parsing-oauth2-acc.patch 1676 BLAKE2B 07cbdc3d6d5d7388186ea785bd1c032a6cb5597b9dfdd43a21d1f4e63bc12bbfa15b2b5c09d29602493dd7f56fcce8eaf9a7a99672d4611556781e310549cea9 SHA512 acc3241b93e8c06a9f6ee05daba20cc4b6f6360642132964b25ca6d81a0acd520e1baf820a18a0df7c21f520a6dd5c3063257fd9b619c74137f94428f562bccd
-DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
 DIST rest-0.9.1.tar.xz 71136 BLAKE2B 696a43db8a05d90cd2cb86cb2ffe22a817c7b0565c1e90e2508b0dffd3824fa46afef78c039d8911dc50f93c0afe1efbc783676c677b71bb7a2b5ad9ac5a1a26 SHA512 7fb219f571aec2b8d09d71e257e2b230bfb5c862e7e425fd540c96f6e2a22457df7d3df32838d71beec00ba54c7adbd0301d744bb0497c46b3a1413949304462
-EBUILD rest-0.8.1-r1.ebuild 1483 BLAKE2B fd647f2cc7b7e945644118a38d98035373188fc2839bda61e4ef72d484731be4179e48c7b043240b7e529597165ab29c38e06c18f1153cf2a2bc3b3a32998504 SHA512 d6035981ef8410bb5b593606d567b2ea4c837941e8b3ad32cb8cf7b283d4be055cdb4d0ad40a7e7b26aa464cbdff8c868cbf1aeadae4f17ba6a0ef4b9df20c6e
 EBUILD rest-0.9.1-r1.ebuild 1682 BLAKE2B 020e61ead4e2cf8ed1131d5d6dfa0d6525fa1871406209c38f9090d9d942b363d4542929510c8f2768a072850c1b450611bac2ef46112229a28ff7f8d89853f1 SHA512 357c89b9af933f48e7a1303b252b1752706916f217c5dbb498605404bb943b72325d50ab8a5bb334f914659b5c88e096dff2cf11646a78476728a3119500d9d9
 MISC metadata.xml 348 BLAKE2B aa9355d4d476aa865a65356707ef1264225ac5bec69af9ca70ed3ebbfe4a5745d8338f9799bd4636f65537d443328a6a4cc9fddd52ab8e88905e9cddff99ee2b SHA512 ac333dd016d4347bd6b342f2cc335254e53029c0db2f954b1ba8e9dfda4803785244a2dd149fde180f2b08271d53b84cbfbf5d5398feb85719e8a20b7672d3c0
diff --git a/net-libs/rest/rest-0.8.1-r1.ebuild b/net-libs/rest/rest-0.8.1-r1.ebuild
deleted file mode 100644
index 9e3edc280976..000000000000
--- a/net-libs/rest/rest-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Helper library for RESTful services"
-HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
-
-LICENSE="LGPL-2.1"
-SLOT="0.7"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
-IUSE="+introspection test"
-RESTRICT="!test? ( test )"
-
-# Coverage testing should not be enabled
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
-	net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-"
-
-multilib_src_configure() {
-	# gnome support only adds dependency on obsolete libsoup-gnome
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758166
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		--disable-gcov \
-		--without-gnome \
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		$(multilib_native_use_enable introspection)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die
-	fi
-}
-
-multilib_src_test() {
-	# Tests need dbus
-	virtx emake check
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a7b6297724c3..abcb3a64860f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index ecb7b328c9bc..77812ebfd7cd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -257,17 +257,6 @@ app-dicts/edictionary
 # Masked for removal on 2023-09-17.
 app-emacs/ruby-mode
 
-# Matt Turner <mattst88@gentoo.org> (2023-08-14)
-# Dead slot depending on libsoup:2.4
-# Removal on 2023-09-14.
-net-libs/rest:0.7
-
-# Matt Turner <mattst88@gentoo.org> (2023-08-14)
-# Unmaintained in Gentoo and upstream. Last release was 2018, last commit
-# upstream was 2021. Only reverse dependency of dead net-libs/rest:0.7.
-# Removal on 2023-09-14.
-gnome-extra/synapse
-
 # Michael Orlitzky <mjo@gentoo.org> (2023-08-12)
 # More php:7.4 casualties that I missed the first time around.
 # They'll be removed whenever php:7.4 is removed.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d6bc0d904f7a..0a69f45122f3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3315,7 +3315,6 @@ gnome-extra/libgsf:gtk - Enable use of gdk in thumbnailer
 gnome-extra/nemo:tracker - Add support for app-misc/tracker search
 gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 gnome-extra/nm-applet:teamd - Enable teamd configuration editor
-gnome-extra/synapse:plugins - Build support for plugins using net-libs/rest
 gnustep-apps/gemas:projectcenter - Build and install plugin for gnustep-apps/projectcenter
 gnustep-apps/gworkspace:gwmetadata - Enable the metadata indexing and searching system
 gnustep-apps/sogo:activesync - Build the ActiveSync support code
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 0a7fd31a9333..a6f3c9b9919f 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat-connectors/Manifest b/sec-keys/openpgp-keys-apache-tomcat-connectors/Manifest
index f3ebf736f1f9..7b1faac2dff7 100644
--- a/sec-keys/openpgp-keys-apache-tomcat-connectors/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat-connectors/Manifest
@@ -1,3 +1,3 @@
 DIST openpgp-keys-apache-tomcat-connectors-20141023-KEYS.asc 73175 BLAKE2B b59c8986c4974e79e32ed0f6f04a7b62e48dcf7e4e7e71f7900de8b8dc2613a5ae96700952545e2548a5784af950f3dc5d39b30fd2489b2392344c32737861ef SHA512 fd8420bb991614bf93b9b7549feaf054481ea0a479b3f675d647b5af8e097e4464b889a987e9b65d8dffe75556befc27d4c2ff2279a579ea7bfd16403751a100
-EBUILD openpgp-keys-apache-tomcat-connectors-20141023.ebuild 558 BLAKE2B a04ace0a8f8f7b65ca4d4ed26ba59ec2b1f02440c9566f46da94f88cc0f9e385738fcc87acb26a216d5e9c117810c6483a5cf6758ff9139977fef9b6ca0bd722 SHA512 4ed498871f209ad70dca0c652d3cab61cef0d5c4568a8d04196a7c9cf06b0b93b83487c4e84e595582655e173320df5917cdaa1e5e38d5262d304b8a1ab83a2c
+EBUILD openpgp-keys-apache-tomcat-connectors-20141023.ebuild 581 BLAKE2B 48e16eb3cd084215b3a621cf8e5110e7f78aade5156a5bbeacc08be5a3304f8fb85dff6f85b10b67c8b29902de963cfc7c788cc2b059ac1439f8c8549268e9fe SHA512 ff7265eea38bcb585c2ccaaa64c035fdce32aab0eaffcd3197d3da78de3da06e37165591eed6bd0cdb58d96bd4b722e07f2923f78086b4ff81ddef4407d259f9
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/sec-keys/openpgp-keys-apache-tomcat-connectors/openpgp-keys-apache-tomcat-connectors-20141023.ebuild b/sec-keys/openpgp-keys-apache-tomcat-connectors/openpgp-keys-apache-tomcat-connectors-20141023.ebuild
index cad9f9ac61ec..dc5b1ba87899 100644
--- a/sec-keys/openpgp-keys-apache-tomcat-connectors/openpgp-keys-apache-tomcat-connectors-20141023.ebuild
+++ b/sec-keys/openpgp-keys-apache-tomcat-connectors/openpgp-keys-apache-tomcat-connectors-20141023.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DESCRIPTION="OpenPGP keys used by commons.apache.org"
+DESCRIPTION="OpenPGP keys used by tomcat-connectors"
 HOMEPAGE="https://tomcat.apache.org/download-native.cgi"
 SRC_URI="https://downloads.apache.org/tomcat/tomcat-connectors/KEYS -> ${P}-KEYS.asc"
 S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sec-keys/openpgp-keys-openssl/Manifest b/sec-keys/openpgp-keys-openssl/Manifest
index 793166f70b79..1b12ffaa6810 100644
--- a/sec-keys/openpgp-keys-openssl/Manifest
+++ b/sec-keys/openpgp-keys-openssl/Manifest
@@ -25,5 +25,5 @@ DIST openssl-keys-20230801-EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5.asc 5414 BLA
 EBUILD openpgp-keys-openssl-20220316-r1.ebuild 946 BLAKE2B 6b8ac9655a53640847401483270e68c1841f91c1c29fac69c8a40298854881d02306ab5c9725230e622f64cf6c642276bc8bc797f682bbfacb202c871d7ff81e SHA512 c6efc3cbee447ba2e3d3708b0c3a68787d475458a57f7c3f3d0743a72e259f8c517054678d01ea764c5fe59b6a745bbcdc45cb81e47978a28f20fcf30ce71341
 EBUILD openpgp-keys-openssl-20221101.ebuild 1924 BLAKE2B d78a943602a99aa0c18c7537f58cbe2f41050ba006135714a893a88802f8b62d7aaeb20b8ac5dfede4395f64c27783123a5b49f37fda993ef97be4b9968690a8 SHA512 92c3cc7beae6d76daa8ba5354704be45108ed0c9b89c267ac14858d20edce786a4f26449783b0319b1c2c9b873d367567a99271105c742fb423cc57ad7d3cc84
 EBUILD openpgp-keys-openssl-20230207.ebuild 1945 BLAKE2B 257062e090feb2a0c390ca3511239f95027e055c3032ee0548e4c8e1abebdb7c3b5d19dba25dc483368bfaa1ac5c24c2c58b1fe5744c54dc4ee26cefa5cc485a SHA512 89aec106c269fb85ed3571feb7a6d0b17c3e8a4231c31ff3349bdd1454f4b7ee64a215f982bf6320788b95d1e18064a21dcf6e7b484426a43dda90bc41a09b5b
-EBUILD openpgp-keys-openssl-20230801.ebuild 2095 BLAKE2B 2ff8690b605add0b67d61be1dbf6ce3f224a3316394d8fe4afd4845d366c1fd31b6010eb9447f766fede970ca58a9d8e4f42c55e3b47d111ade0f42508e18ba1 SHA512 3cc6236ece9ddfb3b650925bde223942fcb66bd6c814ec44f22c5e6cb162be055ac4163b23e82d4ce198c666068ef01f78f910396c54b2ffbee1bc263078c57f
+EBUILD openpgp-keys-openssl-20230801.ebuild 2094 BLAKE2B dd3f0ddfbe6cd6957d79eec16f4ad201bfe1774059668b5b8d7daaf400de585d9140f4a6776bc2ff2c314e86816062ab1a99697d7159213c0be80ea2cb583eb0 SHA512 c12b0541bd2d0d4c34b5f6c90409b4504ea21cbcf7bcecc202049e098d30f9c4378321ed64aec64bfd1fe3ea1d6bfd500d9bf3fe4a81761df0c51356aca73e8f
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230801.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230801.ebuild
index 9b89bd11051c..bad8bc4f9441 100644
--- a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230801.ebuild
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230801.ebuild
@@ -59,7 +59,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 380ac8edce0a..93275a8a37d2 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 80017f3b75a2..89b6eb5ccc7f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -16,6 +16,7 @@ DIST gcc-11-20230817.tar.xz 76219020 BLAKE2B cb1c97f415e098765fc6b958617046f52f6
 DIST gcc-11-20230824.tar.xz 76202120 BLAKE2B 243ce16e28c66d681bb27df32866947309f8fa386e258896651b6853e390da79304250669096fd55cafe0a9d5adf4b3a3cf5989302f4ad13660ece80639b545a SHA512 a9cab8bf61f2a572baba73a2a11271eeb61d43f07411df376a8568820c1373f64f635d747933fda1e942ae717b0ae9f1c810f662fc09ccb075940248bc48b582
 DIST gcc-11-20230831.tar.xz 76211908 BLAKE2B 5feec7b77049dfb2d6372f869d99bd6ed4d2f6cf463e10b503cddf986c38f0c1b4fadcd53bf19e7ca763cf54fbf12766528f99e303f7691dd04f2b43e4d61eeb SHA512 210d61c90fbedf3c52de17d7d2792a90d8e1ad0498dc5fdbb2c21f90ba3d19bb69f0a94766b436121eb149be585358cbf10de66065e40eebb3750d78d165eef9
 DIST gcc-11-20230907.tar.xz 76271328 BLAKE2B 8bd407d603487dfaa52e28562e57a5895dbc3e76462d21de1a9671c3cf0306d0725129ea8468c9e28627329650745c29412f56a065e00188cc81df6fb78b8c64 SHA512 6b11dc113746a323a41bb52c33ec6a4af85818782fe4ba31fe553c5c723d2b8bcd20f4cb9552daf012ba45e0050112e7e6a51bab7c99b0305a17ffdf854b99ec
+DIST gcc-11-20230914.tar.xz 76227984 BLAKE2B b3b45a22895cae00825aa695efe08424ab4e3302375d4767f7488b34dc59af0516fc1c734739f0c608b3ccd77cc22fa36c675cbca4fd0cd0675749a78ecd238f SHA512 08a0a0e66e83459267704f4b0961946455b16d06823624e7af0cc74c09d9aeb8ab19e093518f6d42e4e9d7ce3ea3ea58bec22ca797d5e6c136a0a5563c33d263
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
@@ -73,6 +74,7 @@ EBUILD gcc-11.4.1_p20230817.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167
 EBUILD gcc-11.4.1_p20230824.ebuild 1614 BLAKE2B 76541d8ec0819f2ced3ac9ecc63b7f7fdee3716226b8cb1d1ae1d1115e2ba9c653cfb25e711289d263bce7b75c6812f24bd381ca84c8dbf33ee840f08765f8b7 SHA512 221b1b8aee3fe8d9db2bfc17f25cc59e473960307c95b0991bdae2b8258c889f2765514d27015621cd000e609f14110cb341ffe26054b42444e12a51fff19188
 EBUILD gcc-11.4.1_p20230831.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
 EBUILD gcc-11.4.1_p20230907.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
+EBUILD gcc-11.4.1_p20230914.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
 EBUILD gcc-11.5.9999.ebuild 1582 BLAKE2B a5b94704a65afc32a3079ad0732b544c03413a9f4965ccf1c2718fd763dc29b7a64e54b8cbb492d52e93527e3f0d4966d17eb6b6cb81fd609c6629d19f6b124d SHA512 bd165193f6ef2b12930bac05c8c3f75f6bafd143a13ed5c2960f7a1d8039608ca23ccbffe9a6b235d42c789d117e29cb3d47998c71a4a3eba30a63b8b9e0f116
 EBUILD gcc-12.2.1_p20230428-r1.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e89e82e15fdfc2a0188dafcd5ee3050dd68e20cb765e06eeae92f1b4b965b9f678bd23786291d207984afe0365728f71a327 SHA512 a844ec1b656ade09280433231828e28bdfac9750e277fb5f7b2c905199f62d1f3d59c5c283706f8e80d8f8e5059a7529cd0b5a3c224a55b6e97faa335b8ebe74
 EBUILD gcc-12.3.1_p20230526.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e89e82e15fdfc2a0188dafcd5ee3050dd68e20cb765e06eeae92f1b4b965b9f678bd23786291d207984afe0365728f71a327 SHA512 a844ec1b656ade09280433231828e28bdfac9750e277fb5f7b2c905199f62d1f3d59c5c283706f8e80d8f8e5059a7529cd0b5a3c224a55b6e97faa335b8ebe74
diff --git a/sys-devel/gcc/gcc-11.4.1_p20230914.ebuild b/sys-devel/gcc/gcc-11.4.1_p20230914.ebuild
new file mode 100644
index 000000000000..02c58f02f0a6
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20230914.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="11.4.0"
+PATCH_VER="10"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 68cb9f45c1e9..7eebad387ccf 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 2d3fb7399526..2c12787380f6 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -9,5 +9,5 @@ EBUILD libxcrypt-4.4.28-r2.ebuild 9464 BLAKE2B d5171d0edf8f3028b0e099273a4adfed9
 EBUILD libxcrypt-4.4.33.ebuild 9290 BLAKE2B 950410645ae7c368f5498ca33d26080af50f7e7123b62bb56c7c06c1599fda660efdfd00cf58ad3ef5015562b4541deba9c4791419223413591cc6786880550e SHA512 6623e4c543384119cf360b1de1ed00b775c51fc8d69653a94cfea2095491c8ae576299ab498a524b51ca477bcb5fbd14c659e886a7a12dd41371ac87b974e3cf
 EBUILD libxcrypt-4.4.34.ebuild 9289 BLAKE2B 8a18e3f0c65d971b0733845424cde5f0332feca059c3caabe42b3b3ffcb3778c8609a9a904e8d56a3f88dfa4e1cfc742052794c0b0c6789baaa66b8895fbc346 SHA512 06edc8cfbefe910761d669631e33c1e9ae96670e65668a2e5cd8858c6ae760bb86ec26b7c847d8e28050d74731a8b9ec54f7f4174a12f975f1b96f7a491ebe38
 EBUILD libxcrypt-4.4.35.ebuild 9339 BLAKE2B 08ba04ff9516af517090474e43b7c26f6aad59a34cc1fa220cf5aa236efbe0fb158b6c09459f8031ade49e1209b26dc524495c5b547705b28e4220628a3b602e SHA512 6979069b86306531d0fcd646422b501d5e31f1706a5533c19cde61fbaeb250002c803bb8cda950c00f754904a84829aca684eb17d6c14ebe26eb5b75cd6de589
-EBUILD libxcrypt-4.4.36.ebuild 9278 BLAKE2B 74aefba315598aa9f32b8096ae4b94ce43f3f69df666ffb3e9207d70cec0e6e25d927e5fef0c2a527e1078df07098c0ae07b5d840bbda371a376f3c0f005ebb9 SHA512 dca8f3feeaaa45eba26fadaafd7fab981016f21dc28b06657342dd5a281f2d2e767e04d031baf02dad10637e732a9922e81f052f5d3c2ff65cf1b1657c9d28ea
+EBUILD libxcrypt-4.4.36.ebuild 9277 BLAKE2B 3c61d649872de0732f6b47425c090aab1af550973d8731a1c0f2baec7dd01f7dfa625b767202a2c4ae726754877dba55f47be493d7304eccd9a8f7a296768d88 SHA512 d4460bdc266aa798c201976825155de03e3b2b9d20ede3db8f2c1e685baac3914b135e0946cf185e2f886a2ea088d15b9b5dfcc1e1842deb4c7fba23e78588a9
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
index 0943c85e2c8e..ae56c53456ea 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+compat split-usr static-libs +system test headers-only"
 REQUIRED_USE="split-usr? ( system )"
 RESTRICT="!test? ( test )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index cc59076055cb..3e0aef8c17a4 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index d371e202331d..886769f025a6 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,6 +1,7 @@
 AUX mod_jk-1.2.48-clang16.patch 2217 BLAKE2B d215679542c35f099dd16f64e1ec50907ae695a3d32c09a602d38c1baf9d75243033299fbc1da73961e19088cbf671b539d7dad460710969552159cb68f6a740 SHA512 4bd44d4004997ce38d148af7b8bb2fcba90d74c6b64b17a148a53d63d4e1ce266e8dd82459246645b7f62e51ad34b22891df7e630ba25349ec8a17a932ba5306
 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
 DIST tomcat-connectors-1.2.49-src.tar.gz 1702479 BLAKE2B 5994bbff6b8c11770cfe8287590d3af793d8720b8a54ecb066abe481e158517c25757a575c9db197e39b1ffc957f27237e92818a9da557db78e5d286b58b1d13 SHA512 936eb017ff9d9011996933838d5c306ede9ae1886405f4daed60719ee522cca6075dedb3b647863ef12155cca93f6db8e58209a5d3bbd2da157ffc536a6809f2
+DIST tomcat-connectors-1.2.49-src.tar.gz.asc 873 BLAKE2B 52cd9b6f051a6a76b1823773c4af2742dfdd686afa951975623d2d2a42730cbd40882e0f6f13600a6e473d265418b662ae1a576889e25685d74d8e692ae1a42e SHA512 41edf25b31bbf280814451dcb9fdc28497394213dfd968c37b2c15670aee34e028a7fc1145a374f128d7ab969c43ca9ae6fd296fee6bf5fae4785ea35908b144
 EBUILD mod_jk-1.2.48-r1.ebuild 1694 BLAKE2B 267a901a21ea33ae3c21c65913e94960287141c5c16cd121b7fac9c892d971267068183f07c648e2b59a11ff8017456b85cad3462721a33d61b1a2a2687d0ae7 SHA512 4eda7ee3ad5380a82ed3839b0536684d2debb99bad2c2d4e87219f81430e39e3245083103a7d874aa5e71b86f360e0cd8ceacf76784b2071e2404a8d8db9c667
-EBUILD mod_jk-1.2.49.ebuild 1696 BLAKE2B 2410093ea3a60a34e68b36476eb7533abe03ca5bbc24b8fbcfe5398cf75d751677d23d914fdd08aa2a64fb0d9d36956ef92e884cbf6095f2143671eb7040daae SHA512 4f71d2a26e44cff3daf2c9b9fe9c77aa3f208ebf4a15e2bfcd2497e0e13bf6706ecdd0124812fc567c039241ba76fb2fdc70b0beab4509739def966d815eda05
+EBUILD mod_jk-1.2.49.ebuild 1935 BLAKE2B bba0e9725a2d4ce7235e8d6f76b31874b1fa171e9e00d4e9d2329374cf906f5534c563aa17bd29dd22754447b401340b812935af29ed3eceef258c4b993ff3bf SHA512 a54c48a2b48cc4a61f2e6a4d513cf2dac9f66d5a613120912ba79403cda76b1e1dc7a39618de3b4430f0b7bb6f6bd1574c8d5d82df2858c46d00b8fd2c88eddd
 MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7
diff --git a/www-apache/mod_jk/mod_jk-1.2.49.ebuild b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
index 3e2e8a388ccc..8b6a43685192 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 MY_P="tomcat-connectors-${PV#-*}-src"
 
-inherit apache-module autotools
+inherit apache-module autotools verify-sig
 
 DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine"
 HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/jk/tomcat-connectors-${PV}-src.tar.gz.asc  )"
 S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
@@ -18,15 +19,14 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl"
+BDEPEND="
+	dev-lang/perl
+	verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
 
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_DEFINE="JK"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-clang16.patch
-)
-
 need_apache2
 
 pkg_setup() {
author	V3n3RiX <venerix@koprulu.sector>	2023-09-15 04:49:10 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-09-15 04:49:10 +0100
commit	efca79f216bfeffd55e7731fbf24126d093e1084 (patch)
tree	f19ba31d8686b3de4192db3e4c4dc9f3d9af54b5
parent	ea7f3f690b55cdfa8b2d350b03c1dfc0c8357a51 (diff)