gentoo resync : 15.06.2021

25 files changed, 469 insertions, 21 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7094e04391eb..0dd19358f2dd 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index f1454af5e2d1..61a16ae7fb3d 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,7 @@
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a6a5758b500665aed21b95d8b4295240e24ea69dd806321a32338aeb904c60cd7dbb713d3d456bdc9199c7c4b4e2d65bc7078fa9bbf6a7d94c227265 SHA512 0efc106b35c25199ed8d4edc5c36a10a1013e62100c0b3397a5bb04386d7d2f548e811451c8577bc123ffbe935cea2a8f10d08473de5fadc4d07db0f301ab3bc
 DIST gnome-terminal-3.40.1.tar.xz 2596912 BLAKE2B 6b199941a2d30a8bd06d779d8d5a1fc9096b7183718705b74842566033ddd36c18a32a68014b5c7ab545bf0bb4f780fa950c7d6d04149f89f640f0db6f105b59 SHA512 8e16b3c8513cf3c503a4a35e2c238ea41b087d426787402e0db5ef7e4bc5303d5a34a6455f651760327560f73edf3256177bbe3633e8a5b8abe8edab2bda7698
+DIST gnome-terminal-3.40.2.tar.xz 2608032 BLAKE2B 8d7a355623d6eee9f4e3d4ff219dbd12c34987ea1ab1b7dc960c5bf19772d57de3bd81f63ceae61e87e932f05d47208390738dd8df30cbca71d8d0ad5d4b7887 SHA512 d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100
 EBUILD gnome-terminal-3.40.1.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
+EBUILD gnome-terminal-3.40.2.ebuild 2711 BLAKE2B 762e695dfbac737ef21648c7081dc6b3800f356ed6a9cf5574dd8ab1afc08b0a53871dfe693d0e17625e3571b557c9268b05d91aa3a362693e621a14049bf013 SHA512 65924ea97931d3760555e63862b6b27bbfbf5e2d4182c0eaa1a96e315ed42fd76664aeed88d27947dcb2f897d3d50d5e84868cd7231f22578498f6053348b1b5
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
new file mode 100644
index 000000000000..b16c95d6f7e6
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.27:3
+	>=x11-libs/vte-0.64.0:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore "Set title" support
+		# Automatic title updating based on currently running foreground process
+		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
+		eapply "${WORKDIR}"/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog HACKING NEWS )
+	gnome2_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 3ad98b581f6d..924f6329d14b 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -2,7 +2,9 @@ AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519f
 AUX kitty-terminfo-setup-0.20.1.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5ed12d173a484d702a890b7c673015e59026429e12b7254bb3b1819e972b853fbd07b098fa1459ea0241c3380c1b25eb8e043 SHA512 f45aba42732d01d577f09143cf867b983743b94cff72d07785398e2ebdd2bdaffff4b04a817e0381cb5cfdb505ed7b7fbbf090d1241d3d718b3148a5e76efa90
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
+DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
 EBUILD kitty-terminfo-0.19.3.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
 EBUILD kitty-terminfo-0.20.1.ebuild 995 BLAKE2B 69179592c87c135e8ec646b5fe9d483aefb3d0131414a6e2ede8837c58e22b1f8accb19220e66ed7e1793e1f7c2d57362dd22ea20e0f3cb86608dc631e3128b7 SHA512 5241997e9566a8c8a31320804e0e0c282dc0f20d2e941415ef661ff3b8931d1dae73821a0668617eaef2d8c8950319adc2ace55522dbe5fd445b4abdadd466d4
+EBUILD kitty-terminfo-0.20.3.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
 EBUILD kitty-terminfo-9999.ebuild 918 BLAKE2B 925db099759156ab53f750cdac53fb15bd453e1e493b419e7c807f236fd97f893718df6e7e5a4d8ef0d880544c8c4aaa16da684f5a1bb318c4d1b31432acd09a SHA512 c493c3d9fff637dc4dc8df0a3ec293f1389b5f4695a2d3b0669b6ffdcaec528db6f1b121ca10f10f69141b6bf6710c947b1b610db33dc146b7829d56d8668769
 MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
