gentoo resync : 20.03.2021

20 files changed, 20 insertions, 324 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b8d37540e619..31317bd4fa80 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 6b6be6cff034..ae5424100a19 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -4,4 +4,4 @@ AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e
 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-r4.ebuild 1938 BLAKE2B 5caa5b800459dcd5a976191d909e8dd04f917d219ed7b0b90494421a9af163f84fd2e06a821aeda7f60bd8adfed0aabce388534a7e4eea86c6bd42eba28a19eb SHA512 b202b7be0fe2b02748214fcc2b56034722feaeb91ac6f988af25b3e7a5691b236db8aa86c8128422c54107172f1d03092446e4e86ab10f5d25fc2200dc4a35d0
-MISC metadata.xml 643 BLAKE2B d1a621a0e1435528b11b8c990ef81836692c5f16526c78e2814c1568b0681ef02c2a988008c7c58b074ef8771ae95f840b5506447ad44cbf1617c16c5d09d80d SHA512 562485fc40c786d504d41805670a817811865aad74efb43fd210c3a9280d98f0e896410842c2881fcaa372771492e8a3af0167e8a15395351501981976f56700
+MISC metadata.xml 657 BLAKE2B 4b1fd5ff3e6f256aa54ee7381e2e698fe3328f49438efaacc0f7a5ac4075ec2aa6e1803f9385a8316050ac306eace807f54ad04b41af271c2aaca52d2679446f SHA512 ac7cfe7351d964605383175430cd3e850212b06eb02049f05833fa227bbad42a68e988de144548c8619bd2ee995ed613573facaad7866a4c799b3d604202773e
diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
index 33527ab06bea..a5e1e444453d 100644
--- a/x11-terms/aterm/metadata.xml
+++ b/x11-terms/aterm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>imirkin@alum.mit.edu</email>
 		<name>Ilia Mirkin</name>
 	</maintainer>
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 62b0d298c46d..ef588c006cff 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -2,4 +2,4 @@ AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8d
 DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
 EBUILD guake-3.7.0.ebuild 1791 BLAKE2B 38e91820ceabf6259744e2b549f19d1dcd1d95c5ab7c3991161cef29e2837960dbdd53e7c8db7963b988c7d6b7c0ee5f9cb8f45cddc31c99a555a204c45dad19 SHA512 cf275d91ad2e4236a9893b24f3ef54bf76479163e87949ce1eb1f1cf26ecab298da36fa6f1718350fdbab7699653312f3b57c7676585ab5bb8ef904769c93d3c
 EBUILD guake-9999.ebuild 1562 BLAKE2B d56f4684ab835d08fef52f81b3caba81b8f2eda45c71de8841a9c84886b44db549e79702fe166ecbc3a24f1583f175a23f608e34bb69f341ca350cdbebbead38 SHA512 e22a8baf069ce457b87cadadd9f5c913da74b954f4e300c4a7686e27a2a4f672228cfa53f1ad13a4ac421026c9412cbcf8490a654b713bdf600d729113edbcfb
-MISC metadata.xml 531 BLAKE2B 146f191ac6a28b6b673f7eb9e86c748bd7bf7ce3cfd1e9150dd781bf46de711ef255e7497fef9c89261e571a35b5c829d3e197f31b28f8c501ea5bcd97d267af SHA512 1a30fbf43aa18e54129273bbc4b827e9ed905f47597bf3bfd7b6dce6f4719ec94f3e6d07a0a7fb1d560034c3c10b894b58c2fd8e200db4f7382c98e123b4f64b
+MISC metadata.xml 531 BLAKE2B d81956273548043e4d492692ece7db4e273244923c1764704c309be877b39824c0afdf418aeef7f7bb0f5a3ae8547cc158b49dd5d1f2994e42e0526e915aaba9 SHA512 27386a0206791a3e413504dda0eb8d4b78e709b1ec4c16a8db40bb62ce673bca48b84878b42770b02600f2550f591e3d5b8069a73a233c44e0ed218a2458abb7
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index f13e10f183d2..e63d8a17b1b1 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/metadata.xml
@@ -10,7 +10,7 @@
     <remote-id type="pypi">guake</remote-id>
   </upstream>
   <use>
