gentoo resync : 14.05.2020

41 files changed, 355 insertions, 785 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index ad4304412936..39c9a6716c9a 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index e1c383cfdf76..8944985e193d 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,8 +1,7 @@
 AUX kitty-terminfo-setup-0.17.2.patch 1707 BLAKE2B 6670b86ac9ed5063d2d2bd855ecd274bc14953e0ad836d9a858d425fec4811a92590a551e56a861780d01bcc9152bdaaf0f7d57e5af92b640e14cf97b72feb76 SHA512 982860794a23aa7c97de0c45a462b16ad1f0d596b0f178a10ee304f4926bb8378639b2de4842c7f2a43a4a90a652e6934a8f6891f008547824efd273113d284f
-AUX kitty-terminfo-setup.patch 1700 BLAKE2B e911716feedacd9463667a020e69afa0de8b982f78f3673eb690827ec20baf244cafca903b468577dfb6d6f11df0ac4a6fb0d6ff60b041d2bb4ec9c4c36b051c SHA512 632ca4639df03ecd923e0c650c543ac9f1a74527742fd7bfe0d2ca923ca45cfb6315664f5ed1e7cb72034c1c820cfb4757edc92843750169356fa0364a0bceca
-DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
-EBUILD kitty-terminfo-0.16.0.ebuild 1054 BLAKE2B ba4622acecf495cd0d6ba92449b09c39e3f0518a1954932569d609719b9c2c562534ed3e2fcc620486020d1be42aa6f6b0e71b38374c9eb2b8eb17a2e8686931 SHA512 5f06a74271da119899325f2335a11252d0ccca6b34078150d707d7dbac7f789988c772d5aa78554a3f5ff05b5165c1bd6685929b7b44919b06a806c7c8141c44
+DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
 EBUILD kitty-terminfo-0.17.2.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
+EBUILD kitty-terminfo-0.17.3.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 03f762c69be3ce63a340cd57678444a9960b3654d6ea676a583eca4ff629375f9924328702ed6006a38af2da60ae3220db56ea296171cd69f6ed0c3d5f99dd49 SHA512 bae84cdcdce2cf5dd8f5149cddfb30b79ebd21b00875d49ac7da5856614d8816ba0f8daed4d7197341a5df7660a4221acd037c09f6f52f4fd0bb3ac7b69239fb
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup.patch
deleted file mode 100644
index 5ff1fa2d77d9..000000000000
--- a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/setup.py	2020-03-12 00:28:46.725956882 +0100
-+++ b/setup.py	2020-03-12 00:38:55.557945979 +0100
-@@ -876,6 +876,14 @@
-         create_macos_bundle_gunk(ddir)
- # }}}
- 
-+def terminfo(args):
-+    ddir = args.prefix
-+    libdir = os.path.join(ddir, args.libdir_name.strip('/'), 'kitty')
-+    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)
- 
- def clean():
- 
-@@ -889,7 +897,7 @@
- 
-     safe_remove(
-         'build', 'compile_commands.json', 'link_commands.json',
--        'linux-package', 'kitty.app', 'asan-launcher',
-+        'linux-package', 'linux-terminfo', 'kitty.app', 'asan-launcher',
-         'kitty-profile', 'kitty/launcher')
-     exclude = ('.git',)
-     for root, dirs, files in os.walk('.', topdown=True):
-@@ -910,7 +918,7 @@
-         'action',
-         nargs='?',
-         default='build',
--        choices='build test linux-package kitty.app linux-freeze macos-freeze clean'.split(),
-+        choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze clean'.split(),
-         help='Action to perform (default is build)'
-     )
-     p.add_argument(
-@@ -1007,6 +1015,8 @@
-         elif args.action == 'linux-package':
-             build(args, native_optimizations=False)
-             package(args, bundle_type='linux-package')
-+        elif args.action == 'linux-terminfo':
-+            terminfo(args)
-         elif args.action == 'linux-freeze':
-             build(args, native_optimizations=False)
-             package(args, bundle_type='linux-freeze')
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.16.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.17.3.ebuild
index 6ceb2f1ead77..b37c1bba5c12 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.16.0.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.17.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-single-r1 toolchain-funcs xdg
+inherit python-any-r1 toolchain-funcs xdg
 
 DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
 HOMEPAGE="https://github.com/kovidgoyal/kitty"
@@ -17,14 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}"
+DEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup.patch
+	"${FILESDIR}"/kitty-terminfo-setup-0.17.2.patch
 )
 
 # kitty-terminfo is a split package from kitty that only installs the terminfo
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 0944025b7700..0158890404b0 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,14 +1,9 @@
 AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
-AUX kitty-0.15.1-flags.patch 1674 BLAKE2B 918844df4b6b0bdc7d5dec1c40c47ce5fc3a2b18485ef0d64002ed720835ea98371f938fe97f0fe339b44b977290c716f9d1008c31257da09966e3fd59d52b30 SHA512 c3de4073b654a0c432f7d601378536d531056c961e9036223c93b9653fa924b4343ad797d451bdf9370dce2f97e6d596a04908caea6156095440d6ef52eb17b8
 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
-DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
-DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
-EBUILD kitty-0.15.1.ebuild 1954 BLAKE2B d93e44f89f40e43ae162d9e33ac46294033c78f15460f2157ca745d966185d61ac220c7e884cb51c3e94d7280926575628ff41dee617f735573d3d146fb675ab SHA512 32b9d42eb970957cd8e9b7633100b0e19890f420566f4889a3aa8b45273921bcb7fd84dd769fad7caa0ddbe7c67eebe6c9d80a468222eb21e4a6b24fa3bf4cfd
-EBUILD kitty-0.16.0-r1.ebuild 2016 BLAKE2B 23fb1fcc5173f1c6554a706e1f53a94ad14b54a8613f57e4ee14cc7deb4292242e7529c210ffbcbb05568a7d9903863accb777a4ab8e2ddbca2f3e57eb76ee1c SHA512 3710dc2dbd8738218559b0789ca93ee947bda1e8edfb7c4be64b5d8d695ea43ad73db2ded77598b0e05760b1cfe0071d4005f4d2c9cdd54fe0f6be69bfe1efa4
-EBUILD kitty-0.16.0-r2.ebuild 2151 BLAKE2B fbff92e3ecefbcd90fd36f7001c1a213e8520bdad9e839b027ceb0ba01ea6201bcc8383ceeb458040ad34818d17bcf12fd1a051f88e16eaddd47493f0f095089 SHA512 2396f452018c08f9b9d3863e28397f506e6c66273fba43369611dbfa626c3f28032267511b52244faceaa43dfc9ce10d2100b25d803ebbc54195acbb4e86ffb9
-EBUILD kitty-0.16.0-r3.ebuild 2092 BLAKE2B 1488a8b299a4e649f24cf9be580a1d2caca78ea5bcdd4a0f6299554587a91268b784ea1dac2cae9c9a2668a3156803df8702664e3b9df4fa8a02ebe31974b557 SHA512 68f62412dd54eb10ec6141771242769160cbb4e14caea52e46865d3d13e53a3cf5346e4eebc91369ac416928b5db3d99ae6d9002fa278f723ca802cc87854fd1
+DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
 EBUILD kitty-0.17.2-r1.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
+EBUILD kitty-0.17.3.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
 EBUILD kitty-9999.ebuild 2140 BLAKE2B fb60b6cbbde14212cc2d437a5dd946ce2e0d5178ec86b4e140b8092b8a31d29d7cd68669984a475fd51b2b54ea8b5fb9d9399cb07d99c6897a95f81fddc1cade SHA512 2cc98526c03091abe79a2916ed9b9937f17a06e1347be89d8e496a46fdd5b630b4c5ab84749493ea8565c38ea9738e10149e25b3f3fd5d4fd52d2d606869bcd2
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/files/kitty-0.15.1-flags.patch b/x11-terms/kitty/files/kitty-0.15.1-flags.patch
deleted file mode 100644
index cf09a4a5bab8..000000000000
--- a/x11-terms/kitty/files/kitty-0.15.1-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- a/setup.py
-+++ b/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=c11'
--            ' -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')
-@@ -614,7 +614,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:
-@@ -626,8 +626,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.15.1.ebuild b/x11-terms/kitty/kitty-0.15.1.ebuild
deleted file mode 100644
index b921dc1b6a73..000000000000
--- a/x11-terms/kitty/kitty-0.15.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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 wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-1.5.0:=
-	media-libs/libcanberra
-	media-libs/libpng:0=
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/imagemagick-tools
-	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}"/${P}-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 || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		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
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.16.0-r1.ebuild b/x11-terms/kitty/kitty-0.16.0-r1.ebuild
deleted file mode 100644
index 1dde4e4a9967..000000000000
--- a/x11-terms/kitty/kitty-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit eutils 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/libcanberra
-	media-libs/libpng:0=
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
-	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}"/kitty-0.15.1-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 || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		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-0.16.0-r2.ebuild b/x11-terms/kitty/kitty-0.16.0-r2.ebuild
deleted file mode 100644
index fac39de6d70e..000000000000
--- a/x11-terms/kitty/kitty-0.16.0-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit eutils 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/libcanberra
-	media-libs/libpng:0=
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
-	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.15.1-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.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 || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		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
-	optfeature "Terminfo file for the kitty terminal emulator" x11-terms/kitty-terminfo
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.16.0-r3.ebuild b/x11-terms/kitty/kitty-0.17.3.ebuild
index 39c54b5dc7dd..24b10118172e 100644
--- a/x11-terms/kitty/kitty-0.16.0-r3.ebuild
+++ b/x11-terms/kitty/kitty-0.17.3.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.17
 	)
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_MULTI_USEDEP}]' python3_6)
 "
 
 DEPEND="${RDEPEND}
