gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /app-editors
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
85 files changed, 1204 insertions, 580 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 5c65ca008664..a7e963aa582f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
deleted file mode 100644
index 4fefc8673b46..000000000000
--- a/app-editors/adie/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
-EBUILD adie-1.7.67.ebuild 352 BLAKE2B 1eea30ede78eaaf047ba50591b14086fd9c9fdd45baafea58b5c7c18dd0d56d90861ef9134dd060756d6add2b043236e74dca06122c1c0f980246109bbbee795 SHA512 aa406e5be5e23e01674736f6278cbc681e60d19f9af5b257155736b0f6a731fd74a5e1a897b227a1a68d966249b1b954ce38e5fc0cb9cd7cddf1bf12cd500955
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-editors/adie/adie-1.7.67.ebuild b/app-editors/adie/adie-1.7.67.ebuild
deleted file mode 100644
index 0e290d6b8df5..000000000000
--- a/app-editors/adie/adie-1.7.67.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fox
-
-DESCRIPTION="Text editor based on the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="~x11-libs/fox-${PV}
-	x11-libs/libICE
-	x11-libs/libSM"
-RDEPEND="${DEPEND}"
diff --git a/app-editors/adie/metadata.xml b/app-editors/adie/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-editors/adie/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-editors/beaver/Manifest b/app-editors/beaver/Manifest
index 4433e4cf676e..fdf3dd5830ee 100644
--- a/app-editors/beaver/Manifest
+++ b/app-editors/beaver/Manifest
@@ -1,4 +1,4 @@
 AUX beaver-0.4.1-desktop-file-validate.patch 545 BLAKE2B 33bb8b9c5b90d2257b7e083b832f0a9cfc82b512b51da8e1cc56eee657793c4ed248f97606e6cb4679d398e35d3b5bcea6be9a83230061a5cc7f877c44772769 SHA512 ec33d4a2132bd03859426e7bbaa7a178d808ccd949387a85d18bc0fb01cb907cdb61ce28f52405f71f1b397b6221fa20c00f415e4979db51256511621ffb8475
 DIST beaver-0.4.1.tar.bz2 436321 BLAKE2B 034829d795b5a0502a2df1e675e01d34cc62efbc482959e2d3e0ecf9eeddf1d8450e92ee9c2f98af3e2778ad4c14fac926291ca935ec79822f8f552a9579363e SHA512 3000bed3aa2a67d6c38a68a7782a9d5423bcec0b8420272b0f0dade604c094a7b52058b43222af38d56313f0aa27998028c984f69340bf28eeaa8b8a93548a1e
-EBUILD beaver-0.4.1-r1.ebuild 981 BLAKE2B 95ca31b255da1262a9e5aae4291afed1e65ce1e11ae68059ad7dd892c33216e323867bb3ce6343326ae1ce6ea6b7964e1e291e4be081bcd9f8e4628bb83c228f SHA512 72ad9c5278f7a339bebfb7a3d76526b59328ff5aa06f8151474d1aaaa834d995988c19c7fffb3a4d05c34ac081378611d329dc07fe05c600b72e7a99d595b992
+EBUILD beaver-0.4.1-r1.ebuild 990 BLAKE2B 47dfecd8802fd5653665df362c5b7ba8b5af7a9b0af7d244c8eb7a19951b34f99463bb06d765d94c0a65bd52f061716e2a5f43b3983ed1f603219f9ae5f170cd SHA512 7e7b8102bde6602e533d99fdb53df06ef01ce0d3a9a51170c0273bd4fe814a73f8a173e8d41cfc1402b54e39829eb776799169800413762c78fee8d2dceea3e3
 MISC metadata.xml 359 BLAKE2B d0b8402f3a7a6f77f7c79733394a2bf595320b8f51a65432fd545975b72e9d94ecd5845b8f9f446b3519f6ee2d44c111dadfe6d86cd78bee0f1ba4c3bd7da31c SHA512 7fec5e4168c877d16d8d744244e0aa3cfef4d6d219dc3485caeb21802de8aab2a00188572393b885ef7f8f7ed72b3bad3f5622ecf057347ce6969fb1d3fc5759
diff --git a/app-editors/beaver/beaver-0.4.1-r1.ebuild b/app-editors/beaver/beaver-0.4.1-r1.ebuild
index 57efb98a47a3..b10106d1207b 100644
--- a/app-editors/beaver/beaver-0.4.1-r1.ebuild
+++ b/app-editors/beaver/beaver-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ PATCHES=(
 )
 
 src_configure() {
-	append-cflags -fgnu89-inline
+	append-cflags -fgnu89-inline -fcommon
 
 	econf \
 		$(use_enable doc doxygen-doc) \
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index dcddd6818ae7..b026ba0133fc 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,4 +1,4 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 1cfc9bfc9640d5110c7cacbe60f2f676f6a4b5f4333a6dd8270abfc01475b334c998ae4df9c0cf58a99198bb2af20f9b4718f084a8a63430799860abd90c103c SHA512 60eb5caaf1c8b98c4cd6024546bf235c18b84deeebff3849422546c30fe0dfc415e45d91e29df55d087ca924bea85f27bcede3a49167e3bdee039b89afaf8aa0
+EBUILD bluefish-2.2.10.ebuild 2768 BLAKE2B 95863e4dde17100659e6c0e764397d8c8ee2e70562b6e2c3f63b18bb4cad315f8a5730a6d5b96fb4341a071b1a7cba9e12343d1f655744c9aa11d31cd98ba737 SHA512 d2ca13f91be32151a32bf0e2283bda4559584f7faa78551d4e121a0f0d185cfbc2c765c29e5e3daf89bbea9f7b6450a82a92c4b3df98d7b2e7ca519562f7247c
 MISC metadata.xml 462 BLAKE2B 71ac5de5f71ae32c79122cfefd6179047db2fa0cf758a5807b20985133364e798d440707abab3b0a5893227ad9d005dafb474b479e3d798343d9e92f7799d6bd SHA512 f861be3bcb1034ee6154f5b1327406ddc45c17bec3d328d8d1489a9747160bfd349aabf86c3a90ed94c1662494a25014a0ec9730a7f9789014a10754b777ad98
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
index 9443e11890ad..b68e95c70ffe 100644
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 		gucharmap? ( gnome-extra/gucharmap:2.90 )
 	)
 	python? ( ${PYTHON_DEPS} )
-	spell? ( <app-text/enchant-2 )"
+	spell? ( >=app-text/enchant-1.4:0 )"
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-libs/glib-2.24:2
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index e7fcafb19542..96dec42f8368 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -2,5 +2,5 @@ AUX dav-0.8.5-asneeded.patch 318 BLAKE2B 1556f43aa48931c2687defc85d0b23b7a6519ff
 AUX dav-0.8.5-davrc-buffer-overflow.patch 246 BLAKE2B ef18f5ad8107e981c60f3bd3191cea342fb466cc9232294a88a29f6c2db37ce6ed846a66bf78722291540e0f813d7ce6ae939979352d370931fb5a43e12d5913 SHA512 36c8e336adc3cdb053af61ea53bf497073d197e67957f2ad011f7199c1518deb08f5fcfffa4ff14c49139f6bab01303332c8c15e5944245696dbc62dceff116c
 AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
 DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
-EBUILD dav-0.8.5-r2.ebuild 901 BLAKE2B 11a2fec2f91a3514e65764d674f6d3b29dc46df5a7eeab3b0b489a127b56e8ce889fe45ab0b9fbb0d92249176494795fefd08e27299c37976e250e050d20db85 SHA512 ce402e8d283cbf5102cb79a75e94b26d8023a8fb8db1f94de4dc9bcc7664a79b19f64924ed632cfc9322d1417a62e6a7cf6d93921d1e5e6da3fbfff893fc4e4a
+EBUILD dav-0.8.5-r2.ebuild 902 BLAKE2B 5f259aac8878909bae249330a3bf626f20c39121be038092c75e74edf1958afc3cded2af7406eb0e760b9d2765d66b7b87e047cba9dca5cf63fab31b5fc89999 SHA512 304c5142f89bb51745f9ef0d3f807e6f8df39f2f71fba2622810a5003fa00c282bcea2bd11144255ebaa934f7e548168b9254c11e5496727469723df3dc9b884
 MISC metadata.xml 245 BLAKE2B 0994c9d498383d2c458a3135ca07a8637acc6a2a89547ca1e245bf6354e61cc761e17d1eb33beaaab8c0c30997bbfc5772565212d7f58faf6cbfdaaf082025e8 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
index ce24e3ed7521..af92603ac6cf 100644
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ b/app-editors/dav/dav-0.8.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3e1e31923eff..8fde92b26704 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,10 +11,10 @@ DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
 EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
