gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /app-editors
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
80 files changed, 172 insertions, 254 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index da08244a0ca7..33464a60a489 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index f4ec555ceffa..b724938d61be 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,5 +1,3 @@
-DIST e3-2.8.tgz 119939 BLAKE2B b0882a359126d392a3e24971b1f2e39572bbbe0d95f388a4b75e8cc3e4424e798ddc381c9489ca65452668884abbacc2c27c33b6c7f230a6eb4d44986313a42c SHA512 f3443ac558203b6921458761174ebc060936ae9f8a834670044152b9af52e0919075ac8110ba47b4b6f4e8261afa917e9fe49492b8d40d38d69987353ddd5189
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 832 BLAKE2B 0f7d39ce8a8335eb5a844d5a4bba73720aebca318a602e59f5099ee714b33151d85958f5a391d3a2c69f0dd097fbdd97ff98a2adeec8ee37681083d4a8ea182d SHA512 a720cee4f389cf7da775a3e17c3f041ad5c40cc2da4ce0be23dc0ee992a8c9040285f1ab2493897dd8f4d95c14fa19f29a29a3b194802587eedc63508c6d306b
-EBUILD e3-2.8.ebuild 759 BLAKE2B b59b4cbdf6b7c5752957dd1db03b77321ef1d89b600278abe5a841efe37794038c4aa783189fca0464d7a0f7c8671c292ed42c41232bd541d8d486cfdc72693e SHA512 d76af36d27aee6a1aff25d85c89dee78c223009caee6d8b5f57e66f6b5818aae97324203391ba91e03c5cf72bcc8c658d024660bffaf0b874a9ab68b34e49799
+EBUILD e3-2.8.2.ebuild 830 BLAKE2B ccded20d0b24cf7a236a849bd8c3ebe350aba15038ea49bb499af0a7a4d9b29978b29d82e05963251ba45267ab2a471ec0a027e6c2e3fd5b6e124163b306b96b SHA512 f97dc85dcd00233d110ee2de507019e77dff40023b82e1413e7403625ffc976165c952e4026311ae647021bb0170e115374f8af81b41ceb0e5b065f82309867c
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index 396ed8eb0f58..4d675fa1428c 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sites.google.com/site/e3editor/Home/${MY_P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="strip"
 
 BDEPEND=">=dev-lang/nasm-2.09.04"
diff --git a/app-editors/e3/e3-2.8.ebuild b/app-editors/e3/e3-2.8.ebuild
deleted file mode 100644
index 3cb12476d34d..000000000000
--- a/app-editors/e3/e3-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
-HOMEPAGE="https://sites.google.com/site/e3editor/"
-SRC_URI="https://sites.google.com/site/e3editor/Home/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-
-DEPEND=">=dev-lang/nasm-2.09.04"
-RDEPEND=""
-
-src_prepare() {
-	sed -i 's/-D$(EXMODE)//' Makefile || die
-}
-
-src_compile() {
-	emake -- $(usex amd64 64 32)
-}
-
-src_install() {
-	dobin e3
-	dosym e3 /usr/bin/e3em
-	dosym e3 /usr/bin/e3ne
-	dosym e3 /usr/bin/e3pi
-	dosym e3 /usr/bin/e3vi
-	dosym e3 /usr/bin/e3ws
-
-	newman e3.man e3.1
-	dohtml e3.html
-	dodoc ChangeLog README README_OLD
-}
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index eaa0b08c46fd..db1bd7cd67b5 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,5 @@
 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
-EBUILD emacs-vcs-26.3.9999.ebuild 13154 BLAKE2B 6b980e670978f7fd071371f8aa1e183866b693940fbd22097ec623cf296b4f3af659c833e464d2b3f92487d1d420f9a5ddc30eb96aa97720f867de2e49c2b717 SHA512 7d032f2208854f6de28b972cf3fae3640654c6886c30e297bed32693dc5f1c546d65567378ba7a35e6192e3751fec81f4a3ed64481731f9745618ef85d4f6d4e
-EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13047 BLAKE2B de9c8b6f6d1d70ab0c5d2c1b1550c601596746f75b0409b9e99febea199b496295b22e3b37db168c4931285da3b2b61dc30b85a499c229e9ec543abba6221a9c SHA512 0e1233b711510e42a0d2d43ac80a00e5da52b9d5483e299f678a7d2a8db26d407b93d759ea7b6fb8889abf9418044edd80ea175b8a014ced87ea40c11791bace
-EBUILD emacs-vcs-27.0.9999.ebuild 13364 BLAKE2B b263d41f52ea74503cede2d8e49a5ce26f2640a56dcc1aa5a9cd3a9553b517418de5b810831e185282398f6be2374a2188cc5bd2a5650bc5f08cb6051c88fe2d SHA512 d55512c0891e7631d6f9aaa3f6f4e1908d08ce9183188f9b0f346c30a248c27c201081fa363a066a3df28903bcb9ad0949c5d861877621101300dc5718f168ba
+EBUILD emacs-vcs-26.3.9999.ebuild 13132 BLAKE2B 181a4605dca4bada817c59f842c5d680670d0fba6b041d394c4868bce1eb0b6e423b2528b823f88061e28ebbc91778dcbf0cbe33b1eca466cce807a780c4ee9f SHA512 5d6d216bacb9db7f0df1a3812115598d71b959a8280d494943f01285016357af6652dec56747681a901b1e1f6cacf798efa202dd9c24b3bdbf862f7332e1f44f
+EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13025 BLAKE2B 651157980e1e743372c040a259b50e307e5bdb4d725bbc89df27c65f848352a896c7eeff841678eb11b2b512fb5143fc376f74c0168c03c3f6abe95948d1fb2a SHA512 385a6944dc33dfdabbcd98d88757fc7163285d417dbdf64a63a81d45161b1b8129d023b1330bbeaf3291d718cdbf5e55adb201969fda7b827bcb4c388c3f7241
+EBUILD emacs-vcs-27.0.9999.ebuild 13342 BLAKE2B 1cd1c1d1f357f88db5a4f5479fe9c789611ac512102bb6de5ef11a07e2a0f4b16b906dd7483e4fc8ccfec78e0884b5d8608c629ca26c197833b836f0a5e35e0e SHA512 5bd216667e2abcf1fed5b8d5dbc43a8a7b566e9999e213cb4785ca1cc8d667d470e89e4fac68d91f65653e2c79e06bfb52ffb1b3b830b982bb93a2399a987883
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
index a9c9305621bc..1b73de9ab193 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
index 872a1e4ef91d..e4a2a2cd7162 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index dec6aa315d1d..dc1e3f47c0a1 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 82bab4fd5eb1..798043a213f9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,10 +12,10 @@ DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25
 DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
-EBUILD emacs-23.4-r18.ebuild 11522 BLAKE2B d0dc95d2f279b155f82ecb1d938a761d849398c3ed16291a913a9a7190241a2e70f55cc8aa388c833d25febc11cb6b3c31cc9c541a0540ef9e1e47bea7c49ba5 SHA512 ebf32bcb58382e7a2c72d7da1bfe7fe37daece2356514834dba1f27e5f24a0b214e34f19dc057e8b9bd995dcae8f4cb4304c4eb661a0ce4517f206e23b9f6588
-EBUILD emacs-24.5-r7.ebuild 11332 BLAKE2B d45a7555a37f2e3561538be85fea7cd202a866d9080a4ef929f8b5ed94bfcd5f9d9b414008159391cf94b8cd2e3c7ba420a8223f4e7dcd1e119214f136c241a3 SHA512 eed96c5330a721cf4f3712a03bf9dd83da0ede6bc3dfb248fbd35d95d6a0fb57d08ac13197524e7aac1ae2810f8da82ea0d325af54ee6431c8b2a85f772a9e27
-EBUILD emacs-25.3-r6.ebuild 11630 BLAKE2B 012a8919e279c4fc3b8a58fcf6fcafb5a4cf72c6e0900b2100180c1783501ef158940d8f28fb710fe68742dd898b811fc7871ea0aa04b12add67617fc610f317 SHA512 be527b0a8c99f2f9c17b131cd8d042bccda67f477d523075806f3651691b44ccd6c73213f6b0b768b7697e437e246058e8603f404b696e3db35979867093ad2b
-EBUILD emacs-26.1-r3.ebuild 12276 BLAKE2B 06e2d835d77c2c880496d15a816d4b8a40c20975a84ca17dba65e3eab9e74f0d00a36aa0f107ef79d16215688b44ac2c76fd6011d0ba4ed9232d0194c894fc4c SHA512 62dcd801c4809b01f7ff63de196b7a5d7e823343a361439872c3aa5d8c1a018b43215bd5938633fa1286293dd110a327bfe666c4510904ca06aee97028010d37
-EBUILD emacs-26.2.ebuild 12080 BLAKE2B a5ac2c342732eb3efebcef48281c60df8b816511650d3e563e91a83af370918948e7848fb8634f67ce6dc68bf5db5068e65293c4fb45f88e98aaae812436698f SHA512 99ce6986d95ca8ca441d48010c4482c978553e0649b09afbe73d48f02fb5791fedeb38a899109d413913e6e224659c6c03df7860a62472b4bb88289375357efc
-EBUILD emacs-26.3-r1.ebuild 12373 BLAKE2B 06378a95dda2daef4b95f0630acb91e348a615f011d10cd45ee9c6013857dadb625d695a561a2ab7f426bbf30561d4ee92246fc3e8a158bf70003c65d1152df1 SHA512 a42c16addda1301d01fbc5a81984dfb0039805455b101ee372845087608cbf436a8f15da92c1aa4d1693f3b09628b1170be088563474c62052bdb6a77b64a46b
+EBUILD emacs-23.4-r18.ebuild 11500 BLAKE2B d37c199ac7954ea4367b47ba000bb5991a263ff07ec5d1a69ac87f4ec661fcda9caf2c7f9ce6a05cf399fbdab5ad042401872395570a54e2054fb48bfdccb989 SHA512 75231f47f8784138748a4731f6ef369b819adf63ccad62ad55bff1e74b221f7cd4f0210e0c2d5d07ac197f063dedee40c44478f7a4471b5a6f341f4f4850032b
+EBUILD emacs-24.5-r7.ebuild 11310 BLAKE2B 059bb1958c0c562819115d8951b4d9a4594dde3988409736c4807cb3ee254b898eb1f9ba8f71e08736ee26f32b49c8e040e3f81b65faeef06206c8fc8379754f SHA512 dc8dcbaa57f1b4485c6431a4d6d54ebc0acc1230fc3836c5368150002d1373c84179300b73f826c9f9623f489ddab17eec88467046acb9b2bd3c681c9460ba84
+EBUILD emacs-25.3-r6.ebuild 11608 BLAKE2B dc560ce149de3dffbfa0c2871859f59ecfc5f9770d6d7889f66667b0cf0a8b2efb2bb824f7021a237307fd245971afe02f44c1fef72d29a152c026044cd2bd75 SHA512 643628582c2502732908726ffea70cc3cca9da8d8a8a35291702eb0f63ffbb6ad4f2d8caa17bc8cea4fc02841b5128f317cfecbaae9b30d420f9296b1f0770bf
+EBUILD emacs-26.1-r3.ebuild 12254 BLAKE2B 0d1cb3b0e2003aa7c6e770c30f1ce2b8241459ed416b48be5673caf96d32bdb4aa29c12292c1404d386fbea08e18112e77d17148b7cdb00c1543c71c2f5253b8 SHA512 2ac3ed1b18caa9a8483d92c25ce2f4cbb0b7b0873fc2f339a2c2fdd27996d6879f2b1f6d21875e8da18de25d60d26fcb539d4fddc5837a9939f6cff3b9a86289
+EBUILD emacs-26.2.ebuild 12058 BLAKE2B 8d48410b593fd6525aafa00ac9fe8a3bf0fd25fbc5ecaed98bbbe682565374a605fc2a0bb04c1ef86fe3a7a69c8a88b2f3bb3d7db912e0bd0bfcb516fdc23082 SHA512 f2d13c7b839b6ca4ed240b0443efde4de7a56857db44a8f9b16ec573caa12e000cb3e8aaab5838f3d196c6463de9564ec100fce762a72ab383ea850b87440e71
+EBUILD emacs-26.3-r1.ebuild 12351 BLAKE2B 6dc09026c39ba13e548cd78c5febdd1735648f8bbc0d5b649dc4ed0ae7adcbed97ca00826b4bfa66a46962dc342622a78e619930e68bbb337b96c84e1ca4d9ab SHA512 680ed4e0885c5b90d2c8b0c02641fb8017d774e8bbd6cb24f837de6cb4608f1a80d811a9d222b8d42f093715925e53f447c37d922d3756afa7673b3a90796e29
 MISC metadata.xml 2741 BLAKE2B 9f945f7d777f555676d0c51648822627a3320b98832d9a8dfb93574a2361a3c439f54c8a94f033bd6ea936625764190b5863e727bf518aafd99da389337932be SHA512 6b81f609c0834d10cbdd807e7bf60fa95e23531795bcb6b4a0f854299e3a7498a412fa2864a40b285701c4151ee8473cda9d4b8295b1d60f4b29b66dcb55e11d
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 994df7eb14c6..a5179566d3f6 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index d041d067b740..80d215cacae8 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index d601f758d0e1..757eadddc093 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-26.1-r3.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
index d64e5e88fa9a..2b4924e25c20 100644
--- a/app-editors/emacs/emacs-26.1-r3.ebuild
+++ b/app-editors/emacs/emacs-26.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index e9e7c28c4a2b..3ac8b0f94dae 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index a1a4299b9897..4540d38c57c5 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/ersatz-emacs/Manifest b/app-editors/ersatz-emacs/Manifest
index 348c230843b0..026ed7afa277 100644
--- a/app-editors/ersatz-emacs/Manifest
+++ b/app-editors/ersatz-emacs/Manifest
@@ -1,5 +1,4 @@
 AUX ersatz-emacs-20060515-gentoo.patch 987 BLAKE2B d179aefe21c91d8d207ac6278334a2b2c7de91a46443981099be9926e75f047a688bf18cf290236b00b4a1be8581abb6142e56d53d5f252f5425789b9debbfe7 SHA512 3d411fcd237e320a32663abeeb5030748e9fc678aaecc51d004a538ae0163b447107b8068fe2f17ce4220f78865aee59251810b9ec7044a829bb415cd78f7b2d
 DIST ersatz-emacs-20060515.tar.gz 45581 BLAKE2B 641cad2f5a873b0c70743a6f60ffc31615bb8789d5c6a100a67aaa82c59e7a83d35023eb596303ef0160e3ff561c89e5814b685a7a650aa4625326e86ec4fdf3 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d
-EBUILD ersatz-emacs-20060515-r1.ebuild 1057 BLAKE2B 7cdaf84b5b72ceb47c401d0e3db5610c91c1737ccb2e359de0f1675546c4d6aff10048320c20747bb04a404215695da5b527382333b88477d25593ddd756ffc6 SHA512 0c1be5985a10592e97ec536970a1e88cd9341f650b284f1571a8fea1a20ed287b5a37d00329857a674e0e0a5a0872ee0aa8c40e6862aedbe07599e4677349929
-EBUILD ersatz-emacs-20060515.ebuild 998 BLAKE2B 8f2d0f17c67743b133976585a46c2bf759e84863d6be4e490aa8268d953b9a740b9ca3b763d9591c1cd238ab2a20efde978fcef837bcdeb6d43a0121ff983f78 SHA512 fb40ee9f53105526538b353bcbffa9f3c8b361f9da27289f127b6eff53f78f860577f633172e975338df6d781d85d6b629a4051cc2328bd0ba1a6f7e28099406
+EBUILD ersatz-emacs-20060515-r1.ebuild 1055 BLAKE2B edcfca6d372481cfaee31b1345f214df9a40f62af1670ff32110637872e7bb3b88c1320ee8a2a27e54d32d70b1a0b4e833220930d4dd1117bf5d7f4c601ea03d SHA512 dc2b9159f80ae00dd21b1890f760860e800b80657fb63e4ba44ffffdf5318a5ab3ae346dcb7c7194022f98ab7362c85b99ae4aa7036fbc09fb1103b634fab0c9
 MISC metadata.xml 610 BLAKE2B c7dc603c9e9ac838bd21b3e6f513f1e3f79370f9eedcc0f6973c812526c342408e1eac696d5b0c9fe3a5f8c20911af7f7bc9cc4260f443f2ec0cd80d60dbf724 SHA512 a48b4e5215cdd4a33802ef3fcf3324f43bd3c8ec8d70ba6be8e295c8dda35c4e4df400a04afbf4193c595c7dd4d23aeee38cb80585e498b1b77907aaedb56926
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
index 2506526d39d2..bd82fcd95ff9 100644
--- a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
+++ b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515.ebuild
deleted file mode 100644
index 2b147efbad2e..000000000000
--- a/app-editors/ersatz-emacs/ersatz-emacs-20060515.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A very minimal imitation of the famous GNU Emacs editor"
-HOMEPAGE="http://hunter.apana.org.au/~cjb/Code/"
-# taken from http://hunter.apana.org.au/~cjb/Code/ersatz.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="!app-editors/ee
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i -e "s%/usr/local/share/%/usr/share/doc/${PF}/%" ee.1 \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall" \
-		LFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install() {
-	# Note: /usr/bin/ee is "easy edit" on FreeBSD, so if this
-	# is ever keyworded *-fbsd the binary has to be renamed.
-	dobin ee
-	doman ee.1
-	dodoc ChangeLog ERSATZ.keys README
-}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 71ba32ec8773..e64e642ca43e 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,6 +1,6 @@
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
 DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
