gentoo resync : 22.05.2021

11 files changed, 273 insertions, 11 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 0bfa2cdea12a..dc64682c24f3 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index df4547377113..98476d856680 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,7 +1,7 @@
 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.7.2.tar.gz 1412164 BLAKE2B 64c85c71fdde41be67337f4ea230ddfb3544592ba71c0c0c9c0032fa37eb28a5e669da6777590c3e1f84a6a5d13583b2b7e339c277c60307bcd43458879da8a4 SHA512 6f5d9037038d0ebb7fdaa958bbddc4c68036ee8fbb2b89ff2d49637d46805983f47d1900a11a865c821553bfffde55caef4e0308f176724c3107457c04a6161c
-DIST alacritty-0.8.0_rc6.tar.gz 1415721 BLAKE2B 4e434bd4c45f1df7359ba4a2a6c222ebb6316a763e845f0b7fa27cd1c48fa8ec901eaa9b1ff25b82238160dd29feb93bfb3f014a8ba7182c7b60bbe0355147c1 SHA512 d7a39c6d066824f9403e240f6d2ee722da3b6bf70b0e3acfb00946f12f9db17b45d984da378134e6eb494d5ca59d6cad0b6d4927b0a9149d0d2133d545a74612
+DIST alacritty-0.8.0.tar.gz 1415318 BLAKE2B c73bd76c534b096eeb9e2958bcd3fd96f3dc934afdaa5a5c719635c78ec68dcd4af9d566968466580108e780bdba540cef39ef2c91224946eb3c5cb8436fcd59 SHA512 723addc3f1e91043c75bb2fb631cafb73b0ce14916d40240fdc14b9f5a5284e5caa74a59dcbe0ff572de35079db068c0e20932f769b1e4382c5a0eb48f70d2f7
 DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
@@ -244,6 +244,6 @@ DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD alacritty-0.7.2.ebuild 6141 BLAKE2B bfc5cec131c17925fcb3946ab46e0dd0e33ffe53a6eb850bb2396a333b604252db1570ee52e1532150aca2ec46e99a4c3424a1b214334d723f8309ee246ca56f SHA512 5d30ed7cc993696e460cb9b3146851824b15b231e2f8c7bce2c67961ec825c02405d9125657d5e4dc6783b760c7e06895b4f99f3a1a74d7940326be82694956e
-EBUILD alacritty-0.8.0_rc6.ebuild 5938 BLAKE2B 8b89d93d58a4417a236c5691e933e9696c393e2c7b0838df94eaee146f41e63e00c7df99496c20e1d671f99c8beb02b9c36a0fe7b627dd45944282f034dfe663 SHA512 4d0e962f98009c7fb37961eadf4a69669f7f99622a66588f43b6d4e0152151e8b6d545c0dbe9195dc7eef950a104b83a280bde5ab8d571b4999f3fbf4d11c259
+EBUILD alacritty-0.8.0.ebuild 5963 BLAKE2B 71e89a89a23f12c5523ada545ed84386c12047eedfc296a3e87d1203b4c9da6b12023955d45d159c3fbdf520c241f76005b864342b50c741a2bbe2198f02770c SHA512 96160a814afebdbc7ae5c37aaf99eadd85e251c97344752f17a23c1fe9b050dd6ae41483a29bf39efcb919bf2eb127c540665b0de89d3ff8196ba766340f72b4
 EBUILD alacritty-9999.ebuild 2653 BLAKE2B db02653e037110909d0a1f9ef2caa7b29801690d74e0fb779db9f5e5830dab14555a9afe39c9b3affbc6758df894bc898448d081622b069929c202a24456c8b3 SHA512 0b96484226be356d97ca160a3c74c1d4be7fff8b51ef530a78cb469d497f5d5256d7e99012e5b241a9dfdab4edbaf3dbfbc45b2cd7c93fab1a06e004b1c41cb3
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.8.0_rc6.ebuild b/x11-terms/alacritty/alacritty-0.8.0.ebuild
index 67647f577e2b..dd54b8122947 100644
--- a/x11-terms/alacritty/alacritty-0.8.0_rc6.ebuild
+++ b/x11-terms/alacritty/alacritty-0.8.0.ebuild
@@ -211,7 +211,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index d8da1455466b..3923a4ff734e 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,10 +1,15 @@
 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-perl-segfault-on-exit.patch 996 BLAKE2B bdabdeda2b12e8466dd134899e7aef45c74ef41fc96e15b762b16ad59e74e2fe1036d129c8daf3d9c20f7014ae5dba768afd5b4f3150a4894cc648178113052f SHA512 1640ab12379ebd6a7f0dff0ef6a680a1bf014f6c20e4db0e4d4e05e1725858c42bf8333d5eb1b176dfc35fc695adddc7a3b08665e9b7a8dea06f8d2566ce300a
