gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /x11-misc
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
101 files changed, 808 insertions, 665 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index aa15a84985c8..6791c7e24014 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index d3a294d7ad4a..dde36e73a498 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,7 +1,5 @@
 DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055
 DIST cbatticon-1.6.5.tar.gz 27951 BLAKE2B 41d43bd7bfd5741e37365bed1541c88e255998a4ba69143f80a9c59ac4f51c280b7d07f3f9aba95063a8c3779c9637f7b4e27b771fade0e6092215b529813bd7 SHA512 5e1648cf3b31fe42aefd0a5e79c4e5dc22c3ce4b6f594f0933229494ca6f2e28e44a7e078ef839de1df0b8c1ba494fce8a58866ad70d056799320f4dea32713b
-DIST cbatticon-1.6.9.tar.gz 32257 BLAKE2B de10cae916ddd80638e2f2ea4c64038d5141524c102abce0dcf090517eadd8e375a383d438778e06b9881e617d28cfb999476f75e37ce1ed2a04a811abf5ac4e SHA512 bbaef2b24eddc52e3ad63033e063620960aa791f6bcb06cd1b981ca2a4f38450ee2c2177426b171ece2b5fff0db8f360bd9ca9ef1a3351ec9ad1f5ea34f925f4
-EBUILD cbatticon-1.6.10.ebuild 894 BLAKE2B d1a76d208bf08908caf520b4d5d62601bab12ead57e6ccb8896240765596c725f0204af8c80bbf604c8890da5f689146ad7ae9dd7f48943bd9f18618861aa3b8 SHA512 7c5306b31250105bbca99800c5a49a6fcff0c059c14599267d7d31bdd50dba1da8536e8cc65ad3320278110410e02af55e9e7a7dbd6a8c4bfff9c823fb2c3b03
+EBUILD cbatticon-1.6.10.ebuild 878 BLAKE2B 9b945387edf685253a18343e0b3f24ea97951142ba100e1f001493a5a8c76025c96ec91e70b92203655c31593c60e22035c36fa97a81f8ff15a162e4d3319506 SHA512 7ecf438312aede920da7dccb57ef6daecf0349e1b37c8582890940d95e2bbc584ce8ce7533ced3dd180975e317ff1e4fe6ad7b817eb32365e4a8a4e51a46752e
 EBUILD cbatticon-1.6.5.ebuild 861 BLAKE2B 2aa73a0b824ce558392943ec003d97f4cf15e736676a890f9f6fc474321410c11849cb306deec6c585c6174421f1a6f797f97fe4c5a34804941bb189a57aead7 SHA512 cbc37a6d09c1a8be7b0f9436a5d97d210b884d8e439570650339a60bd2a5ba2e9dc903c730979e4f7bb4166906a540209d5586d7610e47cce61ed94426438225
-EBUILD cbatticon-1.6.9.ebuild 894 BLAKE2B d1a76d208bf08908caf520b4d5d62601bab12ead57e6ccb8896240765596c725f0204af8c80bbf604c8890da5f689146ad7ae9dd7f48943bd9f18618861aa3b8 SHA512 7c5306b31250105bbca99800c5a49a6fcff0c059c14599267d7d31bdd50dba1da8536e8cc65ad3320278110410e02af55e9e7a7dbd6a8c4bfff9c823fb2c3b03
-MISC metadata.xml 361 BLAKE2B df663be776d229d5ab74adc1b1d5dbf1df0754c1fcf773e93ea73b0c03557a1c088b3afe78dc939cadade3a2a106d7be77c81c46bbeb406979c1e402dc849c2b SHA512 854a12b8d9eef3ad16aaedd57e7d371979a8788641759c032aaf025de3331456430325d1101dc9046bf38be86a6ba5a4b3c29eb9daef2d9aae094853c67423e9
+MISC metadata.xml 324 BLAKE2B ee4a0b4dfc25fe37375a21699d236f5a72bc07b5bb6c4dd8990866a5ea3a271aaa19aa5f778ebcfe9f52eb9e7269d1c65267254f9faabcf84d413cb9e0638f22 SHA512 34dfc3da47adc4cdbaa8ffe5dac31f91664a37266599495ec64a819f8afb634373b03bc6a44687dddad86f8b12758a0338679bf290df8a686c6cdc252c21cf8d
diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
index c50d042f8226..98aa41f159d1 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
-HOMEPAGE="https://github.com/ColinJones/cbatticon"
-SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/valr/cbatticon"
+SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libnotify"
 
 RDEPEND="
diff --git a/x11-misc/cbatticon/cbatticon-1.6.9.ebuild b/x11-misc/cbatticon/cbatticon-1.6.9.ebuild
deleted file mode 100644
index c50d042f8226..000000000000
--- a/x11-misc/cbatticon/cbatticon-1.6.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
-HOMEPAGE="https://github.com/ColinJones/cbatticon"
-SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	libnotify? ( x11-libs/libnotify )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	strip-linguas -i .
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		$(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \
-		V=1 \
-		VERSION="${PF}" \
-		WITH_GTK3=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		LANGUAGES="${LINGUAS}" \
-		V=1 VERSION="${PF}" \
-		install
-
-	dodoc Changelog
-}
diff --git a/x11-misc/cbatticon/metadata.xml b/x11-misc/cbatticon/metadata.xml
index 4f6f198a59ab..378ebc5dbcc2 100644
--- a/x11-misc/cbatticon/metadata.xml
+++ b/x11-misc/cbatticon/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="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ColinJones/cbatticon</remote-id>
+		<remote-id type="github">valr/cbatticon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 9ac26daaddf2..5bae2ef20dd6 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4323 BLAKE2B 26e19311b6da6e6716bcc45ae7e62d3cc82afe09435895c3a952dc388cbfb5b18731e8e480c9ce31076616956b740a4a82ac1d6e20e5a903a99f0ebe793700f9 SHA512 0f90dc576eb52f5bcd9965ebbab05dc3e52a3020f25a69209e2b9f8a836e18777452e4e6ee444c61dc4b1515791e811b45a2ad197abec171a9638ffab4c2f7a3
+EBUILD colord-1.3.5.ebuild 4321 BLAKE2B 4b9ba5bc30c9f42704592e76f1f602be29ac070e882599966489f70e3ad3462d7672603a0d1b5dc5c4bd612dc8a566b2643bc64aa1fef6fd2ad452a572256814 SHA512 8d35d6d714b1992d316fcf11cbe0ad4020efa8b09741a3577daf3012b64f628e175cc2e2900d86465327417687604a1cdf885d0a065201f9db79de0b4bbf490d
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index b6b210a9e649..ad4394daeb79 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index acf8e5e1adc3..d3365296f2af 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD compose-tables-1.7.0.ebuild 896 BLAKE2B 8c9361d90be16f2dbdeec75f29e9e9f0e129fa20922c11147d363dcbc23b8747093954ca9b5c914cac9e75c2573261ac043a3ed3253fa5015e0020067345fda0 SHA512 ca1ba19ede5a08d303a9421b529b1e96b68fb30824d3da7b4cd89cfe7728003dae5a656bbfa0886894ea8a2c66a679dc47aa513fc025780f8022b9f146a8f774
+EBUILD compose-tables-1.7.0.ebuild 890 BLAKE2B 9319b020fef2e3a9047bfaedc958f041d4590a857e6ee1f39a3bf6995e5ee2ddb3d08c14756d16b7c3b53ed36ac46f4e42acee9e62744601d673dc2f3d79a1dd SHA512 bc271018303fe1aeadb98010d8be7480de0840e55a0051e2db723316182a46850c4420fb5bf3d1d7f6cc28a7b1c5b67eda1142d2d6bc9d1abaee5595cad258c4
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 252ac5809af1..5c5eca7a991f 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}
 S="${WORKDIR}/libX11-${PV}/"
 
 DESCRIPTION="X.Org Compose Key tables from libX11"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 83469e2e1fe8..404a726810d6 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,5 +1,7 @@
+AUX devilspie2-0.43-lua-pkgconfig.patch 545 BLAKE2B a2a13bf92fae1569d9bcc66c48d73a4c73f1780027df6df4726322c7a6897af1b5686abd122c2f097d360ad0a76999da4cfdc3cd34ae97d0fa339a6b5cbdf91a SHA512 1ef8fc079e8e6196029f302a77aa284341262212eec61a965554b43dc93e8f44b2f8b9b244aef98e7bf290068255b109262b86684abe447a76a1cd311c4752f1
 DIST devilspie2_0.42-src.tar.gz 48663 BLAKE2B a2340f64191ba31d554aaab8c1ce74ba2252ac4f1524446c88eb674d9bc49225298eaa64c9df649410cb8a07993e891491f7d885af0d917810143ecdb8916bbc SHA512 796b95ded542a76343ffcff25d7838ee3bc25f37d9a02d06785a71aeb7c0da3ef05279f9b88216124c5c9c64754fde59973445a954b0f446f5b4ebe6a25f3055
 DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
 EBUILD devilspie2-0.42.ebuild 1133 BLAKE2B a24c2b54cd596f8a38bb78fe0225b7824e08d8ff9116d2e0a7e358ad5e9197313e73cd249aa4e78dcf8ee247b16d1ac3818424d416cdc68ca1c6691b34d43c4b SHA512 a052da3fe67d8d099e6c5ed338aa5a3ecd177aef9d58bc7b570f61c4ae9c6df97ec16ee537080f0c142c0e7e48a269a96e412bbe63dbb0a467502a75c0288b54
+EBUILD devilspie2-0.43-r100.ebuild 1021 BLAKE2B 5777cfc8a936dfb684b97a93ffdd17beec24993954d01d3bf9a31ca89cdec1351008e34d496032a859568886ceb19b9babb3f98e8a2d5de82fbc83bfa4132d10 SHA512 3a5d5aad2c34ba488278f0f28bbc448861748bf90ab6eb1c92bfac6f3c544c44b2d46254cd715f74d8df6ca45bc0c0d84acba555acb81fe3bea148599df20ab5
 EBUILD devilspie2-0.43.ebuild 951 BLAKE2B 020e7b99cb9e1f5e20d1a0f2562b950fca68067866a517cd8dbb25d5a3f380d3fde3e2274fce55df74acf2590405fe907f312194fcded5131caef76d54e5cbca SHA512 81da566022c75df100ab2a1f7c59d5671a7c21950bcac922165133867dc27926ca2f8fc0aefa040100d8ca521284039d582a7c5e1b9fc2d37e4478c9d0808472
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
new file mode 100644
index 000000000000..e9c87f823d33
--- /dev/null
+++ b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+PLOCALES="fi fr it ja nl pt_BR ru sv"
+
+inherit lua-single toolchain-funcs l10n
+
+DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
+HOMEPAGE="https://www.nongnu.org/devilspie2/"
+SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.32.4:2
+	>=x11-libs/gtk+-3.4.4:3
+	>=x11-libs/libwnck-3.4.4:3
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.43-lua-pkgconfig.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" LANGUAGES="$(l10n_get_locales)" install
+	einstalldocs
+	doman devilspie2.1
+}
diff --git a/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch b/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch
new file mode 100644
index 000000000000..89c74d0bbb4e
--- /dev/null
+++ b/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,7 @@
+ endif
+ 
+-LIB_CFLAGS=$(shell pkg-config --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua)
++LIB_CFLAGS=$(shell pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua)
+ STD_LDFLAGS=
+-LIBS=-lX11 $(shell pkg-config --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua)
++LIBS=-lX11 $(shell pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua)
+ 
+ LOCAL_CFLAGS=$(STD_CFLAGS) $(DEPRECATED) $(CFLAGS) $(LIB_CFLAGS)
diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
index 5b2b3606bbdb..dfcc365282db 100644
--- a/x11-misc/fracplanet/Manifest
+++ b/x11-misc/fracplanet/Manifest
@@ -1,3 +1,3 @@
 DIST fracplanet-0.5.1.tar.gz 111911 BLAKE2B 81f5986bdf7a0ddc1a7ef8fd08bf07fbc23ae38ac1cdc452de6696354d291205cb1183d16c3a7fa8bfb250158229d84d94f3c24dafa09d20518fb5d19b31471f SHA512 40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e
 EBUILD fracplanet-0.5.1.ebuild 848 BLAKE2B 17ec269b2c8da445eaa2127cd138d8c388f3aca946e0e2ea82916c8effb0a4c81c26f195afc2d1661ff349d491c6ace3a4e1f19c3641cad79492850f1c28edff SHA512 58366144ff655afa19ed51db1ec7631b138f2cfe23bffa4cce67a274c7a799d623b49ccd2407239fa13d53eea8ab5ed495fec390b7537cb10b874569e8ae0037
-MISC metadata.xml 356 BLAKE2B b7514f3974a8e8f91ce709d90bd372dd73f61645ba8e55595570e8cd03aa2038e9b319a2d07b11b319bcd8bad91bb7fbcf87a35852451d6cfcdc30f33d9c9c1e SHA512 71282985fe89e25eaf0c84d2e3b0469317e2e2b1c3de5db8efc9557f8da2970e021e9aa18b625ef8a718feede1232a7c9687bc89615c12b4efd76325d4ad1561
+MISC metadata.xml 325 BLAKE2B 13c927873af9f831bcf43c551d1f7dc3a7025c148112a417c6b779c3c08dd85fe227e7c2952c07f7808e4ad53b6c08e1ce4606b376e26d7ee34a207d8f35ea47 SHA512 946bf34ca9c0fd8b1a306413a6fbf1d7f8fac6e2e0656beb46325e58f0fe58a2e85e12791271372e6161ba59daef299ea4dc598129bf7d75646a52d2bd0d9cde
diff --git a/x11-misc/fracplanet/metadata.xml b/x11-misc/fracplanet/metadata.xml
index 3d9147f83aa8..56dac63e44c9 100644
--- a/x11-misc/fracplanet/metadata.xml
+++ b/x11-misc/fracplanet/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fracplanet</remote-id>
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index f3a3bfad91e9..51db9c0d08c8 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,6 +1,10 @@
 AUX grsync-1.2.6-gcc-10.patch 1497 BLAKE2B 7b75cb46e4f1fa4df69724441e1a67742469a28b17048a98d6eb87377a6e798a6c72138e74f13be995e414faa0058a66e8c8c591b7f302ec6c08e3cc4c9be000 SHA512 83a09c1601fa5655d3ad29414c0f31f93bd3288c0bb099c17ee5432666bc19b05ccc351dc9f345b769e7d55201788682a872ccb5c141a7b68fde806a3ca99695
