gentoo resync : 13.05.2018

18 files changed, 16 insertions, 115 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 8b3a0017568e..b0c2d6d38aa7 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index 52062146781a..e560ce24b814 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -3,5 +3,5 @@ DIST alternate-2.18.tar.bz2 7907 BLAKE2B 574369557d3a56b163e7288bc60636649a2c441
 DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
 EBUILD alternate-2.18-r1.ebuild 727 BLAKE2B e09fcbd230d6ff7ca1f940556a16483f7fcf9eca457abbfe519fb2c27acbd794b633a96bd2e7ab6f35685832625dd00234374041b1132f122a85854ef48970ef SHA512 1b0932395f1783e4adcad151dc5f12c71938706f15210f26137f6932a30ec17da4f842ddb816e00fb9831bda8c746c3bdc0aa82e091881b7185c1a9c5e6341ac
-EBUILD alternate-2.18-r2.ebuild 985 BLAKE2B 11cebce8641e3c1be0c21435482dd8332dca973e08f5cac1d048b0d4785674d18670b9b6160faf0ba4aac26c959b095da3bbd5a1d8a4b1611aedd3d253bfe5f4 SHA512 657c2ea8628fc408cf74f58132f78f23535e811344331d3bd09c87e20fa391cc866e42e7374a47314ed8260fb2b3149ef0c28335b5d0e8e6c08df68777305b76
+EBUILD alternate-2.18-r2.ebuild 1013 BLAKE2B 57659ca6fb819c9bd22975a31f3e51a84062e31d8b9c44944f80cc95d36149c4d476ab6e7ec2da8bd443af6020dc2d83907d7a2c27c487e29f94d35d4fd9c3a5 SHA512 bbf5ef860e9480e8fbc7dd62ffe6999e9c7d1d5a1f1dde913b9f56318415d5884497f77d55b5c1a168174eab00d145b373bd0a1276960cf4597e7f6db26c5c25
 MISC metadata.xml 331 BLAKE2B 2dc5ef5397f37066b5fc7d3a3c5c04185632f538fa6efb5006d0d8aa12d51696464850b2b3a0aea4e7bff8c3e9caf9cbe9e90a312e903d0b5313e29eb5588d3c SHA512 ef4ca068ea9f5409c814ca371c0f68456799bed2bae3019cf2ea3af5c2d13750a059f1d885e2c901cc6549cb7915dcb48abb9d5ce7d67210d89b73d79a2e319d
diff --git a/app-vim/alternate/alternate-2.18-r2.ebuild b/app-vim/alternate/alternate-2.18-r2.ebuild
index 8f7e87cca08b..5b01204abb9e 100644
--- a/app-vim/alternate/alternate-2.18-r2.ebuild
+++ b/app-vim/alternate/alternate-2.18-r2.ebuild
@@ -6,12 +6,11 @@ EAPI=6
 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"
+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
-"
+	https://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt"
 
 LICENSE="alternate"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
@@ -27,6 +26,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-hh-cc-alternation.patch
 )
 
+S="${WORKDIR}/a.vim-${PV}"
+
 src_prepare() {
 	default
 	mkdir -p "${S}/doc" || die
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index d8aeeb11b457..51134fa806b5 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,5 +1,4 @@
 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 524 BLAKE2B 65a6ca667e4004c353f2128236f71188e0a3e8e6018ecf1f48e1cd727414fa98ade302ec34f8d661b9d7f0d8253a3788fafdc4cd8e91538ce1091eeaa2dc81b1 SHA512 51772c9735f458fd3c3bd1b887717607b9160e0edbac340fd26e539b1323d5e9b582dbbb682459129ad13a8508c7ce53ff5ea9b6aaba6a119853bbec740e1688
-EBUILD dhcpd-syntax-20030825.ebuild 572 BLAKE2B b00d2aa67e2a5f21248d80652adcb31c0860c8a37e78550c79abd25c673ae75e50402d66e8489a475796745d7e8dee64e65253d1122d5523e0016ba8add71769 SHA512 18e1a0d93d58900f071095353cc08d8c6352dabf15ed53c3c3f8dfca5357d1a9c92ec7511292bcdd062977a6909569e793c4b2650e259a16528dd7944330dab3
+EBUILD dhcpd-syntax-20030825-r1.ebuild 518 BLAKE2B dd2b46cc48d7053bd2d47302179cac5b1a3b5edd178209494a4fae46d06b8ba447efbf2404f66ad7ace2cfa3ce7000d60d616b47c45a53784b96073521d19256 SHA512 22eab4a129f6a32c519b1b2c71f3325bbe374506043be7bb95ea8cbce27b83968d0ad386281c0a4afc61de30d77d42305c7d00f1aa74b5f8fbcb6db2d9a9fd15
 MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index 076e66a6f805..543bd478be7a 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -8,7 +8,7 @@ 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 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
 
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
deleted file mode 100644
index cfc50bce8649..000000000000
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit vim-plugin eutils
-
-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 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides syntax highlighting for dhcpd.conf files."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-multiple-addresses.patch
-}
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
index d3e3fac941e2..2e82913f67ac 100644
--- a/app-vim/ebnf-syntax/Manifest
+++ b/app-vim/ebnf-syntax/Manifest
@@ -1,4 +1,3 @@
 DIST ebnf-syntax-1.1.tar.bz2 981 BLAKE2B 5ab1916fc909f8b6b4fc139fd34c5c982f2bfac3f4ccfa53f13945787db6b9c6b5531cb805d4a0feea5f3165259cd3a033951fd9074344e62657e067571e5300 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083