-    <flag name='utempter'>Include utmp management support
+    <flag name="utempter">Include utmp management support
       via <pkg>sys-libs/libutempter</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 6acacb55b511..4312b6ff8985 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,10 +1,6 @@
 AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
 AUX kitty-terminfo-setup-9999.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5ed12d173a484d702a890b7c673015e59026429e12b7254bb3b1819e972b853fbd07b098fa1459ea0241c3380c1b25eb8e043 SHA512 f45aba42732d01d577f09143cf867b983743b94cff72d07785398e2ebdd2bdaffff4b04a817e0381cb5cfdb505ed7b7fbbf090d1241d3d718b3148a5e76efa90
-DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
-DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
-EBUILD kitty-terminfo-0.19.1.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
-EBUILD kitty-terminfo-0.19.2.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
 EBUILD kitty-terminfo-0.19.3.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
 EBUILD kitty-terminfo-9999.ebuild 916 BLAKE2B 641dba1eed986cc0538a48dd08a843cbad8f56c2a1b2e79eac96da4fb3c19b021f2a7f929973e1daba2c403488d7efd8f7bbbee5635667388a44b7dbcff62e72 SHA512 5fc25f2c189a05080de77604a9a1c36abda4381b7991bfdc39d17ce1000eea2ddf91480b30b66dba4732f4fa435a1c67e267f46e7a53217e1dcba5318842c9f1
-MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
+MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
deleted file mode 100644
index 7f52297143e0..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.19.1.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-terminfo/kitty-terminfo-0.19.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.2.ebuild
deleted file mode 100644
index 7f52297143e0..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.19.1.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-terminfo/metadata.xml b/x11-terms/kitty-terminfo/metadata.xml
index 2c9e05543121..c44f75410aaa 100644
--- a/x11-terms/kitty-terminfo/metadata.xml
+++ b/x11-terms/kitty-terminfo/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>pabloorduna98@gmail.com</email>
 		<name>Pablo Orduna</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 506fdc9a8439..fac525968611 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,11 +4,7 @@ AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead
 AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893
 AUX kitty-9999-flags.patch 1962 BLAKE2B a7a446af13b5234c95885a49d7f2f4638fc4839d3ebee0e5249143ec40d8cf5694a1a3826b9e399071a1fb976698fc3698e2e44f8f3827b15df2aaca7039a827 SHA512 b9062d052daa8aa5f403ae42d46b7528f69761b376d73431d9e835413e7ff99d82174208e503619f7c4cdeb47e1b4471dbd4926f3728ac9613387207fb20d23a
 AUX kitty-9999-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
-DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
-DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
-EBUILD kitty-0.19.1.ebuild 2246 BLAKE2B 6f228b2425d71b4024a7997b8b464b5427c779b4a4806b004cc34f2ec0eaf7610336dbe427ceedd45d96f6df3e7a8f1d668e4dce2dac2b1117cebbcbbab30791 SHA512 e000ff8fa7e5990cf7788527c9b5f2a68931af195be86b7350a2698aff6134b3a7ffecf857f53b6d86adc400b8bdfa1b2e8824a1e4cd9d1ddae1deab12057c07
-EBUILD kitty-0.19.2.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4
 EBUILD kitty-9999.ebuild 2175 BLAKE2B 0254a67fe27cea41a49cba4f60578b2ab75719362ebdd278900e6baaa67a356eb46554bfaaa08150604265ff51dd67a9a7ff25902e07ab0d9b3f620f34ec290a SHA512 216891bae1976c8c7a163a776efeb42906e8a5fda599f75505c24292e4f06561e48cbd6b7e39d7cf5aa6fcd7b0936e917b28c8fe06214a9394ad79930510174e
-MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
+MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67
diff --git a/x11-terms/kitty/kitty-0.19.1.ebuild b/x11-terms/kitty/kitty-0.19.1.ebuild
deleted file mode 100644
index 0647b5bfde8d..000000000000
--- a/x11-terms/kitty/kitty-0.19.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=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
-	x11-terms/kitty-terminfo
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-
-DEPEND="${RDEPEND}
-	media-libs/mesa[X]
-	sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.2-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
-	"${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		--update-check-interval=0 \
-		linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-	dobin linux-package/bin/kitty
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.19.2.ebuild b/x11-terms/kitty/kitty-0.19.2.ebuild
deleted file mode 100644
index 6fb2b8651431..000000000000
--- a/x11-terms/kitty/kitty-0.19.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-1.5.0:=
-	media-libs/lcms
-	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
-	x11-terms/kitty-terminfo
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-
-DEPEND="${RDEPEND}
-	media-libs/mesa[X]
-	sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.2-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
-	"${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		--update-check-interval=0 \
-		linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-	dobin linux-package/bin/kitty
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index 2c9e05543121..c44f75410aaa 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>pabloorduna98@gmail.com</email>
 		<name>Pablo Orduna</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/x11-terms/metadata.xml b/x11-terms/metadata.xml
index 7b2e8b135e7d..7faadc0007e9 100644
--- a/x11-terms/metadata.xml
+++ b/x11-terms/metadata.xml
@@ -36,4 +36,3 @@
 		Kategoria x11-terms zawiera emulatory terminala dla środowisk X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 7f1fc4a513b4..745cb8561277 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,3 +1,3 @@
 DIST roxterm-3.9.4.tar.gz 527450 BLAKE2B 0041ce4a026eddd2b78c7e9aed650f21c5ed75903c7903ef79950e95a92045fdc951b23f199173846439b39712be72b0325fba5c2be92f95ee5a121b112977bb SHA512 42f48e56b2f8017fc3ec249ed1e6d42aadc171ab854f948a7b686c36d9b1c5202f7879dab66a04f2a4e0438b09ef0eed69da72eac0cf651c205d9b4724403759
 EBUILD roxterm-3.9.4.ebuild 715 BLAKE2B 9ac04ee7c100210b8f00fd89fe2b4914bf082a1cd0d724b3bea3f14219c7c9d4720d860c956bc9302bafc03b5f28a23500eb0fde28999a9f409e6494a14ead1f SHA512 9aff4e772d9946222353f7ce1a753abccf6bdc6ac823f4acd8d1d0242a909da40e3286ea2723c69ea03876a541fd0c1963f46d3614edcffefd9d184ea069e70a
-MISC metadata.xml 472 BLAKE2B 90826818bb97e1be487ba8f3a3563e06740b0dd133f9785af4f8d37659fe2db305934f72bd7120b19f28de4be7e29566a937e2f4b171b143098ad8063b462aea SHA512 ee65349209ec6c4c5755fea00a37a5f7c671c425bf7804727446b7a59e7069fdcb23e36234b48edaa539ee82ee78574611a174b085f4e9f8ad9532ce93673e6c
+MISC metadata.xml 502 BLAKE2B 89a0929e22225d296c848da1e2c97227a85fd7f057a354bf42f349f7c354d2716021da8373e56accd53ae2dd1786d0257fde37a6fa3c0f5a504f313e2f893ff5 SHA512 c4b048563a75e2d853d86674234f1a27cb59eef3848557243f5280a824dfe87b41abdbe1e5d91276410c41415a182c91a182b0cd9cee84c2df3b724e4418a00a
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index 7b589394216f..91b5e6407565 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ewoud+gentoo@kohlvanwijngaarden.nl</email>
 		<name>Ewoud Kohl van Wijngaarden</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index c2b05cd88e09..6fe849754c03 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -5,4 +5,4 @@ DIST terminator-2.1.0.tar.gz 1030864 BLAKE2B 2fb92644b1e5a79f9f9d307e50889d8741e
 DIST terminator-2.1.0.tar.gz.asc 866 BLAKE2B de8580504665943677eff710418c587f9da1618f2a79c8af76f53c1dae1a5d458be6489e5fd4c8fc7cd89d87d38d7546b1932b9c9c4876a7c3fed3be8fcec930 SHA512 bc5562cf75bb4e890e98e3f3d52f385d357ad97ccca3584da3ea0e5b383f30558ca99808af20c3b5d479d98beed3e69a31a9fe43d289e55d949976843f09ae31
 EBUILD terminator-2.0.1.ebuild 1606 BLAKE2B 1b3272472d14dfd65ae31580ed3243b927dd9a725562676075d39b617a7922e1bd2a2e0acc77d64be76fd5d9359522aac24edf430f96c08cdf55e03f1e5fdb66 SHA512 19cdcb5c8ab1408283ff33263fcf6ac426c8458033cfb286b1484605940ae534476559c2d2259e38c84bcceee9f5972eeebd1ed200b38fac59505f600ef3941b
 EBUILD terminator-2.1.0.ebuild 1854 BLAKE2B 3da53742c988787fa4af97ad62e584f8aa2ecedf0d7c8c4c3fa0016804ee78cf624d1583b4437220e17552842a03681098c25cfd245abe3f3ba35551393a4fba SHA512 1e3d7efcf6d443c8cf1a88409df332b05f07f7e81170b7c7ff55720d7bd5bba946d097c4a4fd78c1f9600a7039fa433088637b4c8fe8503d923c36999bf88d5d
