gentoo resync : 02.08.2019

25 files changed, 88 insertions, 85 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 10d9c287271f..52b7a8343d41 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index 51134fa806b5..067a96e6dea7 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,4 +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 518 BLAKE2B dd2b46cc48d7053bd2d47302179cac5b1a3b5edd178209494a4fae46d06b8ba447efbf2404f66ad7ace2cfa3ce7000d60d616b47c45a53784b96073521d19256 SHA512 22eab4a129f6a32c519b1b2c71f3325bbe374506043be7bb95ea8cbce27b83968d0ad386281c0a4afc61de30d77d42305c7d00f1aa74b5f8fbcb6db2d9a9fd15
+EBUILD dhcpd-syntax-20030825-r1.ebuild 514 BLAKE2B 5d082b622cb6296b3ffe582121cd579776897fbfe408612e630ee25dc8675788b7b84485915ea417b05aa07f907fed47f6b554da6991846928cfd0d58bb82adf SHA512 6579a7d7537b8afd93b52766b0f079561a04b970bc8440e9291d808e9116f08b67c1f398fb28a0d17e33b7abc7580a64699cf4424ae4b029cbf75f6bee685669
 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 543bd478be7a..8a15c15ee645 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/easytags/Manifest b/app-vim/easytags/Manifest
index b31c1c84faf9..049be10074f7 100644
--- a/app-vim/easytags/Manifest
+++ b/app-vim/easytags/Manifest
@@ -1,4 +1,4 @@
 AUX easytags-3.11-fix-ctags-detection.patch 2964 BLAKE2B eafaddd9877d8732eeace0197ab29cedba38a89a1f7c4e1fb2192cb075bc7a4541e6a5e5448a8944a7f6a0b47fb1cd481035529d6b11d5508df35089f2e85865 SHA512 f3ef6cfce5cbbebc4d33fc5f6fe0b7df037c9ec80da6f4a2b29bccb15e00b385719e654238f6becea1372900ac5f9e5e6d6af481537dde12c03cda24ee49e674
 DIST easytags-3.11.tar.gz 40572 BLAKE2B a6b228743f493bd467aff6685b6799de7e4862d384e14c81a084d7a211cf165d62cf902415a3c98a69858eded64c606bd4565f6e0c43fab7c078ba81d0ec5217 SHA512 9c1985a02b2718315d825ed29c06cbf78050e693893a9a7530a774031cbe9e6a27ee1dc91878950a1fbcaf7ea685faeb799d1e5b218b9ce25718783409f66130
-EBUILD easytags-3.11.ebuild 1018 BLAKE2B d212a9b22864eb361299c7b0303409165dc12fb1d67067d6199f57c071d5cf8ff608d9273da3cb5317bda3d691c88ba2102bb90cebf1e8d5c5b4170ab830fdde SHA512 d4de90b1b1da0f94d5254b7917fa3c0df2b47da5c02b7f285a1e5cdfe8974e3029c45f41ea680c9e7990161914a525a2fad1774c8572586a0d1d3b0cfa0d622c
+EBUILD easytags-3.11.ebuild 996 BLAKE2B c3211f023786914dc5d9c9f76cff7295cc8c3ead593438d74cb31565aee0f5c0a7057a6d2b3581d63a1bbcc2d2e5a70add77b2e84e3e78d7b9cab5478b3942f9 SHA512 c351e922c7d4656a1d92e2aaed798b125b40bee89a7e4d758ba0ea197a204b4905d5d8f017dcf5d781ee865350c68fddc2814a856ef3f16abf404486595274a8
 MISC metadata.xml 342 BLAKE2B 5e7e191544a04bc4ae28e482deef1c44c8ee11f6afe01d9ed6b138364f771411e341b5827e92bdfeae1edffdc166979c72a53034886530b0cdb55e34d9c2ce6e SHA512 0f4fbbedc023ccccc74ef8e020c3a90a0ccb0184164a52dd733699c5d4bf729d09478ea87fda093197679f7b44b3c1b64d3c64845d91d3fb92f9e3a1eab8fc78