-EBUILD ebnf-syntax-1.1-r1.ebuild 595 BLAKE2B e84bbbb2137adfdbeefa8b1ed411228a25ea73e49ca92de92919c19c790aa10852a4f83a97f5a5503ab050b4c6e15379285cb17b59dfdb9ab2a5d91f20ab8edc SHA512 e1332c028749be2728d65c0ea2bf39ec02ba6a3f5b0ec91f65bfdd0f83be4ac0b976aa17dc2233640cb61512ecea0c722f9aa23b442fc6a44878cde72256554e
-EBUILD ebnf-syntax-1.1-r2.ebuild 584 BLAKE2B 152db6ad5432928b5789b41e83bb9c10d80e8e022e3b4a2cd98481ba4a01b81687d2dc3c2ea7b6d10ff3044ff2d06f7d066154a8bb465fdf8e4cf4d805226a3a SHA512 d112e45bf3cb62464fc69570b6fed4faa721d4907501434a9cc4090815748a6fec54299df31b68e56ebd8caa2613059c02102b812d12e252a570cf8f5d92c9aa
+EBUILD ebnf-syntax-1.1-r2.ebuild 582 BLAKE2B 109f7998c113695e6404c6630c508a73e157ca7039778e0ab4864aa21af2f08926ff4eab1bf2557f56309d75614f73983ef073a97c385fda8383557b8d5cb66d SHA512 1642c6d5ae458bc4f7edafbf65dc994a01f28c065f6321a5fe3f36b7d9dadeb2e51f79e1a1032e89d3bb6cdad796322db6979b65159fe1ad3eef5a429748155d
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
deleted file mode 100644
index 41bf445bdcec..000000000000
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# 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/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
index 09c4e4bd5c45..fd08be1bffec 100644
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
index bb07ef3ede34..18641f5d30f5 100644
--- a/app-vim/eruby-syntax/Manifest
+++ b/app-vim/eruby-syntax/Manifest
@@ -1,4 +1,3 @@
 DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
-EBUILD eruby-syntax-2.0-r1.ebuild 540 BLAKE2B ac18e4c953a9fcf6454e1754ab1905b5c4fe8b3cf768f0e7b17374e09348d50b957dbcc15921ab869cb6d839ff66f5acc6435ea7963b8ce4d7ba1e8c4ecf419e SHA512 615c05764c5369dc7184e23a8a5d1882d6ec49fffa5a91488e94883d1ed046d49ab5d9fdb303d69597f4e413488ae31872e6c5612244ff719e7213d545a7c58f
-EBUILD eruby-syntax-2.0-r2.ebuild 521 BLAKE2B c2736e195bbee394b91871393e4589e0b2c988e7136c1e36f81341e971a6489233e70e8f2c3860da73d11b423ad2c296a627b1f377ca11f46b86234215b50865 SHA512 63b73f16e3152089b68e876b9e45cc6e5d8191dc228735dff0688af6fea89a71f7af892a733cc0c1d6634685925cfe695187a3b4373e270706d792e5d6279d12
+EBUILD eruby-syntax-2.0-r2.ebuild 518 BLAKE2B d9ff3803aeb6a1b192140b93549f5ea43dce871f6bc3fd585a7b3680419450f15f89e83ac0a91241980dd7c17353e5afb0fa774e84a66119891e8c24a007aa89 SHA512 da855d113283ce2466da482b8fd298b49d5424165bb580d02b005cb0695e25c66374c2e555418a25ae9fb537ac927b67dd0d63f3e855852d7a8e6514c73fca9f
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
deleted file mode 100644
index f781740b355e..000000000000
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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 ~x86-fbsd"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's,hi link,hi def link,' syntax/eruby.vim || die "sed failed"
-}
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
index 5f4dcb5b3716..7062ef9a855c 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -8,7 +8,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
 
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
index a41a5f3ce8c4..d7ce01e42909 100644
--- a/app-vim/nagios-syntax/Manifest
+++ b/app-vim/nagios-syntax/Manifest
@@ -1,5 +1,3 @@
 DIST nagios-syntax-1.8.tar.gz 1737 BLAKE2B 73f3b40b4e79d3449cc0f62e88efa5e7d2085db6050f05a5dd774a375a477f22844c8b5603fd89aa676bc26e90d4ad21ebc377c11c05a67909d0b65e1861983e SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f
