16 files changed, 291 insertions, 68 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 5dcca9f2b8fe..345d59fe1e69 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 00f1d6b5ea5d..10477b37e1dc 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,9 +1,11 @@
 AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
+AUX rxvt-unicode-9.22-sgr-mouse-mode-flag.patch 5613 BLAKE2B 28cf8af70841027ba254704b3bb94e2bcf7f8f6743963056c046279aeef4fc8f866711144880ac6a3ad6acd4ed86332f497dff905f3836775579ba5e90328218 SHA512 b6bf180cd25f46fd22841aa8322839886712312341950e3abeeec1a44d73bbec8e7467ce09878c84b86263ab7067443529a89f017e54dceb84b189477e58f10e
 AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
 EBUILD rxvt-unicode-9.22-r3.ebuild 2125 BLAKE2B 01665c665a51995cdfb6c51ea5dee7dfdc399740159e70fde60af42289d541efde91fde02a2ad8c4d40300c78be488b78e6333afa69000dae0dc2cf86ef0ab42 SHA512 ed31c9577fd093ccd946cd4f8fc8c371c06fd7abfb596c5014842dcd9be48bd50d966eeac77f32360cab2f5709d887514050fde5f51660d4b4cd1cb558076bfc
 EBUILD rxvt-unicode-9.22-r6.ebuild 2741 BLAKE2B fb213b8386cd39249881ed4aaeeadf2d384dd9775dbc9b0d57d8e8ede12ba92fa856e0169882bf34f5b47e2afd70838d382934de1d656da82469aa401f04debf SHA512 cae385d4b8a2ee39b60ec3c4124792acbccc1e2bbcd14dda808eac0af500120129a3bd1e73f60ee6118b8e39aaca8918ec746b1b040f09a1dda00590e5f4c9cc