new file mode 100644
index 000000000000..be10def6c282
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
+)
+
+# kitty-terminfo is a split package from kitty that only installs the terminfo
+# file. As tests are designed to be run with the whole package compiled they
+# would fail in this case.
+RESTRICT="test"
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-terminfo || die "Failed to compile kitty."
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 3c7b64b3aaa8..4e4b34ac2fc1 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -5,10 +5,14 @@ AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1
 AUX kitty-0.20.1-flags.patch 1995 BLAKE2B e563ab5c09d43e8701e6ec5df519c47ae952054da72fedf106809f1c3775f00e172de7146734e10186f75ab10b8b0d42faa2ac6402cac5d57fdd8d5e611d90b0 SHA512 cbc8660909c3e07e16f720528265384bef2152fc33e41fbbef057fcd436216071ebfc0b4956284bd0e8e745ba28ba41221da8fff8d7f9a704fba6b79ea021f6f
 AUX kitty-0.20.1-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
 AUX kitty-0.20.1-tests.patch 514 BLAKE2B 69c4277b4ffc257cc8320dbfc5be95d72bcb35b70a377f8ef24ecd9a20036313ce52f245efd5f620b47ddea6f688cb0d3b4154d8787a3908d5c255ca26143f80 SHA512 bb5dd23b0e83118fd33296e1ee8c6485e51f29518406e1e875b2f5ec8e7de4103c9ec2b4c99516a3d4fe6134ccf5bf0d54e4a37bee89e64f294da4b0350d337c
-AUX kitty-9999-flags.patch 2235 BLAKE2B f434ca8798f2051bcfa487af0eabe2a8142791eb83b9dff4cb815efc93a42a03eeb71b2ed4e4300ab658c79fd6eb742d682025951bfe3f76a105829916708027 SHA512 b46981b5dd75a1554ab722a490c7b6fd281d7698b24998ce875c3a2ba88e048304f0baafc86d0905ac9db2b583799576132eedf47c707681654b23cf64e3d3d9
+AUX kitty-0.20.3-flags.patch 2252 BLAKE2B 62743ee798196ec14ae3899e481271890507563b438ef87f8e7d19f2cfa79def5118aba39bdf402d6d505b208d1082af156c4feb4a113a5bd1fec481c1ffe20f SHA512 2480194e3f5dbee2fe2e70c5c54c69cb497d3dae9914508d3c0488de9227169cb8c023834627d0c55f863498d89890c31110fa3c3ee740b241b99bf299557007
+AUX kitty-9999-flags.patch 2264 BLAKE2B f97139220f48a65fcb7da0cf166b27b9827d5e01f21bc0549f0bf3ce87287f787b167283cf05d82ca15bef7c996da4c512aa6e483900ea4a6c44015de362d11c SHA512 845bd40360730d498de16764423263014bd299c7a9072f12810e859ba851d88d7f1429d2844c7defd0b389694be7ea3dbc2d4e4a4718e35f090440b7d0ef0e84
+AUX kitty-9999-remove-terminfo.patch 666 BLAKE2B e551e919d3a2ea31d53122e1bdd02e492e3ca0f6a0335b94d1e37585f82b2b0340743cd3536b43b9f26865917a01526e09379b02c9f2e55104bb8f4ec8b91b11 SHA512 2ca3ce3bdcbc1c0ec824d496d1682c800960f42289d75d2e92022873c8cf6a6a5095d97241fe5eb3b05949e18ae113719c7542643244d03521c01a857c59f48f
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
+DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
 EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-0.20.1.ebuild 2441 BLAKE2B a2ec955b3c8c6933357bd064df5b61444c31320e99955ff549e2f9c4c932daa7e83bca770008e4c326ce47d75ddd9a3187f7328593cce94c8356c71222f3db77 SHA512 5f42829e8227f4bfb6c30f1d8a028802ff5ee5e4bf240010b70fc04c50d239234dc276eab090f9807aba3f8468baa3399413a160d308977ec82c6dda2f15ee74
