gentoo resync : 25.04.2020

15 files changed, 102 insertions, 21 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 90f4a304de1d..ad4304412936 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 7ea9a360a84e..38dbcf068940 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,6 +1,7 @@
 AUX aterm-1.0.1-deadkeys.patch 1358 BLAKE2B f692e190a33e50877da050cce3e7a3c8ab36c272f3530f0d4df8ff40e7feb255ebd59eeae275bc7344f632111a84c7db86c5ebea07297346dd2feaf8c1865a04 SHA512 58831fbcc38f14f036a759606baed7beadc4d8b7a377e6c6de2d1fcb5a4e0ad06aff4c0d64f189efd26d790c5cc56d631c51797ce8334879997db4f373bd9298
 AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e81526e7575514e9a83e064158bcc3dc5a554db5f5592c3af2c33eea78864ff0d8d16770dadf1ef20aea52fa131c5c75ace20991d2 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
+AUX aterm-1.0.1-remove-streams.patch 1108 BLAKE2B df7ee9b3409127ab82dc110035baa2b91f4d785874febb615d6d864bc4e5561b371707c7acc25096f59a646468b83a0cba27d2270f57ab80564dcc8b541b50e2 SHA512 d0ee1e6edee1e4b936b4179d9673e78f7bc70266f6d576d88ae76c9e87f4ae939baeaf0d62ba2b19cb1195cc3f4e1e111608ed493d56de4531ffb11257d2967d
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r3.ebuild 2040 BLAKE2B b000d95802bba815af3b3b5c8ec909c67c7ae7e7d1b1524f35998d180227fd55bb4a67591ca9b94c952717e6ec55a7fed12db2a18d32e4fb49e78e7c614938a9 SHA512 81ce90c8cea0d8690beeacf6c9d8ce78942e1344d1a4838451f418f9a88a7dffc5657f41f111b31e99c0c48d6931843bd66c71a5202c8219d9c060287d524e29
-MISC metadata.xml 456 BLAKE2B 268ce12677cb3678b091d810094c33905df594b0956e4103b132d6c5bc01bb234dffff4f65e34d8331a4ee76f2b893bf5fecbf4bc403b2c0690a357929a0a2cd SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf
+EBUILD aterm-1.0.1-r4.ebuild 1987 BLAKE2B fac3bc69906ddeac45cfd895936efee2e79ca7ac174dfcb1916591d639f088df8a9a800de13539b4d25191b3cec85f576b08bc69cc81e1753ed3a9acdfe4d307 SHA512 812c5f176ca8126e3f4c02d5242132e0470ecd9fc2cfc6db77ffe00dc8ab96e796e16119ddf37345bcc3b9d6f366abf33b191cdd50453b85698cd106744d2e08
+MISC metadata.xml 643 BLAKE2B d1a621a0e1435528b11b8c990ef81836692c5f16526c78e2814c1568b0681ef02c2a988008c7c58b074ef8771ae95f840b5506447ad44cbf1617c16c5d09d80d SHA512 562485fc40c786d504d41805670a817811865aad74efb43fd210c3a9280d98f0e896410842c2881fcaa372771492e8a3af0167e8a15395351501981976f56700
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
index ba35a2c82cd6..8427c805ffef 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
@@ -32,6 +32,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-display-security-issue.patch"
 	eapply "${FILESDIR}"/${P}-deadkeys.patch
 	eapply "${FILESDIR}/${P}-dpy.patch"
+	eapply "${FILESDIR}/${P}-remove-streams.patch"
 
 	#fix pre-stripped files
 	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
