gentoo auto-resync : 09:03:2025 - 01:48:35

14 files changed, 50 insertions, 118 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index aa13ede7dc4e..559ae3bfb47f 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index ee7cee1bdae6..e0548fda4de3 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -1,5 +1,3 @@
-DIST editorconfig-vim-1.1.1.tar.gz 33287 BLAKE2B 4c79ac3bf1f82ca6182480ab2f3c2ee24b8234f5845c63d90434bb57271981554a0651d8bc0314c718ad9700adf7903fed45f5e400d8ae8a0b6d42932e89e071 SHA512 7b94db4b2f641ecd2d2623bf55bf9b457c007b2b5c8553cba5b7a75bc34823d6995d3c9ed13febe0f59de6f87c52eb0367591213c43c6fcd7c331c529126f4d6
 DIST editorconfig-vim-1.2.0.tar.gz 34457 BLAKE2B 969e650c69abaa4e7fb652f3384f2b4ac779e2d6d3f39d898bcc7e69c7399510bfabb1aae5bd90cbb2e5276f5200a87797f6da976df040e39626d883b907792c SHA512 1101562e71f2a9f356a3773cc32f4f091d5a0b67c85a8d78d70f76a73ec3b709f5ac5b7db7448972409031d37176190922912945be05037b627d1cf766bbb731