-EBUILD emacs-23.4-r18.ebuild 10982 BLAKE2B 7a4f902b59fb956e75716926c3202ab34a5fc26527f9e2557192830c0fbc33684ace7940d508443f5fba9933a25b5837a16ec20c7170cd3dccf2faf743c15488 SHA512 59b7e5369c6de4056e361066b23e2d26d256e6426d14fe97d60731fbdd9dd05f55f1de5d262a3111d1ecc9e1e862d45440e4729056f5b93f13a9750364d7ae9f
-EBUILD emacs-24.5-r7.ebuild 10792 BLAKE2B 3625210c0d2ed6fb758f93473bf938026c1d8303348ceed1a71c8727567ef7b94cd1e422a8ba922901453b4a7a0dd0fd5a944130b406f0762088dc7077253728 SHA512 ace3817542036aa0dbf1ee187649062369a205a5d42d5e2b56c7bd3f39bc267fb0f155d56137bcd52929be585f2cdccf0b1563ed736959deaf64ed370d47a751
-EBUILD emacs-25.3-r6.ebuild 11143 BLAKE2B 716342f762363507d9e5320b8169296f7f7137591b08cb1a1e2769222892f5d5ef7c0fc5a48d453fbf9fcec24bce632f75c2fb1be244fb7b10025ced7b3d8417 SHA512 2cdef6bb8a44080903b7208ce43ca403880f14c2c6aa9c542a6746758c8bdf2d9c3147ff2a670c401d4c2c23b89843032bae2ad4cf6031880587505d2afc449b
-EBUILD emacs-26.2.ebuild 11647 BLAKE2B 8d2d7ab25bfac8075d5e6fff70df9bce0314fca8194fe88e986a68de10451f0129a416a33c84adde2c99f6bb32bb88900298a86e4ce760ab4524b8049eb8b2c7 SHA512 d69edad0066d6c7db51a1f81a7643404282a832c28ec175e9704d1cfbaddff55598ef22536c702e0c2cdfc10e1c8ec9ca840f6ac33f5c4b4fbee426bd0ff4280
+EBUILD emacs-23.4-r18.ebuild 10983 BLAKE2B 6ea7fba597d5d6e530870d380cc6be3ab63ec318078e1acfaab5c5ee1dcbc7fd0a67a9c7e5ad650b544f9120727531ccfd6e8d98b82d5517004e3dd8e60e3ea1 SHA512 c82a4ae52c227ac54c099cd8a4ade3eb609933e08f1033955cc64e37528c58acd7deaf0bc33b75f61408d69ec36df15ad293f7a99ce7ce52f27ca43a598473f2
+EBUILD emacs-24.5-r7.ebuild 10793 BLAKE2B 932c2dda8bdeb1d25cd8386cefe0f9b6f2629b10740b3eef9a6d275d217069b331e698379043a83ea6db5cabf10d255e81b0cb335f98add6392f4f0d66d40763 SHA512 391248ec564e56af1f1faaa47ec4b3959185ea6beff218018070086e4c23d465b0e2b9a2e5dc68693d21cb1c1bb3e303faf93c1f64084a137d37e1af3f555284
+EBUILD emacs-25.3-r6.ebuild 11144 BLAKE2B efed82d0494839b10972829cf790664daed5b1ee705bfaa6bd2539e0c5b7b37ecda54d6cefb61446b1c0ce2ee39ccf6a782fc185f7b62cfc7c3afbb426f8aacc SHA512 6ac3ce3567cd670082574b4ae52ed18d25131643a4706ec7b92926301de47410e1cdab0dd3ad8347c602401bcbab2914e0165ca613aa4d0c3e7d70a9938b41ee
+EBUILD emacs-26.2.ebuild 11648 BLAKE2B 8de319f53857df25789f50e02eb5d3dadb79466aca23cae4f2a03fe19987b2815d0cff3470f1fc5488f92dcf6c824159d9b03f1da50b29d7a96e487710393323 SHA512 33296631ea5df408ec71b6fff0c93858762d3ffc011cd9661240b6c4c650bb25066f9049410a8b4f6c37125f855c814ad02ea5de0f3c0d0b510dc5d43f7644e7
 EBUILD emacs-26.3-r1.ebuild 11932 BLAKE2B 1dc6f4b91a30a54b3898d29b5387aaf7bed43616f7c0139ad7d909c411dd22d4d0851dc46a346873dc869730765941f3630a022197a6af6e6c43401ef0cdb9a1 SHA512 4a77fe9f33e113bd0544ec46a0872efc87528f705f48eb392657278559289bd3c34b145933959e4fa1692b915e88fc20a421b4b1063e13a4d127d863c26043cd
 EBUILD emacs-27.0.50_pre20191223.ebuild 12944 BLAKE2B a91aa673242357b6906b6e33daac9cfdf52633eb9e5af2c574e8e084cdeacb82eeebacd460c5087573412b87be701a110d44030a4014939a2a1fb40966ca841b SHA512 f5594a35b2fdcdc498bfe087be6bcf97549a989e66224a355400017279e56b2086314a6ee73ca9815ec5ebe29da74daf41210dfdfe2a8c1651c51c9e695e4740
 EBUILD emacs-27.0.9999-r1.ebuild 12946 BLAKE2B 8eb50306106f7e86e3de771a8e12f777d016f12a470fea4ed350f0dde137505470ace0daae5fa2991fa2bc7c9fbb0824de58f778a8c46dfa7b8fa3393f5e5a9c SHA512 3f1923925785f637fcfe2257592a368d97d76fa6f9e4a24d1e077432b9f4cebf42081c611eeef0bcc4daaed317de7cd4aad669f0158880957ccd8721b6569251
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 98c12e08da18..417a43038b3f 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index afb4238b747b..dacb99036a69 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 8f79717eeb5a..cbac44b0930c 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 488c95652d9d..4c3979f2bbc2 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index b6491f42048f..ccc76f082943 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,4 +1,3 @@
 DIST gedit-plugins-3.32.2.tar.xz 1474264 BLAKE2B feb116ec201b9eb9630570818cc288f0044ecfc174fc84c7d812aa6dfba5cc3748b4e2351ffa2be0d3a593a58b2318c4296b54b84476fc887195ee27f27bb597 SHA512 2767bc766daba5e1c81ef5a00bc3589a301c02e0286a6622cf11a03b5b391ecbcf9456187563dad4f2916610ee9ddca4414ff4beb639820954385ee3f8091d2a
