gentoo resync : 29.12.2022

38 files changed, 351 insertions, 664 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 9f7b2e629b41..2d1995aa3b46 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 78e424b4edb6..28d531a66243 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,9 +1,8 @@
-AUX 3.42.2-fix-build-with-meson-0.61.1.patch 1024 BLAKE2B bce6f28ff01f895a2890b43fd56eb4c9e69dacf547c3eddd13593cce9d2c84c6b0e3346c607bbb21a8bd059e25e88f035e5918bc1d021cddcd2830baf43a5b5d SHA512 93561c9eb344bebec6106b56212258bb0086225957351c0211eef6515107bf8136b65e734b328f4824f8586f80d8a07612a605c1b7f5c4515ce38d33a2f6429e
+AUX gnome-terminal-3.44.1-fix-missing-wexitcode.patch 727 BLAKE2B 5aa58dea55d8370d66f1b356bad0f8add6dc01359387b6e45c093800276ffe3a7c0beb125935afb67cd093397ed5779ba123ba61e572f34d0fa7f28bc7cd8b11 SHA512 b03c250e1d25464dc483b6a9398ade5cde4d40ad2ddb59ee709f25bd07101f7ba22faf98e519ee7e7fb8a4d20a56d9fc08e13d3b5546d5749ffa2882156a05f4
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
-DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B e0400f960064907c84a059b2210a9299e353b280e4bbe2fb98a887f9806fc2eb5f7de9d3e6dee243f6297275479ec546d47292bb30ea02e8f4a887fafbe04e71 SHA512 4afab38bff15963e88bc756914b5c379634c68d59f0be1189d969ea0a8b7f3f6c0a077199455cc4c2eca96e5c3df06bddebdc32b786aaba3a885e21cb710f210
-DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66 SHA512 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e
 DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
 DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341 SHA512 0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6
-EBUILD gnome-terminal-3.42.2.ebuild 2903 BLAKE2B 141f3a347695d2f6f740aa889bd447f15c28b03810823550aa182262a8da4a9a506d036bf1cb4e5399445f7494c68758d59deb6978364fa4ccd21f42759cab4e SHA512 73effc80fec9f29beaa6fe5d200a7c3b4651274e61f0a05116fbe07d84b7f486c1227d9596a652f4fead335d3275ba5b56083952b49be744520bb227bda1b636
-EBUILD gnome-terminal-3.44.0.ebuild 2901 BLAKE2B 7207aed27e888f8069c147d298c65b4678f3fdb9fa1b5ba846503b40dd951eab5d91310e7e15d38ef05e36b1666611c45ba35e5fb3abb975163683fc77f7af53 SHA512 f9890e7bd3ac16b9c81f729b8d630e3ce969d67ac5733b25b8e244ae3a8319d052e2346fd8fb22a9049af14fe125a5b7e450f95bd4a0d727740a8f1f3b71c6d6
+DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
+EBUILD gnome-terminal-3.44.0.ebuild 2898 BLAKE2B 2f4426d25fd36980f6de0d37c0268f8a27d4611ad5bee9e9093071bc69fad56f18b9c2e7e7ab60e0456c4f9c47d9db5eb6d383c38107e641cabdcb49bbc6fdea SHA512 171eeaa4ac719e5f80e42e3c2807259a5661d14bcd70d1a9acdc3c12e42d11434b97de5eccaa1aceecc59d489f400a312da79025551ab2c0bf5e35225cbdf7e3
+EBUILD gnome-terminal-3.44.1.ebuild 2956 BLAKE2B f6dab5c6aaeac760ea7e473dd1e8db2ae8d47cddd130929e60450d63178a0dfd0fd83c30b97933f5beba3074fdfc38b257567308ce52183a8352129aeec5e48e SHA512 4bc99354f1fc22dcf48bba401ce75d7204a48913d12b0ec7f2497f65ed8728581158d5647a7b1af6cadda8dda514c17899e4268067807578b7da50406132f48d
 MISC metadata.xml 418 BLAKE2B f4066a783c4612bc4d4b0883a5f74e626c2fe8716ba3cf78b2f5ac17aa803e3bfd3ed0ad6c88bd4142163f2f0f8b6e37638ba3c13fb4f199c7a667d9220d7f3c SHA512 b3bdd052a5038b59c040633331cb9a00da50db1ac6af26b0dbeb5b94a91ec6ada15e493101db1882fb194af590301e9965a400db3f1d29800589ea2256c16636