-EBUILD editorconfig-vim-1.1.1.ebuild 569 BLAKE2B 52a8fa9eedb8a3bcb6a7190ed0269c948c66881963bafb8808829dd2cd6d9e48c7b077409593a588331590d7a2c7ae2185ed1563dfd4f182ebd419f9e074ece7 SHA512 0dfb5c2ae977fd9218bb110d04502dc854a6c366c6fc08a5c9724d79ec1d48a44fedad5c6030f289efcfdaab6b59407481f1628efbbc4190ed35afb00623609d
 EBUILD editorconfig-vim-1.2.0.ebuild 569 BLAKE2B e2866586b19b6ff98cd81d178f9d7b2ac1145ddff4b1034c7170c31f4adc91a4d4888ae4e63154979ccc9e54462b7a3a4a53f596905ad5fdafdf5065535bd1c7 SHA512 2161f63e34bf0c93198b2883506e1f51f40e65e2307dc352e04a29d35bfc271593fa025aa16e141af505a2b657d3febe7a9a770758eee2df2305150b3f2f3d4d
 MISC metadata.xml 444 BLAKE2B 962771b028efce996f82b5ad49aa52fd1bca0c8ec361f3f54b21b612eac37cab67bf39017f108ed2afbfa7d5d79003211f525a22fc7ad28bf42067a81c0ce7cd SHA512 0698490137ce8bf55fb4931bff44f9fb018d65245f1c3d7c25e33589758df67aca542cb832fc96ae25d7e49345b8bc388403db416a9419066e545115553efed7
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
deleted file mode 100644
index a6d27567296c..000000000000
--- a/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="vim plugin: Support EditorConfig files"
-HOMEPAGE="https://editorconfig.org/"
-SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2 PSF-2"
-KEYWORDS="amd64 ~arm64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
-
-src_install() {
-	# we don't want to install the tests
-	rm -r tests || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index 1e171b28e1c9..05ed91be7852 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,6 +1,4 @@
-DIST fugitive-3.4.tar.gz 80677 BLAKE2B 7cb341851248eb05a8094617f349e382cb8704f69116d8a00f07db40d96b4cc86b98515a59c489116fe7fdadb9a73a65819bf792005bda316f1a0bca311e6938 SHA512 313f1b06c843f85cfdbee059f1470b1ed062c2055e552fa1e05b01e59d9950c181b19e7553cbbca575b1951949970691081582128be7148885485d4fbed0a4d2
 DIST fugitive-3.7.tar.gz 84271 BLAKE2B 1c00272174bd76a2b4d34aa54a7498b2f75a5322d587e3436d82f21d6188027768bea0475c99fcbc50a82b89d9a9a7697d18106cb1eb2f9788afa81848fe2de8 SHA512 8252b69c6183f5b710739eb68ecb3fbdfad52df3dbee0a3a04ad33f410b489d7fcf1c0bde0cb2d53995a6b4e34191c165c652d08e6145789a88f8c46bfcddf56
-EBUILD fugitive-3.4.ebuild 623 BLAKE2B fcc6f0d03de813c484835ec024214307b05f0f19693cedadb3c462937fd5802265002ee94360a15a844466a66067e4cf04e567f15060ae64538589d73f160424 SHA512 433673db4c18480be1e4bf863d344f957353c84c1596cd2107202b24fcb6073cfa99cf0505bf9e7a3585ffbf2f40237ae4fb342dc687cbba7fd33835e7facaa4
 EBUILD fugitive-3.7.ebuild 634 BLAKE2B ad576ba820d8345bb56b56142445d73cc561d0c1afd8eba46e6ef37cef74d50065a094b4a54e8eba165ad81d5e18435d3ba382b3e84e85107e13518613b9649e SHA512 e9a134e554ac18850de2d8c3f37e7830568fb48c7579cbebfda91fb9c79d38a4712155db0ff0c6ad1e885f8f91c3f4a0f9d66ef7621bd03916dd17f09fa52276
 EBUILD fugitive-9999.ebuild 636 BLAKE2B b96e40e319f06e9b527c8290ec707d6047ddfe1fe1b8f26c8cd58c8cf57cf43b60ae6775fc7b8edc712cf7c6c5a2e194be85a08efed955d9fd5b2fe376d73797 SHA512 5a39e9f04d72ce81f97d6fdb12b20efc49b168e9f37983b1dcdf94a6e4e17c3a44359ef3ca97118f9f6958bf7265943f6361aa308f2bb654fbe824615aec45cb
 MISC metadata.xml 411 BLAKE2B 090886e9c0ef8f9e5879d4bc7c8ca432d547b907c5e10d0c48fd7e036c45508b4d8f4596df096964e538b9d25eff98a6fec0f58c63c8797a11bebcffe0a718be SHA512 5c4640ccedfc05b467fbaffb0f14eb342026010cef1803adeec10c0d19336388e618cb84c3dddc52ae477915e46732c9fa894d02acf45742133aeb978dd394d9
diff --git a/app-vim/fugitive/fugitive-3.4.ebuild b/app-vim/fugitive/fugitive-3.4.ebuild
deleted file mode 100644
index 099b1046e1b4..000000000000
--- a/app-vim/fugitive/fugitive-3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
-else
-	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
-	S="${WORKDIR}/vim-${P}"
-fi
-
-DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index f66313939dbd..977031ddb4df 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-syntax-14.tar.bz2 20988 BLAKE2B 2f11628bec985ef486ad6f04b694df7a2b1e5ef34f5ddb364c7d9dea4a507d9bae4d8de6b00b33358cf651b4fc6816164f22f7760275a1fd0668b89927859cfb SHA512 63914ffb1911d83fa8991a901f9a23ccfc30f0170a6a730cb02919f4adf0ad34c70f4457e006b1c08a004448c6b9e85d97634a8ed8fdf0b4f98ef9fd804eef00
+DIST gentoo-syntax-15.tar.bz2 21018 BLAKE2B 2b0ead6d5701f14f321ad02b1cd3fe426b8e98e4d80e66331387f0543d88a2ac6b5d78a1f8c9125dadf24f3508c34d915fa896dc2fb85a8664984d771b48a29e SHA512 69cdcd58933b4f83da81ecc943e205689591748c283005b2e6cd342e623d8e0643979d913ec6a9464ca2b49431ea2317dfb0e6454143d6757f6ba287286d24f1
 EBUILD gentoo-syntax-14.ebuild 1194 BLAKE2B f5178d022e2289ae63adb73bbca9c8b105ed2617a7fd6ca0440d23024b34768cb92cb4955ba93da396de82f4d66d2ca7b2476fe26ccc8fa815b4a69cdc4615a3 SHA512 ead331820bf726b85e9ed7124524b490d3e2edf71bd89b46889116fa7527d1fb70e74d5a5a27e107ca217c3af768e99c33c074992a03230a4bc0c9e9e663c632
+EBUILD gentoo-syntax-15.ebuild 1202 BLAKE2B 496c37cb0a264acbdcc9457c396b92a6e82cbbe39eb3c0b5cbdc3fefa0f497d8dd7640bee0972ea8d9442d57c06a61956d5d72548973f14eac8201f3963a1d96 SHA512 b5329237d00fa4cf32668b2f902b3b31a7719c71493585bd5f6d5a1fe058ca7246ee7c5d91640303c7c9ce042f9885491ce5b968f41c345689dfe25c28b23452
 EBUILD gentoo-syntax-9999.ebuild 1076 BLAKE2B 0688da77100e073b40e8b72bd97a6c3cce176f73a36e89489a5536b73a1cd9896222c967c564aa8cac53c5be61be6e7495b4f460f413d899f23a250108d5eb4a SHA512 ee83565cc9c614275d5bbfc5cc33b19cc8af0d170837358e663a63f8de95d86c37f33995e878355dc482d5381ae9dd77fb891c2d484d5e2307d20d85f053a3b8
 MISC metadata.xml 646 BLAKE2B d33ab1ce3b852316a114a27c7768310491f51669a44a183c5b2fe639a0d2e65439759de9a83cb019467ef5d206470454bfe1939906d32c1a7fe6ebad0458e14b SHA512 a75bc08e066deac74dc6a8a9927e232be4facc31e0810121480c07e75549de2cbc974eff9f71f2c59fb17f0739bd0cd9cede9a048af4715047a796b6a5afea7d
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild
new file mode 100644
index 000000000000..2258150d4b4b
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		fi
+	fi
+}
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index f1a4b06cc28e..42f8d6f1b764 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1,5 +1,4 @@
 AUX gundo-2.6.2-python3.patch 395 BLAKE2B b39d17b6046f59d9a89fc89f4f6b941fb78777a98525993a046241f780087cf3450833cd966a42354a3d1f26a0171c5ed0d57aa11606ab42c9f04d44aaeafbfc SHA512 0fc80a6ade3a2b53843444a4ec9404d4d1ae54d5add0c5807a49c7a6818282f73c5635df69167a7f5b02da8b198bf83466f7b4da17f5d16f225a72081bd61df5
 DIST gundo-2.6.2.tar.bz2 144107 BLAKE2B 7915a60a77e07e49cc1a214c6e250028e61ff33e6f085960836a3e49c1562f4ff713ff4c57125f677d352ae3477bb514fd94d636ee5ba9afac5d23c4ecd70029 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4