diff --git a/app-vim/easytags/easytags-3.11.ebuild b/app-vim/easytags/easytags-3.11.ebuild
index 79b37e481e5a..3b3fa9986ce5 100644
--- a/app-vim/easytags/easytags-3.11.ebuild
+++ b/app-vim/easytags/easytags-3.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -23,12 +23,10 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 S="${WORKDIR}/vim-${P}"
 
-PATCHES=(
-    "${FILESDIR}/${P}-fix-ctags-detection.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-fix-ctags-detection.patch" )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 	# remove unnecessary files
 	rm addon-info.json INSTALL.md README.md || die
 }
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index 411fda1a6f69..715de68da124 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506-r1.ebuild 595 BLAKE2B be74b2bf61c9eddf023252fed088ccfc508ddd5d02fa868973c1f173dfae45cdebbfe28a660e6abef79b527c9a7fac3f2cd5aa209a0a9e74dc7b0fea21e94316 SHA512 9b5c3fedce9d70e1068332aeecf625666952614e0d352a3e30a3681875f4413efe5b3e8e9a640d3b59ee1a704ef3de43cf8f8d0de12508ffbf6a233e55a0d5bf
+EBUILD eselect-syntax-20070506-r1.ebuild 594 BLAKE2B e4a83fad8a9259b14a24a8d61bb32728ec824112a44d2507207df91dddb2b5b93a54c6d5f163a997a044a582f1ddebfaa84fadd38b53fdee08b7cf6208db45fa SHA512 6aec1fdaee59ab43af34480dfd1d06def05ca4f94c3ced5650a033d272881f078097b6a98c6b7264ddc85670586a7ef537529a92882b93fbf67ddf77ca91688c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index 48044e5ebb7f..3201ac27935e 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND="!<app-vim/gentoo-syntax-20070506"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index f6a5a25eec07..87fec053d7d8 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-syntax-20181023.tar.bz2 18299 BLAKE2B ea037425ab00b05e4a52f943817fb264492793c842b6c9250450ab715fafebc55d0b5b95ff49945f62258f2dc70f357eeef3a5d908592c995cdc6e940f2f15af SHA512 a6bd592dd46ad80a4126321826dbbc4c130624027e7e71f0ea87fb164963e980e3ab3e1db1e87ee0ddad602f2ea2e9e7d955a0016c00eb8aef4c01c29057b737
 DIST gentoo-syntax-20190609.tar.bz2 18401 BLAKE2B db738540fc85d8edd0269ade33e174db08b9231237f1138da9a3f6ecff7c188a041b312975629be652a5384d0c914ad8d7a3ac5ef14670e4bc0859fbdf3dcbc7 SHA512 70fbf6e37eee2e5b007eb59b76492f41046884a8310a6074ca5fbab666ec74d46ab3e57bbf2ae784db2e17bfd1c4801b18b71cf37f746e02ff640de1f6821ec7
 EBUILD gentoo-syntax-20181023.ebuild 1289 BLAKE2B eb217dfaed0680a9dd2e4c6727ee4f07255b04187887f5cff6eada0b56a77ba290173db5394212fe6700750bf9dc73d68170be347f2590723b8c381d2e0e42c9 SHA512 0992ed4df494b14567d259b65e6d15978e3f92f29d54f72c7f72920bbdb2d8fa796d4bfd659b5653c522998eb7f4073a688da84aa1637fa2f6409107f8a880f1