diff --git a/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch
new file mode 100644
index 000000000000..fc9f3f82ba17
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch
@@ -0,0 +1,36 @@
+diff -ur aterm-1.0.1-orig/src/command.c aterm-1.0.1/src/command.c
+--- aterm-1.0.1-orig/src/command.c	2020-04-01 12:50:59.222929696 -0400
++++ aterm-1.0.1/src/command.c	2020-04-01 12:49:47.319579199 -0400
+@@ -91,10 +91,13 @@
+ 
+ #if defined (__svr4__) || defined (__lnx21__)
+ # include <sys/resource.h>	/* for struct rlimit */
+-# include <sys/stropts.h>	/* for I_PUSH */
+ # define _NEW_TTY_CTRL		/* to get proper defines in <termios.h> */
+ #endif
+ 
++#if defined (__svr4__)
++# include <sys/stropts.h>	/* for I_PUSH */
++#endif
++
+ /*}}} */
+ 
+ static unsigned int ModMetaMask, ModNumLockMask;
+@@ -672,7 +675,7 @@
+ 	print_error("can't open slave tty %s", ttydev);
+ 	exit(EXIT_FAILURE);
+     }
+-#if defined (__svr4__) || defined (__lnx21__)
++#if defined (__svr4__)
+ /*
+  * Push STREAMS modules:
+  *    ptem: pseudo-terminal hardware emulation module.
+@@ -682,6 +685,8 @@
+     ioctl(fd, I_PUSH, "ptem");
+     ioctl(fd, I_PUSH, "ldterm");
+     ioctl(fd, I_PUSH, "ttcompat");
++#elif defined (__lnx21__)
++    /* do nothing */
+ #else				/* __svr4__ */
+     {
+     	/* change ownership of tty to real uid and real group */
diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
index edce71995413..33527ab06bea 100644
--- a/x11-terms/aterm/metadata.xml
+++ b/x11-terms/aterm/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>imirkin@alum.mit.edu</email>
+		<name>Ilia Mirkin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
 	<use>
 		<flag name="background">Enable background image support via
 			<pkg>media-libs/libafterimage</pkg></flag>
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index c78bc21a4061..9dec9c133108 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -5,5 +5,5 @@ DIST gnome-terminal-3.34.2-cntr-ntfy-autottl-ts.patch.xz 33896 BLAKE2B 3f52a9ca3
 DIST gnome-terminal-3.34.2-patchset.tar.xz 33120 BLAKE2B d052dc1b425b298d0eca6664d43b0a3fb32e362852f93fb4c736b68f0f0be785cb8d4da3d341fef5abeb881fe6adf7acf1c716166241ecbe60513ac7d4fabe2b SHA512 3a6f9e2a2b04368dd6b3098bd0399cb784f8702b4d23415dc8efe828aa12591a327ff31d0739a19deed0736a6d0a70cbc643c2f3cd0a767c67bb1b009d33969e
 DIST gnome-terminal-3.34.2.tar.xz 2045872 BLAKE2B 390235a1674d1ea7c0398f94ccc9e7baa301e9acef42170d512766d2bcd53a9669c3100a9590702234b456a6d33de5cf825cbe9733d6e89422211049187bb86b SHA512 36df7483c2b56df1d9e66729826b1bb65755590498295615befdb89e25d69464ebf4b77928ccd88f069513cb58da2856dca748dbf6372ca145b4535609d76595
 EBUILD gnome-terminal-3.32.2.ebuild 2602 BLAKE2B 0e47990e557666f0ef9502f760696a6676949da5844c3f63e49e5bf48a1c37e6270603e6694ebf88904dcf3749698c03ae0fb922e82b6636ced3ea9dfa6ff52c SHA512 a03760f0cf4cd5f26e7712f16026013a8dd767f27e76b46472826f9356509df0db6eb0d6dd86a69af9705286d156d87f98b9dab4aa3e3a9e431f8406cecb03e3
-EBUILD gnome-terminal-3.34.2.ebuild 2857 BLAKE2B dbbca2f8a897b1b6cfb4bdb0edf404e900edb0331618b3d9b6be2bc0986d2b50459031480a903d0ba23d5e3debc8c3a40d3c4d49e4552465b1d5c00581fbd512 SHA512 dbb267dece357373711d7d153be9cc4b360d4b57ec8b3b9d2d9d0fd0ba9a6cef4a3f51fb1685ad8d78c591e774ea046a624e40d3769452a15cc59e866e48d9a1
+EBUILD gnome-terminal-3.34.2.ebuild 2855 BLAKE2B 0ef1c4ce3b17fbbbeac174d403e9c74e27742d1cba0ac5d920e51f0bf45b8b7aa65f176d1ceb67a68a0ba989914822d55a0541e65b9b60254659df43a9587ce5 SHA512 32043b11253d91237541e137dbf7accd6ec43e60c622fd25105aa658b5f66d7275abd2ce2151f69f51297f473eb3627e406ffca45d549da6760a0628eb711826
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild
index 64c25ff43587..775869a1a3ed 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.34.2.ebuild
@@ -15,7 +15,7 @@ IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
 !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-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 ~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/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 9f1c65d6efac..e1c383cfdf76 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -4,4 +4,5 @@ DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
 EBUILD kitty-terminfo-0.16.0.ebuild 1054 BLAKE2B ba4622acecf495cd0d6ba92449b09c39e3f0518a1954932569d609719b9c2c562534ed3e2fcc620486020d1be42aa6f6b0e71b38374c9eb2b8eb17a2e8686931 SHA512 5f06a74271da119899325f2335a11252d0ccca6b34078150d707d7dbac7f789988c772d5aa78554a3f5ff05b5165c1bd6685929b7b44919b06a806c7c8141c44
 EBUILD kitty-terminfo-0.17.2.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
+EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 03f762c69be3ce63a340cd57678444a9960b3654d6ea676a583eca4ff629375f9924328702ed6006a38af2da60ae3220db56ea296171cd69f6ed0c3d5f99dd49 SHA512 bae84cdcdce2cf5dd8f5149cddfb30b79ebd21b00875d49ac7da5856614d8816ba0f8daed4d7197341a5df7660a4221acd037c09f6f52f4fd0bb3ac7b69239fb
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
new file mode 100644
index 000000000000..b43704ce0df0
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 toolchain-funcs xdg git-r3
+
+DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.17.2.patch
+)
+
+# kitty-terminfo is a split package from kitty that only installs the terminfo
+# file. As tests are designed to be run with the whole package compiled they
+# would fail in this case.
+RESTRICT="test"
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-terminfo || die "Failed to compile kitty."
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 549ca9f88c34..0944025b7700 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -10,5 +10,5 @@ EBUILD kitty-0.16.0-r1.ebuild 2016 BLAKE2B 23fb1fcc5173f1c6554a706e1f53a94ad14b5
 EBUILD kitty-0.16.0-r2.ebuild 2151 BLAKE2B fbff92e3ecefbcd90fd36f7001c1a213e8520bdad9e839b027ceb0ba01ea6201bcc8383ceeb458040ad34818d17bcf12fd1a051f88e16eaddd47493f0f095089 SHA512 2396f452018c08f9b9d3863e28397f506e6c66273fba43369611dbfa626c3f28032267511b52244faceaa43dfc9ce10d2100b25d803ebbc54195acbb4e86ffb9
 EBUILD kitty-0.16.0-r3.ebuild 2092 BLAKE2B 1488a8b299a4e649f24cf9be580a1d2caca78ea5bcdd4a0f6299554587a91268b784ea1dac2cae9c9a2668a3156803df8702664e3b9df4fa8a02ebe31974b557 SHA512 68f62412dd54eb10ec6141771242769160cbb4e14caea52e46865d3d13e53a3cf5346e4eebc91369ac416928b5db3d99ae6d9002fa278f723ca802cc87854fd1
 EBUILD kitty-0.17.2-r1.ebuild 2183 BLAKE2B a776ca1fd558ced50c8f2bea49f49f88f7fbdbe36f20151af64bdb9a5c59506900779879aa2f863dd792378e761736750f19929db595ded02364024027a50374 SHA512 1bedf2d7e703875987d03629ffeaf33bd69ba036939254935d3668dd63ad07d532ee39424eaecb9bf9aebdb23e0015ba417a766f438b762705005d0084b33013
