gentoo (valentine's day) resync : 14.02.2021

28 files changed, 91 insertions, 488 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 8d77091a934a..35507dcadf38 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 38dbcf068940..6b6be6cff034 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -3,5 +3,5 @@ AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
 AUX aterm-1.0.1-remove-streams.patch 1108 BLAKE2B df7ee9b3409127ab82dc110035baa2b91f4d785874febb615d6d864bc4e5561b371707c7acc25096f59a646468b83a0cba27d2270f57ab80564dcc8b541b50e2 SHA512 d0ee1e6edee1e4b936b4179d9673e78f7bc70266f6d576d88ae76c9e87f4ae939baeaf0d62ba2b19cb1195cc3f4e1e111608ed493d56de4531ffb11257d2967d
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r4.ebuild 1987 BLAKE2B fac3bc69906ddeac45cfd895936efee2e79ca7ac174dfcb1916591d639f088df8a9a800de13539b4d25191b3cec85f576b08bc69cc81e1753ed3a9acdfe4d307 SHA512 812c5f176ca8126e3f4c02d5242132e0470ecd9fc2cfc6db77ffe00dc8ab96e796e16119ddf37345bcc3b9d6f366abf33b191cdd50453b85698cd106744d2e08
+EBUILD aterm-1.0.1-r4.ebuild 1938 BLAKE2B 5caa5b800459dcd5a976191d909e8dd04f917d219ed7b0b90494421a9af163f84fd2e06a821aeda7f60bd8adfed0aabce388534a7e4eea86c6bd42eba28a19eb SHA512 b202b7be0fe2b02748214fcc2b56034722feaeb91ac6f988af25b3e7a5691b236db8aa86c8128422c54107172f1d03092446e4e86ab10f5d25fc2200dc4a35d0
 MISC metadata.xml 643 BLAKE2B d1a621a0e1435528b11b8c990ef81836692c5f16526c78e2814c1568b0681ef02c2a988008c7c58b074ef8771ae95f840b5506447ad44cbf1617c16c5d09d80d SHA512 562485fc40c786d504d41805670a817811865aad74efb43fd210c3a9280d98f0e896410842c2881fcaa372771492e8a3af0167e8a15395351501981976f56700
diff --git a/x11-terms/aterm/aterm-1.0.1-r4.ebuild b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
index 8427c805ffef..8cad83593e22 100644
--- a/x11-terms/aterm/aterm-1.0.1-r4.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,14 +77,12 @@ src_install() {
 	dodoc ChangeLog doc/FAQ doc/README.*
 	docinto menu
 	dodoc doc/menu/*
-	dohtml -r .
 }
 
 pkg_postinst() {
 	echo
 	elog "The transparent background will only work if you have the 'real'"
-	elog "root wallpaper set. Some tools that might help include: Esetroot"
-	elog "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
-	elog "media-gfx/feh."
+	elog "root wallpaper set. Some tools that might help include:"
+	elog "wmsetbg (x11-wm/windowmaker), and/or media-gfx/feh."
 	echo
 }
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
deleted file mode 100644
index 84ad3d594f82..000000000000
--- a/x11-terms/eterm/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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 1475 BLAKE2B 3146946e11147cb52773f5bf6a957145deb5ec6778a1b201c9fba16798168af5841e8b54a3a328b2bb62d785eb76a6c72bc272049b64ec3ec1c3702a99329078 SHA512 27dc802762824e03ce4ba3966fccfd6211d1cbc26769641da4a85040865e610eff87a80910279546b35245b2f33470fd0b24bd3262a1c086b4c1c2eaa9d5bf5b
-EBUILD eterm-9999.ebuild 1217 BLAKE2B 08729118fb5cc187325c31ddfed37cd39dd77a1b033897dd1136c94ecf0ed0004b71d89729b569729735c2aa98242f36e768395bed057e33a86539caed551b24 SHA512 02fc0dbdabd6b349a87f7cd67007ee3ad772ff2ecf2b8ba31a4bf43badb482327f09ec706dd9f8666d96b879f5a1db76114967d2b87ee95cc1e9548176c5aa46
-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
deleted file mode 100644
index 138602b28256..000000000000
--- a/x11-terms/eterm/eterm-0.9.6-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A vt102 terminal emulator for X"
-HOMEPAGE="http://www.eterm.org/"
-SRC_URI="
-	http://www.eterm.org/download/${P^}.tar.gz
-	!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
-IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
-
-BDEPEND="sys-apps/man2html"
-RDEPEND="
-	media-libs/imlib2[X]
-	media-fonts/font-misc-misc
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libast
-	escreen? ( app-misc/screen )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
-PATCHES=( "${FILESDIR}"/${P}-asm-gnu-stack.patch )
-
-src_unpack() {
-	unpack ${P^}.tar.gz
-	cd "${S}" || die
-	use minimal || unpack Eterm-bg-${PV}.tar.gz
-}
-
-src_configure() {
-	export TIC="true"
-	econf \
-		--disable-static \
-		$(use_enable escreen) \
-		--with-imlib \
-		--enable-trans \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable unicode multi-charset) \
-		$(use_enable utempter utmp) \
-		--with-delete=execute \
-		--with-backspace=auto
-}
-
-src_install() {
-	use escreen && DOCS+=( doc/README.Escreen )
-	default
-
-	# We don't install headers to link against this library
-	rm "${ED}"/usr/*/libEterm.{so,la} || die
-}
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
deleted file mode 100644
index ae754baae083..000000000000
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3
-
-DESCRIPTION="A vt102 terminal emulator for X"
-HOMEPAGE="http://www.eterm.org/"
-EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
-
-BDEPEND="sys-apps/man2html"
-RDEPEND="
-	media-libs/imlib2[X]
-	media-fonts/font-misc-misc
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libast
-	escreen? ( app-misc/screen )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export TIC="true"
-	econf \
-		--disable-static \
-		$(use_enable escreen) \
-		--with-imlib \
-		--enable-trans \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable unicode multi-charset) \
-		$(use_enable utempter utmp) \
-		--with-delete=execute \
-		--with-backspace=auto
-}
-
-src_install() {
-	use escreen && DOCS+=( doc/README.Escreen )
-	default
-
-	# We don't install headers to link against this library
-	rm "${ED}"/usr/*/libEterm.{so,la} || die
-}
diff --git a/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch b/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch
deleted file mode 100644
index 777397170d30..000000000000
--- a/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/440618
-
---- Eterm/src/mmx_cmod.S	(revision 78909)
-+++ Eterm/src/mmx_cmod.S	(working copy)
-@@ -485,4 +485,8 @@ shade_ximage_32_mmx:
- 3:
-         LEAVE
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
- #endif /* HAVE_MMX */
diff --git a/x11-terms/eterm/metadata.xml b/x11-terms/eterm/metadata.xml
deleted file mode 100644
index 9a366d709a34..000000000000
--- a/x11-terms/eterm/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-Eterm is a color vt102 terminal emulator intended as a replacement for 
-xterm. It is designed with a Freedom of Choice philosophy, leaving as 
-much power, flexibility, and freedom as possible in the hands of the 
-user. It is designed to look good and work well, but takes a 
-feature-rich approach rather than one of minimalism while still 
-maintaining speed and efficiency.
-	</longdescription>
-	<use>
-		<flag name="escreen">Enable built-in <pkg>app-misc/screen</pkg>
-		support</flag>
-		<flag name="utempter">Include libutempter support</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">eterm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index ba3e6c7ba173..506fdc9a8439 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -2,11 +2,13 @@ AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7
 AUX kitty-0.16.0-remove-terminfo.patch 614 BLAKE2B 701aef294f7e52a2bf8a8cbe0fb192b226d1b430c1bed9f9d58e1f3c8e10362ac3b0cf04bc8de9c4e3a23acfce18bcbe3442191afcd77d76013539c8a7afe16e SHA512 667508e851c48bb66b85e3439cad92d98e12cef18dd0f45a6d8c4226b86b108d64e4d92fc5b650b7b80763665dba59f066930e4a654690d833e42e6aff13418f
 AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead672ce04410ede1a0a392098fc534ea989fcd5c2f7bd2d2581581c2ec64160c2364a1d5ef86eb67b07ec9440ea7 SHA512 49a1cb02beac7e56e6b75d1caf1fdf3111146eb5b40b29f0acf646052a95be84bb943c8a1b15eda8f2c10bc86437387dd465a8d9b044cbf7305cefee1c9fc97f
 AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893
+AUX kitty-9999-flags.patch 1962 BLAKE2B a7a446af13b5234c95885a49d7f2f4638fc4839d3ebee0e5249143ec40d8cf5694a1a3826b9e399071a1fb976698fc3698e2e44f8f3827b15df2aaca7039a827 SHA512 b9062d052daa8aa5f403ae42d46b7528f69761b376d73431d9e835413e7ff99d82174208e503619f7c4cdeb47e1b4471dbd4926f3728ac9613387207fb20d23a
+AUX kitty-9999-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
 DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
 DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 EBUILD kitty-0.19.1.ebuild 2246 BLAKE2B 6f228b2425d71b4024a7997b8b464b5427c779b4a4806b004cc34f2ec0eaf7610336dbe427ceedd45d96f6df3e7a8f1d668e4dce2dac2b1117cebbcbbab30791 SHA512 e000ff8fa7e5990cf7788527c9b5f2a68931af195be86b7350a2698aff6134b3a7ffecf857f53b6d86adc400b8bdfa1b2e8824a1e4cd9d1ddae1deab12057c07
 EBUILD kitty-0.19.2.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
-EBUILD kitty-9999.ebuild 2174 BLAKE2B b31720b068ae1c7ec0e98bfb898ce0c16c7933f1a014b732a7bb68123d09f8d209987b70e5ef6a389294567da9cb399d691db0f897618dc20e7623e634bc8bf1 SHA512 ebe9c51891a30808a6276b746037c153f753b991e6d8333d5249ff2d5563414326bd6785e6ac850c0a45d7f9b9cc71b30ca6c17cdd337e13bf574baaed58efca
+EBUILD kitty-9999.ebuild 2175 BLAKE2B 0254a67fe27cea41a49cba4f60578b2ab75719362ebdd278900e6baaa67a356eb46554bfaaa08150604265ff51dd67a9a7ff25902e07ab0d9b3f620f34ec290a SHA512 216891bae1976c8c7a163a776efeb42906e8a5fda599f75505c24292e4f06561e48cbd6b7e39d7cf5aa6fcd7b0936e917b28c8fe06214a9394ad79930510174e
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
new file mode 100644
index 000000000000..3bc0431b569a
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -0,0 +1,49 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..9cb59461 100755
+--- a/setup.py
++++ b/setup.py
+@@ -278,7 +278,7 @@ def init_env(
+         df += ' -Og'
+         float_conversion = '-Wfloat-conversion'
+     fortify_source = '-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'),
+@@ -289,7 +289,7 @@ def init_env(
+     cflags_ = os.environ.get(
+         'OVERRIDE_CFLAGS', (
+             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}'
+-            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}'
++            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}'
+         ).format(
+             float_conversion,
+             '' if is_openbsd else '-std=c11',
+@@ -306,7 +306,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')
+@@ -764,7 +764,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()
++    cflags = '-Wall -fpie'.split()
+     cppflags = []
+     libs: List[str] = []
+     if args.profile or args.sanitize:
+@@ -776,8 +776,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-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
new file mode 100644
index 000000000000..aeb40e601185
--- /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
++++ b/setup.py
+@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None:
+     safe_makedirs(launcher_dir)
+     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')  # type: ignore
+-    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-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 9b101e5a8027..d6240798626f 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ RDEPEND="
 	>=media-libs/harfbuzz-1.5.0:=
 	media-libs/libcanberra
 	media-libs/libpng:0=
+	media-libs/lcms
 	sys-apps/dbus
 	sys-libs/zlib
 	x11-libs/libxcb[xkb]
@@ -56,8 +57,8 @@ BDEPEND="virtual/pkgconfig"
 	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
 
 PATCHES=(
-	"${FILESDIR}"/kitty-0.17.2-flags.patch
-	"${FILESDIR}"/kitty-0.16.0-remove-terminfo.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-remove-terminfo.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
deleted file mode 100644
index 91944456b4dc..000000000000
--- a/x11-terms/pangoterm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pangoterm-0.0_pre20171111.tar.gz 23650 BLAKE2B 04270f98ab70a3d89a814e7d1e12e9a430a0c203cf5116a0c09813d0b52d8a9e37fc697d0104c3f58a99215b2922d7dac0f0b840cd226701510a8176a40ac540 SHA512 007c9dd4e623a04a1a0b8fd600d08adb1e9729a8f9ee9cbf5af93a33c902874deaf8cfb8227240369dc0ec0c9b93d6459693cb27e66f05163016f851e27cb4b3
-EBUILD pangoterm-0.0_pre20171111.ebuild 622 BLAKE2B 326b1c23b4861811c435d201f143d980aad65ffa9310921ed9251b7b84508c05690daad5c1910124a809d9a2ec58f2b216dda8b9ef34a081f6ac678c89491413 SHA512 8cd2174e44d3a1cc882048ff36f6d9fa11b87caea1c333ddcce0514a8649f118305d422686f4e3e9e57d1cab64ae697a96f2a00d77742b1cf0a800416a202868
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/x11-terms/pangoterm/metadata.xml b/x11-terms/pangoterm/metadata.xml
deleted file mode 100644
index 58f638b2ac3e..000000000000
--- a/x11-terms/pangoterm/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/pangoterm/pangoterm-0.0_pre20171111.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20171111.ebuild
deleted file mode 100644
index 28979dc5381c..000000000000
--- a/x11-terms/pangoterm/pangoterm-0.0_pre20171111.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
-HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
-RDEPEND="${DEPEND}
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-
-S=${WORKDIR}/pangoterm-0
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-}
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index d6b1e275228a..fc4d0f4be4bc 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -6,6 +6,6 @@ DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a037
 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
 EBUILD rxvt-unicode-9.22-r3.ebuild 2114 BLAKE2B f7044821f133b2a65242061d857c3b701d4fa90483c3751f3ce99a1edb5c37bfce7d42a44a593746d5f6465878b619bb8e0280605eb72c87cf700e57261229c9 SHA512 58344c93a3d4bb6c85401c6f568b20ba08425233ad8a25bd6f94b7a7d0e59cc55300dc818298fbc12273a83a5f04b3fb26fbfe6b5ead83d0367e5bb498039303
 EBUILD rxvt-unicode-9.22-r6.ebuild 2730 BLAKE2B fce29694228c2ecfe5c3210f80272f697198c3c790b81d6fbf0f4c07965890ae87668dc924103e1c04fb4f8033d7fae44e0d2ac348fc81a2f74a40a4f571ef15 SHA512 ffc4617decfc6d76c1d598304935f07fb03aca55c3884ae0ec09e3f65b8fbaab851c5b875dd59f14413042e2cd172a31b28470207ed543a44e85887b88a0479d
-EBUILD rxvt-unicode-9.22-r7.ebuild 3053 BLAKE2B 30801062838c034a8013d6c2fcfeac324da17ac83a47acade383eedf46899ddb230364ed65be112e8968185d3645cabbbe72bd6498f5bd2973da41b31a096ec4 SHA512 10ade30a25ee4d7b60ea5bbffde96b2718369f08d0bc6cd1285ecad415bcae091ffd2b6ab5dbe1a86edbaaca8c55914db96b88a31c676f763e11c4100195179a
+EBUILD rxvt-unicode-9.22-r7.ebuild 3048 BLAKE2B fce07540f9dee07a50c2b8930fb2b86fac5477cb36ca8acb2cca30515ff268e03c42cd74988b3f69a744abcd206f3f672e666f499a4f7c867d2cf92014fd0dcb SHA512 a7dd25a900b16594fd6e575fb2054c0068b8e83b4c3b893ac404ef471205ee9a0fd6566a08cf00179eab5734004a64b3f4b64b72d6fa3f1a13867c509cce198a
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
index 7e927275c5e7..55a9c03df63d 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
@@ -14,7 +14,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 ~sparc-solaris"
+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"
 
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index bfb7a2552a79..01148a945ec4 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,7 +1,3 @@
-DIST tilda-1.4.1.tar.gz 471340 BLAKE2B a84d125bf81e384706347401ebbf7b11813bf5ed422e6b374e918ed564b9bfe168ebf3fef163b91a15350b49166b0040e90afdef716cc1762ecc410710f72c29 SHA512 d16878e762d94f94c219e8e711223a771a2ab816f02573f693cfbcfa0eee5aafff8a274898a65df168c0bf78258aa16e5a3be6b0c3dee418af61c68f43ed74c6
-DIST tilda-1.5.0.tar.gz 484754 BLAKE2B 8f04a5046b642e0cd67d375817d046920bbefd9b499458c2dab90f9801b0a4009b7b06cfe29af01095f1627581e4577ba5a7405948b29d21e233db288da48efd SHA512 2876b3ffbc5dd663b10c2f5fc7e6b838d6e3e18f30eb62afe07d9615b4567b04fba0b1efb2449204f4a5b78a90198092e397a24a41b978862d4fc6fab0b8de81
 DIST tilda-1.5.2.tar.gz 485261 BLAKE2B 2ce0059ad695ac3e920cf8e40841b850967ff1e05b88a1c527b7154112c88a3435b66d0f31b882b6fdaf0dee038b7a7e6ab0401184ab701bed8d23d44a2856d8 SHA512 5f950696626005d6f8711fe1403313b36f065796ac07946e9782997aaf67a4bfdb3bfa5e37889bff95d77655d3546100a48327bfa175aa24c39a28685ee0306a
-EBUILD tilda-1.4.1.ebuild 695 BLAKE2B 33d4ffd0915fcbc42591161eba09ec2a36ad63c45ca31f85b9d471afb9ad5cad1fbe7277b1714153d12c43b1dfcee0cea2764dc08c401727b2ccbf97dfa241a5 SHA512 440c50ad4f9c5e738d948951848f25bfbd9a167374bbbb1cc264594d09911759fa5c5df9d35013db1a4f6411c2ed218252fce532563df42a9a10f51cba2edda6
-EBUILD tilda-1.5.0.ebuild 698 BLAKE2B 339df837f44a5c428b6b13639f5a55c5d34734daf59accff528f769e73187955a2a098ba1069eacdc3d8b3330130be71538e5c810aa11a09b395edb5b01a8308 SHA512 e577adb64da6f0be2635d0c1761d3d63099aaae0721cd62f05e1117224f9165af851e88987682ca1345c1d21f13d8e3e14b15059c2c98dac25b747164659a181
-EBUILD tilda-1.5.2.ebuild 710 BLAKE2B ac41566cb55b912690cafbbb20aac065702b8a72371860162fae3fc46c8cc4bfbe529b7e1dc9c13cf32d0d93ecca2b70fab6a350199d453fa453fd522f0c6c8b SHA512 fe96c12b2d2b6cca7523b1e9e9ac73133277978ac2e3cab609a82ad72d6a286e7f714822b3245698cdd79a1937dd1d503a38e3a366b4982de197caf1c4f8104a
+EBUILD tilda-1.5.2.ebuild 709 BLAKE2B caf0f2f3ae738f1d83eed3d8a1ddd8a129be81ebde72a5fb123160d836d1598710ea7b0f79d141ba0085cae768114bf58f472fc5c0ec3c914a8bda742bb883bd SHA512 eee1562a17400a3ab2d2149bf07284b2507f382b8788767c73820211ad764f5d45cf938d1e2ac10a809d01d759ffe95cca1540335f1e1c4e07ff3636e7025dea
 MISC metadata.xml 241 BLAKE2B 485e7c59f6c5a5bfbd9661213e8c1c9d6ee0c2ecea50167c176104e04a9cdcbad10b4eae709b67a9be04fde6ebda3403a984be210bfe0263e3a3dcfa9b93f6a8 SHA512 970a53d9a564b5820f8b144b0b1ccef76db2427fbd2b728ec586b7df5f6167d03e5a215048eb8e1e29eb5884a81e31e806630063f6c8d8654e8c72c0082b0d4e
diff --git a/x11-terms/tilda/tilda-1.4.1.ebuild b/x11-terms/tilda/tilda-1.4.1.ebuild
deleted file mode 100644
index 075ba71876f2..000000000000
--- a/x11-terms/tilda/tilda-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
-HOMEPAGE="https://github.com/lanoxx/tilda"
-SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="x11-libs/vte:2.91
-	>=dev-libs/glib-2.8.4:2
-	dev-libs/confuse:=
-	gnome-base/libglade
-	x11-libs/gtk+:3
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	append-cflags -std=c99
-	eautoreconf
-}
diff --git a/x11-terms/tilda/tilda-1.5.0.ebuild b/x11-terms/tilda/tilda-1.5.0.ebuild
deleted file mode 100644
index b7827af4144d..000000000000
--- a/x11-terms/tilda/tilda-1.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
-HOMEPAGE="https://github.com/lanoxx/tilda"
-SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="x11-libs/vte:2.91
-	>=dev-libs/glib-2.8.4:2
-	dev-libs/confuse:=
-	gnome-base/libglade
-	x11-libs/gtk+:3
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	append-cflags -std=c99
-	eautoreconf
-}
diff --git a/x11-terms/tilda/tilda-1.5.2.ebuild b/x11-terms/tilda/tilda-1.5.2.ebuild
index dffad7e00208..c0f266815627 100644
--- a/x11-terms/tilda/tilda-1.5.2.ebuild
+++ b/x11-terms/tilda/tilda-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index c6ba46787ba2..10dd588740bd 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 976 BLAKE2B 5dbc856d3799831a58e4d4afdc1ec143278fd08306a7c7439ef6e8e535447296dadd7b57ec65d9ce7fce3ba0d43564a3b1ef95c4d1037a49890f44944f913e14 SHA512 f320148755472bcedc5f934ec01def1b20d92f670cd91a1cc5d47ca8355e749ef7feb41cc1f55b6bca0999ce10ec7c86a299968003e211de6d0986c2dbc01a03
+EBUILD xfce4-terminal-0.8.10.ebuild 973 BLAKE2B 932eafbc5e1b15831b9a38193d9cc213946e56f6d8194827ce24f0fee90beba17b1986bf85f7f5b83c105d117d5f762d77586e234e4c6a3a73774b7b64df542a SHA512 70336b675e38571b6ec0eb606efa28a7235c387904a8150722e5b0fca10d341ec7caa47c37c1222971b5aee2abfd5097a3857c04f44e2a2ceb139b3af4393ffa
 EBUILD xfce4-terminal-0.8.9.2.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
 MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
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 444db2416bcd..4f2e5836b213 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://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.42:2=
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 78335ee02b35..a031fba3e235 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,13 +1,9 @@
-DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
-DIST xterm-360.tgz 1431491 BLAKE2B 2afa7f9cb93136ad0bfb29e0862642221b4b1f583caa5890bbdd4c0a2370266f7c7f19419e3bb82f93d854b3c5703ddd30b896dcb5069873458ac3483dbd7073 SHA512 ffca51e21584e4b84b271a555bead45df1759a9e353d776fd7d8736fb001b71cfa14dc85336c01c304b4fc98297523b1a943792da73b453e1810b890671bb607
-DIST xterm-361.tgz 1435017 BLAKE2B 8e413f3d9b8f3aa11fd71ed5692da9b274109bef5e0303470cf3eb81a333a12eb1437a01c023cff2dd0eb14aa19a849f6b00fa0a155c068421c7d070b1c64e35 SHA512 99e2a018729840c3ec8fe81d3cb305af249b641ceb40c2020f3cd4af3be7d88b6174a39fe8aa614d4ba1734af5f858762ffd68c9ee118ec3ef9030469583e852
-DIST xterm-362.tgz 1436334 BLAKE2B c87b01806cba53700888cd9e9e84fa4d4c822044bc709fdf66ed32f6a2d7866f6bc0e090a778ccb3bee025825ca4d87c4e95b4c6fc8870ba0ec34faefba71418 SHA512 fddfa689fe948245964b347f27c8c66b28eee82cb78062f0e296053a5db9a20f74786b34058512b109064628992db94e87bc12c79f2db4a50acb79e408173168
 DIST xterm-363.tgz 1442520 BLAKE2B f63efde533f9d495c3d6b744544e592608d2731f04af58a9d799f8ca7d705c81c507d9012fc4a1bd04b3e4c0a76fc00557d1a61cd9954f5fb2bf7b5ec624764f SHA512 e9148f144e5e38597c84ccd82033f4fb83a9dd222c4cecf7498e31065e7d0148c89631290e5f804fcd9d2d55f59f4fd271aaf220eb636fbe38ae245ea6537871