-EBUILD gedit-3.30.2.ebuild 2323 BLAKE2B 4fa5600d7163ce9fb6670a89d9151343cc7c256cbb0219f3150f94acdb2ff4b53e85dc116eec708ebf12b0fd5926325fdcd1d725c956b8c7001db89c643ceddc SHA512 a0c3b76b6f6454678d50a6f60bb8dae830023dabc22de5581848bf42932a25db9fa8c32b753e6747c486badcaa7c3f679b58a0874c26f99f69f1c7a2049a217e
-EBUILD gedit-3.32.2.ebuild 2170 BLAKE2B 53c6298dd6badfe493fd0ec17f907679cc445bd3668362a999c3ccacc7a448eed2688d5bb7ba16980e08b027cdaae77dd105ac5903d72e5856919ca10125a006 SHA512 6702a1815ec658058a02c979ead36ef069de320bf2fc4f6353af7dcad2ffa7a4cd92d60d42c13b927606cf6262f42a9213f7483e0524fa38db52c37480562c7f
+EBUILD gedit-3.30.2.ebuild 2301 BLAKE2B 44f162af9aac54652103e00e9602cfc519e2acaf639b2c61be5cf13b22727b016956caa6a7ec72eda660ff6c64f4ed665f90a9c0c574218c08c490d6efd2dfb1 SHA512 7b576cc6064caabb1fc2f9d4f56f5a12ed6c8b8666257bf3ff1f7f740ce02737ea9e3d729d45c401ca26cf2f78b8b2425771941773abfbb698a4517d91a39d59
+EBUILD gedit-3.32.2.ebuild 2148 BLAKE2B 3fb562eea325c437f5fc6b35a7e3a22379322a49a35d56b8144055b81b2a66324e9a076b5960180928be3239574eaca403db7d8dc8b3b1235ee04baaf9653dc5 SHA512 dd7b7de90fcafa09f2dba4b4255fc2e82aba611950891aab442c0eaee702f62929bb7c49c0ee5ffb7ea03e20bb998bc8646cea05cce15c3e6c1acaca7399f82c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.30.2.ebuild b/app-editors/gedit/gedit-3.30.2.ebuild
index 70d241ee4cee..1ef6ef90b9d6 100644
--- a/app-editors/gedit/gedit-3.30.2.ebuild
+++ b/app-editors/gedit/gedit-3.30.2.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="+introspection +python spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
diff --git a/app-editors/gedit/gedit-3.32.2.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild
index 106d022fdbfb..e8f11fd45a95 100644
--- a/app-editors/gedit/gedit-3.32.2.ebuild
+++ b/app-editors/gedit/gedit-3.32.2.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 56184b486ad7..e831ad8ba9f7 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -3,7 +3,7 @@ AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-EBUILD gvim-8.1.1486.ebuild 10494 BLAKE2B 51243386b3da023593d6bc76298a8eceb1bf6729af96e56e681f51c3918efb511646551c75b3948375a6e7f93b4c5a9019bb34014047aaef4d799404e0e77ae1 SHA512 9243aa4423bb4f7a728129462d6c59dfbd67eddee9f6ff2a8c3fdde0a4cacb47deef5dda4b1951c1e6c948c15d59d3f34c63c74fe63c77e95d8d79bc037b245f
-EBUILD gvim-8.1.1846.ebuild 10570 BLAKE2B 5fa1b0d05aef06fe1a5ae514d2490052489afc3bed4d9ab3b24dff8f093f668d1a14e393d2ac2e6db2bffdc5078c79622d52a129522d10c5c7291e6127f8ddda SHA512 6d4ec8903fe888c20fd55368e8c18aad8840329982fd89ecd8dd48cc769eb8e6d29194c65cdd3dc67a322401028997c265a58cdb5e24e50bfdaa2476d9480fb6
-EBUILD gvim-9999.ebuild 10479 BLAKE2B 23832b28593eae47c503d092017f98c4b6f71bbc68fe72ff9ccff50f390c262ddec420faf81dff19030e0a60fddcc9bdca3393b51400cef3e4b823af2b195c73 SHA512 37fd1e11ebf5b9e8d8547a7490ecf1fcef87aa8cec808353b11e6188e537f8670e0caede5a3a206ec02786806bb26e0e79bd819f14c84469443a2bec913a665b
+EBUILD gvim-8.1.1486.ebuild 10484 BLAKE2B 705dc36a68203d67960bafd223e3470dbcf110ae2adb703a66a036471398062e8f67321dbab9be7a2ab7f55fad981b879374750540833d07572a0108687bded8 SHA512 0b5a4ec94b3be6c7617666ba76d205e6b049a242a449ae6276ed0e6b4fad7ac468a84016e3b7b9da851f32a20c113b219a490dab8e7c79da9b392c60192bfb69
+EBUILD gvim-8.1.1846.ebuild 10560 BLAKE2B f978c64faf723120390ff56bb17fcc91a3c4e325bd5bc592adfd68cfb8fc9421937de21d3343739364742289ade6ec77b0bd8ffd701995964b82de0f07a45025 SHA512 b400dd6a94ba7bde34c064d0444ec3d3d98d04aa14398e7e94a0b80142858155d28296fbbbcc12c3f8bbb3e7cdca5727c187cd1d6d24ee6db307677e4d332331
+EBUILD gvim-9999.ebuild 10469 BLAKE2B 71861c44a0a6013c1effbb221b499c8e6805b3263fe6064c2139ebc4970894250696d72faf72a4f5fcfd84ae41ad4d1ad7c4331898a30e41176bdbe4c7d99734 SHA512 d4948fb7f77706838f6d15ff8d7d25020dafd95e36899638199020ac363618b71a6614df9e27312a6d70e75d8dd0a70f356a37f6f5942b59821b32178c1db440
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.1.1486.ebuild b/app-editors/gvim/gvim-8.1.1486.ebuild
index 96c1657b3c2c..3db19e3bb9bc 100644
--- a/app-editors/gvim/gvim-8.1.1486.ebuild
+++ b/app-editors/gvim/gvim-8.1.1486.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-8.1.1846.ebuild b/app-editors/gvim/gvim-8.1.1846.ebuild
index 66d226abb287..29b3e72b4e23 100644
--- a/app-editors/gvim/gvim-8.1.1846.ebuild
+++ b/app-editors/gvim/gvim-8.1.1846.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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-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 0f2395ff5c45..a26105139406 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 26a3acc2d1fb..6109f516844e 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -3,6 +3,6 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1231 BLAKE2B c25a462ec8e00c6c689d03dfc8c74676743cf4f345ef34827e59cd875111c4c9e4d6f92d494bc2f33384e76036f7d7f8c0c6bf91d791b665f02f9d35847d51fa SHA512 b496fd7d0a1df96b80d387d49ff94bc11e59a324fefd2e66a5d26bae285c57be9f7a3f792ae265b3145d6437134772b393e2466d1062c2b1d8f224212351a908
-EBUILD hteditor-2.1.0.ebuild 1185 BLAKE2B 03f7e29f51fe3cc3e1aae710a962b07b0245ff81b60a5a946a1bac41e1539e7ea345b5069ab48d946c13382d58f6db7fd58430c8561a81e74e6ce57ad6fc1150 SHA512 1de23a98bf82d020b34543e0eb572eb44dcba82a6d294455a3c68c02a3da3aa22e6348e2c8d25ecab7878b5fcd7e4ab4b42d48c07f90e42b6befa54730ba0b9c
+EBUILD hteditor-2.1.0-r1.ebuild 1219 BLAKE2B 9d8d214caffb1171cd951e2462e003e75eaa1f0e0e76b7b0cf7644197990a9471bb1d4560a99383850ae949391bba24cd57eec3bc961a7154890b42cad355a26 SHA512 0b3bc68e0fd55b6e178299c4541dc87ed073d1c3af6b5186c2f05ab6815bc249cd27c3e2aa387a5277d52cbf1985372d4e4daae22a38f5e45dcafa85a2c00932
+EBUILD hteditor-2.1.0.ebuild 1173 BLAKE2B 4a61d5860885b2ef48f0f21621abea57429dd36ebbba36a6250954785880d8cdfd648a0827756ca38b25b33691fcc64afc06c11e7bf59d8823ac7068befa9d67 SHA512 6022aa8a28461dde621ff2a02695b1aecfb4473bc451a9555350f510773882534e8283e711c69037f1787a77f7483312e7645a0660940d60bb6eb968802bafb5
 MISC metadata.xml 459 BLAKE2B 36a72c5d6c9ffccd7ee46c8b372e8774b567a1747303c37af5aa00a3a1fe5e8db3d86fa7c97e4f3accb207375b4e6eecd3e92f995cd9a1d78abd1281172110f4 SHA512 9c266e7cd98ab8b6653f2820b7018235636e3ffc3bd455f905390cbfcc61dd8ca36d110a3214603c9450db909c248f9321ef89ab6af95a07f9cba97684f43757
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index a1d577aacafa..8798cd47595b 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild
index 1f5fc5b5ee5c..837b225b19b7 100644
--- a/app-editors/hteditor/hteditor-2.1.0.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index f77607d4cb46..0b2579e1157b 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,4 +1,3 @@
 DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
