gentoo resync : 07.01.2022

28 files changed, 731 insertions, 35 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a2b8cedaac0a..99af6e76acd4 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
new file mode 100644
index 000000000000..8c18b70fc67e
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -0,0 +1,6 @@
+DIST kitty-0.24.0.tar.xz 4503616 BLAKE2B 5a42b4815d25ff9e3a1f9fb6673e4e58ec3b59b5f81dc4098ef24408580d070e92a181e84167f5a343ffc3a9af33556823153d463eaa8e406f31c032ed8bab37 SHA512 b851ed56d16f9a39d47810bf27c2bc8cbb52d476376c4090045db90c1ad0bc7db6fd9e97edd6ce50a6d69e716671e1e909aab889ecac368857ad5c07f68a76af
+DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389
+EBUILD kitty-shell-integration-0.24.0.ebuild 1341 BLAKE2B 82d41d989852db434fcb8eb0716880d4aa68b57c23d66af5c0a65ec784c0102f194edd8471e97f0352f0cb68747c6390dd694aa965608a9fd1ec852b7287b3df SHA512 a8b4b8988a9d0fa6ba2c2d690c3ee065a7efc3ee4c7f00b8c089f841a4ca0c7b3c72bf86a07e605440d19592db143ad0df0f13de1e1a070298e00e07e0bbe4d3
+EBUILD kitty-shell-integration-0.24.1.ebuild 1341 BLAKE2B 82d41d989852db434fcb8eb0716880d4aa68b57c23d66af5c0a65ec784c0102f194edd8471e97f0352f0cb68747c6390dd694aa965608a9fd1ec852b7287b3df SHA512 a8b4b8988a9d0fa6ba2c2d690c3ee065a7efc3ee4c7f00b8c089f841a4ca0c7b3c72bf86a07e605440d19592db143ad0df0f13de1e1a070298e00e07e0bbe4d3
+EBUILD kitty-shell-integration-9999.ebuild 1273 BLAKE2B 141961e4dd944b18a87b9eed23a66d414585079e2d80a1677584a59959dd56c2bc827a4dd18b255b1571d97efbfddd77f97fdd494713cd07cd513b79bd79ff8b SHA512 84a4ed1442f18c857d4770e08ab28a8e4fc37c227499cdd1a190e6347382f4df3f3b8c6c62799d1a00b4c5390f2c2249809a2aa9f47844e23a8bda9f8179cf10
+MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.0.ebuild
new file mode 100644
index 000000000000..fc3c61131372
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.0.ebuild
@@ -0,0 +1,34 @@
+# 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 ~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.24.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.1.ebuild
new file mode 100644
index 000000000000..fc3c61131372
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.1.ebuild
@@ -0,0 +1,34 @@
+# 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 ~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-9999.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
new file mode 100644
index 000000000000..4bf3e29efd4b
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3
+
+DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+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/metadata.xml b/x11-terms/kitty-shell-integration/metadata.xml
new file mode 100644
index 000000000000..60597e252fe3
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>pabloorduna98@gmail.com</email>
+		<name>Pablo Orduna</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">kovidgoyal/kitty</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index a90400c3fca7..6b3a7c205ad2 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,4 +1,8 @@
 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
+DIST kitty-0.24.0.tar.xz 4503616 BLAKE2B 5a42b4815d25ff9e3a1f9fb6673e4e58ec3b59b5f81dc4098ef24408580d070e92a181e84167f5a343ffc3a9af33556823153d463eaa8e406f31c032ed8bab37 SHA512 b851ed56d16f9a39d47810bf27c2bc8cbb52d476376c4090045db90c1ad0bc7db6fd9e97edd6ce50a6d69e716671e1e909aab889ecac368857ad5c07f68a76af
+DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389
 EBUILD kitty-terminfo-0.23.1-r1.ebuild 612 BLAKE2B 14c01d616c309893e6a21e862861df66729eb4c7b68801515fc7bd8508ba85c033d262ae9c20cfe5fc3d175a3b3f7ae6844abd72992141be42fb69f96c08e1a0 SHA512 df25aaaf8c08cc35d91ee5678bf37767f4d17687d50d543b0ef59cd1da04dbf2a07d85d664951b373e600a81cf30cb0ae9ca9fab51df9b4097781100854e306f