-EBUILD kitty-9999.ebuild 2183 BLAKE2B 4b78f145c0250b3bfb50f5e0f777a3a820290e0860986cb9650fc500b8ccd7163d7bbd81d58ecaadac70a5ebaa901de21f944d934f21ac1815c2d43b3bf17954 SHA512 020310f8278e2c4feef73abe270e59ad167e9fbb286521acdf32e729b9c1e9e69d07411a2cb5a5e5d5fb2c4684f14a50419699270ec24d54bf9a429954448c4e
+EBUILD kitty-0.20.3.ebuild 2358 BLAKE2B 5a2b447aafd0495c1c3541fd7a6bc4e8ca16f4ef5434053ed66c103faf22825675571fedb92e9613895db1ff3b3fd961f8d812df679e8acf885f502fb36105ed SHA512 c409ff2ecf6c3de4fde17ffdeb2261d8e3750921db12462e76970e8b78bd2a3a8b084229085565cb83b505d8fcc08022975686f7cc475c2479f2aa6d7d9866d0
+EBUILD kitty-9999.ebuild 2177 BLAKE2B 60b8835d09ca32f7e948cfa411f8ea19aaaeec27ef2edcd7858081b69967dc77a5a771234e49c62c2f984e53b6fd4aacc11fe3f6296ed151c462e60110a25bc7 SHA512 1eb053e488ba994f77110c6db603dde52f65034cdd162d87eea369cc91720042a6531150e1e20ccf37669e3c23155e813063537013c2883098735b2b87991309
 MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty/files/kitty-0.20.3-flags.patch b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
new file mode 100644
index 000000000000..131d6214b4c1
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
@@ -0,0 +1,53 @@
+diff --git a/setup.py b/setup.py
+index f751107f..69bf39d4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -293,7 +293,7 @@ def init_env(
+         df += ' -Og'
+         float_conversion = '-Wfloat-conversion'
+     fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
+-    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'),
+@@ -308,8 +308,8 @@ def init_env(
+     cflags_ = os.environ.get(
+         'OVERRIDE_CFLAGS', (
+             f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
+-            f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
+-            f' -pipe {march} -fvisibility=hidden {fortify_source}'
++            f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
++            f' {march} -fvisibility=hidden {fortify_source}'
+         )
+     )
+     cflags = shlex.split(cflags_) + shlex.split(
+@@ -317,7 +317,7 @@ def init_env(
+     )
+     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')
+@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None:
+ 
+ 
+ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
+-    cflags = '-Wall -Werror -fpie'.split()
+-    if args.build_universal_binary:
+-        cflags += '-arch x86_64 -arch arm64'.split()
++    cflags = '-Wall -fpie'.split()
+     cppflags = []
+     libs: List[str] = []
+     if args.profile or args.sanitize:
+@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
+             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-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 39042dbd458a..0e773c677650 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -17,7 +17,7 @@ index f751107f..69bf39d4 100755
              f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
 -            f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
 -            f' -pipe {march} -fvisibility=hidden {fortify_source}'
-+            f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
++            f' {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
 +            f' {march} -fvisibility=hidden {fortify_source}'
          )
      )
@@ -31,14 +31,15 @@ index f751107f..69bf39d4 100755
      )
      ldflags = shlex.split(ldflags_)
      ldflags.append('-shared')
-@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None:
- 
- 
+@@ -789,10 +789,7 @@
+
+
  def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
--    cflags = '-Wall -Werror -fpie'.split()
+-    werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror'
+-    cflags = f'-Wall {werror} -fpie'.split()
 -    if args.build_universal_binary:
 -        cflags += '-arch x86_64 -arch arm64'.split()