+AUX grsync-1.3.0-desktop.patch 971 BLAKE2B d84b3a8dc985a749ec1e06efca88bd4d7055b8abd75a11d38b4ba3155072f1c3dc7161c90c3078259cb61d786e769134e55bea0c77e96d1108e4a2be00297488 SHA512 34db923df4fb6d5fbc3275d9f2b00b638bad22e59f6a91223423928124e6d209548e0a2aa15d461cb42fc8888f61dba379f747f7994cdfd604bedfddb761720d
+AUX grsync-1.3.0-nested_func.patch 954 BLAKE2B ce3aa388652b89278b91d1f10c83bef6e0f3dd5a13a90170d911c325e8581cb081277564eed640e39a8beb86a9f6c2e59d31a093e48c984cc92d53302d0c480c SHA512 b11bae4abdd9de4cb2a2b6acc7af30d7507fbc99dff869521f923c2456cf6316fdb2b36849dc978817915c9839d1b15353e664575bb93fdc0f4ee887c22fad2d
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
 DIST grsync-1.2.8.tar.gz 352885 BLAKE2B fc63db9b2739bc7a253b64cb1820a7c51c7408ebbe5bb950672b6ab08942726467a4966eea3da67c7c7e21e0acc703a06183d58e2fbcd1ec38370257b57bad63 SHA512 7feee6c405b20f147641e9a9a114645a7132345fcfc33c656a190aba0d2b7fedcd40f98328dfb0b123f38d8648d041a2f53cabbae0b8d53a243d3a6029bf0963
+DIST grsync-1.3.0.tar.gz 304725 BLAKE2B 4e58eb7db8082b733468b95db995a2e7f7f970cebe2b3eb614e0a828d2fb34bc20fc2163f8bca7d5d87e648cfe0dd45a0cd22319d6504e9bd491a6da462ee8a3 SHA512 2d2d9e7910f18e061c5259f51510cd5e3c14c1c15b649618ea096777531780c2d5821a7bb415cd762a695302146b4835d793d31c032667431e227ac11a7aa108
 EBUILD grsync-1.2.6.ebuild 531 BLAKE2B 189975475dbb3ee82136f7abb13b9b0934ef550eede295136b3ec4d25bda3cf1494d5f24f9e9a715619f6227557ca88cc993f86083d898d9edeeda57077c9795 SHA512 9f2ab15a2ea536f07e4d12f65b7f1640ea791b54704654da9ec1a75bc0ca6178e0d2dbf777a593523f1d38dfc7a737cbd4c8f3c9aecce419ec8f456617fce448
 EBUILD grsync-1.2.8.ebuild 563 BLAKE2B 43169b43b94c3de0ccbd8c440415882b8c8942c88bf8d74c75ab4930d2c5b7f31a73e4c6500a80b60d7e44cb937f1604f83ae945226404eab833902c48c84a2b SHA512 dc3a99be2b068aa0023b51878de0fee836ed1306f945d62f465d235a722f898a298bc12de1e2f6abb7ff0a08125ddcb0f91bc9aff88e924909a5161d51fc1918
-MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
+EBUILD grsync-1.3.0.ebuild 710 BLAKE2B f579d5e2d5d90d32b2435cdd81afef4035e0dca86b8b76dc77bb5cafdfb602ce6283a67c64a2edf162cc0a35777a853f7ce121299672cf909542da22a4d32571 SHA512 83594f433fe740b70eea5085c8e1a7341ac9db5030b5777e4f50a457d99a9c427ea567fe25f1d2004050c3f077431b895cb3547c4180b302ba8060531c714888
+MISC metadata.xml 382 BLAKE2B 900a8fa87186afeeafd9afdb5e39898e0c4c03f80a8e73af8d9a39117ea71dbce2d8a59de41a732429b09b38b235b1fbbd24dd165ae1a23df90f48d804661a3d SHA512 64f28a7fa9ca489135b65b5ce73f1dfed7580401bd5e0aba1042344e532e31edbdc225a9650fcfc883eb563d7c7f571834852e3af659144c1d6fb5a1db859fe2
diff --git a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch
new file mode 100644
index 000000000000..5cdc49194371
--- /dev/null
+++ b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch
@@ -0,0 +1,24 @@
+diff -Naur grsync-1.3.0.orig/configure.in grsync-1.3.0/configure.in
+--- grsync-1.3.0.orig/configure.in	2020-05-28 10:16:05.000000000 +0200
++++ grsync-1.3.0/configure.in	2020-12-04 09:30:40.082105813 +0100
+@@ -30,7 +30,7 @@
+ 		GTK_API_VERSION="2.0"
+ fi
+ pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0"
+-OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
++OTHER_DESKTOP_ENTRIES="Icon=grsync"
+ MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
+ MIME_OSSOCAT=""
+ 
+diff -Naur grsync-1.3.0.orig/grsync.desktop.in grsync-1.3.0/grsync.desktop.in
+--- grsync-1.3.0.orig/grsync.desktop.in	2015-09-11 13:21:28.000000000 +0200
++++ grsync-1.3.0/grsync.desktop.in	2020-12-04 09:30:50.473110946 +0100
+@@ -4,7 +4,7 @@
+ Terminal=false
+ Type=Application
+ MimeType=application/x-grsync-session;
+-Categories=Application;System;
++Categories=System;
+ GenericName=Synchronize files with rsync
+ GenericName[fr]=Interface GTK pour rsync
+ GenericName[it]=Sincronizza file con rsync
diff --git a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch
new file mode 100644
index 000000000000..6d135674bac8
--- /dev/null
+++ b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch
@@ -0,0 +1,21 @@
+diff -Naur grsync-1.3.0.orig/src/callbacks.c grsync-1.3.0/src/callbacks.c
+--- grsync-1.3.0.orig/src/callbacks.c	2020-11-23 14:52:42.000000000 +0100
++++ grsync-1.3.0/src/callbacks.c	2020-12-04 09:18:27.573776667 +0100
+@@ -40,12 +40,12 @@
+ gboolean more = FALSE, first = TRUE;
+ 
+ 
+-void dialog_set_labels_selectable(GtkWidget *dialog) {
+-	void _set_label_selectable(gpointer data, gpointer user_data) {
+-		GtkWidget *widget = GTK_WIDGET(data);
+-		if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
+-	}
++void _set_label_selectable(gpointer data, gpointer user_data) {
++	GtkWidget *widget = GTK_WIDGET(data);
++	if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
++}
+ 
++void dialog_set_labels_selectable(GtkWidget *dialog) {
+ 	GtkWidget *area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog));
+ 	GtkContainer *box = (GtkContainer *) area;
+ 	GList *children = gtk_container_get_children(box);
diff --git a/x11-misc/grsync/grsync-1.3.0.ebuild b/x11-misc/grsync/grsync-1.3.0.ebuild
new file mode 100644
index 000000000000..a941d3f0832e
--- /dev/null
+++ b/x11-misc/grsync/grsync-1.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="A gtk frontend to rsync"
+HOMEPAGE="http://www.opbyte.it/grsync/"
+SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.16:2 )"
+RDEPEND="${DEPEND}
+	net-misc/rsync"
+BDEPEND="virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS NEWS README"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-nested_func.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-unity $(use_enable gtk3)
+}
diff --git a/x11-misc/grsync/metadata.xml b/x11-misc/grsync/metadata.xml
index dc71e24a084b..269ca1f3751e 100644
--- a/x11-misc/grsync/metadata.xml
+++ b/x11-misc/grsync/metadata.xml
@@ -5,4 +5,7 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
+  <use>
+    <flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 5f607803b60c..0112c05576ff 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,5 +1,3 @@
-DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a
-DIST grub2-theme-preview-1.5.1.tar.gz 197976 BLAKE2B 561090bc4ab7fc6d170521380fe595e8db6ef553a5359bd5a1b42e986f2aab52a6c08ce0f5183dd8aa6d87d8bb44410cf6df80cb69781557cadb9f35b19ee5cf SHA512 a96ee503b793707ce59a0a691c3a0b7eaf206d0780de4f3ef53c6d6c05ab23c9dc58774a40043a35bbebdc4becc5414e520b9e5c805953c9145435d644aabfe9
-EBUILD grub2-theme-preview-1.4.2.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
-EBUILD grub2-theme-preview-1.5.1.ebuild 743 BLAKE2B 300937ef4a2f6f4bfbb2fbcf4d06a9d8de98c4302b70cbc38ba189b7aec48891f787608c8c5b2b1dd246b0ec60b96a4bd47a04eb36221472f1584bd1bf111e90 SHA512 25003f6009f5513048e175c7275b2e1e0beb67964cac966fdcec65b65aaa928060e58ed2579341404011b3396b8aa9e68b4bbf5c44acc3b4c58dbf984990f2f9
+DIST grub2-theme-preview-2.1.0.tar.gz 198805 BLAKE2B ef0417d49462a78678abfbcaa6b2ad31010cc033467c76291be8f66d4a3e412ac6d015ed4ff55a4aa557e7ed5a7cd33d25a2dd04111fe1ee78af413505fdab78 SHA512 9e8f21b5b84e2564654ffff84149f8421e168bc83c39ad9adf1ba0522de3b3d041c4be3853c6749bfa4d0693e629f43f359724c14b652a599f9c202fe00ba6b1
+EBUILD grub2-theme-preview-2.1.0.ebuild 742 BLAKE2B 9cb7d7478a1f238a43a38968972d75618c83a83f1c348a13691b168452836f3d299082874430c900bc94f29d8c1030187756efb771e7e4fe701bf275727e4033 SHA512 89905b91c88d1d7b90dbc89007df6db8e35f901aa12cfef2cdeef675a38634ba4e2f75c76d38e4a58d65dad0b69be336b95e3f015548423d655e98d37540f6f9
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild
deleted file mode 100644
index 87db4a2d4a93..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
index c955b14f2b62..49c8ba2a55f2 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index 68d6f69f482f..4d83bec7e87b 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -2,9 +2,6 @@ AUX hsetroot-1.0.2-underlinking.patch 500 BLAKE2B 62758446bca47b8e8ff8b58d3e370a
 AUX hsetroot-1.0.5-XOpenDisplay.patch 346 BLAKE2B 975ebe306ce78411912d676b8334b31c47e3b96a8551a93c0cabd84b9782bbfd1c8e87cc6e1a49c7fcbbf3b8e33b69e69fa7a3cf0e1cf105bb90e4b038707a65 SHA512 2e6b9666e2a79a4dc65e1393018d79848e72b73290bd65bb8316ceaef741ae835385190b0e3592fd9175c68c402c504a679a22cebf8b8684c759787c49d70173
 DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
 DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
-DIST hsetroot_1.0.2-5.debian.tar.xz 4384 BLAKE2B 5ea72b6017a90bdf36030334c021cef1000ca29370f359f2596feea69365ebe5bd6b58286b109ca63a16dc953aea1f873ee4a7eadd50432655093d2dd7e6249d SHA512 5f1dbb00daebf6b8c9db77a51dbc463ea92b4564e0d7a2dac1ea9c316dd2e2126fb8c6454f4d1eddfd19533297e29651444987a7eacb7c0080e26c14383c827d
-DIST hsetroot_1.0.2.orig.tar.gz 125621 BLAKE2B 932acda46653d2211c528008dad14c8877b0b6ace0888da19e1316af58a39b0cde0464f5dd058b752d7d95dd6d69deefc254a0a445e37077c4b177ddedf74809 SHA512 cac98cc602fd8825dbfce27d289dc4ba47805c99c78de804e95c539e83ffae6984601a535cdb90658536a007a5f17c71e27e4c31af562ade6610f11f0d0d2ca5
 EBUILD hsetroot-1.0.2.ebuild 741 BLAKE2B ef440b29711e148c34e1f067d7269005afd3ab326c470c9f181d06719c699092219c93737e0f13b2dad111544169f3b6bf280a81b0fb2ba925f934a54d62ea84 SHA512 d46a6a728b029768ff522fbc39067c8f267bd5f27228ef944c82aca9102c5901c56390d2554b709b21e3a007d7ab5f5eb25e860209abd84159e91eaa307acd47