@@ -55,7 +56,7 @@ BDEPEND="virtual/pkgconfig"
 [[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.1-flags.patch
+	"${FILESDIR}"/${PN}-0.17.2-flags.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
 )
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index b7e59da2cf32..b0f2a47707ba 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,7 +1,5 @@
-DIST mate-terminal-1.22.0.tar.xz 1538540 BLAKE2B 490ff1e2a0d8c93b2ab2479c8a735867f551111585d82d353cd7a150f1fd5e4e1319dc25832628b464572734efc2fa4917b49b7d4fe5d63b78ce6ea5601e4611 SHA512 45932db8c50348386a58ee7acaf08af43e28bd495dac08b4dcff5defd1c10189163bdfd73c61015674d61f275dabc2f749b2e0cbf9981c7dfdef5a4060686645
 DIST mate-terminal-1.22.1.tar.xz 1543900 BLAKE2B 9c5d92525391603f3dd06444c07d892bbae43c03da7f09414901ee31ce8497e65dfca9f184c8186bead91c27c99c69a528ad2021983ad074023781b275e2b748 SHA512 b20102c15dc140b59c93802606ca94fd108dfd5f7ac7f079b872e957794fc2c3aab40c0e6da697e8d393a67fca7b106573a4cb8014af5d6c8ad777be3a798534
 DIST mate-terminal-1.24.0.tar.xz 2084772 BLAKE2B 82909eb210bf5f0848e35b06b8569b22ba35ff515b2f90bc20e1766564997c7a44080597ac2efa825a8f9793f64c56136dd977b86e4d88e0886bb0e70c772e79 SHA512 2ad25411a8e720d3ef43964dc9f80732e215b1b5154e904069d25e73910c0c8f0e1b100d21f85b9a1eec06f6b17f891791445f7830bb52fc44b67fa3f8cebf76
-EBUILD mate-terminal-1.22.0.ebuild 746 BLAKE2B 2a763e188f9c824daf1d5cc4b618047b98494264ddba5efc404e22eeb0c00577fe7bc2279197f5e966afd17768a7b73d4b9f753f1e67c8e27fdb806684a13476 SHA512 a399a9b94bc1f4f4414d08597e2cd15000a78808e6d8f0ea5bb3432cba1dde3379fe94321db7425be203e42491a4ad8d76f49576793039eec5126815d6ba43cb
-EBUILD mate-terminal-1.22.1.ebuild 748 BLAKE2B 6cec50cbb0113613336aa793fdb42de0b22fbdb4bfee788270aac7840405301042ddec2df13ce8924a032723d00e6333ddd17902605903891bb586100a13910c SHA512 9d6bf30c51de24b0fdbcecaa9e9e09a045b82e8cac4d5a06a799bbcedb0a94a88ae7f891baff496cd784a6bedbb7322ace6be89df3c1dd8b5f31b5a2763aa15b
+EBUILD mate-terminal-1.22.1.ebuild 746 BLAKE2B 57d61f6ca3e83a32fb9cce4101c3212e6675b85791a7a62cfedfa4c078bb8a556da8ad1fd5b7d4ba47f63ac53e496ee567fec40fea09d2237c38fe8a36a083f3 SHA512 66bf960e9eeff78a42a68991f834f7f091681732b56b8777f2e1a52242148c2f9082cb300701b828e6597b2c074dfe616e6d61418b7b6a4d411ee2de9a17a905
 EBUILD mate-terminal-1.24.0.ebuild 753 BLAKE2B 962406ac757444dcd7535afbecd441a38b4da440b5ef6cfeca24547dfe67630ecaad512a8e48ec7eceba20628beccfe0e1ec7f483968eb74dce2f329f83e4850 SHA512 513ce811cda6c1875092db64dc71dc12902f411739e5800cf723a38f4495bce98ccb057b2f114d003af7accea724388e1d9afdeceff7ba233d5daec97b93989d
 MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9
diff --git a/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild b/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
deleted file mode 100644
index 8fda2f9a7d12..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="FDL-1.1+ GPL-3+ LGPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/pango
-	>=x11-libs/gtk+-3.22:3[X]
-	>=x11-libs/vte-0.46:2.91"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.22.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.22.1.ebuild
index 8eb018b4fbc2..cc113ab0ab41 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.22.1.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.22.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE Terminal"
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index da2c8e2551d1..ff303aee28de 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,8 +1,6 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
-DIST mlterm-3.8.7.tar.gz 3994292 BLAKE2B c30991a7bb3a9f0a36d9f898087bda5b86e8282bc811e60430dc61ddd04c8c4cb6b9284ab178d8a6610aca2dcac785326e69e2088b2a7dee786451aa7c6a794c SHA512 6d2087d1433918f476e35dbde8d79940170fa6f133b9122e1db19006afc5081dbad7ed487bfa939b3d92ea29f3843a2b7c5540dc05e54b3c568bbe76ceb66ad2
-DIST mlterm-3.8.8.tar.gz 4035215 BLAKE2B 4ef85822915a1a15119ed771e0d2da0158e469b60cc8eafa9a118ba0ee0e4d4191fb0b5e371320978ff83b79907a42c9065d374dff8774bbac73f7ddb57be0af SHA512 4db7de441300d30eadc85d1c780bb10c81d2555225fe163280508180ccc2114eeacf0e5772f9d69c1b59ef6f3ffb3444b75fe3e5ea508dd9e18e5850e78f78a5
 DIST mlterm-3.8.9.tar.gz 4101898 BLAKE2B 81ce300f16dcf6bc1f3e0467fc4646aa263a222965f10d87a8010a70af9f675965f184a5f1a7909b43d6375fc951e98854ee41af10c2cebfd03697560fb5856b SHA512 0bd5468dc58095fd9432922490178fe14335724cee08d2f509e8f72a4d5f9aea9ff2f0672706e5290219575f47a1ff15dccb4e21e318c89dd5718fe6ef694c0c
-EBUILD mlterm-3.8.7.ebuild 2929 BLAKE2B ef432a502e9999e1867453fed1d1f35c4394391ba8cbd8d77845549c9eab3c3b5e874c57d24410dcca8d084b38fb8dfc64d10a98bf796b3de57c2206fec4d2ff SHA512 fcb2c789b954494e9a9df21b762b77291ba12d98b1070d26babf45232168c47a0a212cdbcb29be0919985fd867abe171317fcf0d5ae5a9549a73151c90dccf46
-EBUILD mlterm-3.8.8-r1.ebuild 2934 BLAKE2B f9d241aee6afe49186f8dcac901c49861a7d1e59838391cdd9a777df684b71f492962c4c24a5636819e2b4210a66219680f9e5dcf28dfc0c784d32d4e3a91930 SHA512 6d2906ff84073736ea5a83f5d91acfa2abbf8118cdf64963efce18e6854ca506975a7c750e43fb7af6ae988ca766439987582a4db6eb0f773a3d3dce605b2f3a
-EBUILD mlterm-3.8.9.ebuild 2934 BLAKE2B f9d241aee6afe49186f8dcac901c49861a7d1e59838391cdd9a777df684b71f492962c4c24a5636819e2b4210a66219680f9e5dcf28dfc0c784d32d4e3a91930 SHA512 6d2906ff84073736ea5a83f5d91acfa2abbf8118cdf64963efce18e6854ca506975a7c750e43fb7af6ae988ca766439987582a4db6eb0f773a3d3dce605b2f3a
+DIST mlterm-3.9.0.tar.gz 4143644 BLAKE2B 01e95b0319526e03a009e6b2f1467287a6ecc2ec29c4808c486a779896f183cf9f1732baba38c02150db89ef9e6754760df308ba477cca916f60d167062ea13c SHA512 d89340eb460904ca36c6ed063b356625d9c9b4ad129dc51640d50a04e166f8239124d0003db778376c47daa6311c869f9fe7e337c90937fed5ae4151f5af57c4
+EBUILD mlterm-3.8.9.ebuild 2930 BLAKE2B aa5f219cc82299d111503383e1b859102bcb67d0ddacfcf9097226ec325537624d31eafe758f13ff184188611381287b25dd26a08c1fc04953930ef4ef341386 SHA512 d7d55696f4e566b37a04950cee433089e7927535ad4aa723a236735e9b6cceaec72f381756c5956292e172ddc10cec5aa1dceb4bda86ddf1f2369191b0bf4dae
+EBUILD mlterm-3.9.0.ebuild 2934 BLAKE2B f9d241aee6afe49186f8dcac901c49861a7d1e59838391cdd9a777df684b71f492962c4c24a5636819e2b4210a66219680f9e5dcf28dfc0c784d32d4e3a91930 SHA512 6d2906ff84073736ea5a83f5d91acfa2abbf8118cdf64963efce18e6854ca506975a7c750e43fb7af6ae988ca766439987582a4db6eb0f773a3d3dce605b2f3a
 MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
diff --git a/x11-terms/mlterm/mlterm-3.8.7.ebuild b/x11-terms/mlterm/mlterm-3.8.7.ebuild
deleted file mode 100644
index 5c4771382088..000000000000
--- a/x11-terms/mlterm/mlterm-3.8.7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
-REQUIRED_USE="gtk2? ( gtk )"
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	bidi? ( dev-libs/fribidi )
-	brltty? ( app-accessibility/brltty )
-	cairo? ( x11-libs/cairo[X(+)] )
-	canna? ( app-i18n/canna )
-	fbcon? ( media-fonts/unifont )
-	fcitx? ( app-i18n/fcitx )
-	freewnn? ( app-i18n/freewnn )
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
-	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
-	ibus? ( app-i18n/ibus )
-	libssh2? ( net-libs/libssh2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	nls? ( virtual/libintl )
-	regis? (
-		|| (
-			media-libs/sdl-ttf
-			media-libs/sdl2-ttf
-		)
-	)
-	scim? ( app-i18n/scim )
-	skk? (
-		|| (
-			virtual/skkserv
-			app-i18n/skk-jisyo
-		)
-	)
-	uim? ( app-i18n/uim )
-	utempter? ( sys-libs/libutempter )
-	wayland? ( dev-libs/wayland )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
-DOCS=( doc/{en,ja} )
-
-src_prepare() {
-	# default config
-	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
-		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bidi fribidi)
-		$(use_enable brltty brlapi)
-		$(use_enable canna)
-		$(use_enable debug)
-		$(use_enable fcitx)
-		$(use_enable freewnn wnn)
-		$(use_enable harfbuzz otl)
-		$(use_enable ibus)
-		$(use_enable libssh2 ssh2)
-		$(use_enable m17n-lib m17nlib)
-		$(use_enable nls)
-		$(use_enable scim)
-		$(use_enable skk)
-		$(use_enable uim)
-		$(use_enable utempter utmp)
-		--with-gui=xlib$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
-		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
-		--enable-optimize-redrawing
-		--enable-vt52
-		--disable-static
-	)
-
-	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
-	if use gtk; then
-		myconf+=(
-			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
-			--with-imagelib=gdk-pixbuf
-		)
-		scrollbars+=",pixmap_engine"
-		tools+=",mlconfig,mlimgloader"
-	fi
-	if use regis; then
-		tools+=",registobmp"
-	fi
-	myconf+=( --with-scrollbars="${scrollbars}" )
-	myconf+=( --with-tools="${tools}" )
-
-	addpredict /dev/ptmx
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	docinto contrib/icon
-	dodoc contrib/icon/README
-
-	doicon contrib/icon/${PN}*
-	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
-}
diff --git a/x11-terms/mlterm/mlterm-3.8.9.ebuild b/x11-terms/mlterm/mlterm-3.8.9.ebuild
index 915523df803a..81617541d78a 100644
--- a/x11-terms/mlterm/mlterm-3.8.9.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.9.ebuild
@@ -11,7 +11,7 @@ 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 gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
 REQUIRED_USE="gtk2? ( gtk )"
 