-+    cflags = '-Wall -fpie'.split()
++    cflags = f'-Wall -fpie'.split()
      cppflags = []
      libs: List[str] = []
      if args.profile or args.sanitize:
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
new file mode 100644
index 000000000000..39fe84b3b2a0
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..02f38c61 100755
+--- a/setup.py
++++ a/setup.py
+@@ -1082,11 +1082,6 @@
+     else:
+         build_launcher(args, launcher_dir, bundle_type)
+     os.makedirs(os.path.join(libdir, 'logo'))
+-    build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')
+-    for x in (libdir, os.path.join(ddir, 'share')):
+-        odir = os.path.join(x, 'terminfo')
+-        safe_makedirs(odir)
+-        build_terminfo['compile_terminfo'](odir)
+     shutil.copy2('__main__.py', libdir)
+     shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
+     shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/kitty-0.20.3.ebuild b/x11-terms/kitty/kitty-0.20.3.ebuild
new file mode 100644
index 000000000000..35273c44a076
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.20.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit optfeature 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 wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-1.5.0:=
+	media-libs/lcms
+	media-libs/libcanberra
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/libxcb[xkb]
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-terms/kitty-terminfo
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+"
+
+DEPEND="${RDEPEND}
+	media-libs/mesa[X]
+	sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.3-flags.patch
+	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.20.1-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.20.1-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+		# also disable wayland tests
+		sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+		sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+	tc-export CC
+}
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		--update-check-interval=0 \
+		linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+	dobin linux-package/bin/kitty
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index fb9de537a83c..e67ade738230 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit optfeature python-single-r1 toolchain-funcs xdg
 
@@ -58,7 +58,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/kitty-0.20.1-remove-terminfo.patch
+	"${FILESDIR}"/${P}-remove-terminfo.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index c594adf7fa10..3ade090d4a96 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -2,5 +2,5 @@ AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b
 DIST mlterm-3.9.0.tar.gz 4143644 BLAKE2B 01e95b0319526e03a009e6b2f1467287a6ecc2ec29c4808c486a779896f183cf9f1732baba38c02150db89ef9e6754760df308ba477cca916f60d167062ea13c SHA512 d89340eb460904ca36c6ed063b356625d9c9b4ad129dc51640d50a04e166f8239124d0003db778376c47daa6311c869f9fe7e337c90937fed5ae4151f5af57c4
 DIST mlterm-3.9.1.tar.gz 4175186 BLAKE2B 030d9144e7c835c895269fd19f89ece7c0dae9ca3f1d4425a1d409b9ac78a530431a4e05ef685d178748a35f9fae77414286a38a412a0496433b8324a22a73dd SHA512 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870
 EBUILD mlterm-3.9.0.ebuild 2930 BLAKE2B aa5f219cc82299d111503383e1b859102bcb67d0ddacfcf9097226ec325537624d31eafe758f13ff184188611381287b25dd26a08c1fc04953930ef4ef341386 SHA512 d7d55696f4e566b37a04950cee433089e7927535ad4aa723a236735e9b6cceaec72f381756c5956292e172ddc10cec5aa1dceb4bda86ddf1f2369191b0bf4dae
-EBUILD mlterm-3.9.1.ebuild 2881 BLAKE2B a7307b93c560b620c54a58e2258cc3e646f2e2ea1434260d3a233835098ac41990e102784b888b1c74dffd716e64cdd6d8d6112e8e49bd3ad67cf8eb549a3ed4 SHA512 e7bea3d9090b942b42d2ea3c9b7617753363fffaf96dafa16768cca06e616008b1fcbbd680f083cd4b580a1c258fb32f686297c8611271b7835ffcad840a890f
+EBUILD mlterm-3.9.1.ebuild 2900 BLAKE2B 33f241d1b523367589852a6a9f0dc507ec2d26df89a770e61920f7375ef038c65e8ab96c5d9ff767ab08b9dfd5f8a6e76262a74358a931db52556c9cb0764959 SHA512 d619e7dbf5ee6933ee8b2affa5e2970280aa8523168fc848124a0c75ebf6594435a42747ac095cc8f61333803eebec60136c06d2511c4aac4bd07070b3e6f8f9
 MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