-EBUILD xterm-337.ebuild 2573 BLAKE2B 597ff7e49af001ae4787a667d4ef7f5c0431c855238f20f629962f541f56ab240ec2b35068f9e8d58fac4838e142b28141ee93eef8a8d96cad68e5c57c69a4d3 SHA512 db96bdb6785ee4a2f673210c1f3ee1c2b9ff8d7f0049eece287407fc0e1ae6247cc80fe46e05e140f86a0a9260822309a1859cf28a37df5542f32337d1437da3
+DIST xterm-365.tgz 1444367 BLAKE2B efb4ce024b7a196955c160e10aadc54d97da1df6e53b9ca79184382a1db939583e52f66ed4df1f586a33b9febda6ac51dc66a9f2cd69bb04296c934aae7e7571 SHA512 3f6571d09cd3fa94e9133494a2893e804ea0f0c76289d4a7e46e3ea267278042f0e78231ff4b06ee6d7ba5936dc3e2e6c81a8f52c36d79a8ddf3cfaa59376970
+DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef
 EBUILD xterm-351.ebuild 2616 BLAKE2B 2f09fb2709f822a8f821e8633a1383cb389f84d5e480d8d63010ff4557adf70c8d467224890a205b275bb2941f57bb59af00dbdf6433a152d893bac2718e857b SHA512 e4fdcbf2250ad5db0b9907af0b8b501f4b955808c840d0417db35e7c97a777c433d01353c02bf2161d5d9e34dea79697cab32f9240cc7466ac6aa1cab8115ab8