diff --git a/x11-terms/mlterm/mlterm-3.8.8-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.0.ebuild
index 915523df803a..915523df803a 100644
--- a/x11-terms/mlterm/mlterm-3.8.8-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.0.ebuild
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 15b32a7bdbd1..3b90427e204e 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,3 +1,5 @@
 DIST roxterm-3.1.5.tar.xz 309892 BLAKE2B 11ede6d870a2aa96bfff4974ab33ac4814802f6b08e684f9367e3e268adc113be2b0c92eb337447f8d20a687c7be5f414854cf1f75831ef6c38f4d78d3897317 SHA512 f07989331b1cf915e94582bfceff8cb87f20613eb272ccc502fb49c7508a1330cfa3b137c59f300b8541595aed541867c1b0aad36809e7e9a326f7119fde2acd
+DIST roxterm-3.9.3.tar.gz 527056 BLAKE2B 442b9ee2605dd2b5e817ec792cab718eeed7aeacdd5a34582df780ee7fb970299985a49fda146c56dfa242d3a34098673fdcdbf7af96f1ab9e7c4340f08d78d9 SHA512 d3e29575a9985c8c967d9fa2b73d7dfd45cc13334b29c759219a90a3e0299c4d253a15e969be8c85c9aa12b1fddd390830fdb3ae99fea49d37a849e9881bd087
 EBUILD roxterm-3.1.5-r1.ebuild 1330 BLAKE2B 065b8390a3e504329a86773d9303b2bec008e36428d39fd5062b136878dc374e210e01babb6750968f5d430c70644bf86699601f2d13747e3af70c6d4887b2d9 SHA512 af40d002452814c561bae1116beaf7b7de85347e0ec57bce723628ba6420fe64c76833d487b1c06747d96e7bbbaf47e3347102b673c39984bd4fa1215aad24d8