+EBUILD kitty-terminfo-0.24.0.ebuild 613 BLAKE2B bcc99a8092ed726fd24ce3058e640c7b05ca8ee96f48d554df43b3d366ba553a40d5f487830a7a67781c28a94430149be62108c7701e864f7d62f5090d822917 SHA512 9169c3d0ad1b83eb8c3e6e390e18edf2c02b9c5498144d4a0afbd179b6b9d01eb04d38f7a2d9cc6d1f0198749861d36cadcf3e99431c779ba94afb447b49bc42
+EBUILD kitty-terminfo-0.24.1.ebuild 613 BLAKE2B bcc99a8092ed726fd24ce3058e640c7b05ca8ee96f48d554df43b3d366ba553a40d5f487830a7a67781c28a94430149be62108c7701e864f7d62f5090d822917 SHA512 9169c3d0ad1b83eb8c3e6e390e18edf2c02b9c5498144d4a0afbd179b6b9d01eb04d38f7a2d9cc6d1f0198749861d36cadcf3e99431c779ba94afb447b49bc42
 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.24.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.24.0.ebuild
new file mode 100644
index 000000000000..348b95a9b4a6
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.24.0.ebuild
@@ -0,0 +1,23 @@
+# 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 ~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.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.24.1.ebuild
new file mode 100644
index 000000000000..348b95a9b4a6
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.24.1.ebuild
@@ -0,0 +1,23 @@
+# 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 ~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/Manifest b/x11-terms/kitty/Manifest
index a9277dc5a76d..a45a46a9264f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,5 +1,10 @@
 AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0
 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
+DIST kitty-0.24.0.tar.xz 4503616 BLAKE2B 5a42b4815d25ff9e3a1f9fb6673e4e58ec3b59b5f81dc4098ef24408580d070e92a181e84167f5a343ffc3a9af33556823153d463eaa8e406f31c032ed8bab37 SHA512 b851ed56d16f9a39d47810bf27c2bc8cbb52d476376c4090045db90c1ad0bc7db6fd9e97edd6ce50a6d69e716671e1e909aab889ecac368857ad5c07f68a76af
+DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389
+DIST kitty-0.24.1.tar.xz.sig 566 BLAKE2B efff022baff8b16a4b576c1eb1aba83a7a931857850ae2815f54c06d7e9e7110c8bc27f89bec6ba679a4d1df133e1ec13e061cd880dbef02680a2d8021beadf8 SHA512 a2943d1fe20f6c36015db8b9cb8ddef9461fe6503110eb2dce6646afb141b3a3ceb7ab62ec2cbc027d2e2dc2a25c16a207dfc45f619b6464c0ce1995bae54144
 EBUILD kitty-0.23.1-r1.ebuild 2725 BLAKE2B d298ad931465ca1d0c84754c7a4cbb48ab7a821389bec388ee761ebc0fa80214bba3df3f4b0802a92df68a6c9ee55a2d034f81f554c1712387dfb498d57f2354 SHA512 04c9b83b5cb893847fc2b8cc2025217ed068db1cb075cf8e10f450c782f6e1818ac5734cbbaf10103ae16918a767799b21935908dc015c78f6703f635638dc14