-EBUILD gedit-plugins-3.32.2-r1.ebuild 2383 BLAKE2B dfa536d051b59b6de2a9c72ec90dc67b11c53de38df9992db4dfe640050db6913f2f5d027dd5a2b0989cdff14d4a5e2a7c54fae2a326bab55951a56fc6526f81 SHA512 b34a616b814baa236e037070b6c4808269febb644f18c02ad02ad1b0773f858b906c20b4f1e1408d45be5272e62600de93414e27c7118f818dccb38ac5279248
-EBUILD gedit-plugins-3.32.2.ebuild 2314 BLAKE2B fffd3532b8f714efda95340b4ea0bdbe7ff3bab8e9ffaadc2ed07652cb1a1b3d5cf14de32c8a737b278e4ee04853e1b0ec0da60b944aa4abdee23f171493611c SHA512 c8dbe0866d79a153a9ccf89fdc33cc09e16ee19fef18dfd219f4b41a1d2bd2b2a7ea727af6053ba3b611029a2c832d3bdad270edd8d4d430d72b1d9c0876c1a6
+EBUILD gedit-plugins-3.32.2-r1.ebuild 2381 BLAKE2B 1072087ebff2c06b5d27d5a3d60ed8565888626112e1670e58b800a5766733e1c6e946b80e08ed4e1a588be6898a6b8a5da2715d8759e7e1537830b90e23bcbe SHA512 7afac3fb1bd24594b7b8059561c5bd40ddcb9f5620030f6189a3014f62491584958ad52bd6175d74afb609bd3960d4596c8d2bf2e9f0a41f5c2575b1e38c8c39
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
index ba7394761d39..163ff8c20947 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 IUSE_plugins="charmap git terminal vala"
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
deleted file mode 100644
index 2c8ba88d1e57..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.32.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit eutils gnome2 multilib python-single-r1 vala
-
-DESCRIPTION="Official plugins for gedit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE_plugins="charmap git terminal vala"
-IUSE="+python ${IUSE_plugins}"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=app-editors/gedit-3.16
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libpeas-1.7.0[gtk]
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-	python? (
-		${PYTHON_DEPS}
-		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-3.14:3.0[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6 )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-	vala? ( $(vala_depend) )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# FIXME: crazy !!!
-	if use python; then
-		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
-		find "${ED}"/usr/share/gedit -type d -empty -delete || die
-	fi
-
-	# FIXME: upstream made this automagic...
-	clean_plugin charmap
-	clean_plugin git
-	clean_plugin terminal
-}
-
-clean_plugin() {
-	if use !${1} ; then
-		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
-		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
-	fi
-}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 2b72cd735046..29bb005d9e69 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,5 @@
+AUX 3.32.2-fix-parallel-build.patch 5216 BLAKE2B ad6a307be458d828c19bb6981717479a7a9ff3d5405b0abd2b1235a06b78935932104f10b10993fb6672b0c749f525f3192aedadaafb90edecdc663e22dcaaea SHA512 7b408f750e055b68b019301dbd771b309068be6dd599b830679fae89ebf3f15acc95b798e30876664abfc14bfe535eaf8dc4ce6f3b2bd87230a1f2018a37af29
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
-EBUILD gedit-3.32.2-r1.ebuild 2263 BLAKE2B de5b1d3ff6dbbf5fc1a875ae51f56428ca19cff45508ed0bb79e632ca89c5dc9a4d5829e32407b8032b1f27605c8b4c91e22d78be052a7eb7b7652d87d636cfa SHA512 1a5ce93aeb577f9717a1562df9e73a58849378b76640669b470b54fedbddc2273010715b8430b13e1813d0ff481aa13dcf1aa50c14c0894b3f5883bd3c7d61ab
-EBUILD gedit-3.32.2.ebuild 2148 BLAKE2B 2dd7960f9a773a67089b156d46e2b1f1a1a8f1dba9ec8614bc20755fd1111d4a15e1883cf8cb6cc552cb3dcacb62720f7798bd644f3ade5dd8154560b875df10 SHA512 d3bc48ebbee1b08dd8e8d91a67a026a3b431c692f1a0622734e64e7769e95780528e466c19ad2f7a44c43a1bf2eb6fcd5e03c5b25138a9b2d96cf253b9525843
+EBUILD gedit-3.32.2-r1.ebuild 2355 BLAKE2B 60ac30d1da1d0ab005e5105829d37ae6839b0893ff6595c7aa82c8a9aa743288fe25ce987ca37566f146f66cf561fd1d37ae9adf59247b28c80faf3896ca8f4e SHA512 da659168215870a832fe4c4f7d2000a9a0324464326cb77e6c256c4eb7008f8e3fa17f58e9e01304a21e81b3d796a4011fba2d213d6bd9af55240d249113eee3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch b/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
new file mode 100644
index 000000000000..b3a52a0cdc9c
--- /dev/null
+++ b/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
@@ -0,0 +1,49 @@
+From 79ff20c4123fb674b467f78b542f048f07516652 Mon Sep 17 00:00:00 2001
+From: Will Thompson <wjt@endlessm.com>
+Date: Wed, 17 Apr 2019 06:29:27 +0100
+Subject: [PATCH] filebrowser: fix build order for enum-types.h
+
+On Endless's package build server, building gedit on x86_64 failed as
+follows:
+
+    [  194s] [97/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_gedit-tool-merge.pl_cd41154a78cf16ac2c5a9a58261cb6418b36427a.dat
+    [  195s] [98/147] /usr/bin/msgfmt --desktop --keyword=Name --keyword=Description --template=../plugins/externaltools/externaltools.plugin.desktop.in -d /usr/src/packages/BUILD/po --output=plugins/externaltools/externaltools.plugin
+    [  195s] [99/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_glib-mkenums_ea0cb1ece8d7fa2e9a3e7c5a57f45df212823d0f.dat
+    [  195s] [100/147] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H  -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
+    [  195s] FAILED: plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o
+    [  195s] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H  -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
+    [  195s] ../plugins/filebrowser/gedit-file-browser-plugin.c:35:10: fatal error: gedit-file-browser-enum-types.h: No such file or directory
+    [  195s]  #include "gedit-file-browser-enum-types.h"
+    [  195s]           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    [  195s] compilation terminated.
+
+I couldn't reproduce this locally, perhaps because I have the wrong number
+of cores. However, exploring the build graph with:
+
+    ninja -t browse plugins/filebrowser/5f8d977@@filebrowser@sha/libfilebrowser.so.symbols
+
+showed that there was no dependency between
+gedit-file-browser-plugin.c.o and gedit-file-browser-enum-types.h.
+Adding the generated gedit-file-browser-enum-types.h to the sources for
+this shared_library() causes an (order-only) dependency to be added,
+ensuring that gedit-file-browser-enum-types.h is generated before
+gedit-file-browser-plugin.c is compiled.
+---
+ plugins/filebrowser/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
+index 708f7f1d4..94a4ab0a6 100644
+--- a/plugins/filebrowser/meson.build
++++ b/plugins/filebrowser/meson.build
+@@ -59,6 +59,7 @@ libfilebrowser_enums_c = custom_target('libfilebrowser_enums_c',
+ 
+ libfilebrowser_sources += [
+   libfilebrowser_enums_c,
++  libfilebrowser_type_enums.get(1),
+ ]
+ 
+ subdir('resources')
+-- 
+2.20.1
+
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
index 8fc28471641e..8e8bb61899a0 100644
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ b/app-editors/gedit/gedit-3.32.2-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 DEPEND="
@@ -54,7 +54,10 @@ BDEPEND="
 	>=sys-devel/gettext-0.18
 	virtual/pkgconfig
 "
-PATCHES=( "${FILESDIR}/${PV}-make-spell-optional.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PV}-make-spell-optional.patch
+	"${FILESDIR}"/${PV}-fix-parallel-build.patch # parallel build failure fix, included in 3.34
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/app-editors/gedit/gedit-3.32.2.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild
deleted file mode 100644
index f312441381b1..000000000000
--- a/app-editors/gedit/gedit-3.32.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{6,7,8} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome.org gnome2-utils meson multilib python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.44:2[dbus]
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=net-libs/libsoup-2.60:2.4
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
-	spell? ( >=app-text/gspell-0.2.5:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${PV}-make-spell-optional.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc documentation)
-		$(meson_use introspection)
-		$(meson_use python plugins)
-		$(meson_use spell)
-		$(meson_use vala vapi)
-		-Denable-gvfs-metadata=yes
-	)
-	meson_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index 277ab66f901e..61023ab62312 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-latex-3.28.1.tar.xz 1082708 BLAKE2B 3b0a341278838b37fb1a54f4f746af4fc6ccf4dd37f6b919f53523acfdcbeb6a8974217260db4d8186b8acd3ba782cbc1ddf1dce20735d70d01c88ed3c1fb90f SHA512 fe5c2456839757237d422d0f0629f11a43a8ca5b3cd86ce94b37ee26f68165f111940d5c3c47adba7be05532c413a97a867219c498abec3fd064122516e0c470
+DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0
 EBUILD gnome-latex-3.28.1.ebuild 1081 BLAKE2B 5aa3a45f7ac589c90d6be2e9ac812b74e99eca0992adcdc6b0d6e7eaa905f9c73e1258b08979ed084ad7661d0e116093e69bf047731e3b803775ca02ce6a9982 SHA512 3327ed208e9b74061ef604906248314bc5449f955e77a842703131329c7aabc3b122b21c7fa013204e205a798c9d02d42c2303207242843f192b6d61754051c7
+EBUILD gnome-latex-3.32.0.ebuild 1136 BLAKE2B 63a3cb2f605e63dc26e199e9e9c7157225fb80f58d6daa7a159754d504fa27f9becbae2508edc6f497b278a4cf7ab1535af8f1f5cb3fdf29ee4c743574e55b10 SHA512 07ee3a4fdfdb451135f54737c3984044bfff968b9a7b0993e4a1ff9e5816b871b83e579f2cfec511502591f73518fba7e6955c02999bb24d38d244a39022f00d
 MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
new file mode 100644
index 000000000000..69da54f2a141
--- /dev/null
+++ b/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+COMMON_DEPEND="
+	>=app-text/gspell-1.8:0=
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0:4
+	>=gui-libs/tepl-4.2:4
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	gnome-base/dconf
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-dconf_migration \
+		APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0
+}
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 916cad4f9264..1470f2ee1715 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,5 +1,5 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-DIST gummi-0.8.0.tar.gz 580933 BLAKE2B f0591d1acf244edb4cd2a6db109532b84dd0ec741e4575c1bdc690e0763a73ebe8e8882c328627908d9cc0c23ba50e94d1d0e5cea95e60a22d0a369cd4a1f8c1 SHA512 a4ae897a9f3f6f1dabb70a09801e83e0675934298caa022ddeb2c84f90d418cbc5b1a0e02b4b021f40daa784f145b5136b53ce70acf3e4834eea04afcb663b2b
+DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
 EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
-EBUILD gummi-0.8.0.ebuild 943 BLAKE2B 0c5e299fdccbf498337ab8d8498d6f0af2e91ef7a52e3a9988354b61f030b77d22d9eba4e214f8d2d3f6a01437e2c666abb0f851e36ef742927c7e9fc450be55 SHA512 bd3decbb0dd7e430ce5890099cb620472bf39f52a1f3248fcdada2a0c7dcfb19f8ac9bdb0979e6261abcb6345b898866b7177125e88d6f886590d472cb13017c
+EBUILD gummi-0.8.1.ebuild 943 BLAKE2B adeb4a9363684e05f03b09df0c8bd041b86d3d93473377ed4907375852f31af316a792ac9e61f8de36b985c444d79cc81d21fb002f15901bde7ee57247e13bb3 SHA512 7995ac480ab5862c5407c222a1c7c3b2de7fd17d8a6150cf2e51f3a98a2e3360df9a9e9b566c2d0ab61ee1c891da502eb42d20b17c4e41436863af96e6fe62db
 MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.8.0.ebuild b/app-editors/gummi/gummi-0.8.1.ebuild
index 1b970f9dfd15..df951917e006 100644
--- a/app-editors/gummi/gummi-0.8.0.ebuild
+++ b/app-editors/gummi/gummi-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 96dfc867e22c..46f247444fd4 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -5,9 +5,12 @@ DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
 DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
 DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
-EBUILD gvim-8.1.1486.ebuild 10480 BLAKE2B 007b09cc3a0e77ac67dbe365e97df30a3c1741947f4b221a342b9e1166dcde9fc5f4e63c88a9953180bbfe3fe22759d6ca80fbff4d662c95bda3086790fff8af SHA512 8109c52b6d01e9620530d4b7f2a4a2be7ddeb3b512bdb4ebab48ff902f31e8b9850e99ff62b5505248de438264bdc57790b8711c9c9d01c63c52cc1ed812bea7
+DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
+DIST vim-8.2.0210.tar.gz 14757725 BLAKE2B b78ed42b42d40911efb76d4317c116b1c207909ed47241f9dbe6cf6385a4a25ee8cceb2d883171dd922027fb91e9f25e4741fdcd6ebc69217e7d26eae2f88efe SHA512 118131c7c186bac36b3e4928a0021e03b4bf197e1d5651019f4fcf8d4fee89fb7e0123adaf18bebc932c5e06217904526d0625513646e34aebf6cfdee8885260
+EBUILD gvim-8.1.1486.ebuild 10481 BLAKE2B bf3ea284ca7ec187e32c1cef705867fbbb9292f8923fef15e59b85cd8e97e7d55e364b3142b6e577110171eb80e4174a4a5e9ccdfda5a4f7c6dea691cf1c1a08 SHA512 e1a91b847174c14d0a5cbb56b847a4bf0a6d406359305b49cc39847801d88dc88d95ecfab9aad5f53e3e79b293d7241c60103b56a927f1f31343935b3573ace3
 EBUILD gvim-8.1.1846.ebuild 10556 BLAKE2B 7df798e79326c4bbf64be95fcae2f3ac4668dedc949211010cc6f82c69d2e85f6ae96089c063947bf424a33e2956bcbdaf044a43bbaa8375e5f5540c1daeb434 SHA512 acb4e88bd8fa52f8fc69eb038030f3d148ec916cbcdd812411b8bb58ed7a2801bdc32a04b7af057d925113c6353aade536cc1a5a8da138a1ffd0e54227bb4837
 EBUILD gvim-8.2.0055.ebuild 10556 BLAKE2B 66fd819bf91a53ef4535df4a63c0cc85b65c33d5d5db66219d5e895bddb5c7f2eea1fb2450456d549cfac2143d82fcd5bf1c2150cc39f4b91f60416fa367f2f4 SHA512 7e7693d91affa860adb941c25dad8583abbb5720d7fb2aa44919e9850cac8ef6b711dd138fb1799029f7f918164f4ebb175e4a9d461a5adcb234121f069dd62a
 EBUILD gvim-8.2.0114.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
-EBUILD gvim-9999.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
+EBUILD gvim-8.2.0210.ebuild 10341 BLAKE2B 773ebd921b36898918496d422d66f141ef1bd4eb4a4ee7ecfa3bac66d3a6ac00ee4bd00e00bf677384c51fbcb00b1a003d50666cd95b7ced62d3f440544cdd89 SHA512 23b54753dfb84c19b024de2b6f6c34bbed88285fd0e4d24754c20739208bdf03c50c14f7c309e31094916b6cfb56ac84d0053fa83c1fffbcdba23570ee168f1c
+EBUILD gvim-9999.ebuild 10341 BLAKE2B 773ebd921b36898918496d422d66f141ef1bd4eb4a4ee7ecfa3bac66d3a6ac00ee4bd00e00bf677384c51fbcb00b1a003d50666cd95b7ced62d3f440544cdd89 SHA512 23b54753dfb84c19b024de2b6f6c34bbed88285fd0e4d24754c20739208bdf03c50c14f7c309e31094916b6cfb56ac84d0053fa83c1fffbcdba23570ee168f1c
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.1.1486.ebuild b/app-editors/gvim/gvim-8.1.1486.ebuild
index a6611c41126a..cf6219d16b38 100644
--- a/app-editors/gvim/gvim-8.1.1486.ebuild
+++ b/app-editors/gvim/gvim-8.1.1486.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.0210.ebuild b/app-editors/gvim/gvim-8.2.0210.ebuild
new file mode 100644
index 000000000000..d67c65f8ee9b
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.0210.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp dynamic)
+		$(use_with python python3-command $(type -P $(eselect python show --python3)))
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                         CARBON (not tested)
+	# -aqua gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 2bdfc5eb2348..d67c65f8ee9b 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIM_VERSION="8.2"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
@@ -199,7 +199,7 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
-		$(use_enable python python3interp)
+		$(use_enable python python3interp dynamic)
 		$(use_with python python3-command $(type -P $(eselect python show --python3)))
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index 848d389afa62..07701d5c7bb7 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -4,6 +4,6 @@ AUX hexcurse-1.60.0-Werror.patch 291 BLAKE2B ce310d08d4880d53c2eb3c17794294cc124
 AUX hexcurse-1.60.0-tinfo.patch 386 BLAKE2B e4f376cc9cf60c9163553aa9082e5c84a228f0704c575941414cde6527cb6c9b867d55cba45dbb35bdd95d79ee8d13acee3a139256d794f9f648af87581ed458 SHA512 ce0c25842a874d631d75826f6b967fe0d0f53a435e6222eed1310caa884b570c1cf131c14e0be84fc7de728e37cdaee5b950ada527fd03ddba0dacf578e4fe42
 DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174ca3cc7d29232c6d2a2f909339a0555ff459ed373e62e35b3d1d8abfbbd32a9462006b20bfa1f4f641f4eba825 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7
 DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
-EBUILD hexcurse-1.55.ebuild 672 BLAKE2B aeb280c5f666ede76a36289db50e39b6630417e98cbb6715ecbb60b4ad0c9a63a31cfda99ca9d50906f2d2ea90ade4a7992c94256055617920b9ba22d7d717f6 SHA512 7307707e8478233822aa68a688d9db271975d21ae600821e6bc77a0f0109acc4794b7812872979202285b8362996ff7f1bf4d53f831fe96def9bc3f2d9b98e3c
+EBUILD hexcurse-1.55.ebuild 673 BLAKE2B 1265db7eda045f0a6fd59a1ca3e550c2a58231280e76aed86a4967a08c3e4b17fc729d6782578e3107502137443432141f9004bf62028109445d592d3340c20f SHA512 e7484821f47180634a670ffc64073b2b7fb2c2f93b1ddf46d81352cbf09f1b5e5ebfb12983b6dd594cb68749cfedbe7b13a4d2d1ab764ebe7ff14450f180f4e6
 EBUILD hexcurse-1.60.0.ebuild 713 BLAKE2B ef37131406f851827fc94f0524de69bf0e79fa823acf982e8ca43751ea63a286fee96859839101274c03248561f9a8f337c966f8b78eb5608dd5e9c7b01b208a SHA512 98cc4f96741c84ca32b5b2bb7f9606b51d6f4e105672bb5cb0ddac18439baf8c96fe78c67203e96ead5d8352828a740018d73c258004a22be4f4de0d912b5bde
 MISC metadata.xml 463 BLAKE2B 104010d8e61f58282a944b121dd649fbceca67fe8981030d7aae737bf709029a94c75bfbd648c07bfbffedfee10cc0cb5718da7376eee7b4b5ce014a987acb6c SHA512 571a214805d30efc4f0f8a83964938e175aa1cecdbf76c1153189315dca316b625507860ac86b14209ff116706e8beedbea7b66aa5714ffde264ca94a88270c1
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
index c0d5399a72b6..2e1c9c309b56 100644
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.jewfish.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0="
 DEPEND="
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index 57b2776eb3ff..f5caaf2bd024 100644
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@@ -1,4 +1,4 @@
 AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a
 DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb
-EBUILD hexedit-1.2.13.ebuild 698 BLAKE2B 89e3f6426b44847b7cdd5db5e0e67a840c3cdf7760f8657f8b1ddbd0d7a61e4ba9f37c43f22dddba1593939a928cf870fff627d960ed7d36ecd7bf053b7c5598 SHA512 fc82df639c0165215f4864d377e0610d096a29146b3949c5da34b14fcaa6140464072fafdb269b5662e56ece388d3aa092cea6dc36f624a060d34dcc150f8d75
+EBUILD hexedit-1.2.13.ebuild 699 BLAKE2B 954340eda0d298c30123687bd26f94661ff4c5a5c746edefedb0a6ce6756f8b5c8a8836ab81986dbd80d580de5f710713db870b8b50769fd5cd2b5211c41c861 SHA512 ef631e6a500101493f9473ef1430f6e41fb9ef9d35940c254484c90314c5fb003e4ffd2ea36e8b09270d9e46fff7b15e26d4c1f27ff54b432dd490e7d405cd83
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index 6bf3c4700dec..ebe64f97baf9 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rigaux.org/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index fd53198a58f9..6637d3427607 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -4,8 +4,8 @@ DIST joe-4.2.tar.gz 1341048 BLAKE2B 112163e67311051dad8714e19cdee1a11ff3bbe29734
 DIST joe-4.3.tar.gz 1270523 BLAKE2B 442e05dd29a0a8d4a26500c89a2cafee88bf2d1ed00a4cb539d940e2e849456e6c4c5bf347b4803ee02ab38311b225cc8034177a1e0b7a1967a2629fd283b7e2 SHA512 a711ce129518863856b8f581ac7acdd7661f5e571cb77c5411317e0db0344c9ba44e73ec2ca9a307e639170a7914d53352eebcd00a33c9270809551f12376e69
 DIST joe-4.4.tar.gz 1350062 BLAKE2B eb58117e313ef4abc31026a2800f2b9258c12d0d865c768138ec42a97c1f7fedcd8e397f7aaf13f8bb3776f2571d5a85e27ea7f9a6fbd6710d935a2b80afcd1f SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d
 DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.2.ebuild 1160 BLAKE2B d049ce775cef8713553ac61e163963c3c38e93d97cc5542dfee994082ca2ddf037d483f80691fd73f1b4ee8081af1465026eb970136c4fea15ecc6231ee471ff SHA512 489b78ebf703364fb288a75b476e5e551b0b6c9ee9d69d9933caae130c614694774e5de8d3c1283052a7d5dfd993b2b8c1b580af326db009393b80a79856e724
-EBUILD joe-4.3-r1.ebuild 1293 BLAKE2B 10c691bd22a2f4acbc262fa46645924a4d2e3ec87c61cca2b606aae70a6dcc348ba1445fe2f3ad29cd95a00b94c97dd08b3f02fde5e7f489e6a9a3e5d8fd5eeb SHA512 3d2118c01d34563e613218c5ab0c302b9012e2500a6503fd68c6dfc14962e60b54398da19b7119b89ede837c0c272223a6ac36cb0341f6d62eb1b14357f6154e
-EBUILD joe-4.4.ebuild 1293 BLAKE2B 10c691bd22a2f4acbc262fa46645924a4d2e3ec87c61cca2b606aae70a6dcc348ba1445fe2f3ad29cd95a00b94c97dd08b3f02fde5e7f489e6a9a3e5d8fd5eeb SHA512 3d2118c01d34563e613218c5ab0c302b9012e2500a6503fd68c6dfc14962e60b54398da19b7119b89ede837c0c272223a6ac36cb0341f6d62eb1b14357f6154e
-EBUILD joe-4.6.ebuild 1463 BLAKE2B 2ef021eb73440f069d7a9430030ba81b9c48c76f7b37567e4eda016f15b0d17eed888826c2b401968f9af1136fc9e30cc1dc174a036d3064f79670a178dec83a SHA512 d508eefc9470bcfe11d4bcefed42e289a229ead8e02a1231864a4b8473d7734eee4fd90b912c648095f4ad9526e97dea58b8a3c29f74d616152fdd03f1189b8e
+EBUILD joe-4.2.ebuild 1161 BLAKE2B c9bca4482e53cf28d2c9f7db8655c5a6cf882fe4a649c42649266b9c133b407d7e9bef225a4d7c313d6b805f7d25fb544ee58466ca9b2aedc0f38a52537f5541 SHA512 c682628b6af3e4fe00af14de8f60992e43df77f40f8fb2ae735f0a6d9eb1e3aef5962403014d5b0233897e87ff6819580c408e4096df51064d9fa6095320f1e9
+EBUILD joe-4.3-r1.ebuild 1294 BLAKE2B 9744510ac5411edb2d6dceb768605afa039bd32ed94e121f484cc102af5527cbe0b414a5dc72d903f0ecc1f05c971d9fa633c33c3ba83a8e999c37485bc6f120 SHA512 beafe2e60b25982d250853573661b9891332e501c1550a84107613638690fd2c7c913d35a351e71ec38af6242f8f7745d020403f405435f1a8bc44283e1ddcb8
+EBUILD joe-4.4.ebuild 1294 BLAKE2B 9744510ac5411edb2d6dceb768605afa039bd32ed94e121f484cc102af5527cbe0b414a5dc72d903f0ecc1f05c971d9fa633c33c3ba83a8e999c37485bc6f120 SHA512 beafe2e60b25982d250853573661b9891332e501c1550a84107613638690fd2c7c913d35a351e71ec38af6242f8f7745d020403f405435f1a8bc44283e1ddcb8
+EBUILD joe-4.6.ebuild 1464 BLAKE2B e0286810a462d460ba44d84e6a90ed2498a13f6f674687ae710644c89d508a4e129869b164ae2c50cb598035993598c956c16fd73f4af8973bee5e17ddfa3764 SHA512 b17dade3b55ff7147b4f5675d96446b06ccb0f9f60a4657d224c355f5907d4df0f1b37c96007a1b9715f81651976a1083609b55e4981bfe6e7e6515a10f5f475
 MISC metadata.xml 914 BLAKE2B 9af1e6230a119f778ed4404922ba650ceadb0ae58966cefd2df8b4424efd2b813a5c9805a1796623028308172fc9bf94b6effc9b9b7f34b0d1de9c484150a8eb SHA512 12324115a08719acf2377848a9cb930b4ad69764624a1cf093e4ef3e124fef85e059476a0f1b353314a03d97089fe0c518adf47f2da102f7492a1e612c420b15
diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild
index c59c4b6c1594..b8ffa09e84ac 100644
--- a/app-editors/joe/joe-4.2.ebuild
+++ b/app-editors/joe/joe-4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.3-r1.ebuild
index 1af8395200ec..038209a82b3d 100644
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ b/app-editors/joe/joe-4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
index 1af8395200ec..038209a82b3d 100644
--- a/app-editors/joe/joe-4.4.ebuild
+++ b/app-editors/joe/joe-4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
index ac3a9015d369..4e0c3be3f36b 100644
--- a/app-editors/joe/joe-4.6.ebuild
+++ b/app-editors/joe/joe-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 867da876cbef..7a4ad627bc60 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
 DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
-EBUILD mg-20171014.ebuild 1025 BLAKE2B 67b12c3665a444bf21b63e621831acb138a88d7160866e4743ed9a78d0629a0931bf3dc37718bc720f7ab67e10c90e38c5dcacfa708ac8c175c7354da0d9260d SHA512 0080fcc40e3b62917f41881c8eefee21d08422174e81b4459df8f281dc2ee9f36853d2a55ac572f23cc7ed3134c0d8eda154dfc2f6e098dbb46bfe85f22166a0
-EBUILD mg-20180408.ebuild 1041 BLAKE2B 4d7d43d927598aa8cc453e75791453a6523e07fafd992e2a04144a1dafe31fe7fa20306f8b5d08b07d967861116affa77dbbbb6836a2ac8af65dfb654338bcf7 SHA512 4be310c749a9b5151f04096772c2296e7621c5cfebbd03f2f947fc51265014afba8af5eb437b74a066b4dc28830fd2d039df73f2ec523207b0cac63f0a887844
+EBUILD mg-20171014.ebuild 1026 BLAKE2B eacc2425b716d502369cbc84089bb219aea1a0a4fc4d060101ddcd78e7de69179ffa0742d03e333bcbf8b56f87c17a46a8ffe18d09ea2c7d132385acf61b549e SHA512 3739fef3e64dad9190523a92464ebb395ff78e132f84760d92639d177507c4d53a33f0543f9703ab26fc2da8c654c1cd3708983a4110cafd25ae0235c5884a22
+EBUILD mg-20180408.ebuild 1042 BLAKE2B 636d84bf99cb39aef17af0512b4c6a71713a7a544416fae60d51e62eb6b122aa52722e3f7f49f64add4e0373cf7178fb716a59533ff14d7331c7320674023581 SHA512 44d8192c79cb8201215e25266b528ce15f44f9c7f2ef2f4dfc2ec31d9e5ff0d3ca67659b53716694c51006cc712d92d4b48b96a5b0a59ed51e1ca751a01c30fa
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
index 76952de56f28..03bdb29a79bb 100644
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
index 7aa5d884daab..c905308a3530 100644
--- a/app-editors/mg/mg-20180408.ebuild
+++ b/app-editors/mg/mg-20180408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index b6d8e46b9e71..c93dde01e98d 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,7 +1,7 @@
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
 DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58 SHA512 76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
 DIST nano-4.7.tar.gz 2977920 BLAKE2B 8373ebf3f4e98ba204ed00678ba1e8791c9ffc11226baa98b7dac9ff9389cc465dc6574833ce222570301232a97f87e1b8d505dcce617f6c8bd915f4a662df4d SHA512 2cbe2341bba46f57a692d6deb20003d992da0230fdec3a2dc485d3b03d2ec2a70e66d05299bbc719fca658c8a8060dd64d4b52e68aadfd73980b82445761615f
-EBUILD nano-4.2.ebuild 2167 BLAKE2B 7a1770c86696d2daa754f4081b15b9eac55471708a8c4da56caa9ba02a5b703643eedc29429b509adbf5a02f65d546f2aae7a378b2d5c03079cbb7931f3d5019 SHA512 7c475d9ec61e69176964ad8105390832738be2be6ddefca50bb5412e6bd0dcc7eb000d452145ebdea562f947dbdff05d3d7470405d1b1b168aac8b7cf27e9983
+EBUILD nano-4.2.ebuild 2168 BLAKE2B d6daebcddb29f779588ded756966e14efc827c68cd3eb5c7a7fb9e7c98159b9d6c286ee7456aa6bc16b5d3bdc167c7fd987ba6ef65a85d16dfd8c1d5d5c014a5 SHA512 21c1507c0a2430595eaf3031b1fd587c766ec162648f7eeb0d427aa5308ec4c5a74638bacc61e982763c212e15db20cc40bf3f64caf3ff61650dc374dccf5d74
 EBUILD nano-4.6.ebuild 2170 BLAKE2B 0f57307e8cb772be9e724eb03605465c41cca60e941a99ae7add2a31cfa1066d25b629721a25c7a3166d33bacba13965543c6ddc7c819945642ae451df93b8d1 SHA512 212eff2f9f01da5e094a378f5a46c968e853423049a93b4183ecb973926cd9394edb12f0bc2012d2c207b028377a4957d5d49ba1be45e3f106894c8e8b88e5ac
 EBUILD nano-4.7.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
 EBUILD nano-9999.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
diff --git a/app-editors/nano/nano-4.2.ebuild b/app-editors/nano/nano-4.2.ebuild
index a8bb7fdf3fa6..5b528ae79a8c 100644
--- a/app-editors/nano/nano-4.2.ebuild
+++ b/app-editors/nano/nano-4.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 92bf4dfbae71..f0f7fa619149 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -8,7 +8,7 @@ AUX nedit-5.7-ldflags.patch 814 BLAKE2B 5d300f5006c41ef378d4cadfa2daa287034338c7
 DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0
 DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932
 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
-EBUILD nedit-5.6-r1.ebuild 1979 BLAKE2B 29b2348f0c20c38c2e295f33124c196123261381adb642502dee40b45371afe08aa8cb981a762b9a037a9100f9958dc5065c369533e85d0df3f7251cbe2a5f78 SHA512 9de6b05cb61a67aed95d9b3de9cd51d814b7d6654ed01fdd3f74545d0f8f44863145f1feeabd82a568bd7958d57181f6fa70b48d906b8f86b769d40c7daffbb7
+EBUILD nedit-5.6-r1.ebuild 1980 BLAKE2B 940a46851c0ea1a72a6d21058b27426855482411b95eabd78dac43b4a14e6387ff5e8696bb520bf19861edd2029cccf3d6d035f7802cdeeacde8ba8f34d923e9 SHA512 d57705f962e6c7517dd56b716738c3679ff647e479366a72e6a6741efdd1624508801a89b811a448359713847455acbd5ce3a76ab7fc53605edf10be9d9126ea
 EBUILD nedit-5.6-r2.ebuild 2027 BLAKE2B 08aeeb58ab2870a0dc8139b8eb0c7e218f22b46da0bb385185969ccba7808a52cf551a0549701d568be7ad88ad103f02b9507fc810c3cf90d2d73a1cb584c6a7 SHA512 038ef549923cad319852d95a704c4f0e946a3121f920b8d405817cf0bee7dac7ae6c11eb53e09cd9c95de2c665a9ca74d2b4092a518af9ef6b1673519c5ec123
 EBUILD nedit-5.7.ebuild 1983 BLAKE2B dab69c3457dafe874dda1c22efef39b6d6abd130de845907a41184cbff49775e240a12ad2d782a02d76a06c097be2bd3d04fa83c4cf1a58068f73f3062d74ff4 SHA512 92856002bd8db8724abbcaa6ad78b1d2435d39bd7a6537e65f23467649dc2234723f488f353177bb0a5fe8560fe395f4b843c25a1d5fcbc868b16dd4b4134009
 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699
diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
index fe368ae4145b..4d915f977689 100644
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ b/app-editors/nedit/nedit-5.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 745463311753..880205f6156a 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,9 +1,5 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
-DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22
 DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
-EBUILD neovim-0.3.8.ebuild 1897 BLAKE2B 00799391504976461e2f154d1f5919866226ec26f40b7b3204f33e8b56cfbc3410222067d6e078dfb91fe4b7d2587110d99e0675664d9dc9e9d2d3902d62ed91 SHA512 b6ebe40492f0411020907b113e3444bbd2b7480fb3b5716bf9eb5c3a7ee6daca183e79d10fe77657bfbd19bdc31d12435611e2cb028763c22d2dba19e8f4cb7c
-EBUILD neovim-0.4.2.ebuild 1846 BLAKE2B 3e159b6cd82170b039f10781df9b99e8b2ce5559b573ab54b003e0bb461f999ba02d705efe0568bc8fb080c8ecd4a2e4eb68690d3689e61c6150f4d1e3a8b775 SHA512 620175aaddcb9b727dbad52b235377bdcb9f1865ac344d0aab0f7c5c41504b4c1be37aea28bb85835ab6a9fbff8c8215d3ae153699318ef2c2437c4c8ad77c3d
-EBUILD neovim-0.4.3.ebuild 1846 BLAKE2B 224a144b097bd8408f291a0d85ea101abd49affef14091ccac8a63a95972971f2dc9d5d97a807123667f64820d3233d05a1b868b70f491dcdbe780206cdbe0db SHA512 dea497ac68cb3e71f810f70af91a23e2ef8373cae73ee39ae360304fa4e1cf5072d4992a78b78be4eb8a0685d47a8fe19e20f56fd25f336278e64ae92ad0b0d0
-EBUILD neovim-9999.ebuild 1870 BLAKE2B 9d966a25c0baeb9c58c376a2765471bb6482282e066fe90ac23f7cdc031cb995078375d728da0dfab6d7e466ab42ff6d2f6b2c3b5e6ac8e2371b307e200ccd91 SHA512 fc70ada70af311a1d632383a045e07ac5f96d8fb07d88e9e0db618cbe918d1bc7b4b77cc4b213e37655a84778d4906bff8262d43a5874d00d3c4dda4f177b606
-MISC metadata.xml 862 BLAKE2B e9725c43d1a34d8da4fd779a2a945594914ed51a2fc0b87a9a2a6ddefcc8d38d88c94c426a59df9f94b08045b2f8820ee205e7982a19c15f1872d2a73b35fae6 SHA512 9eb46f7862d26c27f400d22023ac3cc81f5671e8b17d4f52b0743abcfdf53d63366cd16c06ac1e391f02bf35fb9b70e0864eda9457c1f45ff74a06f528d1b8a7
+EBUILD neovim-0.4.3.ebuild 1837 BLAKE2B c044e3eddc1a7c9bcb5f1d8ed804a0def40a84c0d6cb4175f4a6f41f44e16d8b2aff35452ceee322c444326fb9b923d4110a00bece8fe24abd422e7e24748f98 SHA512 9ee9af220071426b9977b9a49f433b62e8aca089d989c659cc27b13b3344e278303017c74c4cf391a117a7da4bfc09c4caedc55bd90ec3b6d29d540a0529acc5
+EBUILD neovim-9999.ebuild 1861 BLAKE2B 7eb5a5509a102b044cb69b056965b31a92e92aa04adb4b506102f19a7175fe654f498ddc1904805e99c0abc161aeda6c3a420dd5fe4576c95db1723c393fe24d SHA512 c6d6f456c6ee4ac41970e635e90d95eb32866f2a463b729f2624dadca7b727ced783e0081af0140c5b9fcf6e6b510adfb70551bae639f0831e35894730568ff1
+MISC metadata.xml 713 BLAKE2B 2a16bd4220ee68336467dfeb68d452bdec9e31ab230a55345e232553a245de0fe5aca04754e855d087fb2cb164a0f3e23aae7f3b8065e04804bcd1a5e8c47a54 SHA512 9cb453f34498a5c72fee2f3ff40e7fa58a6612a3de870e087d0c8b35674f83c0be1ca377f023adba516d10db6b7998359aac76bfa116cd36c28df94508a23498
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 0a78b2540a2f..15cd5ba1c97d 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -14,9 +14,7 @@
 		<name>Gentoo Vim Project</name>
 	</maintainer>
 	<use>
-		<flag name="clipboard">Enable clipboard support through a provider</flag>
 		<flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
-		<flag name="remote">Enable support for remote options using nvr</flag>
 		<flag name="tui">Build the neovim unix tui</flag>
 	</use>
 	<upstream>
diff --git a/app-editors/neovim/neovim-0.3.8.ebuild b/app-editors/neovim/neovim-0.3.8.ebuild
deleted file mode 100644
index 52b26cd51f4b..000000000000
--- a/app-editors/neovim/neovim-0.3.8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
-
-BDEPEND="
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-
-DEPEND="
-	dev-libs/libuv:0=
-	<dev-libs/libvterm-0.1
-	dev-libs/msgpack:0=
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	net-libs/libnsl
-	jemalloc? ( dev-libs/jemalloc )
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
-"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/neovim/neovim-0.4.2.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild
deleted file mode 100644
index 525ec586a27f..000000000000
--- a/app-editors/neovim/neovim-0.4.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eutils xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+luajit +nvimpager +tui"
-
-BDEPEND="
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-
-DEPEND="
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1
-	dev-libs/msgpack:0=
-	dev-lua/lpeg[luajit=]
-	dev-lua/luv[luajit=]
-	dev-lua/mpack[luajit=]
-	net-libs/libnsl
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/neovim-python-client
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index 6f27a67c108e..7891fa27662b 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -85,7 +85,7 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/neovim-python-client
+	optfeature "Python plugin support" dev-python/pynvim
 	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
 	optfeature "remote/nvr support" dev-python/neovim-remote
 }
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 6647b38da751..3855e2b02929 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -86,7 +86,7 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/neovim-python-client
+	optfeature "Python plugin support" dev-python/pynvim
 	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
 	optfeature "remote/nvr support" dev-python/neovim-remote
 }
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 076886040e09..0f595caf0554 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -7,5 +7,5 @@ AUX nvi-1.81.6-printf-types.patch 437 BLAKE2B a7cf425c52882b693e928af13790df0959
 AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 BLAKE2B 2c764c05ba9e8745369441062452e6bcdf6c065d2c9a040d4ef0f3d2041ec31c574be18bca3432b3ac252c693e2feec4f7df9851055305bad9760fc33d7220ec SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196
 AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 BLAKE2B ffdef923f5355ab4839955865cce148c8713517d19c5c6cb8fc4dcff227c1c833bc120d505f36d81240d64d4a0472628c61a28456db1675ecc2d47c3323a1507 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906
 DIST nvi-1.81.6.tar.bz2 1758309 BLAKE2B 7aa9b1a7f5337bb246a4a8779180830efd2fb1cfeda2c0d5fc153393cd683237cdfc2a69ac22b228629561ae2222d4eb36746fae4dfb6b9ff44945265988929a SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd
-EBUILD nvi-1.81.6-r7.ebuild 2087 BLAKE2B d0cc1884d123f1bd37e6e368ad7336ca1543da27b9493e05599a0e974d818351da639bbbc15374c2ff2ac3531f7851e1f9a242daffe9db8b40b54b4beda5ab5d SHA512 2a838ff387f3a82f67bc2375a4ae9720ca92c9d0a583b903284e147abfca6b503dcd73cddbbe7945a35dc42039bff014666feee1420e806240f8f1121b97b9e8
+EBUILD nvi-1.81.6-r7.ebuild 2088 BLAKE2B 290dc6358a735f11fec193136308cf9fa3361b264c155d7427854b15be51da590220434c82fa5ad1c804c54c663995834be7d362a78546a1a340689dc41142ae SHA512 901b2ba1386317deab1df817eb3cc0ee755c3cc64d86a61f583eb22b3221168c5a3255934347a42e4d00ea76298e804ebb4c595224449c3f86e697bc677d21ec
 MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index 2c957e6016f1..dc52ca6e54cb 100644
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
 IUSE="perl tcl unicode"
 
 CDEPEND=">=sys-libs/db-4.2.52_p5:=
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index a13f7ddd2c69..0d729d3d7dcc 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.26.2.tar.xz 976264 BLAKE2B 6bd0708ecab61097130ad3b96d44c4a58a7711f6d9ecc9c70d3db792728489f395e691b0157f0cf8ffc0e07b1796ce6fde9f689108c3236412ad37c4e87a210a SHA512 9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246
+DIST okteta-0.26.3.tar.xz 947272 BLAKE2B c4502315a3713aebfb6f19adb92b01268346b0f71f1f59007b7f0dc06aa1ad71993a7b022669f7912ad10cec6c7d2eed9b552d66294f6b6657e664c3b1ba95bd SHA512 345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6
 EBUILD okteta-0.26.2.ebuild 1591 BLAKE2B fc5ae8e0096950c34f2d0a2929a63a1eb0a143d6fd99bfdeff9cd9780703de207fae12214ef5aec131d34e8c0592398e8cf0009313983e9b57e74f5242630984 SHA512 c9fa8774ae09325dcd21641cc0f3f5d5a216c9d3db278ca3b9f778304a995488a6e862ef1c48cafb62dd8383c2e9f400053c1679376388ad53ba20d7b9f196ac
