gentoo resync : 02.02.2022

27 files changed, 204 insertions, 179 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7f13e3ef16e6..6e1f46b5d047 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 3de3d54401e3..7382dd9a0182 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,6 +1,6 @@
 DIST ab_glyph_rasterizer-0.1.4.crate 6641 BLAKE2B fc70a45030d969f8af31d1bc3f83069acc014b33cde31817063ab1d40f8caebe12f3896b6a249620a8f2a2d0adc149fcc402f2af25b31ebe223ad0779028d843 SHA512 a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
-DIST alacritty-0.10.0_rc4.tar.gz 1437540 BLAKE2B 097c06f983801cb54b93f66cb33b02d2e11bbbf01c02e95c564b56cf67615c7553643a7134f5c9eab822de930c937c12ebe4fbfee6bc9f1626c32bb4d9d4d2cc SHA512 00d9311b7a2f0982676e90032c432d1fe63ce2e1c9bc7fb353b92a28ee76508bfc2296a7af2c3d17813340a4689748a550bb44b8e828546dfab83f35dc769461
+DIST alacritty-0.10.0.tar.gz 1437372 BLAKE2B f9bdb19e92f89e30efaf2c773dd27efbb53d97edcf032c1eed55671d2ee2965341cd044feb76ed2d213a84760c64381aaca72a046d40ead7195c012895016a06 SHA512 25919fc7a0dac0011fc508e07f168fce953780ec8bbdbea440ee41a848bef93594d022a0d79018efacfcb9b7eca6c785b03f479bc12e09226e83b13245f5edab
 DIST alacritty-0.9.0.tar.gz 1422571 BLAKE2B 0b9531b92e57e36f86ae2a855c9dca4d3789e21b2ade9df2d22d32b9cf0967748df2acd1c79a1defba4d9eac21b2477550b799e5ffc4f9cb1444793ae9ca36e4 SHA512 17b53a1f98e8435a3ab120e39040c591d96a05d793b78030732f5624e2b717ab6a06c8de67fb25c6a502f3f3064f08a2a3c64cf7a1b7f3f7fda699e7fd95f931
 DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
@@ -288,7 +288,7 @@ DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e
 DIST xdg-2.4.0.crate 14035 BLAKE2B 9a2ce4737bbc4f36b007008fb6d66065bb2354c03df4feab127992d360f2e2d9a681c314f61b856b165b6515781917976bee415fba0b9e814695a046de467387 SHA512 d45b090c83bda578d89480f783e7238149203256d61aed46ae1657dc3de62551a618aa5a02e9d9867b39de82a8df527d37432b9b8c41afbbf0188f3644c4ad2d
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD alacritty-0.10.0_rc4.ebuild 6509 BLAKE2B 8d4644a82dc6b7978cfc2ee4b0deb0cb81be709f37a238cd3c19c02ae0795a76679b72275dba055bfc0c3161f04c448f88b9568101108687e6ae1d38baafabee SHA512 84f48011652d589289046c571d2ae7659409b99c93d6f9afaf52678f1a8efc02d6c830c017a22b7d97182512891b6e4a7717ee7f86e835be80ba6bf4fa9dc538
+EBUILD alacritty-0.10.0.ebuild 6509 BLAKE2B 8d4644a82dc6b7978cfc2ee4b0deb0cb81be709f37a238cd3c19c02ae0795a76679b72275dba055bfc0c3161f04c448f88b9568101108687e6ae1d38baafabee SHA512 84f48011652d589289046c571d2ae7659409b99c93d6f9afaf52678f1a8efc02d6c830c017a22b7d97182512891b6e4a7717ee7f86e835be80ba6bf4fa9dc538
 EBUILD alacritty-0.9.0-r1.ebuild 6081 BLAKE2B aebc58cf2513aabe6f15238a5ee3005016fb6a1ff1ef0f5ce9388119f4206b573147c72af0d8f2e3b6541ca7fd1d49864ae5702daf6dd3f27fbe6f83d04acdcd SHA512 9cc3c5237405479d49529d9f207817cc414e642b99362ef092bc0b665f7167b9f7b54f9013c9b003a18cebcf886c8aa50e0c474233bfbbddd6451a1a90f1ed00
 EBUILD alacritty-9999.ebuild 2734 BLAKE2B 3679ddf62eb4881fce918a8ca5d3f91be23efa318689f805ba58a84d749c251f871a683004e4309e7cebae4e2787cd8fc38a4ec1cfa242c6c6ce4c07ea475b3c SHA512 799ad3836318209092f8c5a6aa443651b4db15fd8fb84bd3659e8bd8720886674e864532799e7d73e8d04159902fa5e1ef47b270b2cbfe46cb00751978b7b8d6
 MISC metadata.xml 819 BLAKE2B f4e1bce404d7ce61f8a5b64562f1ac55294000d8d32343ed58d283759c041b913908881bdc371ddd6118b4cad923239c6b3961b9b86ab2441a9f3cc0eeded2b2 SHA512 21c9e1ef6176ecefbcc168aa854332a6207db160ec30db5da091761f22ca809ffa3ef3f09086fb9e40b647617eeeba391775ee3ea81db3cc1db6b2663f3d3461