-EBUILD gentoo-syntax-20190609.ebuild 1302 BLAKE2B f38ff2cc4a3f1f7721aaa7fa0dc52cd3dab579f42cccd1e21251d06f4c2791d8e96e3ac5398e1a0bff9ba0880aab238728157850ed9c2f7e535dafe88668d060 SHA512 e4314a6092df220f6fdac1961444eaef82f46f318ffc6f3b81d447934c692ea9a741fc09356218590f20e0fb1992ba3099ee9285c2a656b99a6718b70cb6b94d
+EBUILD gentoo-syntax-20190609.ebuild 1289 BLAKE2B eb217dfaed0680a9dd2e4c6727ee4f07255b04187887f5cff6eada0b56a77ba290173db5394212fe6700750bf9dc73d68170be347f2590723b8c381d2e0e42c9 SHA512 0992ed4df494b14567d259b65e6d15978e3f92f29d54f72c7f72920bbdb2d8fa796d4bfd659b5653c522998eb7f4073a688da84aa1637fa2f6409107f8a880f1
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
-MISC metadata.xml 560 BLAKE2B 21f954af20949469ae0f30a81743d9bdd1114b64b51b640d0da2d294897a885878a13bb1d408c69cd9e1afe936fd02c1ae7170e48a2f5d2280afe525266e448a SHA512 89d979077e4171aece29bd44f3d6ab6a84261dfa8eaa655b5b5d77dc20c5e2ea7cd361002e0f4d8212793449bd86da03e2d2e59bc6d23a158dceca1d60d416fe
+MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild
index c134f1d2e57d..f1853ed776bb 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20190609.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gentoo-syntax/metadata.xml b/app-vim/gentoo-syntax/metadata.xml
index 9390fa132f30..2bbe39245f1d 100644
--- a/app-vim/gentoo-syntax/metadata.xml
+++ b/app-vim/gentoo-syntax/metadata.xml
@@ -9,6 +9,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="ignore-glep31">Remove GLEP 31 (UTF-8 file encodings) settings</flag>
   </use>
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
index b2727ca41099..24c4eda9a5a6 100644
--- a/app-vim/gtk-syntax/Manifest
+++ b/app-vim/gtk-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
-EBUILD gtk-syntax-20130716.ebuild 462 BLAKE2B 81100fd21d3f401a588fcd717938b511729e29c78618949d73f9310d994e60a6c8c9ef39f51c3789478b19e953ed9687d7cbdf748b71c7e0bdab12429b2846ef SHA512 7b11261605b5afa7320cf169993dbc8cf71db21e409183ab1937fd79a0b692c917fd8cb2e0fab1b6d9b1a6771eeec5e1025bafe7e7ba5ded3dc8f77d367cbb22
+EBUILD gtk-syntax-20130716.ebuild 461 BLAKE2B 2b430ba58025a81bf77b35bdc81e48d32b408bed9a4aea30eb6256154a06ef4b5af5afc0a68e2ee0f9b5804f88c081d2e2a6290ab3f116b85d30b82d202a43b1 SHA512 de981dae8d0756100dff9ee794e5a6fc6dc0efc65d915d8bece70bba33f5b509a2c959268418713118f2f50afcb0323e9e6d5a0fee19c6f5acebb3405427d803
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index 16c851a4f71b..b016461d42f4 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 0155e577d450..7aaf0d917deb 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,3 +1,3 @@
 DIST jedi-0.8_p20171015.zip 43567 BLAKE2B 6065e2df567159054d99ec502ddb8ec8103e0892c9f78f6bbc2e72cad6cb3fe37d86882a72135f238fd47a747e03275aa82edee9d954459194940e8a69e1a775 SHA512 d69fa77ada22b0c75b7ec4ad1765035454312707ffb0f8a0bb0de4928e5fd21b08e39ab28b3f0ff9b37c8eb5389bc44c507fa2a08c0322510a57a91d7de028e6
