7 files changed, 44 insertions, 31 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3edcd9112967..3eeec827c745 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 4b30cc16fcee..b4f08f24a72a 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,5 +3,5 @@ DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a
 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
 EBUILD gnome-terminal-3.40.2.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
-EBUILD gnome-terminal-3.40.3.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
+EBUILD gnome-terminal-3.40.3.ebuild 2716 BLAKE2B fb0820ad2f10d352e00490f0e47f4daca12292209bc7d4c40f97ed43373dcc73af1dd7dfde85285b36290c15af6a2cf1b3197ba5b5f3183840d77d9b9a33537a SHA512 ccf66f14ccb081e82b364320979511ea6d9d1598ed913185d2363c126c2e7e967c23880792591e1a1b5848244fa82391a1a0b85339256d39e0cc17bdb1acab3f
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild
index f134dbb1f61e..5476cb9249a1 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 2eb1e363ac67..a40e700430c9 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,6 +1,5 @@
-AUX zutty-0.8-gcc11.patch 517 BLAKE2B 0d8432a219e20b985f13e75814440640c0a83f3a92df313aad8cc3f6091b3e5f3d503f87b9d48574e88ae64206b9e0b1434166c125a46dc669de02bdf2b13ad3 SHA512 7b3167d6643dc7672c5aa2ab1215c73af6b9e7c1072a012810d45defcb2362535bb2b8b88bef321cad28e6efe130811e3d314da0a1f795ba4a748c1011381dac
-DIST zutty-0.8.tar.gz 307235 BLAKE2B 897fea3735785ba1e8c811adbc90b96598c04f3ec19d9d3027745e5b9d3c1d21c55343b9409e48327139545e2675346be90d84af422d3ce97b1737cc287bb96b SHA512 75c5637fe8f0c8aff41e394a05f304f56bf03faf1dfa78807ca930a722536a93f54012f051f411b4e8ff478dd991f5b8ca1285fcd674879eac568c8971004317
+AUX zutty-0.9-freetype-2.11.0.patch 1072 BLAKE2B 91b443535e432304c80df2fa91995eccac32bdc2e1c6bb95f55450b57b72789cc50f485c0c4376db32425481d17793985b4ebdeeb4093dd68d4323f9cc2dc04b SHA512 df7a4da6367a05d15dfd8dbe03ee59d01d385600b96798761202016e014e881271dce6e596a2fae2e155793e25b4743bda43ceb1a52d08eb6c327886b02b8180
 DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
-EBUILD zutty-0.8.ebuild 734 BLAKE2B 6a1f930a041b6431556ccc3bdb764dd773a7b1df1c46e1dd6125c8c4cbf4807b59ee081762b277f4f4986394ee0555949ed6c4827b0374904a759eeca58a2dd0 SHA512 7d5de7d3092a84104b49e77908e3475d4316eefbc4f3932334cf3fbc4477524366cfece3f8938633650c6c599904f19d7b19c67c574990ad98d9ed86f4f9315f
+EBUILD zutty-0.9-r1.ebuild 758 BLAKE2B 5aff0a097a3c6c0fe046033b1a4af0a9168b68dff979a78b244588c47e4a9e59911677f31729edfa6232804acf91942dc176512daceb41afee74d840b8f78dbd SHA512 6a7c06d5a0923c8fdfa38bbd2bedab753ff5e1f1d0d73d88aff8f2e2f3113f7f0731217fe2c3f3c6716a267e425ccef8806d9b84fb9bdd0a45fc840596054f40
 EBUILD zutty-0.9.ebuild 684 BLAKE2B ebc469725ac2ed634719b3346d533341fc81f71a7435903f1339f73bc84b54e22c702153af170ffb77d42a6b2bf19bef5b18743dbaa8ea0a4969b0736d48d915 SHA512 20f0d3cdb20e309dd39b621a9142444a05c63534b53f2dc03a0d6ae85752449d3383e87d5b34db86b3458dbd4fab28dd80c1456f33dcac55cbf7c3e954c342e8
 MISC metadata.xml 1156 BLAKE2B 86e49541468db22123cd56f6aee08e61e6e79daddb817a11bf549b7c50cbcf5ed165316772c726caf7aaa0dc1321753ec3cd36eb25d88fad4216520827ad59e2 SHA512 3caa4dbda104f1fc1ab8326e40de573d2d8ba445c3a1002dd5c24d64d2bba9c5808addae2508d267497d80d90cd0cf285244a9874f9a31f62175f3c77adfadc5
diff --git a/x11-terms/zutty/files/zutty-0.8-gcc11.patch b/x11-terms/zutty/files/zutty-0.8-gcc11.patch
deleted file mode 100644
index 75b8234d24bf..000000000000
--- a/x11-terms/zutty/files/zutty-0.8-gcc11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 75bffab09e842bfff56a6cf111360421a5ee9e15 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Thu, 29 Apr 2021 19:23:00 +0100
-Subject: [PATCH] Add missing include to fix GCC 11 build
-
----
- src/font.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/font.cc b/src/font.cc
-index 0dd2166..f8da582 100644
---- a/src/font.cc
-+++ b/src/font.cc
-@@ -15,6 +15,7 @@
- 
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
--- 
-2.31.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
new file mode 100644
index 000000000000..b5d62204e6be
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
@@ -0,0 +1,35 @@
+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.8.ebuild b/x11-terms/zutty/zutty-0.9-r1.ebuild
index e4986f621853..cdf1da5f9cd0 100644
--- a/x11-terms/zutty/zutty-0.8.ebuild
+++ b/x11-terms/zutty/zutty-0.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	media-libs/freetype:2
@@ -27,6 +27,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.8-gcc11.patch )
+PATCHES=(
+	# Bug 809611
+	"${FILESDIR}"/${PN}-0.9-freetype-2.11.0.patch
+)
 
 DOCS=( doc/KEYS.org doc/USAGE.org )