-EBUILD jed-0.99.19-r1.ebuild 1113 BLAKE2B d8e5bce395af77ed43d7b54542c0274dd414e17fe2eec77b939b7fdc9b136878239478b2f0011b63befa0c739dbbff475aac2867f784d731bab739793903f745 SHA512 6c9be8b81b1bd147e4416a4af26d7fdc8a58045cb798e21b246fade1b4edbbeda30d7e899987f40cfb7486d4022754a3d1a2ec11b081fab17146e995278b9327
-EBUILD jed-0.99.19.ebuild 1135 BLAKE2B 31333f1321e4f07b5d37b3198f4f91c22c7578996723c288a2d0152cf31b8dcc2f7c4343bc9c902c47772bcce8f670c048b48ea4eaf7272afd79d3510ca98bf5 SHA512 1311e8b402ab97a696f6538543da6b313fd84d62fd0fb3000642e03205d693d867fcb076843e9edcf1cab139ebeeda898875b6c33e6304381a537fa800d5981f
+EBUILD jed-0.99.19-r1.ebuild 1108 BLAKE2B 83cc4abce340b0ce713cb287f2c481ca5ad7a0d140867d698542ebefd3c77d0efc11405e8b5bc63ea879497de86907bed696a576247ae61fdd2d6ca33152c0c6 SHA512 546f2db3dc94643d966e272a87a3cd50023e85b585627c59f20a14794e39cfecb300577eb120c8f6cf5ddbacd289bbd58f8d9c935e6b73d2e36761fa61f48003
 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 ec91058ed134..b6609a508346 100644
--- a/app-editors/jed/jed-0.99.19-r1.ebuild
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -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 ~x86-macos"
 IUSE="X gpm xft"
 
 RDEPEND=">=sys-libs/slang-2