-EBUILD jedi-0.8_p20171015.ebuild 817 BLAKE2B fdf08f34abca4ef21713178f6412ad9f1df29a940def04cb343737863a6b63aa6b513dfba62cc14e5d20c4eb0a35ef1f31226474cac2f51e0fe2185f52bc88ad SHA512 b9d5c19b1484a3e3e6aa5046db44f036ff85b5c12b817265b0dfbc85f79c45bfc4ddc028eb58db04ba0288891a83f9f73dd11e802f4439ebe3874fa48b742019
+EBUILD jedi-0.8_p20171015-r1.ebuild 869 BLAKE2B 7db54cd86224e86c57160e7b901a2bb46c3131578f5174fb89ed334d9a3e839b90b655f57c30a8c90763a219e18704bc25714c9e81254f92f525d38daf2b4fd3 SHA512 7547ca7fe88bf2aca31b9b3cb7ba22e7aee389d90825f7c4467e2ad225f91e7268dd547a7724157cc1e128d6ebec73d8a165ee654aee4898e5ac1248ae7d280f
 MISC metadata.xml 740 BLAKE2B 82dbee0d839faa814f29236625da3bed8eaf6abf8e286c15800ae43758a017394e0b714896b721104213546554f56597a68556dec22038a730423df9a215963b SHA512 145652296b05261952034b26cf36a6fdabee22cdccf4b85914c383e1fde270ca66fcc0b5cae43294907b0730005eb3ce87feb39b716f89740277a9a133229142
diff --git a/app-vim/jedi/jedi-0.8_p20171015.ebuild b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
index b536cedbf3ee..654cb4c957eb 100644
--- a/app-vim/jedi/jedi-0.8_p20171015.ebuild
+++ b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
@@ -16,8 +16,10 @@ SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${COMMIT}.zip -> ${P}.z
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND="dev-python/jedi[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/jedi[${PYTHON_USEDEP}]"
 DEPEND="app-editors/vim[python]"
 
 S="${WORKDIR}/jedi-vim-${COMMIT}"
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index 73ceef8c8418..45addccd44bc 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
-EBUILD ntp-syntax-20031001-r1.ebuild 447 BLAKE2B e9c177df0ebc7fc8e2db68279806c17b6dbaa0faa8b7fce94e55477b520ed1b293bc65f018e5977bf4c962839f4346ae25f8b89b5b028fe03ff81289df9a5b37 SHA512 f921ee26611e776a3abfbf986a67ca80ec99ef2c333197b7ad341b68f4a52c1076683a565c2aee0f75c621fac823f047783e4506c0281c9bf4022ee95c395f96
+EBUILD ntp-syntax-20031001-r1.ebuild 450 BLAKE2B 69319f939bd4d2567af71c11fec0047efc757d73ed075f919f2012920b3bb50d6d92c4de219fabdca201d73ffde60da401309a2684cede5c1b32ae0e4828ebc8 SHA512 992c5dcbb43d6f3274d41fca6124e6796018eff863864819bec5a944958dad6c8bd11e7e18a83a1da87e19e62fa993382e497fd51a1b2e333f44034b72491a50
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index 3f0a9615a1f8..89779d1126d1 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm 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 ntp.conf files."
diff --git a/app-vim/supertab/Manifest b/app-vim/supertab/Manifest
index a1eb7de1aa13..ca34e6a2292b 100644
--- a/app-vim/supertab/Manifest
+++ b/app-vim/supertab/Manifest
@@ -1,3 +1,3 @@
 DIST supertab-2.1.tar.gz 16585 BLAKE2B 8c9adcd1e4cd27ea3c6ef33215287b3f6734ea6dba8ff1ae4852db387c26fadcad9fa9c6ee57800c662d6da815af2e7e91682bbb768b6d15ee661063af30bfa2 SHA512 6daec863968be9aaefecb3388a8626f4ebf1c76899e460463fc64a56f15f743d3eae36b03588b5450a2c49b63ecdec8faf3476eda1a07cc48caf731eff77a592
