gentoo resync : 16.04.2022

15 files changed, 226 insertions, 23 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 652f3b8d99db..fe62863299a1 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 08311093bd98..6352c7763e1c 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 418 BLAKE2B 4eaf1e46ca71463bf5e7c54f31941d391851b2415872e06e41bc97b8d2278ac58c544ff869a5050e4d20abc670c20d4c7d364a8d68a7d9fb21baae2fa061af69 SHA512 52a8f383fc6bd2757dfc41fd0758c2b47ee177ecf49bf840a4e8ee8b32421a8f3c6a08270fa72f8cd2d87f8bfe663390ae18f17ea9ad18715099fe575de726d1
diff --git a/x11-terms/guake/guake-3.8.5.ebuild b/x11-terms/guake/guake-3.8.5.ebuild
new file mode 100644
index 000000000000..aca9e52d877b
--- /dev/null
+++ b/x11-terms/guake/guake-3.8.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 gnome2-utils plocale virtualx xdg
+
+PLOCALES="ca cs de el es fa fi fr gl hr hu id it ja ko nb nl pa pl pt_BR ru sv tr uk zh_CN zh_TW"
+
+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/setuptools_scm[${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
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} # needed with github's tarball
+
+	local po=($(plocale_get_locales disabled))
+	po=("${po[@]/%/.po}")
+	(( ! ${#po[@]} )) || rm "${po[@]/#/po/}" || die
+
+	emake PREFIX="${EPREFIX}"/usr prepare-install # paths.py.in -> paths.py
+}
+
+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() {
+	# use right schema/data dirs, 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}/install$(python_get_sitedir)"/guake/paths.py || die
+
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install-{locale,schemas}
+
+	dodoc NEWS.rst README.rst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 5d8ea171e948..1a94f3eb05bc 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,4 +1,6 @@
 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-9999.ebuild 1273 BLAKE2B 141961e4dd944b18a87b9eed23a66d414585079e2d80a1677584a59959dd56c2bc827a4dd18b255b1571d97efbfddd77f97fdd494713cd07cd513b79bd79ff8b SHA512 84a4ed1442f18c857d4770e08ab28a8e4fc37c227499cdd1a190e6347382f4df3f3b8c6c62799d1a00b4c5390f2c2249809a2aa9f47844e23a8bda9f8179cf10
+EBUILD kitty-shell-integration-0.25.0.ebuild 1478 BLAKE2B c9751a6a82bf10a629f06b6099dec2b6d08c0e4d961e6c8105ce7e975e849161bb09a8990a0ed971f96e4ea0787b87e64074d705e807fba6dbef3c3494ea495b SHA512 7f5f6d48619adeb300727cc9b30ef97403a2f6da00a45661cb8cec489ea9ccab02a48ba502d8099175342d832ec9ad98f82aff87bf5ef5d1df50ab7971d8fcea
+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.25.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild
new file mode 100644
index 000000000000..4c3e987c411b
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.0.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+	# this is used internally by the ssh kitten and is not useful there
+	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
+}
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
index 4bf3e29efd4b..c50ecb7f91d9 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
@@ -31,4 +31,7 @@ src_install() {
 	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
+
+	# this is used internally by the ssh kitten and is not useful there
+	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
 }
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 27bf148e0757..790d380c99d1 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,6 @@
-DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
 DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf222207fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f
-EBUILD kitty-terminfo-0.23.1-r1.ebuild 611 BLAKE2B 8146d5c5a87f4f71596e4f489df05b94c62bd0fdfa6145f5cdd4aa3fe2f0d89b2bf086f6a2459a907257ca391ecd1262152803ed2ed1844105f35ffe01c690cc SHA512 4e62146cd2baacde6010f82869bcc81f8bebd85f6ddb7242295cec3d3023b2052016919c71974bf64898dd8c211d80213493d6dc38cd83b003709cdb3f839e7d
+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
 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.23.1-r1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild
index 39ccb7d51e93..35ff98034a87 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 BDEPEND="sys-libs/ncurses"
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 9c85154628ee..502885a1ecdd 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,8 +1,9 @@
 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.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf222207fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f
 DIST kitty-0.24.4.tar.xz.sig 566 BLAKE2B 7a6513e6296b8c4a1781cef6bcea865b8187fcd8d2abd822627a401f943b1fb1d1432935fdbdc348c3062b07c91a85adcec280be64676782492f6245c72ed89b SHA512 34d24eebf08e19a96f715afb4a570746e1b7bcace6b6226dd596b2886b7bf3bc34b9842d0686c07a655b6b870da77cf25adf6d577dac811a01a70db8c477723a
-EBUILD kitty-0.23.1-r1.ebuild 2720 BLAKE2B 04a7963c18f5d480e9abbda815231e146baf383cf59de0ed1a7bab6687ab1cc2357fc5219a9ad6cd9a83f24b8fd47dcfeafc648359f5826879703a97645b440f SHA512 36b5c852e1b966186c4b8b8aa57dc53f0477ed177f9eba30a3cc073364510656a1699156c702a4b1e4c2ebea437981401c4ffac3084dd569034b9125754da865
+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-9999.ebuild 3239 BLAKE2B cb3ce1e0120cba89dca4180a62d30cc1fbb39efc2c3a349c49897071d6e34a2be369596b4de70a08f72ff92c0ae0951c169d55bdab53ca077b04e0f77c9d4afb SHA512 f8c6ea0dbef4508652c4def65e108312b432ebcabf9bcb2ae5b9bdd6e43125e23077a72b23a2ab3d14b00a20dda3e2a0fc1ecd19b45eb722e4f68e4c118e1636
+EBUILD kitty-0.25.0.ebuild 3420 BLAKE2B 60f7d4366201c91c2224cb188dab60955b9b7fdacbdd98c8ccaf31343f74ee2904b9a8ed048c65169f1579c40b918f115d032cefcab7d8f7c309ea7719c9fa1b SHA512 770098db045569ffe16e827f0a3d05feacbbffb36549a855aeb79e48dae3cd06f588df05f8f502a58fb671e649486a52232a1a61b71009c90b78ae20025cc9bc
+EBUILD kitty-9999.ebuild 3420 BLAKE2B 60f7d4366201c91c2224cb188dab60955b9b7fdacbdd98c8ccaf31343f74ee2904b9a8ed048c65169f1579c40b918f115d032cefcab7d8f7c309ea7719c9fa1b SHA512 770098db045569ffe16e827f0a3d05feacbbffb36549a855aeb79e48dae3cd06f588df05f8f502a58fb671e649486a52232a1a61b71009c90b78ae20025cc9bc
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.25.0.ebuild
index 67420a5f1402..16dd62bce059 100644
--- a/x11-terms/kitty/kitty-0.23.1-r1.ebuild
+++ b/x11-terms/kitty/kitty-0.25.0.ebuild
@@ -10,8 +10,12 @@ 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"
+	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"
@@ -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}
@@ -37,9 +41,10 @@ RDEPEND="
 	sys-libs/zlib:=
 	x11-libs/libxkbcommon[X?]
 	x11-misc/xkeyboard-config
+	~x11-terms/kitty-shell-integration-${PV}
 	~x11-terms/kitty-terminfo-${PV}
-	>x11-terms/kitty-terminfo-0.23.1-r0
 	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,18 @@ 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
+
+	# test may fail/hang depending on environment and shell initialization scripts
+	rm kitty_tests/ssh.py || die
 
 	# skip docs for live version
 	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
@@ -79,14 +93,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[*]}"
@@ -105,7 +119,8 @@ src_install() {
 	insinto /usr
 	doins -r linux-package/.
 
-	fperms +x /usr/bin/kitty
+	fperms +x /usr/bin/kitty \
+		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
 }
 
 pkg_postinst() {
@@ -113,4 +128,5 @@ 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-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 22dc6f82a916..16dd62bce059 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -81,6 +81,9 @@ src_prepare() {
 	# test relies on 'who' command which doesn't detect users with pid-sandbox
 	rm kitty_tests/utmp.py || die
 
+	# test may fail/hang depending on environment and shell initialization scripts
+	rm kitty_tests/ssh.py || die
+
 	# skip docs for live version
 	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
 }
@@ -116,7 +119,8 @@ src_install() {
 	insinto /usr
 	doins -r linux-package/.
 
-	fperms +x /usr/bin/kitty
+	fperms +x /usr/bin/kitty \
+		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
 }
 
 pkg_postinst() {
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index f9d276f56cfa..84ab58e047af 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -2,6 +2,6 @@ AUX qterminal-0.16.1-appdata.patch 309 BLAKE2B 3aef2327582b603056ea7061fc1f5103e
 DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57
 DIST qterminal-1.0.0.tar.xz 201644 BLAKE2B e294c575590964710aeb4b433db51844f75fe0f73b966ef5acde148b3f779aa89ae3c5f1d73d3a3877b14d932150702ff871267399cbcab3b4aefc445c942922 SHA512 d3fd04ef94d683aae641367e56185723cf32d2390ab505b956c6736fe674144f6f270ef0def43b1f2d3aec659a2a7735cfb3713da07f49697823f9384572b3a0
 EBUILD qterminal-0.17.0.ebuild 843 BLAKE2B e3ebbd0ddef4d7288cf24702325ae411c8e76e6247b4a94823e830b09c60b32e6fa14ec778f0084a9639349e200bd8af09f8c19b16e950605cecbf5b7b44fc43 SHA512 01fdff5baf310fd829ba096513ac42185b86d460a518db3e4be7c77c80c0795174221f21a696b824edda94b0496a507bb9f274e8eda4bd228d0cde79236fca9a
-EBUILD qterminal-1.0.0.ebuild 885 BLAKE2B ecca7cd2757a8e30fb2da4d22937dc63d66745fd7db130274bb4c1a8346951533d9c01df0fe7ab0bb2e792d94be8ccadb7e9b1e76c536a67ab5be18a62b767e3 SHA512 ef14c6d807a6d20624aa9b6415b235a9d76adaedbc9c5a8221b98b9211c9a567258707ccdfc598c5941b7dbced3c0afd9f5cdafc156c6050cd70b9bbcba7d6ab
+EBUILD qterminal-1.0.0.ebuild 882 BLAKE2B 894b1102baef7fc58c16a91186f064ef486c3b7e1720a4d28103d1fa5de2ba17e36b990e866387276aaa6ce59edb9769df11a5eb9109199b1947cc53ba1bf58c SHA512 4777092761998de3d33efd39349c4678bc3fee31b4fc200dd2fd9ef79b1287a278110d763ed6549ca81e4d26ed502f9274cd25b511d8603a1e9cc5ac2edce0b6
 EBUILD qterminal-9999.ebuild 885 BLAKE2B ecca7cd2757a8e30fb2da4d22937dc63d66745fd7db130274bb4c1a8346951533d9c01df0fe7ab0bb2e792d94be8ccadb7e9b1e76c536a67ab5be18a62b767e3 SHA512 ef14c6d807a6d20624aa9b6415b235a9d76adaedbc9c5a8221b98b9211c9a567258707ccdfc598c5941b7dbced3c0afd9f5cdafc156c6050cd70b9bbcba7d6ab
 MISC metadata.xml 332 BLAKE2B 624f66a3b8a745cfa2f4486cd22cf18f2f650d3be2b9b702527983f7a16bd81adeed917daa5520fa6de32191d30b6cf590eeb12e83e19032d7ee720eb07dcaf2 SHA512 c4e36da6992031391c905fb0908fcf1fcb2061ba2999814e8b33a194dde60bde987ef5689d46ef8a1bea67e8094dcb30fee7749d29f11bb560aec5a6a86742f6
diff --git a/x11-terms/qterminal/qterminal-1.0.0.ebuild b/x11-terms/qterminal/qterminal-1.0.0.ebuild
index 34e20dcedd2a..52947cd89a2a 100644
--- a/x11-terms/qterminal/qterminal-1.0.0.ebuild
+++ b/x11-terms/qterminal/qterminal-1.0.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index c8ba44bed67c..ff99478716dd 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,7 +1,9 @@
 DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0e039a43af1968abab86c44fee5575d1fe9c61b3521be156b48bd7084f7169fdcd9757cb6bfe0c99b539bcb865e9150e358 SHA512 92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4
 DIST xfce4-terminal-0.9.2.tar.bz2 1003043 BLAKE2B abab648e33c063235c89d241a3190fa4f7591367a548587198fd93402b344583ae8db8e25e0baaa3b13fa67d3a620370f23f84004f71b3feec8ad104b4b34cee SHA512 1be443b0a720ebc2960b604823bafedf06164b7fcf2090810efb02b817146633509d3f0319b8cb4213cb91752f4fcce469e2b398e04d854630fee44dccec8b4b
 DIST xfce4-terminal-1.0.0.tar.bz2 1022734 BLAKE2B e72ecced3d506e6d69d61cd6fae77dee592e4c77f679428b75900e36aeb916e9581182bb08944c31bcc1bab44c8e45f661fa8dff9d7ed5b2d748e34a392e6106 SHA512 3a7ab171f08b4e9e9628a1e69ce2a5f20a00db13ee01232fe33f86df868037394540fdc5899876a46ce200d15fd9f6603eff2508f3c66b3b4f90573d16b3f02f
+DIST xfce4-terminal-1.0.1.tar.bz2 1002307 BLAKE2B 556d3a8fc40a1a9a33ae40b4bf1b522076405130f2b3e1a2b46a9da00724f92ebf3483ef249a73ce98e351e2c30916b54ef4e24a46e0e1eb7a2725c1895c5f73 SHA512 53e75f091ffa7444b6653a43458793cba2b50c76e9670da801b42e8c9283c4bb9a65404cc75ab35914cf9e3e1ce94914c2d337d35396d797837ef7b8f72f4d65
 EBUILD xfce4-terminal-0.8.10.ebuild 977 BLAKE2B c608ad9804c99786378552eaddf13e32c4d56fe40065ba973aabd7752d2f4252cd6febe80a7f21110103190a069c55da341629d7ae8abcd35184641c3145252f SHA512 35aeff69ad1f1c579f89aa69ef341705439efe85acf7d89be6038aa27cc1354dca6f1edb000fead377e4dbb91d5f9cf13627749a499932589a339de5f5fe36a5
 EBUILD xfce4-terminal-0.9.2.ebuild 989 BLAKE2B 997f3507f651fd45b0a4b1765b90095697e1c79d3a36d47a3f0c5e6530b41ea72f612dc1a72e5c220311df4fab039b6e257cec34576fc965082eb408ebdbd797 SHA512 d25b550bbce705ed30b3e3d5ca4b2625e1b9e06cd1c9efc6fead23e3c31747efa8e908dc88e43c38e15de89c88db25643428b0aedd9836635e20e68fedd698ad
 EBUILD xfce4-terminal-1.0.0.ebuild 992 BLAKE2B b83377ad53bd8b570500a3be55b240f1906fd7456c99cf0cd943756cb9d61c6f4b15fbef33372f54c4419e49224fa86659bc9c1bb3270f54e1dc180d18a627c1 SHA512 5fe438a56ea5bf1af849f38beff3caac2b8d03a823553eeaf14175dc87310484abfa8521b88dfbd77a2a8649b5be152bc3e8f21cd45ca69cab3cc9f9207d59c0
+EBUILD xfce4-terminal-1.0.1.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.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.1.ebuild
new file mode 100644
index 000000000000..515d1165885b
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.1.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
+}