diff --git a/x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild b/x11-terms/alacritty/alacritty-0.10.0.ebuild
index 42733ab1bdee..42733ab1bdee 100644
--- a/x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild
+++ b/x11-terms/alacritty/alacritty-0.10.0.ebuild
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index affaab25fc5c..5bf608b81983 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,10 +1,9 @@
+AUX 3.42.2-fix-build-with-meson-0.61.1.patch 1024 BLAKE2B bce6f28ff01f895a2890b43fd56eb4c9e69dacf547c3eddd13593cce9d2c84c6b0e3346c607bbb21a8bd059e25e88f035e5918bc1d021cddcd2830baf43a5b5d SHA512 93561c9eb344bebec6106b56212258bb0086225957351c0211eef6515107bf8136b65e734b328f4824f8586f80d8a07612a605c1b7f5c4515ce38d33a2f6429e
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a6a5758b500665aed21b95d8b4295240e24ea69dd806321a32338aeb904c60cd7dbb713d3d456bdc9199c7c4b4e2d65bc7078fa9bbf6a7d94c227265 SHA512 0efc106b35c25199ed8d4edc5c36a10a1013e62100c0b3397a5bb04386d7d2f548e811451c8577bc123ffbe935cea2a8f10d08473de5fadc4d07db0f301ab3bc
-DIST gnome-terminal-3.40.2.tar.xz 2608032 BLAKE2B 8d7a355623d6eee9f4e3d4ff219dbd12c34987ea1ab1b7dc960c5bf19772d57de3bd81f63ceae61e87e932f05d47208390738dd8df30cbca71d8d0ad5d4b7887 SHA512 d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100
 DIST gnome-terminal-3.40.3.tar.xz 2609060 BLAKE2B cc0ef61b2ffbe7dd93117acad6ad2b1f737fb74417c2c84a98cdf3c28d29a7aaeaae4461a0160549eaac8bf9fdc1852e67ffb2e2570b456132bc1726a7033486 SHA512 a4de627f88069f3a1cc69a53dfe4c29ebdd22ee604b0e0b1702dd1c7a14a5fb877968c020bece7f0d5d7dc496019ffef0f9b2d15cb17c80c0a99b331a64f8346
 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
-EBUILD gnome-terminal-3.40.2.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
 EBUILD gnome-terminal-3.40.3.ebuild 2716 BLAKE2B fb0820ad2f10d352e00490f0e47f4daca12292209bc7d4c40f97ed43373dcc73af1dd7dfde85285b36290c15af6a2cf1b3197ba5b5f3183840d77d9b9a33537a SHA512 ccf66f14ccb081e82b364320979511ea6d9d1598ed913185d2363c126c2e7e967c23880792591e1a1b5848244fa82391a1a0b85339256d39e0cc17bdb1acab3f
-EBUILD gnome-terminal-3.42.2.ebuild 2838 BLAKE2B 05a377c453a4df08e02cdeff8f2a78ab375c1a584ed0bd462e76eb23cfc4d00498096d963fbab72ffec8905f28fdd18601882089a217a971bdb41c04702b8735 SHA512 dc78f93f5131e80b6d1877596c2b1f6f7bd0dc95c16d24a310a8fd7679020fa84cbdef089b2cfd47a8dc7b725b5a9dc932c3a5cefce0aa52c98459c7e15ce03a
+EBUILD gnome-terminal-3.42.2.ebuild 2906 BLAKE2B fc8c1a5d742681562149b1334edc80bb301faacc1a61aa3efbccfa64883b54e5dd7de6a14dd74df16cdfb8b72fa6a78846da4800b16683b21b8a8a82d1beb5c5 SHA512 4cc09be2b0ff9184ae14ffd3f95d76596c0f320b652aeb159b6bdb28cb8dffb977ba1a1cc61f633c767c9da027df4e86d2d74a475ce332ecbcceaf591fa8f414
 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