-MISC metadata.xml 244 BLAKE2B cf304fb20ba89e08f86507406f4d36eb84f956d7a623a096c44211859cc51191d3d1b700bc1346e64304137af395d4103c99043c083d7f8d35e41603efb23662 SHA512 0783dbb1846be292eb3f6bd707a66012707fc36a7226d3f9e97fa5c58c0e546fa14084d2f8e0a969b55345fbd18d2d72b0f6cd6804896ff613fe5e24ea8b4bc3
+EBUILD roxterm-3.9.3.ebuild 737 BLAKE2B 1ea290cd18d15a57d32d57d7b0281680f2b6b8a9dd34324b39df003738bafaa10d08140bbe5edcb079c8a4cc181f53b66c187c53a04644818615d4b3e679a0b5 SHA512 e1b628f10bff2eb816e334b4ee3f25bce8bd9e2d31201bbab1f6bf5af645431b7136781232a2901492d27ea305249c5f422f24a8636f38b565666f2b9bb2763e
+MISC metadata.xml 472 BLAKE2B 90826818bb97e1be487ba8f3a3563e06740b0dd133f9785af4f8d37659fe2db305934f72bd7120b19f28de4be7e29566a937e2f4b171b143098ad8063b462aea SHA512 ee65349209ec6c4c5755fea00a37a5f7c671c425bf7804727446b7a59e7069fdcb23e36234b48edaa539ee82ee78574611a174b085f4e9f8ad9532ce93673e6c
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index 34ba352f9105..7b589394216f 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ewoud+gentoo@kohlvanwijngaarden.nl</email>
+		<name>Ewoud Kohl van Wijngaarden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+
 	<upstream>
-		<remote-id type="sourceforge">roxterm</remote-id>
+		<remote-id type="github">realh/roxterm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/roxterm/roxterm-3.9.3.ebuild b/x11-terms/roxterm/roxterm-3.9.3.ebuild
new file mode 100644
index 000000000000..af6a540bc9c5
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-3.9.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="https://github.com/realh/roxterm"
+SRC_URI="https://github.com/realh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libpcre2
+	sys-apps/dbus
+	x11-libs/gtk+:3
+	x11-libs/vte:2.91[vanilla]"
+# vanilla vte due to https://github.com/realh/roxterm/issues/222
+DEPEND="${RDEPEND}
+	dev-libs/libxslt"
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index f6cefa2440d6..067784b9cd42 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,6 @@
 DIST st-0.8.2.tar.gz 44788 BLAKE2B cc7fc9040c6db1c903d0f7290e5cfd1c636b2d17b42645956583cc8fa883bc1f0631ffbd683e735a834ff96f90171d9d423801d84ce4c0686564498baa97bbc6 SHA512 eaaf5f2fe050ee768d16a9c8c295ba13315775b3a8a3201e020237a3dd217bfb811832d58477249000596289a6cb3287fbb39d6327fc90986af1c363e4b5bf8d
+DIST st-0.8.3.tar.gz 46292 BLAKE2B e84986dedd9aa8ff8e0b1c702cf5601c16cbed67f69623f41bc4908adb06fa29783b21de22576a50ccaa3cb49f515f284b1c4e72b6c5d9fd9b8efb05434b31c1 SHA512 2a824e43d9b3085d9c5c772e3411d744509be79301937c946b27f25451f68813f46c863dd37babbf67716506e86bc70d03645b39d7b124390b07f8f3e0c0c573
 EBUILD st-0.8.2.ebuild 1395 BLAKE2B 13ec341a08d934219c584f1d308f0d12174be9ad41b2e35c08805367013c901407885383c13fc0cb42cac4851542ca9d12d5c49614a1f2c29f8972866f4ede58 SHA512 d961201fb17a883b9c083201fd457307e2601c33b91b12be68fcd53c4b57863731193cff39c895e921bcc40411fa9d19aee6a72ad1601d59acb978f2dc321c4b
+EBUILD st-0.8.3.ebuild 1398 BLAKE2B b2e5497c103ed053d93052a6f57346427670af48ec6f227a12a13e032bc0c1ba30899d671edcf8b71db16e3b47ddeedf5b0601620559f2bddf5e8431880245f4 SHA512 103f8ea25c28ed9d49d5a2b7afe9a3f6c15996c1bde1b3504bde0c20897e013aca0e404d5add218e2093606069270f61fea8e605202584bd3d73e010f77ff88e
 EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-terms/st/st-0.8.3.ebuild b/x11-terms/st/st-0.8.3.ebuild