-EBUILD kitty-9999.ebuild 2710 BLAKE2B 5f90d2d2b433511460c5aeb31b93b2ec9e3e74b3b2105d4b5eb1d6cf06ade4bfc94604590a47408b6ee1284d27a2a221f15875a2cad8e57d32ad12390272d505 SHA512 c0bbea334adfc09327e65e4660f0ecc89f125da36a798a75903f38b67f7aef203c84982af96f15f2b9547d5070c7fa2f7a7a560f81d8f0ed50439346e1a2050a
-MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
+EBUILD kitty-0.24.0-r1.ebuild 3116 BLAKE2B ae8e06241817db16dca22f7b61a883414bff9c9f22c87fc98c01133bbb266fc38bd804f8235ccb3d2b47151d411c21fb0228f258cf05d616d5f0df8c5e6491f1 SHA512 4e8f4bea7a07d014d031048229a79c2151ac28aeffba6c6880b87c04ec014308dc50c0242921aa9c27328d9f15fad35c3f721700a9ea470177a7c44ca7b87f21
+EBUILD kitty-0.24.1.ebuild 3172 BLAKE2B b696a19fabc55b258fa78d5018537c8d17ca8a59e8dbdc09684d4006bcad20b4192bbfa2cd3945d5ffbcc9bfecad139a95a7cb02ce328a145a74f5e04b0331bb SHA512 5c42874d368037618eff6d400aeb2b2adbddc80057583bba7eb3af9845fdb043dc645801136f085d69a79f8cee03ecb5464f5bfec29a41e7edca1db8f3fdb1b6
+EBUILD kitty-9999.ebuild 3172 BLAKE2B b696a19fabc55b258fa78d5018537c8d17ca8a59e8dbdc09684d4006bcad20b4192bbfa2cd3945d5ffbcc9bfecad139a95a7cb02ce328a145a74f5e04b0331bb SHA512 5c42874d368037618eff6d400aeb2b2adbddc80057583bba7eb3af9845fdb043dc645801136f085d69a79f8cee03ecb5464f5bfec29a41e7edca1db8f3fdb1b6
+MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.24.0-r1.ebuild b/x11-terms/kitty/kitty-0.24.0-r1.ebuild
new file mode 100644
index 000000000000..f94b4bb5d66b
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.24.0-r1.ebuild
@@ -0,0 +1,126 @@
+# 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
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~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 )"
+
+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
+
+	# --shell-integration="enabled no-rc" is the intended way to set
+	# no-rc by default, but setup.py's replacer currently fails
+	# https://github.com/kovidgoyal/kitty/issues/4434
+	sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die
+
+	# 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)
+		--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_icon_cache_update
+
+	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+}
diff --git a/x11-terms/kitty/kitty-0.24.1.ebuild b/x11-terms/kitty/kitty-0.24.1.ebuild
new file mode 100644
index 000000000000..ae77780523a3
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.24.1.ebuild
@@ -0,0 +1,127 @@
+# 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 ~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_icon_cache_update
+
+	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index f47b4d2c18f8..ae77780523a3 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-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
@@ -10,7 +10,11 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
 else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	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 ~x86"
 fi
 
@@ -19,11 +23,11 @@ HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+X debug test wayland"
+IUSE="+X debug test transfer wayland"
 REQUIRED_USE="
 	|| ( X wayland )
 	${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
+RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -33,13 +37,14 @@ RDEPEND="
 	media-libs/lcms:2
 	media-libs/libglvnd[X?]
 	media-libs/libpng:=
-	net-libs/librsync:=
 	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}
@@ -57,6 +62,7 @@ BDEPEND="
 	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