-EBUILD kitty-9999.ebuild 2014 BLAKE2B d191b8e4875303c77e728231c9e8cfe4bceb06a0ab40f9404ee739b111ac7d2f08fe84efdf020e3ef67e11176226d7d12a977747c960a39fa37d47555c81be72 SHA512 54218c081a769c1c40e8ee0250191d148ab47edcfd8b5032cedfc3d8fc4d7c3e286172bd3aae6687216d8b374b3f41029aeee966acb77d6944ed9fda977d0518
+EBUILD kitty-9999.ebuild 2140 BLAKE2B fb60b6cbbde14212cc2d437a5dd946ce2e0d5178ec86b4e140b8092b8a31d29d7cd68669984a475fd51b2b54ea8b5fb9d9399cb07d99c6897a95f81fddc1cade SHA512 2cc98526c03091abe79a2916ed9b9937f17a06e1347be89d8e496a46fdd5b630b4c5ab84749493ea8565c38ea9738e10149e25b3f3fd5d4fd52d2d606869bcd2
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 96dbc6f15d64..2458ef6749d0 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -30,14 +30,15 @@ RDEPEND="
 	>=media-libs/harfbuzz-1.5.0:=
 	media-libs/libcanberra
 	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
 	x11-libs/libxcb[xkb]
 	x11-libs/libXcursor
 	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libxkbcommon[X]
 	x11-libs/libXrandr