-EBUILD gundo-2.6.2-r3.ebuild 738 BLAKE2B 85f5cf5d1eb3eca59d8877d942124cadc42e946aa3558e4bf1fabf281e08816d7597208ad2a6641d0d507e3df5678c70c9dc93af16c7aa3f34344f25d486d10f SHA512 b418a8563343d63660900fe36f1e717756c13b0a221aa488843772d525831e6f4cecbb8e77056a5c9e0edc6177e3df515c424f8f90ba7446596a6097ed067fbe
-EBUILD gundo-2.6.2-r4.ebuild 741 BLAKE2B 270a345280848e9618a9b9f2a2bcf0f5e9d698652aa38f5279c8f388d1289b6cdb85487baa38452f3e8c29b9d7de118e59ae2a0173ea2db65f5740f2505cde9b SHA512 b8ef61dc9ccd27f06d694ade5db2cf04ed77eec0b1da0388e08833323b1675eeaf4f70df6a2cd4f745f0f6767c64f024d8b03b5d05237e55dd6a5d556b1e2930
+EBUILD gundo-2.6.2-r4.ebuild 739 BLAKE2B 755c79edf82fea5a0e83843c4c44bc77d689f9aae22e29bfd6ffe511bf36217f50d4d5429cb106375e148c68349103fe318349be387659add2d83eda560800e1 SHA512 3cf321f78de89c6bff5e044cc570c7824c9b33ea66001f5fed8f4d2cacbf367b351aa5eda2bae94a44f8557721c6ef30f839dae5dbe344e2dd785275e358887e
 MISC metadata.xml 363 BLAKE2B c840f208c7562daff03045c0d10801fb085b5df9e00ebdd230c7e33449e1d65759ae246bfcfb7c43d340799553998497f3c196410bc994aa59c66f977fd86189 SHA512 1885fd25b761f8a83516315354b9adf1477fd492667d9d091a4c9eb30ee31dd15c169811a6a66728a73b2ae132b92c6e19ca0d7e630c163916379465cf86ee48