@@ -65,10 +71,15 @@ PATCHES=(
 src_prepare() {
 	default
 
-	sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die
-	sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \
-		-i kitty_tests/check_build.py || die
-	use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die
+	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
@@ -79,14 +90,14 @@ src_compile() {
 	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
 
 	local setup=(
-		${EPYTHON} setup.py
+		${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)
-		linux-package
 	)
 
 	echo "${setup[*]}"
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index c4f584c5169f..6bb38d37be8c 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -13,6 +13,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="transfer">Enable transfer kitten using <pkg>net-libs/librsync</pkg></flag>
+	</use>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
 		<changelog>https://sw.kovidgoyal.net/kitty/changelog</changelog>
diff --git a/x11-terms/st-terminfo/Manifest b/x11-terms/st-terminfo/Manifest
new file mode 100644
index 000000000000..55aaa1a369f9
--- /dev/null
+++ b/x11-terms/st-terminfo/Manifest
@@ -0,0 +1,4 @@
+DIST st-0.8.5.tar.gz 47829 BLAKE2B 9c036b39605dcc69c03fd5a67e911545eb41e3e748efbcf4761770b2a9bf9f158fc1da1fc140b84fb9939fcb35ce126de444cd567806c350e8e2905907bdf645 SHA512 45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
+EBUILD st-terminfo-0.8.5.ebuild 1069 BLAKE2B 81dbed746b1a45a57a10b54f3b79b955ba43e5a67d7658e516814a85557fd059ea487688957f9915f6d6ebd62044ddfa45448cce1f3052497c8cac4e1ef9562f SHA512 7a33a667cc0729d3b6736d026d675cdb163f843561f068997418460e393d94f81ebbdfe7c3a7f91a80d08d9050afa8b7c83c671f5965daa57b3632291220c750
+EBUILD st-terminfo-9999.ebuild 1069 BLAKE2B 81dbed746b1a45a57a10b54f3b79b955ba43e5a67d7658e516814a85557fd059ea487688957f9915f6d6ebd62044ddfa45448cce1f3052497c8cac4e1ef9562f SHA512 7a33a667cc0729d3b6736d026d675cdb163f843561f068997418460e393d94f81ebbdfe7c3a7f91a80d08d9050afa8b7c83c671f5965daa57b3632291220c750
+MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-terms/st-terminfo/metadata.xml b/x11-terms/st-terminfo/metadata.xml
new file mode 100644
index 000000000000..2f82d0bb8eb7
--- /dev/null
+++ b/x11-terms/st-terminfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/st-terminfo/st-terminfo-0.8.5.ebuild b/x11-terms/st-terminfo/st-terminfo-0.8.5.ebuild
new file mode 100644
index 000000000000..05cc1126c2b2
--- /dev/null
+++ b/x11-terms/st-terminfo/st-terminfo-0.8.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for x11-terms/st"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/st"
+else
+	SRC_URI="https://dl.suckless.org/st/st-${PV}.tar.gz"
+	S="${WORKDIR}/st-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+BDEPEND=">=sys-libs/ncurses-6.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	mkdir -v terminfo || die "Failed to create terminfo directory"
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	tic -sxo terminfo st.info || die "Failed to translate terminfo file"
+}
+
+src_install() {
+	insinto "/usr/share/st"
+	doins -r terminfo
+
+	newenvd - "51${PN}" <<-_EOF_
+		TERMINFO_DIRS="/usr/share/st/terminfo"
+		COLON_SEPARATED="TERMINFO_DIRS"
+	_EOF_
+}
+
+pkg_postinst() {
+	ewarn "Please run env-update and then source /etc/profile in any open shells"
+	ewarn "to update terminfo settings. Relogin to update it for any new shells."
+}
diff --git a/x11-terms/st-terminfo/st-terminfo-9999.ebuild b/x11-terms/st-terminfo/st-terminfo-9999.ebuild
new file mode 100644
index 000000000000..05cc1126c2b2
--- /dev/null
+++ b/x11-terms/st-terminfo/st-terminfo-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for x11-terms/st"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/st"
+else
+	SRC_URI="https://dl.suckless.org/st/st-${PV}.tar.gz"
+	S="${WORKDIR}/st-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+BDEPEND=">=sys-libs/ncurses-6.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	mkdir -v terminfo || die "Failed to create terminfo directory"
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	tic -sxo terminfo st.info || die "Failed to translate terminfo file"
+}
+
+src_install() {
+	insinto "/usr/share/st"
+	doins -r terminfo
+
+	newenvd - "51${PN}" <<-_EOF_
+		TERMINFO_DIRS="/usr/share/st/terminfo"
+		COLON_SEPARATED="TERMINFO_DIRS"
+	_EOF_
+}
+
+pkg_postinst() {
+	ewarn "Please run env-update and then source /etc/profile in any open shells"
+	ewarn "to update terminfo settings. Relogin to update it for any new shells."
+}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index adf27a5d8e2b..41fae118b27e 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,6 +1,8 @@
 AUX st-0.8.4-locale-musl-segfault.patch 513 BLAKE2B 2c2ee2aee8c7a19f11f00d89254e1679cc0278da09b64b469b296c0a81e6afecd67216b70f6244aad086ee1fd5f3729472376968f5247e6891ba39242a8ec9ae SHA512 367b8019ecec058eff0fc499baaea2e29abbf60df6b944eb9b5389336d4e6156fbbc2773326643978eff7cbf15810232f7d30587b0d951ee41ce34114e8277a5
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
+DIST st-0.8.5.tar.gz 47829 BLAKE2B 9c036b39605dcc69c03fd5a67e911545eb41e3e748efbcf4761770b2a9bf9f158fc1da1fc140b84fb9939fcb35ce126de444cd567806c350e8e2905907bdf645 SHA512 45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
 EBUILD st-0.8.4-r1.ebuild 1466 BLAKE2B 6a12c7a52c2e626eefe0fcea85f655e54c247596e0ed2400f1e546d7f93012384620dd5717b85d30d6817e8b4623c6bb48ad1b61238c51c38c0427f5bfd3492e SHA512 869a37fed185091df0f48d306245738eb54bc7bcd8392b1582d077f3c389cde296cec2df43f01ee449ad9f159218c45a58717e3d86ec5148e94f1426e1700cc3
 EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
-EBUILD st-9999.ebuild 1368 BLAKE2B f71916b6b4d68e39140eb241d5384857645f7bd15c07e418ebeb4ec19dcb60d9baa5fb17244c574ae5dd0efa66bf8dd4a9ead92daa7180a0c7507aed489b3d58 SHA512 b9383a140252f7dd4bf5c1bfa218fd07f4d49f33ec6b904ba35afdb53d3cc126a0db7a2e8ff0de1c88cb28617444a94f911fcb7285e653c62dd3253b1efb855a
+EBUILD st-0.8.5.ebuild 1524 BLAKE2B c4d60cd20119173a35ab7c9e4d8a1aa40f7a12c148adf5cb30807421ac808c700b1ce371af6563d19ff7f8bb1beb96b66b9a9b2d12bf47011202074713c6b04c SHA512 26c9ea44a3d848bc3fd0078e2c960370c5b012e8055c09c56df050c185703295457f3aa1c4d31f12dfb269fc7be14196fee9cc1ec3cf3a8bbd12904fef1413a9
+EBUILD st-9999.ebuild 1524 BLAKE2B c4d60cd20119173a35ab7c9e4d8a1aa40f7a12c148adf5cb30807421ac808c700b1ce371af6563d19ff7f8bb1beb96b66b9a9b2d12bf47011202074713c6b04c SHA512 26c9ea44a3d848bc3fd0078e2c960370c5b012e8055c09c56df050c185703295457f3aa1c4d31f12dfb269fc7be14196fee9cc1ec3cf3a8bbd12904fef1413a9
 MISC metadata.xml 254 BLAKE2B aabbd5365abdb36c7ee6418a30169bc87cdd6cf8175a1f3c5d4e27f84b4309f34a42342887ea5e73eeef602a69582854266900794cc81d8e951d2e5f0480b650 SHA512 030e3a92db3cdca585debc6b26403cc6679a4b5f87bdc188a9dfaf4779adca1b4e8445a755618abe5a43157300292a596c5a6850ebe6f6f7f400d3f46ef2e0f9
diff --git a/x11-terms/st/st-0.8.5.ebuild b/x11-terms/st/st-0.8.5.ebuild
new file mode 100644
index 000000000000..defaa3e758e2
--- /dev/null
+++ b/x11-terms/st/st-0.8.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop savedconfig toolchain-funcs
+
+DESCRIPTION="Simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/${PN}"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	~x11-terms/st-terminfo-${PV}
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+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/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 525453f3d78e..defaa3e758e2 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,24 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop git-r3 savedconfig toolchain-funcs
+inherit desktop savedconfig toolchain-funcs
 
-DESCRIPTION="simple terminal implementation for X"
+DESCRIPTION="Simple terminal implementation for X"
 HOMEPAGE="https://st.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/${PN}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/${PN}"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS=""
-IUSE="savedconfig"
 
 RDEPEND="
 	>=sys-libs/ncurses-6.0:0=
 	media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXft
+	~x11-terms/st-terminfo-${PV}
 "
 DEPEND="
 	${RDEPEND}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 7859e32d0214..ed09acf2eb43 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +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 1117 BLAKE2B 8af1bb591bcb3d28803447f5d444e4c4fea4b5f459fdccdc1a03cd717a8aa33a9ba9fa404a9709ca1ad1fe8e85814652c8373d6af7d26c484613aad3f087ab14 SHA512 6b730dbaac2992e3d85197708cf2580019e54594e525a271a8c0ee7c96cd985231852cf3f52f1eb2b851cf2341bc321bcdf087bc7b0c845266213a0dbe5b5de3
 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
new file mode 100644
index 000000000000..701ba06d6caf
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.12.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 xdg
+
+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/terminology/${P}.tar.xz https://downloads.terminolo.gy/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="extras nls"
+
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	>=dev-libs/efl-1.26.1[eet,fontconfig]"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/libintl
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #766081
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls)
+		$(meson_use extras tests)
+	)
+
+	meson_src_configure
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 129afc6c5628..88895d201f5e 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -2,8 +2,8 @@ DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a
 DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
 DIST xterm-368.tgz 1451700 BLAKE2B 3fe939b8248e8839ba8b73b0971ab380e5f6528f51bd1993cc26d53755177fd5537cdbf2044f7fedad20663b3a7b42bc7f8b1c138233d44eb91472840f8448e1 SHA512 ea2f27722795c47a406cf4956ecdd05bae19aee621a0183aa167d188a90767a859ce41c6d1b1352b5ebd94d920360d3f26248ec0bb2068c253583d460baeafda
 DIST xterm-369.tgz 1461310 BLAKE2B 0b807b07c71af39df6b38b16b45f8f24a77e00bf41243c1109cf25c7ff448729b0ed64d62a99e954e0939e4f8ac6298afdc61b4098cf489eadbef55940e0f277 SHA512 b574e75e8bc7918f6e637534a39ebbc72cfbc74e4ff3e2b914962722b9c6e60adee49d74ebe1e778bcb35556e04098baa4465d1694fde61fbcca6434e6e706a7