diff --git a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index e0e9d39204f2..000000000000
--- a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403
-https://bugs.gentoo.org/831940
-
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 14 Jan 2022 11:33:32 +0100
-Subject: [PATCH] build: Fix for newer meson
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -18,7 +18,6 @@
- metainfodir = gt_datadir / 'metainfo'
- 
- i18n.merge_file(
--  gt_dns_name + '.metainfo.xml',
-   input: gt_dns_name + '.metainfo.xml.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-@@ -27,7 +26,6 @@ i18n.merge_file(
- )
- 
- i18n.merge_file(
--  gt_dns_name + '.Nautilus.metainfo.xml',
-   input: gt_dns_name + '.Nautilus.metainfo.xml.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-@@ -40,7 +38,6 @@ i18n.merge_file(
- desktopdatadir = gt_datadir / 'applications'
- 
- i18n.merge_file(
--  gt_dns_name + '.desktop',
-   input: gt_dns_name + '.desktop.in',
-   output: '@BASENAME@',
-   type: 'desktop',
-@@ -57,4 +54,4 @@ meson.add_install_script(
- 
- # Subdirs
- 
--subdir('icons')
-\ No newline at end of file
-+subdir('icons')
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch
new file mode 100644
index 000000000000..aff2237db902
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch
@@ -0,0 +1,21 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+Someone already tried to upstream a similar patch to gnome vte that
+would fix this but was rejected by maintainer. More info can be found
+on the link above.
+
+W_EXITCODE is missing in musl thus causing gnome-terminal build to fail.
+This patch checks if W_EXITCODE is not defined and then defines it.
+--- a/src/terminal.cc
++++ b/src/terminal.cc
+@@ -47,6 +47,11 @@
+ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free)
+ #define gs_free_options __attribute__ ((cleanup(gs_local_options_free)))
+ 
++/* fix for musl */
++#ifndef W_EXITCODE
++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
++#endif
++
+ /* Wait-for-exit helper */
+ 
+ typedef struct {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
index a5297be2d0ec..de2616fb840b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
index 2dc8e8704803..079de738bb03 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="A terminal emulator for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
@@ -11,15 +11,15 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/g
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch.xz )"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
 	>=dev-libs/glib-2.52:2
 	>=x11-libs/gtk+-3.22.27:3
-	>=x11-libs/vte-0.64.0:2.91[!vanilla?]
+	>=x11-libs/vte-0.68.0:2.91[!vanilla?]
 	>=dev-libs/libpcre2-10
 	>=gnome-base/dconf-0.14
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}"
 # itstool required for help/* with non-en LINGUAS, see bug #549358
 # xmllint required for glib-compile-resources, see bug #549304
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
@@ -40,16 +41,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
 DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
 	notifications of long-running commands finishing, you will need
 	to add the following line to your ~/.bashrc:\n
 	. /etc/profile.d/vte-2.91.sh"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-fix-missing-wexitcode.patch
 	if ! use vanilla; then
 		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
 		# Fedora patches:
@@ -59,7 +57,7 @@ src_prepare() {
 		# Automatic title updating based on currently running foreground process
 		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
 		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
-		eapply "${WORKDIR}"/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch
+		eapply "${WORKDIR}"/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch
 	fi
 	default
 }
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 6352c7763e1c..6bedd3cf1ab2 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,3 @@
-DIST guake-3.8.1.tar.gz 1127132 BLAKE2B e91f74bf119c76ad214b5c29bceb4fe18f19c97f14dbb2973c6118bbb9affc06e919c56e0cd24f96b710d9c2468006289fcf1c13a2050e93cc01972f0c9ebe99 SHA512 5fbf4cc37bc501e4533bd27c1c7e1f783e570457867289702ab2122fcb6a55708df151e4307c4cf84a242ac1d2874ef5e8eb9411318e24eca140102a42b426f4
 DIST guake-3.8.5.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb
-EBUILD guake-3.8.1.ebuild 2068 BLAKE2B d6fc6bdfb04a232954da1ca25254eb5482bea88cd232dbeae42b9a8574c7545a7393fcb6dd4654f3805c22f053c91724740fe22614760e9e7260efe22971a3e6 SHA512 dbcf5ade306799d3b5956c78d879858e0fa3b246cb3e10a822ed9be6046764e3a1d6615d6857451d437c9fe6053fa07619c523633a6dba2a226946f688676803
-EBUILD guake-3.8.5.ebuild 2313 BLAKE2B 1133a35c54c913b85b7fcabf9d7023d26476c70bc87a1f7c0ddbaac8e038d8a32a463848829eb09d15dcd022b39cada8eaf2b5bf3b432cce829b2c695734e866 SHA512 3f29cfc418a31cd3cf4449111cd70afc0963516230fa30954c4b1a0c3fcbe275dcce14e4c53507098fe389728d3ee6faa82c7151f7c76395b5486bd9247658a0
+EBUILD guake-3.8.5.ebuild 2310 BLAKE2B 7f7c37278eb68c75c0e831001012967d4895a69493a657aa33f37bf000bc31cadaf32faa360ca30fdb4174ebbea77ef35afefd6b6b854f816a6411289602d502 SHA512 4e358bf44a1e3765436df457ffe9c893d2d877261d77525f19653c231f3af7a32f1aa088515b2f6ce5cb14d1a0c300697ad4d2f6b9bd9596679dc4eb083f4311
 MISC metadata.xml 418 BLAKE2B 4eaf1e46ca71463bf5e7c54f31941d391851b2415872e06e41bc97b8d2278ac58c544ff869a5050e4d20abc670c20d4c7d364a8d68a7d9fb21baae2fa061af69 SHA512 52a8f383fc6bd2757dfc41fd0758c2b47ee177ecf49bf840a4e8ee8b32421a8f3c6a08270fa72f8cd2d87f8bfe663390ae18f17ea9ad18715099fe575de726d1
diff --git a/x11-terms/guake/guake-3.8.1.ebuild b/x11-terms/guake/guake-3.8.1.ebuild
deleted file mode 100644
index c7b0ddb9600b..000000000000
--- a/x11-terms/guake/guake-3.8.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="http://guake-project.org/"
-SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
-IUSE="utempter"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	dev-libs/keybinder:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/vte:2.91[introspection]
-	utempter? ( sys-libs/libutempter )"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pbr[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-		)
-	')
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	emake PREFIX="${EPREFIX}/usr" prepare-install # paths.py.in -> paths.py
-
-	export PBR_VERSION=${PV} # needed if using github's tarball
-}
-
-python_test() {
-	# - uses /usr/bin/bash if SHELL is not exported
-	# - pytest-xvfb fails with Terminated, virtx alone works
-	SHELL=${SHELL} virtx epytest -p no:xvfb
-}
-
-python_install() {
-	# done here so tests don't use the system's
-	sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
-		-e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
-		-i "${BUILD_DIR}"/lib/guake/paths.py || die
-	rm -r "${BUILD_DIR}"/lib/guake/tests || die
-
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-{locale,schemas}
-
-	dodoc NEWS.rst README.rst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/x11-terms/guake/guake-3.8.5.ebuild b/x11-terms/guake/guake-3.8.5.ebuild
index aca9e52d877b..b0161dd6782f 100644
--- a/x11-terms/guake/guake-3.8.5.ebuild
+++ b/x11-terms/guake/guake-3.8.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 1a94f3eb05bc..eb1913486b48 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,4 @@
-DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf222207fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f
-DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8
-EBUILD kitty-shell-integration-0.24.4.ebuild 1346 BLAKE2B 87e2fda053ec3dcf357c591832a87df3ec8ff2865ac905e99ed9b9745a5f658232fdeb4e39c38d8775f0faaed29d6aa14a3d208171a7a54bec2252e6d7f41f03 SHA512 797836fe075a96bdff52b4859f9babe31d4b476d28c13140d2240b56624c0677b856796f33e11ba3a147b52241bb75b8efa1866c5f4bbad758402c0c8b3689a0
-EBUILD kitty-shell-integration-0.25.0.ebuild 1478 BLAKE2B c9751a6a82bf10a629f06b6099dec2b6d08c0e4d961e6c8105ce7e975e849161bb09a8990a0ed971f96e4ea0787b87e64074d705e807fba6dbef3c3494ea495b SHA512 7f5f6d48619adeb300727cc9b30ef97403a2f6da00a45661cb8cec489ea9ccab02a48ba502d8099175342d832ec9ad98f82aff87bf5ef5d1df50ab7971d8fcea
+DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
+EBUILD kitty-shell-integration-0.25.2.ebuild 1476 BLAKE2B d07578dfe48ab8aa3ff01b4ed91e0e9e1d357f00d0931d2a4beaa8659c843b130108ce925bb37fdb4679048e1d9bd90a64aaa95150eabb3e6c9b195e504a1bc3 SHA512 0f74797060755fdf9430efbbe5e7d56182b38dafd1d9c8bbf25d01e932e1bc95fb5e774064667b66f8beb8ab1e0772174746506bb9b156b88131dd23a14d82c4
 EBUILD kitty-shell-integration-9999.ebuild 1403 BLAKE2B 9f1e4aebc1103678d42ba5809c41848b2ace36e2ed0137bdb0f30048cb4372c61f80e509a8087a52b149fe25115ca8aaa511d4697459e1087bee65788055dd85 SHA512 d7674435c3d3d9cfd04d47889f9e0f1cb4e60a6dc3506529829b3782e958fc3cb18fe8b0a25463725128106d6ca8308a17ae961b184e13682a1b05852e22ce4e
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.4.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.4.ebuild
deleted file mode 100644
index 4dc577e72c2f..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-src_compile() { :; }
-
-src_install() {
-	# install the whole directory in the upstream suggested location
-	# for consistency (i.e. less variation between distros if someone
-	# ssh into Gentoo), then set symlinks to autoload where possible
-	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
-	insinto /usr/share/kitty
-	doins -r shell-integration
-
-	dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash
-
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
-
-	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
-	# zsh integration is handled automatically without needing to modify rc files,
-	# but may require user intervention depending on zsh invocation or if remote
-}
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
index 4c3e987c411b..e4411a8cbd8d 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 src_compile() { :; }
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 790d380c99d1..94cbbf0e0946 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,4 @@
-DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf222207fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f
-DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8
-EBUILD kitty-terminfo-0.24.4.ebuild 618 BLAKE2B f28c7bc4aff671b8f2df8094f8abd881b9bfe0580fd84e302fea050235f5932c34636e407d87afb34ee1fe2e7006e1dc1a1902d9a914cfe4aa7372fb7d18d368 SHA512 971734b7d326df234fff57c14a17ce6da9e9f97dc86ea412b9521c76e0c06fceadffcb708db781d85d5529a6ec9c829dcd5f8210c36c06b73f6ce05b9be729b3
-EBUILD kitty-terminfo-0.25.0.ebuild 620 BLAKE2B 84d17d934610d200dd4d556462255c9f6ee5fa90553b81db4dc764a9bb4026d74b874f19ef92e3aeaaaf2856021870199518b66e633212896aa5b9d4f5255b8a SHA512 a9dca5ba4c276df302fb5df4507294bdac4609398ed441b242dba8459d2d58306c29a49373278f428c1d86a3e9e426f3605153252aebe9bfac5af00e088fac18
+DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
+EBUILD kitty-terminfo-0.25.2.ebuild 618 BLAKE2B f28c7bc4aff671b8f2df8094f8abd881b9bfe0580fd84e302fea050235f5932c34636e407d87afb34ee1fe2e7006e1dc1a1902d9a914cfe4aa7372fb7d18d368 SHA512 971734b7d326df234fff57c14a17ce6da9e9f97dc86ea412b9521c76e0c06fceadffcb708db781d85d5529a6ec9c829dcd5f8210c36c06b73f6ce05b9be729b3
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild
deleted file mode 100644
index 35ff98034a87..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-BDEPEND="sys-libs/ncurses"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/terminfo
-	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.24.4.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
index dc5bddaad255..dc5bddaad255 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.24.4.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 502885a1ecdd..6f04c990b8b6 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,9 +1,6 @@
 AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0
-DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf222207fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f
-DIST kitty-0.24.4.tar.xz.sig 566 BLAKE2B 7a6513e6296b8c4a1781cef6bcea865b8187fcd8d2abd822627a401f943b1fb1d1432935fdbdc348c3062b07c91a85adcec280be64676782492f6245c72ed89b SHA512 34d24eebf08e19a96f715afb4a570746e1b7bcace6b6226dd596b2886b7bf3bc34b9842d0686c07a655b6b870da77cf25adf6d577dac811a01a70db8c477723a
-DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8
-DIST kitty-0.25.0.tar.xz.sig 566 BLAKE2B 94d082c4520d1a25c9ea104df94876e342cc84fcc049ebc0b6061fe71206e98c5b5f8aa841ed636988b33f72f122b2d84f39e10d319c1d56c9cbf37d1b6fc064 SHA512 827546ea38af4babf431031184203bd11853469f87826a6b86f45b0b7d087e7523eee935908ca5a5e4a7a87e01d75114ed348ff39a9a0f6329d372fac15841af
-EBUILD kitty-0.24.4.ebuild 3237 BLAKE2B 58bca75ddc8182f6ecfab14bd23173357e4b2709f76a7208f5e7262568ec041da78e1d37dcd504c80b3e0c2a164ffff63486c03e28ea95f19d36488883902b95 SHA512 dbc6576673b3af2839ebecf915d708eb48ad98335a8506f1c56f8e89912c40d346d19afa3c45deff99deaa6fc763cb2ac036792f17bf710d8dde0a8315686c3c
-EBUILD kitty-0.25.0.ebuild 3420 BLAKE2B 60f7d4366201c91c2224cb188dab60955b9b7fdacbdd98c8ccaf31343f74ee2904b9a8ed048c65169f1579c40b918f115d032cefcab7d8f7c309ea7719c9fa1b SHA512 770098db045569ffe16e827f0a3d05feacbbffb36549a855aeb79e48dae3cd06f588df05f8f502a58fb671e649486a52232a1a61b71009c90b78ae20025cc9bc
-EBUILD kitty-9999.ebuild 3420 BLAKE2B 60f7d4366201c91c2224cb188dab60955b9b7fdacbdd98c8ccaf31343f74ee2904b9a8ed048c65169f1579c40b918f115d032cefcab7d8f7c309ea7719c9fa1b SHA512 770098db045569ffe16e827f0a3d05feacbbffb36549a855aeb79e48dae3cd06f588df05f8f502a58fb671e649486a52232a1a61b71009c90b78ae20025cc9bc
+DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
+DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
+EBUILD kitty-0.25.2.ebuild 3519 BLAKE2B a2e4526d6449e83e68dd31370fc1b8df7037c7439dd9881f7214addfe7d5ea6e6ebedebded50fcb3b74176c6a469ee2c2be0bec6876e4c14e13fe7e50e48085c SHA512 aea90a245183698729866da0c687e943f636cee01cfc609bd6694e88cc912834e34a69cdca2305146774805bb0fd08307dc0807649bda7c544b85ef9d8475e6c
+EBUILD kitty-9999.ebuild 3521 BLAKE2B 46b78faae65e9a50fd9bcf5747922418da5c605e62e8c90cdac9b333b951314b79e68ea5817b4867e3ffb171061692afffb8fc680149066f4f2c801d0c6341f1 SHA512 7f6f3de88a3d5a87a07946c78bc0318a80c847fc8e3e28dffdff7d4d972662c0d8cd3d0eaedcd4714f1e2b121dd1ce7432250d16bc78b51d96eb19f76c02f5c5
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.24.4.ebuild b/x11-terms/kitty/kitty-0.24.4.ebuild
deleted file mode 100644
index dffd2c441579..000000000000
--- a/x11-terms/kitty/kitty-0.24.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
-		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+X debug test transfer wayland"
-REQUIRED_USE="
-	|| ( X wayland )
-	${PYTHON_REQUIRED_USE}"
-RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libglvnd[X?]
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libxkbcommon[X?]
-	x11-misc/xkeyboard-config
-	~x11-terms/kitty-shell-integration-${PV}
-	~x11-terms/kitty-terminfo-${PV}
-	X? ( x11-libs/libX11 )
-	transfer? ( net-libs/librsync:= )
-	wayland? ( dev-libs/wayland )"
-DEPEND="
-	${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-	)
-	wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-libs/ncurses
-	virtual/pkgconfig
-	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
-	wayland? ( dev-util/wayland-scanner )"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23.1-flags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die
-
-	if use !transfer; then
-		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
-		rm -r kittens/transfer || die
-	fi
-
-	# test relies on 'who' command which doesn't detect users with pid-sandbox
-	rm kitty_tests/utmp.py || die
-
-	# skip docs for live version
-	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
-}
-
-src_compile() {
-	tc-export CC
-	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
-	local setup=(
-		${EPYTHON} setup.py linux-package
-		--disable-link-time-optimization
-		--ignore-compiler-warnings
-		--libdir-name=$(get_libdir)
-		--shell-integration="enabled no-rc"
-		--update-check-interval=0
-		--verbose
-		$(usev debug --debug)
-	)
-
-	echo "${setup[*]}"
-	"${setup[@]}" || die "setup.py failed to compile ${PN}"
-
-	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
-	rm -r linux-package/share/terminfo || die
-}
-
-src_test() {
-	PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \
-		${EPYTHON} test.py || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/.
-
-	fperms +x /usr/bin/kitty
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/kitty-0.25.0.ebuild b/x11-terms/kitty/kitty-0.25.2.ebuild
index 16dd62bce059..b8455230a169 100644
--- a/x11-terms/kitty/kitty-0.25.0.ebuild
+++ b/x11-terms/kitty/kitty-0.25.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit optfeature python-single-r1 toolchain-funcs xdg
+inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -15,7 +15,7 @@ else
 		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"
@@ -29,10 +29,10 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}"
 RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
 