-MISC metadata.xml 828 BLAKE2B a77c4067e727d814842b41f529d5a1f90bfeab0ab4425bb071ccb9ab043d7c3a97ee8b6e7ac7dc596d0573c35e4c67c8903a284bc5924eac909b9a29eb703890 SHA512 8ecd094dd314e3174163a86d91f67bc01ab4b2047f9ecb8d11cb39525f1b35cdf142d0a73938813f905aec734281a5542eed94540106d829b903cd95ca0193a2
+MISC metadata.xml 858 BLAKE2B 27a8420382f3ed119d3c31bd628c2357d552f79c5361b76446a7ad093f2fca5fd0e9ec1f6b16ab6d2863264993eee52c25e7d1c468f2ec23d99e82d9df3362f3 SHA512 9c058afed38eee38a1bb793ed2a8c2253a729ccd79801365c7cb596aa3402e9e24bd04c71547aa93a550290e07b71c1f5c0f9d9bd41bf886c9935700f3a2d3d7
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index ee4d746c1c88..856d2f60671b 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 1b728ee4fb1d..74f84f035e1d 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -2,4 +2,4 @@ DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0
 DIST xfce4-terminal-0.8.9.2.tar.bz2 945176 BLAKE2B a37a665601c5bdb2f53cd62a0909befaabd9bca0747d477fe369f4e325be15a362d249ae675e6cf707ecc89e623b4b1d73f7a31d32f6c6fcc13e4c57684f5d4b SHA512 1402d913bcc0c050b6c83405c754cdec71cf9bb56e2e68e4396d7ce48bec6e1b0cc875ea3ea2f7a0dff8280d306519fd74a8f9d9ebca383a8f295991cb9ddd94
 EBUILD xfce4-terminal-0.8.10.ebuild 971 BLAKE2B a745e0515ca201130857a065673cd2da539612ca381e9eebdbf02eb2c3b39254abc526d27468d49beb60fa60066ac79b9d931553ab9d787f7929a6629962d767 SHA512 b832a59e037731dd5b53c306dfcfdc278c3e2484271189457f2c0b776e741ad48993e6bc433bef0eb63fe0a96db5ca16383dee349b402719fa9b98198b9e2493
 EBUILD xfce4-terminal-0.8.9.2.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
-MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
+MISC metadata.xml 371 BLAKE2B 0a526c805b03c54f6c83949db4687cc24fb686352edee1f9e28200cd7011a48319bf80d590cffa5c3e3eee94b080ac8949b0dc1de2e80452d21396ed18f56459 SHA512 9791152a81ee8a73e7eaa1477c160b43d8e395813828932882f27cf2a4ac58996bef78c6995ca1f950bebeae8858eb08f23da55dd6547b94bf294b275c920005
diff --git a/x11-terms/xfce4-terminal/metadata.xml b/x11-terms/xfce4-terminal/metadata.xml
index 27885f2335d7..3657198b7f9a 100644
--- a/x11-terms/xfce4-terminal/metadata.xml
+++ b/x11-terms/xfce4-terminal/metadata.xml
@@ -6,7 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='utempter'>Include utmp management support
+    <flag name="utempter">Include utmp management support
       via <pkg>sys-libs/libutempter</pkg></flag>
   </use>
 </pkgmetadata>