-EBUILD xterm-366.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283ad197dc9d140940993a952295e462a8d3565f4fd1173e2d1688ed59b1e0272fc1b1b39d498cdbf3d00111 SHA512 8c59b66c2534ea3d224b1cde39bc54bfa11e5b47f2828dee855bd5d38a2603515caa003b9d12bc80bed4c60f4d43160cb12ef5d0c7d5051426584984c4777b2e
-EBUILD xterm-367.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283ad197dc9d140940993a952295e462a8d3565f4fd1173e2d1688ed59b1e0272fc1b1b39d498cdbf3d00111 SHA512 8c59b66c2534ea3d224b1cde39bc54bfa11e5b47f2828dee855bd5d38a2603515caa003b9d12bc80bed4c60f4d43160cb12ef5d0c7d5051426584984c4777b2e
-EBUILD xterm-368.ebuild 2646 BLAKE2B a02c621fdb8353916253b308b2941dad2574b1dc40edd21aff79ae6e10c62b0d6103d40e260543a2d1d116218894ef39c2c0b8c660b66dfd3a5e9633cd961e29 SHA512 bcb84fc47ded01968d6c3c6a21483006521efcce366a39a984a7f13527affb3ccc870572d702dd263579db84fa2ed80766ad214eeab27e1670bf0fdc98da3255
-EBUILD xterm-369.ebuild 2652 BLAKE2B 52f5c9da94e42b24d65a9087fa82fc23794da555c8344f58097df99a75bebb6bbbf884387d19f2bbb1e5db8c945091294c9ac9d9e2ca45684e29c12d389be04a SHA512 cfbc3925dd1782622a0af17e580b80331e5b49c2eb7aacda76e43a1f74ecde211daa5c3cd8d68b6dcdecc5aad2f3c698b66f501b0f535ff68a5413962408335e
+EBUILD xterm-366.ebuild 2599 BLAKE2B cfd80d741533347fc330450bf7ecfffc2c8a73b27a6c2fcb0368c29ccac49412f4acc7838440cdb9821cc06a1c77a84d7a454524161e3826e8e14682566f390f SHA512 878cb054f5764bdf6cf0b517464261301b97d8040e2d28a5f4efcecbda6851ebd2e68c784ad00b0dd7856a89b7bcd5413c98bc16d671412381f8d86caec3f37a
+EBUILD xterm-367.ebuild 2599 BLAKE2B cfd80d741533347fc330450bf7ecfffc2c8a73b27a6c2fcb0368c29ccac49412f4acc7838440cdb9821cc06a1c77a84d7a454524161e3826e8e14682566f390f SHA512 878cb054f5764bdf6cf0b517464261301b97d8040e2d28a5f4efcecbda6851ebd2e68c784ad00b0dd7856a89b7bcd5413c98bc16d671412381f8d86caec3f37a
+EBUILD xterm-368.ebuild 2606 BLAKE2B 41f077d77771703a8e914b9c7d1b302409ba2cc9b346b4c1e54568ed5558bef5a8a281df985c0f0ffec27a52a58373c7c3af6c793ed7bba2e8c2306132dd6b06 SHA512 d2173fff97d7c3667cb3657a97122bdaeaf4629a30e0d72a808e1beb8d1e9ca513ec3c72ddc4a17b53483b5363a94ea21c337cfdf571630e755e10c5f7a0698c
+EBUILD xterm-369.ebuild 2612 BLAKE2B a252994bb9060d018b83c4aad3d25ec5730bb89dcde80814d84efdb7399af7651639f048eb211fcab759208b2ae63314ca4a1bab9ecd176639b2f925d444a49e SHA512 38f8df8d294cacaa1d6e8dea246aca2116e9263a485df7e09282265453158c104951bb6b5624675b40e417c6a94875755ce5cae7a9131d34e97dba2ac22f9be2
 MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
