gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /app-editors
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
72 files changed, 552 insertions, 224 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 9ccf58ad72a7..41c5fd73e438 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/curses-hexedit/Manifest b/app-editors/curses-hexedit/Manifest
index 5e490a9a9465..e7497d1f4991 100644
--- a/app-editors/curses-hexedit/Manifest
+++ b/app-editors/curses-hexedit/Manifest
@@ -1,6 +1,5 @@
 AUX curses-hexedit-0.9.7-fno-common.patch 1077 BLAKE2B b9e43f69e84870e295ecb4bd9bfdcfb7cf5afe8cc6d432b0fc93acf5a837a566e7fd024ee74ff1f0e6abed8926b28e6dc5979a9d02f7690069eba84490cc6741 SHA512 868d8196406d89bb63e64887a0d13eacfe6ed1ad1faae63b460f5d6c996dbcd3d58c12430cef8177a5890be91f2940a21f1b69418d3aed9957a009e13e928c1c
 AUX curses-hexedit-0.9.7-ncurses-pkg-config.patch 964 BLAKE2B aa433c31a1838cd9fd5d179f628aa2f4c9ffa44bc9eecd1c52c03b6b7a1837235259ad9c689bc6b574c56b0181c1a8ee556c46064b49b70a7393ce9ed99cbef1 SHA512 33efc29f64b9556e761f84d425b1e3c6207c06ecdac0499c9ce4fc1fe9023dbb06245987e8d4f23a6149607d033d1b6a22bf2e7cb5904f83a258cf0e91e56cda
 DIST hexedit-0.9.7.tar.gz 165110 BLAKE2B 8adcb2aa8265ef01c475fcefc97c987da26107871ac87e6154b13257cf30283d5be96fb87d67b6b24d79cf0fdcca7c2bfcd1ef642e9bc1655141cada27fd9aab SHA512 b11b28538900f6e66a9efcca14cd8c2a312c29cea98c6ea5018cd3423e12876a9a4d0bf6dc4f94e7cb02e8bc8d3a406e6bccca7fa7dcbab2e4b717ee2fd826da
-EBUILD curses-hexedit-0.9.7-r1.ebuild 763 BLAKE2B 48ea365c5e427dbc40dae21a1ecbda03e4a44de239b077862f1b5010ca07fc4ca224caec119d454c8f2109ee37f61064ca9f141acacbc488ff91e44bd7901167 SHA512 01d4b6441532ba15a0068fe67a703d4a6f010cecf1f0e2dc0641bdd12a06db1a32bd927a80391cc8ecc6900f063600cccd472dfedcfb319998ee23c041f04e8a
-EBUILD curses-hexedit-0.9.7.ebuild 726 BLAKE2B 683d121d255e5e4c8ffb1a0325dae1ee9354c6126c2db79c90e13af0c3b0cd71ef8908f777cf95a8ba619f2ec1425d58a2f738ae504b47d38bbf7b983098635e SHA512 7f4631bacfdb9c2a3a3f8910c27caee77ab087de74a585c7527fd72d779700493bb73cb19eb8979dd3727394dfd2c73c36d50853f7c5587cdf36a11b3ac7356f
+EBUILD curses-hexedit-0.9.7-r1.ebuild 761 BLAKE2B f106a5b92d343a63a931beb5f3f4820fcf1aed2069abcdd07b27314b3f87e966333f9dd20cd45d1cb3a783ffd392f6d4ad97192bb1ac94e7a18c3b6295b6a380 SHA512 13150576c07792fe5a68e19decc7f6efdfe70630f50bc737df4e2811d70daac8c77c5a347e8e2f22e233677e8c8cb25aa909ae9c9ddc5ee9016ce96aeb59924b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild b/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
index f274d12b8a5b..1572d3c98ed0 100644
--- a/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
+++ b/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # There's already a "hexedit" package in the tree, so name this one differently
@@ -13,7 +13,7 @@ SRC_URI="http://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	sys-libs/ncurses:=
diff --git a/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild b/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild
deleted file mode 100644
index 7eddb2375aaf..000000000000
--- a/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# There's already a "hexedit" package in the tree, so name this one differently
-
-EAPI="5"
-
-inherit toolchain-funcs eutils autotools
-
-MY_P=${P/curses-}
-DESCRIPTION="full screen curses hex editor (with insert/delete support)"
-HOMEPAGE="http://www.rogoyski.com/adam/programs/hexedit/"
-SRC_URI="http://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ncurses-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --program-prefix=curses-
-}
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 53a8ac39d5cd..dec656982992 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -2,7 +2,7 @@ AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21
 AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442
 AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-EBUILD elvis-2.2.0-r6.ebuild 2382 BLAKE2B 83d31da3d0b2fbe1462d3db32d9a87dd792a36b89f1b39de0ad6b7424e67d559c57bff077bb67abbe318f10d9f1aff78f9bf4f5b47b8665111952d8a96c17282 SHA512 f972d440ca798f18beb474e53690f1ee96368b28a91645d3cc7b9ccd3d3fd4217b1db18547994dab63050b75f9ac53d69a0c6261f97ea9cda18e41d7ba5c0bc0
-EBUILD elvis-2.2.0-r7.ebuild 2390 BLAKE2B fe4aa3c08d801007342bb1b2b0eaefe4d76366c8873cabcb2886719f7610150ff249063b09cfa05666be081d9b0ed3ebf64b1406b826415da6be2bae088b26c3 SHA512 afbdab0711b7e7863e3eab53b2c3cdbab0834bcd447021423f8f98961c41b4e88b24f2053b86e9c4b347509529ddc13bff1f47280298bd6fb0ce522fe3329f3f
-EBUILD elvis-2.2.0-r8.ebuild 2509 BLAKE2B bd155b05e6a12ced2cda19eb4b39796c48e49be1657c8dc66362cfac06e8ed0078bdfd5829d1379c6ec3a7328833669bd98e88410b0fd03d95954e061990b615 SHA512 e01f3a8fe8c081dbfdbd4efa67f2d9ef011acaab25d8a189c1fb43d9197a49a98fcd577948f8fa75aad3cb60a96d83a899431f2e3cc8a8bb7c437b6df49c592f
+EBUILD elvis-2.2.0-r6.ebuild 2371 BLAKE2B 207ee8ce046e58ca0a7ac6e814da6327baadc122166c2f94ac1098414866cca6e578c37e1de55e683d6b8df8579adedb3bd706c670c5910c2dced12f432e0125 SHA512 9924b57b3e8af4f63ccba31944d2437bdf17682108a8dab6ac0d8c62acf6be6eef8c4e122bc15d261051300c51386d918f44d87defb775d11f85e08291b7a1fe
+EBUILD elvis-2.2.0-r7.ebuild 2379 BLAKE2B d047b05b67280a760e1f68b4038f72474d01f0766e771fb9612bea83a5b4aee47dacb1c8b0abe314e8002c2c2087fd3d8499d9a5bbd1b000a3a820467a240660 SHA512 ca56ad2a9755edd734079b82f6fdc098afd90d6d9169ec24ca76aaebbc3e26f857d2a10d408d327cded56f25ebe67e408b6f38cbf4c5051697e68ee390dc4aa2
+EBUILD elvis-2.2.0-r8.ebuild 2498 BLAKE2B d4bde6adeb77e9386b615618be3c540e7ab6f064a33f7ef27e596b0622af65bc16e51b2b59226def21a6ed8b42db5e491a71176582f04020d3d21831e413d007 SHA512 3eb10a4529919f144465dcac49c8b99c13a1479979c6892a4201aa42a1279dcf39493f42f7c73007f413da49593d8b5c73ae1af0c2cd1a36c7d4717a28df5b94
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild
index 528a43940694..fba833b8c828 100644
--- a/app-editors/elvis/elvis-2.2.0-r6.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris"
 IUSE="X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild
index 8725034a1229..5df218c1ee98 100644
--- a/app-editors/elvis/elvis-2.2.0-r7.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
index 6a5ee6c55e01..c02af39932bb 100644
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris"
 IUSE="X doc"
 
 RDEPEND="
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5648aa2b3332..b0eefd153fc5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,12 +9,12 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
-EBUILD emacs-23.4-r20.ebuild 11205 BLAKE2B 28556a3ce71eccebd987f71283e694b53074760affa3975227c35f71c74d5e0d64ee3ab82861f57ac0e1c1801ffe565e16c30e8edd25c038ea80bf9452f27ac7 SHA512 236a6d83c14674ea291de35e5cd352ba7c66dc75baa12de2d96d95e1927222eac4681018519c5789b565e799a2ce91d26a250c770901ffa429a7b839171dfbfb
-EBUILD emacs-24.5-r9.ebuild 11075 BLAKE2B e4116ba6e43aa822451495971968edafe2f477b9f7322bae0bdc941abf4251f2a4a5f71fdd6ab686f70996b7121a320d99ebcf64b5dadc5848f8d3bcce0e3e4f SHA512 e98c42cbc1225fe2260b1c597f547db9f168532937cf7e45bca3cb9c0899d116e3a7e2ed099de1c58d232d2307c1927d79995a8307355493299e135035078049
-EBUILD emacs-25.3-r8.ebuild 11417 BLAKE2B a0ce8f334aff288ef8668059b4e5e692077eab2dffd7b5a1a7c4c98d945a47ec7cc0698e19df78b94aa89d0e5afc2a1aa80315432caea6ffd871dd9d848079a0 SHA512 9187c56beca692a6af103e4c8c1d2be6777778f039cb5aa8347e7b443e527951661658ea0e24503213cf035c43e15e0d04fe449e149b091c29345409a120759a
-EBUILD emacs-26.3-r3.ebuild 12235 BLAKE2B 1fedb87b951b84efc5fd00043fa4e6dd38fadbb23502899d6585518fa5f9a50450ab15574bd14b73663444125934adddbede1767d070ed54ef2adc36b30f7f78 SHA512 cee6a29bc0236000e0d1b813e6f9a7bb52904ef3b3b53481c46f65185782eaeff52d35f69434cc12506bc7e7b05491dac0c22588e62394669fcfd3126a4655fe
-EBUILD emacs-27.1-r2.ebuild 13780 BLAKE2B 4eb150551b4b2d3c59d1e27916b02c24b63a984ed2de75c1235dd8637922bf3e5ca60e59679bd0b2422aa5b3c9f3886856d19c107bc6dfe1a315922b918d762c SHA512 d3d3006ffe53e1efd9f8ac94299deb684882c17d493daa1ee5d3c51122e523e9cd77d5966570561d6d4e3c048a87fdde3aacf3ebc44c004db5742cbf58e95f2f
-EBUILD emacs-27.1-r3.ebuild 14763 BLAKE2B e800e12f4bd127057d8096c78485d0c158d09b42a34b61d91bfe242802aa0d5ff21e6fd379491850e9563ce644b8729033f267f9933657ce5d843b11e75ce0cf SHA512 bd2ee5e972ca25fe139347af879d95419cf2b1a6e6b1bf9d3f1867a776615c5cf5c608932c4244fd320d0915a28b441bcf32d3dd2082078292f3b9621980dd0f
-EBUILD emacs-27.1.9999-r1.ebuild 14720 BLAKE2B a084f683d34e2a1b533ddda7a7b027966eada02fce7b8933274a34e3d3cb421fab79abb5e06efd5f759115db0ff201bf5896c2bc3d33296d80e544316a19dd6f SHA512 dc46bfd84dff1df887c780e3f3c4237757049ca2d58fd4fe609b43f8771efdecc61e85c4b005f9afa1f4c695a71ff5d65edb3ffdba7e5c357ba683721fcfda75
-EBUILD emacs-28.0.9999.ebuild 14691 BLAKE2B 4e45b6e02c15a6a04b4dc6c275222cb3e9570b25f7c5c55f3872d900e1c09e02314198644f09116a82cb27fa6f6ed2d7aea60113ee8ac2516e9137c0d7507bc7 SHA512 d74dffaee2c530b1a60c1ecac4be0fea1162bcd00c171b4a46875fea89f736157c68681e100c5c264709d03fb84367f78982a19c13309dd905a4f30af06f8fc5
+EBUILD emacs-23.4-r20.ebuild 11194 BLAKE2B 5a6ad012bc880a168592aaaa13ea478c40b33e3a4ab3e57e137be5e3ed6565263f406e75ee968c18b015524613ef8de9db1cbec990094c27220c22125d813297 SHA512 efbf5f07548f6e5faa5390322a06f05b40137994c0a85cadbdddc2f1359408fe16ec0a008734d0284119d78209e89894ac1904d3b27572b9878e747dc8d47be1
+EBUILD emacs-24.5-r9.ebuild 11064 BLAKE2B 230c4e7f4a42442abb9c5dd1b00e5d07c3c1809d00337b0772551f14978f8daa6b931d06b1a54a25880c9fdb94e1e331421d4980864cb7a327e43cc2338516fc SHA512 d31d44e5110c6bd0533697589ec8f0a54e254a55e0a9087bd11651184a4feedf067a7ea213f5c610836cf3e30c25ad8c56f8f72eb5d1256940aaa97ce9f9a366
+EBUILD emacs-25.3-r8.ebuild 11406 BLAKE2B 491e985bbef6ebb2b9fb59fb1c93934814439d6e01a7e1c96fe755f50974366afd86741b65743c36cd4f7cd5ba436768ff0ac6809a8ed4a53a9b8138df96b7e9 SHA512 6883b698c30ce51b5cc4aa65e001201567dc46182cc001ccbb6ae2fbec7d89689fa6a3c25ba9c93801dfb43073ceda4a83cfbe29261e3bfa620fd939b7669127
+EBUILD emacs-26.3-r3.ebuild 12224 BLAKE2B 0a6e7b4a2efa929000bebfd1a507d5862c5216b256719256bd5c63c4728d3b33204f7abf37108eb613fce89843ea283c51f8e07fb34dc671d6aa3cdfe3164256 SHA512 fb60f96f86d7b051cf0a8009365973e8275f14245e4b1bb1937f491b467c300405f3439c8c3c2eb5fefcc881f2b7fc726b090816711bec4094f8ea497c8bfec8
+EBUILD emacs-27.1-r2.ebuild 13769 BLAKE2B ea25627394cbdd0ba574631df460808dd13965846424a937f1cadcaa5345fea05b05820af6bbe4db5dd2478fed88d79002b60ce5a8a04de555a6e4b2e992e26d SHA512 1e73bf9d4ec1492654b007cf1211f0f2a9a5ee8fda0928fe18006b18c215f94d1c1e388a0607e8d1afb2608c6484b5978e444a7dfd6ff41537e93d698cebdad4
+EBUILD emacs-27.1-r3.ebuild 14752 BLAKE2B c6690b6065eaf8aca2fa736ec24cb6e5881be36fd52116101c3bba596223490ed181d09eb693c798e7cbba9618009f52a9a8326067929fb56ffd3a3531939f37 SHA512 57a13313e7a032aa52e771e75e2d940de1b635e2a358417eac57943f15c98dd512db27d66ee4468273537b9c2cdb66fc7f9cfe95e123d255fbf0b69c51698c52
+EBUILD emacs-27.1.9999-r1.ebuild 14709 BLAKE2B be4d4e9455f17dccd45d6684bc7df95256d4420c95818f504117cef09abee3d59498e92aaed141bdbe2e4343758425ec3fc9ecaf3cc6e3397c9ca06eebfd540a SHA512 b9bb10eac9c6cb4df462fbaa9884e73fd73f1bf69324380f27738a5644090d4df8d82228acc6ff6a945b34ec6ebff3e3a5728fbd725b451c177d2ece5fb842b9
+EBUILD emacs-28.0.9999.ebuild 14680 BLAKE2B 41e448cffe10be975b6a3d6efd8442870c355cc167fc39da0d85fcadd482f8f2e09536cd80db555d5fac1c03521e182a8ef26e72de93b129ed83364314c4d8bc SHA512 6a102ceab1d4636a01add3d4f778ef99257d7cc366340f6e3a4db15ceb4eff0ef6df05d7eb1ca989896d8775ac39212c9bb55ea8e8eb560f0f232c2462dc0fe2
 MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index 32bef55e4fff..9c7889a4cadf 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
 
 RDEPEND="acct-group/mail
diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild
index f52f447b679e..62c7cd0a20a5 100644
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ b/app-editors/emacs/emacs-24.5-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild
index 466ee76552fb..e43700a2f211 100644
--- a/app-editors/emacs/emacs-25.3-r8.ebuild
+++ b/app-editors/emacs/emacs-25.3-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild
index 80915e9112bc..60641dd7a88c 100644
--- a/app-editors/emacs/emacs-26.3-r3.ebuild
+++ b/app-editors/emacs/emacs-26.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui 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 Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild
index e6c3aef737c4..b78766488d2d 100644
--- a/app-editors/emacs/emacs-27.1-r2.ebuild
+++ b/app-editors/emacs/emacs-27.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild b/app-editors/emacs/emacs-27.1-r3.ebuild
index f97171f9c250..87ed9455b8fd 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 3b09fd2768c3..f4d96c1f74fc 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index e6f3ac9b3448..57cb4bc23cf8 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index d5ae3add9a90..9ba697ede993 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-plugins-3.36.2.tar.xz 980648 BLAKE2B 37f55b742258b233d161ce808483ba10f158b951f06eaee53d966edc275dad67a2d11eae342fed7bc9b185d1309c5795f645eabf24db99a6e6551a3dae19ddb6 SHA512 d46a5ec69f69838144333ca3e66abc7c64cdb3248877b38298f869027dd3bab16102957e723ad1b0d3c6af55745c2b7ce321949acb2575734c649a388bb0100b
-EBUILD gedit-plugins-3.36.2.ebuild 2723 BLAKE2B 08e057033afbb73771137966c7d343afa223ff0ae028dedefebc0e049cab781fc476c95fa139bf086df322b6229e0111cddadc7b13ca4fd00eb8ab3caf45f3d8 SHA512 242a3f7f43a1f42307bbd455045e5e394ba5ea9ac8b751fb901bd0bc4a5e01c7ced2d0f92b5c98eba394a4d1225c600e1c995b89af15c7ffe260fbe0fce718f4
+DIST gedit-plugins-3.38.1.tar.xz 957616 BLAKE2B 9cf5fe5343b513bd841add5d4e85f8fe2e8f62524af7c124bdfc41b81e653a41d1a7417f8cc06f764cca730927f471598cae914a1581c5cd3712b89c464a075d SHA512 d5cc3e82ac6a488f5ab06eaf4eb5ad32bdbe50b74f2f215e114b5cb3bb0a089da00caa3815d6638a679c1c902983a0754a16ef88e15ff88d8321a247288ad237
+EBUILD gedit-plugins-3.36.2.ebuild 2740 BLAKE2B 186dc2546ec2e2ae463b1701a9ea87c603c484b4005f0c436bbb843790ee6d84d94b17069f7d650f891b9dd17431c036bf9e19405b9f47583d0718824ff83992 SHA512 93002960d367881138f86216e98ec0fee81847f39073253bb9d8c53b0b6cc922a4b88b297806a0d70411ebe441e26fd92e622be2f2c70c76a8ff646929f415ad
+EBUILD gedit-plugins-3.38.1.ebuild 2722 BLAKE2B c7824246af8dfffaac3cededed8b57a9575101fea78088e527f9930d8826eb6f33f02dc12fd9774ac947ab8fb01d455e5bcb2d8078d62a61ee0b1ce3fbefafb3 SHA512 6e578f6f2c11aa786858eeefacae53ad9f01649a457bd1af58c039589c6244e2b95c0f83ca55f07f17fda62fb3e9257a2546a28e46bea9fe15f281eab0fa5be3
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild
index 724f74088f8c..f5669621848c 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=app-editors/gedit-3.36[introspection,python,${PYTHON_SINGLE_USEDEP}]
+			>=app-editors/gedit-3.36[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
 			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
 			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
 			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
@@ -94,7 +94,7 @@ src_configure() {
 
 src_install() {
 	meson_src_install
-	python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
 }
 
 pkg_postinst() {
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
new file mode 100644
index 000000000000..c91a098c30f2
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE="charmap git +python terminal vala"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=app-editors/gedit-3.38
+
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=app-editors/gedit-3.36[python,${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
+			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		')
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-4.0.2:4[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[python] )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplugin_bookmarks=true
+		$(meson_use python plugin_bracketcompletion)
+		$(meson_use charmap plugin_charmap)
+		$(meson_use python plugin_codecomment)
+		$(meson_use python plugin_colorpicker)
+		$(meson_use python plugin_colorschemer)
+		$(meson_use python plugin_commander)
+		-Dplugin_drawspaces=true
+		$(meson_use vala plugin_findinfiles)
+		$(meson_use git plugin_git)
+		$(meson_use python plugin_joinlines)
+		$(meson_use python plugin_multiedit)
+		$(meson_use python plugin_sessionsaver)
+		$(meson_use python plugin_smartspaces)
+		$(meson_use python plugin_synctex)
+		$(meson_use terminal plugin_terminal)
+		$(meson_use python plugin_textsize)
+		$(meson_use python plugin_translate)
+		-Dplugin_wordcompletion=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 0c99d45370ff..ca338f626e9a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,9 +1,13 @@
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 AUX 3.36-make-gspell-optional.patch 2126 BLAKE2B b4e56744d3ece3e380c1aa628c02237ec8b36fa1c2b9efeee30391cbe9e3d5016e540862b25404ec4f807d9dfb3b78c2a6dc5f5ead2a71dbf4889d78af4cc2b1 SHA512 5916685a00ffa2f1b6f0b0ae77f5165a0199a40eb87e32d00a534d5049454df8aba9c1ba507fb5c1b8c4009c1c1689b962d2051a70173fd335007d5872eeaad0
 AUX 3.36-make-python-optional.patch 2509 BLAKE2B d88b0bf53e37cf20520b5d22565e3ecdfadb112751345784c962747602fd086cf238196ef33c340e228d0aa799631645d5b250bbaa650acfcb387000409405cf SHA512 bc87270a19d8f067ba5d7e697468526a931e020959b04bb1c824dcdf8ca5fe5799cfbf53b1b6e70862a7badbc7a0be98b34cbae1e3cabf90cbfccfd7d6c81b83
+AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
+AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
 DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
 DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
+DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
 EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3
 EBUILD gedit-3.36.2.ebuild 2454 BLAKE2B af8b8e2fa943c9a80d8ffa9d42a8d620207d6f170e187177815f7a037bc0cada8ebff990789b7af786c306ae87ea329e86f9ce6742c681736882c7cdcac24355 SHA512 274a54a606648b3604b78a99e9a932794236c68f1c14916636807da4d1eca42813e477742e4f377354267f3036d0434a66b6b5c250d8d494b6e98e131fc6b267
+EBUILD gedit-3.38.1.ebuild 2311 BLAKE2B eaf4b0925c8ab83f1a2d30fd117c022c5b474bdbbe08db598b6a5defed5bc85a7b51ce6ee770db298d58b08e73efa506297714c85bb3b0446eef070afa240ce1 SHA512 f8661bc217ca2c1c7ee580aabf4cb16e883dfc624f8da1bbae093b46b63453144890493bf09397f76116c2b320cade7a8157c840205c0b29cd222e302a9db1e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch
new file mode 100644
index 000000000000..f1197ebb5222
--- /dev/null
+++ b/app-editors/gedit/files/3.38-make-gspell-optional.patch
@@ -0,0 +1,59 @@
+From 4f32833325a6c95ec451adf1a8d9691cceb14dd8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 16 Aug 2020 23:20:31 +0300
+Subject: [PATCH 1/2] build: Make gspell optional
+
+---
+ meson.build               | 3 ++-
+ meson_options.txt         | 4 ++++
+ plugins/spell/meson.build | 4 ++++
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index acaad0dad..2c5dccb82 100644
+--- a/meson.build
++++ b/meson.build
+@@ -54,7 +54,7 @@ deps_basic_list = [
+   dependency('gobject-introspection-1.0'),
+ ]
+ 
+-gspell_dep = dependency('gspell-1', version: '>= 1.0')
++gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
+ python3 = python.find_installation('python3')
+ 
+ # Configurations
+@@ -94,3 +94,4 @@ summary('Prefix', get_option('prefix'))
+ summary('API documentation', get_option('gtk_doc'))
+ summary('User documentation', get_option('user_documentation'))
+ summary('Require all tests', get_option('require_all_tests'))
++summary('Spell checker plugin', get_option('spell').enabled().to_string())
+diff --git a/meson_options.txt b/meson_options.txt
+index 4e842d1ea..bb3923dd1 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -14,6 +14,10 @@ option(
+   description: 'Require that all tests can be run, even those that depend on third party programs'
+ )
+ 
++option('spell',
++       type: 'feature', value: 'enabled',
++       description: 'Build spell checking plugin')
++
+ # This option exists for the developers, to speed up the install.
+ option(
+   'user_documentation',
+diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
+index 8ce7634b7..cccb42fc1 100644
+--- a/plugins/spell/meson.build
++++ b/plugins/spell/meson.build
+@@ -1,3 +1,7 @@
++if not gspell_dep.found()
++  subdir_done()
++endif
++
+ libspell_sources = files(
+   'gedit-spell-app-activatable.c',
+   'gedit-spell-plugin.c',
+-- 
+2.26.2
+
diff --git a/app-editors/gedit/files/3.38-make-python-optional.patch b/app-editors/gedit/files/3.38-make-python-optional.patch
new file mode 100644
index 000000000000..7dccb18191cd
--- /dev/null
+++ b/app-editors/gedit/files/3.38-make-python-optional.patch
@@ -0,0 +1,86 @@
+From 9ed333a94ea15f74c420cbb2766909953aa6acb6 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 16 Aug 2020 23:34:42 +0300
+Subject: [PATCH 2/2] build: Make python optional
+
+---
+ gedit/meson.build   | 2 ++
+ meson.build         | 2 ++
+ meson_options.txt   | 4 ++++
+ plugins/meson.build | 9 ++++++---
+ 4 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/gedit/meson.build b/gedit/meson.build
+index 9fc81468e..5e808a2d8 100644
+--- a/gedit/meson.build
++++ b/gedit/meson.build
+@@ -197,10 +197,12 @@ libgedit_gir = gnome.generate_gir(
+   install_dir_typelib: get_option('libdir') / 'gedit/girepository-1.0',
+ )
+ 
++if get_option('python')
+ python3.install_sources(
+   'Gedit.py',
+   subdir: 'gi/overrides',
+ )
++endif
+ 
+ # Vala API
+ libgedit_vapi = gnome.generate_vapi(
+diff --git a/meson.build b/meson.build
+index 2c5dccb82..5e1e9340a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,9 @@ deps_basic_list = [
+ ]
+ 
+ gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
++if get_option('python')
+ python3 = python.find_installation('python3')
++endif
+ 
+ # Configurations
+ config_h = configuration_data()
+diff --git a/meson_options.txt b/meson_options.txt
+index bb3923dd1..962b82934 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -14,6 +14,10 @@ option(
+   description: 'Require that all tests can be run, even those that depend on third party programs'
+ )
+ 
++option('python',
++       type: 'boolean', value: true,
++       description: 'Install GIR python overrides and python plugins')
++
+ option('spell',
+        type: 'feature', value: 'enabled',
+        description: 'Build spell checking plugin')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 50bc5d393..63bb7c094 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -18,14 +18,17 @@ msgfmt_plugin_cmd = [
+ subdir('docinfo')
+ subdir('filebrowser')
+ subdir('modelines')
+-subdir('pythonconsole')
+ subdir('quickhighlight')
+-subdir('quickopen')
+-subdir('snippets')
+ subdir('sort')
+ subdir('spell')
+ subdir('time')
+ 
++if get_option('python')
+ if get_option('plugin_externaltools')
+   subdir('externaltools')
+ endif
++
++  subdir('pythonconsole')
++  subdir('quickopen')
++  subdir('snippets')
++endif
+-- 
+2.26.2
+
diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild
new file mode 100644
index 000000000000..f387f481f9aa
--- /dev/null
+++ b/app-editors/gedit/gedit-3.38.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala 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="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# X libs are not needed for OSX (aqua)
+DEPEND="
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+	gui-libs/tepl:5
+
+	spell? ( >=app-text/gspell-0.2.5:0= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+"
+BDEPEND="
+	${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=(
+	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
+	# disagree with; those wanting them off in general would set that globally for gtk
+	"${FILESDIR}"/restore-overlay-scrollbars.patch
+	# Make gspell and python optional
+	"${FILESDIR}"/3.38-make-gspell-optional.patch
+	"${FILESDIR}"/3.38-make-python-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 python)
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_documentation=true
+		$(meson_feature spell)
+	)
+	meson_src_configure
+}
+
+# Only appdata and desktop file validation in v3.32.2
+src_test() { :; }
+
+src_install() {
+	meson_src_install
+	if use python; then
+		python_optimize
+		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index db80dde83adc..e595ccf2c079 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -6,10 +6,10 @@ DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1
 DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
 DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-EBUILD gvim-8.2.0360.ebuild 10326 BLAKE2B 4fd00bb56f9cac3143d22d7d080046a4ac76a8d64b13ede6614527aa5c69603b792f5b0ec5efb9284978a1c782454211bf23ed25fb96e6994352602bc97b350e SHA512 37b60dcc8805c6aef6e1b1a3bb93fa96ad6b12a66614f30858018f369843d77ab57040656b710fd818bc2c823a43202ce52dff5a6aff1e1912298a72e51ea2cd
-EBUILD gvim-8.2.0508.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
-EBUILD gvim-8.2.0638.ebuild 10358 BLAKE2B fcb31925fe4f4bb0c988efe79b2125b1ec8ff0b73d09dbcf8c555ae438dbb7c00b8715bfe3f8327a1ceb11a9642978c6908d3f6ef33563ee9c709a75f139ecb9 SHA512 08644cdbcf7dfa5947a26e6e98de7d71a18f098ba5e365511e9c76cc6b8effd71f2b0655ce6af9350f81fd224d63b3122ea17dff7ec12e0cb88bea56183fe031
-EBUILD gvim-8.2.0814-r100.ebuild 10560 BLAKE2B ad2ea24aba5dbe512dd41d698932e387d67f4b8d712fe42382080bc0d9bb79fa414730aef00d91b38f9467f7dfa21f60f8415d9196706fa6bdaf22a3c5dfc63d SHA512 8e00d83153eaf40c287d1bda548cff545b5e49d1b61c86ac76fcce8f863675629271b6301b19115eab5a2b2f8e871866f310f68c9a0a3777960f85f1483910c8
-EBUILD gvim-8.2.0814.ebuild 10320 BLAKE2B f0cc97277892726264f6db574fe900c9bf67d5b2129cb15a509dd8848a0c8f9310975430a53fa1bffe62d6d94df53603e54194eaa7a1eb17edc78be22e343129 SHA512 dc45775945bcc40913afd9d0bbac3eb6ab5c789dd7621736f4202aa1ae7446083132db353120ba6d781ec63620b33c98cb31a4f390dfadcfae32f53bdc1acca0
-EBUILD gvim-9999.ebuild 10560 BLAKE2B ad2ea24aba5dbe512dd41d698932e387d67f4b8d712fe42382080bc0d9bb79fa414730aef00d91b38f9467f7dfa21f60f8415d9196706fa6bdaf22a3c5dfc63d SHA512 8e00d83153eaf40c287d1bda548cff545b5e49d1b61c86ac76fcce8f863675629271b6301b19115eab5a2b2f8e871866f310f68c9a0a3777960f85f1483910c8
+EBUILD gvim-8.2.0360.ebuild 10315 BLAKE2B 4c1b35b2d2537268194d42befdfeee87e4e23f7ef5a8b2d8fd094f2c2604669f147a12dc67a8f957be172633769a97aa6b20cb479216f318eef568395c52f75a SHA512 a57d51fd95b464e7d1eea345f43c50f4797045b3f7c1c9d7e288adc467d491807dce74545ac7e1abd99a26152447f481ea388b956c9b8d9b7a93578060059a5e
+EBUILD gvim-8.2.0508.ebuild 10341 BLAKE2B c871b703bf332abbc960740665acd93ab0c8addcd976335f2b640875ec7834fd00c56bccfa1397ed15024b80f15ed79fb8627da093169eaf401abbf4509472e7 SHA512 ba60e11d8602810563f70bb96359da99e1c35dd5c791d25ef2517447995a3c886a3615049aee37e51766faffa069911fe504881dc3376f64bb6622f363e12705
+EBUILD gvim-8.2.0638.ebuild 10347 BLAKE2B 9de67c1104ed3870fe86119c89dcb833a750eb71cdb92a4adc0ef2c2bcdf3791a0328dcb4413093c6bf439bea3b658c31b0e19036750d344994742e22ac19814 SHA512 74d6bd5f2c92951e7cd43f60c2abf3cc9ea5766300f9df4456944c98912845348e3ca83169d3254cc579d7fc5c8209cdc0a67d93078ea73e61117942500b4165
+EBUILD gvim-8.2.0814-r100.ebuild 10549 BLAKE2B 9d6705d0359e096511d847e109bd98d2866c60352ff26603b2c0ede17318af33f638aee862d0914d5a7b4a36ca791ffcfa6a081df538d9e921a17e38b44bc131 SHA512 63e84d1573fba10f27fae24d86bed97809daddd1527bcc6d76b87f6e672fddf5da4584c0b44ea916d4168e85609ab90cbb235683b5d0156a31754059619bb88f
+EBUILD gvim-8.2.0814.ebuild 10309 BLAKE2B 760acf4fba14b48dab053ddac8f779346c2d12fca68939db1b5b37940ca58eeeca1c5b0710ca90863ab3a009c46cfb042051e854f2ec411005544df09ad811a0 SHA512 ab5fe4309fd886cbe32a2add953d45249b94c26bd63b63393f28877a8247fae057608925ec1e151129d9b8d28907298037209538aed6a7ccabcaf8feafdfeb98
+EBUILD gvim-9999.ebuild 10549 BLAKE2B 9d6705d0359e096511d847e109bd98d2866c60352ff26603b2c0ede17318af33f638aee862d0914d5a7b4a36ca791ffcfa6a081df538d9e921a17e38b44bc131 SHA512 63e84d1573fba10f27fae24d86bed97809daddd1527bcc6d76b87f6e672fddf5da4584c0b44ea916d4168e85609ab90cbb235683b5d0156a31754059619bb88f
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0360.ebuild b/app-editors/gvim/gvim-8.2.0360.ebuild
index 2176fd3dd89b..91dc1d8447de 100644
--- a/app-editors/gvim/gvim-8.2.0360.ebuild
+++ b/app-editors/gvim/gvim-8.2.0360.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.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"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.0508.ebuild b/app-editors/gvim/gvim-8.2.0508.ebuild
index 3542682bc039..bd496a18eb95 100644
--- a/app-editors/gvim/gvim-8.2.0508.ebuild
+++ b/app-editors/gvim/gvim-8.2.0508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.0638.ebuild b/app-editors/gvim/gvim-8.2.0638.ebuild
index 1e52d07ddb49..b99de41f3d9e 100644
--- a/app-editors/gvim/gvim-8.2.0638.ebuild
+++ b/app-editors/gvim/gvim-8.2.0638.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
index 0c2806893c89..7166331b2c29 100644
--- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.2.0814.ebuild b/app-editors/gvim/gvim-8.2.0814.ebuild
index 15593afef335..4cd14ebc7660 100644
--- a/app-editors/gvim/gvim-8.2.0814.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 0c2806893c89..7166331b2c29 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index d69ae3c48028..8b8df2a21621 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 694 BLAKE2B 9d03989bf263e37769cda98101c8a0ad9e4cce7b664dbfe8571fa38738ff12a7e3ac113f019bc057728a9be171e3cbd7aa161d9cb5f4a9fbe770560c3495bd85 SHA512 91b5207ec6eb7bb3745ff999a9581a8c55bfd2197a0ed976fea1fe25a805a2abe5b5bf54e90be4fba80dbe6f82009f028f5ad589205487c1bbd046809935272e
+EBUILD hexedit-1.2.13.ebuild 683 BLAKE2B 53b0e7f29c26cd216c6fd766de54044d94dd9c34217c6bfed69244100b6cb28be935836e6b1815438ef07b150305f32073f443c1df4f832bc12938d601484a81 SHA512 eb547069a31b3ef40027fdec06857ec30d47787988bc078044e17e973a32aae411f9d323ebd4d7ca9437908bac5c59dba9b19654bea21d1fa4dbda5f8245115d
 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 a5317a013d9b..7bd04eb1bd36 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index ac5dc7514e5e..ba89891f2990 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,3 +1,3 @@
 DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
-EBUILD jed-0.99.19-r1.ebuild 1116 BLAKE2B d0b834d87a0a8a46ca464e2c50e1a2f8bd24cda45758431cf1bd09cd801f94cb2ecbcec5a6e9db014656cfe9f1beb022e2cd6a3e2d192ccee8538d57283d96a8 SHA512 778482d8c54f8608a75ef5dc390f7eee6ac425d1cae12fafc646749a43aa68e355e9a31184a88347ecf9b0393e7a7eeb31ea385926924bf686d082e00eb27e1b
+EBUILD jed-0.99.19-r1.ebuild 1105 BLAKE2B 2ed0e3fee05c5b3281da374edb3142e2d8839e7d52bb034f86b7be8778142041ba738e54c624171c6796dab7c4642548bc80ef82f4bf171065004b8c9fd5f876 SHA512 d07ae32ffabf6c7bb4fe8fed292c9486ca97bfb3c9373feb51df92997804d00ce881b67a06b87c076318ea55b8a5a673ee1f01322c21475b577e2691e20c77fd
 MISC metadata.xml 614 BLAKE2B 023aea459e74aa16cbfd069da28b6c2bc1b87e17be50f1f49e4f070ef8764a75f53b56b6d61a9741caf93ccc1b07cd34a523940754fc33cb6591bdf7f6f417cc SHA512 79f54c7d84965a95e575c4c38d5c9a2158de0a1c539ee32f5839312bed707c8d0df00f7733c3cedeee1cfb3ac10619ff60dc0441f7062535f0d7f79094f5443b
diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild
index 570f81253bbd..2eef627357ee 100644
--- a/app-editors/jed/jed-0.99.19-r1.ebuild
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gpm gui xft"
 
 RDEPEND=">=sys-libs/slang-2
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index c2037973982b..1fff5a40ea82 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 1158 BLAKE2B 145b954ea3ce8b8afe1fd2793d9af57159fb2d021b5600c284462de0c445d638a88697f261ef26c28ce5187d1883f2d3f08e5ac72150a2dc0fad2387cd15ac45 SHA512 013d1b85907a1d109250b046d5f47a9bc846357769817646fd3ac927874075ae9488ff42ea4f4fdcf36b3c180db5bde4baba3a0435adf760245acff0a90288db
-EBUILD joe-4.3-r1.ebuild 1291 BLAKE2B 1a62525a75484f923cde6f6b9f4b769b583bad532231d8dc5c19b265958df88a0c802d0930a20fd892520c4621221c31a2e725bf52cd817b2a869c0c5e76077b SHA512 86585ca0aaf4e773217937fe3fa9e18cc8827f2d578982c0393bb51877f17e061b1c7f4b3502a826c253d84e1d20740cfc29a591c86eb47b248a8d1616d16da1
-EBUILD joe-4.4.ebuild 1291 BLAKE2B 1a62525a75484f923cde6f6b9f4b769b583bad532231d8dc5c19b265958df88a0c802d0930a20fd892520c4621221c31a2e725bf52cd817b2a869c0c5e76077b SHA512 86585ca0aaf4e773217937fe3fa9e18cc8827f2d578982c0393bb51877f17e061b1c7f4b3502a826c253d84e1d20740cfc29a591c86eb47b248a8d1616d16da1
-EBUILD joe-4.6.ebuild 1462 BLAKE2B 684ad19dafe19a2a47c247f02f07de8da5655fcd47cb861970eb3bc6912f6c3aa0b3a89803394dbc9517291e0e3b51f717d8d5986f1706275c17be664ee038a2 SHA512 c341789a5c75ff599de600195ad5aa3eab06224f0dca832009e5bef5443ec5694ebf227dfb0ab1f2d22bf750abe93fffe26a6b0e9bc9c7f3bf3cc230b9583ed6
+EBUILD joe-4.2.ebuild 1147 BLAKE2B 8678ad20d1dccbff057cfd3a0848f8b31382b47d221ed289c9c85b18e81edce0f890432efacb081ee7fe470295efd72e7ca33c6d4e9deb733bf4b228a1a7f7e5 SHA512 c813ff926b3cd19ba57c0917c857f5482c78371f0c53fd5e7ca02103bc8a78307f590b10f06addc73c1a2a682434a35244b71048acdd2d2e0c7ebb25b6f6c4ac
+EBUILD joe-4.3-r1.ebuild 1280 BLAKE2B 57aebe95a494218e0594f3d842ba6fb126496f19b3ba9fae3d3976f981f21677a3765ba54bff15b006ac3e366f3af4a78ffb22ffcfce0223fa81a99b8fd48790 SHA512 7235c4fd3909e3dc2cf0d96051182eb2859c379f4b2dd7b95c8eeddb36deda8556bfc3a5a2b8932728734bc0b2e1accd7938f5f31a2e5feda5967f2cb85a00b7
+EBUILD joe-4.4.ebuild 1280 BLAKE2B 57aebe95a494218e0594f3d842ba6fb126496f19b3ba9fae3d3976f981f21677a3765ba54bff15b006ac3e366f3af4a78ffb22ffcfce0223fa81a99b8fd48790 SHA512 7235c4fd3909e3dc2cf0d96051182eb2859c379f4b2dd7b95c8eeddb36deda8556bfc3a5a2b8932728734bc0b2e1accd7938f5f31a2e5feda5967f2cb85a00b7
+EBUILD joe-4.6.ebuild 1451 BLAKE2B 22ead97178fb10352f96dbd1626621d952a44de87425a9d7d3147b03c2863469209d7b320d0da3fbc2b2031e7737d78195121f3137afd30af8b60e53d933eca5 SHA512 593767e422cc2ac1c6d8e423919cd33b5b679192d2952594e3309fa7147cb2df395717bd2c34903a9aca517b764644e2518898155d7eb120d520e3fa4943e405
 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 913080d78e83..4a399380f488 100644
--- a/app-editors/joe/joe-4.2.ebuild
+++ b/app-editors/joe/joe-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 59e1e2d38a2c..6f21f2fe2ff1 100644
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ b/app-editors/joe/joe-4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 59e1e2d38a2c..6f21f2fe2ff1 100644
--- a/app-editors/joe/joe-4.4.ebuild
+++ b/app-editors/joe/joe-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 dcd75491611a..0bf861b42de7 100644
--- a/app-editors/joe/joe-4.6.ebuild
+++ b/app-editors/joe/joe-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 7ebc8c7bd4d1..8153c6e93ea1 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,7 +1,5 @@
-DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
-DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
 DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73ce616e1c29ed22fbaed42cb78e7c9fbcd2424d98f86725fb00cee5160be4fe40abc97a927201557b684f800 SHA512 c6cda5544210bc3d3fa3cbb8494e60949e10ed3716d96b76d0c9e7f5671c7a85f6e7e7a860cfd05466f1bf52112053c722441ff338210c0ada89f10515ac170a
-EBUILD mg-20171014.ebuild 1023 BLAKE2B a6b86a471504c94104f4b4174cecfe878104b8d3d18ee6e5b5d005e7c19ce03582e68f6306ff8190f4e0bddcf84b223fd1d2d7b3d923c82c6f794daa0c370000 SHA512 845d09a9e38d0315cc0c2383aa3d65770b73c6dd8a494acb32c471b82d5243072236324a5428ca5a9a6200b75b0fe7a8366c4a94bed2c0f48d683ef36ad8628c
-EBUILD mg-20180408.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
+DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
 EBUILD mg-20200215.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
+EBUILD mg-20200723.ebuild 1044 BLAKE2B bcdd18dfbdef4e09f9ced625ce21a8a391428942f74ab42c3a2f126449fb87da1e53c51643f06610ddc0250182d698c6b8ff4ea90763fa109475dd7c4240666d SHA512 e9ea391a0f88264c7d688c503f0972d00e4d489960b2c14b470d362dec6137f71ca7ac8fcca07f1610182524c28978fa1b4589c7d4bd8e46a3b9f4690495e180
 MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
deleted file mode 100644
index da406b5556a2..000000000000
--- a/app-editors/mg/mg-20171014.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
-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"
-IUSE="livecd"
-
-RDEPEND="sys-libs/ncurses:0
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix path to tutorial in man page
-	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	dobin mg
-	doman mg.1
-	dodoc README tutorial
-	# don't compress the tutorial, otherwise mg cannot open it
-	docompress -x /usr/share/doc/${PF}/tutorial
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20200723.ebuild
index c1f6b5cda47e..20816904f732 100644
--- a/app-editors/mg/mg-20180408.ebuild
+++ b/app-editors/mg/mg-20200723.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 207db4f4d54d..fc86be47b249 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -3,8 +3,8 @@ AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea07
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
 DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
 DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
-EBUILD nano-4.9.3.ebuild 2314 BLAKE2B 6ad80caf842f9562d47fa504ed62523a5dd7f5a40921b94f540e5e879b4ab644353ee09e929ca09a80b75617bb1f48e99db25fb767267856099bd9c5b1060a0e SHA512 d55df8945e1189d8f2de2df4ab488310110bcf16ed4db9a31fab653265322971b02adf1aa64acd282e12112601c60624891b56cf22fc0d994e51526123b81bcd
-EBUILD nano-5.3-r1.ebuild 2428 BLAKE2B 5b35807d417b29832e135e0cfc086e01b2f767d510d56ed803e3a61b9fff2ed4fdd874edc0d43c4115297619aaa52c29952985e232772d10433e50c253a054fd SHA512 9b4eadad439cd6c3736dd5d198337901d9e4fa8170cbf6d3bc02e0f4066f0fd410113261d0d2285048fa3438eb25aa5156bc488f15e62ba0e329568ae0e1c1b6
-EBUILD nano-5.4.ebuild 2437 BLAKE2B 9b40d0ff345a2e3763b887bf1af8fa97b60e419eb0305ae315e675d5024f0112006ec30180bff701a7b67a0eb8c5715b099b02926f1125b006b5290706a5a2e6 SHA512 beac9a18bcea1ddcf5b29680d548c6d088a7073a750e0ce60f80313839743e034433ef295bd8be5bb30f281ec0581437e0e14c9fca14f162376c26438ec000ff
-EBUILD nano-9999.ebuild 2437 BLAKE2B 9b40d0ff345a2e3763b887bf1af8fa97b60e419eb0305ae315e675d5024f0112006ec30180bff701a7b67a0eb8c5715b099b02926f1125b006b5290706a5a2e6 SHA512 beac9a18bcea1ddcf5b29680d548c6d088a7073a750e0ce60f80313839743e034433ef295bd8be5bb30f281ec0581437e0e14c9fca14f162376c26438ec000ff
+EBUILD nano-4.9.3.ebuild 2303 BLAKE2B ae1b5d040e6c7be9d49ca11fbf8dd63d93b6ae74093ac9795e8e9c0f61532b4dae83ba4ecd1179469edda487babacb0c4fafcb23155039d2ba052bb01d1026e4 SHA512 7afddc9908b55b2a397915a2a1716c775ac09666eacee600873a19bf0103c49202daa5880a9f19115b6a1488f42dcab16e235cec2c3f8b285254e51a6183fbeb
+EBUILD nano-5.3-r1.ebuild 2417 BLAKE2B 67f81d38936522e480337cdedd8156835e01c92cfe80f4126787015e822ecaec935bcb008a6e02808af155f0dc15b14d3cb209e4583818f1a0a45607004b4bae SHA512 a4b0af913ea15fcdf05e2a6d76eabedcd7833d2a01f879223c1a39a8b670c46c7230b36cfffc57f35b971c875552d21ca184dc108bcc044c87551bd4067f5312
+EBUILD nano-5.4.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af
+EBUILD nano-9999.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index 47ab59c4337f..869ecf6995d1 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index cc4d86a9ef47..6f1437da2a77 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.4.ebuild
index 46e2b65518de..92473ae856c8 100644
--- a/app-editors/nano/nano-5.4.ebuild
+++ b/app-editors/nano/nano-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 46e2b65518de..92473ae856c8 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 5660dc822763..f0a9a168d9a0 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,5 +1,5 @@
 DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
 DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919
-EBUILD ne-3.1.1.ebuild 1118 BLAKE2B 3cdcb4ccaa8df16f2841f1ffd058c57818eea93239993d2815de93ebaca959edd85e540915164373b6756ba59ffae9413ab6ab3fea442ab48dd1b795e99a9d10 SHA512 145bc2a8931119a6b5cc6604db38a7ca027eb00d3363831d187178e7a40e8bee3174291aa864422b97f1c0924dff05037ea6d44eb5ca1159895aacddf40f437f
-EBUILD ne-3.3.0.ebuild 1014 BLAKE2B d7af8d7b8457d5784417427c121c4798f1721953d614cfe53fb7bf819ceb731ff5807ed28eadfcb4fc91f23c800a521f3ef1be2f4a891df72e5f364e844e738a SHA512 125fa01b674e4d39c460fdf53d49a1b7833f80a927650fe7d6a1e028d8170dddcfde4f1d518dd2fa568cf8137e4bbd378e2578266e9452f9df5bf38417cc5f07
+EBUILD ne-3.1.1.ebuild 1107 BLAKE2B fcbe4b009d66a096013ab8f1460166aa94987bbbd2f2cd9b193aa071193df850c46504e530479844c3550a4023510e2bd0297bb04ef8b57c1492e3df0dfd4099 SHA512 6c87ce4bcaada04ae7d7518d4773f4362711313612d4d93ce477321b0d0cc7668dd08c9b885ed774a5e31b0f913c6f1b3ef5e54bafb23c6f9bc8d5188230d5e9
+EBUILD ne-3.3.0.ebuild 1003 BLAKE2B 120daab562298b35f1ccdad4293ce6ce9e50426c88471b876d75e97d85bd3f7e8472a82a6a9460e57a042ed6ede3e4a333ee87555653d843a14b536ffc8f8b1f SHA512 0b80373e820a5509844015362b3a1113c0f703a2b3dfb412b0609efe0019ac17d319f9ee52fe54c568782c0e44a5c9e47fd495f820fa24a76e6dfaa25864044e
 MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild
index e65e7733fbc3..37edf3c0de09 100644
--- a/app-editors/ne/ne-3.1.1.ebuild
+++ b/app-editors/ne/ne-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="tinfo"
 
 DEPEND="sys-libs/ncurses:0=[tinfo?]"
diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.0.ebuild
index f90eeb484b77..c1c60d57ba1e 100644
--- a/app-editors/ne/ne-3.3.0.ebuild
+++ b/app-editors/ne/ne-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0=[tinfo]"
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index d4fd8d0adc02..8e8f2187dbd0 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 932 BLAKE2B eb6eef7f01ebfafcc26f7fd205a2c2ca0e06024d0c8124de4d7e18fe4237924ce50b05b5882b314894d65e02e64dd33fc3289e920e2df2e16f86b37d5f7bc74a SHA512 de079dad8358ea93fc03dd21658a3855c54d2ddded1e616b31d33ed8d216ef6f862a266053bcd9cd772e89e5e3b20a5e5c5f3303c58a441ba22bb9f36b34380e
+EBUILD vile-9.8t.ebuild 921 BLAKE2B 673d5ff4ccdabf5a4f4bdd3d31bb23dc84fb80af53b35b7c8b8a5d9564104874975a48ab3867ab01898e069f21cfb946d2906cbd9baee400abee37dcba3c4d2e SHA512 51e426b58461b8abb10bc6615cb88822f9d512697ed67778f2f336b78686abbcee2cdd4c0a76632a7f0b5e41ee8e371dfdc4c0c02d0c4c4ae78171d98a32ead5
 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 36834959d075..41c4ef2224ed 100644
--- a/app-editors/vile/vile-9.8t.ebuild
+++ b/app-editors/vile/vile-9.8t.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 317fc8b4b8b3..4970294b4f40 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -7,9 +7,9 @@ DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1
 DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
 DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-EBUILD vim-core-8.2.0360.ebuild 6886 BLAKE2B 77bade4a1b661d4975f344ea5b15510a398fa6269f5154891ab1b976aa7e93a00d57d87ca01caef9b22b43fa5b3dc38b535440ee1aa73957e6f756913cca242f SHA512 47d24233d9d707f4566d59953b2f2eea79d70a7fa0a51f1cb7eb8d6beb52dbc8bce7fe99c0e5d7d74b637e28a1d1e2997f2e9f839c5fca2b7f161342fa820b2b
-EBUILD vim-core-8.2.0508.ebuild 6912 BLAKE2B 7ad480da6995adcc16f2bf8222a4cdd49ad661586d4ef1e194662aae595365baf347b2143f507491b9181ca6511417e8dd6afe72128bfc0e4a54a0a525bbe3c5 SHA512 7eb7dd4eedd0d46feabb1856fd96f97acb134c9f08b10a20b435c83dee8b6bf8d877692ec72d9cc41e1977826dd684d297f393cdb965e93cc09e4671fe83794c
-EBUILD vim-core-8.2.0638.ebuild 6912 BLAKE2B 7ad480da6995adcc16f2bf8222a4cdd49ad661586d4ef1e194662aae595365baf347b2143f507491b9181ca6511417e8dd6afe72128bfc0e4a54a0a525bbe3c5 SHA512 7eb7dd4eedd0d46feabb1856fd96f97acb134c9f08b10a20b435c83dee8b6bf8d877692ec72d9cc41e1977826dd684d297f393cdb965e93cc09e4671fe83794c
-EBUILD vim-core-8.2.0814.ebuild 6909 BLAKE2B d5620d9f81cce0e25b376923071c584ae29e14284b4c223366e9ee38bf3c69f79a7869ac82d02a935cbe4df2f507ee89870149390ce6533b966d760d3362ab38 SHA512 010e8296674146df5093f64ef66c1f3fbd8953ebe0f8d58292c7dfda3fde270e850353145e00bf6b707066e31791d90bb4a899efd22ab0943e2bfd4724668bcc
-EBUILD vim-core-9999.ebuild 6893 BLAKE2B cec29396ce12aaca613e9f58c8c6fbf11dca6783af28b579eb74a8f95faf65924b35a43f1dd7931ac7b95f83c7c3bc498f47e92c7d1657f534d17dbfbeba3cf9 SHA512 cc9a3d7b4fe60d1367fcd9bad47abd9b632bd2a2f669adc8571d682bf008bacbc31b53faea2ed1dab006d88271df760e1094421644f2a3b65213c31c1e377098
+EBUILD vim-core-8.2.0360.ebuild 6875 BLAKE2B 6881ab9720a664ec105daa3159f359ef4daf63e6c687d235b0c3eecce4a9629be5f06a887cc4fce0e621a39a5eda3f34bd7355d2084f8b7719bf97a2caf820d4 SHA512 3502ea1efcbd9be140367dbaa8bbd22fd069e2a72fa82be10ab6953019d7840912db332b74adc09934c5e3e4a4d460214b939b3c8ecd4a4b4ca464e7db39480b
+EBUILD vim-core-8.2.0508.ebuild 6901 BLAKE2B 967b665e303eb59ea0bff03db8c38b5b6c9828c0c019303422191837ccff5bc1f8ec4ae737e2e8312169266f1bd70b8852c78e5e8ac79cca3e996bcc85f6701b SHA512 dffbb03dd8d94454a718bf280859100b87199fc3fa6b9d8d6758219e573bc8abefc8ad75897b78687dc1c4053d162de56c63da04d1c7cb7cd73b54fe9d60c51b
+EBUILD vim-core-8.2.0638.ebuild 6901 BLAKE2B 967b665e303eb59ea0bff03db8c38b5b6c9828c0c019303422191837ccff5bc1f8ec4ae737e2e8312169266f1bd70b8852c78e5e8ac79cca3e996bcc85f6701b SHA512 dffbb03dd8d94454a718bf280859100b87199fc3fa6b9d8d6758219e573bc8abefc8ad75897b78687dc1c4053d162de56c63da04d1c7cb7cd73b54fe9d60c51b
+EBUILD vim-core-8.2.0814.ebuild 6898 BLAKE2B 12413f5748072519c1638b4c162c42bbd87e1602514943b7c6c486bcd01d29ca480fd48285ff2030400150e192a07fa79f7403e8182148f4970a09301e48da18 SHA512 d63523ed3cfe6a2d9e9f3504080d9c84d92f78c11199c40717f13c4e58b4fd6050cbac6c42a54265cb1a699e2fad4bb383b2a95d6298e5b817d38fb1908d2737
+EBUILD vim-core-9999.ebuild 6882 BLAKE2B 3ef7200aecfa15b15e5ed1871606b6474aa2e06d7ce4292312c90fbab0792752ee0839014c82bba841deb7d0b1702cc38c6001945e5cc1beb8bac45f02912939 SHA512 4b4b4d6d2c3cd1ce9f5e44c63dd7939c9f75685dd2101709d396a779ee45c90881191bd99cd07fd711c0c7234bcc99aca80b808955f8e30b7b08d16839af1aaf
 MISC metadata.xml 372 BLAKE2B 6a58d097c342a656a226d27d236fb952b31fb4c71a29333a60ec42db7b8bb1ae601e3c717d9c0fda939ff17eab70be2150a0dfeb26ca5b3d786c9b6050efde86 SHA512 63bca13db3d5830cb58e6a848eb444e72ceaf442bf41be1858d80805dc36cc9b9cd363f480feb8dfe1c7bf09cf4685a665657353867742d13f10fd133eba66f2
diff --git a/app-editors/vim-core/vim-core-8.2.0360.ebuild b/app-editors/vim-core/vim-core-8.2.0360.ebuild
index 91a7938857c3..d5485457d7ed 100644
--- a/app-editors/vim-core/vim-core-8.2.0360.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0360.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0508.ebuild b/app-editors/vim-core/vim-core-8.2.0508.ebuild
index 3bb10a9d3a28..f141342833a8 100644
--- a/app-editors/vim-core/vim-core-8.2.0508.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0638.ebuild b/app-editors/vim-core/vim-core-8.2.0638.ebuild
index 3bb10a9d3a28..f141342833a8 100644
--- a/app-editors/vim-core/vim-core-8.2.0638.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0638.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild
index 8e717cace0c9..5ef38f9a81c2 100644
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index a4aee4e9bf95..361565c7977c 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index b7f774d919bc..042db0ad344d 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -5,10 +5,10 @@ DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1
 DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
 DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-EBUILD vim-8.2.0360.ebuild 9057 BLAKE2B 6ca0889f21f0969d20d819315e840603fc4560fd3e8177817aaf38fcbbc800b83b5318f68ecfd765f96a38bd434d6691f93d3134e6a0a9ae70d8b61a17dfcdcd SHA512 c455b5b7b3726c2b772b12105ab11bf2a7ab29f0b443c90e7b426e8e95e880e61f62ece9be74fc29e9c83883fc34538e9ef395f8555a96f55570a8d6da9fb1bd
-EBUILD vim-8.2.0508.ebuild 9083 BLAKE2B c062f60cb580d782263d99f3a6d26a204f14b68a87d0fcd074e4c3a6112bce7de0de658a2613e92b4f8ab94b4f8522df5fb8eadf8c8caf87a2a23b54ffabd7f9 SHA512 138df52ce7a221d09df17cb7a540dde2ff955b82c17442820a7b5cedf12181c29031b7db255052c05eadc30f979baac63a39fa6c64e2570366417df40e6d0b94
-EBUILD vim-8.2.0638.ebuild 9083 BLAKE2B c062f60cb580d782263d99f3a6d26a204f14b68a87d0fcd074e4c3a6112bce7de0de658a2613e92b4f8ab94b4f8522df5fb8eadf8c8caf87a2a23b54ffabd7f9 SHA512 138df52ce7a221d09df17cb7a540dde2ff955b82c17442820a7b5cedf12181c29031b7db255052c05eadc30f979baac63a39fa6c64e2570366417df40e6d0b94
-EBUILD vim-8.2.0814-r100.ebuild 9241 BLAKE2B afae4e0ea8629a8d90172f12821d098e992384a40f962ab2e70156c1ac42f1ddeab97b89b74cdd9c3639bb157ecda090b3fd87b500b70eaabe1e90b2fc02f8dd SHA512 eef286c23fb35363f959db57dc683db727de991538b0bd0181bb48299fa0ee36b05f03f94f1e75b2e3b2f9e58cfe2448bb1411831a46ac2a157f8fd15609ed44
-EBUILD vim-8.2.0814.ebuild 9048 BLAKE2B f819be9b5a3a827612046cf7d237c14c434743db2b8611ce95b62a1681898aa39a4c3c1878f74dd74ca6d48d60615556c354782f4addb5a6c3b716ff89bfb4e0 SHA512 d915e7291c7312059ea7f06278a81aaab791ba4cb04e867bb0aac63593b97171f0b4c2c043325f2c613eef3f65051f08161e7925bdb6af5d9081498a9bf661fb
-EBUILD vim-9999.ebuild 9241 BLAKE2B afae4e0ea8629a8d90172f12821d098e992384a40f962ab2e70156c1ac42f1ddeab97b89b74cdd9c3639bb157ecda090b3fd87b500b70eaabe1e90b2fc02f8dd SHA512 eef286c23fb35363f959db57dc683db727de991538b0bd0181bb48299fa0ee36b05f03f94f1e75b2e3b2f9e58cfe2448bb1411831a46ac2a157f8fd15609ed44
+EBUILD vim-8.2.0360.ebuild 9046 BLAKE2B 8459058d3949155d1e2082574a6b781911adc33b8bf595036313ff4c32133711a6775a7c0b112c9a25dacac430335f2b28891ac34720bebb79ccdbf2d8964e36 SHA512 1e4ec08d88549c0422bd72a67e778b71b6ee10dad3615e8b6ad1b1ada7106376099016a6f291f744e7091998734aabb2871a9734e5e4ac9e68a64a71d3f23381
+EBUILD vim-8.2.0508.ebuild 9072 BLAKE2B fd0c7ad49a1ff9c4b6e645038fd77573cd901803865486c5160a2887301bb2508513368e8437a75864e5091ca215963d94ae7f89c3136241ba9b60538fbacf8a SHA512 5664877249256f51a2753ba0e7026e4eed8e5bc9250b3acfd0463ff99babf227391233f007bf56437d758e5039ac7bf941b49c4381c22a319657891695878688
+EBUILD vim-8.2.0638.ebuild 9072 BLAKE2B fd0c7ad49a1ff9c4b6e645038fd77573cd901803865486c5160a2887301bb2508513368e8437a75864e5091ca215963d94ae7f89c3136241ba9b60538fbacf8a SHA512 5664877249256f51a2753ba0e7026e4eed8e5bc9250b3acfd0463ff99babf227391233f007bf56437d758e5039ac7bf941b49c4381c22a319657891695878688
+EBUILD vim-8.2.0814-r100.ebuild 9230 BLAKE2B a1076be848ed46f432ab9d390ecf93fdd6d5c50956d0c773da95e38a620e8baab6acaaf918ba8b547c0ef6b57bd6aa30242c243e4c75814ef804965a60559ebc SHA512 ef408b1466f375f18ba3abe59e2269d476beba282907df69efac831bc72d9fa83e8250f96e0351d669144daa57e296aa89f80aa5e790ff472801f425616b9f17
+EBUILD vim-8.2.0814.ebuild 9037 BLAKE2B 147f818f86a123f990ebb6301c7a860f9547060965f34add77d2b3ae215195c362a108e5f4c31c78e386750876afbf56a7b7939ca0fdf7982956d52b96e995b7 SHA512 5b36257b17dc28ec9a0b505e750ff3e147eecf76e906b20702f75ec28d7dde1493dad53266940076aa6b0e93f98482a1e4d8ef63ea7b2cd6b3c828d5981dc586
+EBUILD vim-9999.ebuild 9230 BLAKE2B a1076be848ed46f432ab9d390ecf93fdd6d5c50956d0c773da95e38a620e8baab6acaaf918ba8b547c0ef6b57bd6aa30242c243e4c75814ef804965a60559ebc SHA512 ef408b1466f375f18ba3abe59e2269d476beba282907df69efac831bc72d9fa83e8250f96e0351d669144daa57e296aa89f80aa5e790ff472801f425616b9f17
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.2.0360.ebuild b/app-editors/vim/vim-8.2.0360.ebuild
index 92f316237417..637ece553d07 100644
--- a/app-editors/vim/vim-8.2.0360.ebuild
+++ b/app-editors/vim/vim-8.2.0360.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0508.ebuild b/app-editors/vim/vim-8.2.0508.ebuild
index 3884337fb862..bc400ad26a2c 100644
--- a/app-editors/vim/vim-8.2.0508.ebuild
+++ b/app-editors/vim/vim-8.2.0508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0638.ebuild b/app-editors/vim/vim-8.2.0638.ebuild
index 3884337fb862..bc400ad26a2c 100644
--- a/app-editors/vim/vim-8.2.0638.ebuild
+++ b/app-editors/vim/vim-8.2.0638.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild
index 51113346621f..53ce2e38ed21 100644
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild
index f2d17bf17958..7d5909ace05b 100644
--- a/app-editors/vim/vim-8.2.0814.ebuild
+++ b/app-editors/vim/vim-8.2.0814.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 51113346621f..53ce2e38ed21 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 99054cc349e6..6a4f0141b036 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,4 +1,4 @@
 AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 950 BLAKE2B 49fe9c2eb89319395c7e0b7d9e86289da166310b790818f9090c44c7a7bf2dcab713d25c67141a19727360acf71e9a9253ee53e17189d7b0328e3352fe55d81c SHA512 664f046e92bcec6884509a775ec3fe9e83e7adcc955efc1a1cfa3c97a8565c9a4813c22f03d7c8aaff69c6a020eddd24cc694ba914cfe0677ccfc3f73b0632d6
+EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 939 BLAKE2B 5e934e0f17669e683316bbe9534e28b33e747f3db4ea9f0d84b1fb96eb2d2c663022f42c4a68539c5827796ad5cf1dfe6eff8bf22ba4a5f023d924f2ae5a435f SHA512 4c8c6e13755ba3064063aae517368f5016061b2f56d65f0fc59a97bc1b8549253c46fec1462c2c4dafe4125fc8829e10fc72a6aa7725c4624e2a0855211e89db
 MISC metadata.xml 250 BLAKE2B 113a0d77e4ddd91ae5487bc89371d2973202f242a3c9a8899725295e62b51c0a64437ab158b40ba410c671f92fe3efb896b1446f7301e1f1e923baece1cb7e04 SHA512 20703a39d4150e2a8984fdaeb997da464e98e6abc363e5e07fee46954d5af19c861e40648fb238b763420349e3ebeaa4bf61a621ccff3ff77d6e629c61095bb0
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
index 350ac3d80db1..df844c1b0b70 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua nls"
 
 RDEPEND="
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index fdd4e9ae1b6d..f6dec096b383 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -2,6 +2,8 @@ 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 1379 BLAKE2B 9022e257d9d00a3a014d9370b2b8b0b39997c7c1fadd6f9d47395c6893fdc9e45f8ea31d3255512349cbeaab1070144c9b968a051c8ec19aa7cf43c1e1f847fe SHA512 4032897a26174daa4d28024e05092992c9f5bf259f760c63d2327bdf647a45b2e0d855c779b29b9ec1544bada1ad986ea6d23b12757e01883d384ed20a4bdc32
-EBUILD zile-2.4.14.ebuild 1383 BLAKE2B b10f697558df0c02cfc2e00aee541da89aa633faea9f3b3bf9469e8c5cefa20fa2f5712de25bf655e0df690d90869671ba4c4f1b5f30e47017e59ace7c6e744b SHA512 ea99a1450d377fc859494f4b6142873cf678f683ea9216c70514e4f43e3ebd61f370bf239a30ce53c4c552961ac8a709a79484657e835310b7a47ba59ae57ff3
+DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
+EBUILD zile-2.3.24-r2.ebuild 1368 BLAKE2B 308ea08faf165d84b31d2930ecc0fa61bbb087dd009acdc0941743d2738bbd94633672f067854a40d1a207db58af3ca0aca8e704675543bb5185ff7548c47405 SHA512 f721e9f61105809c3eb463f9f0d6e42d3151f32ca98d8e5b26ef46151186bb513036b8be5cda37b3deea48b9713e4b8d9652c5564ef17b5acdefab813a753960
+EBUILD zile-2.4.14.ebuild 1372 BLAKE2B 66fcb554a699b077a46493e517184ab2737e7b7b71e33a0cbb10bcff258f20a9ebf5eb428570e475d8ef818a575171790818b4ee6c264a0c7d0b69c706127015 SHA512 0b556569e60c4f102c41610787ee429e05669731d28ff334ad1d0a075beb25d61efad62c82f7a92919d83f117258fbf684f80b5ce12aa7097e10f1b2e4d04a7a
+EBUILD zile-2.4.15.ebuild 1099 BLAKE2B 458fc420804ca59606b3f7c5bd9fc4e71ce53c89518b61890e861c744066bf8e73ea13a03ac2343f892ef1d43c8f525e4e7def6948e1a7de8efd141a705064ce SHA512 261f0a2de7f3eb2687b9ca7c0f37aedfd195c9ea61a1db5cd2d2530eccf5f37cf66dd7a08c7b8226958ab8d67b2356e9b7ae77e60ebd8c4a3dbe2e43968b5ca3
 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 c796a61701ff..a283c37c087d 100644
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ b/app-editors/zile/zile-2.3.24-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-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 06dc725535f0..38cea8b08e8b 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-solaris"
 IUSE="acl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/zile/zile-2.4.15.ebuild b/app-editors/zile/zile-2.4.15.ebuild
new file mode 100644
index 000000000000..07c97a015ba0
--- /dev/null
+++ b/app-editors/zile/zile-2.4.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Zile is a small Emacs clone"
+HOMEPAGE="https://www.gnu.org/software/zile/"
+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-solaris"
+IUSE="acl"
+
+RDEPEND=">=dev-libs/boehm-gc-7.2:=
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-lang/perl
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+# AUTHORS, FAQ, and NEWS are installed by the build system
+DOCS="README THANKS"
+
+QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
+
+src_configure() {
+	econf \
+		$(use_enable acl) \
+		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_test() {
+	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
+		# We have a sane terminal that can move the cursor
+		emake check
+	else
+		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
+		ewarn "Running the tests with unset TERM instead"
+		( unset TERM; emake check )
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /app-editors
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)