diff --git a/x11-terms/mlterm/mlterm-3.9.1.ebuild b/x11-terms/mlterm/mlterm-3.9.1.ebuild
index b9a346d7cc15..61f8e69eaf71 100644
--- a/x11-terms/mlterm/mlterm-3.9.1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.1.ebuild
@@ -11,10 +11,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="bidi brltty cairo canna debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
 
 RDEPEND="x11-libs/libICE
+	x11-libs/libxkbcommon
 	x11-libs/libSM
 	x11-libs/libX11
 	bidi? ( dev-libs/fribidi )
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index acec4431222e..45298e377810 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -8,7 +8,7 @@ AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
 DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0
-EBUILD rxvt-unicode-9.22-r9.ebuild 3307 BLAKE2B 219652faecdab737305999837914c14e706c349f3103cd5517ff63161d8f0bd08e747934003fe1479f6c04ad6b1546fe49fa022b1232ff68795c924d97ce2cf6 SHA512 b3a65dfacd65e93c835a9a8083fc4527f8de99c368820c01b3f4c1b8614fa33ddb2f02f77dee0e40ab878eb1e10090c85500dadbbea59f3f95f793b81e9a010a
+EBUILD rxvt-unicode-9.22-r9.ebuild 3305 BLAKE2B 10fa2f2fc53f8da9a499703af03be15e464775ed0f0411de2da90ba669061fa846a3a0bb3f75c61da5de6c71e950e9d79c657f9bc5f542be6e0dd6e420982786 SHA512 0907a7236e52c83777d76dbc758d655b27a78778e42d5c0965715b0f3dd60dd717356dce745cf9bb557a5ee1c4ffe55cad8c2d5d599b1bac6855fe6671dc70d9
 EBUILD rxvt-unicode-9.26.ebuild 2431 BLAKE2B 03c40cb09da82783a9fb8c378d9681ecda16a9e468e6b5c15cf98492331fc391324d09d9e158aee60c068ecbbc7f0c25f1034bac944c152d539d9f41e20c9362 SHA512 bb2c3ad2379bd96478769689a3816f413f74926f1946b2f428de8a61328b440ee098f45327ddd8f128c959a49aea3104dad41e745dfa280cf46d057d4ef4efd8
 EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
index bbc44b3c15e6..2e9acbe9987a 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
@@ -15,8 +15,8 @@ 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 ~sparc-solaris"
-IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl -sgrmouse startup-notification unicode3 +utmp +wtmp xft"
+IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl sgrmouse startup-notification unicode3 +utmp +wtmp xft"
 
 RESTRICT="test"
 
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index c777c43ca106..5eceb910bbb8 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,4 +1,4 @@
 AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
-EBUILD sakura-3.7.1.ebuild 1303 BLAKE2B b89e1fc1bd46dbebf14b56675738597d8bb78f71e3fbeae026543aeeee5bcd6b19ad1e517dedb3eb71803fe340521cbf95c412044414faf9d3130ac337b440fa SHA512 4e310ac97a923613c52ecb0dd65dff1289f6079377221e8c1480bd65a44c0eedd5086082fb424e161290052e581b2679b4a8b2f0bf32a564230a5ea6dd955eb5
+EBUILD sakura-3.7.1.ebuild 1302 BLAKE2B 03a1829427e11081656d2a3c3f6ae7e3b41d25598f1640c55f86548f585905533cbc9a4bdd03db8acb4d0214b62864e0af53e87ee3dafa215567946d88f3a954 SHA512 3ef8444f54ccb7b6b4d90d3e356bd79979ee81d5b4e3a776c3542d10f503b64d7cee3bd2e75101b9e200471b8f79327efb1111c0a8a0bb3d9862b02db1465115
 MISC metadata.xml 779 BLAKE2B cc8a0feadbc92e64a47c0d7c1b80c1211fc9f0cfed2d7e386d2225143b51e1d03d32eaef68ddf67525cec3ba409cd86cd652af1fdb4bb733e03b278eccad3c92 SHA512 c091185594b457e8e803b65d5a85cad5e9454fba6ce762350d7156fc8ab2b8e1168d21583e7093534f414a4cf5607b1355d4dae6ee7c353d6b90edbe4f036ca1