-EBUILD supertab-2.1.ebuild 507 BLAKE2B f9ffa97068960076ac7a36898cea6f2c88dc29d2a1e9333a1137b1f22edaee6af9486b696a6dd41ecd9852a51c1574eb89f9565182e095de797b116c11ccbebb SHA512 15d1e6f033c7a36c14a99390b28ef9f52cd2555e9293c7e9a90f16565118ce008021fb084d66244453e211b2db5e403ea3884e5707dbebd32f71a4c5e8c1aedb
+EBUILD supertab-2.1.ebuild 511 BLAKE2B 5abe6de5ddd1e3cf60e0090b6f4b61d0a3f5e6e1d37ee993a6434498e8b5c8734861c00b101307d7dd57e07a8be586515c83d890c286adedaff003332de39551 SHA512 81eb36c1376c7c94f9f1c955952b48149d6dbdde6aef8a13b3dc4db9221fee1754362a0fdd0f844c07827b60e730eda43f6c32c7b9eb3d44469bae57a4ad9de8
 MISC metadata.xml 341 BLAKE2B 33e39fad500b2aaad60543debd41b6d80d713c6ec168ee2e9eb7edb47f4e3d2c621a5bc2f32b24c27d549d6daeb3213c2a2ce2e81f1e8ba492e789da22d11036 SHA512 e1c44cd31882c2aeaee01a4112c8ba3c6d57bfba3d1b30ee0d1f9726569d4249528b2ea1c2d7b5beeddca28dbf443e1b9bc788381510a4ff8ce56b2788d17425
diff --git a/app-vim/supertab/supertab-2.1.ebuild b/app-vim/supertab/supertab-2.1.ebuild
index 6e48c8901b53..6bdcfcdcfece 100644
--- a/app-vim/supertab/supertab-2.1.ebuild
+++ b/app-vim/supertab/supertab-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: enhanced Tab key functionality"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/"
 SRC_URI="https://github.com/ervandew/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="amd64 ~mips ppc x86"