new file mode 100644
index 000000000000..c377bfcdc276
--- /dev/null
+++ b/x11-terms/st/st-0.8.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="savedconfig"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_configure() {
+	sed -i \
+		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+		config.mk || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index a260d3ffae38..216a585e3676 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,5 +1,10 @@
 AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff6132257d27ddb7e29f9bc16733805c3cf1b8707dd4320bde8fd47636aa6e71161847cdcbb06759762674fcd81fa1717bf2d4 SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
+AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
+AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40
+AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d
 DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
+DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
 EBUILD terminator-1.91.ebuild 1331 BLAKE2B 2a078e0162e7461b313d5f2fd3e99e101378141c6f888b21dfc81a7173abea0dd127014c2e981383d15d3d752d034b879aea5a9a2dd2ae2e9b824aa469aef7c0 SHA512 5fe0c87d9ede370c12063f2c899c63f4a0d8cb19c675e113c7536fed496610fa82479b1b24e4c6d61edb149f655d16f3c432945447578ec27deca700dd949d18
-MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b
+EBUILD terminator-1.92.ebuild 1395 BLAKE2B 21053c113d0e410507491dade77bf46605e5d44f50341e35de277a140d59d039c10379978abdafdbd19921335f8d2171ed7bf6a0d70936d764ea9e3b384516de SHA512 6465a1cc9cdbe2b448fbd852f416b30f7d05cc96a5f4c2a3f7c14c60fa563a76000b0a1639e72098b5188156a4c65a3d41362555393194fb5e62c1c512872771
+MISC metadata.xml 944 BLAKE2B 3194719b108a2320e92ea5287f6c8f873bc68b50c151e344fe90ae4c717440de73411fe732c7314b32bcd584bf75ff7ffde4b4b712947f5bf2367ae79c01546b SHA512 8f8f58ffef9623ffbe30740020cd5dff027281f3c5ec0cdd8a57c138e79e331f76e791e1d3a938de5072c93bca19951ceec862ff6971bfe26c3218057c0787a8
diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
new file mode 100644
index 000000000000..c924de3607f5
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
@@ -0,0 +1,16 @@
+Without this patch, terminator's build script runs gtk-update-icon-cache which
+causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
+its own. To avoid that, gtk-update-icon-cache is run later, as part of
+xdg_pkg_postinst in the ebuild.
+
+--- a/setup.py	2009-08-12 22:22:53.000000000 -0400
++++ b/setup.py	2009-08-12 22:22:57.000000000 -0400
+@@ -25,7 +25,7 @@
+ 
+   def __init__ (self, *args):
+     self.without_gettext = False
+-    self.without_icon_cache = False
++    self.without_icon_cache = True
+     Distribution.__init__(self, *args)
+ 
+ 
diff --git a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
new file mode 100644
index 000000000000..ae722cb11685
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
@@ -0,0 +1,25 @@
+commit 9f855d41f3e6d610bd01df9688467fdbb341917c
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Fri May 1 08:36:09 2020 +0100
+
+    Make failed tests fail the test
+
+diff --git a/run_tests b/run_tests
+index 3bf51e4a..cc7fb56a 100755
+--- a/run_tests
++++ b/run_tests
+@@ -4,10 +4,10 @@ for t in tests/test*; do
+     echo $t
+     file_type=$(file -b $t)
+     case ${file_type} in
+-        *[Pp]ython*) python ${t} ;;
+-        *Bourne*) bash ${t} ;;
+-        *bash*)   bash ${t} ;;
+-        *perl*)   perl ${t} ;;
++        *[Pp]ython*) python ${t} || exit 1 ;;
++        *Bourne*) bash ${t} || exit 1 ;;
++        *bash*)   bash ${t} || exit 1 ;;
++        *perl*)   perl ${t} || exit 1 ;;
+         *) echo "Unknown" ;;
+     esac
+     echo
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
new file mode 100644
index 000000000000..ae2fed5d48f0
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
@@ -0,0 +1,32 @@
+commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Fri May 1 20:38:00 2020 +0100
+
+    Install AppStream data as .metainfo.xml
+    
+    Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+
+diff --git a/setup.py b/setup.py
+index 7c54977e..38a819a9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -72,7 +72,7 @@ class BuildData(build):
+           [file_data.write(line.lstrip('_')) for line in file_in]
+ 
+       appdata_in='data/terminator.appdata.xml.in'
+-      appdata_data='data/terminator.appdata.xml'
++      appdata_data='data/terminator.metainfo.xml'
+       rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
+                  "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
+                  appdata_in + " " + appdata_data)
+@@ -205,9 +205,9 @@ setup(name=APP_NAME,
+       license='GNU GPL v2',
+       scripts=['terminator', 'remotinator'],
+       data_files=[
+                   ('bin', ['terminator.wrapper']),
+-                  ('share/appdata', ['data/terminator.appdata.xml']),
+                   ('share/applications', ['data/terminator.desktop']),
++                  ('share/metainfo', ['data/terminator.metainfo.xml']),
+                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
+                   (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
+                   ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index 44b22d322ad3..d11068fa01fd 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		Much of the behaviour of Terminator is based on GNOME Terminal, and
@@ -16,6 +20,6 @@
 		<flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
 	</use>
 	<upstream>
-		<remote-id type="launchpad">terminator</remote-id>
+		<remote-id type="github">gnome-terminator/terminator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild
new file mode 100644
index 000000000000..5891577d909c
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="no"
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="https://github.com/gnome-terminator/terminator"
+SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus +libnotify"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/keybinder:3[introspection]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.16:3
+	x11-libs/vte:2.91[introspection]
+	dbus? ( sys-apps/dbus )
+	libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+	dev-util/intltool
+"
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
+	"${FILESDIR}"/terminator-1.91-desktop.patch
+	"${FILESDIR}"/terminator-1.92-make-tests-fail.patch
+	"${FILESDIR}"/terminator-1.92-metainfo.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 8bf16c92ed34..9ca65843f42c 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,5 @@
 DIST terminology-1.6.0.tar.xz 4893348 BLAKE2B 20c9b8a916a4cd48055839266a157d5d8fca70557f7fb8b61696ceeaf4bc0fd93ea5abc0930d1c552a816e3fa3e455624f62d4adbad7feacc9cd0e874a91feec SHA512 ef95a5d128736a2e6b3b9e48a3f32a8e3a1f19ccabcb9fa429ed777ee201ba16fa431a61edafaebc018567f4a3657d81551407cf0449f58b416aa1e6077afec1
+DIST terminology-1.7.0.tar.xz 4922616 BLAKE2B 40ca7bfff534e773b4c188970ecd82e44c2eee7a75eb2a6d4fc6a8635c57857e2037a319818a437843271faa42995f25b613091a4463c02427d835c6ae572722 SHA512 9635da6a51344fbbafd333592252c2539daa795600b4a1d5ea5710e294f18ff9f5667706c789a3c91378b493ae631df47faec2bc43b4cc48d0266506ab3f2e78
 EBUILD terminology-1.6.0.ebuild 869 BLAKE2B e7329ccfab1942c6387dd366a3d201ed4e1cff240ab9545f4ab1c393d6f3ba18d1380792a281f3400a243ea1882b4b44a899c34492ef077a6b4531faedb9d070 SHA512 651367c30110d89c2c7d0285787747d9756949b61bb0b5afa6f61290d87f1f51f79d4f70f840cb7ebcdbf59b93ca54ddcad4a81b6634a01d1622dfd67d545ac7
+EBUILD terminology-1.7.0.ebuild 865 BLAKE2B 5920556e9e8824b6e0cb7f5c27717ed7aefc9c0a66f2b61dc039b62bf794d94f06647ea57307e554edea8efdb7513453ae2b949ccb18511fe9e10f241b0f528b SHA512 9d11298aed9e010a0ba4a55094144d16047269f9d514e82e7cf7779e87c94e2e2b11a97f2cc50677e0432e468c4ace975c4fafdc2918364fabb1f887f435cb1f
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.7.0.ebuild b/x11-terms/terminology/terminology-1.7.0.ebuild
new file mode 100644
index 000000000000..1e62124d474c
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/about-terminology"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="extras nls"
+
+RDEPEND="|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
+	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	dev-libs/efl[eet,fontconfig]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls)
+		$(meson_use extras tests)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 970ee58a1a15..bfffc95f0d45 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,5 +1,7 @@
 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 698 BLAKE2B 339df837f44a5c428b6b13639f5a55c5d34734daf59accff528f769e73187955a2a098ba1069eacdc3d8b3330130be71538e5c810aa11a09b395edb5b01a8308 SHA512 e577adb64da6f0be2635d0c1761d3d63099aaae0721cd62f05e1117224f9165af851e88987682ca1345c1d21f13d8e3e14b15059c2c98dac25b747164659a181
 MISC metadata.xml 319 BLAKE2B 69510b8b8d8658d9cc6884a960bd6b2511da1ae40e771c1edcfa836b0f1033bd4b66d5cbdb3d664108d90d0afa77de6caacb42f8f0bed5d9f8c88abeb34463d4 SHA512 013ac97bba6505168215a97c531a4fcac607b678aaf804ffdfb44611b61e930709621bedd71f7fbea06b25f8bd7000530f878cf57c419c9938afd61155ff060a
diff --git a/x11-terms/tilda/tilda-1.5.2.ebuild b/x11-terms/tilda/tilda-1.5.2.ebuild
new file mode 100644
index 000000000000..b7827af4144d
--- /dev/null
+++ b/x11-terms/tilda/tilda-1.5.2.ebuild
@@ -0,0 +1,32 @@
+# 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/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 8587100ab698..200e97594898 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-terminal-0.8.9.1.tar.bz2 943603 BLAKE2B ba8521c2e80e8979f1585eb5d9696c31c057a6ae1a9f468c8fe2e97f3a4fa5d494648b349b6c75a115918492d1b46177cf23d712d92345cab74551d68e054ea4 SHA512 c1a68300604d1db205ac52b51dfea38031dfd92b31f7530705ac6bc875c9b4f9819bdf05bca23cbfddd87f7899488ee4dab4c897ceb96efc41a44acfc298ed22
 DIST xfce4-terminal-0.8.9.2.tar.bz2 945176 BLAKE2B a37a665601c5bdb2f53cd62a0909befaabd9bca0747d477fe369f4e325be15a362d249ae675e6cf707ecc89e623b4b1d73f7a31d32f6c6fcc13e4c57684f5d4b SHA512 1402d913bcc0c050b6c83405c754cdec71cf9bb56e2e68e4396d7ce48bec6e1b0cc875ea3ea2f7a0dff8280d306519fd74a8f9d9ebca383a8f295991cb9ddd94
 EBUILD xfce4-terminal-0.8.9.1.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
-EBUILD xfce4-terminal-0.8.9.2.ebuild 911 BLAKE2B 8e43066e1f1675de545db595daae5be2b8648303e123c86228545567caa421a88eea4da20deb030052c1c5fbcb36dd65779de040ae1ff48673af7dad5dc85e3f SHA512 8cdf24598e311e9834a6e47d130325b3f793829f8bac666bd307f62bf0dfa0d06393017e533fdbac963b5610b4d54ec9234f34ba670912e3bd1b5ddeb5d61562
+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.9.2.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
index 81501fe3e7f1..3f7498753831 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.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.38:2=
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
deleted file mode 100644
index 598797937199..000000000000
--- a/x11-terms/xvt/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX xvt-int-main.patch 369 BLAKE2B 51f4bf0d118969b481d12c4113fee1d0c54ee912e048b152b3d0145d9b390a71e86cd658ec33386a42499dceab66f4eb7594158bb47f31c71a9de82fc073cc6f SHA512 76095e594646871771fbd72abe6da7a84a66ed3554534d1b0c0a81ad5648b38d3438cc5e0b40672f809380cfe2122e3a54f9c109477a7148ffdae222cd629cc6
-AUX xvt-makefile.patch 494 BLAKE2B eac194e470d97ccbb3fcb08ab3dc07068495cdfca52d72c420dc2eb706e3acc7c475ceb0b483b8b1339b470a2256c250d2c19b33a804337b29d8bcf114acbb33 SHA512 60421804cc8a892c437d2080b0348c1f32a38aa3da8186ea5b0d733f34b11a8683f4aa3c9dc909c816878c25f9caa67da08fa6a36c2ff6a303bf195c11cf45b7
-AUX xvt-pts.patch 211 BLAKE2B e2ed767f2b2e0e690e694e8dca0c4b7773bea3be1c945bf23e8877ef835e3dee78aaa984c1e7c0d1e4ed549270af8d2259243b638d9a78c341a510168d7bafc1 SHA512 ba3f910018d7e5efaf788ff9d5fe5c7ec74a088522a04c46702f83f9a60455004310e3a32547b3a2feb679056c08af07ace19ad73ddbdbc93a797da7482b420d
-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 901 BLAKE2B 081451cd6bc861d852e1e51d2c78b3e91d78db7dce9573daad8854e256777ba985f4ad773710a3d0e671c6e29d2845ce48c7876abfe0119849a66ad3779e55d9 SHA512 dae39c9c01cd41cb3bfd7f43f2b60fcfd622155b734ef8971dbe75f383b7185fe7ff7f711005908f9b0caaa69b8b0593c6c5ba429764951325b65f4082cae9e9
-MISC metadata.xml 256 BLAKE2B d8cfa88bc259cee95291c384760fad2dfd13f0973776fa55889f61befec06d0bea7953e0d6f3122eda6278272f217b8d94b536982db23815285d66074ab69089 SHA512 954fbecba4916b2b5e4b353a55a7c4ae6bd9be7190f6550ae4eb003f4037698a4576aee03847d4def6a5ca6dfbb9d145749a6fdb44b8a77477f726c92968643b
diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch
deleted file mode 100644
index a0874e45f419..000000000000
--- a/x11-terms/xvt/files/xvt-int-main.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/xvt.c
-+++ b/xvt.c
-@@ -41,9 +41,9 @@
- #endif /* UKC_LOCATIONS */
- 
- #ifdef __STDC__
--void main(int,char **);
-+int main(int,char **);
- #else
--void main();
-+int main();
- #endif
- 
- extern int debugging;
-@@ -67,7 +67,7 @@
-  *  master end of the pseudo-teletype pair with the command talking to
-  *  the slave.
-  */
--void
-+int
- main(argc,argv)
- int argc;
- char **argv;
diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch
deleted file mode 100644
index b147d9d8c2b9..000000000000
--- a/x11-terms/xvt/files/xvt-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@
- #ARCH=AIX3
- #ARCH=ULTRIX
- #ARCH=HPUX
--#ARCH=LINUX
-+ARCH=LINUX
- #
- #
- # If this line is uncommented then `Make config' will unclude several options
-@@ -107,7 +107,7 @@
- OBJ=xvt.o xsetup.o command.o screen.o sbar.o ttyinit.o
- SRC=xvt.c xsetup.c command.c screen.c sbar.c ttyinit.c
- #
--CFLAGS=-O $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH)
-+CFLAGS+= $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH)
- #
- xvt: $(OBJ)
- 	$(CC) $(LDFLAGS) -o xvt $(OBJ) $(LIB) -lX11
diff --git a/x11-terms/xvt/files/xvt-pts.patch b/x11-terms/xvt/files/xvt-pts.patch
deleted file mode 100644
index a86504ad29e5..000000000000
--- a/x11-terms/xvt/files/xvt-pts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ttyinit.c
-+++ b/ttyinit.c
-@@ -25,6 +25,9 @@ 
- 
- char xvt_ttyinit_c_sccsid[] = "@(#)ttyinit.c	1.3 11/1/94 (UKC)";
- 
-+#ifdef LINUX
-+#define _XOPEN_SOURCE
-+#endif
- #ifdef __STDC__
- #include <stdarg.h>
- #else
diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
deleted file mode 100644
index 1cc370b94d7a..000000000000
--- a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/ttyinit.c
-+++ b/ttyinit.c
-@@ -46,6 +46,7 @@
- #include <pwd.h>
- #include <errno.h>
- #include <string.h>
-+#include <stropts.h>
- #include "xvt.h"
- #include "token.h"
- #include "command.h"
-@@ -410,44 +411,6 @@
- get_pseudo_tty(pmaster,pslave)
- int *pmaster, *pslave;
- {
--#ifdef BSD_PTY
--	int mfd, sfd;
--	char *s3, *s4;
--	static char ptyc3[] = "pqrstuvwxyz";
--	static char ptyc4[] = "0123456789abcdef";
--	static char ptynam[] = "/dev/ptyxx";
--	static char ttynam[] = "/dev/ttyxx";
--
--	/*  First find a master pty that we can open.
--	 */
--	mfd = -1;
--	for (s3 = ptyc3; *s3 != 0; s3++) {
--		for (s4 = ptyc4; *s4 != 0; s4++) {
--			ptynam[8] = ttynam[8] = *s3;
--			ptynam[9] = ttynam[9] = *s4;
--			if ((mfd = open(ptynam,O_RDWR)) >= 0) {
--				if (geteuid() == 0 || access(ttynam,R_OK|W_OK) == 0)
--					break;
--				else {
--					close(mfd);
--					mfd = -1;
--				}
--			}
--		}
--		if (mfd >= 0)
--			break;
--	}
--	if (mfd < 0) {
--		error("Can't open a pseudo teletype");
--		return(NULL);
--	}
--	if ((sfd = open(ttynam,O_RDWR)) < 0) {
--		error("could not open slave tty %s",ttynam);
--		return(NULL);
--	}
--#endif /* BSD_PTY */
--
--#ifdef SVR4_PTY
- 	char *ttynam;
- 	int mfd, sfd;
- 
-@@ -464,7 +427,6 @@
- 	}
- 	ioctl(sfd,I_PUSH,"ptem");
- 	ioctl(sfd,I_PUSH,"ldterm");
--#endif /* SVR4_PTY */
- 
- 	*pslave = sfd;
- 	*pmaster = mfd;
diff --git a/x11-terms/xvt/metadata.xml b/x11-terms/xvt/metadata.xml
deleted file mode 100644
index 41c6dfc7341b..000000000000
--- a/x11-terms/xvt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A tiny vt100 terminal emulator for X.
-	</longdescription>
-</pkgmetadata>
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
deleted file mode 100644
index 196cc98c56a1..000000000000
--- a/x11-terms/xvt/xvt-2.1-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tiny vt100 terminal emulator for X"
-HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
-SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
-		mirror://gentoo/xvt-2.1.diff.gz"
-
-LICENSE="xvt"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}-1.0
-
-PATCHES=(
-	# this brings the distribution upto version 2.1
-	"${WORKDIR}"/${P}.diff
-
-	# fix #61393
-	"${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
-
-	# CFLAGS, CC #241554
-	"${FILESDIR}/${PN}-makefile.patch"
-
-	# int main, not void main
-	"${FILESDIR}/${PN}-int-main.patch"
-
-	# fix segfault (bug #363883)
-	"${FILESDIR}/${PN}-pts.patch"
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin xvt
-	doman xvt.1
-	einstalldocs
-}