gentoo resync : 14.12.2020

17 files changed, 76 insertions, 31 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index c4daf7779bfa..58595608f92e 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index ead1b35cc080..97c95c8ccc01 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -436,6 +436,6 @@ DIST zip-0.5.6.crate 33064 BLAKE2B a14d64b109ddeba3a86b254c6c0ff4b50908d96cfa7b0
 DIST zip-0.5.8.crate 41175 BLAKE2B b961a7d7d05540b459e80b6ceb37cdbad974d4221c0e911c145c6ea4c2159ad86e33ee41060a915ff3d20d2847d7c1f3dfe05913d18940b351f8fb89670b349f SHA512 758d6c51f44fb0151176c0ec24d493c2f159a00c6f44d118568b1096676eb115ae4874556b7031a5f8ba0b17f3b48b6e355c340e7ea38b196d3df077cfdef344
 EBUILD alacritty-0.4.3.ebuild 6708 BLAKE2B c0f5c76517369f8ade3b8a98bb5d888ab061a60eceec72cb44a51f8b1da82164c61fc509f62e7fafeed93a013fc5e64c5f8f1c7c9c3e7b226e23ed273aa7ed18 SHA512 a88669b3973a90ba74fee3649a19341ef88f6a29aa8f342aec8f393de74b67feb4757a4e8506545433cc307f004c1c97440fafb723a4b5cc8ee3ba89671c02e2
 EBUILD alacritty-0.5.0.ebuild 6715 BLAKE2B 6e2093f3ed5d4d913829f5076845bf1c95af2b6620e3dbe7499bb8e1ae528bb4a3d790be26d6976e38a02f9155a4dd5f92bc79f4d67054c84ea4482430ad2ef1 SHA512 08fa348d91377046e9e08a99c6de3697577fc58048f3defe5cdc240a5467aabee31fcdf882c048a0fd6dfe58daf5ebdc40dd36bccb29c49e793045363e82200c
-EBUILD alacritty-0.6.0.ebuild 6724 BLAKE2B e82d399c4aa12baf9cbc054c78839aeac15fe98328fd87c43afc32af8cbe8c5191c823c85238e7fc2cee2e671eb4d98bb8ffb1838eff41a6c5f2d819efbc6b4f SHA512 500892966d64c82a4a630a1d9cc453d10df6e08a3acf212f69d6d8b392b113ad68cc8c19b536da6cbff71e440f0eb0864b6d20bf5318643bcabfe2920f946524
+EBUILD alacritty-0.6.0.ebuild 6729 BLAKE2B ebe3f73f7902df4c6d3d7bf7e1e96e238101b1b7e5690d421fb5a4c790d171e4609d3f57cc8e0d8aadd5e93a5156d961c2b24484f3f75f404ef7f51f89801da4 SHA512 a38653389f5d4b93c55ef887d682ac3ae4c0be5e465ab0e6e6fc51f4e5832273588f95af7bc0b887c376c31642c8b0cb6bd2ffcb844c037000598e136170d2e4
 EBUILD alacritty-9999.ebuild 2325 BLAKE2B 66a4e43e4bd6418f9bb099b63a56a0183d33ffe749f3b25c76795c5456cec8b9590ae960639ad0a8e29d30e7cc719bec149b4b722dcba1526f66a7748dc8d1d7 SHA512 5ee4c54f10507231079ab19b155ce814ce0c7abf657ac0b476386391c41b7cd4c75705a24f7ac0d4328a1959997a9e388e2d5c6a1c90aa79936b8d8881eae6db
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.6.0.ebuild b/x11-terms/alacritty/alacritty-0.6.0.ebuild
index dfced84f7325..dd6d892993a2 100644
--- a/x11-terms/alacritty/alacritty-0.6.0.ebuild
+++ b/x11-terms/alacritty/alacritty-0.6.0.ebuild
@@ -275,7 +275,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="~amd64 ~arm64 ~ppc64"
+	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/guake/Manifest b/x11-terms/guake/Manifest
index e1957b9e64fd..fa0b57898258 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,5 @@
 AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
 DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