-EBUILD xterm-360.ebuild 2623 BLAKE2B a8d3e53ab715a047a08be83b10530b81ce0aece749b37e31074737b66f1cb116efb30a1b3958ae433b447496d9421308889b3dad59be26999e853314c8fd8334 SHA512 7ddfe83b65d1744d3a42c6ed7fd32d4a83088d2204f93d671d5df2491a5f101fd65ec837ab331f11e59f11fa63bd60b768a4e2bf2e4a8d9c723b398d791d2a69
-EBUILD xterm-361.ebuild 2630 BLAKE2B bf521d867776ad520dc0e977e7365d8991e88ea2efdc1d9eb3b767ba4750a19fe86d316e3b20be1fee6ef5f27caa78015cbacf56b79a855334cc55cc4a183669 SHA512 b5f1c968fea90c9b8c21e51acd36e6716d04fb4136ab86afa10ec86190db4eaa9d1787e2a16c1e8cb1b8622ad0d1e82caa3d8e9715bf1f82c70e084c982a4aa5
-EBUILD xterm-362.ebuild 2615 BLAKE2B 6a6028a900e1399d1f2e2a6d81148b27a43b016f3bbf4a86898dba8408b7f9d91493fac06a7ba7c41f7a9a1e33cfbc426ffd2cf06f698df83f2d5540659c9421 SHA512 321a5d11669432eb8d4d7ed6faf0b8ffbe72bf719ca07fba35150305e5afd9b8f95f53875c27f333b367a679b623805440acd68cd5fb4a9fa1b2f4f6bf7bb864
 EBUILD xterm-363.ebuild 2622 BLAKE2B 9d7a3c00d431f1b77289ef45e16103a6037e2897e94fefb0d14056c351f77016924508d116cec3908e4866774bc6e9ca8d2e3563fae4a091eccceb516b6faf2f SHA512 1eebedb4b17af7b044f9fa28533803b1b5720925a324154ddf0c0dfe4e88281537e0247af034fe8895f5c764796e27386d85509d2a07585d02cd8b572bd77654