+# dlopen: fontconfig,libglvnd
 RDEPEND="
 	${PYTHON_DEPS}
 	media-libs/fontconfig
-	media-libs/freetype:2
 	media-libs/harfbuzz:=
 	media-libs/lcms:2
 	media-libs/libglvnd[X?]
@@ -71,7 +71,9 @@ PATCHES=(
 src_prepare() {
 	default
 
-	sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die
+	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
+		-i setup.py || die
 
 	if use !transfer; then
 		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
@@ -82,7 +84,7 @@ src_prepare() {
 	rm kitty_tests/utmp.py || die
 
 	# test may fail/hang depending on environment and shell initialization scripts
-	rm kitty_tests/ssh.py || die
+	rm kitty_tests/{shell_integration,ssh}.py || die
 
 	# skip docs for live version
 	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 16dd62bce059..531d4fb7df94 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit optfeature python-single-r1 toolchain-funcs xdg
+inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -29,10 +29,10 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}"
 RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
 
+# dlopen: fontconfig,libglvnd
 RDEPEND="
 	${PYTHON_DEPS}
 	media-libs/fontconfig
-	media-libs/freetype:2
 	media-libs/harfbuzz:=
 	media-libs/lcms:2
 	media-libs/libglvnd[X?]
@@ -71,7 +71,9 @@ PATCHES=(
 src_prepare() {
 	default
 
-	sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die
+	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
+		-i setup.py || die
 
 	if use !transfer; then
 		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
@@ -82,7 +84,7 @@ src_prepare() {
 	rm kitty_tests/utmp.py || die
 
 	# test may fail/hang depending on environment and shell initialization scripts
-	rm kitty_tests/ssh.py || die
+	rm kitty_tests/{shell_integration,ssh}.py || die
 
 	# skip docs for live version
 	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 96f61b52ec16..7da01e9fc2ee 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST mate-terminal-1.24.1.tar.xz 2032824 BLAKE2B d5c6e97fbb22550f8caf0042422ea9104b947f04e3dacb42bee4e6d1dcdbd59c8cb6765889ac86ea5850ac5ca293a9f796aa5c41d5e1707df2bb37670b3832f3 SHA512 83090667f823605ef0681efeff66c30729df83e7335c100171017ee5f2e819ec0bb219fdc71ed54a27c4a846fcc8db01c4462ef5b9c1e3f31d9c5838427566dc
-EBUILD mate-terminal-1.24.1.ebuild 756 BLAKE2B 9a4a58b9e8fe498a3b6107c4c0718c65bca822e2ac3e52c306e8e683db4993848ecc2ba14c67f8ea23dd33a5b4b313f0a5bf58a174b89fd118a763c902b15f79 SHA512 0267b4b6e42f211833478c5a72dd8b2dbedc4924c9a02951138d9bb55b610807803660a541f8ee9bf82ec4f058290c40ecef385a13a081f872b207d387a86d81
+EBUILD mate-terminal-1.24.1.ebuild 763 BLAKE2B 3819d2532558d6ad6fe26e54959848f4c058ca35db2b9cb73d2374d0ef9250d67a71db62dab6256b5b429f3bc86eae4b845a1941974f66afb9818e648bc52594 SHA512 0b7a92e1c63c2cac3790365194d6ecfd1312a4deb97bfb3f504987830bcc6935f5daf1cc50ee229178e099fcf437749d2ddf15083d49a68eccd0a0b5af942bf0
 MISC metadata.xml 343 BLAKE2B a551b6d036d45f08c7a3c925b92a5ce2a7b17435b6df28d410abd318f21f08152aa31a70a6b477085777be36a410f1a1d8b1ca40ad95ebeb7afce2486eba6767 SHA512 ce620470e64f45c91502a26a9847cec26c71b4994a45a68a07cbf9f8f88a2d0586716005f3da729fa84941139269b7494d7c7ac6fb0449b627817f1d13037a08
diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
index af088b2a1eba..ddf348ab3a52 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="The MATE Terminal"
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 84ab58e047af..e506b6ad7d1c 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,7 +1,9 @@
 AUX qterminal-0.16.1-appdata.patch 309 BLAKE2B 3aef2327582b603056ea7061fc1f5103e0ad5130d3e8c7f5b4bbe111d8fd0cb4be4a5e29b434395acb1fdf03635681a33965e74df125da0eaecd0fb8b0b7fab5 SHA512 f67478af84a9fb14a7e95e030cf1695febb4b0e7e47949272dd4ebae0b7183f23abb37089017c2b69ced33d3295f9c37035576b913478e347aee01550ee2a80a
 DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57
 DIST qterminal-1.0.0.tar.xz 201644 BLAKE2B e294c575590964710aeb4b433db51844f75fe0f73b966ef5acde148b3f779aa89ae3c5f1d73d3a3877b14d932150702ff871267399cbcab3b4aefc445c942922 SHA512 d3fd04ef94d683aae641367e56185723cf32d2390ab505b956c6736fe674144f6f270ef0def43b1f2d3aec659a2a7735cfb3713da07f49697823f9384572b3a0
+DIST qterminal-1.1.0.tar.xz 209908 BLAKE2B 1ff732f9ae2c84ef063c97679fb4acd1c4b0eb9a981ab99aba689d1f48496fa8721b5b7bfbaae3d7e440e74385d47b4dddb834685f03d2b308a597329af463c1 SHA512 422ba05ebed00ac7f355cd9599f930f861141b9f69ff3e475ac9bb1e74aa02b4787d18fe52c03350dcb3b9b579d67b67d5d4e3b86aa204084d16c1097dc3b291
 EBUILD qterminal-0.17.0.ebuild 843 BLAKE2B e3ebbd0ddef4d7288cf24702325ae411c8e76e6247b4a94823e830b09c60b32e6fa14ec778f0084a9639349e200bd8af09f8c19b16e950605cecbf5b7b44fc43 SHA512 01fdff5baf310fd829ba096513ac42185b86d460a518db3e4be7c77c80c0795174221f21a696b824edda94b0496a507bb9f274e8eda4bd228d0cde79236fca9a
 EBUILD qterminal-1.0.0.ebuild 882 BLAKE2B 894b1102baef7fc58c16a91186f064ef486c3b7e1720a4d28103d1fa5de2ba17e36b990e866387276aaa6ce59edb9769df11a5eb9109199b1947cc53ba1bf58c SHA512 4777092761998de3d33efd39349c4678bc3fee31b4fc200dd2fd9ef79b1287a278110d763ed6549ca81e4d26ed502f9274cd25b511d8603a1e9cc5ac2edce0b6
-EBUILD qterminal-9999.ebuild 885 BLAKE2B ecca7cd2757a8e30fb2da4d22937dc63d66745fd7db130274bb4c1a8346951533d9c01df0fe7ab0bb2e792d94be8ccadb7e9b1e76c536a67ab5be18a62b767e3 SHA512 ef14c6d807a6d20624aa9b6415b235a9d76adaedbc9c5a8221b98b9211c9a567258707ccdfc598c5941b7dbced3c0afd9f5cdafc156c6050cd70b9bbcba7d6ab
+EBUILD qterminal-1.1.0.ebuild 827 BLAKE2B c44255577597cedd00bcc7f41c288cd657ae737e01d5443d2a9950a660ec183a9de854a13855111212a067f6e2e9e533ab63dcc70a2341902c3b0afe606a2262 SHA512 15b9ad7127da3d6bd4abe2efaca41df5a6e6b86753b352ae211f036bb1b16b2a8e919ff62224848d9b75df9d622f05b7fb676ecf236d7fa856734fbce35ca45c
+EBUILD qterminal-9999.ebuild 827 BLAKE2B c44255577597cedd00bcc7f41c288cd657ae737e01d5443d2a9950a660ec183a9de854a13855111212a067f6e2e9e533ab63dcc70a2341902c3b0afe606a2262 SHA512 15b9ad7127da3d6bd4abe2efaca41df5a6e6b86753b352ae211f036bb1b16b2a8e919ff62224848d9b75df9d622f05b7fb676ecf236d7fa856734fbce35ca45c
 MISC metadata.xml 332 BLAKE2B 624f66a3b8a745cfa2f4486cd22cf18f2f650d3be2b9b702527983f7a16bd81adeed917daa5520fa6de32191d30b6cf590eeb12e83e19032d7ee720eb07dcaf2 SHA512 c4e36da6992031391c905fb0908fcf1fcb2061ba2999814e8b33a194dde60bde987ef5689d46ef8a1bea67e8094dcb30fee7749d29f11bb560aec5a6a86742f6
diff --git a/x11-terms/qterminal/qterminal-1.1.0.ebuild b/x11-terms/qterminal/qterminal-1.1.0.ebuild
new file mode 100644
index 000000000000..894a3242fa81
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-1.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND=">=dev-util/lxqt-build-tools-0.11.0"
+DEPEND="
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtx11extras-5.15:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 34e20dcedd2a..894a3242fa81 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ fi
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
-BDEPEND=">=dev-util/lxqt-build-tools-0.10.0"
+BDEPEND=">=dev-util/lxqt-build-tools-0.11.0"
 DEPEND="
 	>=dev-qt/qtcore-5.15:5
 	>=dev-qt/qtdbus-5.15:5
@@ -31,8 +31,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" )
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 871d83d7263c..2621514e5f1a 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,5 +2,6 @@ AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
 DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B f92235bacf34ec5bfe2400c6bbfc8bbdee3867531fac5129fb59b84459101f2d673e3a6699eecf1fa0d19c33d30467bb043010bd19737c2bc0461cea861c71a7 SHA512 a916b9718801bb015d14bdec2eede24c89101d5ea36d22131b7d34f8dad48b9db9e79811645ce571e3c95c9e4b2f18d6b8508f519de7ff54c4246c5f7b546af2
 DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c SHA512 ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
+EBUILD terminator-2.1.1-r1.ebuild 1713 BLAKE2B 6b91af54ae6df2e83058d653b9cf900d2a766a9761ef27194a69d13a9456603fa2e5d4005b4be56c462c36fcfce8c179350fb0da01f537fc0cb10a7381fa2801 SHA512 923097df4aabeab251db09ea7c315f4f901e444ddeec61f2d7ccdb68a7d81f70c97f8f98d8528cae3d3934a68be1290b78f6bddc835a5e5d99c9aedc754f3990
 EBUILD terminator-2.1.1.ebuild 1674 BLAKE2B 5fb09a6c2b9dc319af7e34a3fa1e6aa10ab4aeb39f856651b133ef4b594d02d1a0d09425eeb3d4e3a9e2ff5fb5aa59a3300fddb5c1f5c7e78160e5fe95673cf3 SHA512 8a223dc859dcbc9c656b92be8cb9e78979f936a830e0d1c9205b36ed036795d0c9214e3a4a4a44b8e33c1ba383c778656dddfedd717ce6fe07699f59c59c577e
 MISC metadata.xml 859 BLAKE2B 315ffd413597c4b0b5e847e4869c330be0f9092f3c272dcb362fdce1b89423a65a887a6e63b2770253aa2125cc3e6368adb058491f0fd420594d315047279c83 SHA512 2a56b28dcc37b9697c778de2482b7e191fc83907f1e8930a015b3e60a8a672faeec18a6602565ad60c0883f7857b956a1abccf06800f4a4276f72cd643449030
diff --git a/x11-terms/terminator/terminator-2.1.1-r1.ebuild b/x11-terms/terminator/terminator-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..e6ed9f78c840
--- /dev/null
+++ b/x11-terms/terminator/terminator-2.1.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature verify-sig virtualx xdg
+
+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
+	verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~riscv x86"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas[introspection]
+	x11-libs/gtk+:3
+	x11-libs/vte:2.91[introspection]
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	test? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		x11-libs/libnotify[introspection]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-terminator )
+"
+distutils_enable_tests pytest
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc
+
+PATCHES=(
+	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
+	"${FILESDIR}"/terminator-1.91-desktop.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "D-Bus" dev-python/dbus-python
+	optfeature "desktop notifications" "x11-libs/libnotify[introspection]"
+	optfeature "global keyboard shortcuts" "dev-libs/keybinder:3[introspection]"
+}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 8a62bbfa37c2..6724cbba6fb6 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,5 @@
 DIST terminology-1.11.0.tar.xz 4984128 BLAKE2B 059de50cd9e4c94f628e992f44909a1f2dcd79ce01c48cbde2f043f08a2e22c6ded1e7de61f84bd8b37961191501a4ec32ca027c32994a1d7b1929a2270c977e SHA512 9c26c383760a497cc9bbb36aa8bd154599a708cb6bbede26fc2f5c6d6459a51d566066c4d9b64198afaadd94463ce83bca4b392551fd4ff3e68d8a4383d6c403
 DIST terminology-1.12.1.tar.xz 2722144 BLAKE2B ce6eea2fd6efe8a4a6d654f8e7899336b3bb7a1d2f1728c2ac2f1b367972c8b222e665309e2b704dd1f3bb774784d218789bcd8134348893a265c0e50fa855d9 SHA512 036f1e516d5f9c44185fc417266022bb4a3c34839451b2bd7ab64c9610e71cd1690faee014cf8364ceac12261cb9b57501446a3e6e58ac13f98f11064498a43b
 EBUILD terminology-1.11.0.ebuild 1250 BLAKE2B 206fdcb16cab6a35565306e500aa6981b33ab90c818cb7a92ce3f21acc111185a1c8c2690edfa4e205af97f6e8065150f00dd6ea618cbd338258f54c8ff27702 SHA512 f0e45dd106dd9894eb18690024e3528df8982be2b8f76e649ff2ed10ff54bad730d3a32820a8917720b9650834228151ef310d496c5b644d2f6fcb34c3eff414
-EBUILD terminology-1.12.1-r1.ebuild 1115 BLAKE2B 73c15031ebd6ab9d258378c0ae50918578f1448d69237e0d11091fefd24064050232c932bc6b1bbdd242356910f8263c89aedfa818dff75e39b5c8823a9dfc81 SHA512 b2a825942771e13dd2e42eb90193ceee0e2d7ae5d41c46bbdaf5d5ba7af88cca03aa62151d0f9d4642ba0f024e48544b0e81e15c6fc589c54ba5059cca5eb194
+EBUILD terminology-1.12.1-r1.ebuild 1115 BLAKE2B 2f66a03a7fc21fc8894c94f9e1a55a3474324f2e5bf238ace58e01c6111c342681844d26efb5a83ba34304af484f6a63aabcbe57af5e161574c761260ad3f28a SHA512 c8190862a7569dc949568de7e670cf1a932648dffe15c5363a74b9f82a23a90af846be9160c16b586c181fe1d93217e8c876549796801d4f41b17ce14942de3a
 MISC metadata.xml 336 BLAKE2B 6f8e4a99a9941e3a9dba25832ae43998f1cc27e85c4535494f6762f99e915aa3be299cefdd9a8e9fcd1e5d934c87de826c64c72f1e74f4a49f57aa76de73595f SHA512 12190b1f38b235ba164b13cb7bac3f24fafc65a001c9cc5d7f24fbefed5ed5cb411a563ff57a54db722a3a79b9030d8eeaaaaafa4df79b0e2758393dc9332fa0
diff --git a/x11-terms/terminology/terminology-1.12.1-r1.ebuild b/x11-terms/terminology/terminology-1.12.1-r1.ebuild
index bc8585a92849..7ae281d7342e 100644
--- a/x11-terms/terminology/terminology-1.12.1-r1.ebuild
+++ b/x11-terms/terminology/terminology-1.12.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson python-any-r1 xdg
 
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 7959b0e10e53..3d0356f5ab2d 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,3 +1,7 @@
 DIST xfce4-terminal-1.0.2.tar.bz2 1001720 BLAKE2B c3759f5199da51ffae3bcacb0c1cfcfd54d9c4e11f52c7681ca335042164a0311990174defc0ef82cbb3aea6e6cf89400dd9de4406e3843d17f5da8e7ed048fe SHA512 0ac33e01b2975c2ab4cc6078075ba83a77c260ea914e89d1dce8393c307aa4956f0cb0db13c3ecff0bec7659d33e02834343211852787a691b61a19d40a0c757
+DIST xfce4-terminal-1.0.3.tar.bz2 1000750 BLAKE2B 7d8f39725619f9c67b671a0ba3f358c448e53b47d8454233ab97c31735a64d6050e180d1612cbaa9cddf619daf9b12dbb77d97e0737f81337ffe5cb5d9303e4a SHA512 b9d93c3def9cd1237b985ee95664e210595f450e78b9e23fd5928d66cd978fca38db8be1e3c2968b6cb9a8abb5ab978975eed6b8afa3b49509fecf16b66580d3
+DIST xfce4-terminal-1.0.4.tar.bz2 1009367 BLAKE2B 48a618f8ea98ad0408d8e54d4489358874e9e0e3c6a7011f298d0fed21512783258598cc59013c7406128e68d7311ddf64fdb13f9517306a819db50edc0555cc SHA512 76ea8f296fe1c128dc70d8aabf23447300ba83405d52e844abec89049968bac51fe47fd7545a76e4a421275c6a2f230f326ed3a25083bf536f17fc3218b05fce
 EBUILD xfce4-terminal-1.0.2.ebuild 986 BLAKE2B 8eb4d2d2717d49c580841fd4c2b643fea73dd236774445cd5d8efa532fa77e7836e6efb23ff9fae31f3a4795f51d2a576f5859e256aba7deb3f8f408baf79a04 SHA512 c1503fa2a2ca57c9408355235816fbe175ae1927548d599299416ce47b74fb0df3f59423ea7ed7feb2c40c18c6d9e2dcd78e28be8223e847ead3582ee44bd61d
+EBUILD xfce4-terminal-1.0.3.ebuild 992 BLAKE2B b83377ad53bd8b570500a3be55b240f1906fd7456c99cf0cd943756cb9d61c6f4b15fbef33372f54c4419e49224fa86659bc9c1bb3270f54e1dc180d18a627c1 SHA512 5fe438a56ea5bf1af849f38beff3caac2b8d03a823553eeaf14175dc87310484abfa8521b88dfbd77a2a8649b5be152bc3e8f21cd45ca69cab3cc9f9207d59c0
+EBUILD xfce4-terminal-1.0.4.ebuild 992 BLAKE2B b83377ad53bd8b570500a3be55b240f1906fd7456c99cf0cd943756cb9d61c6f4b15fbef33372f54c4419e49224fa86659bc9c1bb3270f54e1dc180d18a627c1 SHA512 5fe438a56ea5bf1af849f38beff3caac2b8d03a823553eeaf14175dc87310484abfa8521b88dfbd77a2a8649b5be152bc3e8f21cd45ca69cab3cc9f9207d59c0
 MISC metadata.xml 372 BLAKE2B bb4bcd3652bb3bbaee272af26e6b07b5279167c165574cfcbaa1c23d8b9786cc79972325893fc563aac5ae1eef257ebe4807199497a02c147515af68b80e27a2 SHA512 722c99f01658541a9d1df513ffa218ac36897644e771d8b439bf6b2c38e241304c0a43c94115ed95f367ba6e3a8606bee2c63ef8c1ef9841f08b9f06977751c7
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.0.3.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.3.ebuild
new file mode 100644
index 000000000000..515d1165885b
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="utempter"
+
+RDEPEND="
+	>=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.22:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.51.3:2.91=
+	>=xfce-base/libxfce4ui-4.16:=[gtk3(+)]
+	>=xfce-base/xfconf-4.16:=
+	utempter? ( sys-libs/libutempter:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_with utempter)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
new file mode 100644
index 000000000000..515d1165885b
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="utempter"
+
+RDEPEND="
+	>=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.22:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.51.3:2.91=
+	>=xfce-base/libxfce4ui-4.16:=[gtk3(+)]
+	>=xfce-base/xfconf-4.16:=
+	utempter? ( sys-libs/libutempter:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_with utempter)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index c7e7acce9452..364a1cf019eb 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,3 @@
-DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
-DIST xterm-370.tgz 1500208 BLAKE2B 973cda2511e761be64332746f004ed9ea716c8f5b7065cef2ef60d789e6186138b671920f23135b5c66d3226ce17c1d195db456350c94f5f0973e29610896b1a SHA512 24f1836c4f5aec175c45db77e9bc829b45ee2c93cf12c20252b22bee470392ef0637cfbbb6e90074b1c038ac023f74a4fb713bbd4abf2b5b86d064667caf38dd
-DIST xterm-371.tgz 1507938 BLAKE2B 4ae16885bc07e7a0feb9aae29ef724f45e1170ba1eb7660c000df9a3f903c73063569d366383e7c30546480675b3fcd6513bb824ee3a5ee05155739e858360c5 SHA512 024c2cd8ab5a9da6585999907974a917497f693a0fb8cf4519c41c7e75ef2bfcc146c7078129590a836a322f7e59a550ad741b55dcbe98be6ee7988ccebe8903
 DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
-EBUILD xterm-367.ebuild 2599 BLAKE2B cfd80d741533347fc330450bf7ecfffc2c8a73b27a6c2fcb0368c29ccac49412f4acc7838440cdb9821cc06a1c77a84d7a454524161e3826e8e14682566f390f SHA512 878cb054f5764bdf6cf0b517464261301b97d8040e2d28a5f4efcecbda6851ebd2e68c784ad00b0dd7856a89b7bcd5413c98bc16d671412381f8d86caec3f37a
-EBUILD xterm-370.ebuild 2612 BLAKE2B a252994bb9060d018b83c4aad3d25ec5730bb89dcde80814d84efdb7399af7651639f048eb211fcab759208b2ae63314ca4a1bab9ecd176639b2f925d444a49e SHA512 38f8df8d294cacaa1d6e8dea246aca2116e9263a485df7e09282265453158c104951bb6b5624675b40e417c6a94875755ce5cae7a9131d34e97dba2ac22f9be2
-EBUILD xterm-371.ebuild 2602 BLAKE2B e1597c676eebf44289dadfc3cd50ae974a839f92cee438dbd2322856b2bd4a537574785d61735846b3ab3f19b45d88b31570f5f208257a2b27e099ab9d153b4e SHA512 c995b9ce3cf0e6c3e7e9524eb8a8c16b250517296c49d90dd38715ecdffb51e2af3ab601f2fe9749b8a31d97c5f7a50651f2acb0bce2aae6069af1adc5a346b4
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
 MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild
deleted file mode 100644
index 99c8680dc55c..000000000000
--- a/x11-terms/xterm/xterm-367.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-370.ebuild b/x11-terms/xterm/xterm-370.ebuild
deleted file mode 100644
index 57e07cc5fdd8..000000000000
--- a/x11-terms/xterm/xterm-370.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-371.ebuild b/x11-terms/xterm/xterm-371.ebuild
deleted file mode 100644
index 9a982a2d7cbb..000000000000
--- a/x11-terms/xterm/xterm-371.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	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 )
-
-src_configure() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
-	# bug #454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index be8bcff0df63..ac9256465352 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,4 +1,7 @@
 AUX zutty-0.11-cxxflags.patch 784 BLAKE2B 06dcb5309326ff43337d32b52d9ea03dc2673020492640a37bf91a8d709bf19afa51850fabc5f6a08fedcf91dbff5fc28ffdf7719aaa98dd475e4527321d391f SHA512 7c8e425375d513c2591b3ef153054811a2c3f88134aa27f9bc3aa2b8328a5c10d1938a606d0ef11f168671537bc6d5773570c9947f7c99871f668540d76fc8c3
+AUX zutty-0.12-cxxflags.patch 750 BLAKE2B 24c3d67ba191bfb988a8ecb5ea7f1aeb1cf504adc230c1ed70c440b0dadd808d6f009c2da517587f59ea4f924aaea00b1072466187fe5e0705296b80b8c81d6e SHA512 0c32cece7edd62c476907f840c24391a68cda9dee1a21995858fe17de9e88e952bb9b9df1565c1ae73dc77a154130ab24ba4ab623a74fb7023448c0da63e84e7
 DIST zutty-0.11.tar.gz 343469 BLAKE2B 9cd040e72d0ea76a526d099265b3a0974d40b1b8b679ff3baafc47f827b140943ac8bc13676831245e219ca1335ded7aca1e7826baf175fc63e88012791785e1 SHA512 84e8402a310adc80c698ded38fa3eb8ba44034f391e2538bccbdbc4082e239dc0d6ceb20504eeab4e5d2499ded55ef0941ae2e5d07eeb809d1059e5449cdb708
+DIST zutty-0.12.tar.gz 348226 BLAKE2B 8d065928fe3e8049e63f1e679d4e8d2ef6643b01b098698594d536c6fa9494a2a934dce3e4fe60594be4f1b56691a83a8e7fab0dd1ec6c09e12eeb1e69354f5e SHA512 d10289a51469ec6352a5b1feefb732dce7cf507b02ce57e64f8f65443f4533b8d61f357dec92cb00b58386416470928d763290a6d4ff714f65f98f1f09d60083
 EBUILD zutty-0.11.ebuild 969 BLAKE2B 4fceb5a68005b746abcf9de7ba0c8a1baa526840d1ddbf30f4900c2f4843445d32ba3f62eada0c239b323d8ad0a8d06a9c3ad61af106974a83c40127465c9492 SHA512 1a290fa2662a31957238c04d56e112f76e428ce82c03e4a06527a1d41486681cc731db01302d10d02f6c8aa16ac9abba1945d3166c6225b6241bd2b634d3ba04
+EBUILD zutty-0.12.ebuild 970 BLAKE2B 68dbc9f3e1d643a24102b318fd5cb9b1197aadbaf4f0f94f2ee24388155750650e454ebc763e02b9ae02773dcdd9d20d570efab6217856d6b4e6f7123beba759 SHA512 ea9948fbb23d879363ffabcc776373208e61b1e0712cc12cabf6b0759e944f1b63cbc46d20422d808ea5adf81914cf7bc4b82b089529e41a717333d59dedc9c2
 MISC metadata.xml 1008 BLAKE2B 8b9a265f83e520e56c7781129d523223e8e1b68ec2dd0141229216600d4264639934d84d90ba6a1a74e826a9773f7bea3f21cc647676b0d5648940d89848e501 SHA512 665feb252776365286ffedf94da2c53ee7da6fed7f6c6449ef37cfb2d910a0c082c396a40b70c85b856fde736babc756564d8bdf6bc8be054643f08db26182a8
diff --git a/x11-terms/zutty/files/zutty-0.12-cxxflags.patch b/x11-terms/zutty/files/zutty-0.12-cxxflags.patch
new file mode 100644
index 000000000000..11b3066e50ba
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.12-cxxflags.patch
@@ -0,0 +1,27 @@
+From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Wed, 19 Jan 2022 18:07:55 +0000
+Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS
+
+---
+ wscript | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/wscript b/wscript
+index d2bfbc8..b38b50b 100644
+--- a/wscript
++++ b/wscript
+@@ -69,10 +69,6 @@ def configure(cfg):
+            ['-DDEBUG', '-Og', '-g', '-ggdb'])
+     else:
+         cfg.env.target = 'zutty'
+-        cfg.env.append_value('CXXFLAGS',
+-           ['-Werror', '-O3', '-flto'])
+-        cfg.env.append_value('LINKFLAGS',
+-           ['-flto'])
+ 
+     cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'],
+                   uselib_store='FT')
+-- 
+2.34.1
+
diff --git a/x11-terms/zutty/zutty-0.12.ebuild b/x11-terms/zutty/zutty-0.12.ebuild
new file mode 100644
index 000000000000..10690f8057ce
--- /dev/null
+++ b/x11-terms/zutty/zutty-0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="X terminal emulator rendering through OpenGL ES Compute Shaders"
+HOMEPAGE="https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty"
+SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# It is possible to run the tests using virtualx, but it seems to take
+# screenshots of the terminal window, and compares checksums that never
+# seem to match.
+RESTRICT="test"
+
+RDEPEND="
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Remove default CXX/LDFLAGS, bug #830405.
+	"${FILESDIR}"/${PN}-0.12-cxxflags.patch
+)
+
+DOCS=( doc/KEYS.org doc/USAGE.org )