-DIST nagios-syntax-20050105.tar.bz2 1721 BLAKE2B 1dd50f29ab734c48caaa52e2f6c0bf601c71136ae8ff7b08077e4f329815e7c5988ad8759d926c2344163aaeccb51be827049c10e3315c6175f57eeac8a9ee3b SHA512 4bfca41c7aac4580511bf651db67c0dc16fcdcb09137ba27ce5472be9e3695db0ac254dca370b0f3576ab58959cd0ca5235833e45b1186c6f6721ca3d5793c6b
-EBUILD nagios-syntax-1.8.ebuild 558 BLAKE2B 4d3468e7d217ba7e13650fadc969a3956200e0d72aa7d762569c4977cbda0ee2ef6c59593e90fbaced95939d0b0719169010b3d3d79c6408a94b36584121dfe7 SHA512 cdfa5df9c86afef7c0f22142dbddef826e954496cf22906b891c2f43bfb29a0cbf6ec776f2c185c9bf96bb699e7a9f3b1d58d1e3715e2c5f78395c7c3168fe86
-EBUILD nagios-syntax-20050105.ebuild 497 BLAKE2B 86318ad6d3fb4191da42332febe28dabf6f5ab00b0156c06ce2f2f7e56bf00b568435bf1ce2a8adbf379ed5f7ed4c599559400817459dcc0f42f50918f887bd2 SHA512 d94b131b9f9a545bd8145b06efc307b7200286d76c8d04c98907d230fbfacc0f9bdf911adb6af9657e67991fae92ff04143b5295d37fb7abe31f85ae407fdc85
+EBUILD nagios-syntax-1.8.ebuild 554 BLAKE2B ff066fc273b15ea38db7a4b83ba00dffd4e5d72fa8ca46ab4672a765bc6c113eb87c558d82590628d0c7cde4a9fcce17a8982d87d1ca53cba25ac9b49ecd4487 SHA512 13a7c9cfb509795a07d7f4016f7673d7788162ccd316fbe8d80f998e76bd1f8518dc3143c6cc05353efce72ee42d8e5326a54d18e93c1f40b16d3cb0345c49ce
 MISC metadata.xml 452 BLAKE2B 6f55d99e5936a8deeef449a45d4a35a4ae34e6d7fa10c642153b4c815dcbffa29574dd68cb1923a61f04885a7521dc56f384550d4a85f8d58ac4830bf15fbe35 SHA512 9cab1433b109d4ee6a223b5da40a276e330cb97ea4a48a570e399ebf939de36623f052bd222c0f957cf3c7ddddd7c380d2b5a711867be32de059006d48d85b9b
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
index 8ae4c68fd007..37286c2a11f0 100644
--- a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Nagios configuration
diff --git a/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild b/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
deleted file mode 100644
index 4828c3e0510c..000000000000
--- a/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Nagios configuration files syntax"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2261"
-LICENSE="vim.org"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides syntax highlighting for Nagios configuration
-files. Detection is by filename (/etc/nagios/)."
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
index d60f192871a0..fba209b3cfc5 100644
--- a/app-vim/tt2-syntax/Manifest
+++ b/app-vim/tt2-syntax/Manifest
@@ -1,4 +1,3 @@
 DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
-EBUILD tt2-syntax-1.13-r1.ebuild 447 BLAKE2B afb6a3aae6708398f5ed331b32e654c73d09c966c8cd1536b520b562aefd88119eba0d9790ba0aaca7511980a7dcec51de4261e8e934cffd9f2863bfcb5ca22a SHA512 2be930eef14047bc1a6e3c84aad925478b889a402444e458994d958c9c0d5fc27037748a3d0e78a614087b18a771af781ebb56311cc3e46a1a1ebadeeab13d5a
-EBUILD tt2-syntax-1.13.ebuild 446 BLAKE2B ac820dd981b409d06ee6465e68edc678d1a90cb22b32e49b1778c8a78a6101415f3009df5558ad18b117000450d63c30f1a67fb7dbe7af14e9d3c8a16092e8a7 SHA512 ae223ec94c7cde9513d93f41dc96d0cf1fa55f23ba84be25b2f40c499952708074c24a176238458ae8e1107d74c8f42ead1b56817c4f6ca8195c5a88308a706f
+EBUILD tt2-syntax-1.13-r1.ebuild 445 BLAKE2B 89c1e67ecd039afac311e70d95959334ce1a26a6518009ac7ec6fda0213e9adeb47a6c60790f1c78ef41430c7ca53fc54c48f663e3de7097426ce6fad2aa6ce0 SHA512 e996ab70a54ed861feb1f2ed03ed43344a6f7ab1077be81971725f1b07ba9b831fd5def7f5284cdc2e2bc1b355bbef09e1ac9809b9a267e277e3d11753f4953d
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
index 2cee4cc1ecaa..ea3b7184e7e5 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -8,7 +8,7 @@ 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 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13.ebuild
deleted file mode 100644
index cffed6d41246..000000000000
--- a/app-vim/tt2-syntax/tt2-syntax-1.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides syntax highlighting for perl module Template-Toolkit"