new file mode 100644
index 000000000000..e0e9d39204f2
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,39 @@
+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/gnome-terminal-3.40.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
deleted file mode 100644
index f134dbb1f61e..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch.xz )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~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?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-"
-DEPEND="${RDEPEND}"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-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() {
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore "Set title" support
-		# 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.40.1-cntr-ntfy-autottl-ts.patch
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension)
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog HACKING NEWS )
-	gnome2_src_install
-	if ! use vanilla; then
-		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
-		insinto /usr/share/glib-2.0/schemas
-		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
index 066ebe755cd7..f47df2f66e01 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.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
@@ -40,6 +40,10 @@ 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
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index bd07f4cc3ac3..55bb2bda59b7 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.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.23.1-r1.ebuild 611 BLAKE2B 8146d5c5a87f4f71596e4f489df05b94c62bd0fdfa6145f5cdd4aa3fe2f0d89b2bf086f6a2459a907257ca391ecd1262152803ed2ed1844105f35ffe01c690cc SHA512 4e62146cd2baacde6010f82869bcc81f8bebd85f6ddb7242295cec3d3023b2052016919c71974bf64898dd8c211d80213493d6dc38cd83b003709cdb3f839e7d
 EBUILD kitty-terminfo-0.24.1.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.23.1-r1.ebuild
index 651df9c89ca3..39ccb7d51e93 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.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,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 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 101b3c229d30..060243ffc4b9 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -3,6 +3,6 @@ DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee
 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-0.24.1.ebuild 3179 BLAKE2B d575fa05b98f0a089ab0101f766cb1cb7b656d0d853d2d7f019125a353371c55a76b86d41a120c33150cfa09559d52afb48d243c9a4043bc069896fbc411a48e SHA512 9f473f767c840f5e58b0560c33d4947d21493d5338c088292459306622abf118fd3c47682e4fab7d87095581c7bd6d1068491157af53f33cec0b72d28add7ef9