diff --git a/x11-terms/sakura/sakura-3.7.1.ebuild b/x11-terms/sakura/sakura-3.7.1.ebuild
index ab800b36599e..104d146b9851 100644
--- a/x11-terms/sakura/sakura-3.7.1.ebuild
+++ b/x11-terms/sakura/sakura-3.7.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake eutils flag-o-matic xdg-utils
+
+inherit cmake flag-o-matic l10n xdg-utils
 
 DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
 HOMEPAGE="https://www.pleyades.net/david/projects/sakura"
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 865610ac0867..dd8cae5ca5f2 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -7,5 +7,5 @@ DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B f92235bacf34ec5bfe2400c6bbfc8bbdee3
 DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c SHA512 ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
 EBUILD terminator-2.0.1.ebuild 1539 BLAKE2B d586a61aad2771cd87b7c1cb161e45d59c292a008b98c02daf7471ebb10115583015c86ba986f2b12264bf55675f02e60cca343e525b07b7745aa735ecbfe71f SHA512 f4fa2cd2459997ac49bf6264170f96b28f7d3d19aeee94b1effd60cc135f697867c3604dd8ed27ceb59ba11c5b50c45475deff21bd97cca7ca0db04d1b1b74a6
 EBUILD terminator-2.1.0.ebuild 1787 BLAKE2B a6ce1383476457de519f6eefad0d3d605b41673dbb8f79854d2d0ba96954054f554ee6c7536a04cbeb2d32a7df3318b9ca9f0c691b805b505ae38c297e2c0f2f SHA512 ea638caa15d269593ab3d9c2717dd0bc557bad2fe3162764c3045d2514ed466fc13674d0495c419488c15dc06b586362f52a167aeb0fa89c1dd35ebf49728de2
-EBUILD terminator-2.1.1.ebuild 1677 BLAKE2B 7f472a73e990585bc65cce785ab19463f05bcb056b72bdc42882244bf505905e9191671da5d3f72f444d2e47482f1d0c31c738e2c5982a01e30132c5c97d8c09 SHA512 d3aeb13e038a6a8295dab3c1e69d07e6725bdf1891c07be86ff28364cc134ee1c5c9199669d455054c4ef28420c89304fd601fb1c205f34db01bd07e76555eb3
+EBUILD terminator-2.1.1.ebuild 1675 BLAKE2B 33ee917015d29b78e8ec509c4bd1b0418894f6c7542af277e9bdf3c6ae96dcfa419479a0161cb59aecf3388aa2ad0adda963cbbd9c38fbe18e59246e3caf1e6d SHA512 a80582155cbf175ef76da4708b919c1bba277c47d6507b94dd64a9b911fe255b1b615a152c0b58920f1c31a6e10beb90743626cc7f596dfe177b6a2afe7f588d
 MISC metadata.xml 858 BLAKE2B 27a8420382f3ed119d3c31bd628c2357d552f79c5361b76446a7ad093f2fca5fd0e9ec1f6b16ab6d2863264993eee52c25e7d1c468f2ec23d99e82d9df3362f3 SHA512 9c058afed38eee38a1bb793ed2a8c2253a729ccd79801365c7cb596aa3402e9e24bd04c71547aa93a550290e07b71c1f5c0f9d9bd41bf886c9935700f3a2d3d7
diff --git a/x11-terms/terminator/terminator-2.1.1.ebuild b/x11-terms/terminator/terminator-2.1.1.ebuild
index a792fa24fec7..67ffbfbf2919 100644
--- a/x11-terms/terminator/terminator-2.1.1.ebuild
+++ b/x11-terms/terminator/terminator-2.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 3a5d50bcbebe..0b5f65983fdf 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0e039a43af1968abab86c44fee5575d1fe9c61b3521be156b48bd7084f7169fdcd9757cb6bfe0c99b539bcb865e9150e358 SHA512 92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4
 DIST xfce4-terminal-0.8.9.2.tar.bz2 945176 BLAKE2B a37a665601c5bdb2f53cd62a0909befaabd9bca0747d477fe369f4e325be15a362d249ae675e6cf707ecc89e623b4b1d73f7a31d32f6c6fcc13e4c57684f5d4b SHA512 1402d913bcc0c050b6c83405c754cdec71cf9bb56e2e68e4396d7ce48bec6e1b0cc875ea3ea2f7a0dff8280d306519fd74a8f9d9ebca383a8f295991cb9ddd94