-EBUILD guake-3.7.0.ebuild 1684 BLAKE2B 881da9288378855c973b79b273efd22af7eae33d1f517df8a0da160ba9d0a6678e9b7e9a7ec6a8d6f8c0464f7abed8e4b54488b255a74261f155fdd43e4c4407 SHA512 ff107919cb0b36ba4ba9b639f9132c215a8b67adcb534a40df6372c62644ada67fb549b17c17bf96eddd561eb0ed4e0d19e5eb724472c6d5c6b9f58a294f0f22
-EBUILD guake-9999.ebuild 1445 BLAKE2B 21be5f4d247ac9adc7a1a00387d57c63dc6f12553a0dd4dadd6b7508cf3f7281a80aceede48bbcf683ca7a395c4a2a27fa1f995228b03a0ecc22b8bde44605b5 SHA512 d83179ecd59f9685ab1acd0eedef20d6acd2a5a2f03f93c8e50130965335b086830a1d4a7058506dcd15ebdbaf81d1023841688f289ae840a5152aa1a68eb37f
-MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
+EBUILD guake-3.7.0.ebuild 1689 BLAKE2B 1fdbc22fc96f1264d266149d2a02430b3ce697655444df86c95d6ebd4e9a0d51e3f8313551f8ac3a9b4f68b89ae66f38f512348e341d0684765750709630e9a0 SHA512 1a7a9b6783ce31dd9d9d223c7c0a99f38f532016c7f62f5340149c0d357903d60914e2d4db681995178b67c9c5660936048581371bdf09b7707dd12020de4988
+EBUILD guake-9999.ebuild 1450 BLAKE2B ac72ebe2e9cf631ee82579e9cfa084b1d884d50ddd4086c7ffa01bf3b28bd571da890349f79a0f322291ea3495ddfb30d4c52e1400dc133457a8200bc23978c9 SHA512 d4b64d58e424e6d8c944fca221c760ff69018028bb7e7db0ad4b309701b812d101098e8d2338498ae0561599e4fa6ef971c0e24a48edbe8ee758f05d993de72b
+MISC metadata.xml 531 BLAKE2B 146f191ac6a28b6b673f7eb9e86c748bd7bf7ce3cfd1e9150dd781bf46de711ef255e7497fef9c89261e571a35b5c829d3e197f31b28f8c501ea5bcd97d267af SHA512 1a30fbf43aa18e54129273bbc4b827e9ed905f47597bf3bfd7b6dce6f4719ec94f3e6d07a0a7fb1d560034c3c10b894b58c2fd8e200db4f7382c98e123b4f64b
diff --git a/x11-terms/guake/guake-3.7.0.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
index b10718f1fbae..ba220799be04 100644
--- a/x11-terms/guake/guake-3.7.0.ebuild
+++ b/x11-terms/guake/guake-3.7.0.ebuild
@@ -8,7 +8,9 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
+HOMEPAGE="
+	https://github.com/Guake/guake/
+	https://pypi.org/project/guake/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 7c92f743a64b..71b577db1c7d 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -8,7 +8,9 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 git-r3 gnome2-utils xdg-utils
 
 DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
+HOMEPAGE="
+	https://github.com/Guake/guake/
+	https://pypi.org/project/guake/"
 EGIT_REPO_URI="https://github.com/Guake/guake.git"
 
 LICENSE="GPL-2"
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index 49c1dac718b0..f13e10f183d2 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="github">Guake/guake</remote-id>
+    <remote-id type="pypi">guake</remote-id>
   </upstream>
   <use>
     <flag name='utempter'>Include utmp management support
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 28194bf3f858..e143cdb8408e 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,5 +1,6 @@
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4
+AUX mrxvt-0.5.4-fno-common.patch 430 BLAKE2B b5fa23b21524ab486a9c95863af1f858727778a2cdec363e800666bf3518bd1dcb85fbc9e2cb5e90def93ac4243e89f1aea7c73b9c1bca225f4a88ada9415450 SHA512 1def1813c0db009534259d9319cac827d1dfb0aed3751cba9e1a56fe53ab5819a208f54f7eeef25da26302bf81ab4a43ffc7d9b47a0d60871baed6552bd505a8
 AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3453 BLAKE2B 0c797c8533a38dda2a98844a9046ec7cc625e5ed8f261118f881258be5991bddd3a69fe3eb82fc675a9b44333cec32fbe6fb5567640dd7672c5da489f58833e5 SHA512 0729c682c6f20a749aec36ed30a811d57ffff38c66bf254910e314a67e772afd87a1b93a1468c31927bf2395050fedfe84c12c50fe69eb94d0aab969da56869e