diff --git a/app-editors/jed/jed-0.99.19.ebuild b/app-editors/jed/jed-0.99.19.ebuild
deleted file mode 100644
index 04e69c80056f..000000000000
--- a/app-editors/jed/jed-0.99.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Console S-Lang-based editor"
-HOMEPAGE="http://www.jedsoft.org/jed/"
-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"
-IUSE="X gpm xft"
-
-RDEPEND=">=sys-libs/slang-2
-	gpm? ( sys-libs/gpm )
-	X? (
-		x11-libs/libX11
-		xft? (
-			>=media-libs/freetype-2
-			x11-libs/libXft
-		)
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		x11-libs/libXt
-		x11-base/xorg-proto
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	export JED_ROOT="${EPREFIX}"/usr/share/jed
-	econf \
-		$(use_enable gpm) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	emake
-	use X && emake xjed
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc changes.txt INSTALL{,.unx} README
-	doinfo info/jed*
-
-	insinto /etc
-	doins lib/jed.conf
-
-	# replace IDE mode with EMACS mode
-	sed -i \
-		-e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
-		"${ED}"/etc/jed.conf || die
-}
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 6cfbb4573155..fd53198a58f9 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 1170 BLAKE2B c1d8e1c49a3cbcc8dba6c6d679bb0b7e543e5b7ce5b2cde63c5a1970d1c4e2312f751323d4ebcddf1612465e526551756528548db4f4aeb04c93e14df2acfd6a SHA512 e0b51d75d14eb5bc34fd8628ce36f77cb4154965fe8189fccbb2d5d4a4dc746f6ccee09b13a50347a532619b06f13ec254c0c1fd37caaefa9886ca1e6e8504c9
-EBUILD joe-4.3-r1.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
-EBUILD joe-4.4.ebuild 1303 BLAKE2B 7359e4551103885dc2f31f6a0813095bc08b04db37697beb90b1ef89fd682352e8cf835a638dd14fb10016ff49716a34e2623f4f60c632cabe8e9709d0c87301 SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a
-EBUILD joe-4.6.ebuild 1473 BLAKE2B 68c33a26c049a333012daed4dc3cbe96b5c3594c77381747178a35c44445d620bdc6d52e4e1bac66cffeb4d9a9d7c407ade8951c6d74fca76e8454198b1518a6 SHA512 6b46979a7aad8f18a08c8df1172ace41f0baffefae79c5fed7f8d3aa3905d2948ae576dd633ca4df47ce1fb0f234606ba8ad8a44508712651048bb6b8bc144ec
+EBUILD joe-4.2.ebuild 1160 BLAKE2B d049ce775cef8713553ac61e163963c3c38e93d97cc5542dfee994082ca2ddf037d483f80691fd73f1b4ee8081af1465026eb970136c4fea15ecc6231ee471ff SHA512 489b78ebf703364fb288a75b476e5e551b0b6c9ee9d69d9933caae130c614694774e5de8d3c1283052a7d5dfd993b2b8c1b580af326db009393b80a79856e724
+EBUILD joe-4.3-r1.ebuild 1293 BLAKE2B 10c691bd22a2f4acbc262fa46645924a4d2e3ec87c61cca2b606aae70a6dcc348ba1445fe2f3ad29cd95a00b94c97dd08b3f02fde5e7f489e6a9a3e5d8fd5eeb SHA512 3d2118c01d34563e613218c5ab0c302b9012e2500a6503fd68c6dfc14962e60b54398da19b7119b89ede837c0c272223a6ac36cb0341f6d62eb1b14357f6154e
+EBUILD joe-4.4.ebuild 1293 BLAKE2B 10c691bd22a2f4acbc262fa46645924a4d2e3ec87c61cca2b606aae70a6dcc348ba1445fe2f3ad29cd95a00b94c97dd08b3f02fde5e7f489e6a9a3e5d8fd5eeb SHA512 3d2118c01d34563e613218c5ab0c302b9012e2500a6503fd68c6dfc14962e60b54398da19b7119b89ede837c0c272223a6ac36cb0341f6d62eb1b14357f6154e
+EBUILD joe-4.6.ebuild 1463 BLAKE2B 2ef021eb73440f069d7a9430030ba81b9c48c76f7b37567e4eda016f15b0d17eed888826c2b401968f9af1136fc9e30cc1dc174a036d3064f79670a178dec83a SHA512 d508eefc9470bcfe11d4bcefed42e289a229ead8e02a1231864a4b8473d7734eee4fd90b912c648095f4ad9526e97dea58b8a3c29f74d616152fdd03f1189b8e
 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 750368519c35..c59c4b6c1594 100644
--- a/app-editors/joe/joe-4.2.ebuild
+++ b/app-editors/joe/joe-4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.3-r1.ebuild
index 89f4fbd78d42..1af8395200ec 100644
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ b/app-editors/joe/joe-4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
index 89f4fbd78d42..1af8395200ec 100644
--- a/app-editors/joe/joe-4.4.ebuild
+++ b/app-editors/joe/joe-4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
index 73407dbf4711..ac3a9015d369 100644
--- a/app-editors/joe/joe-4.6.ebuild
+++ b/app-editors/joe/joe-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 70b3ff8936a8..867da876cbef 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56
 DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701
-EBUILD mg-20171014.ebuild 1047 BLAKE2B ee8886aaabefaeb4005d711eb0520c4508407ff0d44c1b1a0094b025764242c9ff35df8808288b7b9df3a48120d0f00de880b454d1fb7176c0c570e5a3781e07 SHA512 e2f54dbdccc36ed6055b96c69246507c085fd88bb5bd136a05e8d2c364c0c887dc866405116fe1f28d63a03392c82da2abb2bee34db1075490cb3cbce24e92b0
-EBUILD mg-20180408.ebuild 1063 BLAKE2B ec7f33847582aae18b20581f9d103c58649a0e12b4bc6a327f7c08511d47f0e8196c79c2ed6443ac325d2e65bb1bacdb31b9b5fb9cea6184887bedca7c8c17a2 SHA512 4adf73361fbe0c7044955ee3f7a33cf10de8f9098b53b43275b89de4a355377c31187d826705538b629ef36f5368c2acf3e7775cba049ffecf94a753c3e48b55
+EBUILD mg-20171014.ebuild 1025 BLAKE2B 67b12c3665a444bf21b63e621831acb138a88d7160866e4743ed9a78d0629a0931bf3dc37718bc720f7ab67e10c90e38c5dcacfa708ac8c175c7354da0d9260d SHA512 0080fcc40e3b62917f41881c8eefee21d08422174e81b4459df8f281dc2ee9f36853d2a55ac572f23cc7ed3134c0d8eda154dfc2f6e098dbb46bfe85f22166a0
+EBUILD mg-20180408.ebuild 1041 BLAKE2B 4d7d43d927598aa8cc453e75791453a6523e07fafd992e2a04144a1dafe31fe7fa20306f8b5d08b07d967861116affa77dbbbb6836a2ac8af65dfb654338bcf7 SHA512 4be310c749a9b5151f04096772c2296e7621c5cfebbd03f2f947fc51265014afba8af5eb437b74a066b4dc28830fd2d039df73f2ec523207b0cac63f0a887844
 MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild
index 232a6b42a429..76952de56f28 100644
--- a/app-editors/mg/mg-20171014.ebuild
+++ b/app-editors/mg/mg-20171014.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
index 2b72c6155847..7aa5d884daab 100644
--- a/app-editors/mg/mg-20180408.ebuild
+++ b/app-editors/mg/mg-20180408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 407423d31880..88ca4263ac91 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,5 @@
 DIST mousepad-0.4.1.tar.bz2 644161 BLAKE2B 656245afb38423cff7eb8a038c8247d9023e10eb85f574f25fd4fad50b0316cbe125630ddff330adb91c49eec9ee3ed67ecd0546b9fecb065c832882b3e42145 SHA512 2ffbb4245a3344437bd41f9f28cc066ae45062f6b6d169aa274e933f033c434f0b10845ccf42ab846dcad25ae7cee36ea6619bfb6889e8cd41c994be87b77be8
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
 EBUILD mousepad-0.4.1.ebuild 997 BLAKE2B b3aa9ff9fd24384dad2219a270187aff5c7e1954acef0bb10cd2a6707092a53b972d1f58bd397f871b28504e7c3e5cb1e73fa554939fa399538ef6e1da53a550 SHA512 be7e8177305687445becc4b2af67612c186f2b4d8d6e0bbbb8b5c58ba2442420da2537cabf64d52f2347cd725a416b763f33576f962866466ecc017f7183948c