+AUX rxvt-unicode-9.22-query-graphics-insecure.patch 403 BLAKE2B 306fab801001368ddde73eba4fab460b454bfacee36565ebf3211ebb1383ab8f4d42972c15c479b731771fa012daa73556a0406da7dc55331eb7428970134d47 SHA512 d3574abb33cd099f66d8080b93d897966ce7133dc38a3f280aaa791cc8b11372dc569371e2dce7ed40222a406f593d3c3ddd4c91849aa2fd6396bbae6fed7a7a
 AUX rxvt-unicode-9.22-sgr-mouse-mode-flag.patch 5613 BLAKE2B 28cf8af70841027ba254704b3bb94e2bcf7f8f6743963056c046279aeef4fc8f866711144880ac6a3ad6acd4ed86332f497dff905f3836775579ba5e90328218 SHA512 b6bf180cd25f46fd22841aa8322839886712312341950e3abeeec1a44d73bbec8e7467ce09878c84b86263ab7067443529a89f017e54dceb84b189477e58f10e
 AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38
+AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f0742330910c3867f60871a96a237787d85f66b8999b397281b36ed9b92bda2422e1e2295accfee SHA512 20c7d7a00bd41deefb738b6795ecbea8098ec81d3356cceab4de39408de3552d385fc48ef74a087f3724d436b77de54adb67d0858a0949b9595820ee3d9cf7e4
 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
+DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0
 EBUILD rxvt-unicode-9.22-r8.ebuild 3251 BLAKE2B a36f66ce21a4508ce48b86d76686a82160f5b4e12539e260f62dc036b012343de434ed40bdad9d4ebecac3ff6f65914d853aa1b9985d89b8373ab046e2caed70 SHA512 0a44b0fde9312389859398ab1a7dad1afdfdef1458701cf9e796a4db7ccdf3cfd44888f4e1136ae57acd920894cf09fa3bd318ebbca9256ec934b561d5484aa2
+EBUILD rxvt-unicode-9.22-r9.ebuild 3307 BLAKE2B 219652faecdab737305999837914c14e706c349f3103cd5517ff63161d8f0bd08e747934003fe1479f6c04ad6b1546fe49fa022b1232ff68795c924d97ce2cf6 SHA512 b3a65dfacd65e93c835a9a8083fc4527f8de99c368820c01b3f4c1b8614fa33ddb2f02f77dee0e40ab878eb1e10090c85500dadbbea59f3f95f793b81e9a010a
+EBUILD rxvt-unicode-9.26.ebuild 2431 BLAKE2B 03c40cb09da82783a9fb8c378d9681ecda16a9e468e6b5c15cf98492331fc391324d09d9e158aee60c068ecbbc7f0c25f1034bac944c152d539d9f41e20c9362 SHA512 bb2c3ad2379bd96478769689a3816f413f74926f1946b2f428de8a61328b440ee098f45327ddd8f128c959a49aea3104dad41e745dfa280cf46d057d4ef4efd8
 EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch
new file mode 100644
index 000000000000..52a8c8297050
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch
@@ -0,0 +1,11 @@
+--- a/src/command.C
++++ b/src/command.C
+@@ -2695,7 +2695,7 @@
+         /* kidnapped escape sequence: Should be 8.3.48 */
+       case C1_ESA:		/* ESC G */
+         // used by original rxvt for rob nations own graphics mode
+-        if (cmd_getc () == 'Q')
++        if (cmd_getc () == 'Q' && option (Opt_insecure))
+           tt_printf ("\033G0\012");	/* query graphics - no graphics */
+         break;
+ 
diff --git a/x11-terms/rxvt-unicode/files/urxvtd.socket b/x11-terms/rxvt-unicode/files/urxvtd.socket
new file mode 100644
index 000000000000..4da0499c7bba
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/urxvtd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=rxvt-unicode terminal daemon socket
+
+[Socket]
+ListenStream=%h/.urxvt/urxvtd-%H
+
+[Install]
+WantedBy=sockets.target
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
new file mode 100644
index 000000000000..bbc44b3c15e6
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic systemd prefix
+
+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 ~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-perl-segfault-on-exit.patch
+	"${FILESDIR}"/${PN}-9.22-query-graphics-insecure.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() {
+	# Bug #787104
+	append-cxxflags -std=c++14
+
+	default
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	# use xsubpp from Prefix - #506500
+	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
+
+	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/rxvt-unicode/rxvt-unicode-9.26.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild
new file mode 100644
index 000000000000..981de5a0d605
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic systemd prefix
+
+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"
+
+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 ~sparc-solaris"
+IUSE="256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl startup-notification unicode3 +utmp +wtmp xft"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r6:=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	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"
+# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-05-16) if eautoreconf has to be called
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+)
+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"
+
+	# use xsubpp from Prefix - #506500
+	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
+}
+
+src_configure() {
+	# --enable-everything goes first: the order of the arguments matters
+	econf --enable-everything \
+		$(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 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
+	systemd_douserunit "${FILESDIR}"/urxvtd.socket
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index e672e647ebd3..38a486d6c41c 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,3 +1,4 @@
+AUX zutty-0.8-gcc11.patch 517 BLAKE2B 0d8432a219e20b985f13e75814440640c0a83f3a92df313aad8cc3f6091b3e5f3d503f87b9d48574e88ae64206b9e0b1434166c125a46dc669de02bdf2b13ad3 SHA512 7b3167d6643dc7672c5aa2ab1215c73af6b9e7c1072a012810d45defcb2362535bb2b8b88bef321cad28e6efe130811e3d314da0a1f795ba4a748c1011381dac
 DIST zutty-0.8.tar.gz 307235 BLAKE2B 897fea3735785ba1e8c811adbc90b96598c04f3ec19d9d3027745e5b9d3c1d21c55343b9409e48327139545e2675346be90d84af422d3ce97b1737cc287bb96b SHA512 75c5637fe8f0c8aff41e394a05f304f56bf03faf1dfa78807ca930a722536a93f54012f051f411b4e8ff478dd991f5b8ca1285fcd674879eac568c8971004317
-EBUILD zutty-0.8.ebuild 722 BLAKE2B 51455d9434b2c46a3020461efad6a75951890a5afb4cd16cb2902c30cdf06945b7210ebdeccb7e7124802a8a52d9fb7e75a4ee09343e01710e46bb9ae57fdb9e SHA512 8303765c956016ebc667149189a5b8a1b257a4db347b382a22a2e5b932837cf265592562c531b65fca7b6c8f830df79cfb703ebd7b856c93b7edf6b5fae930bb
+EBUILD zutty-0.8.ebuild 734 BLAKE2B 6a1f930a041b6431556ccc3bdb764dd773a7b1df1c46e1dd6125c8c4cbf4807b59ee081762b277f4f4986394ee0555949ed6c4827b0374904a759eeca58a2dd0 SHA512 7d5de7d3092a84104b49e77908e3475d4316eefbc4f3932334cf3fbc4477524366cfece3f8938633650c6c599904f19d7b19c67c574990ad98d9ed86f4f9315f
 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
new file mode 100644
index 000000000000..75b8234d24bf
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.8-gcc11.patch
@@ -0,0 +1,24 @@
+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/zutty-0.8.ebuild b/x11-terms/zutty/zutty-0.8.ebuild
index d4ab66148fff..e4986f621853 100644
--- a/x11-terms/zutty/zutty-0.8.ebuild
+++ b/x11-terms/zutty/zutty-0.8.ebuild
@@ -16,14 +16,17 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-COMMON_DEPEND="
+RDEPEND="
 	media-libs/freetype:2
 	media-libs/libglvnd[X]
-	x11-libs/libXmu"
-DEPEND="
-	${COMMON_DEPEND}
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="virtual/pkgconfig"
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8-gcc11.patch )
 
 DOCS=( doc/KEYS.org doc/USAGE.org )