+EBUILD mrxvt-0.5.4.ebuild 3488 BLAKE2B f20e2fc6fdce8a128948d036425a331fee3de9ec5081fb103a15fa589062ab4de72400f6ae6793e4fb3b9c79b1df78c4c2a0c6d10e66179883dbc665143efc2c SHA512 92d01241b1874cb8ae6fb2ddc8cb000b28c927e0079ebf2179321b0ad5736230bf4e2c291ca74a1dd8581955582904ff19710433fd0edcfdbe0146041e7eaf59
 MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
new file mode 100644
index 000000000000..2bb39a423aed
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/rxvtlib.h
++++ b/src/rxvtlib.h
+@@ -790,7 +790,7 @@ typedef struct {
+ } action_t;
+ 
+ /* Values for macro_t.type. Must sync this with macroNames from macros.c */
+-enum {
++enum macroFnNames {
+     MacroFnDummy=0,
+     MacroFnEsc,
+     MacroFnStr,
+@@ -820,7 +820,7 @@ enum {
+     MacroFnSaveConfig,
+     MacroFnToggleMacros,
+     NMACRO_FUNCS
+-} macroFnNames;
++};
+ 
+ typedef unsigned char macro_priority_t;
+ typedef struct {
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2090e188130d..dbbfd4f073da 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
 HOMEPAGE="http://materm.sourceforge.net/"
@@ -15,31 +16,37 @@ KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
 
-RDEPEND="png? ( media-libs/libpng )
-	utempter? ( sys-libs/libutempter )
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
 	jpeg? ( virtual/jpeg )
-	truetype? ( x11-libs/libXft
+	png? ( media-libs/libpng:= )
+	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
-		elibc_uclibc? ( dev-libs/libiconv ) )
-	x11-libs/libX11
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )
-	x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
+		x11-libs/libXft
+		elibc_uclibc? ( dev-libs/libiconv )
+	)
+	utempter? ( sys-libs/libutempter )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
-	eapply "${FILESDIR}"/${P}-libpng14.patch
-	eapply_user
+PATCHES=(
+	"${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+	default
 	eautoreconf
 
 	if use elibc_uclibc && use truetype; then
 		# It is stated in the README "Multichar support under XFT requires GNU iconv"
-		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' "${S}/src/Makefile.in"
+		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' src/Makefile.in || die
 	fi
 }
 
@@ -102,7 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z $RXVT_TERM ]]; then
+	if [[ -z ${RXVT_TERM} ]]; then
 		einfo
 		einfo "If you experience problems with curses programs, then this is"
 		einfo "most likely because of incorrectly set termcap / terminfo"
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index feb97cafe8a9..00f1d6b5ea5d 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,8 +1,9 @@
 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 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-r5.ebuild 2683 BLAKE2B 09b9e3110d24d72efd7e9bda1e542a762ad2bd12ed0a671994f75e5942ab653e94db8596bed79f45faf736fd37d504ab014e24c5b97661901d286e5c568d58c2 SHA512 f69809a1c9b2bc039ff4c6c15d2110bc4b38fc4fdded21fd4dcb3d99a5a2871a1cfb33a234d058314cafab4078776fd7b5e98baf5f1134635b0fb972e4fdce41