diff --git a/app-vim/gundo/gundo-2.6.2-r3.ebuild b/app-vim/gundo/gundo-2.6.2-r3.ebuild
deleted file mode 100644
index b791897b38a4..000000000000
--- a/app-vim/gundo/gundo-2.6.2-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit vim-plugin python-single-r1 vcs-snapshot
-
-DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://github.com/sjl/gundo.vim"
-SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86 ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-PATCHES=( "${FILESDIR}"/${P}-python3.patch )
-
-src_prepare() {
-	rm -r site tests || die
-	default
-}
diff --git a/app-vim/gundo/gundo-2.6.2-r4.ebuild b/app-vim/gundo/gundo-2.6.2-r4.ebuild
index 32c0758b25dd..2c977633e345 100644
--- a/app-vim/gundo/gundo-2.6.2-r4.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/sjl/gundo.vim"
 SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
index 9f941aa4c520..3e58771ec4ee 100644
--- a/app-vim/nerdtree/Manifest
+++ b/app-vim/nerdtree/Manifest
@@ -1,6 +1,6 @@
 DIST nerdtree-6.4.3.tar.gz 158308 BLAKE2B 49c5014f76c19ccec2a42812d70c1e4186ce0f918ca483e340679b59680d49dfe3ac5488075af9d84d5122a89f8b972f5270ae7a6c4d8756edd0c01554a341ef SHA512 ea4ba39c67817589ab0e64192ab1889f9f0b7eeb1ccb85c5d2b4141e8759ef7e6ee9822e0ea3bdcdb9a7141ffe9e70af1c3f462a06f8c76c3234f07f5750518d
 DIST nerdtree-7.1.3.tar.gz 166022 BLAKE2B c8c4ddead5def6b80aeda659fd08cb6bce1c176b99e1f08425119935bec461e7b3581f5c3805ce6d782cb826400cab63bf46d3faa98fc4237e3bfc397936089d SHA512 f700facf00a837ba44a1844bc68633d88333e2d1a2debc83ec1fee4897dfc30bbc1abe3f4cc89c6b533a7db74e29470f344a6180de3d8e7fe638457d89b5ef5b
 EBUILD nerdtree-6.4.3.ebuild 637 BLAKE2B 688288ce6d084f1b9c899f6a8fc2eddc199b11c524f6b649236468bebe2ffc8e805f8e61221c1a47ebaa11f8d6e0b9ad1b04afa98e0b10cd35faf305a04ea968 SHA512 fdd3f8e74c5f40ec21924c86582208038730161b589fe139e35a9fbedca17654a958b8359c2a3e627fc26f4d17f4afa396df1561c6e185d8d6d267e9bf2dca15
-EBUILD nerdtree-7.1.3-r1.ebuild 700 BLAKE2B 7d1dd5719067811108d928161fcca63e522cbc08dfdbb121febebdd879e7741937b9ea93d83c19135c0b6a3a94127d99ee5cf925d613534313145c24aa23b8b2 SHA512 f82456f1c7570ec009aeec891e89c8d0929496f0d21d443690908ae8e0047ffa716643bff5bf43dd94391e5860f3f6c10064a83f7afb3624a4f36286a1cae774
+EBUILD nerdtree-7.1.3-r1.ebuild 698 BLAKE2B 58fe88de837e4a0d4428a3fe2c80ca3eec608aa921332e94b8cf789a8290a778205deed090a449b554a5c110c1330f969f767be78103bfd16da13a897b91a472 SHA512 8e41e0ef1c450ca7777de07d97dad0bd4347403129b14fa4f1b0aaa6aa3bd9e147cfe151bd9a2d6a14c2c2a8d4f084c40df64512e2cdb258d582e54561236645
 EBUILD nerdtree-9999.ebuild 702 BLAKE2B dd8317c243741bcc872cd6535ee4cae947a6dc12d2cbf264832a1f715d9ec4635cc7442ec677a86edc69d696e7f4a47971a4e2f8de3498fad03e6095e238a450 SHA512 dd816eac181965ada2b9df0143b85c51eb06d309ea6323dad57cdafda1cf287c13670ad1eb49981576d9ea78cf6fbf689d039e61cd1832caf085c116af46c5ab
 MISC metadata.xml 398 BLAKE2B 56817db4efe62000012b5d908dfa57bb720cb4f1fd20d763772e483c2b12fa14609a061f0921de599015d473bbbf7fe02301c1f789bd86eee116dec560c1fe57 SHA512 de4d86934b9f8a4e198f2c2ce93daf14ff6d3bc42c105a1516f9aec41955de8ca168beeb4d26da00ae9c44a22a6fbbf57a6cbc71aeab7eae66433ee1a272f512