-	sys-apps/dbus
-	sys-libs/zlib
+	x11-terms/kitty-terminfo
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.17
@@ -51,10 +52,12 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
 
 PATCHES=(
 	"${FILESDIR}"/kitty-0.17.2-flags.patch
+	"${FILESDIR}"/kitty-0.16.0-remove-terminfo.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index bb017581d1c4..15b32a7bdbd1 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,3 +1,3 @@
 DIST roxterm-3.1.5.tar.xz 309892 BLAKE2B 11ede6d870a2aa96bfff4974ab33ac4814802f6b08e684f9367e3e268adc113be2b0c92eb337447f8d20a687c7be5f414854cf1f75831ef6c38f4d78d3897317 SHA512 f07989331b1cf915e94582bfceff8cb87f20613eb272ccc502fb49c7508a1330cfa3b137c59f300b8541595aed541867c1b0aad36809e7e9a326f7119fde2acd
 EBUILD roxterm-3.1.5-r1.ebuild 1330 BLAKE2B 065b8390a3e504329a86773d9303b2bec008e36428d39fd5062b136878dc374e210e01babb6750968f5d430c70644bf86699601f2d13747e3af70c6d4887b2d9 SHA512 af40d002452814c561bae1116beaf7b7de85347e0ec57bce723628ba6420fe64c76833d487b1c06747d96e7bbbaf47e3347102b673c39984bd4fa1215aad24d8
-MISC metadata.xml 451 BLAKE2B de541f71407130ef2336489ed65e3dcb0987bd185b45e49d26ecaa81151d1f1b9fd307522181fc7ae17a8fd89697f7d50b0d3249e59f8933b999f4a7c30056f8 SHA512 e4ad584a3a03fcc666b476c78f7651c3d8f03256c1e3828a735b9bd5e0477be6d9231cbf89cc8608d7f93e3d3ea6473c715ab0995b3c5b24f07c7ce13a69c3b0
+MISC metadata.xml 244 BLAKE2B cf304fb20ba89e08f86507406f4d36eb84f956d7a623a096c44211859cc51191d3d1b700bc1346e64304137af395d4103c99043c083d7f8d35e41603efb23662 SHA512 0783dbb1846be292eb3f6bd707a66012707fc36a7226d3f9e97fa5c58c0e546fa14084d2f8e0a969b55345fbd18d2d72b0f6cd6804896ff613fe5e24ea8b4bc3
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index 6d4c2c1c9a8e..34ba352f9105 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>russell@annunaki2k2.co.uk</email>
-		<name>Russell Knighton</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">roxterm</remote-id>
 	</upstream>
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index e03417059a2b..79da5efefc24 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -2,6 +2,6 @@ DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b
 DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
 DIST xterm-353.tgz 1407183 BLAKE2B be5efe091a9b9511b264eed0c12568d0d92ac7189c883d62d21124ed45a5d229a3a063496f7bbf08e593bfdc5652c5d153d87f8313a9b2901da8e15483904565 SHA512 2ea63858ec069a769f0a25a159d17099044686e20649233631244fed29440fa8beebbd0dd8ccaf4260fb3d26996a49013eeeea7e0c98860e00d2e657019e2611
 EBUILD xterm-337.ebuild 2584 BLAKE2B a767cd2ecb33368a1aee6766ee6d08b3c7b7f4fb37b9b7173b2d276f5385fd5c6d7ceaa29807f63712a437dd551eeafd0f409cfb65d31e5ac3871314875a3e23 SHA512 75470065aa1bfda91bcc84041021244ad2d6210d1761b082913b714e3be122c5f1089f786b6f03a23d9cc13008fe0120415a732146c838199f476d7ebf13b171
-EBUILD xterm-351.ebuild 2629 BLAKE2B 4a34f35c239de83f72a9dc63edb7c21580f82f947fd14fac05778f6c0345be596a272cdc642979b06695fd5388539f2013f4490cffdb82439b6d39ae9974b553 SHA512 b44127231c772a0eec44865fc0d23dc3bd1680ba4d793a69df7746a192bc0a7b10ddb8f65e9143877b9ff517327287a194878b03925eae240c66751593d47100
+EBUILD xterm-351.ebuild 2627 BLAKE2B 4f4c4a0d0374c40ea8f029194d5525d950c9645bf6b2dcee4d64cae653fb7c7c7cb5619aaac48be2e5938f4fff8ccd289821ffd102eb0ae0ff30a557db8b13cc SHA512 70ab6dce2c2ff855ecb535e39bfe9e70c5276e2affb63c25df5da2d9caf494ea397e607eca8e327cf7262dc26cf381bbf77c65ce21caf759ba66b7a94db3fb7e
 EBUILD xterm-353.ebuild 2635 BLAKE2B 28001fbf343dd204d9b447828c0eb558382d80859cdfbdb9ad1da13e7773d837585d66e93fb429be3c81e812e84164c0b3ea67885f080706bb58e355f9301ccf SHA512 a07dac126924296f66643dae2435ba36dabae4767928c42a2be9ce20cdc77269bf35c047f85ec52228b307d9875e0ecb42dc48fe4938c9ff68c759e24d810821
 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 176fa5f57820..fa35f79b4ad9 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