-EBUILD kitty-9999.ebuild 3179 BLAKE2B d575fa05b98f0a089ab0101f766cb1cb7b656d0d853d2d7f019125a353371c55a76b86d41a120c33150cfa09559d52afb48d243c9a4043bc069896fbc411a48e SHA512 9f473f767c840f5e58b0560c33d4947d21493d5338c088292459306622abf118fd3c47682e4fab7d87095581c7bd6d1068491157af53f33cec0b72d28add7ef9
+EBUILD kitty-0.24.1.ebuild 3244 BLAKE2B abe736d9d59ecb8486ac0790107a8c0c592986427c0a17aee1b7c4d2e2d5ba16d5d5fb41431f6950719efdf6c2e4e5884f4b6164e15d58a07b046df29b9b8dd1 SHA512 1d5609025d1aaac3084ba183d123e6c4a3ae4bab1d39c02bf48ec539026c2324fb29ce146631135422dbe93b41a101c362fec9667dffc6a48505cbc1fac518cb
+EBUILD kitty-9999.ebuild 3244 BLAKE2B abe736d9d59ecb8486ac0790107a8c0c592986427c0a17aee1b7c4d2e2d5ba16d5d5fb41431f6950719efdf6c2e4e5884f4b6164e15d58a07b046df29b9b8dd1 SHA512 1d5609025d1aaac3084ba183d123e6c4a3ae4bab1d39c02bf48ec539026c2324fb29ce146631135422dbe93b41a101c362fec9667dffc6a48505cbc1fac518cb
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.24.1.ebuild b/x11-terms/kitty/kitty-0.24.1.ebuild
index 1b783a910a30..f12b599aaa04 100644
--- a/x11-terms/kitty/kitty-0.24.1.ebuild
+++ b/x11-terms/kitty/kitty-0.24.1.ebuild
@@ -124,4 +124,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 1b783a910a30..f12b599aaa04 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -124,4 +124,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/qterminal/Manifest b/x11-terms/qterminal/Manifest
index fd1393da13ce..f9d276f56cfa 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD qterminal-0.17.0.ebuild 843 BLAKE2B e3ebbd0ddef4d7288cf24702325ae411c8e76e6247b4a94823e830b09c60b32e6fa14ec778f0084a9639349e200bd8af09f8c19b16e950605cecbf5b7b44fc43 SHA512 01fdff5baf310fd829ba096513ac42185b86d460a518db3e4be7c77c80c0795174221f21a696b824edda94b0496a507bb9f274e8eda4bd228d0cde79236fca9a
-EBUILD qterminal-9999.ebuild 834 BLAKE2B 7d083ad025507a0c640d684046b9e6fe7c3dde4afa713cb7304db6602e2de8b5498e4f5a2eed85db450f6d11b4a8c208f28a20ae01e4161c505b064e4a38abd7 SHA512 662116f94c3132d4a94e4d3f9544fc43ed5f2baef0fe5399f7e3b59f71a51e22e9a1e14618feb629a34a61d6b2e0f56d87f7c361681fbe911eb1f623b68b12c0
+EBUILD qterminal-1.0.0.ebuild 885 BLAKE2B ecca7cd2757a8e30fb2da4d22937dc63d66745fd7db130274bb4c1a8346951533d9c01df0fe7ab0bb2e792d94be8ccadb7e9b1e76c536a67ab5be18a62b767e3 SHA512 ef14c6d807a6d20624aa9b6415b235a9d76adaedbc9c5a8221b98b9211c9a567258707ccdfc598c5941b7dbced3c0afd9f5cdafc156c6050cd70b9bbcba7d6ab
+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
new file mode 100644
index 000000000000..34e20dcedd2a
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 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.10.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}"
+
+PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" )
+
+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 fc217e25da76..34e20dcedd2a 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -1,37 +1,37 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt.github.io/"
+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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
-BDEPEND=">=dev-util/lxqt-build-tools-0.9.0"
+BDEPEND=">=dev-util/lxqt-build-tools-0.10.0"
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	>=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}
+	~x11-libs/qtermwidget-${PV}:=
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.16.1-appdata.patch" )
+PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" )
 
 pkg_postinst() {
 	xdg_icon_cache_update
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 45277d2946dd..fced9ee09e8d 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -7,5 +7,5 @@ DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAK
 DIST rxvt-unicode-9.29_24-bit-color_aur-9.26-20210712.patch.xz 7568 BLAKE2B 8ea5d813e00fd4012d145acf70e3d9b0974dddffd203fbec4bf06a0da1c9368ec316fc2903dccae3a5d71d684fd93b2a09ed208f26be1e85f77c702494db4e54 SHA512 baa226ca9adf6025a72dea925ec3be16186502bb4aab21dd61ef1f7c3e2eb793e7a1dc9619ed8228166758daa2879a465da2ace3f3b14545808955388bd2b74b
 DIST rxvt-unicode-9.30.tar.bz2 877186 BLAKE2B 645164e37e9e484c66f5047836689e4e4727575dfdcbefc64affb70d9110497529fdcc7d476f77737efed5cee4af314e1e1ccbcb42b506bb7e653b827c24a0c7 SHA512 048d5f635a61bc1a739d5cbc09e7a9f77cee18c81df468ce1ff0a62866ced06fc4ec258bb015d2484a7e7bad2339f0bdd79bd824d649c2553a80bdef9f199e99
 EBUILD rxvt-unicode-9.26-r2.ebuild 3021 BLAKE2B 80d258c5d5e5319b98370e9d59d0200e5a7fa8540a4c0b1a3884004d7399e0d3c22c0555554cd81c8a23a5f854c322451adfd447f549cb5fe268d2816fec8070 SHA512 ed19df722eb87d6c18bbe0155e8a5e15738d3353a7fbfccf95baf769eb0ca39bc5e3b24b75acbab086cdd65a1c181bbe1c3f1f15a9b0848f99602d332ed50369
-EBUILD rxvt-unicode-9.30.ebuild 3016 BLAKE2B 1bea3013336d8a223b1998e3231130a333a5b77a9d55c4191e0e7bd53bf660e94874535ffd3911e09472bab99d5f2110a27ea74643027a45100e80a3af90f138 SHA512 d0741eb4e28d8e89acb9b11035b726ad53e18a38a9636cbd1f8e1687562ee2f3075ef67d15fa01a1c110c76d548a1d6954d5a8b0c01a3dcd543f5d251d101423
+EBUILD rxvt-unicode-9.30.ebuild 3069 BLAKE2B 914399f6f4faf9c0d495551e06d6c4e22ed29a5ae508b54ee6eee7651d740895bb03d131410f0cc497dd3230f9e3f9595f48c4bd8bd4744973385cd70f4e2f25 SHA512 94d49a9038ad2f7ebd7db755717743c0ec366e968c6252053d59b6327275978e7608e482a28842d1e4168a042df2e319c22949096195c1ede7d1f631b258aac4
 MISC metadata.xml 1577 BLAKE2B ca4f7c5d7697dd6a3bb087b59a1fa76501372cb802061285b0c35c55a014cd044a2c1a67db94d4f5c3cf86afc5307e3052dbd533287664fa3f855f79bd575e77 SHA512 65ee848f71db806ae5e8016243d328b786b2135705e4d2d5fae30e8b018b1d215327a8310be2845b0958c6af92be75082bc16e5007f1f2b888dba74e9f8e74b8
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild
index a0b503f4a33d..8ed6dbcc8ffd 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.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
@@ -16,7 +16,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl startup-notification unicode3 xft"
+	perl startup-notification unicode3 xft"
+
+# Bug #830329
+REQUIRED_USE="perl? ( fading-colors )"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r6:=
 	dev-libs/libptytty
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index fff6f51c72d1..925188d96a0b 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,5 +1,4 @@
-AUX sakura-3.8.3-gentoo.patch 479 BLAKE2B b17b1a39e46db6f8f14d59b2bb2f353229c9bfe63461e9447091f1650deb5849276581ff70f9d2646e86cc3efa43b5c21eca7ca8e02ef480d73920187cfa0f74 SHA512 8a7354df38e9968ebc366ef3835f117256bc364ea99ca99541ca6e0d63c0fb2f5768a6e628f3cffceaba8d4a6a1a903683718690e5a315597d3d8989892b95f2
-AUX sakura-3.8.3-opacity.patch 571 BLAKE2B 0641cde4fabdc7d6b39ab82116e7999e03224d7bcd2375487146f9574187758a37113ecfbabb82398a1e4afa89a5e61b54fe7c286af61404006390916617d73c SHA512 0907cc2d9caa2b9e0f42f3e0644d44dcea603584080753db6dd78f4814920ef8a1ad45593d7a4b485392c11e0b7855fd78b7a3134072de2d7bc926e27edda2c6
-DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e
-EBUILD sakura-3.8.3.ebuild 865 BLAKE2B 11d4aff567fd3ab1dd7a3a8be2df654dcd51728c0dc7cb12ed9dc0ee49fd5482a92b61a458745f25d66f21caebeddddab556b6d7346979dc438128bad1096570 SHA512 62ce919e21fe558a0200940e068e0a45ad92f99eb3e0fea6f8e49ba8257443a3604ad28a71a1c2692c9dc975cfa94d5623d932264ca8782b1ced3203a0bcd4b1
+AUX sakura-3.8.4-gentoo.patch 636 BLAKE2B b091feefd69ce0c0940837a5f9688b421ea9f47b022b1e45d3d1d6e9047fde48c994488d46e14de8bfab332ba45bc70fcbe5c2dc6744ff5f97afc50786322476 SHA512 e6c38bcea03561b874fb3110a6f5e6508091c2398fd578e9daf9f7c55d86e56197235795a525f4d96b03aa365f8152b5869602e206a261c0738cd8f224ca7c67
+DIST sakura-3.8.4.tar.bz2 70492 BLAKE2B 4f53a86813de49d1f76c0a209a825b19601a22b4078744a0e4dfe21afd000e524a3705e8125b275b3615b35e5e7f38934270baa73d190e06dabf4284d4dab536 SHA512 9450f523555a40c66375304cb4134686dddd1b15233a70e488d1220fbdacd46b8e93cb679bbd1c235cc8d08f08551743b4780130d282d94d258247436a84ed61
+EBUILD sakura-3.8.4.ebuild 831 BLAKE2B efec7ee938882aa7159c90c753b8e673059294bc38e28b8f26f098db1982b77a77952fbf67c4dcbf02ca1d910210e50127c19dc3e6b038c935b894d5e4cc94f1 SHA512 5641fdf132d93cc8b46b2228944ea274eabde789ea1044cd05da37a74c2aef88c8dde4fc1bb2ff8617cf80bc7cb59224fb71a35c8ff1c3fcca1f4be25907172e
 MISC metadata.xml 851 BLAKE2B 823d08b0bc994ef9732b69188f2d6f55bd58709104517313093ee1f5d39fcb40e01a54fe47ab0e80f9b42b523f38129ac2ac0f1fdfb8d08338c3d4bb893914ec SHA512 99c6563360d9326835c2b49d8e77c28c07573c3dc14303f6ed4e1699ddc9ed199cad03ba841556903845a43d245c692ca0909f825c9cbd4a198a56a6b9dee0ae
diff --git a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch
deleted file mode 100644
index 4bb4ba88f189..000000000000
--- a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix regression with opacity not being applied on startup.
-https://bugs.launchpad.net/sakura/+bug/1942665
-https://github.com/dabisu/sakura/pull/5
---- a/src/sakura.c
-+++ b/src/sakura.c
-@@ -2180,4 +2180,8 @@
- 	gtk_widget_add_events(sakura.notebook, GDK_SCROLL_MASK);
- 
-+	screen = gtk_widget_get_screen (GTK_WIDGET (sakura.main_window));
-+	GdkVisual *visual = gdk_screen_get_rgba_visual (screen);
-+	if (visual != NULL && gdk_screen_is_composited (screen))
-+		gtk_widget_set_visual (GTK_WIDGET (sakura.main_window), visual);
- 	
- 	/*** Command line options initialization ***/
diff --git a/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch b/x11-terms/sakura/files/sakura-3.8.4-gentoo.patch
index c9f2c5a85f44..8289d3ed9ea0 100644
--- a/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch
+++ b/x11-terms/sakura/files/sakura-3.8.4-gentoo.patch
@@ -1,15 +1,18 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -40,8 +40,2 @@
+@@ -39,9 +39,4 @@
+ ADD_DEFINITIONS (-DBUILDTYPE="${CMAKE_BUILD_TYPE}")
  
 -IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 -	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 -ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
 -	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations")
 -ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
--
+ 
  INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
-@@ -59,3 +53,2 @@
+@@ -58,5 +53,4 @@
+ 	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION share/man/man1)
  ENDIF (POD2MAN)
