gentoo resync : 05.02.2020

33 files changed, 90 insertions, 371 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 009c484d77c9..b8df235f9fd5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index dda6db11047b..55d9fc89ae1c 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -2,5 +2,5 @@ AUX aterm-1.0.1-deadkeys.patch 1358 BLAKE2B f692e190a33e50877da050cce3e7a3c8ab36
 AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e81526e7575514e9a83e064158bcc3dc5a554db5f5592c3af2c33eea78864ff0d8d16770dadf1ef20aea52fa131c5c75ace20991d2 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r3.ebuild 2041 BLAKE2B d09c5fd5e0bf6426013ffe82ce406b39246dc7acd4f8e79d9aa186b27d1a166d63353b8502fc1ce87f36aac1c8be85ae77473a88ee3f19e9481e5c7dccf19c50 SHA512 620d7bb0361a3ba518ad5c1ce6032e5c98cc046826a781de164de4249b587302ea1b2e84b5058a4e9634d685e09dbf503d672de625d6389edc7a55042133d969
+EBUILD aterm-1.0.1-r3.ebuild 2042 BLAKE2B 0765344ffd957b20b87962175d985f3d0debff6e41069d4614a2b4b5166d2190025ff94f72ead0c050f1431ab103228fb36c32c8b8c268d79efda2c709482b55 SHA512 7bab005922e3d52f6fb0e5ea1f858d2635e36feff6791c4480399b3903ec7323c0d5982c696abad80f8ca7cd02c947e6dacccf1dd5233fd92a8a7fbffadabe38
 MISC metadata.xml 456 BLAKE2B 268ce12677cb3678b091d810094c33905df594b0956e4103b132d6c5bc01bb234dffff4f65e34d8331a4ee76f2b893bf5fecbf4bc403b2c0690a357929a0a2cd SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index 7ebd09a48499..e9368e714ee8 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest
index 6e5b51317357..d296d72fc443 100644
--- a/x11-terms/cool-retro-term/Manifest
+++ b/x11-terms/cool-retro-term/Manifest
@@ -1,6 +1,6 @@
-DIST cool-retro-term-1.1.0.tar.gz 1973348 BLAKE2B 9490b05db849bdc08e83215651081e175a59888b2dc1a516fa380fcf10d5b9443e9d214009d06e6b0741cad6c16857357753c846be18b7fd9455c7a3e28ec728 SHA512 70a0fdd3653fa91b92f796d865bd1256fa39228ff536dad95d0eadee502e6babbc56ae6e0275913ec38573669e4f03938dd559128cbf46209149bd60171391e6
+AUX qmltermwidget-0.2.0-gcc-10.patch 1398 BLAKE2B a06fd644c64fd0b5cf549b410c28473d3ae31ec1477ee1dd60fb0108ee2af2221597d8fbeac6f3a8c33f605f3003b9a4dc2cffeb568788f606440aed9b19dc37 SHA512 fc50c4e64a8126b8586efc74939c71d43601e9a0dd4863a618fb51be46d05ac325ea3dfb96cab4a4a5b2accf0e2e8893174c1980b5b96ade8490d3a485c58ccb
 DIST cool-retro-term-1.1.1.tar.gz 1975853 BLAKE2B 54c9e5adb0879380215c390659da59266c323f12a046dafa2981d9c5e5ccbc6369e553427014e0347afcb6a1a64e188fb51f202d7c870a544fd2ecd5980f4c0c SHA512 59da4b5d18ad64b917caebbc63ea9e3d562ed2a2dc9eae00f36cf434df44d17adca084b448f860f24a74ee6b59cd083d6a81e2217df1fb5e9f2731eaf1752148
 DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43
-EBUILD cool-retro-term-1.1.0.ebuild 1209 BLAKE2B 14ba5cc79d82b32eabd4f6aea766258e72393e339545c37e6f98b743563cb2beccb3497cc8a1a2a3d4256a0ea2d8c76223da029407a8ca38fee8fc85ad3b2144 SHA512 4152bf28c77b4896dbeb8c90dc10122c87a1412eb0a6d14b97a547b2eb59796df379bc472418ea70a22592ff8e09b05887e4dc8faecd7a5bd5f0ad2a6b5d3d7b
+EBUILD cool-retro-term-1.1.1-r2.ebuild 1315 BLAKE2B 9050009b9ad8c43ba1fc278f4dffbcb1a36f43d3c6151f40a120a631571c8b8e0932c9838029bec19391afc5a7e30434c79df5f70fd939e7b8593ccb09e46636 SHA512 c5c4d122caf5d4f5ef98f33748d238f5abc435bbb195d41fe0b6ef7f00b2dee9d2820713b4f5cd271ab0b1d21a903447aca28c620030bdab9982e3fc56bffeaf
 EBUILD cool-retro-term-1.1.1.ebuild 1209 BLAKE2B 997d91692ba3d191c82eae17df1c54e0d65595d438cf4968ed1f106319a2941ac37be59686e74228cd1699da9000ce7a83927ef9f204cebf2fa56b682e869111 SHA512 ada8aa91ea4a817e432f9370a28c2a557d72fd02721bb07a4e8780eb41b971f3b28936b6d4e5fc23b602ed1f90f8154cc4f882fcbac3187ec5774425045e37a2
 MISC metadata.xml 343 BLAKE2B 4c576b8928fb82994206d310506a0b790c14108c235e9815750cddd3f9becc747fdec7f2bab7aae92c2d52b648f25b9b82dfdccea77953b6f694514977efd7a5 SHA512 5e102d64e39f274ce62e25739adc52ae998b830a38e7f292b33ccceccd5b262aa62fcf04a4372561aed54760ef9624e1f7335e4198cadb582b152f128be60466
diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
index 23c927425471..1f9256427d7d 100644
--- a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild
+++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
 QTW_PN=qmltermwidget
 QTW_PV=0.2.0
@@ -34,6 +34,9 @@ src_prepare() {
 
 	rmdir qmltermwidget || die
 	mv "${WORKDIR}/${QTW_P}" qmltermwidget || die
+	pushd qmltermwidget || die
+	eapply "${FILESDIR}"/qmltermwidget-0.2.0-gcc-10.patch
+	popd || die
 }
 
 src_configure() {
@@ -46,6 +49,12 @@ src_install() {
 	doman packaging/debian/cool-retro-term.1
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch b/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch
new file mode 100644
index 000000000000..f14a269712e6
--- /dev/null
+++ b/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch
@@ -0,0 +1,46 @@
+From 5cb4f9e6c86354674bd7715d947f95ac9f16a6c1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2020 12:20:37 +0000
+Subject: [PATCH] TerminalCharacterDecoder.cpp: fix build failure against
+ gcc-10
+
+gcc-10 fixed a few transitive includes and std::cwctype does not
+get included implicitly via other headers. This leads to the
+following build error:
+
+```
+lib/TerminalCharacterDecoder.cpp: In member function
+  'virtual void Konsole::HTMLDecoder::decodeLine(const Konsole::Character*,
+      int, Konsole::LineProperty)':
+lib/TerminalCharacterDecoder.cpp:205:18:
+  error: 'iswspace' is not a member of 'std'; did you mean 'isspace'?
+  205 |         if (std::iswspace(ch))
+      |                  ^~~~~~~~
+      |                  isspace
+make: *** [Makefile:924: TerminalCharacterDecoder.o] Error 1
+```
+
+The fix is to include <cwctype> that is supposed to define 'std::iswspace'.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ lib/TerminalCharacterDecoder.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/TerminalCharacterDecoder.cpp b/lib/TerminalCharacterDecoder.cpp
+index 579dedf..5d5bfc0 100644
+--- a/lib/TerminalCharacterDecoder.cpp
++++ b/lib/TerminalCharacterDecoder.cpp
+@@ -19,6 +19,9 @@
+     02110-1301  USA.
+ */
+ 
++// System
++#include <cwctype> /* std::iswspace */
++
+ // Own
+ #include "TerminalCharacterDecoder.h"
+ 
+-- 
+2.25.0
+
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 690cb83a54f5..7a2e509562b9 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,6 +1,6 @@
 AUX eterm-0.9.6-asm-gnu-stack.patch 292 BLAKE2B 4d4e90c0a68119ccd1f41132b7dd77f8fe388c503f5ff6e04faa08c6bee50de5d389f1e40e40396cda027748d25f0f2c28bbeec7175220ef3e861702420d6721 SHA512 cb4a1d3910fcf23bba51069b0639a1725b375a09d1bd9ae43985c1dfdd29737291888cabcb2ce03961fbd3a219437567509eaea8b3072a297774bf4cdf534baf
 DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
 DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
-EBUILD eterm-0.9.6-r2.ebuild 1465 BLAKE2B 49f120948da5ca18d5367a4c8dbd3ff6e01d5c916b79bafd7392cb90078d1aae234d22d53275aa7925f518e6b311adaef9c08650828544f23b69f9a42e7a4f58 SHA512 b395bd17ca516859c9d027b3a775ab7b948bc1e106f97469b0b62c924b7f2a0bdafc9ff4eeca873c65483ddfc3081c7e55403be5f891eb284a9e1f205091f798
+EBUILD eterm-0.9.6-r2.ebuild 1466 BLAKE2B ff9594a9ece2a9b749dd6daf8c70b6915f4a9b14bb48f528b5ba8b8691dc8a0b9bd85f8b66cfbd9b81d7866e7cac82ce662a73cef41e7a7b585ba973e0c469eb SHA512 38596c4d20c0d3163d455f8f12b9333d82aa5eaa0d520ecc72af9889fb7d0072d9ae8cf3e6a1d2415277ea09f873408421ee810c56ea8e4d831075f8db12aedd
 EBUILD eterm-9999.ebuild 1195 BLAKE2B 083dd092a63b1df6585353fd7e6dc71190ee9cd4dbc979e1c5e75ed9317495c18250039af9e599171e27c4b841fc35ae81b1607429eeaae22593d2d1208ba328 SHA512 ef1d09e3a7c3a54571c6a460b548dde075eeca921899fe54f11d6263106c1a7f87b4ec6d1ddd989739c6c3c0869bccd55236c5ce6dc5d186d0a5b0a231e8a652
 MISC metadata.xml 812 BLAKE2B c3f47ef367d27e0ad69c54e22fdbda24d3673208561b9a7827f612d1d487e4ab2ffd05c02832b112ef8c599921bc3a59c3296b50874a2bf52218fc5dbf76f960 SHA512 86f0b751166e5ccf7de8e65a8acc6c74a189be1d692b9e470c9142a351de2f436a7e62237dea218d1e143b0a2e5423e419d194cbbc911a5e1f5787bf570aba7a
diff --git a/x11-terms/eterm/eterm-0.9.6-r2.ebuild b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
index db5513aa22c9..0d9cd254c9ec 100644
--- a/x11-terms/eterm/eterm-0.9.6-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index d7bde7dc2759..cf1a38a3b244 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,12 +1,8 @@
-AUX kitty-0.14.4-flags.patch 1662 BLAKE2B a936f445ad9d0ab7eb23ef9d50b94d52e49233e4890bbcde1de873c2d094687870b97261f3c0b01e059ce5debf67ae3dd1829835f2c4c06713996547f345dead SHA512 f8c2c2b9888d644e3f43b2893d9719b50fbd8627976ac81dcfd26e4409b2644c544fb610e39a84e8b4b7bf0851224f247716c5358c02e053ec571361b694d00e
 AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
-AUX kitty-0.15.0-flags.patch 1697 BLAKE2B 0a92e8e8c6f9fe8e49f315d0cfb40f383d12bfb94c5d1aae7ccc10d5a74611a18d3fe0ff7be8cfbf07a440973dbc5ec63c50a7c74f744198c1ff5b8ade49421f SHA512 5207adcca12836fe2ec803a5809a02e5ce531e1ba1559d70e11156df367ad038c76180b8cfa6171a0448f98705bdb3ec62fb98138f9b41e802116066474eb6e5
 AUX kitty-0.15.1-flags.patch 1674 BLAKE2B 918844df4b6b0bdc7d5dec1c40c47ce5fc3a2b18485ef0d64002ed720835ea98371f938fe97f0fe339b44b977290c716f9d1008c31257da09966e3fd59d52b30 SHA512 c3de4073b654a0c432f7d601378536d531056c961e9036223c93b9653fa924b4343ad797d451bdf9370dce2f97e6d596a04908caea6156095440d6ef52eb17b8
-DIST kitty-0.14.6.tar.xz 2970008 BLAKE2B e4f64051aebcc5d5aa1956351acb5564815e65c7c8435cac3c7960c5096fbeb5f0e98e3bdf92e750e8d70d6b0124b081bbb5d38a589c3dc5cf74642c3eaf83c9 SHA512 889bfce732f2a36d338c9c41b28e0770d98c15530b56a9f037cef610593b50453f1bde60e89560472035fc250dec0431a9776de1449f77e4c6988aca157eea12
-DIST kitty-0.15.0.tar.xz 2978152 BLAKE2B 49f6e5051392c9ad0a91151ccc9f62dbc8ce0031680c66f4b08291c5b5cf43ccb1f096aecfcc69f7980997397d326d6b164f5f189fb89608ed9c8c22f313ebda SHA512 4e546fb9ad0cf34df8aa5ef3787224e8dd820fadb474faddc5f47b987bbc46fb62350a64bcacbdccd7e7cd287df22045ed742b89f613e402f033dc8bb73d8688
 DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
-EBUILD kitty-0.14.6-r1.ebuild 2104 BLAKE2B d0d8942e23268eb5c03e8ba3cbc1e4c134221675c3f572d6cb54242c47e5332fc41cdab4c40b82e31922b773a9ddcbc09e52b987cb503f2604ef6bd9a1fd0ab4 SHA512 1db004153abcb2c2691a2ee64ad6c200a0541a3ac03d79a9b4f47b91b7d4b6e19e114bb1fa50dc7faa588a30c2e283c9618bd6c4265687e4020392b180c2fa80
-EBUILD kitty-0.15.0.ebuild 1981 BLAKE2B 292538aadcd73130bac9c995c6a4e69ff6603de699016a5c55a2a7531264678b42d61314cf82648952dd0d18047ed084f25060342fb5818bd9400cdbdc744575 SHA512 5779182be177f68d2230e077ab9a6a91aa1a9ff19e67b81af454d4f802bfddaa0f67c57bb6919d2d177c669040005caea303fe3881d1a1824cf1e49a11aa783a
+DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
 EBUILD kitty-0.15.1.ebuild 1954 BLAKE2B d93e44f89f40e43ae162d9e33ac46294033c78f15460f2157ca745d966185d61ac220c7e884cb51c3e94d7280926575628ff41dee617f735573d3d146fb675ab SHA512 32b9d42eb970957cd8e9b7633100b0e19890f420566f4889a3aa8b45273921bcb7fd84dd769fad7caa0ddbe7c67eebe6c9d80a468222eb21e4a6b24fa3bf4cfd
+EBUILD kitty-0.16.0.ebuild 1962 BLAKE2B 2c186851ecb7e65951ed52409e44b88f1a82edf85d3a35413b7d120fdabb7f41ff3501fbe6cee0e499b062a40e4ff0021196f9d1f48ded48cdc27fe27ba69b57 SHA512 68310c47fcf7a07a33335e3311a18272588d81990ab46b47f711c45a8f456aaa9006dcdb34123480d0f113475599cedc90c38ca84130a5ddc57e12a06eebd559
 EBUILD kitty-9999.ebuild 1962 BLAKE2B 2c186851ecb7e65951ed52409e44b88f1a82edf85d3a35413b7d120fdabb7f41ff3501fbe6cee0e499b062a40e4ff0021196f9d1f48ded48cdc27fe27ba69b57 SHA512 68310c47fcf7a07a33335e3311a18272588d81990ab46b47f711c45a8f456aaa9006dcdb34123480d0f113475599cedc90c38ca84130a5ddc57e12a06eebd559
-MISC metadata.xml 565 BLAKE2B 3b1a6c00d6f1f1281b1c861cc9d6b6e0b62a0cd82ae6e81f11917855138a85e6b3687857b7bd0f9c8709baf8414fa9ef3c2a49c79751d4bc98d949c6f39b9169 SHA512 10fd20fe44a6503fc49c2f88ab6affcc2d00376cb4edb3144fe0ab81bbb6e3930fc02f87372ca171de67f7aa86e341cdaf344eb3d872dc450b5df8d087a37b7c
+MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/files/kitty-0.14.4-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
deleted file mode 100644
index 5bf301efd5a8..000000000000
--- a/x11-terms/kitty/files/kitty-0.14.4-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.14.4/setup.py
-+++ kitty-0.14.4/setup.py
-@@ -202,7 +202,7 @@
-     df = '-g3'
-     if ccver >= (5, 0):
-         df += ' -Og'
--    optimize = df if debug or sanitize else '-O3'
-+    optimize = ''
-     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-     cppflags = os.environ.get(
-         'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -213,7 +213,7 @@
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
--            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             optimize,
-             ' '.join(sanitize_args),
-@@ -227,7 +227,7 @@
-     )
-     ldflags = os.environ.get(
-         'OVERRIDE_LDFLAGS',
--        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+        '-Wall ' + ' '.join(sanitize_args)
-     )
-     ldflags = shlex.split(ldflags)
-     ldflags.append('-shared')
-@@ -608,7 +608,7 @@
- 
- 
- def build_launcher(args, launcher_dir='.', bundle_type='source'):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     cppflags = []
-     libs = []
-     if args.profile or args.sanitize:
-@@ -620,8 +620,6 @@
-             cflags.append('-g')
-         if args.profile:
-             libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-     if bundle_type.endswith('-freeze'):
-         cppflags.append('-DFOR_BUNDLE')
-         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.15.0-flags.patch b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
deleted file mode 100644
index 921104e95f3f..000000000000
--- a/x11-terms/kitty/files/kitty-0.15.0-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.15.0/setup.py
-+++ kitty-0.15.0/setup.py
-@@ -204,7 +204,7 @@
-     if ccver >= (5, 0):
-         df += ' -Og'
-         float_conversion = '-Wfloat-conversion'
--    optimize = df if debug or sanitize else '-O3'
-+    optimize = ''
-     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-     cppflags = os.environ.get(
-         'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -217,7 +217,7 @@
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11'
--            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             float_conversion, std,
-             optimize,
-@@ -232,7 +232,7 @@
-     )
-     ldflags = os.environ.get(
-         'OVERRIDE_LDFLAGS',
--        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+        '-Wall ' + ' '.join(sanitize_args)
-     )
-     ldflags = shlex.split(ldflags)
-     ldflags.append('-shared')
-@@ -611,7 +611,7 @@
- 
- 
- def build_launcher(args, launcher_dir='.', bundle_type='source'):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     cppflags = []
-     libs = []
-     if args.profile or args.sanitize:
-@@ -623,8 +623,6 @@
-             cflags.append('-g')
-         if args.profile:
-             libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-     if bundle_type.endswith('-freeze'):
-         cppflags.append('-DFOR_BUNDLE')
-         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.14.6-r1.ebuild b/x11-terms/kitty/kitty-0.14.6-r1.ebuild
deleted file mode 100644
index 8fa3a58dc70c..000000000000
--- a/x11-terms/kitty/kitty-0.14.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-apps/dbus
-	sys-libs/zlib
-	media-libs/libcanberra
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libxcb[xkb]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	media-libs/mesa[X(+)]
-	sys-libs/ncurses
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.4-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"/usr || die
-	cp -r linux-package/* "${ED}/usr" || die
-	python_fix_shebang "${ED}"
-
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.15.0.ebuild b/x11-terms/kitty/kitty-0.16.0.ebuild
index 6cf7eb8c9ee3..c62b5d655696 100644
--- a/x11-terms/kitty/kitty-0.15.0.ebuild
+++ b/x11-terms/kitty/kitty-0.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-single-r1 toolchain-funcs xdg
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug imagemagick wayland"
+IUSE="debug wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -38,7 +38,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	sys-apps/dbus
 	sys-libs/zlib
-	imagemagick? ( virtual/imagemagick-tools )
+	virtual/imagemagick-tools
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.17
@@ -55,7 +55,7 @@ BDEPEND="virtual/pkgconfig"
 [[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/kitty-0.15.1-flags.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index 99074a0caa85..2c9e05543121 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
-	<use>
-		<flag name="imagemagick">Support displaying images in the terminal with icat</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
 	</upstream>
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index ed166bdb8980..55fe9dd23633 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,5 +1,5 @@
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4
 AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3445 BLAKE2B 3d03bb7eb88a0f692619bf62c05bb4ff723de84047d15f5f8423d10bb775bbcc1e33850a707faf3d59654f9333187705202d3f3d8a24e3cfd63473c2bdc34abf SHA512 d59f9d79c13882dc5e8c77bca003249b6466083c855a0789afbaafdda79f18bec1d28e5dbe61dfa5267a1689bd88f23d631682a85653174b9c60f2bce544ed0c
+EBUILD mrxvt-0.5.4.ebuild 3446 BLAKE2B 7220a94953490f88da6c6dabe86a284c345ae98df42acfe75b8a520b1a3efa4a1d834272a210fe8d6b0aebdae9f775ca9d48cf930ec545339a1bd651c31c8322 SHA512 a3dce3b8087503924b4086f9b4ce437f9ec081c720717229598437292572b785fb495e72ec4e50240ad3aef98af78aea1f3b37f2b2d276da5d337ecb47b32d7a
 MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 5d841cb7c682..cf71052941d7 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
diff --git a/x11-terms/multi-aterm/Manifest b/x11-terms/multi-aterm/Manifest
deleted file mode 100644
index 76468970fa39..000000000000
--- a/x11-terms/multi-aterm/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.2.1-initialize-vars.patch 317 BLAKE2B 77ff654ba30457f82c2acd34be27dd4d0a7bb7bc3f83e06e6d168136807e01b890145411a6479aeb4992e997bbbaad3cee3606bfa80cd9ad9a796eb71c4b6630 SHA512 be7a0dde783074c859ffcf6c0ee4a527e2a3229ef19ac9f820116edbdda7d6fe1beac56eb4d682cf0ccd48bccd9252924c1bf0bbd2f7217bfb528be5e671e255
-AUX multi-aterm-0.2.1-display-security-issue.patch 550 BLAKE2B 312b598f81de1138dfcbc7b21d5b920d6ec62a8e48433eeecd41c3780d913ae621e986c7eada619bdf0c9682e9c2c4a92542b802077362216a9bdb9a5c1d9a0f SHA512 dd8b216a33585a0d54e4d261a6361b94f626bfef4be5d65d4bde797384f7dcaed85137ae000261775f31c93077a1f42bc56da466713b5e905d61554718b2efaa
-AUX multi-aterm-0.2.1-libpng14.patch 539 BLAKE2B ea81c2fe1c4faa7bbc616d9218f9164c2e2e3be70d400ed62064aabfdb56fd046df38172ee433e982ea7928f0028dd2746eca3b40b3a2cab4da857e410d0d70b SHA512 74b31a1692299f92e85c6894a6ed220be1f20983da2bc8649454bc02d6f1186ebc97b645bee122578dc64630bdb098cd54707ab7b9850fc123a6cf6c9c9c52a6
-DIST multi-aterm-0.2.1.tar.gz 237428 BLAKE2B 44c20143ce55b20ba82dc1fec49b63a5c2c7387862203cd9eff0a6f4d1c34b599fe0ff965e50062ec144eab4655f4df1f421f73ecdaee095554024b4b4f4f60c SHA512 f5326314c97514609c84ae997c336afe6baa334d2295b4d4803e72411c07c377475a713473193a8d4260eca9008fbbc31c0ef93805e66024ea0814ab504c8d2a
-EBUILD multi-aterm-0.2.1-r1.ebuild 1197 BLAKE2B 2de0ab061073272b099a97228a47c17b91134584437dba099f08d9736f78ff71197d322053c7b7ece730053e45062ab7b972595b94e2692827c7915d0accc088 SHA512 bcbd7c7be5187d06541118b2daa310d86a37dd1fcf94ff7b64e0a2436a6c5b52db1eb1d1df4f816afe119ae777eb0d868f562977162edc1f5f0edd84a77718f2
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
deleted file mode 100644
index 58be689bb961..000000000000
--- a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/command.c
-+++ src/command.c
-@@ -1487,7 +1487,7 @@
- 	static XComposeStatus compose = { NULL, 0 };
- 	static unsigned char kbuf[KBUFSZ];
- 	int             ctrl, meta, shft, len;
--	KeySym          keysym;
-+	KeySym          keysym = 0;
- 
- /*
-  * use Num_Lock to toggle Keypad on/off.  If Num_Lock is off, allow an
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
deleted file mode 100644
index 939785484030..000000000000
--- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/219754
-
---- src/main.c
-+++ src/main.c
-@@ -1853,15 +1853,13 @@
-   //get_options(argc, argv);
-   //display_options();
- 
--	if (display_name == NULL)
--		if ((display_name = getenv("DISPLAY")) == NULL)
--			display_name = ":0";
--
- 	Xdisplay = XOpenDisplay(display_name);
- 
- 	if (!Xdisplay)
- 	{
--		print_error("can't open display %s", display_name);
-+		print_error("can't open display %s", display_name?display_name:
-+				getenv("DISPLAY")?getenv("DISPLAY"):
-+				"as no -d given and DISPLAY not set");
- 		exit(EXIT_FAILURE);
- 	}
-   
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
deleted file mode 100644
index 6aeadc47780e..000000000000
--- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/png.c
-+++ src/png.c
-@@ -86,7 +86,7 @@
-     display_depth = XDefaultDepth(display,XDefaultScreen(display));
- 
-     fread(sig, 1, 8, ifile);
--    if (!png_check_sig(sig, 8)){
-+    if (png_sig_cmp (sig, 0, 8)){
-       fclose(ifile);
-       return -1;
-     }
-@@ -116,7 +116,7 @@
- 
-     if (png_depth < 8){
-       if (png_color_type == PNG_COLOR_TYPE_GRAY ){
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-         png_row_bytes = png_width;
-       }else{
-         png_set_expand(png_ptr);
diff --git a/x11-terms/multi-aterm/metadata.xml b/x11-terms/multi-aterm/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/x11-terms/multi-aterm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
deleted file mode 100644
index 3b237a98a4a6..000000000000
--- a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="rxvt compatible terminal emulator with transparency and tab support"
-HOMEPAGE="http://www.nongnu.org/materm/materm.html"
-SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-IUSE="cjk debug jpeg png"
-
-RDEPEND="x11-libs/libXpm
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-initialize-vars.patch \
-		"${FILESDIR}"/${P}-display-security-issue.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	sed -i \
-		-e 's:png_check_sig:png_sig_cmp:' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--enable-transparency \
-		--enable-fading \
-		--enable-xterm-scroll \
-		--enable-half-shadow \
-		--enable-graphics \
-		--enable-mousewheel \
-		--with-x \
-		--with-xpm=/usr \
-		$(use_enable cjk kanji) \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	newdoc doc/TODO TODO.2
-}
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index ee2974ce6d4d..cc2fc175213a 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,7 +1,7 @@
 AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
-EBUILD rxvt-unicode-9.22-r1.ebuild 2058 BLAKE2B 317c845af7a1cf2bf43ce0a69e37b01f10c3319b3afd7729ff574a9688200d9c61d212fa0c6ae147842d86e47da469b2096cb8da6eafb63ce82c90f59dfdfcbf SHA512 bd0fa0b07136cbc23f14ae48f704ff5adbad960eddb83c82ccc96820e8ada104cf09796574650f893ef2c6e2f376ed014a029bd4ab752bd640c4d60062ed2245
+EBUILD rxvt-unicode-9.22-r1.ebuild 2059 BLAKE2B a2e905a4db0d25a635c3404197a2ba76da090aab859180ffd97da768e17c69a451430e0d17a7c114d1263471a11f6550633ffef6b8c1cc7de3bb9a56860c5b88 SHA512 5b87d7d4a273b15454035b920dce9f01620b27d8b6e4b5c86fa79f05062e7100ed066432c6351a3ff4c42be7fe095c616922c8ef4b51f97ab861ecbe07ff472f
 EBUILD rxvt-unicode-9.22-r3.ebuild 2131 BLAKE2B a2b63654c2c983ae159923d5683bd00902206dfbf25de1d01eb1728fa8416e7626e3657251cc4faa32150bedf57a44de6c3b4ed8eabc8e494315d2d5f45c96c9 SHA512 cd7b3ca4384906a863a172df692ed4f174a436a8b66f4ab765493508ca3ea676af50bef70fba17d06445507450c4ec1a06f47bd6d24bbd75c4e0b1b2190c69ff
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1099 BLAKE2B f30d8fc667246ab2e113f8e9356941f0e7cd40aad88ed578cece7e5cba1622aa2c8ea0b5918d239b994483fb171f8c1fcc03ae6e2d5204f0c2d09a2b22819be1 SHA512 bbd5ec950a1a14975ba50860a0ee924e6a736890dd3bbf7add4b001d164cab6ddc8bebc94c71cb855524b5006c29c3176dbcb489817afad54de1dabaa0410978
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
index d29cbf35d61b..0dd9c4f13469 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl startup-notification unicode3 xft
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index e43f68b9234f..8bf16c92ed34 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,3 @@
 DIST terminology-1.6.0.tar.xz 4893348 BLAKE2B 20c9b8a916a4cd48055839266a157d5d8fca70557f7fb8b61696ceeaf4bc0fd93ea5abc0930d1c552a816e3fa3e455624f62d4adbad7feacc9cd0e874a91feec SHA512 ef95a5d128736a2e6b3b9e48a3f32a8e3a1f19ccabcb9fa429ed777ee201ba16fa431a61edafaebc018567f4a3657d81551407cf0449f58b416aa1e6077afec1
-EBUILD terminology-1.6.0.ebuild 864 BLAKE2B 36c00aa1e5bc52e26f9ab041f9d31df08fd6b76514f6085a26dd58c68ceb67f7244eff0af33dac8d430642f87980ccc675aea7c966e6eb935e4db7feb4184712 SHA512 4d3081f5580b44e9619eac1c9826c1fc9b85a6e2aae7d4de7a19945f1ec8cdb851beca96051958089c907acf4384e4872a32a7e61fe396dd0725b0a19b90ca1e
+EBUILD terminology-1.6.0.ebuild 869 BLAKE2B e7329ccfab1942c6387dd366a3d201ed4e1cff240ab9545f4ab1c393d6f3ba18d1380792a281f3400a243ea1882b4b44a899c34492ef077a6b4531faedb9d070 SHA512 651367c30110d89c2c7d0285787747d9756949b61bb0b5afa6f61290d87f1f51f79d4f70f840cb7ebcdbf59b93ca54ddcad4a81b6634a01d1622dfd67d545ac7
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.6.0.ebuild b/x11-terms/terminology/terminology-1.6.0.ebuild
index 01c5736f1c75..bdbffee66726 100644
--- a/x11-terms/terminology/terminology-1.6.0.ebuild
+++ b/x11-terms/terminology/terminology-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="extras nls"
 
 RDEPEND="
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 38fbe3b81dc7..83101d371b9e 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-terminal-0.8.8.tar.bz2 938843 BLAKE2B ae7beb611744d7f2cc168cf1c938f5c49add4fb4691f95cfd8f88959f380aa1e3ff11181f08529a9825273a5da7fd9ab5f45de6e3f78eb5b7f224d8044592c5b SHA512 0ceb130f0a0ceaa0a30a808fb7ff5070f75a84ef460c99799b267e5ecb1e0c15ef29558f78949d9a8968bfc50efebabc0f32dfc426a1db7ee6d225c6fdbf7645
 DIST xfce4-terminal-0.8.9.1.tar.bz2 943603 BLAKE2B ba8521c2e80e8979f1585eb5d9696c31c057a6ae1a9f468c8fe2e97f3a4fa5d494648b349b6c75a115918492d1b46177cf23d712d92345cab74551d68e054ea4 SHA512 c1a68300604d1db205ac52b51dfea38031dfd92b31f7530705ac6bc875c9b4f9819bdf05bca23cbfddd87f7899488ee4dab4c897ceb96efc41a44acfc298ed22
-EBUILD xfce4-terminal-0.8.8.ebuild 903 BLAKE2B b79a9a51b81435fce696ca8a12f9f3da76ce9581998de9667d0e193f87b951320b17f563de78d2ddc02a7f1a7ebab82aecb1df25f392b5eff16467cb3410be1f SHA512 5b1f994d468cb2882746f291b9a673bb59ecd059e8e2bc91e76482c8eb2ce6514e8eebc2c0b2aed8bc1cfe68a77239a946ffdb81844ed38e991d3099df7a75ae
+EBUILD xfce4-terminal-0.8.8.ebuild 904 BLAKE2B 00d67e5c679bb6ddc0b89d09146a4303156048bb828882496059b2a980deba971a642eb0b701646f01ad1fad2084defc0ef5aa1932a60ad57e4d784fee3bfc1e SHA512 3481d4449e9251d82501c062bbd472d305550d9de2033e347fd7cbc62e7acbd83c4b55314b0013d675fbd1175f72a29e0d919b443514d0e657021e3c06721f31
 EBUILD xfce4-terminal-0.8.9.1.ebuild 911 BLAKE2B 71213c7a52898c619ded9492a8ce5c227feee2cedc174c981364d7ee4d68b4b5dc042635f44244cd1f363cbfc2b769a3d11a7ce7784e054893fd4fe55a5af312 SHA512 486288b84a62db1330ee9a520aa6c1272c369db848684d7b02d8bd2114630acca6edd2f953f50c4587eeeaa0ee8a7965ff211e708794a192cea4954d7ff20642
 MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
index 7241f3f1a41b..92c6446d86fd 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter"
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 8c92595bac16..7be2047ea681 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,7 @@
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
 DIST xterm-352.tgz 1405420 BLAKE2B 46cedc409cb174fc1901bec31e190be64a07de34d59d0e767217384761dba7e98d97728fc8976f8a432eb80256471edeb2f4b58a61f875aaaa9b2cf20999f08e SHA512 9116f78dda685af75192f2fcd0ddff5244746f0e55b5e91ced6be0f85cb3dd78287bd873cf55ccb15901e98647df9cf8083b9ad84f53e12bae5134889aef82c0
-EBUILD xterm-337.ebuild 2586 BLAKE2B 67c5a5aa246f5279d89ec8ecc6d32aeab9a2b07e022fc567a0b4a4ba901fc27349e041036c2fae3be89248d7b1a0da9581a8309eaa652dabbaecc109fe5d40fa SHA512 ba7b05c70078919c7a902b829bea6a3c5b423bf90adb021b007104556e476f7c3a035b4948c6329412fbe9b45e6c39ce0112d03bd92addb3c5b3faeb296b4410
-EBUILD xterm-351.ebuild 2634 BLAKE2B 65b7ad0488d7ab5d4e5c90133134aac6275aae1c09bfbb0566c61ca57ee035084465f662471d9c29f095c3109fad54057256f77665ef9f45d15c2b36e6e1fb77 SHA512 646da488ea9ff3f32b49065c137e07e522fedc8dfcece6bb5884c46135128cfb1920089c883a624bc05a83f7754750db597fd47e6086a5e5fbe0de4f922092e7
+EBUILD xterm-337.ebuild 2587 BLAKE2B e78f6b212cd3f47412ff24377791100f8855a31e95c37ad9721955966dc49513d5f0f25576fa24014b5de55d6c0809e3a15d4a22832854799735e83eac6ea1dd SHA512 439ad5b7bd4c98cc3053a707fe4ab72acbf90c9864a5654b1333baef8094b6ba25b4ea85d98a4f939a124706d2ff0c9fcf4ca74e5a9a6f6dbf59a1886cd09ff8
+EBUILD xterm-351.ebuild 2633 BLAKE2B 975dcaa27c031b84a6f087dbf22ba7000f9a0b86eb6766d20cc1050fef5a6973ec5eca7abf3c38eba20a643efe29a6c733587cb687da7196ca8f8db4f76cf055 SHA512 90ea97ae8a145919364b60dc52efd72b93639d2bec89ab12090e47ff03be59ece61ad0bf42ddd12db405c24960437aef597c4cd1a0c0cfda27b137e3f5783b34
 EBUILD xterm-352.ebuild 2639 BLAKE2B c6a6638503226412ad582323c3ed6fcf70919e5234a69cad8dc1682df83b1266a8dcfc3e0512b074d0c59d72830f0c30659b9215b67f50dd7700ca3893c1c8a5 SHA512 975e4d6a883603d2ebaa4310e52c80fdd77a046a9dc33ac7827108bcc1417858e4e2638249bf1706f543676dee78d88fea2a21274288176039be69213e6323f6
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index c414f44fb277..dad3c2a4732f 100644
--- a/x11-terms/xterm/xterm-337.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
index e6759e862d63..25c8c6ccb379 100644
--- a/x11-terms/xterm/xterm-351.ebuild
+++ b/x11-terms/xterm/xterm-351.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index f27b7e97ea70..55ccebde02a4 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -4,5 +4,5 @@ AUX xvt-pts.patch 211 BLAKE2B e2ed767f2b2e0e690e694e8dca0c4b7773bea3be1c945bf23e
 AUX xvt-ttyinit-svr4pty.diff 1308 BLAKE2B 0ac8e7b40d23870f8e925b326261618942cf23f71677424c09180d8050e2f4e27d3ff8a2f62e90325e34a1377b5da419509ae4bf30dc1d0565928b205dc77745 SHA512 6039acfed6dc8effb99e9dc633472387db7ccadb842d52b32e9bc9d21a30e54419c1dc1a796834353412c72e5024944b0c7aa995083a5b931ecb16d63d0a3b9f
 DIST xvt-1.0.tar.Z 59445 BLAKE2B 9b50b7c2c9832621960249f9b04eff9b2be04b90766865bc2cd55d67ca348bf41b539906125c8a51a3e08e13d6fc3402a57ef5f31d781e675061910ce53198dc SHA512 671fdc931526821e9228c327d2231e0f241997c632b0f084b2be02b99296ececa64f2de2769e92c3682c0aa2e9cf8dc61ac561ffd1d10136256029d24f872a1b
 DIST xvt-2.1.diff.gz 39941 BLAKE2B cbb491f0f65ac6ae8f8a801e68f6f08805c886c16a000d7e54fb24ac08d17133958eb376306b2b30dfc4def447ec62259cebd43854433405c0aee080a79addf7 SHA512 c229cb98ef3de7b4ab76b81ae888fc3a59ff9fcf5807ecdc58f8e5b634f9c2e618d2b3c17b4cd6410903004a712aac1c1d329751a48f05d605a7eb23dd58d612
-EBUILD xvt-2.1-r3.ebuild 903 BLAKE2B 92ecf6c6884f662f006613a7fa7b0a4f98ec2ad2dc3c974daa5195f61d92e2d87bf96aa37ce38d681bcf6ee9bd366fc333fc471446d2bb4aa1b7937e6d3335fe SHA512 f826430ccab41f86eec88643595066099bb5c37bcf10e3c636266d3e27ce34785a4c154449a4d25873498fa6e1f096c14fa1a270ef47e8c47ce05ed130a75574
+EBUILD xvt-2.1-r3.ebuild 904 BLAKE2B 45895f008ec948b5f3e5c4c06bb2785006efb03747e0e9a25d0f345431cc5a56d2c0b52ab8e7be8862db311ea02f6dda0403d88cb03c782a93a6dde3e9140675 SHA512 18b6e7a0b73439fecc69980ac3fa842299b1ba5410f443bb068016ed261b162d73191b7e35a627cd4da76e0d53035217511131c7cd0f458fa39569ae63d82ae4
 MISC metadata.xml 256 BLAKE2B d8cfa88bc259cee95291c384760fad2dfd13f0973776fa55889f61befec06d0bea7953e0d6f3122eda6278272f217b8d94b536982db23815285d66074ab69089 SHA512 954fbecba4916b2b5e4b353a55a7c4ae6bd9be7190f6550ae4eb003f4037698a4576aee03847d4def6a5ca6dfbb9d145749a6fdb44b8a77477f726c92968643b
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
index ec2d970817df..12699505cf33 100644
--- a/x11-terms/xvt/xvt-2.1-r3.ebuild
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
 
 LICENSE="xvt"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"