+KEYWORDS="amd64 ~mips ppc ~ppc64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
index fba209b3cfc5..39e640ade629 100644
--- a/app-vim/tt2-syntax/Manifest
+++ b/app-vim/tt2-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
-EBUILD tt2-syntax-1.13-r1.ebuild 445 BLAKE2B 89c1e67ecd039afac311e70d95959334ce1a26a6518009ac7ec6fda0213e9adeb47a6c60790f1c78ef41430c7ca53fc54c48f663e3de7097426ce6fad2aa6ce0 SHA512 e996ab70a54ed861feb1f2ed03ed43344a6f7ab1077be81971725f1b07ba9b831fd5def7f5284cdc2e2bc1b355bbef09e1ac9809b9a267e277e3d11753f4953d
+EBUILD tt2-syntax-1.13-r1.ebuild 448 BLAKE2B 32e1ac14ef797b4a77d61fc931f4ea607741c368dbbab99f2b18c5ae6bba259dc809a30f96534aa7783dd74114fb88f20dd98c565a3fbc05a330ab5a3bb038a2 SHA512 f9f4b031a7ca398f93d0cd9ad8a66b2787e8d5da8eae9e9a1a1c0a761a3187d114cd223cb0744340d553bdd8fd6540bec500f7672f0d09f7656132e7045148a6
 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 ea3b7184e7e5..3671775ee279 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 arm64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 4dc3012f27d7..79f56ab2d7e3 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,7 +1,7 @@
 AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
 DIST vimoutliner-0.3.6.zip 249053 BLAKE2B 329fbf73423291598a104881299200153c6d98cf75f3884c690879dc3460c4190c09eefec55415589f16a426ee76911a8ee7761a158d76b9e84360f5fadb83eb SHA512 20d348ff1b1b9572956fdc56b75e742b25b7deac2637fa6972a1e451edc1f679d8255847a291b84c80866a9ad8a37421524b8eb33565a1bb32ff2b75d0b68dde
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
-EBUILD vimoutliner-0.3.6-r1.ebuild 1264 BLAKE2B a48fc8a75d18829d1d9e35c800ead9fa1075819e55a28078b2fbe4149ac7f1a9d532ded7929a72f177c7f22d912825f55a89c571eb8b493c4479027746da5421 SHA512 20984869fcfa1947334619f9dee9feede43e60c883d853778c4afbf6024c213734b0f5cbe86df453388a3f40e863a71c9f665150749e37fed1476d6d0a4ae037
-EBUILD vimoutliner-0.3.6.ebuild 694 BLAKE2B 7e0c7ddda16ac846fe5794192e6d24eafa25b8910b5fe259568c8ff7dc92117d8711fa61364abf0be8008e7c0a42e2726eb70a26e5d38eff8e09bff6de35cd90 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4
-EBUILD vimoutliner-0.4.0_p20180301.ebuild 1056 BLAKE2B fe31bb24b29306a003e36030daeab78f0c1ae4501145f5a00a70b9d12bfc63601638dbc293ed2380aadbd40836244dfb2202e7738fc3512cb1bacfe532860934 SHA512 b753d9c8b73d9a1ffe21780b9d80bd76a222b1baa4c3a795f7e5ae97efa2e0a114faece37981c41ad2a842b0ec73b6fe6f55f1d015068467d6421e467be982ce
+EBUILD vimoutliner-0.3.6-r1.ebuild 694 BLAKE2B 7e0c7ddda16ac846fe5794192e6d24eafa25b8910b5fe259568c8ff7dc92117d8711fa61364abf0be8008e7c0a42e2726eb70a26e5d38eff8e09bff6de35cd90 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4
+EBUILD vimoutliner-0.3.6-r2.ebuild 1298 BLAKE2B f1e86d39b5de8608b2094f43a5ab1cb07186203e1ca2e53614ec80472397b868ecc528088cab6f8a9dee8f10f317a4212980dde1d0c1a81a2d99c681f976971c SHA512 9f3bfe6dba7bbcadf8e0dfcd86a49042f8afe7548afd2b0fe33b14fccb0ded4fb65fa25868434ba62bde9bf3f7f295755f9ed53518901c7705157b02f9bd96d7
+EBUILD vimoutliner-0.4.0_p20180301-r1.ebuild 1094 BLAKE2B 06f2432288653826cb839fb0043701444355c2dd1161a5baa0d7f99eae6d4a987ca99c09858c810af284472dcf9a80971d6681cbdc940137d19410ef022515b7 SHA512 56413d64eda82ed2cc01813b6dab78769e28498f9013e483948461c5e7da111fba1e3b10374f188db8712d5009cb5861942b0db3450d9f553c0d9006df713520
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
index d7c15479021b..36ebfb95a0a7 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -1,31 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit vim-plugin python-single-r1
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
 
-PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
-
-RDEPEND="dev-python/autopep8"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
@@ -33,16 +21,3 @@ src_prepare() {
 	rm -v install.sh || die
 	find "${S}" -type f -exec chmod a+r {} \; || die
 }
-
-src_compile() {
-	local pyscript _pyscript
-	for pyscript in $(find "${S}" -type f -name \*.py); do
-		_pyscript=$(basename "${pyscript}")
-		einfo "Processing ${_pyscript}"
-		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
-		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
-		autopep8 -i "${pyscript}" || die
-		python_fix_shebang -q "${pyscript}" || die
-		eend $?
-	done
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
new file mode 100644
index 000000000000..b9d58e98e883
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/autopep8[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+	rm -v install.sh || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+	local pyscript _pyscript
+	for pyscript in $(find "${S}" -type f -name \*.py); do
+		_pyscript=$(basename "${pyscript}")
+		einfo "Processing ${_pyscript}"
+		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
+		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
+		autopep8 -i "${pyscript}" || die
+		python_fix_shebang -q "${pyscript}" || die
+		eend $?
+	done
+}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
deleted file mode 100644
index 36ebfb95a0a7..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
-	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
-	rm -v install.sh || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
index 693542279762..91f8bce967ca 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,13 +22,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
 
-RDEPEND="dev-python/autopep8"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/autopep8[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
 
-	sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py
+	sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py || die
 	find "${S}" -type f -exec chmod a+r {} \; || die
 }