+EBUILD rxvt-unicode-9.22-r6.ebuild 2741 BLAKE2B fb213b8386cd39249881ed4aaeeadf2d384dd9775dbc9b0d57d8e8ede12ba92fa856e0169882bf34f5b47e2afd70838d382934de1d656da82469aa401f04debf SHA512 cae385d4b8a2ee39b60ec3c4124792acbccc1e2bbcd14dda808eac0af500120129a3bd1e73f60ee6118b8e39aaca8918ec746b1b040f09a1dda00590e5f4c9cc
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1536 BLAKE2B 3cb37fce2861ce60176fc096ed712ff5e7932a28d6527d8ffe296c85c1068d045e40d59fd6f3bb0e4480513d16388a570c1357cd89f5c104638329cae9bace47 SHA512 7facca26d8c97b8cd5f0030d89c86c272821f5a1a8f87f3ddeacda713ddde1cec71969c429bf711ff42745a1652552753c0f9fda42cb95543e6b7e13cf01c368
diff --git a/x11-terms/rxvt-unicode/files/urxvtd.service b/x11-terms/rxvt-unicode/files/urxvtd.service
new file mode 100644
index 000000000000..758e8154cee6
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/urxvtd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=rxvt-unicode terminal daemon
+Documentation=man:urxvtd
+
+[Service]
+ExecStart=/usr/bin/urxvtd
+
+[Install]
+WantedBy=default.target
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild
index ce083fc2e2f3..4d046e664f9c 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop
+inherit autotools desktop systemd
 
 COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
 