-EBUILD hsetroot-1.0.2_p5.ebuild 975 BLAKE2B afbd38010572cefa7f952d823e90e7e51b826992ef755885c597c1565022a1367793a138e146afbfd62944282cb6fda8f77dc1a532a20d34e47489727fb15539 SHA512 d479998a4d0fbf213aef85fa806fb60dd73f4a6aefad21c887025e08019752886262922c88ccbc5828e0bc06c878720dd2d99ce5d7bbb274564df209b2964ad4
-EBUILD hsetroot-1.0.5.ebuild 1156 BLAKE2B a0623f8e1a2b1ffedaaaca8ed84c9827163ae93990bf1464335a600010124de156240e15dc7b31b3b523026bba4c22aeae2f2b558346c44780c2d6f894f08cd2 SHA512 2132975b975ea54942e3a892483db1de9237603ead8b4230b746b5f25c6b380785bd149f21251b5cb6096f1ca8d7ee0c8d2d493ea2602d36e91934160135a81b
-MISC metadata.xml 1187 BLAKE2B 68310d07fff41e0af94b70fe62f253de23b966e0689bb33ffb699b6cea3e06cebb137556e9c8d871dd92a261e4db979ac590de0233e86862c3dc2c545c6e63f1 SHA512 30bd381778a254be23fc5b4554b42cd846229ba6c67914fa173c8d429f2ffd3f7a9de5497d5205cf0e1a455d2d0bdfe1a368352d0e25bcb2a173f7b7b76bc3c8
+EBUILD hsetroot-1.0.5.ebuild 1104 BLAKE2B 4021e14ee5845fc57ad4836410f9fe512491e06fe276a30ceaca88768a89c63a50e40b9f4bf1fd3292a370447c39bc2a48c607f0851d7e40ff2c26453e8d393a SHA512 f62b16509e03bfbc4779dcb1ba8dbe485deb38390beefa6a2c9f169949751373f283a415b2090a44608a41a64d6e25d1e59860ccac54b5b572286d2f0f2b9365
+MISC metadata.xml 1162 BLAKE2B 2a21b9cf3ba91825ce65b577154d19ad0275219373e4d4a9560ab3651a4509ccb1f21ccd1d32abd5e2799a60b0aef21fcc7b27f49b79995d5cf15a4ea90966b4 SHA512 66a8c4cc58859f3a7fca586428330b045056c7557be0186f18f2492ef5b5cedf854e1810622505a3902e6c9bb5e13318d219924e13af9cb2513eb9b52eb3d6a9
diff --git a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild
deleted file mode 100644
index 691121fea2e5..000000000000
--- a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	mirror://debian/pool/main/h/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
-	mirror://debian/pool/main/h/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=media-libs/imlib2-1.0.6.2003[X]
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*/}-underlinking.patch
-	"${WORKDIR}"/debian/patches/01_fix-no-display-crash.patch
-	"${WORKDIR}"/debian/patches/02_extend-mode.patch
-	"${WORKDIR}"/debian/patches/03_cover-mode.patch
-)
-S=${WORKDIR}/${P/_p*/}.orig
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
index cde4912ca941..515cd6e49130 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -2,31 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X"
 HOMEPAGE="https://github.com/himdel/hsetroot/"
-SRC_URI="
-	https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
-RDEPEND="
-	>=media-libs/imlib2-1.0.6.2003[X]
+RDEPEND=">=media-libs/imlib2-1.0.6.2003[X]
 	x11-libs/libX11
-	x11-libs/libXinerama
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DOCS="AUTHORS ChangeLog NEWS README"
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.5-XOpenDisplay.patch
 )
@@ -52,5 +45,5 @@ src_compile() {
 
 src_install() {
 	dobin ${PN} hsr-outputs
-	dodoc README.md
+	einstalldocs
 }
diff --git a/x11-misc/hsetroot/metadata.xml b/x11-misc/hsetroot/metadata.xml
index fdbc1f83706c..01e8255bb436 100644
--- a/x11-misc/hsetroot/metadata.xml
+++ b/x11-misc/hsetroot/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="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<longdescription>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
 hsetroot is a tool which allows you to compose wallpapers ("root pixmaps") for
 X. It has a lot of options like rendering gradients, solids, images but it also
 allows you to perform manipulations on those things, or chain them together.
@@ -19,5 +19,5 @@ maximum aspect). It supports the following manipulations: tinting (overlaying a
 color mask), blurring, sharpening, flipping (horizontally, diagonally,
 vertically) it also allows you to adjust brightness, contrast and gamma-level.
 hsetroot also supports alpha-channels when rendering things.
-</longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 50a9afe59995..49ff2c798b25 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,10 +1,5 @@
-AUX i3lock-2.11-version.patch 395 BLAKE2B dee64a9c8b255e3cbadd27419929da66a8fe66c097dac64ada091d78d900595cd32645eac912eaa151b11fa565cbd4d613502e218cef8d118892bf7455fb0749 SHA512 26bffc363d833a6c7049bd6cc0b05d6d2e737dce184e0265d67949f04371c399f41cc54e7071a63d1bffec5d9166aa7c4a4d0bb8fc3fe6b67cb1366963dc08b0
-AUX i3lock-2.12-fno-common.patch 312 BLAKE2B d93783fe971d5a36212e8a4f50d1ccfee35000656f0411d7ccbab8bd723c3564bf5a40e2eebe5c0e662363909ee147a395c61d0d3c004a5606031240405e6134 SHA512 4fdbb7d3c2e18738c788e3cece95735f3a91af4c2f26b74417fd48e789a4342b3e60b0ad456c4882628ed7a240c5285097991aad161d87e8ddfe51f9fb0b0ff7
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
-DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c
-DIST i3lock-2.12.tar.bz2 147521 BLAKE2B 38ae5b4d6a92f918bc432e425301e8d04f9cc3bf8569e5f4e443dafed5aba19abf6604bfa102bc00ea5db87052583f1e9927a4f8e55906545b501829d95081e7 SHA512 84f1558368381bcad9a64f41ab6134a6614dea453d1ee5ecfe886185b9e1baebeeca446c4635158deb8dae5b25c09d47d3990239d76c44e5325ca5bfaad9b2ad
+DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
 EBUILD i3lock-2.10-r1.ebuild 673 BLAKE2B 812f0149566d91f2ace6ee875e6531e88d848971117a39101574f6edb98db41fe1cdc74eee6979ce9a1b810d9489ab4e48d7dc9c9b65c84ee6883b81b8b28ea4 SHA512 4c1f403cb6bf8bf5351336e99ae0a1c909d6b1ee7b4d27d0338808a59db1443d82aedcc4030a00a5a19cc62abca711200ea2d6a41c59f517c4e8cbeab645c17e