-EBUILD xfce4-terminal-0.8.10.ebuild 970 BLAKE2B a3dfb7acb0b88942ec71fc44e47f420f09bf8718304040ee639e48b31ef834fcd2837cf0df6e5c38c083633b78762fd030fda4450a8a8b378fe8e9b3985fde46 SHA512 36819f5bd5490dba76e7f0c1ebb6694ae0d69b678c22db22b7eacc058732008dfb20a2a6d51e33e1d55a8fb777c05dadc7d7d43be759d15515bf597193031f34
+EBUILD xfce4-terminal-0.8.10.ebuild 977 BLAKE2B c608ad9804c99786378552eaddf13e32c4d56fe40065ba973aabd7752d2f4252cd6febe80a7f21110103190a069c55da341629d7ae8abcd35184641c3145252f SHA512 35aeff69ad1f1c579f89aa69ef341705439efe85acf7d89be6038aa27cc1354dca6f1edb000fead377e4dbb91d5f9cf13627749a499932589a339de5f5fe36a5
 EBUILD xfce4-terminal-0.8.9.2.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
 MISC metadata.xml 371 BLAKE2B 0a526c805b03c54f6c83949db4687cc24fb686352edee1f9e28200cd7011a48319bf80d590cffa5c3e3eee94b080ac8949b0dc1de2e80452d21396ed18f56459 SHA512 9791152a81ee8a73e7eaa1477c160b43d8e395813828932882f27cf2a4ac58996bef78c6995ca1f950bebeae8858eb08f23da55dd6547b94bf294b275c920005
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild
index ef158f769f59..4f057f1b94b0 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.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 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter"
 
 RDEPEND=">=dev-libs/glib-2.42:2=
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 16784c982c88..9e0aa83ed2f3 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,5 +1,7 @@
 DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef
 DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
+DIST xterm-368.tgz 1451700 BLAKE2B 3fe939b8248e8839ba8b73b0971ab380e5f6528f51bd1993cc26d53755177fd5537cdbf2044f7fedad20663b3a7b42bc7f8b1c138233d44eb91472840f8448e1 SHA512 ea2f27722795c47a406cf4956ecdd05bae19aee621a0183aa167d188a90767a859ce41c6d1b1352b5ebd94d920360d3f26248ec0bb2068c253583d460baeafda
 EBUILD xterm-366.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283ad197dc9d140940993a952295e462a8d3565f4fd1173e2d1688ed59b1e0272fc1b1b39d498cdbf3d00111 SHA512 8c59b66c2534ea3d224b1cde39bc54bfa11e5b47f2828dee855bd5d38a2603515caa003b9d12bc80bed4c60f4d43160cb12ef5d0c7d5051426584984c4777b2e
 EBUILD xterm-367.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283ad197dc9d140940993a952295e462a8d3565f4fd1173e2d1688ed59b1e0272fc1b1b39d498cdbf3d00111 SHA512 8c59b66c2534ea3d224b1cde39bc54bfa11e5b47f2828dee855bd5d38a2603515caa003b9d12bc80bed4c60f4d43160cb12ef5d0c7d5051426584984c4777b2e