+EBUILD rxvt-unicode-9.22-r7.ebuild 3064 BLAKE2B c2d667b5155e7cf4d8243efe899d6a849b20a8614cf4981c5c29bf6ba68d300fe8985a7385c7172e4959e498c625eff1f2dd0e538c33c51cd1f0c6c9dcba6f26 SHA512 cdd14f22da8a99b02328b7ecab0ea265f5356bcca66b43ae96ea25d7fa03033ca560fdfbec93112a792838c7c344565246fe8241d3f1e27ebb4c40c6a66ea38e
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
-MISC metadata.xml 1536 BLAKE2B 3cb37fce2861ce60176fc096ed712ff5e7932a28d6527d8ffe296c85c1068d045e40d59fd6f3bb0e4480513d16388a570c1357cd89f5c104638329cae9bace47 SHA512 7facca26d8c97b8cd5f0030d89c86c272821f5a1a8f87f3ddeacda713ddde1cec71969c429bf711ff42745a1652552753c0f9fda42cb95543e6b7e13cf01c368
+MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch
new file mode 100644
index 000000000000..3f6f5d90618e
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch
@@ -0,0 +1,165 @@
+diff --git a/config.h.in b/config.h.in
+index 914d606..b869bfb 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -9,6 +9,9 @@
+ /* Define if you want handling for rarely used but handy features */
+ #undef ENABLE_FRILLS
+ 
++/* Define if you want support for SGR mouse mode 1006 */
++#undef ENABLE_SGRMOUSE
++
+ /* Define if you can embed a perl interpreter */
+ #undef ENABLE_PERL
+ 
+diff --git a/configure.ac b/configure.ac
+index 0da3b59..c8b9c80 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,6 +76,7 @@ AC_SEARCH_LIBS(gethostbyname, nsl)
+ AC_SEARCH_LIBS(socket,        socket)
+ 
+ support_frills=yes
++support_sgrmouse=yes
+ support_inheritpixmap=yes
+ support_fading=yes
+ support_keepscrolling=yes
+@@ -109,6 +110,7 @@ AC_ARG_ENABLE(everything,
+   [
+     if test x$enableval = xno; then
+        support_frills=no
++       support_sgrmouse=no
+        support_inheritpixmap=no
+        support_fading=no
+        support_keepscrolling=no
+@@ -137,6 +139,7 @@ AC_ARG_ENABLE(everything,
+     fi
+     if test x$enableval = xyes; then
+        support_frills=yes
++       support_sgrmouse=yes
+        support_inheritpixmap=yes
+        support_fading=yes
+        support_keepscrolling=yes
+@@ -359,6 +362,12 @@ AC_ARG_ENABLE(frills,
+     support_frills=$enableval
+   fi])
+ 
++AC_ARG_ENABLE(sgrmouse,
++  [  --enable-sgrmouse       enable support for SGR mouse mode 1006],
++  [if test x$enableval = xyes -o x$enableval = xno; then
++    support_sgrmouse=$enableval
++  fi])
++
+ AC_ARG_ENABLE(keepscrolling,
+   [  --enable-keepscrolling  enable continual scrolling on scrollbar arrow press],
+   [if test x$enableval = xyes -o x$enableval = xno; then
+@@ -666,6 +675,9 @@ fi
+ if test x$support_frills = xyes; then
+   AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
+ fi
++if test x$support_sgrmouse = xyes; then
++  AC_DEFINE(ENABLE_SGRMOUSE, 1, Define if you want support for SGR mouse mode 1006)
++fi
+ if test x$support_mousewheel = xyes; then
+   AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
+ fi
+diff --git a/src/command.C b/src/command.C
+index 7b79f51..a62ef87 100644
+--- a/src/command.C
++++ b/src/command.C
+@@ -1282,6 +1282,13 @@ rxvt_term::mouse_report (XButtonEvent &ev)
+   int button_number, key_state = 0;
+   int x, y;
+   int code = 32;
++  bool mode_sgr = false;
++
++#if ENABLE_SGRMOUSE
++  if (priv_modes & PrivMode_ExtMouseSgr) mode_sgr = true;
++#endif
++
++  if (mode_sgr) code = 0;
+ 
+   x = Pixel2Col (ev.x) + 1;
+   y = Pixel2Row (ev.y) + 1;
+@@ -1296,11 +1303,18 @@ rxvt_term::mouse_report (XButtonEvent &ev)
+       code += 32;
+     }
+ 
+-  if (MEvent.button == AnyButton)
++  if (!(mode_sgr) && MEvent.button == AnyButton)
+     button_number = 3;
+   else
+     {
+-      button_number = MEvent.button - Button1;
++      if (ev.type == MotionNotify) {
++        if (ev.state & Button1Mask) button_number = 0;
++        else if (ev.state & Button2Mask) button_number = 1;
++        else if (ev.state & Button3Mask) button_number = 2;
++        else return;
++      } else {
++        button_number = ev.button - Button1;
++      }
+       /* add 0x3D for wheel events, like xterm does */
+       if (button_number >= 3)
+         button_number += 64 - 3;
+@@ -1361,6 +1375,15 @@ rxvt_term::mouse_report (XButtonEvent &ev)
+               wint_t (32 + x),
+               wint_t (32 + y));
+   else
++#endif
++#if ENABLE_SGRMOUSE
++  if (mode_sgr)
++    tt_printf ("\033[<%d;%d;%d%c",
++              code + button_number + key_state,
++              x,
++              y,
++              (ev.type == ButtonRelease ? 'm' : 'M'));
++  else
+ #endif
+     tt_printf ("\033[M%c%c%c",
+               code + button_number + key_state,
+@@ -2904,7 +2927,7 @@ rxvt_term::process_csi_seq ()
+                 scr_soft_reset ();
+ 
+                 static const int pm_h[] = { 7, 25 };
+-                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
++                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1002, 1003, 1005, 1006, 1015, 1049 };
+ 
+                 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
+                 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
+@@ -3710,6 +3733,9 @@ rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int na
+                   { 1003, PrivMode_MouseAnyEvent },
+ #if ENABLE_FRILLS
+                   { 1005, PrivMode_ExtModeMouse },
++#endif
++#if ENABLE_SGRMOUSE
++                  { 1006, PrivMode_ExtMouseSgr },
+ #endif
+                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
+                   { 1011, PrivMode_Keypress }, // rxvt extension
+diff --git a/src/rxvt.h b/src/rxvt.h
+index 5c7cf66..2ffd3fb 100644
+--- a/src/rxvt.h
++++ b/src/rxvt.h
+@@ -645,6 +645,7 @@ enum {
+ #define PrivMode_ExtModeMouse   (1UL<<23) // xterm pseudo-utf-8 hack
+ #define PrivMode_ExtMouseRight  (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
+ #define PrivMode_BlinkingCursor (1UL<<25)
++#define PrivMode_ExtMouseSgr    (1UL<<27) // sgr mouse extension
+ 
+ #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
+ 
+diff --git a/src/xdefaults.C b/src/xdefaults.C
+index 894aa8d..e5952b7 100644
+--- a/src/xdefaults.C
++++ b/src/xdefaults.C
+@@ -359,6 +359,9 @@ static const char optionsstring[] = "options: "
+ #if defined(ENABLE_FRILLS)
+                                     "frills,"
+ #endif
++#if defined(ENABLE_SGRMOUSE)
++                                    "sgrmouse,"
++#endif
+ #if defined(SELECTION_SCROLLING)
+                                     "selectionscrolling,"
+ #endif
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index e088706493d5..b2f262896f27 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -21,6 +21,9 @@
 <flag name="iso14755">Enable ISO-14755 support</flag>
 <flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
 <flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
+<flag name="sgrmouse">Enable unofficial support for the xterm SGR 1006 mouse-tracking extension.
+	Needed to properly support mouse events for terminals with more than 223
+	rows or columns, in applications not supporting the urxvt 1015 extension.</flag>
 <flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
 <flag name="utmp">Enable utmp support</flag>
 <flag name="wtmp">Enable wtmp support</flag>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
new file mode 100644
index 000000000000..3f1cb44b6c4b
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop systemd
+
+COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
+	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl -sgrmouse startup-notification unicode3 +utmp +wtmp xft"
+
+RESTRICT="test"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r6:=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	perl? ( dev-lang/perl:= )
+	startup-notification? ( x11-libs/startup-notification )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
+	"${WORKDIR}"/${COLOUR_PATCH_NAME}
+)
+DOCS=(
+	Changes
+	README.FAQ
+	doc/README.xvt
+	doc/changes.txt
+	doc/etc/${PN}.term{cap,info}
+	doc/rxvt-tabbed
+)
+
+src_prepare() {
+	default
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-everything goes first: the order of the arguments matters
+	econf --enable-everything \
+		$(use_enable 24-bit-color) \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable gdk-pixbuf pixbuf) \
+		$(use_enable iso14755) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable sgrmouse) \
+		$(use_enable startup-notification) \
+		$(use_enable unicode3) \
+		$(use_enable utmp) \
+		$(use_enable wtmp) \
+		$(use_enable xft)
+}
+
+src_compile() {
+	default
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die
+}
+
+src_install() {
+	default
+
+	systemd_douserunit "${FILESDIR}"/urxvtd.service
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
+
+pkg_postinst() {
+	if use 24-bit-color; then
+		ewarn
+		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
+		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
+		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
+		ewarn
+	fi
+
+	if use sgrmouse; then
+		ewarn
+		ewarn "Support for the SGR 1006 mouse extension in ${PN} is UNOFFICIAL and provided as-is."
+		ewarn "When in doubt, rebuild =${CATEGORY}/${PF} with USE=-sgrmouse (the default setting)."
+		ewarn
+	fi
+}
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index e0bf08731da4..e8477b4314f5 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -2,5 +2,5 @@ AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260f
 DIST sakura-3.7.0.tar.gz 64728 BLAKE2B 637d8c9a393fe2823943190ec3c1676d3dd900b574f58fc3f6d61709ac3b70081736f0804c0e7d8ec5a1409cc2651aa1c3bee04a04c5d3df4ac1432fa2a5c41b SHA512 1018ea952d491f68a05ee3b3d8ac70cbfb485687f76224f9a395ff6508e0e75ff58bfd12dcb534c86430da54803a3016619f441d8bd14e496df32f81e00ca72e
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
 EBUILD sakura-3.7.0.ebuild 1314 BLAKE2B 325c2e3d4072343dad837cebc180b7aa1322164b5a4f89945ae6f4e9ee780f65462deedc769eb36cc9ea7dc4ab1a1b929cffa08792bfafca89660dccb613db55 SHA512 066332356e27dd198600deef6ba976d539b7db4782dfd5bc98a2b035905b405d7c6e8c3aca4e91a8c9d782b6bee3dc726cec237250a77630bffef441490a1f21
-EBUILD sakura-3.7.1.ebuild 1305 BLAKE2B 53643fd3df797829905d3aa4a67d6262b92df2991a181e9c2bef76222cdfe93b850e11769e5ee1d48d54f87d25a67d8e0a192de3f28792077532aa3cc52087fc SHA512 c9b2aeb453b175172d2773a4563c964bc54dd0d567b3abad0369dac49d2932ae1a1500829ce99ece6cf1665147700ef85d6b5e560cac55a140e37e7eccdb6613
+EBUILD sakura-3.7.1.ebuild 1304 BLAKE2B 424e0319541931f96009e86f3833515f70032de85c77562344a8f4169571c0c58db40554d832e3134de3c734e4b41e9685a79ffa95f868f6561b1cc010c1b445 SHA512 40ad3fbdeb2e23ccc7ad9aebfaf90366f8e5ef41b80cc150f3e6b2ce9a00fda3904ecb2b6a93ccd15bd3922edcb9e7c78a201ed885b14b9d9caeb72d8899a35b
 MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb
diff --git a/x11-terms/sakura/sakura-3.7.1.ebuild b/x11-terms/sakura/sakura-3.7.1.ebuild
index fa7df4734c68..ed44aea604ce 100644
--- a/x11-terms/sakura/sakura-3.7.1.ebuild
+++ b/x11-terms/sakura/sakura-3.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 ~x86 ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.20:2
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index d7b6a497231f..866b026ae93d 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,4 @@
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
-EBUILD st-0.8.4.ebuild 1395 BLAKE2B 558c5149c09a586d4cbaac54d23c12215fc1621e101b418a2aa46cebd82de04f8cae569fbd42ae87168323604cfa06ee80c32ff3e0acf2810096a509589ee0ac SHA512 1852c3072d6caf0f28bb841a6e80af56c0c2cd25c80b124ef75759da9d7088e30d041b92ede4e9cc0e2cdcf299816d4694a79a0a6bc7518eeea1d01de7a1fd9c
+EBUILD st-0.8.4.ebuild 1396 BLAKE2B 8e01a488315ebfd3e99db6e98ab6b1c5c5d4d2557d6a80efc0eaad9b951dc8ac5839ce68053fc7b78f082685b4cc9df566eba5a6c1db25b0196b43e56b3406d1 SHA512 0d831ddceaa1371d27b72b7221f0319c34911e3b4574b6e047ee85b0ed2fe9cde399731206e4d217b90e4b2b963e286633c9117906bd897d0666e35c5458238c
 EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
 MISC metadata.xml 253 BLAKE2B c8d50d54b7f2ccbb05e040cf1d70b8cdfc51eca4935ec7a7b19ac9c22c5afd74a86ef411c87234ae6d41b60e1e0e5464d5411d888653d1a10ed79af4d77ec9f1 SHA512 80c74cb698ccf335fdf96109313b0916ae86bf371a1024b65704b537cef4234ddf09d6cca8b86c51e04558115e4f7ae7bcd6787ba23e2b4774c36aa4e65b5c52
diff --git a/x11-terms/st/st-0.8.4.ebuild b/x11-terms/st/st-0.8.4.ebuild
index 30359a2a81ed..59951e850953 100644
--- a/x11-terms/st/st-0.8.4.ebuild
+++ b/x11-terms/st/st-0.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE="savedconfig"
 
 RDEPEND="
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 8ef8836f6f75..6318a26e554f 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,7 +1,5 @@
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
-AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40
-AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d
 DIST terminator-2.0.1.tar.gz 934263 BLAKE2B b3b74f513f50f53bd9d6c0909daebb6912b20fd19cfb4ebcded443d2118a4608c3377e0498604ffec61e4d4ee48eb573a4e59ebef9a2b5708f52afb6949238cf SHA512 d0159ba966a10e51d18374ce2c9f700a2b9cc981496804948ed8d13b2896ad2c2a621337b6e5da8abee59616c16a64ac267e02b8ecd55d40c35d503397a9f50b
 EBUILD terminator-2.0.1.ebuild 1606 BLAKE2B 1b3272472d14dfd65ae31580ed3243b927dd9a725562676075d39b617a7922e1bd2a2e0acc77d64be76fd5d9359522aac24edf430f96c08cdf55e03f1e5fdb66 SHA512 19cdcb5c8ab1408283ff33263fcf6ac426c8458033cfb286b1484605940ae534476559c2d2259e38c84bcceee9f5972eeebd1ed200b38fac59505f600ef3941b
 MISC metadata.xml 828 BLAKE2B a77c4067e727d814842b41f529d5a1f90bfeab0ab4425bb071ccb9ab043d7c3a97ee8b6e7ac7dc596d0573c35e4c67c8903a284bc5924eac909b9a29eb703890 SHA512 8ecd094dd314e3174163a86d91f67bc01ab4b2047f9ecb8d11cb39525f1b35cdf142d0a73938813f905aec734281a5542eed94540106d829b903cd95ca0193a2
diff --git a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
deleted file mode 100644
index ae722cb11685..000000000000
--- a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 9f855d41f3e6d610bd01df9688467fdbb341917c
-Author: Alexey Sokolov <sokolov@google.com>
-Date:   Fri May 1 08:36:09 2020 +0100
-
-    Make failed tests fail the test
-
-diff --git a/run_tests b/run_tests
-index 3bf51e4a..cc7fb56a 100755
---- a/run_tests
-+++ b/run_tests
-@@ -4,10 +4,10 @@ for t in tests/test*; do
-     echo $t
-     file_type=$(file -b $t)
-     case ${file_type} in
--        *[Pp]ython*) python ${t} ;;
--        *Bourne*) bash ${t} ;;
--        *bash*)   bash ${t} ;;
--        *perl*)   perl ${t} ;;
-+        *[Pp]ython*) python ${t} || exit 1 ;;
-+        *Bourne*) bash ${t} || exit 1 ;;
-+        *bash*)   bash ${t} || exit 1 ;;
-+        *perl*)   perl ${t} || exit 1 ;;
-         *) echo "Unknown" ;;
-     esac
-     echo
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
deleted file mode 100644
index ae2fed5d48f0..000000000000
--- a/x11-terms/terminator/files/terminator-1.92-metainfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
-Author: Alexey Sokolov <sokolov@google.com>
-Date:   Fri May 1 20:38:00 2020 +0100
-
-    Install AppStream data as .metainfo.xml
-    
-    Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-
-diff --git a/setup.py b/setup.py
-index 7c54977e..38a819a9 100755
---- a/setup.py
-+++ b/setup.py
-@@ -72,7 +72,7 @@ class BuildData(build):
-           [file_data.write(line.lstrip('_')) for line in file_in]
- 
-       appdata_in='data/terminator.appdata.xml.in'
--      appdata_data='data/terminator.appdata.xml'
-+      appdata_data='data/terminator.metainfo.xml'
-       rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
-                  "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
-                  appdata_in + " " + appdata_data)
-@@ -205,9 +205,9 @@ setup(name=APP_NAME,
-       license='GNU GPL v2',
-       scripts=['terminator', 'remotinator'],
-       data_files=[
-                   ('bin', ['terminator.wrapper']),
--                  ('share/appdata', ['data/terminator.appdata.xml']),
-                   ('share/applications', ['data/terminator.desktop']),
-+                  ('share/metainfo', ['data/terminator.metainfo.xml']),
-                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
-                   (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
-                   ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 0b44b91e6b4d..47bd10c80a68 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -3,7 +3,7 @@ DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf
 DIST xterm-360.tgz 1431491 BLAKE2B 2afa7f9cb93136ad0bfb29e0862642221b4b1f583caa5890bbdd4c0a2370266f7c7f19419e3bb82f93d854b3c5703ddd30b896dcb5069873458ac3483dbd7073 SHA512 ffca51e21584e4b84b271a555bead45df1759a9e353d776fd7d8736fb001b71cfa14dc85336c01c304b4fc98297523b1a943792da73b453e1810b890671bb607
 DIST xterm-361.tgz 1435017 BLAKE2B 8e413f3d9b8f3aa11fd71ed5692da9b274109bef5e0303470cf3eb81a333a12eb1437a01c023cff2dd0eb14aa19a849f6b00fa0a155c068421c7d070b1c64e35 SHA512 99e2a018729840c3ec8fe81d3cb305af249b641ceb40c2020f3cd4af3be7d88b6174a39fe8aa614d4ba1734af5f858762ffd68c9ee118ec3ef9030469583e852
 EBUILD xterm-337.ebuild 2584 BLAKE2B a767cd2ecb33368a1aee6766ee6d08b3c7b7f4fb37b9b7173b2d276f5385fd5c6d7ceaa29807f63712a437dd551eeafd0f409cfb65d31e5ac3871314875a3e23 SHA512 75470065aa1bfda91bcc84041021244ad2d6210d1761b082913b714e3be122c5f1089f786b6f03a23d9cc13008fe0120415a732146c838199f476d7ebf13b171
-EBUILD xterm-351.ebuild 2626 BLAKE2B 7a93b6c1ed5f1f82fb85e228aa276434757623abfa93bcd27af63ed3aa4895a3750200b4bde4c9032861dc62c462e56316f5af810c63a34091297685c1536799 SHA512 6dd4f5be9ad48a64a6b7aa04c0da48f3b84f79da20a8499b71f68ac819c11543b50b599a2c9d8e9a4d6c8490b83b086847cb2f7c5400976b61082374a30268ad
+EBUILD xterm-351.ebuild 2627 BLAKE2B b35485759d9db19d6e52d7b4805122abd07d465f5fe8ffb64c3535af3e9a3ebeec1c0b004c6845a7e522556bdfd33df320e314f3e72ebfca766e24a83db09b99 SHA512 c562c997072350a5f5e058067a2acf79edd05daddaa5ff8bffad7a1c2e4c6f09fa28ed5ce2df9bea39aec371159ec9073a253f3aecf87ff49a10efee787bf28f
 EBUILD xterm-360.ebuild 2634 BLAKE2B 65f1b58b2ca30a8a896bab018dca7491562af73e13ef237f19351e456d4a66d3ed16e28b84c010de36da3db4988e2228cd587fc5816315ab9c07c5a26ba9af92 SHA512 0411951a5bb60c492917a29c9185ada8a82bea059aef7a2ba5a513c90497db4ccba1d4fe567d6e6c61133f72635d358d57f7805a6d0703784571e17b9f1a7cca
 EBUILD xterm-361.ebuild 2641 BLAKE2B 27ede55566ab8e0da7e72df953cd59821162861e0cb2f7cba16a3420de82a4ba2ea6e49b5760cfc0f9c33f37811e57b68594c41de41dc02792bffd53309d4b5b SHA512 918d8f73878f3c5b33e8fc82477c2500248a1b265c8286dca22945afe1bdedb1efaa50274182b56e6419cb68ae15a026a03e11be5f25c27d2ae809e9042af662
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
index 73e871a7a0c9..27c2c1a20e9d 100644
--- a/x11-terms/xterm/xterm-351.ebuild
+++ b/x11-terms/xterm/xterm-351.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/yeahconsole/Manifest b/x11-terms/yeahconsole/Manifest
index 4c923ab12e3a..36ac9e34d68c 100644
--- a/x11-terms/yeahconsole/Manifest
+++ b/x11-terms/yeahconsole/Manifest
@@ -1,4 +1,4 @@
 AUX yeahconsole-0.3.4-make.patch 769 BLAKE2B 23f6aed2c70340e4d007f5ffc8ff986c3063f51d851fc42f8605fefc9d735bf39eb8ce8d3ad87dd1d5d8fbf30d077f0c944c903790df76f9ad41a50c5931ab6a SHA512 e78ace16e451fabe508ff9e6b691ae215b626a1b16868d44f958801c01278b15921cd8a187d454dd685a75eea8b798cd00e71ae024d83c43918104c43cf1a58f
 DIST yeahconsole-0.3.4.tar.gz 12281 BLAKE2B d53ca2a5000a0b166f23195a6d4febcae96a0b91c03ea2d60c9a2a82bfef65222431bcdf717e10e3b83d3ed2387d3ea5ce746b22d3af209fcfb8939935d00996 SHA512 cba74d988b3cb991d95de1796e9e79b881fe011d4fc8d6aa1f863f4c465aadfd31250e57d36ce0118dfc367225c2861cf8e80ac47996c2718d83756a8e638ead
-EBUILD yeahconsole-0.3.4-r1.ebuild 779 BLAKE2B 1d3c3ac5cedb82b3d5212de9bcfbc0c1527103105205f01005c4b85436652a81ba4211cee95e9e92fcbe9f445436b3e44211ca07ac6a221b0d81fb4f6306ca79 SHA512 f955ec803b24c8d95342063df4f6da831ea2161ec8ffc8d34f4f6eebc8f91802ff94b4685b86dc548ca2dbad4c0499c0fa75ffb23420362cdbbae9468b03682c
+EBUILD yeahconsole-0.3.4-r1.ebuild 780 BLAKE2B 8f86955523a6f0db7bd1c834e0b54ecb8bfe98816922f038d7fcc56544c752a19346a3bde5c47eeaf924c67fe54e18442a5d56010031b2acac1b219a8a8fb137 SHA512 95db2c17eaff3839205a6ea802c69bd0924563d08176602ea5a6216c7be28d623a7d8fc87948636b9b4a80f58b112aae89b2da6bd5b7505ff2fd90cef98950ea
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
index 53ef1c2a9f9d..4656d9469a51 100644
--- a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
+++ b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://phrat.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 RDEPEND="
 	x11-libs/libX11
 "