@@ -90,6 +90,8 @@ src_compile() {
 src_install() {
 	default
 
+	systemd_douserunit "${FILESDIR}"/urxvtd.service
+
 	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
 		"System;TerminalEmulator"
 }
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 8d97620784c9..5d3273e9b8e4 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -3,5 +3,5 @@ DIST tilda-1.5.0.tar.gz 484754 BLAKE2B 8f04a5046b642e0cd67d375817d046920bbefd9b4
 DIST tilda-1.5.2.tar.gz 485261 BLAKE2B 2ce0059ad695ac3e920cf8e40841b850967ff1e05b88a1c527b7154112c88a3435b66d0f31b882b6fdaf0dee038b7a7e6ab0401184ab701bed8d23d44a2856d8 SHA512 5f950696626005d6f8711fe1403313b36f065796ac07946e9782997aaf67a4bfdb3bfa5e37889bff95d77655d3546100a48327bfa175aa24c39a28685ee0306a
 EBUILD tilda-1.4.1.ebuild 695 BLAKE2B 33d4ffd0915fcbc42591161eba09ec2a36ad63c45ca31f85b9d471afb9ad5cad1fbe7277b1714153d12c43b1dfcee0cea2764dc08c401727b2ccbf97dfa241a5 SHA512 440c50ad4f9c5e738d948951848f25bfbd9a167374bbbb1cc264594d09911759fa5c5df9d35013db1a4f6411c2ed218252fce532563df42a9a10f51cba2edda6
 EBUILD tilda-1.5.0.ebuild 698 BLAKE2B 339df837f44a5c428b6b13639f5a55c5d34734daf59accff528f769e73187955a2a098ba1069eacdc3d8b3330130be71538e5c810aa11a09b395edb5b01a8308 SHA512 e577adb64da6f0be2635d0c1761d3d63099aaae0721cd62f05e1117224f9165af851e88987682ca1345c1d21f13d8e3e14b15059c2c98dac25b747164659a181
-EBUILD tilda-1.5.2.ebuild 705 BLAKE2B ca1bc4b1d8b0a5af8702ee5fa63aa6934d1b806be38b085d29219069e23b1c032dbefe9c74281305da425e04b922de675ee7bec7b399a784c947e531c28a9115 SHA512 1f2f54154ba34c24e743ea89236f58fafa0b949b98465f67922b12571cdee01d8c0d8639055b1e8ef62ba09f5affb26573e580fe84beb9308fd2df54310f1495
+EBUILD tilda-1.5.2.ebuild 712 BLAKE2B 5123c28038a63c3f8914679f58c51ef84519c1e4ad52bf47ced0d52fe7a7360c07a82b8f3d3e527b627ca83f9a3949ab5a01c9f08061861b8d6b4de783aab134 SHA512 7f62565b0755a6a23c00736c07d15b1e4cca91a27e8f8bac442c7a87aef37b37457a5f98fd6e0034d79e4d20be29b45cace6cb36aeb307521065237b108d084a
 MISC metadata.xml 319 BLAKE2B 69510b8b8d8658d9cc6884a960bd6b2511da1ae40e771c1edcfa836b0f1033bd4b66d5cbdb3d664108d90d0afa77de6caacb42f8f0bed5d9f8c88abeb34463d4 SHA512 013ac97bba6505168215a97c531a4fcac607b678aaf804ffdfb44611b61e930709621bedd71f7fbea06b25f8bd7000530f878cf57c419c9938afd61155ff060a
diff --git a/x11-terms/tilda/tilda-1.5.2.ebuild b/x11-terms/tilda/tilda-1.5.2.ebuild
index 83b145b42c18..247f2520dd04 100644
--- a/x11-terms/tilda/tilda-1.5.2.ebuild
+++ b/x11-terms/tilda/tilda-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index ed8f9845d6c7..02f961474dec 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -5,5 +5,5 @@ DIST xterm-361.tgz 1435017 BLAKE2B 8e413f3d9b8f3aa11fd71ed5692da9b274109bef5e030
 EBUILD xterm-337.ebuild 2584 BLAKE2B a767cd2ecb33368a1aee6766ee6d08b3c7b7f4fb37b9b7173b2d276f5385fd5c6d7ceaa29807f63712a437dd551eeafd0f409cfb65d31e5ac3871314875a3e23 SHA512 75470065aa1bfda91bcc84041021244ad2d6210d1761b082913b714e3be122c5f1089f786b6f03a23d9cc13008fe0120415a732146c838199f476d7ebf13b171
 EBUILD xterm-351.ebuild 2627 BLAKE2B 4f4c4a0d0374c40ea8f029194d5525d950c9645bf6b2dcee4d64cae653fb7c7c7cb5619aaac48be2e5938f4fff8ccd289821ffd102eb0ae0ff30a557db8b13cc SHA512 70ab6dce2c2ff855ecb535e39bfe9e70c5276e2affb63c25df5da2d9caf494ea397e607eca8e327cf7262dc26cf381bbf77c65ce21caf759ba66b7a94db3fb7e
 EBUILD xterm-360.ebuild 2635 BLAKE2B 28001fbf343dd204d9b447828c0eb558382d80859cdfbdb9ad1da13e7773d837585d66e93fb429be3c81e812e84164c0b3ea67885f080706bb58e355f9301ccf SHA512 a07dac126924296f66643dae2435ba36dabae4767928c42a2be9ce20cdc77269bf35c047f85ec52228b307d9875e0ecb42dc48fe4938c9ff68c759e24d810821
-EBUILD xterm-361.ebuild 2635 BLAKE2B 28001fbf343dd204d9b447828c0eb558382d80859cdfbdb9ad1da13e7773d837585d66e93fb429be3c81e812e84164c0b3ea67885f080706bb58e355f9301ccf SHA512 a07dac126924296f66643dae2435ba36dabae4767928c42a2be9ce20cdc77269bf35c047f85ec52228b307d9875e0ecb42dc48fe4938c9ff68c759e24d810821
+EBUILD xterm-361.ebuild 2642 BLAKE2B 416f99c86f0f9870e8da670af21fd831e5a2fbf0b103015a63832f8b8c44e1d55fbc905ef77e4b3233c73be65c520847824515e9a9cbfb570ef47f6bbc9970aa SHA512 ccb8a9b3eecbc409dc71d2fa9901129b03e581ddbd281a1aca9084ae5452d70320d0e8f267c0e9c36fedf4e9cac8657673f551ff43fa3015e7b5886e059d1bb8
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-361.ebuild b/x11-terms/xterm/xterm-361.ebuild
index ace98c8c3afe..4578ed83e77e 100644
--- a/x11-terms/xterm/xterm-361.ebuild
+++ b/x11-terms/xterm/xterm-361.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 ~riscv ~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