+EBUILD xterm-365.ebuild 2622 BLAKE2B 9d7a3c00d431f1b77289ef45e16103a6037e2897e94fefb0d14056c351f77016924508d116cec3908e4866774bc6e9ca8d2e3563fae4a091eccceb516b6faf2f SHA512 1eebedb4b17af7b044f9fa28533803b1b5720925a324154ddf0c0dfe4e88281537e0247af034fe8895f5c764796e27386d85509d2a07585d02cd8b572bd77654
+EBUILD xterm-366.ebuild 2618 BLAKE2B 51ce6eac9631b1295da8c8586ec26edd8fe2264b87c2a0c6bddbaeff706e3f351bf4a89c70c316ae976c65a11c30b77628104b14a65175c5749caf546d225d00 SHA512 82db4dbc12fffb9a259b14e353467e0160d7b027cd9fdbcd47af0aa62f11cbc4b819642cae05a2917e48be9c8b8a1973b40e5b139a444b13444281a18bf9cb88
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
deleted file mode 100644
index 375cad80a8ef..000000000000
--- a/x11-terms/xterm/xterm-337.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic multilib
-
-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 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty 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 $(pkg-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 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/xterm/xterm-360.ebuild b/x11-terms/xterm/xterm-360.ebuild
deleted file mode 100644
index d99f0bb579e3..000000000000
--- a/x11-terms/xterm/xterm-360.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic multilib
-
-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 ~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 $(pkg-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/xterm/xterm-361.ebuild b/x11-terms/xterm/xterm-365.ebuild
index ffc411683012..0102172747d3 100644
--- a/x11-terms/xterm/xterm-361.ebuild
+++ b/x11-terms/xterm/xterm-365.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic multilib
+inherit desktop flag-o-matic
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="https://invisible-island.net/xterm/"
@@ -95,5 +95,5 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+	sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
 }
diff --git a/x11-terms/xterm/xterm-362.ebuild b/x11-terms/xterm/xterm-366.ebuild
index c0019dc43a7e..5efe26d32233 100644
--- a/x11-terms/xterm/xterm-362.ebuild
+++ b/x11-terms/xterm/xterm-366.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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