+EBUILD okteta-0.26.3.ebuild 1766 BLAKE2B 373e4672e78a89e365683a5ebb76b62785496c141e85018a18d7c6e137bc796003d14393b5ec4d5338aba1d6d5feb4b680d499178542342c87b982a46cde7c8d SHA512 e8665043d86ed90bcf6ff0e87d96a92933562071f573f2f2e0d648248771ff58caae80df1dc370275a79e3852e6743360ac34f2445df674ca91952ed3df05b6b
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.3.ebuild b/app-editors/okteta/okteta-0.26.3.ebuild
new file mode 100644
index 000000000000..a03835d9b894
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.okteta
+https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 8ead1244be21..8b39da77270e 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
 DIST pluma-1.22.1.tar.xz 3236724 BLAKE2B f571ccb79ffac11122dad1888a9804fdb1671f2c73b28c216e0ec593ffc4dac3fec3053b83fd1503e0c951e032f6e4c22fb4f3d6a1d23477a54e06de2659222e SHA512 0d3f07b2e8c736c9e1ad64ed5cb749db6088868e9bc27aa786cbb0c3fe72715f0fd4dd53999502a4333ec82110148b772c0dde81433d0936d2d3c2d04804026a
-EBUILD pluma-1.22.0.ebuild 1743 BLAKE2B 40c26b28de7ba18f07cb417ebf2b94e02dae42b5a3f81f9954c2c018056424755ec3e3d7233198f258beeb690be86fd96ccca9a30c254e9059c42e2edb812d97 SHA512 596cffd23ece2b64af7afd0d75d416b1a23757ed4a868e3247c8d188f06ab79c6bc7ec7cafd0ac331d650968771100e980471ece1f933c9ed990cf327e586a4a
-EBUILD pluma-1.22.1.ebuild 1745 BLAKE2B 9cd06ff881e7aeaf69386f083108914cf2df1fb9bdc5e003dd5b191ea1ae6467c440dc2d0f5f680db659d41825669062a28db3e92b0c267d7f48fa0c040fed9f SHA512 b8f68d58fdb0cdbfdd29f28a120b20353c7cbcf0c08f30cd0cfaeaced09b3e56cbea0ed40e7e38d1555017b59908aba6f80500426727a1bf394655089faa1202
+EBUILD pluma-1.22.0.ebuild 1745 BLAKE2B 5c69aac384e3084b053e93138636e3a9ebc4f60da1ec4792258c4431ef0546161dca7e47a3d3ff29a05e0d6a4c2ef7a9e8063ee74d66408b661bff29ed14c785 SHA512 e371c4c8438759c3cd4fd69053115e20e19ff4537be2093e86f77333318ba004d3f996d9d8185fd063ced5402ababb7216c609680b8e0209665057a7ec2dac94
+EBUILD pluma-1.22.1.ebuild 1747 BLAKE2B 8c14be924bec494258f729557695d684c6b44c44b57630982e214d14270d6562b54da74c73f8adf68a06cd6bb5d0e6cc867d6db1b29968ee6c40ca76d998ec71 SHA512 c1b44789912904af1a5e1e3a387afe3997ab6a0a862b0588f41cee7ea258cf834a77f8c1bb3dac6ec4ff93ccfd29064f160aea8560f92a77c0e0500f3b65c553
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.22.0.ebuild b/app-editors/pluma/pluma-1.22.0.ebuild
index cf7016392b87..063c79480954 100644
--- a/app-editors/pluma/pluma-1.22.0.ebuild
+++ b/app-editors/pluma/pluma-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ COMMON_DEPEND="dev-libs/atk
 	virtual/libintl
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	spell? (
-		>=app-text/enchant-1.2
+		>=app-text/enchant-1.2:=
 		>=app-text/iso-codes-0.35
 	)
 	!!app-editors/mate-text-editor"