diff --git a/x11-terms/xterm/xterm-366.ebuild b/x11-terms/xterm/xterm-366.ebuild
index 86edf8cd23ef..99c8680dc55c 100644
--- a/x11-terms/xterm/xterm-366.ebuild
+++ b/x11-terms/xterm/xterm-366.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=7
@@ -16,8 +16,8 @@ IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
 	x11-base/xorg-proto"
-DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( sys-libs/libutempter )
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
 	media-libs/fontconfig:1.0
 	>=sys-libs/ncurses-5.7-r7:0=
 	x11-apps/xmessage
diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild
index 86edf8cd23ef..99c8680dc55c 100644
--- a/x11-terms/xterm/xterm-367.ebuild
+++ b/x11-terms/xterm/xterm-367.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=7
@@ -16,8 +16,8 @@ IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
 	x11-base/xorg-proto"
-DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( sys-libs/libutempter )
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
 	media-libs/fontconfig:1.0
 	>=sys-libs/ncurses-5.7-r7:0=
 	x11-apps/xmessage
diff --git a/x11-terms/xterm/xterm-368.ebuild b/x11-terms/xterm/xterm-368.ebuild
index 360ff3a47763..b29486ec821a 100644
--- a/x11-terms/xterm/xterm-368.ebuild
+++ b/x11-terms/xterm/xterm-368.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=7
@@ -16,8 +16,8 @@ IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
 	x11-base/xorg-proto"
-DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( sys-libs/libutempter )
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
 	media-libs/fontconfig:1.0
 	>=sys-libs/ncurses-5.7-r7:0=
 	x11-apps/xmessage
diff --git a/x11-terms/xterm/xterm-369.ebuild b/x11-terms/xterm/xterm-369.ebuild
index c82fc284ca0f..57e07cc5fdd8 100644
--- a/x11-terms/xterm/xterm-369.ebuild
+++ b/x11-terms/xterm/xterm-369.ebuild
@@ -16,8 +16,8 @@ IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
 	x11-base/xorg-proto"
-DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( sys-libs/libutempter )
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
 	media-libs/fontconfig:1.0
 	>=sys-libs/ncurses-5.7-r7:0=
 	x11-apps/xmessage