--INSTALL (FILES README.md DESTINATION share/doc/sakura)	
+-INSTALL (FILES README.md DESTINATION share/doc/sakura)
  
+ FILE (GLOB MO_FILES po/*.mo)
diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.4.ebuild
index 717bbf73513c..ffbb0678d52d 100644
--- a/x11-terms/sakura/sakura-3.8.3.ebuild
+++ b/x11-terms/sakura/sakura-3.8.4.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
@@ -28,7 +28,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-opacity.patch
 )
 
 src_prepare() {
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 8ede05a68055..35d578699ba6 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,3 +1,5 @@
 DIST tilda-1.5.2.tar.gz 485261 BLAKE2B 2ce0059ad695ac3e920cf8e40841b850967ff1e05b88a1c527b7154112c88a3435b66d0f31b882b6fdaf0dee038b7a7e6ab0401184ab701bed8d23d44a2856d8 SHA512 5f950696626005d6f8711fe1403313b36f065796ac07946e9782997aaf67a4bfdb3bfa5e37889bff95d77655d3546100a48327bfa175aa24c39a28685ee0306a
+DIST tilda-1.5.4.tar.gz 485611 BLAKE2B beced68e0712fdc3f4f46a1d839a87e91ecf7e84dec500908efa510d7b43d0c0bf6b5e296c3df255ea462cf08f5107aa324d5a0a6abb134917a054366912a068 SHA512 6982a14a89d148c04e08df0c7566ea7b3e340252fa1a3e434450443f7464e6805caee46afda9b385633a4b9c22d2f2d283641082a1e009f301c3a1bf508c3b29
 EBUILD tilda-1.5.2.ebuild 709 BLAKE2B caf0f2f3ae738f1d83eed3d8a1ddd8a129be81ebde72a5fb123160d836d1598710ea7b0f79d141ba0085cae768114bf58f472fc5c0ec3c914a8bda742bb883bd SHA512 eee1562a17400a3ab2d2149bf07284b2507f382b8788767c73820211ad764f5d45cf938d1e2ac10a809d01d759ffe95cca1540335f1e1c4e07ff3636e7025dea
+EBUILD tilda-1.5.4.ebuild 721 BLAKE2B fab581ad51534a048afb6a6b6bbe4eff727a0c3a7fd2d5f829ff4115fa4dd66feb3074cf10676e7e3037b579a176a095312c5a19a87dcde448c796c6b9014f17 SHA512 5489f5e90e9f1fcba9067de2f790d3d86d60a3e6b9516fa1f0bd9164f956db6c04048fd30076b59034ca05f52cb6636fb03d7d81b966e92285be7fa9458c0b87
 MISC metadata.xml 242 BLAKE2B 9b338f1eb44c24956b9596e6a05518fa7fd906b726fe00f2e2a7412cdce3cee52c1441f48036cc06fa239c4fd220933b50e17b229eb5ca9fe8ce5379c085756a SHA512 d290789b741e9f43df1ee2a05c22772aac504ff031a022a9462d533b9fe700ecd9b00b24db7137ca2e498236b4c624b82b280e31549b0b0641ce09b041b2619d
diff --git a/x11-terms/tilda/tilda-1.5.4.ebuild b/x11-terms/tilda/tilda-1.5.4.ebuild
new file mode 100644
index 000000000000..8a62f1c1038e
--- /dev/null
+++ b/x11-terms/tilda/tilda-1.5.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
+HOMEPAGE="https://github.com/lanoxx/tilda"
+SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="x11-libs/vte:2.91
+	>=dev-libs/glib-2.8.4:2
+	dev-libs/confuse:=
+	gnome-base/libglade
+	x11-libs/gtk+:3
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	append-cflags -std=c99
+	eautoreconf
+}
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 8eec03855850..d327e5b17e6c 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,6 +1,6 @@
-AUX zutty-0.9-freetype-2.11.0.patch 1072 BLAKE2B 91b443535e432304c80df2fa91995eccac32bdc2e1c6bb95f55450b57b72789cc50f485c0c4376db32425481d17793985b4ebdeeb4093dd68d4323f9cc2dc04b SHA512 df7a4da6367a05d15dfd8dbe03ee59d01d385600b96798761202016e014e881271dce6e596a2fae2e155793e25b4743bda43ceb1a52d08eb6c327886b02b8180
+AUX zutty-0.11-cxxflags.patch 784 BLAKE2B 06dcb5309326ff43337d32b52d9ea03dc2673020492640a37bf91a8d709bf19afa51850fabc5f6a08fedcf91dbff5fc28ffdf7719aaa98dd475e4527321d391f SHA512 7c8e425375d513c2591b3ef153054811a2c3f88134aa27f9bc3aa2b8328a5c10d1938a606d0ef11f168671537bc6d5773570c9947f7c99871f668540d76fc8c3
 DIST zutty-0.10.tar.gz 336599 BLAKE2B 0041bbbc268ff042bac6bea1984ebf05d958f622b4c2e736bfe3d18e3a224238f27a7ef9920b8f7bc820705ce7560f20819650ec27fb3e5fc13dbef76fc6d0af SHA512 f499fb499779f8b5936a03c48e3c042f5fa0f0c99d3b24a4c9b963c2df8151561ac82456625d768e65f75aea641539a036300f1f99404eecfd15a0a25aeb6779
-DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
+DIST zutty-0.11.tar.gz 343469 BLAKE2B 9cd040e72d0ea76a526d099265b3a0974d40b1b8b679ff3baafc47f827b140943ac8bc13676831245e219ca1335ded7aca1e7826baf175fc63e88012791785e1 SHA512 84e8402a310adc80c698ded38fa3eb8ba44034f391e2538bccbdbc4082e239dc0d6ceb20504eeab4e5d2499ded55ef0941ae2e5d07eeb809d1059e5449cdb708
 EBUILD zutty-0.10.ebuild 682 BLAKE2B 48c4ca8530d0eb51a88c2e8494987e59d89e11a53379be7a704c889e128f17d07a71f607862d025c6388013ba1c6b6558680640c4b19f79932a4d4ea80f14815 SHA512 efe82d8d68e47cfa54bc37dbea6b87abeeb5db55fc560594f001dae40fe60139562858f07d300dd4333303681f9878a016e6fd2e374f18775b26bd597cf7d01d
-EBUILD zutty-0.9-r1.ebuild 758 BLAKE2B 5aff0a097a3c6c0fe046033b1a4af0a9168b68dff979a78b244588c47e4a9e59911677f31729edfa6232804acf91942dc176512daceb41afee74d840b8f78dbd SHA512 6a7c06d5a0923c8fdfa38bbd2bedab753ff5e1f1d0d73d88aff8f2e2f3113f7f0731217fe2c3f3c6716a267e425ccef8806d9b84fb9bdd0a45fc840596054f40
+EBUILD zutty-0.11.ebuild 970 BLAKE2B 24eeaedd8c9119ac5242342e376fcf93cac9552d680f6a41eecdf0db5aaec7e95457b0dbbbe7487e260507d2aa3e62ad09f51d84d164df7fc5ce6da09a0c6071 SHA512 472f41e18cc08f375d234212146166523947b43fbccfad250b1e2c9be2f6003e9c027c26c349d669080e3677a278bf57ee59da1a574284d7824c8368e8706347
 MISC metadata.xml 1157 BLAKE2B 883ce392103af3b9f9be08766807134f21136c3e40d622b6e29b9da3ba3e08ac461856ea64c32110ac6d169a92260ebaffc9398ed1fa9ad44f2eaaae18336faf SHA512 f2eb0fc8e9ef6c505759c3721ca65636c3d76fede249675a57f23f1a3498a5eb2290fd1ba0c51c97d726483a0b6d2ce1e3310c621ce67401509c21010ceb75d5
diff --git a/x11-terms/zutty/files/zutty-0.11-cxxflags.patch b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
new file mode 100644
index 000000000000..19b6649bb561
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.11-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', '-march=native', '-mtune=native', '-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/files/zutty-0.9-freetype-2.11.0.patch b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
deleted file mode 100644
index b5d62204e6be..000000000000
--- a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c73c99d6b024047d9f9e53e263be56093b6bf986 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Sun, 29 Aug 2021 19:15:01 +0100
-Subject: [PATCH] Prevent rendering glyphs twice
-
-Characters are loaded with FT_LOAD_RENDER.  Calling FT_Render_Glyph
-again causes an error in Freetype 2.11.0 and later.
-
-Thanks to Stephan Hartmann <sultan@gentoo.org> for debugging and creating initial patch.
-
-Bug: https://bugs.gentoo.org/809611
----
- src/font.cc | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/font.cc b/src/font.cc
-index f8da582..350a1a6 100644
---- a/src/font.cc
-+++ b/src/font.cc
-@@ -255,12 +255,6 @@ namespace zutty
-             std::to_string (c));
-       }
- 
--      if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL))
--         throw std::runtime_error (
--            std::string ("FreeType: Failed to render glyph for char ") +
--            std::to_string (c));
--
--
-       // destination pixel offset
-       const unsigned int dx = face->glyph->bitmap_left > 0
-                             ? face->glyph->bitmap_left : 0;
--- 
-2.33.0
-
diff --git a/x11-terms/zutty/zutty-0.9-r1.ebuild b/x11-terms/zutty/zutty-0.11.ebuild
index cdf1da5f9cd0..9363c3151d1b 100644
--- a/x11-terms/zutty/zutty-0.9-r1.ebuild
+++ b/x11-terms/zutty/zutty-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit python-any-r1 waf-utils
@@ -14,11 +14,17 @@ SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+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
-	media-libs/libglvnd[X]
+	virtual/opengl
+	x11-libs/libX11
 	x11-libs/libXmu
 "
 DEPEND="${RDEPEND}"
@@ -28,8 +34,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Bug 809611
-	"${FILESDIR}"/${PN}-0.9-freetype-2.11.0.patch
+	# Remove default CXX/LDFLAGS, bug #830405.
+	"${FILESDIR}"/${PN}-0.11-cxxflags.patch
 )
 
 DOCS=( doc/KEYS.org doc/USAGE.org )