-EBUILD i3lock-2.11.1-r1.ebuild 795 BLAKE2B a5dc71760f2ef1ef8a08dafb8fdf26a255de816aba3e7821b32bbad9ef8efefa222be67b9cfc4b557aa31f7fae1e7d4a30ad4466fcad47c32ddd097a7944b9a6 SHA512 80d57ba92cba7f3f30e9315f6868e756ee5f3e7f6d63edc4bda99176873dd5e6f830ddfeed924a82133190f920216ac5f13d3593777e7eaac2562ca083a8ae9e
-EBUILD i3lock-2.12-r1.ebuild 750 BLAKE2B ddf64eb8b8219a49c7b5b9dc448b596b7be74c128ed38debc7bae4c9361bdfab5909d4690042899a6644117e69846823f9e103ce1c73201f1e791a80440e01dc SHA512 89da663a00fc64e4900ff74e1053906847c30fc90b7a00f718d2bf6d088080c07c29edd891f2df8034cb02588b97edbc33df3c1a1873f7d073e3c1e01d215f1c
-EBUILD i3lock-2.12-r2.ebuild 781 BLAKE2B 21494b572ec4a81756f2dcc0cc20200dea41b11d2242249195c71d33e66d9ca0e15d49fbf6363c543d712f1dc9862adf103b33d3780d64c17925a63d252d105e SHA512 1bc9ccab0673d265259b1a97f963b0c81bf5ef2836782f10a444038a2a10eee10abff7c2b34a47833a17f7a9e5c2dd05621e69040a03671cc07ec399567d7daf
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD i3lock-2.13.ebuild 695 BLAKE2B 4a141ecca3734c76266b899c85928c9f1c315fc3cb47b6c637f8f9b7b774fc64dd29ee6f1888b7e8874d0f7b1b340e4e5e2d475f22d07028e8085791076a1260 SHA512 dd2593dffa96e736ff2a466402848da05764d4cb27bf768a4ed9a344ca7af35f72a8b09848d15e452521014b7bac421c9ff0146e680479018d3ec625913f98ec
+MISC metadata.xml 357 BLAKE2B 40dcfc882fb8c7149a23b006e6348eafebeb9da6895bc1f55b17c4a19c165cf336a28cb4695db0b7a794023a8b5758a59aeeb67e9e92998b83844f5bb1db895a SHA512 565f596c3057c2fde857dab1bc064bc6c040372f8898f021079a5f52264de6958ab4604a0dec7392de2e53c3a7142d922e80dc6ae52ad5c68fef99700678b1cb
diff --git a/x11-misc/i3lock/files/i3lock-2.11-version.patch b/x11-misc/i3lock/files/i3lock-2.11-version.patch
deleted file mode 100644
index df133cb91cdb..000000000000
--- a/x11-misc/i3lock/files/i3lock-2.11-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@
- # Run autoreconf -fi to generate a configure script from this file.
- 
- AC_PREREQ([2.69])
--AC_INIT([i3lock], [2.10], [https://github.com/i3/i3lock/issues])
-+AC_INIT([i3lock], [2.11], [https://github.com/i3/i3lock/issues])
- # For AX_EXTEND_SRCDIR
- AX_ENABLE_BUILDDIR
- AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
-
diff --git a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch b/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch
deleted file mode 100644
index 09003b165919..000000000000
--- a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/unlock_indicator.c
-+++ b/unlock_indicator.c
-@@ -35,7 +35,7 @@
- 
- /* The current position in the input buffer. Useful to determine if any
-  * characters of the password have already been entered or not. */
--int input_position;
-+extern int input_position;
- 
- /* The lock window. */
- extern xcb_window_t win;
diff --git a/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild b/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild
deleted file mode 100644
index 5d706ccac8b5..000000000000
--- a/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11-version.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > I3LOCK_VERSION
-
-	sed -i -e 's:login:system-auth:' pam/${PN} || die
-
-	eautoreconf
-
-	tc-export CC
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.12-r1.ebuild b/x11-misc/i3lock/i3lock-2.12-r1.ebuild
deleted file mode 100644
index c2510a4767eb..000000000000
--- a/x11-misc/i3lock/i3lock-2.12-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-
-src_prepare() {
-	default
-
-	echo ${PV} > I3LOCK_VERSION
-
-	sed -i -e 's:login:system-auth:' pam/${PN} || die
-
-	eautoreconf
-
-	tc-export CC
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.12-r2.ebuild b/x11-misc/i3lock/i3lock-2.13.ebuild
index 07a68eb55c25..2ece4ee1a049 100644
--- a/x11-misc/i3lock/i3lock-2.12-r2.ebuild
+++ b/x11-misc/i3lock/i3lock-2.13.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Simple screen locker"
@@ -13,22 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
 	sys-libs/pam
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
 	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-fno-common.patch
-)
+	x11-libs/xcb-util-xrm"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index 2ba8e9e851e4..d6036a612f2b 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index b0185e224a20..d9e06c98655b 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
-EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2039 BLAKE2B 133128e7e1c9af386bd133c1c5fcc0a1b59cb6d2547f95076bd3452b5e38e7946e4c2e2648741fd0333c366b55b4ac0dc4f24ccb5214ce25048d0b8df7407adf SHA512 18b5f1b5d3e467b314a2c037ce789e11b0d51d7d9e6b2f5447d74fec668393cca10b764b27364961cf8b31f9f48af03e1333958abf4fe86b2ec3b66cac8a2ce6
+EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2034 BLAKE2B 24fef9edce9bec0d542de0918d6573d9f32255e041121d66501e0d60d85d8c880d334dda7fa6d12321be949bdb8a2c39db4b3f756381bd7960fb2b0b19548feb SHA512 e655361f54a16ed0ab33fbc3ae27ca88ec90a998baf086442114089800f9417f9e7bf9ae57bd5c141dd7f79d2cf13789127036be87ee5f52230f84bbbf02cf22
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
index a671662a7e34..e809fccb60a7 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 IUSE="appindicator branding"
 
 DEPEND="appindicator? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 0119a9277b00..cb61d5c691f6 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,4 +1,4 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
-EBUILD mozo-1.24.0-r1.ebuild 1313 BLAKE2B 245b391e83ec524f3a14f772bccd9771d67ee65bb98b39dd085ec3a70c62fc992792e1aaea7d1f7197e797a6421470f3debacca3ccd9bec4e1f7c9e95321af66 SHA512 5099b3d2be89196d4b177c7186a7ed78dc250f9fcf285cba70c62a055e36da3822b045cacc95c5ae78d8fb325a73fe737bfb30b3014dc9478e9a5f96a6880e4c
+EBUILD mozo-1.24.0-r1.ebuild 1311 BLAKE2B a4ca8365fe09dcaca5e878003f648e154d7910a33f647bd913461c87caa4f811cb9a1ee5d9f61eb9b226068cd60f9d299f338f89dfe57f231b6a96cef4c047a2 SHA512 3b09ae2cd6f82e3026ccd58edffc54c9b0b5fcea8bd03e98a557a7c9d5ee1fc3c803d11db199bb82195ba71818e7ece23e8c444b9f60f471bb749069cd5f71f1
 EBUILD mozo-1.24.0.ebuild 1311 BLAKE2B 31a5bb689aff98fe1f37caea0a4f856262592214f24621ed6be18fba2563c601e0c41f37e96e2605104f2bae7473135e27bf0a7a7530480cec2eab00ba22cf8a SHA512 d7ffdb97ca09abe2814c244accd3d622fced0e385c1723ac22d925ca97e7b9358382540718cb877996dc7d3108156b9a9fc5c866f34e564eb055202d74e7bb56
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 8977a145b152..b9efa4ff3396 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit mate python-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index ee4d8db51231..13d53ea2dd4a 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,6 +1,6 @@
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 BLAKE2B 9da54db70a628988b5f5b3e34dd71a7bbf8357a58be1e7c9de863d719619b6376ca311c4963e0974f77c08671f03efd28693d90f97a852ee68393e3b11b550fc SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870
 AUX notification-daemon-0.5.0-underlinking.patch 277 BLAKE2B ef30fae7ca0d8a26c18acc5f98e5a2bd4db53293f302fdba3bf3fbc362c435931d81482e174fbff5396ecee04768068e51c48a8e19be3f881803ae4af77e3637 SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-3.20.0-r1.ebuild 860 BLAKE2B 25b340172da0360327ed04e014d22285075326745a92628ff0b9fefae555ddb5b4ea302e274b6c5d12effee0503d15a8a9b80ee67bf0558c340e4f24eac45c3b SHA512 0bec1c988b485c9a8f8e554512cb83000e7f903fa2cf7284d50c15f83d6e118fa28d28e76ab215c859ad8a6bb0522d02f2b6a47e03fa14c00896ab3f164a3444
+EBUILD notification-daemon-3.20.0-r1.ebuild 854 BLAKE2B 98f8d5c1dd5486b54296abe4417a295aadbe2fc63d8427bab65e9bc30b02d1808ac5b34fce35aa1861aff0b577f8a4083fe8d459e5a1d30ab1b4a7418f7d985f SHA512 4e122f144f1118d56b7cc7645c49e792ef605f502dd07164f08bac1bad96f01b261e1b696b9672ca492ad633649eaaad4b2d01a59b5af22efcdf3ac441855c6d
 EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 136f1965fa15..36fe6823fe63 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index b7849c12a412..ab10cc30fffe 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,5 @@
 DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
+DIST obmenu-generator-0.89.tar.gz 20583 BLAKE2B 0513713ed08fb47b212b07a8c8d1a2e496f6962f9940f6dc8e087043276b3d80a5c305fbebbc0c0a39c9c75058bf363adb4c8739f51ff08258e63b1305a320fd SHA512 a796b1a2c6a3080627129360cc67695b73ee7ce82a4e4e879b306fe45f73d9223c8a08d053e7c9c9e8fbb779c3ebad15737b81ec4dfb9a406d77ac74cecddde0
 EBUILD obmenu-generator-0.88.ebuild 805 BLAKE2B f7ed00f5bfeb176b6e14663ae32016a72b9e4c08fca8cd689634021eebdca540cb803067c18943bed886b1c5bc52cf497a7a469addbe7b49fb37a5752215a26d SHA512 727b300980f85d4021c12295c8625573045b03b9c01f443a66aa146179a270ef02ae3c574316b6e2adb4530968fc142da6606f0aeaa795cd300d3d66e25e4d8c
+EBUILD obmenu-generator-0.89.ebuild 807 BLAKE2B 2dcd051b572e98e85e2912f95909e68c653f2856807ca6dd31c56bba494e21a65857c7e4f54637e5d2d199bc0f3c8c55846204999944d38dcd3b69c6c3dd3067 SHA512 b077f1281213801439ae787e8a3a83f9e6a0067bb615d6709cc1229e47f58c61b133b9e3f5ff8b62e9abcfcdc9a7cee56145e4ed79cb8cff6f5989787ad7dffc
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild
new file mode 100644
index 000000000000..8a36e7f9249a
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.89.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="https://github.com/trizen/obmenu-generator"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl[gdbm]
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "For icon (-i) functionality, install:"
+	optfeature "support via gtk+:2 (default)" dev-perl/Gtk2
+	optfeature "support via gtk+:3 (enabled via config)" dev-perl/Gtk3
+}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 227a7366f6a5..bd97fe927793 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,5 +1,9 @@
 DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
+DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9764f429edd4a65d173ff43c139083a8831d9ee68d3024c033f039409efd486178a6225d06e3313642a9918298b1b60da1da75d49243973f8e2dd1fc855f SHA512 27a90d80f2de45743c2347be5ec5c88db58c4f3bb2aa44093c2a1e3178bfd5761ec806bdec9c6b6a4de6d1e67d5f14d4518e99611bf7e2984cfc880898357133
 DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
+DIST polybar-3.5.1.tar.gz 282038 BLAKE2B 2b252c3bea296581160af74412485a6a19201c1a6666ef688c496294823380503574e8b912be4b9eb822214b6a696954ccfc3e3ca29303f751bfa6640988593a SHA512 835decbdfcf398d6920d871beace2aa3883977bec89c7d87f3bd650d05ef267cfa17d1df7fd79bcf685c79ea0c5c9d1d46c4ab32cffbfd85d44a273f0ae8b906
+DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
 EBUILD polybar-3.4.3.ebuild 1808 BLAKE2B 383e0c9b63385237bf1ecf2b0650f3bdcdb8df85cd72b8fbcbdab391b509de5736592de7d9684209c332be857f79cbeec0f51a3d04b2a5ec3b1783a01bc3e846 SHA512 170c1bfe1a8b80b7feed829496724fd3f90a6a0ade553ca828ef06552f1e38cc78180ff2eeed0690b0072f7d2c82494835fb23a76a6d4eeaddb152d9c5381f01
+EBUILD polybar-3.5.1.ebuild 1816 BLAKE2B 2d5179fc6cdbeac9f5b4593fc8dfb8a4b4f5f8c7326ff8819bc5b46297b82f57e7ff1c6c94af7d505f56d6a24f2c4721e2906981690975436632bdd4a763327e SHA512 cc92006e5abf400cdfef1c64a81eb82a9129608b0bb67102d745ffa91b5ff75ea7a90de470d79ac7a4fb4aad5e12b786eacef93980850d2a8419af1c69fb4969
 MISC metadata.xml 813 BLAKE2B f620aa54849e10ab8a6f14e78bb00b2cb17ec9309d032025833fef0aa3e339fe3236ca3a83abed185fa2f3098b1c3127f09bed4ff75d1f4de1999097112f8f26 SHA512 b7a4b4143245837dbfc14270b008f1b48b2b7c0746d16180cabe569d562709f41229d7028397c3eca64a5a07319441d69e3affe2b0851e5a6c33f5727608989d
diff --git a/x11-misc/polybar/polybar-3.5.1.ebuild b/x11-misc/polybar/polybar-3.5.1.ebuild
new file mode 100644
index 000000000000..876307caf15b
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
+I3IPCPP_COMMIT="cb008b30fc5f3febfe467884cb0211ee3c16386b"
+
+inherit cmake python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/polybar/polybar"
+SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
+	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	i3wm? (
+		dev-libs/jsoncpp:=
+		|| ( x11-wm/i3 x11-wm/i3-gaps )
+	)
+	mpd? ( media-libs/libmpdclient )
+	network? ( net-wireless/wireless-tools )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rmdir "${S}/lib/xpp" || die
+	mv "${WORKDIR}/xpp-${XPP_COMMIT}" "${S}/lib/xpp" || die
+
+	rmdir "${S}/lib/i3ipcpp" || die
+	mv "${WORKDIR}/i3ipcpp-${I3IPCPP_COMMIT}" "${S}/lib/i3ipcpp" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_IPC_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+	)
+
+	cmake_src_configure
+}
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 8f190680c90c..4640a4427501 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -2,4 +2,4 @@ DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17d
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
 EBUILD read-edid-1.4.2.ebuild 398 BLAKE2B b148b8369304073919a5af6b03aa2376400246edddc0357572d5c155d6029c2feef0599252a8e700f5708c4bbe87319879344d7a948e291fdf0d7efefc105739 SHA512 67b788582eed4a5fff82932ca8a10e0aeee71f4bd3e3d8e14821cdc8fd99881bb1f2cf255f4bcbed9510144206bd3b28b69dc3c508e6e24d912e882d8a59274d
 EBUILD read-edid-3.0.2.ebuild 632 BLAKE2B 37ead5344183f471899083553305170e9d436f865bc79d2d974a5638dea0641b4d61a7a248c75807f65a4cd35de6e8d3dbffc9b9c2f3b76c1b24fbb72963f9e9 SHA512 600f885382be075b3b8742c7b55303316f2d0707be5195304d21778a5e4646cf8cabf65f38f4489da401bbdb6cbd49155228af9728b30e0b0e2cbbeb46981338
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/x11-misc/read-edid/metadata.xml b/x11-misc/read-edid/metadata.xml
index bc1b97e1eb76..3e5026ee3754 100644
--- a/x11-misc/read-edid/metadata.xml
+++ b/x11-misc/read-edid/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index c19217297216..b5d2adbbbff1 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,3 +1,3 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
-EBUILD redshift-1.12-r3.ebuild 1960 BLAKE2B b3fa8037776ef468fbfbc949e1dd83272fc4ab6e76a17c59e705034ed0ebc0fd99de4fb96757a2df68296cf85356727a1efc600347864918dca0fdba796658a1 SHA512 4b52b08a0880104120fb6c7f2341f39b29991db98876d4d801341194cac9a296c4a89917837dbb84bf1de3d4bc493138868d0578d310dca0b333c88a87681d90
-MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
+EBUILD redshift-1.12-r3.ebuild 1964 BLAKE2B c9e8801715cf6aeed7e74dd691803a0dd4e16c507354767a44429a67a3ff002737eae6fdde2ebcc3d777daa119aafd67b19c039b6ddae73119eaf14f83d9bdb7 SHA512 c531a7282f8976f3831a28f30b84f94851a83cd352ed134aa23966fd40d5de90510a6831a4e67a92d8a996b12051fb0e6f744bdb2bd99c1cd86bde75654a3e23
+MISC metadata.xml 664 BLAKE2B 89016dc7ae9944887a57ec96172466d5bdc79eb74822eb3b2c297e29cae4cf2bbddff8fa927cb8d1fd550264b6cd3c69f285945b716fb964c0d3b3121a646eac SHA512 1f68f19b095c7f6ae7ea5e1069438262e53548532f4ac7ce6f3a3344ad0883b82100cfb94ad667ad36c0397338c98279e9397f4154c52a88cd8d9c604f674fda
diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml
index fbfb697dea56..5d4ec1bc0245 100644
--- a/x11-misc/redshift/metadata.xml
+++ b/x11-misc/redshift/metadata.xml
@@ -4,6 +4,10 @@
   <maintainer type="person">
     <email>sping@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>slashbeast@gentoo.org</email>
+    <name>Piotr Karbowski</name>
+  </maintainer>
   <maintainer type="project">
     <email>desktop-misc@gentoo.org</email>
     <name>Gentoo Desktop Miscellaneous Project</name>
diff --git a/x11-misc/redshift/redshift-1.12-r3.ebuild b/x11-misc/redshift/redshift-1.12-r3.ebuild
index 2666e1fd1976..82823403908a 100644
--- a/x11-misc/redshift/redshift-1.12-r3.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit systemd autotools eutils gnome2-utils python-r1
 
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 6afd1a86f03e..26ae24f85ff1 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,7 +1,3 @@
-DIST safeeyes-2.0.8.1.tar.gz 314379 BLAKE2B 9a54dfcda3027ecb12261b5e90f5526c4011ddc07bcaa8f80357b60738a5a03673136c5597e0f1414894b548d10a52da13f7cac4bd418c0534c341bcf3b5397a SHA512 06b53d6baad479e4143ae65cc37d01367ff73875083817511903692f493f01f5704a1f37ac95c4ec4aaa66040ec0aa1424e6a76fbea0676584fd531c1547b0a7
-DIST safeeyes-2.0.8.tar.gz 304438 BLAKE2B 5f6b36ae0d214e33035d1a3f7856c2eacd8407b2586365f7c914d69a5744a4d1488f5bcbc1d1c7112b9f237ccdbfa7839c426048e88d2e19e56cf550da33ecfa SHA512 6e7669d9ee6b2167c23307108544b3a3b4a4161fe819569fc7920a7e24af94701b053a2e147f83ce0300a0112e2a66d500055fc722eba89208b6c0cd86b49f38
 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
-EBUILD safeeyes-2.0.8.1.ebuild 1004 BLAKE2B 4c9d76c967fee8b434334c1f86bccb7737374c5a48c1c450318d86e0fe4dbd394b6c913d41eb1ecb45acdcb5a7d8da277ed50bbb0d16b1c23731d471658e6198 SHA512 78b4a731f0ae6b24b7048f734f12771a13ca9d39cd1f53344a5bcf6d53c9e122717a1da7f16aa89c5f6f102d6b8806f904da483e6a0c6c347984bf44a5dc8009
-EBUILD safeeyes-2.0.8.ebuild 1004 BLAKE2B 4c9d76c967fee8b434334c1f86bccb7737374c5a48c1c450318d86e0fe4dbd394b6c913d41eb1ecb45acdcb5a7d8da277ed50bbb0d16b1c23731d471658e6198 SHA512 78b4a731f0ae6b24b7048f734f12771a13ca9d39cd1f53344a5bcf6d53c9e122717a1da7f16aa89c5f6f102d6b8806f904da483e6a0c6c347984bf44a5dc8009
-EBUILD safeeyes-2.0.9.ebuild 1004 BLAKE2B 4c9d76c967fee8b434334c1f86bccb7737374c5a48c1c450318d86e0fe4dbd394b6c913d41eb1ecb45acdcb5a7d8da277ed50bbb0d16b1c23731d471658e6198 SHA512 78b4a731f0ae6b24b7048f734f12771a13ca9d39cd1f53344a5bcf6d53c9e122717a1da7f16aa89c5f6f102d6b8806f904da483e6a0c6c347984bf44a5dc8009
+EBUILD safeeyes-2.0.9-r1.ebuild 979 BLAKE2B b0bf9e797f72f41a971fb358ca41be1e528f6eff85b9f39643f092dad70825e82f809d24b7d5902da6201848cc12c42be3b01759925a067d7e514d7bbd3caba0 SHA512 2f0fb0b6c7cfe130d1891fbafb894bb43e99646a135536510c51244ea94bfae87d15281576f409a8417ffe8f8259b6c640881cfd118e5f2edacc47cc0d87a433
 MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
deleted file mode 100644
index 583b24353a25..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit gnome2-utils xdg distutils-r1
-
-DESCRIPTION="Linux alternative to EyeLeo"
-HOMEPAGE="https://github.com/slgobinath/SafeEyes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}
-	dev-libs/libappindicator:3
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	media-sound/alsa-utils
-	x11-apps/xprop
-	x11-misc/xprintidle
-	"
-
-DOCS=(
-	README.md
-)
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9-r1.ebuild
index 583b24353a25..fe34e0ec4707 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.9-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-inherit gnome2-utils xdg distutils-r1
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
 HOMEPAGE="https://github.com/slgobinath/SafeEyes"
@@ -35,16 +37,12 @@ DOCS=(
 	README.md
 )
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
deleted file mode 100644
index 583b24353a25..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit gnome2-utils xdg distutils-r1
-
-DESCRIPTION="Linux alternative to EyeLeo"
-HOMEPAGE="https://github.com/slgobinath/SafeEyes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}
-	dev-libs/libappindicator:3
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	media-sound/alsa-utils
-	x11-apps/xprop
-	x11-misc/xprintidle
-	"
-
-DOCS=(
-	README.md
-)
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/sct/Manifest b/x11-misc/sct/Manifest
index 9da99dfb3b57..079f96b85902 100644
--- a/x11-misc/sct/Manifest
+++ b/x11-misc/sct/Manifest
@@ -1,5 +1,4 @@
-DIST sct-0.4.tar.gz 4560 BLAKE2B a7434499d43180a20e4345ad207cd7644dd7271f9d1a3929e797263f5580e9f7517a3cb86a65892b68a1619a29cc5bb846fa40e3e8c14f4f5a5a7ab65dfa5ca1 SHA512 7a556c2d26cb2389a3e38e74de992d3fac96b29c637e20d1307e0ea0985c1119a3d05f2108d338612b407f5b5f5362bd3e5582722878d7ae62c568bdc9f46e65
 DIST sct-0.5.tar.gz 4802 BLAKE2B 2a7d522031f159b2a8d8d8b63603ff4094d6726d92ad7ac1675c8fbc4c716a8c8b1ae6fbc12d3fe5238552621ebbbc4416658ac89610d40010bf1560446fc55d SHA512 15f2013e3c6c56ff50078f1aa070b3388e07a780d14e5664542ea47e51e8eb84e937927467bf9ed74127a7382dea16c5ca94d255c8aeaaa696c9a81ca658f4a2
-EBUILD sct-0.4.ebuild 522 BLAKE2B 846877741dc7d50c9bf794a79b483f4ec709106d8795f5315e636c1b09e54c7686ed0162fd0e1a2bb74a2555b7507a888a5a375269837135ff68a3798f994d50 SHA512 7f762239a80f9431b66bb0b05243f0d3e9b4321a34680c7396bd2caa2df6e6112ab43e009ffaf51e801e3fbe421a0e42e628e6d9ef2e413588b5e256aa6b270c
-EBUILD sct-0.5.ebuild 650 BLAKE2B 599fb6acd1305334531072ea8090ba2941749b5f62bf3643607f8cf0ed9ee96611e8889573c57d8e1196835029cb8702ef5234a4dd318045d8244d11ad485508 SHA512 fd4ec6ea983e56388f924b4ec5a7474042ec9427cf1010a619ae3b973e71c42ce5eedb13e2aeab8225d432229b1d2bb27fa51a26b7ca68cc5138cfa6d617be1f
+EBUILD sct-0.5-r1.ebuild 650 BLAKE2B c542ba220656116b9a4dc4aa8ca1394ac359d1763a0bfde0e6670e28abb4f8ce01f31e90573e6220b2c64f853b0104971aa197e50f945d692f3452b2dfb6b29a SHA512 cfdd0df768b1388f0b02b2ff4f5ff02a045fd47300f40b943fca11b9f70e9ffe5e7964329f0f72e89b78b4cdfec615ce0a275b0192721356c8e583c937f233bf
+EBUILD sct-0.5.ebuild 648 BLAKE2B da2ad5954af75c1abd20618872196c7678fc30df636267e7235f111052ee2c4cd739b554a6df0517ba7b1af0045a9a338ad05fd0f1e592a1fc00ad56959bc191 SHA512 3ee17c629d7d91468675f23c1fb5d3b90de350ff390dfa1e340dda15983f74875b71369a1b9354ee4b484551bcbae214a9d1b9cad76387da8f4f32612cc40d40
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-misc/sct/sct-0.4.ebuild b/x11-misc/sct/sct-0.5-r1.ebuild
index 757fc9bf534b..2fbc0da2e7cd 100644
--- a/x11-misc/sct/sct-0.4.ebuild
+++ b/x11-misc/sct/sct-0.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Set color temperature of the screen"
 HOMEPAGE="https://www.umaxx.net/"
@@ -9,10 +9,17 @@ SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DEPEND="
-	x11-libs/libXrandr"
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	dev-libs/libbsd"
 
 RDEPEND="
 	${DEPEND}"
diff --git a/x11-misc/sct/sct-0.5.ebuild b/x11-misc/sct/sct-0.5.ebuild
index 615b8b643af7..f16460c1db01 100644
--- a/x11-misc/sct/sct-0.5.ebuild
+++ b/x11-misc/sct/sct-0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND="
 	x11-libs/libXrender
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index a61e44cd6d58..4258231d479c 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -16,4 +16,4 @@ AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
 EBUILD slim-1.3.6-r5.ebuild 3827 BLAKE2B d945b687a7c1a18210f355afbfc0d8451b4b6da431c55827cc6a1d994e16236943ebb1b74cdbdb11d3bec47483958e9bd01573e591cef3daed9605c6e8c8b935 SHA512 807d4b74101b27495a0d930f8176fa091b008e9118d028bc4f471115bc33f2933ff8d8599a1f21d2884a68e832bda217b295d5a3f1613ce8df0bccd70ace09f6
 EBUILD slim-9999.ebuild 3664 BLAKE2B 9fe1f1efae07054d5b6a8be8fb95074d3979eac95b202c7c7ace7e3ee9d299ee3366fb2185014b50c509022073b8d909e00768232d402d248ccad51c43bd910b SHA512 4836465fd45a3bbf864890a4a35a8eb1d314a24bccd638d1e8162f9f2d68002401703f99c2773ace13459d0f5200892d510f0bb70bb792f6b9fbbf517f21752a
-MISC metadata.xml 296 BLAKE2B 32be4afe8f62ed7b8f735c21cd70f6f917208e75b2e0dbc953cf1ab25ff43b3c9d4f140beb5b4a49c00311abe6f80b7672cb5f0626539ffcc6c1fe76a59dcef9 SHA512 4c622a7f52bd12997f0fa95135ded68f5f23d2c8b6e7203afd68e57c4c0a849520314f407f69fe20dde03f4690a2fc982856d869fffa59f2b362767ccb4e19b0
+MISC metadata.xml 249 BLAKE2B f1188767acee9adb5a73fedc907c389bf967957760ba5af8a90636683d26cf964d03be1bc6f9bc79cceefe20783ce4665dd67c58f9b25983321550bb8d1485e3 SHA512 a5a485bd5f4ae6cb9c2e85025d164278c6469aef02eb40e39149c94ed53a2c9a0503183377473563923043154571ecb4a033edfea00dd83d6aa4eb462d06e790
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index bce828f91d88..f11171234502 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">slim.berlios</remote-id>
 	</upstream>
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index af23c29d8faa..9da7005d549d 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,4 +1,6 @@
 AUX spnavcfg-0.3-custom-flags.patch 1568 BLAKE2B b4280b99137f36d9c3a191f25ea9a55785878a004fdf6d581ade55161e1cbd15bd5895ad8d61844a3a19f56e3ba6d226ad49ae6f31550317be0a5894e9e5c6bf SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632
+DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
 DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80
+EBUILD spnavcfg-0.3.1.ebuild 631 BLAKE2B f8f8fac556180047074ce1669efdf1237d70cda815a2ee2fbd52bc06168030a9b572e84a47cd7d2aa84fdaf254cabe6aa29f81867b37d945f4d13fec754d9fdf SHA512 76850fbf0b33e739ba1633fe4548d4feb516034a61e22c0176461fecd10e0de1b082b22237ab25c02e03eb9f06c1a7ad795caaed58c0ce4fd82167691eaef043
 EBUILD spnavcfg-0.3.ebuild 625 BLAKE2B 6b2af2cb0be40861e6f944463fd63d74cf0e3d42e6c5c4bc969a1542440e960b5d73a2ca103ff9ec24e865fb05c9c3480ca63201d689ed063861463785966248 SHA512 6d4ec044c9b9d9318b4645e759436e7577179c0fba5934cda57850c6dca2da24bca939583aee098b746aafc5cfc2697f3f2cbb17ecda2f53628c165b395b11a2
 MISC metadata.xml 513 BLAKE2B 5730394269a90ee628138e0a865b15053c020dea720f442c4718baed6d6bcf7d2ba55f567085d730ccb04907c2019dcadfb2d226b53e2f91a8bd549e28ab6462 SHA512 4aee293da64f4e77b69be1c4c937787e3e1794d51ef22e3d37a5f6c20e6a3507d27c87b75495406429fdd98cd4ef3ed0d85ec9a7418c13b42422b61beb1b5a04
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
new file mode 100644
index 000000000000..3f3ca2c51ac4
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="GTK-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-misc/spacenavd[X]"
+
+src_configure() {
+	econf --disable-debug --disable-opt
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 532248b7e4bc..b62b8b98313a 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,11 +1,15 @@
+AUX synergy-1.12.0-dnssd-dep.patch 1512 BLAKE2B 1014b7624142e744cfa5be14cc6e282dea5e6059922f59040304c15b397c6b1368c8892e4f40cf68b74de9bda9d3a2769d8f81c473b0588a56e763c4e76b77a0 SHA512 88ffdea5d85279abfb66ad1a6edc9451ef82d87ca944282e6d6a586cd1ad4a1c13016c519ad515d906ae7d3468ef49365475a049e049ad610daa9b3fcfb48265
 AUX synergy-1.9.1-cmake-version.patch 2136 BLAKE2B e96bdfdc278e818be0f46eb2bef7dedb24f70d6fbab3b0ec36716811590f55a742f2d61b6976f6b3eb16490a2deedf6664ee556244065a97afbf2b603d151ec3 SHA512 80dd8adcfe58eff2d6ee74b5e2e408ded1b9b112e72d8bb1d86d33a12c778c5b8bb359501490dff0a896e21f23dc321bcf670fcb2d5cdf66a0ba5a8904f206cd
-AUX synergy-1.9.1-gtest.patch 641 BLAKE2B 30103de347404858f35eba8600a961b7f01fa0f4469f293cdf13fb3956d02467924a17e0870fa690e715c5a02bf42d67cc4a103d70af8d006ed381d4fbefcac3 SHA512 c81471a2bded4aeafafb8c0369e6296dc32cf39371795082663d408fd6308d6b520f90bb7e7b57c5156d8e4e3cdb261eead4ac9668a4e0e18649a9ae0d256f64
-AUX synergy-1.9.1-internal-gmock-gtest.patch 725 BLAKE2B 2c7d6a2a2086283e761f3322959d3721a0e1b687683a0420eb282bf841ad5597925bdadd6098615a54e2fe6230e9efd8e0be1063fde8a881deafc149a52329a2 SHA512 1a644f8cb7422cbc36d0ce37648038ae464f7a1c26efb89ff07477447ee69ff2ea10d71765536e19269d63249db6391d997680ad06df1a5c24e1fcc708f2ba3c
 AUX synergy-1.9.1-pthread.patch 391 BLAKE2B 8d1aabe8a8ddcd1494de5aa5d19428e4e2d248fbef5a372fa1102f36d2e8e7868afdafce0109293b517b81ba3104f7555a9d3e808f5f3752434068ef527626b2 SHA512 8ab56a98baa7f97034bfd2e9577d84edbf7fbd954bce76b2674fe90f0baf9d91bc5f2d5550f7c57cc214316a34fb2769b1c91c4bcfbe967f13fb64863941cb24
 AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44edecb88bb907e5e260f10aedd1978a9c7b56a90cf83a6d4df227ccb548c416196a9ad7c30053aa6b14bedf2a1862042 SHA512 7931de105c6dd7a0d673dacb4ed26ceea6e5ed78460a8c8c8e7104c662d884de37fbe2a8d497c1a3689fcd6316063e3cd3bdd1d7e1650add52153deee0669fc2
+AUX synergy-1.9.1-test.patch 1372 BLAKE2B 3a73c9d431d0fee62e701770ceeb01e3f652b677343104a0ee804c5ed3f6943ec62dced7c24f2f518930099db1ccfb32db08cdf4df72915501e37a89ebfcc2b4 SHA512 cd923dd998dccf31e267db87154288c420538f621e9d179c7e275697edded2c835f75d323b6a94b6b453729fbb7909334474fc7a0202fcdda535e6dce42a44e3
+DIST googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
+DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
 DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
+DIST synergy-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.9.1.ebuild 2121 BLAKE2B f70ec2b27f543ba1ea37bce20cfc88b3ea28f5a100d6b72713112dbcf2b1d9df6c032594c3c9131750c403254c3e544d3be2259e08c59c3cc1de7fc64acd9d17 SHA512 ccc1adf63d0d50ae81110f11b3f8a63386df7cc9c8ee59b2f70f19f2282d8138c7faccb5b68b92aa864790837e8e89e22363879eb97815113db5442e8c7a8ed6
+EBUILD synergy-1.12.0.ebuild 2586 BLAKE2B 157712549a01453c2d65aa5f30005d1d978b795e3a85acfc758de79e108f9b578970502073618ddfbb9668c1bdcdbb2a2023f1317ddb778b78732748fde8bf7e SHA512 72715baf7a8d10983bc6ee23165d22deaaa726c302b8f708b6c81c73595e7ea92b515a2fa6493a4c48d9531391dce7de2de3be61b2f52dd600784b5fa3663759
+EBUILD synergy-1.9.1-r1.ebuild 2575 BLAKE2B b47f14fbdf5ab56e142e80b84d7d52a1e2aa2ed30b4d0209d1d56496b89aa1d5de6c1541c429ba3d430c1481ebbf53fd31b1ab4f3c8ebf80b8dbdd0b0ba6e071 SHA512 dd058c22b6a547582e2d3e3bd869fe6c19c8dedfe00481907134650687b7a8323055e30d99b8cdb835c4d60cd0678c5ba417869ad77977ef1c5c43816594f8be
 EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B cadd551ffa38911e4e825ffd7ada68d08f5fd8278f71af7321af48aefa81a632c608cba876a17dda8a1f66e0b5762e220389b68ac03c2bfbcf5446e51d9969c9 SHA512 9a931df7b5d5f37b3f5d951aafad19fbb24def897a46fb1d37ecab62bc07141d0f3e19e36e0f9cdd3903e44f23e7e83b8fe6daa56944dada2906026878d489fd
-MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
+MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch
new file mode 100644
index 000000000000..1905fc552ea1
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch
@@ -0,0 +1,42 @@
+From 91e150889814ddf97a75b881bb979c975894f34f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 Dec 2020 22:40:40 +0100
+Subject: [PATCH] Check for dns_sd.h only when building GUI
+
+The <dns_sd.h> header is only used in the synergy GUI component.  Update
+the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled.
+This fixes build failures when GUI is not being built and <dns_sd.h>
+is not installed.
+
+While at it, fix indentation around the added check to match the rest
+of the file and avoid being misleading.
+---
+ CMakeLists.txt | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 581fdf77..35d806d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -235,11 +235,13 @@ if (UNIX)
+             list (APPEND libs Xi)
+         endif()
+ 
+-		set (DnsSdlib "dns_sd.h")
+-		set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
+-		check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
+-		if (NOT HAVE_DNS_SD)
+-            message (FATAL_ERROR "Missing header: " ${DnsSdlib})
++        if (SYNERGY_BUILD_LEGACY_GUI)
++            set (DnsSdlib "dns_sd.h")
++            set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
++            check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
++            if (NOT HAVE_DNS_SD)
++                message (FATAL_ERROR "Missing header: " ${DnsSdlib})
++            endif()
+         endif()
+     endif()
+ 
+-- 
+2.29.2
+
diff --git a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch
deleted file mode 100644
index f7a5e614e810..000000000000
--- a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/lib/synergy/KeyMap.h
-+++ b/src/lib/synergy/KeyMap.h
-@@ -24,7 +24,9 @@
- #include "common/stdset.h"
- #include "common/stdvector.h"
- 
-+#if WITH_GENTOO_TEST
- #include <gtest/gtest_prod.h>
-+#endif
- 
- namespace synergy {
- 
-@@ -327,6 +329,7 @@
-     //@}
- 
- 
-+#if WITH_GENTOO_TEST
- private:
-     FRIEND_TEST(KeyMapTests,
-                 findBestKey_requiredDown_matchExactFirstItem);
-@@ -341,6 +344,7 @@
-     FRIEND_TEST(KeyMapTests,
-                 findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
-     FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
-+#endif
- 
- private:
-     //! Ways to synthesize a key
diff --git a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch
deleted file mode 100644
index bc8a96130575..000000000000
--- a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -14,20 +14,5 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--include_directories(
--    ../../ext/gtest
--    ../../ext/gtest/include
--    ../../ext/gmock
--    ../../ext/gmock/include)
--    
--add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
--add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
--
--if (UNIX)
--    # ignore warnings in gtest and gmock
--    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
--    set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
--endif()
--
- add_subdirectory(integtests)
- add_subdirectory(unittests)
diff --git a/x11-misc/synergy/files/synergy-1.9.1-test.patch b/x11-misc/synergy/files/synergy-1.9.1-test.patch
new file mode 100644
index 000000000000..d0c44e9dd7ff
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.9.1-test.patch
@@ -0,0 +1,33 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ab63a06..ec7a3e0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,3 +22,8 @@ add_subdirectory(cmd)
+ if (SYNERGY_BUILD_LEGACY_GUI)
+ add_subdirectory(gui)
+ endif (SYNERGY_BUILD_LEGACY_GUI)
++
++option(BUILD_TESTS "Build tests" OFF)
++if (BUILD_TESTS)
++	add_subdirectory(test)
++endif()
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index f39968a..bfc886c 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -68,4 +68,4 @@ endif()
+ 
+ add_executable(integtests ${sources})
+ target_link_libraries(integtests
+-    arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS})
++    arch base client common io ipc mt net platform server gtest gmock ${libs} ${OPENSSL_LIBS})
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index 54131eb..ef84dba 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -68,4 +68,4 @@ endif()
+ 
+ add_executable(unittests ${sources})
+ target_link_libraries(unittests
+-    arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
++    arch base client server common io net platform server mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml
index 11c61fc68912..23c6a90172fc 100644
--- a/x11-misc/synergy/metadata.xml
+++ b/x11-misc/synergy/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">synergy</remote-id>
-		<remote-id type="github">synergy/synergy</remote-id>
+		<remote-id type="github">symless/synergy-core</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/synergy/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild
new file mode 100644
index 000000000000..d144f9cb3919
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.12.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils virtualx
+
+MY_P=synergy-core-${PV}-stable
+GTEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/"
+SRC_URI="
+	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz
+		-> ${MY_P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png
+	test? (
+		https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz
+			-> googletest-${GTEST_COMMIT}.tar.gz
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="libressl gui test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libICE:=
+	x11-libs/libSM:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXi:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXtst:=
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
+
+PATCHES=(
+	"${FILESDIR}"/synergy-1.12.0-dnssd-dep.patch
+)
+
+src_prepare() {
+	# broken on Xvfb
+	rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
+
+	if use test; then
+		rmdir ext/googletest || die
+		mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die
+	else
+		[[ ${PV} == 1.12.0 ]] || die "Remove this hack on bump"
+		> ext/googletest/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYNERGY_BUILD_LEGACY_GUI=$(usex gui)
+		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+my_test() {
+	"${BUILD_DIR}"/bin/unittests &&
+	"${BUILD_DIR}"/bin/integtests
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
+
+	if use gui; then
+		newbin "${BUILD_DIR}"/bin/synergy qsynergy
+		newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png
+		make_desktop_entry qsynergy Synergy qsynergy 'Utility;'
+	fi
+
+	insinto /etc
+	newins doc/synergy.conf.example synergy.conf
+
+	newman doc/synergyc.man synergyc.1
+	newman doc/synergys.man synergys.1
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use gui && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}
diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
index 0c5c3b75592b..e44e659f7187 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils desktop gnome2-utils
+inherit cmake-utils desktop gnome2-utils virtualx
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
 HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core"
@@ -14,9 +14,9 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="libressl qt5"
-RESTRICT="test"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="libressl qt5 test"
+RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/${PN}-core-${PV}-stable
 
@@ -53,21 +53,43 @@ DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
 
 PATCHES=(
 	"${FILESDIR}"/${P}-pthread.patch
-	"${FILESDIR}"/${P}-internal-gmock-gtest.patch
-	"${FILESDIR}"/${P}-gtest.patch
 	"${FILESDIR}"/${P}-cmake-version.patch
 	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-test.patch
 )
 
+src_prepare() {
+	# requires Internet, and relies on old site anyway
+	rm src/test/integtests/arch/ArchInternetTests.cpp || die
+	# broken on Xvfb
+	rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
+
+	cmake-utils_src_prepare
+}
+
 src_configure() {
+	# otherwise unit tests segfault
+	local -x CFLAGS="${CFLAGS} -O0"
+	local -x CXXFLAGS="${CXXFLAGS} -O0"
+
 	local mycmakeargs=(
 		-DSYNERGY_BUILD_LEGACY_GUI=$(usex qt5)
 		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	cmake-utils_src_configure
 }
 
+my_test() {
+	"${BUILD_DIR}"/bin/unittests &&
+	"${BUILD_DIR}"/bin/integtests
+}
+
+src_test() {
+	virtx my_test
+}
+
 src_install() {
 	dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
 
diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest
index 919b89d70436..e6ec9772c074 100644
--- a/x11-misc/urxvt-tabbedex/Manifest
+++ b/x11-misc/urxvt-tabbedex/Manifest
@@ -1,3 +1,5 @@
 DIST urxvt-tabbedex-20.09.tar.gz 32254 BLAKE2B 7c2bc4d17ad91415210c039adcb01edbafe539e24d82000314124c518d76af97487c1929c168dbce40b4931822aed6224e309e82a855fbc07adf44a0639b538a SHA512 166fa965236d3f60d17d1ad914b3648895237003704219294b0ce72631e6e0431c61a3c320823f227ee58a07f968a1b7d9c479bc58c6246df2f7059e1f04613f
+DIST urxvt-tabbedex-20.49.tar.gz 33239 BLAKE2B fd5e3619c7b639cbf65364895389145dc7b5d819808a4d40d99732f2d1154ac4418f0a9324b4e8f001ca6786c959886e58df2b8f81e3b9a723b948708c869a40 SHA512 27e508f388e5725866465fe3c3e6ff052eabd14e9a72c22788c61ebed2a9db69517f676071d648a693ba5b9a438ac14d5b9a9ea1208a044001255c2d2562fc48
 EBUILD urxvt-tabbedex-20.09.ebuild 676 BLAKE2B 06458a34bae0eb4cd88949b94492936f55cc8d7443366f1a34af6a05f6a1dab784c5b811d8c324b08d22c1121b5a38815273550d763751c16b846cff49b1df9b SHA512 38f60cb3fd44a1f9e7991ca210aecf79eae48c4e1cbabc1ce6d964bda5f3374d9a59fadb06f81dfea9486612078e356124149f96cd89670f710f44f5f7c9bb7a
+EBUILD urxvt-tabbedex-20.49.ebuild 671 BLAKE2B cd9632ca0961a54a7b2c9cae51e1fb05ed9cbe50e6c686859342291519da4d0dfec10092c4b892b227a9987a88e83ccd1a9e9a31ccf2d327ddfb595e0b323ef9 SHA512 c8b417cfcc53ecf4d6278311c52ee84404a07b76a1928631893b479df9778622f6a94c24f0dc058b2482fbdde5cffe56d7c25be976327f9e39e7bf5d72dec23a
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild
new file mode 100644
index 000000000000..81d3bcdede94
--- /dev/null
+++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An extended version of rxvt-unicode's tabbed perl extension"
+HOMEPAGE="https://github.com/mina86/urxvt-tabbedex"
+
+MY_PN=${PN/urxvt-/}
+SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-terms/rxvt-unicode[perl]"
+
+DOCS=( AUTHORS README.md command-runner.sample )
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/urxvt/perl/
+	doins ${MY_PN}
+
+	insinto /usr/$(get_libdir)/urxvt/
+	newins pgid-cd.pl tabbedex-pgid-cd
+}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 694578223b5e..40da32635028 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,4 +1,4 @@
 AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.2-r2.ebuild 752 BLAKE2B 949a81950949fa68bdda6f73a955d2eacc684807164837dc27bb604f921158752e4ae2363022819609d8fb5381e3c84168338dfd1874478c8e993e41b60e8b34 SHA512 f0abd0adac3913bf44fcbf168a8bfb557d1c5e95890733b2f6a89a42e5f4ad5667e8dc6ea153976310310f857b389ecc1016fac59eb8da973aed2b64c835e4f5
+EBUILD util-macros-1.19.2-r2.ebuild 759 BLAKE2B ec61822da41da82edc41beb08ab546813596a82523b6fd2e1f4a16921733622494bd92c2e10c1e9d08741fa37ae2ebaa72d569be07f9aee0cb44cea4f28bdd83 SHA512 eb133ae7d50e899a1f831203efa661bbea8e05b4697a56035f48373cd8a25d3f4a8630b20e011e96f22bfbc4060a86417b36b7051e3c9d7668166a61c5f60a9a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
index 81fcaa3a9e9a..cc3ce637fce0 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-CPP.patch
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index c6fb9c89fd5d..c0bad4ffbf50 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -3,11 +3,9 @@ AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
 AUX virtualgl-2.6.3-mesa-19.3.patch 3803 BLAKE2B cd2120dfc1fdc9c65cb65e428fd5bf98082c0bfcba3ce18ddd736bd1f421188ad9df4170bd6aa7bc2c8ef15f36398ec37a80554aa82e959e2e858faa910171d7 SHA512 6845a60071aac333ac1c2ad5c3861f9fbe8cdf9f28425817a18c2b6f8c280b5469ce3be4831a0bf8a6600955bf5177217ff684c61f728783f2d09be6885f2815
-DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
-DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
-EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01
-EBUILD virtualgl-2.6.3-r1.ebuild 2960 BLAKE2B 15f663fe63ebcf45c8efc7efa31af1bf2f98b39916533e335e30eb2fa03fba204e28e1c06c6a1e83c0f612a8b6cb56c22340ee77cf10685f60aec5f8eec86f2c SHA512 159f58a730f670615a26640e9b5f9d7e55b10562e2af06cc1dc93b5066b5c6d4b7095e0718ee3382f126376e0803446927afc7a5552dcf77d62b2794f6c1b504
+DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
 EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
+EBUILD virtualgl-2.6.5.ebuild 2931 BLAKE2B 5150dca6a9a42c2a07a89253aa178bb84d5bfd3900fa9dd06376420f043a2a5a6d0fec04e49c035807e4fedb6141a002dceb419f28d12d7e3e0a582f6975992f SHA512 f710ee90dff478f5777cf5571e38b4b3ca5eb54897f04eda438f6684bc5a2de2c3292d43bea31fac627fdd1808789cf0ad8a0dac8738a8c9d513155e04baf5a1
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
 MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
deleted file mode 100644
index 15a2ad641c5e..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
-	inherit git-r3
-else
-	MY_PN="VirtualGL"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXtst-1.2.3[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
index ed68cde9f2f2..7decbf89ae3b 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXtst[${MULTILIB_USEDEP}]
 	x11-libs/libXv[${MULTILIB_USEDEP}]
+	x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
 	virtual/glu[${MULTILIB_USEDEP}]
 	virtual/opencl[${MULTILIB_USEDEP}]
 	virtual/opengl[${MULTILIB_USEDEP}]
@@ -43,6 +44,7 @@ RDEPEND="
 		>=x11-libs/libXext-1.3.2[abi_x86_32]
 		>=x11-libs/libXtst-1.2.3[abi_x86_32]
 		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		x11-libs/xcb-util-keysyms[abi_x86_32]
 		>=virtual/glu-9.0-r1[abi_x86_32]
 		virtual/opencl[abi_x86_32]
 		>=virtual/opengl-7.0-r1[abi_x86_32]
@@ -50,11 +52,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	# Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
-	"${FILESDIR}/${P}-mesa-19.3.patch"
-)
-
 src_prepare() {
 	# Use /var/lib, bug #428122
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index c7a61861ba0f..b293d50f60a4 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,3 +1,4 @@
+AUX x11vnc-0.9.16-CVE-2020-29074.patch 774 BLAKE2B 5a8fcb123f1698e78f76eb1828f935ad1a228990975b5ef42bf1599b46b4d88b7fb90d7d986c3189c2ac8fea305a3040a10c94741068b1d4393ebb7030fc27e2 SHA512 c021115fef4290f41d8df3a1231066d4efd1ca46ad59f0892329f32876e1dec47c000136e5fcbf53c32d8216ee89043b5857c8a873f9cc34c3e4bc543e8b85c1
 AUX x11vnc-0.9.16-anonymous-ssl.patch 841 BLAKE2B d037f4f784fe12cedca33be6a638524785342d4da9c2cd73acf138b64978d8303ee45fe08cc7516dd7baeed596bf53647db82caf693022cceb2e0b43c94f5dab SHA512 8c56c76758eb117db590415debaa18eec441ef952dac607ab77182f414e0e5f76d4a1dd2e543e0542a0fd413a8ec5dc2661f1dbabb27a4d6b36eacb09327ce2c
 AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
 AUX x11vnc-0.9.16-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2b9a18261a279b05fa54dff1240674d51dc44ce4fff9ea64a6644e532c80499287bbb1025b06b47d3b2546eb76f32fbce SHA512 3acaa4e57921673aef14ce2e9931880bcbc8c3d73708124599b8ffc79be6c4fa43713184f01983f4f432e29137c3628902681aed275ca98c7a6f32cb10bc54ca
@@ -7,4 +8,5 @@ AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.16-r2.ebuild 1942 BLAKE2B 72cb2940aefc086db989a74155fa48fe27a27593ba04c14af7b83a67fd2da64eb2c0354a1565ba9ddfa744b804869f5f3a102a54e87f949b9efa5ca1c01d6e63 SHA512 7d5b4399b806d4059bb5a0aff470671c8b4591febf562c003e57e7ca6c2bc429fa416ef09f6885cc9b764677c38e44041cbf5b4f911a723a98c5a13f5e795103
 EBUILD x11vnc-0.9.16-r3.ebuild 2014 BLAKE2B e85b366cab4ceb65ffc8c7b644b5814da9db6f8070c180526f66f917d291809ea9c4ddfefc921de89ef216cc03e6391df170e3435e3ddce858ebdba7432fc026 SHA512 d79f267e41843d1cf7c40814baddabea3729608d0d2dfc4f28543de459ff559b39a19221f60fcc808992c0cb0bae86126203700bcd8b181e9199bee5f8a5b2c9
+EBUILD x11vnc-0.9.16-r4.ebuild 2050 BLAKE2B 4e1b446da52ffb86258432cde295536d5f431ca80a411d5657dcffc64a975252aa12255fd61a15cf401ae948a27285ec76f11fe4b642ef3b01a6e30b53961c6b SHA512 2a0563c2c2d767c0dfe65fb5a3108dfc4cfd71f0ec8c628fa6c3c18b2cd09348302416e15d0a307a208a3eb4d7f40dec703464f5eb3e22c4798f378b9b79790f
 MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch
new file mode 100644
index 000000000000..12f65b94fb62
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch
@@ -0,0 +1,25 @@
+From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <guenal.davalan@uca.fr>
+Date: Wed, 18 Nov 2020 08:40:45 +0100
+Subject: [PATCH] scan: limit access to shared memory segments to current user
+
+---
+ src/scan.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scan.c b/src/scan.c
+index 43e00d2..12994d5 100644
+--- a/src/scan.c
++++ b/src/scan.c
+@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h,
+ 
+ #if HAVE_XSHM
+ 	shm->shmid = shmget(IPC_PRIVATE,
+-	    xim->bytes_per_line * xim->height, IPC_CREAT | 0777);
++	    xim->bytes_per_line * xim->height, IPC_CREAT | 0600);
+ 
+ 	if (shm->shmid == -1) {
+ 		rfbErr("shmget(%s) failed.\n", name);
+-- 
+2.26.2
+
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
new file mode 100644
index 000000000000..077b2fc02915
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+
+COMMON_DEPEND="
+	>=net-libs/libvncserver-0.9.8[ssl=]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	>=x11-libs/libXtst-1.1.0
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xcomposite? ( x11-libs/libXcomposite )
+	xdamage? ( x11-libs/libXdamage )
+	xfixes? ( x11-libs/libXfixes )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )
+	zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/tk:0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-CVE-2020-29074.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	local myconf=(
+		--without-v4l
+		--without-xkeyboard
+		--without-fbpm
+		--without-dpms
+		$(use_with crypt)
+		$(use_with fbcon fbdev)
+		$(use_with ssl)
+		$(use_with ssl crypto)
+		$(use_with xcomposite)
+		$(use_with xdamage)
+		$(use_with xfixes)
+		$(use_with xinerama)
+		$(use_with xrandr)
+		$(use_with zeroconf avahi)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/xautomation/Manifest b/x11-misc/xautomation/Manifest
index 8eec7fcbca8f..a3bc5352c298 100644
--- a/x11-misc/xautomation/Manifest
+++ b/x11-misc/xautomation/Manifest
@@ -1,3 +1,3 @@
 DIST xautomation-1.09.tar.gz 123995 BLAKE2B fb26c3d7c1ff7bc37412e02eaad9165fc81a908508da5da364e1d44eeb89b7e8cc3b25d9d7cd7dd18467b6abb5ec4e9ad4214e1f49d1ee133906ba0514c4b7f3 SHA512 60de78ef9e4bd605ff2cdf1cd34771940d043a2ba0498a053d54dad82476aa123afe91690e7f57d2f346845d4b1313bc0e4d3df524815265c817961978ef4ad8
-EBUILD xautomation-1.09-r1.ebuild 492 BLAKE2B 2d508c8697606ab91f2ae6727ddaac5ca86541f7fa99ba46b6b638fd2b223bdbedd94c0dfb09517b99a9aaff11d81a26f7a27769600d849745a18920f59ce56c SHA512 8718346d3335b4c12982820f6762eb26d2a8b23af903f8db72687ec993595d4f2efb06b213a3384dea0a0f96b8f7e1e5a52d53479df6433154019e7d4d5cdd32
+EBUILD xautomation-1.09-r1.ebuild 496 BLAKE2B 88c93ec5657240b014d670310f806894651b9ae334aae34e4012150af1cd2fb73a3101172dd293213b43e63ed89020bff360ffd2033a5f748ae7508166e7fd03 SHA512 8ee5f5c9006ebf4f901dd9d9a909dbdb21d2b04684d6e2c6212ef89d44153d5dfe421dedcdadb403467fc65c306e842989c6fd873de7d638408d9fc8ad52253c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
index d78715f36b68..ee773eb1d6fb 100644
--- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild
+++ b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://hoopajoo.net/static/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 
 RDEPEND="
 	>=media-libs/libpng-1.2:0
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 637d64883953..2e8f82c71d9e 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.2-r1.ebuild 670 BLAKE2B 3fa353f18a1bf4cf5d1bd7f09e3587982a80993d9873c81af914ed70bb8a1ce3d99653719926b4ea05c05424a92e04b1816f689a2192f14e58d423b9ad7a183b SHA512 dc27c3a42bb6d08e40fbf0585e36791da958c4b63de32e02d1f7aa1b93e07fc9ebcd6c7f495edf674040b0231ffbe405bee177f67b9d670db04f1546788aa634
+EBUILD xbitmaps-1.1.2-r1.ebuild 677 BLAKE2B 25a919d422297699d731790a7fa30b21065ac4a68271120e9860db2d18a44afa848d3e339b92804c882bdca0bfbbd84f4baad0e857768b727d3e1241c5d58dc7 SHA512 968b7a5e936c8436fdf7a895992982ed38aba5db42e0bb99510b4d16900249962ea0e8c0e03e0782ab5652c24bc01b80759a421667fc78d6e14bf065daf93312
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index b1deeb2f45dc..d7be7e71aeeb 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xcb/Manifest b/x11-misc/xcb/Manifest
index 63d2d491ca3e..7c48954e4382 100644
--- a/x11-misc/xcb/Manifest
+++ b/x11-misc/xcb/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-2.4.tar.gz 19830 BLAKE2B 7808021c2781421e4d609c27516f8a45195999bd75c82935c84048852f08e2656d6693abd3993e919b9740b11252da5cb15dcbe73602d715390839391ca75cb4 SHA512 cc612231cd61507a1af1a12fab7684b074ec99ec87e82bcba13dba215d4569c0605d3861f40d858f87da9b027c440a02f03b18a968c1d73ab08b8ee41e644948
-EBUILD xcb-2.4-r1.ebuild 967 BLAKE2B 8fa1a2cbac6ca2ab6cd3a5b7bffedbddc0fafd32403e8822c6c4eb77d8f38d3fb07439a2cf4f93180cfd51b6dfeaa36894e3b55925d5d83951858cd3dc31819a SHA512 15d1478af101b5bb681570800c8988c648ac6b5dff79b1cd5076981c5ad08dec5226124b82dee2d121da9363a7a20c14106cd593f40f5e15e4c3ac4eeb7a83a2
+EBUILD xcb-2.4-r1.ebuild 974 BLAKE2B aadc97ee88dc0ecf32935fd11b72c0a771a15d17d19896493b1bb04d5cec97eca8c9ff4cc8ed2279a018d253e48d971763b6819bc2b3c3ef82a8a745aa2fd93a SHA512 f81d9dc494c36c6a7aec8b7e715760a73c70daad4ea5b4aec34cecb4491198c85e55f03b8f8745fe1275e4a55d4f7336077a26a7d176abd68fee7303a94689c6
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
index 8a899553b4f9..6e45fc992880 100644
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild
+++ b/x11-misc/xcb/xcb-2.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~ppc ~riscv x86"
 IUSE="motif"
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 1b9cb16addd6..e96ade68c62f 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.17.ebuild 946 BLAKE2B eeb6c5bc1bf84ba37d82f18b61102089697faf53eaa6dc68b95a67db2765f6a703365bd88e274b2e382850da3f34259e624b587382c9fae3bd8b5d08969bce13 SHA512 103ee866601fcc42be78b53fc3ef7cc12a3f862ddb5f9136104d184ab0cf6964fe8e76c265c40019c43cc2293babb0891da211489e92c19e39aa44ff59bfd845
+EBUILD xdg-user-dirs-0.17.ebuild 953 BLAKE2B b3a55e78ee7f886c52d3a88c1f2cf6ca56357cf4bcfc7c1dce42f5d230994374354321076c759627a078f046fc630d1e3fd999e038c42eb5a1045b4b58f5d751 SHA512 445c3d667b41f60ab88779714d4ca194e3387c85c867fd0bc5ac396351ae84f3dfe37fa9d3038cc8aca2b8762135bfd7cbeca859f84f770776861803f45ce177
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index bb36a19d1dcd..d23ebd52d834 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index a277ba7cb8c5..2ffc99cdc502 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -3,5 +3,5 @@ AUX xdiskusage-1.52-pathbuf.patch 334 BLAKE2B f37d93288cff512a198c05759f50570c09
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
 DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54
 EBUILD xdiskusage-1.51.ebuild 586 BLAKE2B 5ec139ccb463bf6bd0a6aee0764911cf5bc558cc953b5c17aeab83042288f974995d9c96ea68fe0eceacc1991c5e445b1d152667d47b86378db69fd1eb74a9b6 SHA512 aa6921eb15f6748483dbc3631c99c0c95a9b3133ec7188ebf9c13ace3c84ee15c3bb99b0c18d7193cac18b03f0ca91b6eaf16671cf7a26ed6bb28ab2eacb748c
-EBUILD xdiskusage-1.52.ebuild 675 BLAKE2B bcc0b178091a6b2bc7ae3e30ffb585c504d767b0a6e4024bfa7a68a5ecda637ada2934d5f5184575f7de9e921bfe5e15269073df55dc244907b004c69ae7b102 SHA512 b1b53a166537e46f2b85853f059bb4bc98ef7d25ad0d07e47a84c63505a7f0a70ea45a80863859da2bb7e4c625d2536f9601e8b2295ec5705db58aba6ce6e22e
+EBUILD xdiskusage-1.52.ebuild 682 BLAKE2B 3f42da0ef7c789aae94966e55e7b1301499e4e536fc5aad87f26d0c224c292fba784cc8fd8fc2e4c2831b4ce8190b421324a36a6b762570602b3a272b3f84249 SHA512 3a1ed3de6356ef1ce9fbac3fdaed4ed7cb82f78eeea528e8741dcc844c838f9e877178d1a293ebc669b9eb58f60d0a814ceb56a22c2fb092432f42f76d2c8380
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
index 7449a2fa676e..555166755fd6 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3:1
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 5c5093b31531..c88a6e29dae5 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,3 +1,3 @@
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
-EBUILD xdotool-3.20160805.1.ebuild 1350 BLAKE2B 40f5a3d18293cfd1aef97b74b1916494b380065f910126b8f71849734bc0fcd33d638fff988e827269c00de4ac37dcc5a7bb28d71ecc18f9afe9f97a86ff5d83 SHA512 1c26297aabcc3e86b1392756da3fbef93132030bad486d907f73458574941479975fe4b88f9a6ee9b673192b765973c2699a2b130eaadf860f347fce0beb60d3
-MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
+EBUILD xdotool-3.20160805.1.ebuild 1310 BLAKE2B db143d4c90ad28f6621cf3c1fd23fcefcb28a4f737ccf7a0bcdc068731976af74c18b49cfae09eec00213da1b146947c58f5315e256b07b86ffb71cdc7076920 SHA512 5d6521786b8750919db11ef2d098f157baceffe9cab84a064b8a96443fdf6ae9820b0947b9b722b8df1776b7a40ac64d66a41276671f21621f145dad31da04fa
+MISC metadata.xml 559 BLAKE2B 799ca899f19315166729afb319949ac00dc89ffa5e71b1180a762f0f584f0c5369279c22f4df59cd8e034ceba100d19d4addc0f3f08a3879ec991d2e9c775559 SHA512 c3868963a90c77f0df833cafb4a9adfbe16a7a161f89863874f76b2c1e0a31652256a252acee1580135ecf48d431253f853512afe778b89e400b7c1a14a0f44e
diff --git a/x11-misc/xdotool/metadata.xml b/x11-misc/xdotool/metadata.xml
index f872516554a8..af7bc0696135 100644
--- a/x11-misc/xdotool/metadata.xml
+++ b/x11-misc/xdotool/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
-<email>desktop-misc@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
 This tool lets you programatically (or manually) simulate keyboard input and
 mouse activity, move and resize windows, etc. It does this using X11's XTEST
 extension and other Xlib functions.
-</longdescription>
-<upstream>
-<remote-id type="google-code">semicomplete</remote-id>
-<remote-id type="github">jordansissel/xdotool</remote-id>
-</upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jordansissel/xdotool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index fcd7fd283af2..ab4e1749bebe 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="
@@ -51,7 +51,6 @@ src_install() {
 
 	dodoc CHANGELIST README
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
+		dodoc -r examples
 	fi
 }
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 0d9c2a8e5772..b80ddc25db40 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
 DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
 EBUILD xkeyboard-config-2.30.ebuild 1338 BLAKE2B 9cda49f311d777e251148420d651b2254c29e2adbfd82ae6d70489fecfb55ed955d9f98d6bcc93878a0f6a7d7942f863257e24519e97243a4058f4259f55ef9f SHA512 6e0f427d0f7a30afcbb7263e8b3dede847a33f33bca90842c4317b4bb04f967b6586fda0abea90e506b21b2de007eb8ac30167d444b37df6e2a5d691659e0e5d
-EBUILD xkeyboard-config-2.31.ebuild 1346 BLAKE2B c959c766f7c811b58016fd0078d035682021bca7a966ea59e61b85f3526211bc9d842076b71d3e980070889f444736eef7ed067bafabe08f6b9a8c6713791131 SHA512 e5df90e9632c688546636f4c4ff4f595860263140b0c5437bc98786bffa65dfc4667805a759603e46bc82c54f59abe6189e8e831e53c69a80a3965976e43fdd6
+EBUILD xkeyboard-config-2.31.ebuild 1348 BLAKE2B defcbc90ee2d7dcf1b414f61289d54b9140efbce8403e85769530814c22ad32675e0dcc8eb640eede410825d6ea2e5c0c670674b8a6c2b30b7344513ee16aaf7 SHA512 111dc7dd9732639dd5ad75ba754a42e29b420d5511ded88f6947c3a29b33d6edb091f108883fcc28f8fa3c5fdcb047998d49405c216784ef3597aae58287fade
 EBUILD xkeyboard-config-9999.ebuild 1025 BLAKE2B 40114e9b867de73171361cb9bbfc524d4b9ec67af46f58ec4aa12851ed34f9e6be3851aadb1758ae6dc7b0870eb84c83db77deb0c76ac63cd01e5438dbb0d8fc SHA512 a61f3525effabe287198ca34aa64198e876feadb44188e8a3df47465b3fddfd9cc2d56f2bf080ad19b9e8aceaff1387cff8893e7d46727903c480879fd85106c
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
index 892bf38d0d17..a3b43b48b034 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index c559e691b720..dde4432e71c6 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -2,4 +2,4 @@ AUX xnots-0.2.1-gcc6.patch 1134 BLAKE2B f169cdd6236c4f068aa2661c3d937d5d97035572
 DIST xnots-0.2.1.tar.gz 41442 BLAKE2B 26579cfb5508ed1e956b027c769c9c0924870867428cdf5b569e571fce57777267f0523a9ceebabe7f2c705c7b6a34549a122d162cb547e44d8489708fb9e83c SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c
 EBUILD xnots-0.2.1-r2.ebuild 1003 BLAKE2B 51e9e4a85bb183f634f50e5a2a340f006ff05fb8a1c9941041295a5e9a0b791c3e8caf7a7ae9b39e3780bf4b943dcf48e60efdfd94bc6692874c99d2eba8e093 SHA512 533815f7dd9896083a2f535857d23c10f20325a3c8cc068e3fc429b70ae502386ae500fccbc4a286a7a2e8b02dfe441a326655c9be9eba31556796d4b1c9459f
 EBUILD xnots-9999.ebuild 948 BLAKE2B 7a7183891ab4b05a031b395ceb60e853eaa13d3235ebd0fdee2d4a6dacdf0d8dfdff10319278954fda63031872ca8e37c1b7e485fb7115cb9e2432986c495aaf SHA512 854cfbd3b99291da2fecc789f3f07f37cdc56b2e367020fac9367c1c843f5087db9bac2c71c15dab520815f24988b90af0063f830849a667fbd7f15854ac76c5
-MISC metadata.xml 410 BLAKE2B 1cfb5af15dcb1f596fc9eff076b7e4bce5af2d328f1f1040167117162b0ddfa4b1aca2a6bc30fdd54732f998ffebe6f51dd042f04e8a6e211bd115d3d3325bdd SHA512 fc75f0e956d59b3231440882242a1c9ef59f3e694c3c0ed16673cdb99aa92b58d94679d6b3385c373e8aa7bbf7b1ced73ed50ca26be76ebf54a72341c284bdbf
+MISC metadata.xml 379 BLAKE2B 7ff127576248582a810a436a8ae95bfb007d8198d21ef3a9127e4aafb3e774e3bc0565ebec59493f99f2c4c8a11242ae17a076b28657f124b6e70d3e99d3f85f SHA512 0ecbc5e5e8880944216fdaef09d214a68cab57ea20bdf4594afba5756eca90b5c535a2d14c5915c7e53cf9f190bb9dc2555dec55374aa7dc0afc1f6c937ddc8d
diff --git a/x11-misc/xnots/metadata.xml b/x11-misc/xnots/metadata.xml
index 230858f0c0fd..8d64b0da80c7 100644
--- a/x11-misc/xnots/metadata.xml
+++ b/x11-misc/xnots/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xnots</remote-id>
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index cdab4a7667b5..9b387e2adda5 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -4,4 +4,4 @@ DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc3389
 EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
 EBUILD xosview-1.21.ebuild 1201 BLAKE2B 6530a3f6d4bbc77b80b41477b42eaae3e61f23ae2249df43aa11803d3be2081ebd273cfc0c694b74ab96f2c4e6cc609072ab251aefb398914712511e4f1c5053 SHA512 342579968e7da80b5252a01f8c3d4ddd9e24f9f8bd69ab8997b07c3047797f7a8a14f706eeab1deaae465fab4f22034a6de79676ff255968be78514201f8b012
 EBUILD xosview-1.22.ebuild 1201 BLAKE2B 6530a3f6d4bbc77b80b41477b42eaae3e61f23ae2249df43aa11803d3be2081ebd273cfc0c694b74ab96f2c4e6cc609072ab251aefb398914712511e4f1c5053 SHA512 342579968e7da80b5252a01f8c3d4ddd9e24f9f8bd69ab8997b07c3047797f7a8a14f706eeab1deaae465fab4f22034a6de79676ff255968be78514201f8b012
-MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
+MISC metadata.xml 248 BLAKE2B c7f5029a5618609fad34b55b5c6e79ffe112a902735b964a3139d4ff2619f580af2268acb6bd76d5a0a4300bd6dad7e523474a9d8d12e4dd47ccb69b0d2531b0 SHA512 8363b906d5217879df7f18fdea58938e4ab205decbf5c11dcb6bb36caa58d4596ae669e4964a4660b2d9b475b8a583beb15e9208fa9cd0bb241c423173aa3b98
diff --git a/x11-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
index 66187a0f4213..cc7bf6e4bb7e 100644
--- a/x11-misc/xosview/metadata.xml
+++ b/x11-misc/xosview/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="project">
-                <email>desktop-misc@gentoo.org</email>
-                <name>Gentoo Desktop Miscellaneous Project</name>
+        <maintainer type="person">
+                <email>dilfridge@gentoo.org</email>
         </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index cf9d6c60c6d2..f03d6dcbf4bf 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -2,5 +2,5 @@ AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c
 DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
 DIST xsnow-3.0.7.tar.gz 322314 BLAKE2B 21c754daddb989a2f0771199d15342d0c08d23669525bbd9672537c200f7ff06d92708c256f2f89b483bb91947374195e4e95c2291425e630883cfe3b9898563 SHA512 1bc58d8c4542839ccc80c7612e472754f7471d2d72c61785b27d8a89d5e6826d40b892628bcea8c7dcfcf22e4c13db76a825a8c580a32f1ea74785f6c478fb79
 EBUILD xsnow-1.42-r2.ebuild 840 BLAKE2B 26e9758f489b23dc14b0bd8fb36a99f70ef559bfa0ecddfa53c30ea103cdfdd1caf739ad4644acce8ea6ac678a33cf23e93235a8aa03dc32df71855502fa4e90 SHA512 92e50bb5485cb268bac62d773447a40a696feffb7ad3ec05f7a5feed52812298cefb58a7a24bac341de7448c777d7607b2d277c9dad4d1d397af1d36696be476
-EBUILD xsnow-3.0.7.ebuild 658 BLAKE2B 3f4c503239a02c9daa1d90663da347605d192ac7312928003fcb333d676e507c4ed8461ed6c7670aba7e3385c409c1e2777273beb685d9ae0738e4652a9a6c61 SHA512 a6255df42783b011fdf782c6dee452c2d2cf47c5c41c571e3bec7bb5bcf8698c2eae154c5c8a5f5eb3243a10ba8d151a41f39ac18c6e7966bd08f6c218cf1b63
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD xsnow-3.0.7.ebuild 654 BLAKE2B 045eacf2da33856e15119899be8f9b855be6595dbfd833738dd0ca0dc58b2e530df57f25f965734808af4e6efc55582eb486aef136c77ecf75cad2740a62e835 SHA512 fb96cf34290b6e8e94083490dc4dc19fcbc49406bb398ec6da55b70dd228a9e217a0d29db88ec563a2f769a4af43f8122bd4b847c580878ce6bdb80cdbd1bf74
+MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
index 2ba8e9e851e4..b1dfcefdcde9 100644
--- a/x11-misc/xsnow/metadata.xml
+++ b/x11-misc/xsnow/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsnow/xsnow-3.0.7.ebuild b/x11-misc/xsnow/xsnow-3.0.7.ebuild
index e5540612626c..27ecfa5b733a 100644
--- a/x11-misc/xsnow/xsnow-3.0.7.ebuild
+++ b/x11-misc/xsnow/xsnow-3.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/xteddy/Manifest b/x11-misc/xteddy/Manifest
index 5f8b0853db95..87a661adcd13 100644
--- a/x11-misc/xteddy/Manifest
+++ b/x11-misc/xteddy/Manifest
@@ -1,4 +1,4 @@
 AUX xteddy-2.2-linking.patch 477 BLAKE2B 1537f00e5b94f58fce6dc0b0f4fdffd7caddc799fa5f1141504f0f02ded3c563176f569b97a5bfb15dc7c85c6d8f25562ab96abd0f863980cb445a5ecf9c9be1 SHA512 dbfa4207f6e77435b2bef95ae426107c5f397a31e8236a87b05bca86ecd39ce3797a380f4150fa5da3e2016c8ab78b44c6d8e34d69fb8e7619821c285f6c0704
 DIST xteddy-2.2.tar.gz 867005 BLAKE2B e0f701f715c8797d4fea0ac4286bba2412bbb593563d97e621d146f36f843e0e083c6ebdd9b27943482ec00c3e4d0f2c2a1d484ba2360e047eb1a9d92e69172c SHA512 e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b
 EBUILD xteddy-2.2.ebuild 713 BLAKE2B 81df26e399dbe378af6b535805ff1ff5941fd01ca822c0b5591d6dd83c37ddd4f40070c51593491647345cd07a40a356a7cc55092f564861355fcec4a8a2a027 SHA512 9e1f47ffeb837e25e30e1e09301988466705b7278e475e3f49babc1c76a247f1eddf493bcc06a1c7222f196dc9ccdcb5027343b9479d62ea631dd47ca76939ce
-MISC metadata.xml 656 BLAKE2B 2cbb02ea0591ab4b42c076026d09bb47e370c174fd7a88c58f8072c423844b8e9c0bf983bbb0268862525c7cc020d303df4b09d3fb3a4011a0476a90323289ce SHA512 788050bff7d1c505d389eafd049bfec1d0237742ed9e4f78c97419633239534c0b46de68f20040c5cef95b3bcdb69f686908dbe7289da3060c9ac37a6962d55d
+MISC metadata.xml 600 BLAKE2B cbb9f02ca6677772acd013dbcbeb088906a932bd3c3bceaead60f72ff89ae9285d3a1039be43f7e2011a4c43bee5545a73bb76ab616a88ad7deeaeb0acc95a62 SHA512 cc4855cd461e4b8cd1eb20d9a59e0b3770b4324b5c550ddee23f181461195b1224e7a021a0c6d9ea7d192b010016ff0df987e09e32e2c6a62f67b19212307583
diff --git a/x11-misc/xteddy/metadata.xml b/x11-misc/xteddy/metadata.xml
index c030175dcef1..6f559bd42fa2 100644
--- a/x11-misc/xteddy/metadata.xml
+++ b/x11-misc/xteddy/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Normally, xteddy just sits around doing nothing. After all, that's what
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /x11-misc
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)