diff --git a/app-vim/nerdtree/nerdtree-7.1.3-r1.ebuild b/app-vim/nerdtree/nerdtree-7.1.3-r1.ebuild
index d4df4bcc54b7..f46748e4171f 100644
--- a/app-vim/nerdtree/nerdtree-7.1.3-r1.ebuild
+++ b/app-vim/nerdtree/nerdtree-7.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/preservim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
index 4a6ea0dc4347..2c57ab1ada56 100644
--- a/app-vim/vimtex/Manifest
+++ b/app-vim/vimtex/Manifest
@@ -1,5 +1,3 @@
-DIST vimtex-1.5.tar.gz 1666938 BLAKE2B 7d203f25b1f5c653bb270fb4cb5463d2851fe63d52dde9b99d8ca4e2c7936f7291c649e5a71d25c01329a2caf3aa4258f302d2585c6b7e67991e5f91dd785526 SHA512 9009a830e117c8d1d6b00f97cb1382704c77120e05810ad40d1ec191cb547e5045101d2901b88d85b42d17ba51cdd5f5a00b2f80aa2424e2529bb19c7f651f00
 DIST vimtex-2.15.tar.gz 1092207 BLAKE2B 19feb79c47fa7906fbf97c126ca30a3ff89cd2b5aa034356e48d202eb55f41320bce1d40011dee4f8d099678a9748405ad7913f6df520773050fe494402f56e6 SHA512 1e436a375d3244b2bd3ccd82badc31f145c95990c1b058b5aa02ecb1adaafc80c6bf31661229fe6cb4f262c282da49755491b7311c0d450e5782d427e92ada1e
-EBUILD vimtex-1.5.ebuild 540 BLAKE2B 4a03b7b850d52d3e6739f0d6c09397472e40db8e60825f333278a6edb6a5942e6334857478720635cf6d6a9ef25932588c4e0b3498908940a88fb881ba76d2a7 SHA512 9450b1d918a2547708c5d1ed6ff940ba730f6f52f6301048d1cf756b246ce0ee04ddd0f1215e81c665820bdd43ad63d8fcb92be85537722dcc33fb8b8c7d6bfd
 EBUILD vimtex-2.15.ebuild 511 BLAKE2B 72d898b27afb9acb253cb74366845fb759cc7ccc94a1932f1f2b70ea98e44a3ae4c2933ac9b79bc797d0f676437dbe1631a9face4e5bcd30a8f32ae14f5f734c SHA512 3c4c5a5a02a6df40c4173ece2c77212db331ee7d38ae13b87715903e0bae59cd74c688010a13880d5f253afb7101b3a00fda002d02b0f498fb32b76618ce69e4
 MISC metadata.xml 363 BLAKE2B 7dc4990b369a13767a56df41b0eb7354c24a914c35d587614355d7dbc465512d9f41f444410038082c67cfd1100bc399e3508301b9c8a03e2a610c37cce4e81a SHA512 e0a2e4b953b1dfa4764b33e643bc7f7abcc04aef2dd34d7fc66d41619d3f20ba4a38fea7d1dccba6f61c4020663d0baeac72e01613a10a9a605127097df166fa
diff --git a/app-vim/vimtex/vimtex-1.5.ebuild b/app-vim/vimtex/vimtex-1.5.ebuild
deleted file mode 100644
index bc71b2da1a54..000000000000
--- a/app-vim/vimtex/vimtex-1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
-HOMEPAGE="https://github.com/lervag/vimtex"
-SRC_URI="https://github.com/lervag/vimtex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~riscv ~x86"
-LICENSE="MIT"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-RDEPEND="
-	!app-vim/vim-latex
-	!app-vim/automatictexplugin"
-
-src_prepare() {
-	default
-
-	# remove unwanted dirs
-	rm -r media test || die
-}