+EBUILD xterm-368.ebuild 2646 BLAKE2B a02c621fdb8353916253b308b2941dad2574b1dc40edd21aff79ae6e10c62b0d6103d40e260543a2d1d116218894ef39c2c0b8c660b66dfd3a5e9633cd961e29 SHA512 bcb84fc47ded01968d6c3c6a21483006521efcce366a39a984a7f13527affb3ccc870572d702dd263579db84fa2ed80766ad214eeab27e1670bf0fdc98da3255
 MISC metadata.xml 561 BLAKE2B 3b2f983cfb86c089d56cd61ae38e31036783fc94a61872dfb4ea707963c87e5dae4af4ed99144869e5cdfaa5fd9b6be301b5fa4567ea9b186dbd2410152e369e SHA512 79f2981a9be0ec7bcee8cafad4bea55e4a9291825ea85aee0ff6c6e49c26228803534873c5a87cc825b675e27c5246a7446afbd2c5c7717865d0c1920db9197b
diff --git a/x11-terms/xterm/xterm-368.ebuild b/x11-terms/xterm/xterm-368.ebuild
new file mode 100644
index 000000000000..360ff3a47763
--- /dev/null
+++ b/x11-terms/xterm/xterm-368.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+BDEPEND="virtual/pkgconfig
+	x11-base/xorg-proto"
+DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( sys-libs/libutempter )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable sixel sixel-graphics)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 38a486d6c41c..4de531284349 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,4 +1,6 @@
 AUX zutty-0.8-gcc11.patch 517 BLAKE2B 0d8432a219e20b985f13e75814440640c0a83f3a92df313aad8cc3f6091b3e5f3d503f87b9d48574e88ae64206b9e0b1434166c125a46dc669de02bdf2b13ad3 SHA512 7b3167d6643dc7672c5aa2ab1215c73af6b9e7c1072a012810d45defcb2362535bb2b8b88bef321cad28e6efe130811e3d314da0a1f795ba4a748c1011381dac
 DIST zutty-0.8.tar.gz 307235 BLAKE2B 897fea3735785ba1e8c811adbc90b96598c04f3ec19d9d3027745e5b9d3c1d21c55343b9409e48327139545e2675346be90d84af422d3ce97b1737cc287bb96b SHA512 75c5637fe8f0c8aff41e394a05f304f56bf03faf1dfa78807ca930a722536a93f54012f051f411b4e8ff478dd991f5b8ca1285fcd674879eac568c8971004317
+DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
 EBUILD zutty-0.8.ebuild 734 BLAKE2B 6a1f930a041b6431556ccc3bdb764dd773a7b1df1c46e1dd6125c8c4cbf4807b59ee081762b277f4f4986394ee0555949ed6c4827b0374904a759eeca58a2dd0 SHA512 7d5de7d3092a84104b49e77908e3475d4316eefbc4f3932334cf3fbc4477524366cfece3f8938633650c6c599904f19d7b19c67c574990ad98d9ed86f4f9315f
+EBUILD zutty-0.9.ebuild 685 BLAKE2B 4253ed0866707f675c29750bfb19b71da0786c976218f99686c9a472708a2b0d562cbc9a197dd470737ddc400a5930c9b3816bbb8ee115d8f25337e427725745 SHA512 7b247ce022fc582d383c3241ef2bf5301a182b5385eac3044ff25c7101b983511d48415b5076d35faebbf56585f6f9cc87d6d65e4f0bb767104dec922b829137
 MISC metadata.xml 1156 BLAKE2B 86e49541468db22123cd56f6aee08e61e6e79daddb817a11bf549b7c50cbcf5ed165316772c726caf7aaa0dc1321753ec3cd36eb25d88fad4216520827ad59e2 SHA512 3caa4dbda104f1fc1ab8326e40de573d2d8ba445c3a1002dd5c24d64d2bba9c5808addae2508d267497d80d90cd0cf285244a9874f9a31f62175f3c77adfadc5
diff --git a/x11-terms/zutty/zutty-0.9.ebuild b/x11-terms/zutty/zutty-0.9.ebuild
new file mode 100644
index 000000000000..6d1da930375a
--- /dev/null
+++ b/x11-terms/zutty/zutty-0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="X terminal emulator rendering through OpenGL ES Compute Shaders"
+HOMEPAGE="https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty"
+SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+DOCS=( doc/KEYS.org doc/USAGE.org )