-EBUILD mousepad-0.4.2.ebuild 1137 BLAKE2B b7f3348329833068bb95db03612b82eb7ad9f3044a4eaaaa6c78a6bfe634618ba3e768f63c6b0d84937e5c11c2917bf6c8799695ee037c0a56a69c6ea463673e SHA512 8ffa5138d50ff515bd0bc2c639afe9d4978fbf2e8987a5df4d4ba99b0fd3ee3516f213b9e3e52e1e7eee64571f449c2211585ec5f36f184668f47de0a149a4c7
+EBUILD mousepad-0.4.2.ebuild 1135 BLAKE2B 94382272da3c4e73d7116598cd8cc5fd0d0fc8d89e8de32b2ee1b36a4535687ca24168ceed13b7c644c8402a5c455d59f161b65391454493892578bec89c1151 SHA512 70011b57e94d29363a7af9971f8896aeefeeb935df6a6e9006fc42a48ee3182a88ca25cc2da9e852ec100150d17f95681f9f8b18e39070f9d0d9a6281d7700e2
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.2.ebuild b/app-editors/mousepad/mousepad-0.4.2.ebuild
index 212d8a3f27d6..d6c73c134145 100644
--- a/app-editors/mousepad/mousepad-0.4.2.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus +gtk3"
 # D-Bus code fails to build against GTK+2
 # https://bugzilla.xfce.org/show_bug.cgi?id=15755
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index ec44bb6a72e3..82d42f8bd306 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,8 @@
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
-DIST nano-4.3.tar.gz 2939418 BLAKE2B 2464118a1cd16477637a8e98c1d179cbea1f33cc1548eff09b3b77b613b5b2b628915da1d11c04064f7211a0254461eab09ddae6dda582004d77adea9dff2360 SHA512 2fb76e61079efb0a16f3ea27fdc7da749c71d61a752d96beee4f8376ad0071792ecaa5f3dc627fbcce175227ca48c60c1a4a3e17bfbc89180aa484c28fe37746
 DIST nano-4.4.tar.gz 2947594 BLAKE2B 20cdc21e136ff213ecc2dd64531e51c552547633a422566c325b8d777800d5f77691751d3acae3b9489eeec40c0893fe913dd8669b29ab985cdf0ac4a3381192 SHA512 14f23de002f5919a3b75ef8c0cfb93a45c8b8ba6c87d8b7c472ab2106fb4c1c17a3846f99ad6e2d2d160aa14aea44c23067fa58b2e668a41616f5cff2feea50f
-EBUILD nano-4.2.ebuild 2189 BLAKE2B 62dcb827d9d5deb4b6f1ab8b89fea344137b78e468d29160b5873f47bd2680da952a6fa1d7ca288e0b6142f76a3d83633251465a354b1c54222bc426760b5763 SHA512 2824d4c52b92de0384d05725695d9b78e0e924b07562436dcd8963c94dc5c2aa739486e2eb96a0c410614d099efe5d8550f133d68e67b783556c4ac304857d34
-EBUILD nano-4.3.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
-EBUILD nano-4.4.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
-EBUILD nano-9999.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
+DIST nano-4.5.tar.gz 2957974 BLAKE2B cc605cec46ba4b7328eb70af42da067a30b07ca884a702d20e2294cc3a6c4d7166aa279f6aa044d4655effcb783ab7371feee3db788c2b15587f85f66e03816c SHA512 68dcf95ca2b02d518a915cb77c51f2af42bab82d38673feff06b6afdbc31530ad7d63fdb083077cfe23181df03fbbbe1f00e189e79aff0e12d5dbe26220cadac
+EBUILD nano-4.2.ebuild 2167 BLAKE2B 7a1770c86696d2daa754f4081b15b9eac55471708a8c4da56caa9ba02a5b703643eedc29429b509adbf5a02f65d546f2aae7a378b2d5c03079cbb7931f3d5019 SHA512 7c475d9ec61e69176964ad8105390832738be2be6ddefca50bb5412e6bd0dcc7eb000d452145ebdea562f947dbdff05d3d7470405d1b1b168aac8b7cf27e9983
+EBUILD nano-4.4.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
+EBUILD nano-4.5.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
+EBUILD nano-9999.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.2.ebuild b/app-editors/nano/nano-4.2.ebuild
index fb77434f71b0..a8bb7fdf3fa6 100644
--- a/app-editors/nano/nano-4.2.ebuild
+++ b/app-editors/nano/nano-4.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-4.4.ebuild b/app-editors/nano/nano-4.4.ebuild
index 9934461b7d4e..c3d78b31034c 100644
--- a/app-editors/nano/nano-4.4.ebuild
+++ b/app-editors/nano/nano-4.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-4.3.ebuild b/app-editors/nano/nano-4.5.ebuild
index 9934461b7d4e..c3d78b31034c 100644
--- a/app-editors/nano/nano-4.3.ebuild
+++ b/app-editors/nano/nano-4.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 9934461b7d4e..c3d78b31034c 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index ef7b5f1d1922..92bf4dfbae71 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -8,7 +8,7 @@ AUX nedit-5.7-ldflags.patch 814 BLAKE2B 5d300f5006c41ef378d4cadfa2daa287034338c7
 DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0
 DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932
 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
-EBUILD nedit-5.6-r1.ebuild 1989 BLAKE2B 8d5cde4cb3ecd3a20db4ecc763a1a97db7ba9a86dbea7c5355d8c5c7056ef3afe7d90fb94f97dd4652b8d71a7163ef17346b71fdd0a1ad9dfaa966d5b2c8a203 SHA512 147d9308121e65466d22b9973f8d0ab69b0fca53769b51dce8da933a8a069e025cf1222f4ff5d03af3df71fd4c0a93def2f99c0b9402456e3903bce5ebf5dc3b
-EBUILD nedit-5.6-r2.ebuild 2037 BLAKE2B b881666c19e2d9aa63e219ad2a1a0d4d632470d80bbe74bbddfcbd7272a210882bc172e9499d61c77afd8fa63fa30f465fd9c7814c893e635ad0833adf05bb31 SHA512 ed954cd69acc1652f597d188c72c38f38e8ff0d06ede0f7b98c818b1c0a442c9e688a1ade3cb245ab3de907966c86210dd6b28528ddef448fc367c6d8aab20ed
-EBUILD nedit-5.7.ebuild 1993 BLAKE2B 84f90d629c8bfef4107a645848614181cc38bb5e6fdc669e0b2b433b6aea8a5327379540ed9bcb8615f6621a3289053820da4234db824ca2104776d20a60c852 SHA512 b103f021cc3a3e58fc5191b050f865bce33fcc716eb7c6432bea66f138a718208ea39c2db8a3967b9c5f92b744bedaec36ae1981f6df4a129882ab2dae1250c3
+EBUILD nedit-5.6-r1.ebuild 1979 BLAKE2B 29b2348f0c20c38c2e295f33124c196123261381adb642502dee40b45371afe08aa8cb981a762b9a037a9100f9958dc5065c369533e85d0df3f7251cbe2a5f78 SHA512 9de6b05cb61a67aed95d9b3de9cd51d814b7d6654ed01fdd3f74545d0f8f44863145f1feeabd82a568bd7958d57181f6fa70b48d906b8f86b769d40c7daffbb7
+EBUILD nedit-5.6-r2.ebuild 2027 BLAKE2B 08aeeb58ab2870a0dc8139b8eb0c7e218f22b46da0bb385185969ccba7808a52cf551a0549701d568be7ad88ad103f02b9507fc810c3cf90d2d73a1cb584c6a7 SHA512 038ef549923cad319852d95a704c4f0e946a3121f920b8d405817cf0bee7dac7ae6c11eb53e09cd9c95de2c665a9ca74d2b4092a518af9ef6b1673519c5ec123
+EBUILD nedit-5.7.ebuild 1983 BLAKE2B dab69c3457dafe874dda1c22efef39b6d6abd130de845907a41184cbff49775e240a12ad2d782a02d76a06c097be2bd3d04fa83c4cf1a58068f73f3062d74ff4 SHA512 92856002bd8db8724abbcaa6ad78b1d2435d39bd7a6537e65f23467649dc2234723f488f353177bb0a5fe8560fe395f4b843c25a1d5fcbc868b16dd4b4134009
 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699
diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
index 86b946aebecb..fe368ae4145b 100644
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ b/app-editors/nedit/nedit-5.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
index a37c9fcd64a5..018a58628a32 100644
--- a/app-editors/nedit/nedit-5.6-r2.ebuild
+++ b/app-editors/nedit/nedit-5.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild
index 264b42660216..69f74a487102 100644
--- a/app-editors/nedit/nedit-5.7.ebuild
+++ b/app-editors/nedit/nedit-5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/motif-2.3:0
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index baa46f2fd138..25445427f388 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,13 +1,7 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
-<<<<<<< HEAD
-EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
-EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef
-MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
-=======
 DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22
 EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
 EBUILD neovim-0.4.2.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b
-EBUILD neovim-9999.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b
+EBUILD neovim-9999.ebuild 1884 BLAKE2B 35642daa24554b4c3cb439861723381e3176f803abb8ee01982f3cd260a8661a6923c4f96754d3ff1fd4b200c9a505d1c3b18f24a47b57c6bdfa6330d6c7d0a1 SHA512 358fda9fca9b3325b9d0d44ffce8633cd698b1e0530b1c3a4ced44911f939065948ded21418c928f780e4d85c76fc64a22d89035bdbbdfa5c2059fa2681b9ce2
 MISC metadata.xml 862 BLAKE2B e9725c43d1a34d8da4fd779a2a945594914ed51a2fc0b87a9a2a6ddefcc8d38d88c94c426a59df9f94b08045b2f8820ee205e7982a19c15f1872d2a73b35fae6 SHA512 9eb46f7862d26c27f400d22023ac3cc81f5671e8b17d4f52b0743abcfdf53d63366cd16c06ac1e391f02bf35fb9b70e0864eda9457c1f45ff74a06f528d1b8a7
->>>>>>> next
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 7726bfae3ede..794068e522f1 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 "
 
 DEPEND="
+	dev-libs/libutf8proc:=
 	dev-libs/libuv:0=
 	>=dev-libs/libvterm-0.1
 	dev-libs/msgpack:0=
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index feba4a49a085..076886040e09 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -7,5 +7,5 @@ AUX nvi-1.81.6-printf-types.patch 437 BLAKE2B a7cf425c52882b693e928af13790df0959
 AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 BLAKE2B 2c764c05ba9e8745369441062452e6bcdf6c065d2c9a040d4ef0f3d2041ec31c574be18bca3432b3ac252c693e2feec4f7df9851055305bad9760fc33d7220ec SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196
 AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 BLAKE2B ffdef923f5355ab4839955865cce148c8713517d19c5c6cb8fc4dcff227c1c833bc120d505f36d81240d64d4a0472628c61a28456db1675ecc2d47c3323a1507 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906
 DIST nvi-1.81.6.tar.bz2 1758309 BLAKE2B 7aa9b1a7f5337bb246a4a8779180830efd2fb1cfeda2c0d5fc153393cd683237cdfc2a69ac22b228629561ae2222d4eb36746fae4dfb6b9ff44945265988929a SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd
-EBUILD nvi-1.81.6-r7.ebuild 2099 BLAKE2B 8d07e8e35bd7f1d6722c4a733c36f197bfd046432ed439e2d75391e1c0308033411252ed81bd9336bedc15ea993b3cd6bc51f5c96ae9b67667b38b9294e4ff55 SHA512 215dd5cd07c0097af6814fba82f5325c4b14799d69d848c15e42bd83555c10776327f4116f5908941e53362a6ba5d1e34adc628da4f603a8b5ba89140c7792b9
+EBUILD nvi-1.81.6-r7.ebuild 2087 BLAKE2B d0cc1884d123f1bd37e6e368ad7336ca1543da27b9493e05599a0e974d818351da639bbbc15374c2ff2ac3531f7851e1f9a242daffe9db8b40b54b4beda5ab5d SHA512 2a838ff387f3a82f67bc2375a4ae9720ca92c9d0a583b903284e147abfca6b503dcd73cddbbe7945a35dc42039bff014666feee1420e806240f8f1121b97b9e8
 MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index f92396e05432..2c957e6016f1 100644
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
 IUSE="perl tcl unicode"
 
 CDEPEND=">=sys-libs/db-4.2.52_p5:=
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 3e75bc8c821e..d6dedd4fc1cb 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -4,9 +4,9 @@ DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e
 DIST scite355.tgz 2302137 BLAKE2B 5b36c68a5447b7fd0dd2fce51fc09cec0ee4a86be10f4f32fa7bf47354c56424cbead6cdfe819c8014be75e843c867ccaa137c5f7e32c3f9b0dabb6b9a5a9cb3 SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d
 DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd77772923ceeb249b3182dc47cb1e1097a4e0942b3a5c7528d0e80fe2314ed9d3d2b7f4e960a0f17ff2 SHA512 193dcb1f8787a7c7d520ce62462e5c95e7b6bcaf79f4ab23f9885474fb0444dbc5a69a0d45eafc592e5fff2a2e746a9aba599799e847e3c74d3436eed26580a9
 DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
-EBUILD scite-3.5.5.ebuild 2106 BLAKE2B 0fbf6349ae99aa3e489dbb025cb78c22038ddb5c4e232f2ef1f89ec0a0615ed8b1c463a3afe9cc727500f4d4cbf5bfc4c2a53e5dc8677b8b46462a828838f6d9 SHA512 e1d459d71002b5f9a856e7b7ad4c9ad43bb0883f382d19dea28c43588e5ef495bca3dc769859781e26a65745dca5a252bbc81a657e261d64556366ceb60a60c1
-EBUILD scite-3.6.5-r1.ebuild 2232 BLAKE2B 1b98e140a18dfa4c3b45a0d2febfe841af872df2cb508ac7c5f38ba04a463c182209b0530837208b81754c6b5d4bc2bc5fb02d9aeb1bbff7c6e319f0f94b1987 SHA512 ee976179aef40711c27e4f6edec220e20a4fcf08f3edc430a83e6eedf2b1b56ab57c907c333d358cfeb6b08da29aafdba1211a10168ccc0ab6eadb0648b7a611
-EBUILD scite-4.0.2.ebuild 2685 BLAKE2B 4bc65707a1cb11601a2118547882acda73c5d44d7b5f4d4fbfcde0734aac363d63399f046689ea9e5d47a6456dc07aa757f9ff86a6e8a08f0afb6f52f90990cf SHA512 bd98bfcaf33289cea962500ac87505b541e3496c019e4b88f3562b380c8b06c54a93c5ff761319c404b8512fca673b14c2b966d2ac1253a3bb64a4fef7d9ccb8
-EBUILD scite-4.1.3.ebuild 2986 BLAKE2B 87f3702f0e2bdb8de85708a182579d7514d4718dbc5babfc525b1aade2d5d196d8d3390fc9addf9143179050eb0f9d4b842a6db51885fbcebf55b706312e50b6 SHA512 22c4d50ac9ee8692790018ff0930827627420888d7e563f90068eed6218527fed9f3ad60ffec5b304156faafe286acfef97e3853d4a5995e0cab59966c6102b5
-EBUILD scite-4.2.0.ebuild 2988 BLAKE2B 660573fc9cc0f46bf10316e7478c6b02c725a43a4aa80849e70fab05179a39fc751db73b19769222016735f56d03003152739826140833572961788f4bcc3151 SHA512 bfdb80f6fd248dc6ca93457f54f56a1e378d6c03be5aa8586ca66a6caddc2761893382ce66efdbe287b6ec747467faea2134906343eb0fb9d59ff373a67d7c70
+EBUILD scite-3.5.5.ebuild 2096 BLAKE2B ff9f5cda63b66b685c558e7eca8553633b02ab0c6a8bfd2ad7e9b1dd61a562811e0127a439b4ad9440ecaf130e58c0ff4be791889ce90c739de6517a6bfa49ff SHA512 d0f43c83671fc3f4e7c8776493cd686b1d643c0a9b2e481280664b467eae35cb9546e51a1d998e47b3e9bdb249d184c955baf45190f83fae72d59491287d5f96
+EBUILD scite-3.6.5-r1.ebuild 2222 BLAKE2B 5840af902527a245a59650b0485fc9ad38274ab5ee3c459d4ae5d625596862bfc359b68af35cdcab1720bd4b499d6860f6cc7ea275f7fa925d952fc69d3aaf57 SHA512 97909239de93b72dc6beb44f5a2b387883e1024bb8b0d581124be6e4fcfc56edec745dbf287979f5db85c6217c23b218e1ba420966ddc3d398e94c6d11fb2ca6
+EBUILD scite-4.0.2.ebuild 2675 BLAKE2B 55a3ffa305ae36cf27d77b376167123606e7e55a72b4ceac34957fe51cb3325110abc1e50a5bca9a48371938b2241da7d217a46386d15e64888428ac2494625e SHA512 04f7358b0144dc4caa04d17f6c2cd401a6d5b7e3a3e5e1f55ecf07525e5c5b7548e91d18e2ea4a6b24d80abc88bc09757fd5479d6c4d12d3f9bb9456e3fba22c
+EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
+EBUILD scite-4.2.0.ebuild 2978 BLAKE2B 1c792af0b81ddbbc4971b86391cbb903f01391bd8c9560d936b613859bce02b8a272b20bcb8ced750cee0456ce463401d96ae09b48f978440254bcda0fec6818 SHA512 8ea00f543446e4b803eb4621104a627f7a91cf10553298d689b6a518b0a20b99ce626e02390991d33729046beb049323f81966713b55b65d31556a6fe1b36400
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-3.5.5.ebuild b/app-editors/scite/scite-3.5.5.ebuild
index 6f65486b980f..1adfbe41a5c9 100644
--- a/app-editors/scite/scite-3.5.5.ebuild
+++ b/app-editors/scite/scite-3.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-editors/scite/scite-3.6.5-r1.ebuild b/app-editors/scite/scite-3.6.5-r1.ebuild
index 3e79ba6e66cd..5662b8b541e9 100644
--- a/app-editors/scite/scite-3.6.5-r1.ebuild
+++ b/app-editors/scite/scite-3.6.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
index 3ba228e94d7a..4ab3e1e3acfe 100644
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ b/app-editors/scite/scite-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-editors/scite/scite-4.1.3.ebuild b/app-editors/scite/scite-4.1.3.ebuild
index 637601da53d5..01cbf1b36376 100644
--- a/app-editors/scite/scite-4.1.3.ebuild
+++ b/app-editors/scite/scite-4.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
diff --git a/app-editors/scite/scite-4.2.0.ebuild b/app-editors/scite/scite-4.2.0.ebuild
index fd4938711afc..0b8f9197c347 100644
--- a/app-editors/scite/scite-4.2.0.ebuild
+++ b/app-editors/scite/scite-4.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index 3dafe5540396..400c3beeaa91 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -4,7 +4,10 @@ DIST sublime_text_3_build_3200_x32.tar.bz2 13798686 BLAKE2B bed2ec4cfaccaba6a044
 DIST sublime_text_3_build_3200_x64.tar.bz2 13657959 BLAKE2B 88d38014977ce92503583e626a59a57ccf0f5ff243cbc1487478d65ab065fccbe28af65f91db7e63a46a90614c1f5161ce24558c6c2ea4d0c6f7cfffd8bd153e SHA512 9a8c739fe0899286f8026bdebcd69ee80ac8a9194cec4695efffda8340438537a03e203f944c94e35478fb2cda3a28971067eabd7152a3247122937e094361d2
 DIST sublime_text_3_build_3207_x32.tar.bz2 13801015 BLAKE2B 5d2c76b4f0894ad2c171cf7e3726e3684057fb4f7c6fa5bd35b9bc9d0e32781884340cb5c2d2bae15128b41b888337d88a7d917e1841b939607507da9c888d93 SHA512 28859fedb76c6074cbf7724ba5822bce8e1e89393bf3f61c4b277847a8568bb3e92345628754deb73e96c10fe748b0c43000d6e15e59422b20904e042a3d1e61
 DIST sublime_text_3_build_3207_x64.tar.bz2 13672413 BLAKE2B e9e98fe0d6d8f059ec9af2593414cf6c35bce3b70193999922f6ea8fccad5348af549a374f57a2410ed10fd74bf58d6bf895da667af67c454d8ad678b52e52a0 SHA512 48510da4714bddfc129d89d68b277c2a3e9badfd0bd276c746e0dc0e5f14efb091dc7c2b3a1228095ebf70be8f73f4a5004f6f8903fb18d7bcc70366150e6251
+DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
+DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
 EBUILD sublime-text-3_p3176.ebuild 1655 BLAKE2B 9c224d920d1e2928c70c46b6709c579b7e17df4b8f50b06355f4336b730f8341a5a64bcfa31b9be3db94c436aaf6d9f4765241f8f7087774fe970cf3577c812a SHA512 d536fa15fcbad6e804c339f9ab13896020ae92579069fd4e1dddf4337777760fc0b8874f098b73091a5867a3c74ceb5da295df1f893d4b2bf3b0b1ee99269193
 EBUILD sublime-text-3_p3200-r1.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c
 EBUILD sublime-text-3_p3207.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c
+EBUILD sublime-text-3_p3211.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c
 MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/sublime-text-3_p3211.ebuild b/app-editors/sublime-text/sublime-text-3_p3211.ebuild
new file mode 100644
index 000000000000..d059f42e93d5
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-3_p3211.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+# get the major version from PV
+MV=${PV:0:1}
+MY_PV=${PV#*_p}
+
+DESCRIPTION="Sophisticated text editor for code, markup and prose"
+HOMEPAGE="https://www.sublimetext.com"
+SRC_URI="
+	amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 )
+	x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )"
+
+LICENSE="Sublime"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( sys-apps/dbus )"
+
+QA_PREBUILT="*"
+S="${WORKDIR}/sublime_text_${MV}"
+
+# Sublime bundles the kitchen sink, which includes python and other assorted
+# modules. Do not try to unbundle these because you are guaranteed to fail.
+
+src_install() {
+	insinto /opt/${PN}${MV}
+	doins -r Packages Icon
+	doins changelog.txt sublime_plugin.py sublime.py python3.3.zip
+
+	exeinto /opt/${PN}${MV}
+	doexe crash_reporter plugin_host sublime_text
+	dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl
+
+	local size
+	for size in 16 32 48 128 256; do
+		dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \
+			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
+	done
+
+	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
+		"TextEditor;IDE;Development" "StartupNotify=true"
+
+	# needed to get WM_CLASS lookup right
+	mv "${ED}"/usr/share/applications/subl{-sublime-text,}.desktop || die
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index ce8354be1e94..e7f19b89826a 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,3 +1,3 @@
 DIST texworks-0.6.3.tar.gz 12082640 BLAKE2B db5b98f9226e0e7e109dc06d8e0a88b0e8f0dd237676ebec3be55308c720eb6dada25be061d8d5dc27949b9673e93fd65c8ddddfbe03aee4f8170471c52b37fd SHA512 389cf54441e74164fc842f2f293cdee45c6ff9fe202f262d32f3fb076de9a29813a62cd75052969293f2f784e0722215bbbf2206e75bc836a13d495bf5aed653
-EBUILD texworks-0.6.3.ebuild 1315 BLAKE2B d91858e4fd69821a7c1c2c65c0139f24218beae6e3fd73c74eb948702a8d64f000b94007873c833eedd2e0f75406319b36acabf2545b612bdda7454496bd1497 SHA512 d91a5fbbc9652be39436128f655af27a8264c4a62716c57147ea3299935b64164585c0051cd7d0a73c3ea05b136a84a475d1448040cb879f6b5be488c34c82aa
+EBUILD texworks-0.6.3.ebuild 1314 BLAKE2B c864909e3096a6b4c034b0d0e02013eb975895a117387099bf49f23b6cfd3c98c4167429d76d2556d0bb73ab389685c39afa8a63fca13cdf89022f5659c06d50 SHA512 b0fe735402a15e7073a1cddf94289c24ea48c2b38278d831c5dde8df30dfc2dd9f95099459d496262e649de1e77acd607e0b145f0ea558669afc5b276c69b864
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.3.ebuild b/app-editors/texworks/texworks-0.6.3.ebuild
index f52bfdf76e57..63fc66eee9b1 100644
--- a/app-editors/texworks/texworks-0.6.3.ebuild
+++ b/app-editors/texworks/texworks-0.6.3.ebuild
@@ -41,7 +41,7 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-Wno-dev
-		-DPREFER_BUNDLED_SYNCTEX=OFF
+		-DPREFER_BUNDLED_SYNCTEX=ON
 		-DWITH_LUA=$(usex lua ON OFF)
 		-DWITH_PYTHON=$(usex python ON OFF)
 		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index b30d70cbf1bd..745a377b1fa8 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -1,6 +1,6 @@
 AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d9302a42f547848f346dab632a64688091b0e8180332935e3a72773247498314e82af31a904405c965dd7073bdb317f0d09944752f34 SHA512 6938e768e742ffcbd88469c58bba07325d0c2ae7d354bdba66fcc3f9d47d141a98923fce516a03a799032869461da301cbe8ce7f312196a51f69dddcbe5c069b
 DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
 DIST uemacs-4.0.15_p20180719.tar.xz 151748 BLAKE2B 66572d3b4eb54310b7468a43fa718faa78aae8070a8675018f8dccc38d2dcb8e93b41942f49ca28b7c8ee5d100b541ecebfa2adc9a84f121a178ade0903029b1 SHA512 0baa273d5f8df75976d01acbe69b2bca7ec803c8a40364ebded39d16874426874af7b7547774c211fbbb96c82fcb69aaf75f8fa5fd3e95422ee105e6be7f9564
-EBUILD uemacs-pk-4.0.15_p20180117.ebuild 937 BLAKE2B f1ff9da5a0484ab9e5fca3573859766afc30cedf46d35ab77dff19c8850072c4e591145dec35f9b790dd0c8ccaa1107712ac6be1ad25c1c1ddd2f48959f21283 SHA512 ce04f47cf3d809ff8ae2b92514d7c032be5630165c5d000cbebee9ff0fae2588ab881c0d3009941752a8187c690d41b6d08dcfdc9e49cfe10f030171432626f2
-EBUILD uemacs-pk-4.0.15_p20180719.ebuild 943 BLAKE2B 9fa110db6096a60c8fa1d9e2baf02c723c085243bc848303edc11823afbe3f316d8c003fa9bbe267feba984253b9eee9f933a6336b03fd683e0764759e302040 SHA512 fc355983744a4f3190e83f29be38230885021efe3197a5029faea0f56f1dff3cae0a38b1e04641534db1aacd1d6740f5d37e9c2bec41042ad7785c6bc9d5d2eb
+EBUILD uemacs-pk-4.0.15_p20180117.ebuild 927 BLAKE2B b202db5a4d1349c326969c5170b816b3d9137bb589e02743e9d96dc8c044b77085aac8b0937c48e1c19e05f4fe6c9b536a434418edf2a45b9219f5dbdb17eaa4 SHA512 ea4379eb99195b753cc107c3864089f346a1d0c74766a884098f5a840835b7337adfa75bd95698719a34a33b88ecb06926b6f001d987ad24685e1c4d4189bb0e
+EBUILD uemacs-pk-4.0.15_p20180719.ebuild 933 BLAKE2B 562f57c36831cf1b3c6d201651064dd753f28627ea987a8267ac9f981350c0837a5d34537c2289ebdab75745bb2a5119c49f34abab2220bca85a5babd6757330 SHA512 09eb12f2e1c6cf870a4cd179906e90f55783ce2db169bdc30c64a670f2519cfa413b5fb513b479c07260cdd5be08567e87cee5282fac627ac2e09013268f12a9
 MISC metadata.xml 1038 BLAKE2B 78d5d45edaf021f6be2ecb46cfc2c8538a14f7589d16a1891481633e23c272f8d76905b27535baedb4af0be51b7e1e9a2ea1bc286dd79c6c06d7b6658a856df8 SHA512 303232f4886511f0731e699a8c29a1925f506a037cebc60669c02aa060b2d555bdb2378919f5d66e61859e18a3b2ede21204edc5fce37a9220ab9dcf2f23c1b0
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
index 33a4432c46d9..c526622b9492 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
index efd6c5b740c4..0955ecca90cd 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 3b5bbade0c8b..dc237da39515 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -4,7 +4,7 @@ AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e2
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-EBUILD vim-core-8.1.1486.ebuild 6937 BLAKE2B 0409e1720c6082fca63bffe307bdfb0cf5c79325c3f61dd0d4f2360e33c03643b7e1ec0f6f8c98a3ed27fdb95f7ea50378d8063441ea594fdaec376ccbb2fa45 SHA512 b6c00c520c2d99a3325538fde47e2bb9d9088f491df6d5dc7c0802f53c2f365ff542f226f800ab0634c2b2589d456211dacc212407c70c77400c5ad80b401904
-EBUILD vim-core-8.1.1846.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
-EBUILD vim-core-9999.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
+EBUILD vim-core-8.1.1486.ebuild 6915 BLAKE2B 2d44adfb2dea395989f9658b0d0e1957c965424e035ea321837117f9223418e496fb55f8e04b3176001aae546197cb72e4274d6b137a92697c2defcdcf3da149 SHA512 e294057a7bfaed7787e7a37c3a806a218b7d6c374e9f01fa054c601a38a446ee0ca6c79d6e69c40a0b01c2526b7736a2fbfbcfb2ddcc47cfb074626c0bdf9f16
+EBUILD vim-core-8.1.1846.ebuild 6926 BLAKE2B 466e6b784517dcd1d71a23bb1daba145e01ec8fb09d1560984c5a4641bf03177d36dd43be67402f7b87fecca7bfad264d54d404d4355c9a4f141f8bb1821fd62 SHA512 a660417f9e9d5493d49c9c118e38de7373ef1429093bf68577a535083725dca32a8415d44d50165ca29d369cb1b2211ee8fb3fe0c415709b35247ddad7efec50
+EBUILD vim-core-9999.ebuild 6926 BLAKE2B 466e6b784517dcd1d71a23bb1daba145e01ec8fb09d1560984c5a4641bf03177d36dd43be67402f7b87fecca7bfad264d54d404d4355c9a4f141f8bb1821fd62 SHA512 a660417f9e9d5493d49c9c118e38de7373ef1429093bf68577a535083725dca32a8415d44d50165ca29d369cb1b2211ee8fb3fe0c415709b35247ddad7efec50
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.1.1486.ebuild b/app-editors/vim-core/vim-core-8.1.1486.ebuild
index 634ffc480635..18d0e6f673cc 100644
--- a/app-editors/vim-core/vim-core-8.1.1486.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1486.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-8.1.1846.ebuild b/app-editors/vim-core/vim-core-8.1.1846.ebuild
index 08bf83307d75..b12aef7dde9c 100644
--- a/app-editors/vim-core/vim-core-8.1.1846.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.1846.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 08bf83307d75..b12aef7dde9c 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index f019d93ed5fa..95baa09b0db9 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,7 +2,7 @@ AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
-EBUILD vim-8.1.1486.ebuild 9093 BLAKE2B dea5afe5f46f73fc190210988cbad81fa3a4d91796f4e968e9675b2e3e09eb8dd4e678a1899d57405bbaf14f70fdb9d0125d64cf0394be09ccb5cde83e347446 SHA512 d6d231bf494b2742dd3820aa7f8f7a8303d7a6edd4dc3c2e61396fba3961a134017bcd81d093dbe9ef635da524ff0adf000dc52a06c18a528781922e4bf8523b
-EBUILD vim-8.1.1846.ebuild 9180 BLAKE2B b5f478b9591fc2cd3fea99c82d89cad0bb2d8457180d47b9020ea0f259eef2cfcec7fabb49f8e12466f6bf7dadac74882fc5013e03fd9c76a7fa073802decf12 SHA512 2da5c7d28d1660c80299e0f3f3c454edb741e9bbcf94b577986ba2fdddd9ae1a072e44309e25962c5d9423b5538dee2fbcf2914787bbdfc460e6b62fbd464116
-EBUILD vim-9999.ebuild 9199 BLAKE2B c7e0eb1fbb65ead20d911c9b6cf60c34b63a89d8dce49799ee496600496a83bffb671249f5a965b0f5f2a93684a92b967e759a7b6a61a431a7bf82abe6ff2a67 SHA512 383c348dd5be5d939b218a21bd3b281b8a9cd411c745c045ecdacd28e78a2364b005d8423cce6485ac78588a96a3b7aec0e980d2acb8fd7ab91d5ff5bbc07f11
+EBUILD vim-8.1.1486.ebuild 9071 BLAKE2B ccc015ffe297ef875c31f05ab802b14785d4e020975b251b1dcfbe49a93662a6c543c4fc3645a37c5882a8357419f1bf241328890769cf0198a2d05c5f56f1fe SHA512 0d968e45730203fbe7a936a3329ecf107fad7edb5fe53b524873bb71aebc9dbbb602580d3775cbf59d56ffc27caa70e6078ea374e9fe75b45df3167971fbc0c0
+EBUILD vim-8.1.1846.ebuild 9158 BLAKE2B 2128b3794ae8d7957c74ecb63bb06fc1b6b4a3cc17fbf66925fe775eab9b466f819e80a68c467497591399770d0023a83611b9e0e32bb7552f30bf4c2a5f649c SHA512 0a91a04386d233913f888a90da840ef33846e9d450d6287d7b7c64712cdbae765476c866be0d729c638192e0ac9c90a4bea7656210ad60656c64c43f5f9e76fe
+EBUILD vim-9999.ebuild 9177 BLAKE2B f1e49f697e9dd013d586ac25859cb5f9e42a4f4b133e86103c182743592a736c05d4ffa9cfab92bdb02ac7f589c0ce3257a0bb4f5464ffe5d483d7c3ffe6c523 SHA512 86d01ac13dcbbd16e0932d486ec986f829fff21c72efa3a557941dd9ac69085a0af9c7597011beaee3adb323706c8fc329681e487c5f74221f29e9c366427f16
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.1.1486.ebuild b/app-editors/vim/vim-8.1.1486.ebuild
index 2a8a0c1966b2..523b701d7e45 100644
--- a/app-editors/vim/vim-8.1.1486.ebuild
+++ b/app-editors/vim/vim-8.1.1486.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-8.1.1846.ebuild b/app-editors/vim/vim-8.1.1846.ebuild
index e01727ab759b..a5ce18ee59be 100644
--- a/app-editors/vim/vim-8.1.1846.ebuild
+++ b/app-editors/vim/vim-8.1.1846.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 3bf04b7c1478..704472bff111 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index d5906d0e526a..e7b62df35b27 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -13,5 +13,5 @@ DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e54
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r1.ebuild 6737 BLAKE2B a6b3db1d9408e639fba375220a9016c037644777e5f472a4f354e90d56dd3bc3daa822bc5c4fe46a3250212b9c73f2af52c5eafac3df4fa18f211c3d3fe2ea95 SHA512 48aab5209af4ae97a885345919619a1dbaa0fecaf1f3b89c47ad8aac93efcb9094b27615181082939785eb520768c49f1c1a1787946215a04fcc9244b8c399bb
 EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
-EBUILD xemacs-21.5.34-r4.ebuild 7267 BLAKE2B 125e827c81687086442d4da66740a194c308a3d02b713ba29e0834e2fb8580726e49b17cc48c417eb3dd97bd2a473cfcc762a453ff63497463e3625a749b258c SHA512 3e59773f446d1fdebdd49894225040bd89ce3b8027259293494312fd0e5de9ed02367f56cbf6d73afe112c2959b72619de496ff89fe0d1b66c0cbbe718ab4cd2
+EBUILD xemacs-21.5.34-r4.ebuild 7255 BLAKE2B 755a7be006e03a589514eb2c65ec4bfb5d869ef3eb84fee718b77e06d1ed90db0aac543e511cbe6f9d5cba706bb9e5e3f104efe6fc9c4d8df715a91fad0249fc SHA512 33d58e6564d6312058a67a86da32ca335eed47ef3d03da97bf822b9992da775e638fab1061c884f42423b43f69ff98726e894f734ab401d1a14e1b04e7105733
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 28f843bc94a4..487f5b97af04 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index b25ea4a3a797..0bbc92d83c7e 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -2,6 +2,6 @@ AUX zile-2.3.24-gets.patch 904 BLAKE2B 7d5bca1774f2a507281b17213289bbc15a75e112b
 AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821fe611396743a64e161c3268086e252651b3fc05745fcd00ce614a94c776d7305251ea971adeb80e799d7edbfca1 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7
 DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
-EBUILD zile-2.3.24-r2.ebuild 1388 BLAKE2B 482aa4b2d310ca7e8be5dbc41e5966e88fc2de91a78b373ec61e52c6e9bbfa4ede3656472fb9acd22d7641c7229b3be79438965eeb5aa7f45accf3ad26a5a94f SHA512 dd9cbb3919ee2ad723b6cbe0b50259f9702473902f8df03f2ae8c119e19b45fe804387f9bf6ca8e12bc51883e1bf4272d4ca2a04540640e1a2b152b0bb80b312
-EBUILD zile-2.4.14.ebuild 1438 BLAKE2B 04de964dfa2c0189356495f5837ea7b33e2eaa0d6270faba250ef6850838495c2f2d52a175a0db719981a65e3681e5298e2c7ae0d697df498009d8760a7627eb SHA512 3f25e4f8ade5f0b49a62c382133d1c85aaaeefe0470b59212903e4bc942b706bd1530586faad99f59ed8b1f63ebdd3b0648f66974793d8e6d0903cbf3ff9f839
+EBUILD zile-2.3.24-r2.ebuild 1378 BLAKE2B b8a77f28aaea35d3c5878b9ff39a0762a1d95edf78eaccd5a1aec73e16abff63a54bbd184d6e80530ae39e30b3552491b0cdf4e6ce0a66658b37a65833f7ded7 SHA512 e8a715aed8be8f7cbf70a13d4c32b3dfb62640e92dcae1766eb7dc6e8d25d2726162675aca11060fdc321fd92f971fd3a7672a67204a59e8384c1cb9b2a51060
+EBUILD zile-2.4.14.ebuild 1428 BLAKE2B a0fc4296f9d557ffc92d54f71b2d139ec0f49f442580dedc31c3c54d5a2f3f4d02f4506e94fac2c62da06ddcb66060286fd18aff8ad066906386b4ede005e971 SHA512 d8e69deab0b1f25d2d5ccf11b97d7017499a82fba87c2a48f686e2b6b6356b9034aa20247e22474d737e752a257d2d6215e5d5ca84f96b2d491ade61122ad88b
 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 ed5b64501fbe..f57acf4304eb 100644
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ b/app-editors/zile/zile-2.3.24-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index ac47a50b378f..014e00abf5c0 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /app-editors
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)