diff --git a/app-editors/pluma/pluma-1.22.1.ebuild b/app-editors/pluma/pluma-1.22.1.ebuild
index aa932ba522f3..9e1d789c3749 100644
--- a/app-editors/pluma/pluma-1.22.1.ebuild
+++ b/app-editors/pluma/pluma-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ COMMON_DEPEND="dev-libs/atk
 	virtual/libintl
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	spell? (
-		>=app-text/enchant-1.6
+		>=app-text/enchant-1.6:=
 		>=app-text/iso-codes-0.35
 	)
 	!!app-editors/mate-text-editor"
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index e2dd17ecfb1e..6737ba51f8f4 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -1,5 +1,3 @@
-AUX qemacs-0.4.1_pre20150916-Makefile.patch 799 BLAKE2B 1a75b0b1f6ec433bb130fa3fcd142eacfdd2665117e6efdaa28dee0d2bbf394e5c270241be5719d64f49facb115febb8f99de399b4561e6921bc7f1293ff59a0 SHA512 1bb412ffc530b8d00569618b8a7d87d65b2baa9a3aacf83b377c41ea29b976ea0f84161d979f06d79a27b6b5b1192135917772c3af2bab66fb28a58c3006dd18
-AUX qemacs-0.4.1_pre20150916-nostrip.patch 1162 BLAKE2B a84d798d0a2d97b6413b10c075daa9f28b952ee655192e01cf6fd788e003785c0ad243bacbda16be071ac2e2a3ff38e7e005a008c88e475483e74d67291f8f4f SHA512 9495ea9799a6b728a2f25545dd2216758247b70985bbf8d1d0cccff1d152ee1f14575e4ca02799cfe105ea0ac799c1865414f30270c3f2373601ac02b1e44770
 AUX qemacs-0.4.1_pre20170225-Makefile.patch 954 BLAKE2B 16fce167962370753730dbe61ee5cbfa4d1e7b208bd350e433eeeb1bfe9eef2892a4532e83675b6c40344aed04df38c8236a01a7ff3db5fa6ec5592ec1225c18 SHA512 8146d383e53df6a5c540581925d85c2eff3dafe5cd78a23a784f3fc4fd41e23804f1287dc68597b33582f9beacef57df4a80a1930399b66566c77ff5e17eb227
 AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c5706788036665271cffee46a4b896573de3691c3e8cc96db9972fd0f170033b9d85fb048578c8cf3502a53a5c4ad8b7c9858c0771e195a42 SHA512 1c81e3570a2d00df04fa9a4dfae404be2f1c684b9b86ef67aa3f13a4b6f734d99d768350d41c75dc8c2874ccf853d021e497c87c751d86e2df1015f42fe97889
 AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-Makefile.patch
deleted file mode 100644
index 53c71f21580d..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-Makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Removes forced march setting and align-functions on x86, as they would
-override user's CFLAGS.
-
---- qemacs-orig/Makefile
-+++ qemacs/Makefile
-@@ -29,32 +29,6 @@
-     cmd   := 
- endif
- 
--ifeq ($(CC),gcc)
--  CFLAGS   += -Wall -g -O2 -funsigned-char
--  # do not warn about zero-length formats.
--  CFLAGS   += -Wno-format-zero-length
--  LDFLAGS  := -g
--endif
--
--#include local compiler configuration file
---include $(DEPTH)/cflags.mk
--
--ifdef TARGET_GPROF
--  CFLAGS  += -p
--  LDFLAGS += -p
--endif
--
--TLDFLAGS := $(LDFLAGS)
--
--ifdef TARGET_ARCH_X86
--  #CFLAGS+=-fomit-frame-pointer
--  ifeq ($(GCC_MAJOR),2)
--    CFLAGS+=-m386 -malign-functions=0
--  else
--    CFLAGS+=-march=i386 -falign-functions=0
--  endif
--endif
--
- DEFINES=-DHAVE_QE_CONFIG_H
- 
- ########################################################
diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-nostrip.patch
deleted file mode 100644
index 2ee40c6d2fdb..000000000000
--- a/app-editors/qemacs/files/qemacs-0.4.1_pre20150916-nostrip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Suppress stripping.
-
---- qemacs-orig/Makefile
-+++ qemacs/Makefile
-@@ -168,7 +168,6 @@
- qe$(EXE): qe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` qe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -183,7 +182,6 @@
- tqe$(EXE): tqe_g$(EXE) Makefile
- 	@rm -f $@
- 	cp $< $@
--	-$(STRIP) $@
- 	@ls -l $@
- 	@echo `size $@` `wc -c $@` tqe $(OPTIONS) \
- 		| cut -d ' ' -f 7-10,13,15-40 >> STATS
-@@ -386,7 +384,7 @@
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/qe
--	$(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-+	$(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
- 	ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
- ifdef CONFIG_FFMPEG
- 	ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
-@@ -394,7 +392,7 @@
- 	$(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(datadir)/qe
- 	$(INSTALL) -m 644 qe.1 $(DESTDIR)$(mandir)/man1
- ifdef CONFIG_HTML
--	$(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
-+	$(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin
- endif
- 
- uninstall:
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 8e0a3de48bb5..556cff91e8b3 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -3,5 +3,5 @@ DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
 EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
 EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
-EBUILD scite-4.2.1.ebuild 2942 BLAKE2B 414e81abc436af6237f90e697d264b28442e8e4db39980033395eb9ad7ee0df577dd9a5865782ef2d509b7e5398591eb96c67ec921adcb8aed63d9cd7464c73e SHA512 12c55b65c148cdc443ccb9ac5f77b646598f060709b89683c02e76522a5b5dd92fbf0fde79ed7e6d2878311528f0c430f963f1c380be502cee8d73ceae5b0a53
+EBUILD scite-4.2.1.ebuild 2939 BLAKE2B b1068efcac9794f133bcb5b059f030d8d804c501d229525b8985112f2c245be60a0b3a49e3a46dae901d37790f669784ba542005fe266aae99eb4240a64965e1 SHA512 921c777969f1f7a307eba9b073d151691c4b11faeec2e84c88ecb0cf5b6c7965109b1a35924e3a59859878976da842345a0042d5667e03672bf2a439f619de47
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index d0d87359e824..12a5af367952 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index 1ac34c589aa4..ea73e676c71a 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,7 +1,8 @@
 AUX teco-double-free.patch 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
 AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
+AUX teco-no-common.patch 289 BLAKE2B ce84e9132f53b0b465ab1118ef53246d83188f9c6b38ff617a63e52e91f2443ee718e495dceb9d32d8bc81b381923fbad5e837f9fb57474bcf98466244d821f3 SHA512 f0059e69090c345925e1ce50d9074d7c7d0e692e2d529233538cb640bb6705b0c27901ee4d780e2b99500f604e17f521db5a39e2a518396514631ee6c6bd05d7
 AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
 DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
 DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
-EBUILD teco-36_p19940820.ebuild 1458 BLAKE2B 27dbb4e4ebfe5b62561c612e7330afe5ed9ca78b725db0b9002c3b4a8857df2cf313be572d98433908d336f78519cdd224290f3c0f88327575737eea045582ee SHA512 8100eca3bb36b8d9f89cb57586d198eb991feb6ee47ea0dbf44dfb1a0069788c79b2c3cc1a13923d0fbd937afdab240e14a97c6ba4c626fdbc75afe3d8cd5bf8
+EBUILD teco-36_p19940820.ebuild 1496 BLAKE2B e6ab0702aa988e1323ff018dce667cd482848e6feaa34600faa33158fdbea82f447db576c46160c2cfd41314c857864f274693be722236e543dd543d8a3cb1e6 SHA512 dd772f5da48194e7b48115a05235b526a225bb41ae274f6a53aac4db2e3eb0a96b16078c2cd3721c1c4c020cdfb8b60790566c5090b0983eef7ba4fdf8c0addb
 MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
diff --git a/app-editors/teco/files/teco-no-common.patch b/app-editors/teco/files/teco-no-common.patch
new file mode 100644
index 000000000000..18880579e370
--- /dev/null
+++ b/app-editors/teco/files/teco-no-common.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/707300
+
+--- teco-orig/te_subs.c
++++ teco/te_subs.c
+@@ -249,8 +249,6 @@
+ /* leaves bb pointing to end of that text */
+ /* insert2() copies rest of buffer */
+ 
+-struct buffcell *insert_p;
+-
+ insert1()
+     {
+     int nchars;             /* number of chars in cell */
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index f46d3c234792..4dd048a4f2d5 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.t
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="sys-libs/ncurses:0="
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-double-free.patch
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
+	"${FILESDIR}"/${PN}-no-common.patch
 )
 
 src_prepare() {
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index db67b541c738..a403f687f44c 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,3 +1,3 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD vile-9.8t.ebuild 930 BLAKE2B ca240e6c36d4c5167ed3d1cb094320ddcb6836d3f9bf1d0f97613f3a93fb83a6db6f08fc080b32d3af276363a4dc53886bf9637fa24ec76b9fe7718d309cc83c SHA512 04cce701d9e68fc595c67b5ca012f05e016cfe022aafe896a6236076fe7386d92503fbc45dc41ab54ee0c43b81e0ac8bcd1f9293918b90b5206ad88766b19f35
+EBUILD vile-9.8t.ebuild 931 BLAKE2B f5b010ffb3eeec8a58b2639204b88bd5bdb4012f0a5885ddfe09af170aa1012b698380594aa02e188ce446e81b5b7d17646aa64aaeda572449b6c66269adeb01 SHA512 3ba718801563ae6da6641d3c2580898086f8edb5ba753436a61d0ac4750976f62fb3b1d5f3fca931fccb71e082ff2876bffa99ed8bc879f099572d1c1cad7141
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-editors/vile/vile-9.8t.ebuild b/app-editors/vile/vile-9.8t.ebuild
index 12f031b8a50c..8bd3e6025079 100644
--- a/app-editors/vile/vile-9.8t.ebuild
+++ b/app-editors/vile/vile-9.8t.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 7c67ae0f872f..c6f14a592612 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -6,9 +6,12 @@ DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
 DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
 DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
-EBUILD vim-core-8.1.1486.ebuild 6915 BLAKE2B 2d44adfb2dea395989f9658b0d0e1957c965424e035ea321837117f9223418e496fb55f8e04b3176001aae546197cb72e4274d6b137a92697c2defcdcf3da149 SHA512 e294057a7bfaed7787e7a37c3a806a218b7d6c374e9f01fa054c601a38a446ee0ca6c79d6e69c40a0b01c2526b7736a2fbfbcfb2ddcc47cfb074626c0bdf9f16
+DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
+DIST vim-8.2.0210.tar.gz 14757725 BLAKE2B b78ed42b42d40911efb76d4317c116b1c207909ed47241f9dbe6cf6385a4a25ee8cceb2d883171dd922027fb91e9f25e4741fdcd6ebc69217e7d26eae2f88efe SHA512 118131c7c186bac36b3e4928a0021e03b4bf197e1d5651019f4fcf8d4fee89fb7e0123adaf18bebc932c5e06217904526d0625513646e34aebf6cfdee8885260
+EBUILD vim-core-8.1.1486.ebuild 6916 BLAKE2B 990492d5da1acb4d797fcf7673f07607f7e730ef849f02eb9f2f0133915c71c57dfd710b647f7cb387901567d53c6bced91b9b75461b922b93edd38ca4d08107 SHA512 ce915e839c97df913b6b6613eee3e40d4bfaceacf574228f527536c6871387b02e0782f54b955169279102a19984082a7bee9ca62a4cd24967d139e1143315d5
 EBUILD vim-core-8.1.1846.ebuild 6926 BLAKE2B 466e6b784517dcd1d71a23bb1daba145e01ec8fb09d1560984c5a4641bf03177d36dd43be67402f7b87fecca7bfad264d54d404d4355c9a4f141f8bb1821fd62 SHA512 a660417f9e9d5493d49c9c118e38de7373ef1429093bf68577a535083725dca32a8415d44d50165ca29d369cb1b2211ee8fb3fe0c415709b35247ddad7efec50
 EBUILD vim-core-8.2.0055.ebuild 6926 BLAKE2B 5c50fb2c6a266ab19f8b8aa9bab7c099a1d52d3735de9404a74920de926ffc9994b66c526d777f918d64c2f97cfe0d44bc7d17757dd226f0758346a1a7f01e37 SHA512 a0f833d10f85ce8695b205be4b026e6aeeb189fa7817f02b4f5b657e7d95a88267d51dead4240ee1bfc10dc79157885278f62a12f3b89e906d39f681e985f49a
 EBUILD vim-core-8.2.0114.ebuild 6917 BLAKE2B 63b8d9cc79678377f3b8b2c1a3ca59061080dced4eb2a3c38259265f7d08573fb7f0cd3a0e7d0bfd9e748198bdb5d84065955e12013e3f68ffa0c989de8e825a SHA512 7d70d62bd36e97a1c021f81098bc3adc614518045401f77ad092b891bfda8f0d2e1792e994fd79159db88ef09fb164218918738ef652576ce4b59d4c6cabe9d9
-EBUILD vim-core-9999.ebuild 6917 BLAKE2B 63b8d9cc79678377f3b8b2c1a3ca59061080dced4eb2a3c38259265f7d08573fb7f0cd3a0e7d0bfd9e748198bdb5d84065955e12013e3f68ffa0c989de8e825a SHA512 7d70d62bd36e97a1c021f81098bc3adc614518045401f77ad092b891bfda8f0d2e1792e994fd79159db88ef09fb164218918738ef652576ce4b59d4c6cabe9d9
+EBUILD vim-core-8.2.0210.ebuild 6917 BLAKE2B 3b181fc11ac2a77537eb81a72c700c70b0117780f17577013b04db7f3d7d027d60078d7fb51fb41affe4696205871e0eead822f22384f02c1748c654e69e694e SHA512 b9041c1a25395beb192379347cb3fc2b35c517588e2f5b051c4d8d48d70441a3c755fe1ccc6289eed6ea15a22c899f8547c1ebfe7ca6ab9d616a9d7eac12c9d2
+EBUILD vim-core-9999.ebuild 6917 BLAKE2B 3b181fc11ac2a77537eb81a72c700c70b0117780f17577013b04db7f3d7d027d60078d7fb51fb41affe4696205871e0eead822f22384f02c1748c654e69e694e SHA512 b9041c1a25395beb192379347cb3fc2b35c517588e2f5b051c4d8d48d70441a3c755fe1ccc6289eed6ea15a22c899f8547c1ebfe7ca6ab9d616a9d7eac12c9d2
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.1.1486.ebuild b/app-editors/vim-core/vim-core-8.1.1486.ebuild
index 18d0e6f673cc..e5b9934edd91 100644
--- a/app-editors/vim-core/vim-core-8.1.1486.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1486.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.2.0210.ebuild b/app-editors/vim-core/vim-core-8.2.0210.ebuild
new file mode 100644
index 000000000000..e8ecb7550a62
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.0210.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+# avoid icon file collision bug #673880
+RDEPEND="!!<app-editors/gvim-8.1.0648"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir -p failed"
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index b5cbae1c222a..e8ecb7550a62 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 4af86e9011bc..e70e8d8c07db 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,9 +4,12 @@ DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
 DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
 DIST vim-8.2.0114.tar.gz 14667122 BLAKE2B 3f6219592a1b8ed85caee4cfa289e4042380da4e4a563692fb36d60fdec9e29930a8e20963fa57dddd4dd346928b34626ea51a8ab79085c1fac86c755bccfeac SHA512 0e45a63bc910f8f2972e2df076523d3a2612836bee0cffba6c2753eeadaff978054689af4029384713e822aabe0e57aa8c89bbb5f9a813781f381c3a2a416d1f
-EBUILD vim-8.1.1486.ebuild 9067 BLAKE2B be4836c179288569bf5de15e3e50dc879676f86be1d84810dea0e33d454603f407d1f1327ee38b9a3841a6a67e690af0b26bd3557b245b9caf2a309af01f66fa SHA512 6e0e205b33f62ae2f97b989e22bd39365db7d687e3e5bc56ec3e811dca6e40c295b05de7060ab31f109fa9df2e3c93c6adbd97a470b0ba1251e177f50ae949a7
+DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
+DIST vim-8.2.0210.tar.gz 14757725 BLAKE2B b78ed42b42d40911efb76d4317c116b1c207909ed47241f9dbe6cf6385a4a25ee8cceb2d883171dd922027fb91e9f25e4741fdcd6ebc69217e7d26eae2f88efe SHA512 118131c7c186bac36b3e4928a0021e03b4bf197e1d5651019f4fcf8d4fee89fb7e0123adaf18bebc932c5e06217904526d0625513646e34aebf6cfdee8885260
+EBUILD vim-8.1.1486.ebuild 9068 BLAKE2B 2c49c2980f6e45c9b210bf9d1ca0edeb6f308f4aa8d7990066e4a4c6c34491f8bebee29e7f918282969ec45073f2f547a30e29b4027832261fff0d43ef6495b1 SHA512 4263af06b7ea6320ba654d8ef8c40f1735186c282279c63e0905bc89755b76edb11629cb53bdd597fc5e46d5551753d8e4ced3d025c1da04a4713144886d1d4e
 EBUILD vim-8.1.1846.ebuild 9154 BLAKE2B 9963fe3bffcf4ecc6ccb82751152e6f4428865c00bae9c8f7e86ce9038b2f791679c74d4b14bcb1cb0eeec97998745263851ce58ca26c9cb3f9392b007ca578e SHA512 3ed6f3180065ce544e3f48cdb8cad923188511ca2170d5145bcd0ae4e78a22a964db491e4eafb56f2ec791c81369dd0f09ca6ad438347c232751763a3852a1fc
 EBUILD vim-8.2.0055.ebuild 9154 BLAKE2B 2d3d69e1fe5e8b777dfe7c2e6a34d0f00e739cd162e6306a2fead62c795b799fe92f03a48e8c9d150a5d609d9aa11190afdb6e229d2ae2ca6a4e8faa0aade033 SHA512 d8f6c1c253d01df537e2c6edcbc964c8c1ce7035967eebe5c0c9511acb1bc4411c999bf6dd3acc4d95edf7afb9382214beb3dd7a73e023cd8a7b706a3a86c1af
 EBUILD vim-8.2.0114.ebuild 9043 BLAKE2B 3dea56da891356560d81f8aad7ff902bcc6e7aa30478051b0ca1704483b8758919547de3461f874fe09c637298ba8703eba4cbc98642d69545e103c2ea2e665e SHA512 2e4fd2908d6e5bda8aeee29b37dfcb6ffda2c5aaccfac820dbfff58663ab6ca498c26d0c5cc32e7809ba70e655aeedaa5962bef3fe2aa0d2f1b2f728fc9ba000
-EBUILD vim-9999.ebuild 9062 BLAKE2B 637721a3b1b66fbd7738b3af885ed8867627994e1ec7131647fc67b73fc74558f60464a4786b27bae0f4775c4ff4fac711348b5cfb1254ac4b94505f470c4ee7 SHA512 60cde8a76286735f4bde290ef4f8dc2338997a89dc922221cdcb4d255028c59069eebcb6767bf321258c495d062269fc1182671a9c932b7ce6d96d217b163b2b
+EBUILD vim-8.2.0210.ebuild 9058 BLAKE2B 474d6d874b1866c295f9cd41519ce6517fbdd11608bca8f8f85251f5c2986b4e83a740c4cae6c35b6c4e6a23cf7ee98ac673f826a16c9791358fb8faef1a1818 SHA512 7f585586e1af37ef716f111411a0bbc75b2fde3141be76cbe4b8948a20f6ed6c3020f409572418ee44047d51a4327b3548dcf4eba59b85f94c27e1e432ec29bb
+EBUILD vim-9999.ebuild 9058 BLAKE2B 474d6d874b1866c295f9cd41519ce6517fbdd11608bca8f8f85251f5c2986b4e83a740c4cae6c35b6c4e6a23cf7ee98ac673f826a16c9791358fb8faef1a1818 SHA512 7f585586e1af37ef716f111411a0bbc75b2fde3141be76cbe4b8948a20f6ed6c3020f409572418ee44047d51a4327b3548dcf4eba59b85f94c27e1e432ec29bb
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.1.1486.ebuild b/app-editors/vim/vim-8.1.1486.ebuild
index 0eb8f9ece42b..7030a92b7e63 100644
--- a/app-editors/vim/vim-8.1.1486.ebuild
+++ b/app-editors/vim/vim-8.1.1486.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.2.0210.ebuild b/app-editors/vim/vim-8.2.0210.ebuild
new file mode 100644
index 000000000000..ac2920a55c28
--- /dev/null
+++ b/app-editors/vim/vim-8.2.0210.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? ( ~app-editors/vim-core-${PV} )
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command $(type -P $(eselect python show --python3)))
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 6f2ff73fb529..ac2920a55c28 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIM_VERSION="8.2"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 29b4b532aa35..1236f924facf 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -11,8 +11,8 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r1.ebuild 6737 BLAKE2B a6b3db1d9408e639fba375220a9016c037644777e5f472a4f354e90d56dd3bc3daa822bc5c4fe46a3250212b9c73f2af52c5eafac3df4fa18f211c3d3fe2ea95 SHA512 48aab5209af4ae97a885345919619a1dbaa0fecaf1f3b89c47ad8aac93efcb9094b27615181082939785eb520768c49f1c1a1787946215a04fcc9244b8c399bb
+EBUILD xemacs-21.4.24-r1.ebuild 6738 BLAKE2B 96c4f3505e714607a44d7e315d5232d38163132709cf2e0010ee7fd3fff089dc398ec87c245fcfeabb6bb4baad4c93f5b4076b63c4b6109a059d1470b89dad3a SHA512 ef5e10f21353470e269f93e676646903eb8e07e710b91641df7f6e80d8b7a7d922485796dea4c40358bae6aedc344f5f137474b4d346c2620892d5fa6a40123d
 EBUILD xemacs-21.4.24-r2.ebuild 7085 BLAKE2B 1e799def26063041aa0b65cb96f9f22a33d87370d26a6ab7faa311862a9a653de8fdf2b446355489bcb8733c746cbbe16fc047a72036edba16b389625a07c299 SHA512 2217a71aead967aafc089089a95bf638fe13ad5293939de35ed0feac6b655ca73a9efc90aebf555e65bb59e4aa12e9ddae08a3dfaf26414ac39c784a5e27761d
-EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
+EBUILD xemacs-21.4.24.ebuild 6783 BLAKE2B 53d0f7afd29d6d9646e548cfaa77fb8eeb99aaa36a27764e5f95c6ff88cbe6bb77e97bb94f12e80866292ffdf5ab1a6b0b000fcb88b310f372154df340b856dd SHA512 05169f920ae5a875b98ece41a71342ae35ac124b022c7ed171b08368d006bec57fcb27cccf48dc13ffb728a4d4d2f3beee8541c20104689cd865c9afe22fdbbd
 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index dfb34f7237ac..09c8fd7fc08d 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 hppa ppc ppc64 sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 08d08cdd1233..e151eed47b67 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index 80d562309e7d..a94067019b4c 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -1,3 +1,3 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD xvile-9.8t.ebuild 860 BLAKE2B 9a2759b6987b6d7f1f96cd3df0c5a024b0d4ca07265cc0a1b03a70a10b78a84a4d965aaaa86f7b2166284db51f56415c850443d04f248b26129d8696b14611f8 SHA512 c1c5dd0aae090786b02458773560ee1e63a944f623491e94246d85aba102fd2a5e24e8f106cdd1de4e2543dd2b560e45e72098949396db0e0f9f67a0ef2a7a72
+EBUILD xvile-9.8t.ebuild 861 BLAKE2B 7a6423563063ffc05f8dc523a2772457b7b04c41707378b64f68fa0a5a88a5772f793795727ccbb94e375044b55b023e35a2ae7167e2a7385c7e604db5b8ee94 SHA512 13b234a595c88da6320cfea91668985d9a14e40e00ee37576b18c889efca3483064f9d1d7c2e819ff1383317874e1f37855be790dd9c7d0d057d4d83e43d5c76
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/xvile/xvile-9.8t.ebuild b/app-editors/xvile/xvile-9.8t.ebuild
index 15ce448f4d61..d13cf6ab8d1d 100644
--- a/app-editors/xvile/xvile-9.8t.ebuild
+++ b/app-editors/xvile/xvile-9.8t.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 0bbc92d83c7e..f701cf281d5b 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -2,6 +2,6 @@ AUX zile-2.3.24-gets.patch 904 BLAKE2B 7d5bca1774f2a507281b17213289bbc15a75e112b
 AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821fe611396743a64e161c3268086e252651b3fc05745fcd00ce614a94c776d7305251ea971adeb80e799d7edbfca1 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7
 DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
-EBUILD zile-2.3.24-r2.ebuild 1378 BLAKE2B b8a77f28aaea35d3c5878b9ff39a0762a1d95edf78eaccd5a1aec73e16abff63a54bbd184d6e80530ae39e30b3552491b0cdf4e6ce0a66658b37a65833f7ded7 SHA512 e8a715aed8be8f7cbf70a13d4c32b3dfb62640e92dcae1766eb7dc6e8d25d2726162675aca11060fdc321fd92f971fd3a7672a67204a59e8384c1cb9b2a51060
-EBUILD zile-2.4.14.ebuild 1428 BLAKE2B a0fc4296f9d557ffc92d54f71b2d139ec0f49f442580dedc31c3c54d5a2f3f4d02f4506e94fac2c62da06ddcb66060286fd18aff8ad066906386b4ede005e971 SHA512 d8e69deab0b1f25d2d5ccf11b97d7017499a82fba87c2a48f686e2b6b6356b9034aa20247e22474d737e752a257d2d6215e5d5ca84f96b2d491ade61122ad88b
+EBUILD zile-2.3.24-r2.ebuild 1379 BLAKE2B eccc15eb794f4f34119f24f5b3d845700737af51cd390a31685cbf6e9fe195898167a54b2a400aa9a541aaaa55c57b957ee63b54ec5e634d74f984e61d59cfbc SHA512 21f89890983692018a318f3325790546d40aed968cd1db3aec2bb9f8b11b8be62308401d8534a7fd21fbbe08c672930f91f0897f21200f405f083b506ad9a4d9
+EBUILD zile-2.4.14.ebuild 1429 BLAKE2B 9e02eabea86100d33d1674d719bc3d5b9e0aca32287d4b13a4806e4e7e2c549c9253ae7e58b4c3dfca4dbc827fd1dbd0aa14e7616d0196c3214c94c970e64e33 SHA512 8b003e386173101aa0f670686eeaefd25f801d4edee646c7f50cf4dd28214cb92e260fd1aa7ffcaddc28bc5206175ccb12afcf3713f188e1d51330219ab17348
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild
index f57acf4304eb..ee49216dc925 100644
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ b/app-editors/zile/zile-2.3.24-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index 014e00abf5c0..ea420d7f9c27 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /app-editors
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)