gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /x11-misc
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
89 files changed, 743 insertions, 966 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 152cb3bce861..d456a268edb0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index e39b0ab0efa6..f87c31ae2664 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -5,6 +5,6 @@ AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
 DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
 EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2295 BLAKE2B ee30265b3733279db824a9a97a62428d0c480590543475b18eed9450c1735dafb26410a838467f1ce0c98617b9d705f02015f63ee8e4662847d07c7bab296696 SHA512 e4cb4d0c2083134ca248f59e5d709ab61b36429f13ee2a4f3cff8bb5ea8bbd384d759f7193151bff146c11e96914ac70e6eaa0e88b4d1742b69980aa08f735a7
-EBUILD bumblebee-3.2.1_p20210112.ebuild 2190 BLAKE2B e4802c77f1d18a6172a3178695e9d0d64c651d6695a40a03507d1efd5c0347d54f0519c6c1451f4e597c8112688e3dfd747862213e03486b9d6112daa2767229 SHA512 c7bcc34cdb778ee55b7ac83c792d3203f23e052072bd9a9fa9817dd64f3008ec4346d05c41c8af4bab4811cb935d3face9a2b36300a5a31beb65d78c798de4ad
+EBUILD bumblebee-3.2.1_p20210112.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
 EBUILD bumblebee-9999.ebuild 2199 BLAKE2B e19016ca68387e551f0694b924217680f46752f81e6fa5126b14217c33f0dfe29b41fd7d8555ab05ef69a11c31aa94013f6d705538002d3daf80c4afad36b36d SHA512 a483f2303cba245bbcc94d8cf984e606539ad200d7db9bd53e36152719dc9f64038b2b4046ca7121d8db0af4f1b8400c1e006fffa17e0cd75c5dac7065555f9a
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
index 58973b2a9eb5..4984d378312b 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 
 	S="${WORKDIR}/Bumblebee-${COMMIT}"
 fi
diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
index 566bb9375eda..98865ad00a6d 100644
--- a/x11-misc/devilspie/Manifest
+++ b/x11-misc/devilspie/Manifest
@@ -1,4 +1,4 @@
 DIST devilspie-0.23.tar.xz 130984 BLAKE2B 86b1b472d23ba49fdcc27c1d5a48ef95e3edd1c236569a3d25e23c8947ed41d91ce35969939cefc8ee1b74eb65594f91617172d35350e873977f4e8856e71ce4 SHA512 6ea6c79d317b0f35d943ecafa010e8c6011870796d83ff0a24a4853ad0ebad93608173dd1c4b645254d53c5c182c667e6eba42a20f764f258c211ee2bcd19174
-EBUILD devilspie-0.23-r1.ebuild 1028 BLAKE2B df241aeff50c518c512954e6ef83aac0a7ee9a8bd1b2bc01989ad92ab2de613d9ecde62f4649e3f8d92f319123a050414b35c594608de29b0fedf32f79d142a6 SHA512 69e3078752ee90f39ae4d220d002e9b5330ccae8b2feeb73e76ad7b19f5310483da989ed6e3e8f238782c8deb53fdd3d7398705572638b90e65a4a17dbc7a06c
+EBUILD devilspie-0.23-r2.ebuild 661 BLAKE2B 71800ca4f4c9f8fc06b9cfa844c2bf50a71ce9cd7f00846e77b36bfcf2f5c8451a0fee642de7f56dadf853cedf3e122c72639cdefce5745d8cb9a4738cfede9c SHA512 4c2d3f2e705fc14205ae471cacc1f7630f7daf09ebcaad25019a2d95579e004e280fd16c5c0ba4335d80392c139d33745e8ec4b9f2b92fd59f93b817d80ee463
 EBUILD devilspie-0.23.ebuild 966 BLAKE2B 2aff3525074fff8cc2cf32360b776072e24567f35a6529a97418ab27102c718b000fdf9b49b30ca5a94c30ac33520ddad808e96d4980e4bb14e76d37b8d893d8 SHA512 399161cbecec1da3d68ec0ec9981558569d0425431b96418b4764307557354c96965c15fd16a8df49e13d8d06681c3cef3ddb801d73988824350cecb91056395
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
diff --git a/x11-misc/devilspie/devilspie-0.23-r1.ebuild b/x11-misc/devilspie/devilspie-0.23-r1.ebuild
deleted file mode 100644
index 5711466aa402..000000000000
--- a/x11-misc/devilspie/devilspie-0.23-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A Window Matching utility similar to Sawfish's Matched Windows feature"
-HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html"
-SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.10
-	x11-libs/gtk+:3[X]
-	x11-libs/libwnck:3
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	gnome-base/gnome-common" # Required by eautoreconf
-
-src_prepare() {
-	default
-	sed -i -e "s:\(/usr/share/doc/devilspie\):\1-${PVR}:" devilspie.1 || die
-	sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am || die
-	mv configure.{in,ac} || die
-	eautoreconf
-	LIBS="$($(tc-getPKG_CONFIG) --libs x11)"
-}
-
-src_configure() {
-	econf --disable-compile-warnings
-}
-
-src_install() {
-	default
-	keepdir /etc/devilspie
-}
diff --git a/x11-misc/devilspie/devilspie-0.23-r2.ebuild b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
new file mode 100644
index 000000000000..e515002c9246
--- /dev/null
+++ b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Window matching utility similar to Sawfish's Matched Windows"
+HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html"
+SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libwnck:3"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i "/doc\//s@devilspie..@${PF}/@" devilspie.1 || die
+}
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index 2ba8e9e851e4..d91810780a67 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/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="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index b10a252a94a8..9241ff1b6ff1 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,7 +1,4 @@
 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 1019 BLAKE2B 76bc48bd30bfaac0871a3ea97f9fc42284a98d973a418cb8e7465dee375821540750f6c96df041bbe1fbb9b1816384db484a710431ed293cf4273ac5f5ccc2d8 SHA512 7224b2ff7c486b604af6a278b81c5eb34295fa34cef95f99ab547372143ad1fecd0f2b6535ef0206e36d2150d2f93cfa4016f772a6cb0c3017ce44cf7247a8fe
-EBUILD devilspie2-0.43.ebuild 951 BLAKE2B 020e7b99cb9e1f5e20d1a0f2562b950fca68067866a517cd8dbb25d5a3f380d3fde3e2274fce55df74acf2590405fe907f312194fcded5131caef76d54e5cbca SHA512 81da566022c75df100ab2a1f7c59d5671a7c21950bcac922165133867dc27926ca2f8fc0aefa040100d8ca521284039d582a7c5e1b9fc2d37e4478c9d0808472
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
diff --git a/x11-misc/devilspie2/devilspie2-0.42.ebuild b/x11-misc/devilspie2/devilspie2-0.42.ebuild
deleted file mode 100644
index 26fe55495aef..000000000000
--- a/x11-misc/devilspie2/devilspie2-0.42.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# check locales on version bump!
-PLOCALES="fi fr it ja nl pt_BR ru sv"
-inherit flag-o-matic 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"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/lua-5.1.5:0
-	>=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}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	use debug && append-cflags -D_DEBUG
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install
-
-	dodoc AUTHORS ChangeLog README README.translators TODO VERSION
-	doman devilspie2.1
-}
-
-pkg_postinst() {
-	elog "Default directory for scripts is ~/.config/devilspie2/"
-}
diff --git a/x11-misc/devilspie2/devilspie2-0.43.ebuild b/x11-misc/devilspie2/devilspie2-0.43.ebuild
deleted file mode 100644
index 20368879deeb..000000000000
--- a/x11-misc/devilspie2/devilspie2-0.43.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="fi fr it ja nl pt_BR ru sv"
-inherit flag-o-matic 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"
-
-RDEPEND="
-	>=dev-lang/lua-5.1.5:0
-	>=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
-"
-DEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_compile() {
-	emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install
-
-	dodoc AUTHORS ChangeLog README README.translators TODO VERSION
-	doman devilspie2.1
-}
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index 2ba8e9e851e4..d91810780a67 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/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="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 943f60598ae3..b9d7173e5c64 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -6,7 +6,7 @@ DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
 EBUILD dmenu-4.6.ebuild 1259 BLAKE2B a66febb24e2ebd8542e946524f0f86bcf21804cc89df93823c6b10ff6f13f398f5dba7798d08fd2d0b697f6aba74272f52d0892be7df9e4465001a80e246701c SHA512 b685e44eaf6eaf43cf37bdf7d92a4dcb56dd32926ad64d21b5646250eb465b67b6bb678ebf51b3e862d0398a777cd8a8d91184b99ddebfdc4690c02de5cd535d
-EBUILD dmenu-4.8.ebuild 1328 BLAKE2B a6b334826c57cd2c254d55ec186c53809b97d1c6d8cc005c9966c85783ad88966881a5e17057c74cc8d928a87d1fd0848a3690946490da025be4905afadc13ad SHA512 248ca049055af994cd3e42582ea03ec6d11fa5f02dfbd1942bcc29fce8be5609d546e40dd3017e3e2da662b3457057c685b9350c098937d90cc1c93a35232cb0
+EBUILD dmenu-4.8.ebuild 1326 BLAKE2B 70f603bb8446ff6c64e8744e2f5ba9aada0d842719b094d71655fb873a7c9ff05194a80d961779df1d6ef82b71a13516c61960cefbd6f47ba097ecdbf01a63bc SHA512 cdd9a67e9bbe61a1c7fa3fda53d7c44e6eb2342f7ef0f31e3432d35fa8b841f0c0b678e1de87646d5ead7f9eac24eef0a9de972d9d80b7ccf3c9d3695b0e0fd6
 EBUILD dmenu-4.9.ebuild 1414 BLAKE2B 25a16db270e58b5e68f2630a370bb95451d873dcec7fa7d3af21040d44713d68ba8c02188b5c530ef3e39fb29464fd1c9f206a6ea8915666633215f179dc61e2 SHA512 be96af4189cbe5b9ea489869995ae362abec9439f4d1c0577840ff18862d0c1c6fd9f526f2543d3bbbe756f61582b2a6449f2d891ba5d8cf8b9ace81df7fafe3
 EBUILD dmenu-5.0.ebuild 1414 BLAKE2B 4e712800e3749d3c3cf8eab605d995667b3ff46aff7f696b4387911aa0bf31e31a4ca8bad2156591e2d3007950f592122b8ef57f0eb840d084903293569a7b98 SHA512 0bfc3218a7c653bc104680ca46cec18db8554b71327864493e57693eac2f69979b31a3ceacd71e31a0c2e9ef4e5a7fd88765ff9186435328e83af74e9c2174a3
 EBUILD dmenu-9999.ebuild 1375 BLAKE2B 35a86f3d75697c2c2cdf2c7298103dcf0a97dec40b11432ebe571f3d0df3deee399035ea5a59ea2af5deddd768e5e7825e75ad02a32836153cf0b401aabe25aa SHA512 670b62a9a32187a0ec812c4d0069f9020e5711f46aad32fc8671b290a7e986ed544c04020b5706cef980801aa5265fe9091ece0db6e40aedf0cf9ae6f519ede8
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index e577a44a68fd..976b6840c2e3 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 614fd65c2a97..c495fab552d4 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,9 +1,7 @@
 AUX dzen-0.9.5-config-default.patch 2649 BLAKE2B 1069b1d94482fd471387ceca9c727eaf65f9ecde401015a114e73498874d7d04e3c4ec2e7062e245bcfd26a2feb8db5d4b39e072e64899eedca34d3033813102 SHA512 4884455ff03197d718e5700106b4b5250343a69b11cdd6190580f89e70306d97a1dde8154baabc79a909ed571806a992fa643d7380830257331bec477e46c54d
 AUX dzen-0.9.5-off-by-one.patch 188 BLAKE2B edd3b393c3b4cfb3091cc7fe3ca156b06fd178e53a24ec08967765c90d60005415109f9c85e67680f735c037abe4150cf162b184bbd47f108ac37b26ec2618c8 SHA512 1a82875ee296af37d559b14da4cadef40f2cd6842d67cf6d761d0c65acd1bdb51b0d8096282f1172f109178ecd3f3c1debef809373a0e6ab04fb161d57e20f8d
-AUX dzen-0.9.5_p1-gentoo.patch 8159 BLAKE2B 1dde32a7522894bf5bf947651c7a0a1f64db40d1e4e439182dcc0982af21a7620c38fc8149aa9bb607ae7821acf094d7e2ed8b2547efcc389c234d4c6dcf3f36 SHA512 8c6eb3c45c12f095a41b1847967dfe42ddd1fd7572e48aef5673a548b7186f0ad4ea08c662e08a632c5bcb1e191f381f4ae57fc293920f77e541bbdc294f974c
-AUX dzen-0.9.5_p1-unused-but-set.patch 2024 BLAKE2B 6dbcb15ac1e62f34a54f96a0a39117b88c71944c6157ec44384aeddbb9e6bd6010b4b8504929e57c77f3911e5f1857bb323223b273ccb3a1461f4c501a470da9 SHA512 c5200e9d4a3519d9cf1439c6f171335c2eceacb3691e08bbcffc4431b420a1c5bfb1036ffffaf9b3307c5b940d546b2549e8fce42dd157d7b9d37920631e57a2
 DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
-DIST dzen-0.9.5_p1.tar.gz 38178 BLAKE2B 9ec81747d6eec9b7cca58b11096e00548cdca7ba21a179599979cf9b22ff84100d266d98e7a3e419960a56fee788ae96158650884a1b1322def6a98a70d6683b SHA512 239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300
+DIST dzen-0.9.5_p2.tar.gz 38181 BLAKE2B 0e34228c3795864a1b6ac5a3ac9d0ab4a1b90e065a649caa34d704951007bb1239db920f7ed3e35303f614c6572b6232768d59302b23edab0c11793574fcde3d SHA512 e750ab9c62dad311bf478d79c15ffdc1ef108fe2c3ed5df82316d879aad000bee785d304048f5daae237468f6fe018f14fc05d0114d68d873f766dbf1dfebbc9
 EBUILD dzen-0.9.5-r1.ebuild 1578 BLAKE2B d67c414c9ecfa47316f9f8df899928f2c0c0cf5eaa34898b2445be7c1923bc74c7896425969b96ee13b173efce4653e04a11016a8b97cf11bb38ee584b097925 SHA512 e5f07cb9df6dd14af89441659de778470924cc4c681feaa176e9282a05f03186e0e7d14b7782d4fe2334471f19995658c80a11411240fa06a9d80f1a455a513c
-EBUILD dzen-0.9.5_p1.ebuild 1465 BLAKE2B 7a1b4332f1001bfb4a01cd7f431a3d5a95214b3f3c5366a12aec84c7e6cd6a4e247fc526837bb8beee5430e3ff9def819cd79c6bcfa457c5b93ab097183cd236 SHA512 d634a77533d3a9c1517b11f0497d5b7a13b91a6e625a972e4f1cc593785f2ef81f5de11fe39313b24eba784a8b922551b34c382bb6510c0a858a0b44b3edf1a1
-MISC metadata.xml 642 BLAKE2B 28355993f6f8edc43e8af4717523ae4dc0b249f88ee5a85bc20e23d4942084dfc29d43a71c9163f2a3bfa4555dca5648bd7682429527124502be4f2eef10288d SHA512 3f7b850582bdc314f4bbf795a3171f27ac8e9c41eeb56221106cb70f039ce37e62b43b2a09c21862cb6efe50e22ddfa45b711c809ba8347c52010188c2207e81
+EBUILD dzen-0.9.5_p2.ebuild 1565 BLAKE2B ed3b0a8e0e9934437d97dda7f518d9556ae81f18e2fb2ff743cd867aeb33689fbea98bf7e5f4dda77fc671093ddf1882b1b064171dd654a76965ed00e5e8974e SHA512 474536e097bb7d03e70eaa709b798bb6deb36035a0361fbf903248f7b6a6fe02dd871575d24a7be1a9efee03dca4f28436b9e66622a1e2e71db25817d08406c2
+MISC metadata.xml 438 BLAKE2B f10ab9d9e7e3fd4009c0fc7c7daaf3b08fd0cbf4c53e463d4acf7a401a911dfebec71d62dd985b99a19d9123f9c60bb7338b170c8493cfc71e6fb943fbb415d5 SHA512 7698619d1e49251e7d82e6489e858c5543828a87d5439d3cfc6cb190ceb5754adfc4602a179fe63a2fe96a913887418f3987b52895132b9d78ec61fbadc72330
diff --git a/x11-misc/dzen/dzen-0.9.5_p1.ebuild b/x11-misc/dzen/dzen-0.9.5_p1.ebuild
deleted file mode 100644
index f8b22d1c4b8d..000000000000
--- a/x11-misc/dzen/dzen-0.9.5_p1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-COMMITID="488ab66019f475e35e067646621827c18a879ba1"
-
-DESCRIPTION="A general purpose messaging, notification and menuing program for X11"
-HOMEPAGE="https://github.com/robm/dzen"
-SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal xft xinerama xpm"
-SLOT="2"
-
-RDEPEND="
-	x11-libs/libX11
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-unused-but-set.patch
-)
-DOCS=( README )
-S=${WORKDIR}/robm-${PN}-${COMMITID:0:7}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	if use xinerama ; then
-		sed -e '/^LIBS/s|$| -lXinerama|' \
-			-e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \
-			-i config.mk || die
-	fi
-	if use xpm ; then
-		sed -e '/^LIBS/s|$| -lXpm|' \
-			-e '/^CFLAGS/s|$| -DDZEN_XPM|' \
-			-i config.mk || die
-	fi
-	if use xft ; then
-		sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \
-			-e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \
-			-i config.mk || die
-	fi
-}
-
-src_compile() {
-	default
-	use minimal || emake -C gadgets
-}
-
-src_install() {
-	default
-
-	if ! use minimal ; then
-		emake -C gadgets DESTDIR="${D}" install
-		dobin gadgets/*.sh
-		dodoc gadgets/README*
-	fi
-}
diff --git a/x11-misc/dzen/dzen-0.9.5_p2.ebuild b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
new file mode 100644
index 000000000000..b2dadc4502d7
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+COMMIT_HASH="488ab66019f475e35e067646621827c18a879ba1"
+
+DESCRIPTION="General purpose messaging, notification, and menu utility"
+HOMEPAGE="https://github.com/robm/dzen"
+SRC_URI="https://github.com/robm/dzen/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="2"
+IUSE="xinerama xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i '/strip/d; /@echo/d; s/\t@/\t/; s/-L.*/$(X11LIBS)/' \
+		Makefile gadgets/Makefile || die
+}
+
+src_compile() {
+	local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11)"
+	local libs="$($(tc-getPKG_CONFIG) --libs x11)"
+
+	emake -C gadgets \
+		CC="$(tc-getCC)" CFLAGS="${cflags}" \
+		LDFLAGS="${LDFLAGS}" X11LIBS="${libs}"
+
+	local flag
+	# xft always-enabled wrt bug #477656
+	for flag in xft $(usev xinerama) $(usev xpm); do
+		cflags+=" $($(tc-getPKG_CONFIG) --cflags ${flag}) -DDZEN_${flag^^}"
+		libs+=" $($(tc-getPKG_CONFIG) --libs ${flag})"
+	done
+
+	cflags+=" -DVERSION='\"$(ver_cut 1-3)\"'"
+
+	emake CC="$(tc-getCC)" CFLAGS="${cflags}" LIBS="${LDFLAGS} ${libs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C gadgets install
+	dobin gadgets/*.sh
+	dodoc gadgets/README*
+	einstalldocs
+}
diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch
deleted file mode 100644
index 9ac204e6b28e..000000000000
--- a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,45 +12,44 @@
- 	@echo dzen2 build options:
- 	@echo "CFLAGS   = ${CFLAGS}"
- 	@echo "LDFLAGS  = ${LDFLAGS}"
--	@echo "CC       = ${CC}"
-+	@echo "CC       = $(CC)"
- 	@echo "LD       = ${LD}"
- 
- .c.o:
- 	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	$(CC) -c ${CFLAGS} $<
- 
- ${OBJ}: dzen.h action.h config.mk
- 
- dzen2: ${OBJ}
- 	@echo LD $@
--	@${LD} -o $@ ${OBJ} ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ ${OBJ} ${LDFLAGS}
- 	@echo "Run ./help for documentation"
- 
- clean:
- 	@echo cleaning
--	@rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
-+	rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
- 
- dist: clean
- 	@echo creating dist tarball
--	@mkdir -p dzen2-${VERSION}
--	@mkdir -p dzen2-${VERSION}/gadgets
--	@mkdir -p dzen2-${VERSION}/bitmaps
--	@cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
--	@cp -R gadgets/Makefile  gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
--	@cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm  dzen2-${VERSION}/bitmaps
--	@tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
--	@gzip dzen2-${VERSION}.tar
--	@rm -rf dzen2-${VERSION}
-+	mkdir -p dzen2-${VERSION}
-+	mkdir -p dzen2-${VERSION}/gadgets
-+	mkdir -p dzen2-${VERSION}/bitmaps
-+	cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
-+	cp -R gadgets/Makefile  gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
-+	cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm  dzen2-${VERSION}/bitmaps
-+	tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
-+	gzip dzen2-${VERSION}.tar
-+	rm -rf dzen2-${VERSION}
- 
- install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f dzen2 ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
-+	mkdir -p ${DESTDIR}${PREFIX}/bin
-+	cp -f dzen2 ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--	@rm -f ${DESTDIR}${PREFIX}/bin/dzen2
-+	rm -f ${DESTDIR}${PREFIX}/bin/dzen2
- 
- .PHONY: all options clean dist install uninstall
---- a/config.mk
-+++ b/config.mk
-@@ -4,7 +4,7 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
- 
- X11INC = /usr/X11R6/include
-@@ -18,61 +18,12 @@
- # Uncomment: Remove # from the beginning of respective lines
- # Comment  : Add # to the beginning of the respective lines
- 
--## Option 1: No Xinerama no XPM no XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\"
--
--
--## Option 2: No Xinerama with XPM
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
--
--
--# Option 3: With Xinerama no XPM
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
--
--
--## Option 4: With Xinerama and XPM
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
--
--
--## Option 5: With XFT
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
--CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
--
--
--## Option 6: With XPM and XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft`
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
--
--
--## Option 7: With Xinerama and XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama `pkg-config --libs xft`
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XFT `pkg-config --cflags xft`
--
--
--## Option 8: With Xinerama and XPM and XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
--
--
-+LIBS = -lX11
-+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
- 
- # END of feature configuration
- 
--
--LDFLAGS = ${LIBS}
--
--# Solaris, uncomment for Solaris
--#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
--#LDFLAGS = ${LIBS}
--#CFLAGS += -xtarget=ultra
--
--# Debugging
--#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft`
--#LDFLAGS = ${LIBS}
-+LDFLAGS += ${LIBS}
- 
- # compiler and linker
--CC = gcc
--LD = ${CC}
-+LD = $(CC)
---- a/gadgets/Makefile
-+++ b/gadgets/Makefile
-@@ -12,61 +12,57 @@
- 	@echo dzen2 gadgets build options:
- 	@echo "CFLAGS   = ${CFLAGS}"
- 	@echo "LDFLAGS  = ${LDFLAGS}"
--	@echo "CC       = ${CC}"
-+	@echo "CC       = $(CC)"
- 	@echo "LD       = ${LD}"
- 
- .c.o:
- 	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	$(CC) -c ${CFLAGS} $<
- 
- ${OBJ}: dbar.h config.mk
- 
- dbar: ${OBJ}
- 	@echo LD $@
--	@${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
- 
- gdbar: ${OBJ}
- 	@echo LD $@
- #	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11
--	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
- 
- gcpubar: ${OBJ}
- 	@echo LD $@
- #	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB}
--	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
- 
- textwidth: ${OBJ}
- 	@echo LD $@
--	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
--	@strip $@
-+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
- 
- clean:
- 	@echo cleaning
--	@rm -f ${OBJ} dbar
--	@rm -f ${OBJ} gdbar
--	@rm -f ${OBJ} gcpubar
--	@rm -f ${OBJ} textwidth
-+	rm -f ${OBJ} dbar
-+	rm -f ${OBJ} gdbar
-+	rm -f ${OBJ} gcpubar
-+	rm -f ${OBJ} textwidth
- 
- install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f dbar ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
--	@cp -f gdbar ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
--	@cp -f gcpubar ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
--	@cp -f textwidth ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
-+	mkdir -p ${DESTDIR}${PREFIX}/bin
-+	cp -f dbar ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
-+	cp -f gdbar ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
-+	cp -f gcpubar ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
-+	cp -f textwidth ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--	@rm -f ${DESTDIR}${PREFIX}/bin/dbar
--	@rm -f ${DESTDIR}${PREFIX}/bin/gdbar
--	@rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
--	@rm -f ${DESTDIR}${PREFIX}/bin/textwidth
-+	rm -f ${DESTDIR}${PREFIX}/bin/dbar
-+	rm -f ${DESTDIR}${PREFIX}/bin/gdbar
-+	rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
-+	rm -f ${DESTDIR}${PREFIX}/bin/textwidth
- 
- .PHONY: all options clean install uninstall
---- a/gadgets/config.mk
-+++ b/gadgets/config.mk
-@@ -1,7 +1,7 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
- 
- X11INC = /usr/X11R6/include
-@@ -10,9 +10,8 @@
- X11LIB = /usr/X11R6/lib
- LIBS = -L/usr/lib 
- 
--CFLAGS = -Os ${INCS} 
--LDFLAGS = ${LIBS}
-+CFLAGS += ${INCS} 
-+LDFLAGS += ${LIBS}
- 
- # compiler and linker
--CC = gcc
- LD = ${CC}
diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch
deleted file mode 100644
index 70116ff66d2b..000000000000
--- a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -293,7 +293,6 @@
- static void
- set_docking_ewmh_info(Display *dpy, Window w, int dock) {
- 	unsigned long strut[12] = { 0 };
--	unsigned long strut_s[4] = { 0 };
- 	XWindowAttributes wa;
- 	Atom type;
- 	unsigned int desktop;
-@@ -339,8 +338,6 @@
- 		strut[2] = si.y + wa.height;
- 		strut[8] = wa.x;
- 		strut[9] = wa.x + wa.width - 1;
--
--		strut_s[2] = strut[2];
- 	}
- 	else if((wa.y - si.y + wa.height) == si.height) {
- #ifdef DZEN_XINERAMA
-@@ -358,8 +355,6 @@
- #endif
- 		strut[10] = wa.x;
- 		strut[11] = wa.x + wa.width - 1;
--
--		strut_s[3] = strut[3];
- 	}
- 
- 	if(strut[2] != 0 || strut[3] != 0) {
-@@ -832,11 +827,9 @@
- 		XFreeStringList(missing);
- 
- 	if(dzen.fnpl[p].set) {
--		XFontSetExtents *font_extents;
- 		XFontStruct **xfonts;
- 		char **font_names;
- 		dzen.fnpl[p].ascent = dzen.fnpl[p].descent = 0;
--		font_extents = XExtentsOfFontSet(dzen.fnpl[p].set);
- 		n = XFontsOfFontSet(dzen.fnpl[p].set, &xfonts, &font_names);
- 		for(i = 0, dzen.fnpl[p].ascent = 0, dzen.fnpl[p].descent = 0; i < n; i++) {
- 			if(dzen.fnpl[p].ascent < (*xfonts)->ascent)
---- a/gadgets/textwidth.c
-+++ b/gadgets/textwidth.c
-@@ -62,11 +62,9 @@
- 	if(missing)
- 		XFreeStringList(missing);
- 	if(font.set) {
--		XFontSetExtents *font_extents;
- 		XFontStruct **xfonts;
- 		char **font_names;
- 		font.ascent = font.descent = 0;
--		font_extents = XExtentsOfFontSet(font.set);
- 		n = XFontsOfFontSet(font.set, &xfonts, &font_names);
- 		for(i = 0, font.ascent = 0, font.descent = 0; i < n; i++) {
- 			if(font.ascent < (*xfonts)->ascent)
---- a/gadgets/gcpubar.c
-+++ b/gadgets/gcpubar.c
-@@ -40,7 +40,6 @@
- 
- int main(int argc, char *argv[]) {
- 	int i, t;
--	double total;
- 	struct cpu_info mcpu;
- 	FILE *statfp;
- 	char buf[256], *ep;
-@@ -149,7 +148,6 @@
- 		while(fgets(buf, sizeof buf, statfp)) {
- 			if(!strncmp(buf, "cpu ", 4)) {
- 				unsigned long long unice;
--				double myload;
- 				/* linux >= 2.6 */
- 				if((sscanf(buf, "cpu %llu %llu %llu %llu %llu", 
- 								&ncpu.user, &unice, &ncpu.sys, &ncpu.idle, &ncpu.iowait)) < 5) {
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index 3319f73334bb..d2e640d185c3 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/metadata.xml
@@ -1,15 +1,15 @@
 <?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>Dzen is a general purpose messaging, notification and menuing
-  program for X11. It was designed to be scriptable in any language and
-  integrate well with window managers like dwm, wmii and xmonad though it will
-  work with any window manager.</longdescription>
-  <upstream>
-    <remote-id type="github">robm/dzen</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">robm/dzen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/lightdm-mini-greeter/Manifest b/x11-misc/lightdm-mini-greeter/Manifest
index 48d33bbede07..58425ffdeb79 100644
--- a/x11-misc/lightdm-mini-greeter/Manifest
+++ b/x11-misc/lightdm-mini-greeter/Manifest
@@ -1,5 +1,9 @@
 DIST lightdm-mini-greeter-0.3.4.tar.gz 27327 BLAKE2B 5f16b3d785e6773c127927caccfcd53089f3f31a8f1cc4c34ab09baf3cfebf9aabff45b5c76b1efdb850cde550e9335f3b8e8cd00d623a501346b9fe4e0d8e70 SHA512 dd605aaed14ead44962ef34d1d42bb350abc25f2975b2d1ed0b58e852b8f75805015ab4908a2414ebee3339e087f7d1e757f09345affb6a69bcac250ce47914f
 DIST lightdm-mini-greeter-0.4.0.tar.gz 28761 BLAKE2B 3f35a0d6c50ef96e995b0d96a509ec0cd2feb68dc262aaf1dc353f5cac6677abd79a0f1cf4c1119f4d96c8193b5f58f5938801503979682f85037cc2d6330ce9 SHA512 c195d16f2650a1680e6fd13493c666d5bdfd2badf2dc8c3f09a4cb973eeaf1412bf7d4c9d38c28d408ad83d65f3a4bd27b2bb7071182ca108bd2bcb94164d202
+DIST lightdm-mini-greeter-0.5.0.tar.gz 32039 BLAKE2B 7fbef14d96e7ca5b80377069d8c4240142a8e6fc312ea9aa48343810375009dc416adb20f6a3bc113fcc4fb5a48d00e80dd410847c1b30b9030da2981ee19438 SHA512 4d1a34d78759562ef42237028e5de07e0d807f1effd2a65b0f7a735fe9ae78acb6fb6f51111ecf371b307e7973ec64c9dddd85013ea1ce0b2ea6376bce320c12
+DIST lightdm-mini-greeter-0.5.1.tar.gz 32132 BLAKE2B 851b4e1ee9d5205575adb2b81cbaa61eac10bd977dd8f30771a9e7f968802115ac57a09401e6931cd3292f36fdabd0333e9c0729d2246a6394fb71c61311a9dc SHA512 231845c79da5e938d4ab3045a17b9c7a7becde491ea64a19934d42495bdbafd7b329c07a72162b9b1514b7895fe59186296f8157a711a46f14b05f21c7c90eaf
 EBUILD lightdm-mini-greeter-0.3.4.ebuild 586 BLAKE2B f9a8847e8b5a2a93fefc3100dbd0f708f48fc095b2c6ccc10ca8b783348cf88ddd9f70b6e9f83df2115197e29835337f5c53971eb9cf11fe9ed9180c5737e1e2 SHA512 6e029e59fdd2e9f978bc508259aec005e86d51a7fc3392f86cef91953563e9194c2c5205a2ede04e170702a215be6811965eb375c88673dac440d454f9e34f69
 EBUILD lightdm-mini-greeter-0.4.0.ebuild 586 BLAKE2B 45bc8be020848e4319012893c3753298f50613f31af48447b4054fede4c9192b380439761bdddbc6f219ca1fbcf53d9dcf82e6b7684cdd637de7327a3b53c072 SHA512 e21a9a3a865575fde2af6facb530c00ec0cc96272d5a15819acd24e3f14838e29110bc2f2bfe5bf28055b61900ff9f8c16087883ac4a55e52bede87587e059f8
+EBUILD lightdm-mini-greeter-0.5.0.ebuild 631 BLAKE2B 46b8d2ca7baadf2f690bed6339bce6ee0daffec95a66fdee9d4c915e7e6b781a6da4adb0333069bda603f2fc6374a494d1c5a5b2bcd066874612079f0bb18ae6 SHA512 c369573bee92c4b4df5a344f44c55da95e8b51a341538d4ac87889de9744e1dff8819a7f5092f4f532e089b2dde0e1557d831424c538b9e8a8a7148c9857dfaf
+EBUILD lightdm-mini-greeter-0.5.1.ebuild 631 BLAKE2B 46b8d2ca7baadf2f690bed6339bce6ee0daffec95a66fdee9d4c915e7e6b781a6da4adb0333069bda603f2fc6374a494d1c5a5b2bcd066874612079f0bb18ae6 SHA512 c369573bee92c4b4df5a344f44c55da95e8b51a341538d4ac87889de9744e1dff8819a7f5092f4f532e089b2dde0e1557d831424c538b9e8a8a7148c9857dfaf
 MISC metadata.xml 353 BLAKE2B 364a6904c6b871e3a331928070a8d65a75c04ca8646636cc7978abfa8fb69cc9286556e93a7cbafd793236f6a3e5ad45ace236df780710f3ff1624b7e81211c8 SHA512 346fabfe019f6c030e58de94c7de3e344aeabb9227f931f5d3067338a9cb795fff6ecddef18d2f6af97c2fcbcb0d5953f2984914841278bd5a8632983e5b7734
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild
new file mode 100644
index 000000000000..a8f82dec16b8
--- /dev/null
+++ b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter"
+HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter"
+SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.14:3
+	>=x11-misc/lightdm-1.12
+"
+DEPEND="${RDEPEND}"
+
+DOCS="CHANGELOG.md README.md"
+
+src_prepare() {
+	sed -i -e 's/-Werror//' Makefile.am || die
+
+	eapply_user
+	eautoreconf
+}
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.1.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.1.ebuild
new file mode 100644
index 000000000000..a8f82dec16b8
--- /dev/null
+++ b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter"
+HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter"
+SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.14:3
+	>=x11-misc/lightdm-1.12
+"
+DEPEND="${RDEPEND}"
+
+DOCS="CHANGELOG.md README.md"
+
+src_prepare() {
+	sed -i -e 's/-Werror//' Makefile.am || die
+
+	eapply_user
+	eautoreconf
+}
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 00647d5494b1..b5303cb414bf 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -3,5 +3,5 @@ AUX menumaker-0.99.12-AM_PATH_PYTHON.patch 2600 BLAKE2B bd7b4b3628c9628ca9b381f2
 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
 DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
 EBUILD menumaker-0.99.11.ebuild 1083 BLAKE2B e5123461019a41dc840748eab0cbcdf6d6ba7ca783054348bf0ff38f04501ebe6030b38efc2481ca50a66519f699dbce02adf4d8ce503d52e3874a0d70ed237e SHA512 15d038e1103322e1e86cfcc9bd21b5a00633f149d45d6e6f3c6153cb40b4d35e580e2cc4e76efa8d942878487cc278b6c35e1b5cca8257710abcf60f77f2c248
-EBUILD menumaker-0.99.12.ebuild 895 BLAKE2B 582c439f8aa27ae242b1997baf3c6dcffcce6430eb5ca13fd15cfdf05eda8f6df1a284d72be44ca3371bfe62b8f55caefe2687d183bf8ed7f476c620fdede501 SHA512 01d2570ae2e426d833736924075fbd58e1372aeb4e076311197d1605c315ba3b9c16d395716bd790cf4b113cfa3ff5984a1a8c1ca4afb5534536775ee8523cd1
-MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
+EBUILD menumaker-0.99.12.ebuild 893 BLAKE2B 7056604320104a158ac866216548e7f4d74d385f5b04cebba13c8dc75b0eac706842a4ddb9f79df9f3718e5747f31d5e0b35935bfc42da7e49c6dfc06b6798cd SHA512 1a07ff69c1af53dc8fce9417d261e12a5c4a34cab82c704fec5e88a3371f7cb54bc7b475bfdc3fcd6ac45dcaea7c1a92692eb5de905b3e17d15fe5464a39bd17
+MISC metadata.xml 463 BLAKE2B d9fa2fb06c3c12064fccf263fcba9bdf6763c7d19e72fce75851694a978d18229a59dc6fb4e1d3744b094fca002bc115b9aa524460a43f8b806dbe3c5997194c SHA512 4963c8ee2ddbc9dd8ab2c6bc1a440e6eff3fb12278e0b281fc109ac4a90c1a283afce947068aa1bdc860f8a582296b7efefd753178a91c3694b86f1e6b799d12
diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
index 1bad651efc6e..1c1fad134bf1 100644
--- a/x11-misc/menumaker/menumaker-0.99.12.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE="doc"
 
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
index fd651f75dd2c..735d21bbe5bb 100644
--- a/x11-misc/menumaker/metadata.xml
+++ b/x11-misc/menumaker/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">menumaker</remote-id>
 	</upstream>
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 11de694075a4..8036541eda1c 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,6 +1,3 @@
-AUX mugshot-0.4.2-python39.patch 1369 BLAKE2B e006525dae248e4e8d04a01932f74371846c2757c085f5a0afc634f2c163c81918e6130ca796bcf122645bb7bd4e33348eea3ed0d926ff867028ab84641bf67a SHA512 c3868bec2772e7834bae8de87c2407986aacca1d32125631da92788ac9ae03e5a688b36ff6090792990f6c3163ecae1623eccd84349dc0099b4809258f14793b
-DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
 DIST mugshot-0.4.3.tar.gz 128500 BLAKE2B 88ed4a9a0efa70a14d90b831d00ad8c98d7c6dc4eff0e319e5ad08e904b0c0cf2c15bb26198f4ae1248e85959c08af165c9b6dc917dce35d986fdd73ff67eed8 SHA512 b5e91288b4de30124bd84c44b8f2a70e043af12e1f9580d07b13344b6c0343399037aadf153ea216d61cd12e4891ebb15557f1ad62c3b4d7c49584fa004ae65c
-EBUILD mugshot-0.4.2-r1.ebuild 1587 BLAKE2B 1a9e12cfa704ffdd94f1e5d604430235d0f310047b9c1fcc8f80d2b87066f67c17f8dd644313bd16eab075ded788e2016b2949484d14737bf40bafcd9707fe97 SHA512 522f910f8c4453cde563dcef3ba9a8f605bf582eb9ca6af491d3055b12bab8a6738221c276df914fec9662e7bfb3d9ac3a3cefb5e4b043d45d5006a500d5331b
-EBUILD mugshot-0.4.3.ebuild 1535 BLAKE2B 8008535ae4ece7b4d07589f88bb9aa7bf87f15953e9450d177669abc6b7828b967e796a20049de2ef25534c47bb2be8697cc2adf636ee30c51887f841c68ae15 SHA512 aed45e5798726e84a664ab168c7876847c74a0b987fe9f5295b2fe2d792ba53d8894e0cd51982e2e1444f4d6809dd599fea8270e1fdb22de22a98beecefd6ef0
+EBUILD mugshot-0.4.3.ebuild 1533 BLAKE2B 9ef49b35bc106191757cfde43ba1334c9d496d817d0174746bb1688d776a14f5665c780bc2deaaf50ff9abf4e421924b2475f88fdd1b4ed2b22811bc2d08556c SHA512 d34e6e05781b8843352996bc9cd95d11e9eafb302ffbabb83e84ed22e0d3048a62c319cdcf4ac7c7647fc991dd21a25c011fe5984952db62afd216c6a66b3748
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
deleted file mode 100644
index b0443f7a3d33..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643b3d005a8865c961b836aeae4c1f76711646e9 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Mon, 24 Aug 2020 23:58:10 +0200
-Subject: [PATCH] Add python3.9 compatiblity
-
-Starting with python3.9, launching of mugshot will fail,
-as getiterator() been deprecated since Python 2.7,
-and has been removed in Python 3.9. Using iter() will fix that.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- mugshot_lib/Builder.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mugshot_lib/Builder.py b/mugshot_lib/Builder.py
-index 7297541..6c08d70 100644
---- a/mugshot_lib/Builder.py
-+++ b/mugshot_lib/Builder.py
-@@ -89,7 +89,7 @@ def add_from_file(self, filename):
-         tree = ElementTree()
-         tree.parse(filename)
- 
--        ele_widgets = tree.getiterator("object")
-+        ele_widgets = tree.iter("object")
-         for ele_widget in ele_widgets:
-             name = ele_widget.attrib['id']
-             widget = self.get_object(name)
-@@ -111,7 +111,7 @@ def add_from_file(self, filename):
-             if connections:
-                 self.connections.extend(connections)
- 
--        ele_signals = tree.getiterator("signal")
-+        ele_signals = tree.iter("signal")
-         for ele_signal in ele_signals:
-             self.glade_handler_dict.update(
-                 {ele_signal.attrib["handler"]: None})
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
deleted file mode 100644
index d6005fd6a5bd..000000000000
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight user-configuration application"
-HOMEPAGE="https://github.com/bluesabre/mugshot"
-SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome libreoffice webcam"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/accountsservice
-	sys-apps/shadow
-	gnome? ( gnome-base/gnome-control-center )
-	libreoffice? (
-		|| (
-			app-office/libreoffice-bin
-			app-office/libreoffice
-		)
-	)
-	webcam? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-		gnome? (
-			media-libs/clutter-gtk[introspection]
-			media-video/cheese[introspection]
-		)
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/gtk+:3[introspection]
-"
-
-BDEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-util/intltool
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.2-python39.patch" )
-
-python_install() {
-	distutils-r1_python_install
-
-	python_optimize
-
-	# Since DOCS are installed twice, remove the wrong path
-	rm -r "${ED}"/usr/share/doc/mugshot || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/mugshot/mugshot-0.4.3.ebuild b/x11-misc/mugshot/mugshot-0.4.3.ebuild
index 6400bbcad709..2504ff5e3d9d 100644
--- a/x11-misc/mugshot/mugshot-0.4.3.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome libreoffice webcam"
 
 COMMON_DEPEND="
diff --git a/x11-misc/numlockx/Manifest b/x11-misc/numlockx/Manifest
index 12582151a7e8..a96f5cefbc79 100644
--- a/x11-misc/numlockx/Manifest
+++ b/x11-misc/numlockx/Manifest
@@ -1,3 +1,3 @@
 DIST numlockx-1.2.tar.gz 82703 BLAKE2B e874671fca1991c541022859bae6606d550fed66b4f40ffdd1bc2cbd74ce65f8148845014d7290db7fe7a333aad526ec186197cca989bac2b519915aa374214f SHA512 efaaa67e8b2723cb1e8461dde664f1f8e9b21f34edfe2e1135a6b756fa2843aed1a386f2f9d70bd62ddae9aedfeeff856a18da8b542f2cff440f93b38e5a853e
-EBUILD numlockx-1.2.ebuild 679 BLAKE2B 6d913530753783e5df7398079f1cc328ba2f80c0f6d68efc4be9b31afbde55f0ad0a6b6b09f5d1a65abcab60b0d8acc8ae29b628efd2bcfccdddd583d161fd04 SHA512 c0ef53d620ebca852c2ea8ffdd3e74d611af045734acdcb5efd5416873435a1f9daa9df92c71693ba6db7cf6ef2dcec83ff042ec31f136e9c97ff344a82422b8
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD numlockx-1.2.ebuild 696 BLAKE2B 26c868db36e1525dd6a9e99689d607fc10cff48c0890a5c66fda8a4549130c6d8c201a367a4099a4341a8232eb5a617eb8db86fb40bd02fe30d8c4e97053fd8d SHA512 f68f6d1349220159fe60efd7ef3888be5632b9c024cdd8daa5082b3eb25e0be14d559ee74a834a703662018d2ea0c5d64e415584918a20c4c99ec7520dec4cce
+MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
index 2ba8e9e851e4..d91810780a67 100644
--- a/x11-misc/numlockx/metadata.xml
+++ b/x11-misc/numlockx/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="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild
index bd6dcd1d7a2a..5d4050ff9f5c 100644
--- a/x11-misc/numlockx/numlockx-1.2.ebuild
+++ b/x11-misc/numlockx/numlockx-1.2.ebuild
@@ -1,38 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit autotools
 
-DESCRIPTION="Turns on numlock in X"
-HOMEPAGE="https://home.kde.org/~seli/numlockx/"
+DESCRIPTION="Changes keyboard's numlock state under X"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXtst
-"
+	x11-libs/libXtst"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-"
+	x11-base/xorg-proto"
 
 src_prepare() {
-	sed -i \
-		-e '/^K_.*$/d' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die
-	sed -i -e 's,@X_[_A-Z]\+@,,g' Makefile.am || die
+	default
+	mv configure.{in,ac} || die
+	sed -i '/^K_/d; s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+	sed -i 's/@X_.*@//g' Makefile.am || die
 	eautoreconf
 }
 
-src_install() {
-	dobin ${PN}
-	dodoc AUTHORS README
+src_configure() {
+	econf X_LDFLAGS="${LDFLAGS}"
 }
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 159b60f5fdb3..8d3741c8041a 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,9 +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.4.tar.gz 282581 BLAKE2B 4c9d10e2974200b3df05685e703d0fc5340d4ee194a4a01cb7a1ea6917e8e3b1a3a71849ef345eba416873a567bbf69b597b1a2dff679e17ac34b86f3e164c5d SHA512 0e01ef9284b2a66af3080e5b709f5220da07462dfa9b0836e2bdc275b4cf735245e5ede0eb404a9a73f35722ae455ec3b4ef525ad65362a2ffc607b73295eae5
+DIST polybar-3.5.5.tar.gz 282816 BLAKE2B c6bd7283fa30197446cc328f52b0d9ed6eadefaf6b19327898f559f860009b43d9923ad1d00bcf173f6a3663af6813c368563a9b59e91828ab8966aef722eea8 SHA512 f4174e82871aafcd890145eba472fc8c3055dafff4ea19123fa844d8bce2e85152e0e597496df8af257ef00d676e744249d204bb52668e3f303cc57a6fe3fcee
 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 1806 BLAKE2B c49575c6b2e1523b23ca517025ff23c0fd2c856635124dc86aa8d235195dd9b206870f337475289ca54b4d1748d9cc73f4a85fd690ff77100a61157f7c2680cc SHA512 7cd51352cfeca6a68e3bc7a168bdaf9a842dea5f03e6ce7d2a4e94945b861bf93aba70ffc91645e10406c253ed530b4ae66095c8bd2d119a9e101f6ca656621d
-EBUILD polybar-3.5.4.ebuild 1874 BLAKE2B ab49d503519e10845de63bcbd57e23dc146035eed3ccf971a2f060c16d6efc8e5f3d9017593676ad0156e968e07b2b8ab7d5c4f8e711f9c5f552f5e85d57b9b2 SHA512 b5d28bbe50719d44e72c589ae86ada209dfdf22e9d02c1109045c140ab2b6e6696dd1a98cc738122179b6bddcfbd0cdb3f7de921126a213d54da05965bd50d1a
-MISC metadata.xml 813 BLAKE2B f620aa54849e10ab8a6f14e78bb00b2cb17ec9309d032025833fef0aa3e339fe3236ca3a83abed185fa2f3098b1c3127f09bed4ff75d1f4de1999097112f8f26 SHA512 b7a4b4143245837dbfc14270b008f1b48b2b7c0746d16180cabe569d562709f41229d7028397c3eca64a5a07319441d69e3affe2b0851e5a6c33f5727608989d
+EBUILD polybar-3.4.3.ebuild 1845 BLAKE2B fabf5fd39f2af2c9984736d89742f955243f6c1c2736e4fd9258a637a15816396b9b0b2fe2f130804e687a6bd9592bc7e44249e3f5f4361a0ec3c3cf56068edb SHA512 56d9a0d5766b19a3c1beff2a61fdd842443e6d71e3147055bcc89fd70515fa922810595f1fd225555468b8054153d544db593df66fde8dd65c60c17ac8139925
+EBUILD polybar-3.5.5.ebuild 1913 BLAKE2B a836f322cc212bd9fd3eecceae17f084664c27470af84789c2fd963e4999ea9085f25914a9d944e6acb90f7c249fca13b2381fea9fa64c3dfef68699554f2230 SHA512 dccd5cb5885c065a0099ef24eaf88bf87ee6ba559d8f017c0dbf979c5a24e01a026bce635c130f17f7110bcdee530c434f299b7114f124951627579c27a6be1d
+MISC metadata.xml 690 BLAKE2B a67ba0ba7acc59f754a50d95fbde39c861a0253845f1bf965b82d3b7e9ebaa699ff12ea60ebb2018a6518d7b0fbd3baeed05ff7496d302932bfd11aa3077387d SHA512 16b3f3e709976ac75c8c45d8963d7224d34c36a452cc7beb18883b912abbc901336dc0d9576ccaeb94f4c28edef5bf951306aca4fce0ca163dfbb970d031d88e
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 37f978d5dcef..ba31ba3ca913 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -6,13 +6,9 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="i3wm">Add support for i3 window manager</flag>
 		<flag name="ipc">Add support for Inter-Process Messaging</flag>
diff --git a/x11-misc/polybar/polybar-3.4.3.ebuild b/x11-misc/polybar/polybar-3.4.3.ebuild
index a66e7c726bbb..86a472786934 100644
--- a/x11-misc/polybar/polybar-3.4.3.ebuild
+++ b/x11-misc/polybar/polybar-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,6 +61,8 @@ src_configure() {
 		-DENABLE_MPD="$(usex mpd)"
 		-DENABLE_NETWORK="$(usex network)"
 		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+		# Bug 767949
+		-DENABLE_CCACHE="OFF"
 	)
 
 	cmake_src_configure
diff --git a/x11-misc/polybar/polybar-3.5.4.ebuild b/x11-misc/polybar/polybar-3.5.5.ebuild
index 6fbf15046c64..e8f06439f9c6 100644
--- a/x11-misc/polybar/polybar-3.5.4.ebuild
+++ b/x11-misc/polybar/polybar-3.5.5.ebuild
@@ -63,6 +63,8 @@ src_configure() {
 		-DENABLE_MPD="$(usex mpd)"
 		-DENABLE_NETWORK="$(usex network)"
 		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+		# Bug 767949
+		-DENABLE_CCACHE="OFF"
 	)
 
 	cmake_src_configure
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index 8036a01a6697..d5d3e3d125b4 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,3 +1,6 @@
+AUX projecteur-0.9.1-dont-compress-manpage.patch 1117 BLAKE2B b75c1510f0c6561f935a7e7dba5a200f1b0a9cd0be892818ef1e5251b3d9ad6ac3e95200d90c2de6cf9ff38e61fe546560c3c2118eeb20e45a963b3fbfa4d2ff SHA512 ff3734d495ad94e0ed527cb2efc5d4627f45947ec9b75a960564b99ef6114ecd7efc260d1b1293db5d4835a8dc1450f322d8a6e3d1548e850d888d692580e425
 DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de
+DIST projecteur-0.9.1.tar.gz 392308 BLAKE2B 31ec19b81b9f3cf8c60712a52d3cf4dd96a215115d2fffc437892f276b9f1e6a58cf0c2165226166f0c2067f6ab2180829c8bc8204dbe368facbeef398da837f SHA512 28e0030a481dd2adb9eaba54066f060b61f7e4477918f46e25fad1e1a1c841dd5500c24779d66d3fab643e5aa39f92b0dd0c2fd7a0b80b8de8f258ae7572ed36
 EBUILD projecteur-0.8.ebuild 948 BLAKE2B e30b164914ed71a6cc887ce83281be0d6e948e2be9e95f5ca5c0862ef32ce101cc610c41ba61a55288b4264bfb380170c301b456275b84c113757ba0cf17be54 SHA512 8da018f746920cc16b9fdf2fe8c0bc4e2b4738107f4665dc109a37b09ad6037b7c1e365b343db4d1e3cf23f2f742773acf712e478c8ae5bb6e45a392ae3cf8d4
+EBUILD projecteur-0.9.1.ebuild 1006 BLAKE2B fcb8c7f029b6d2061e1cd1b6bd082ae10923827ea5cc23ac813b032ad1d1a455985b82b18e8c42d01eb2b52c9f3cc096f0c2a425f13ce4d7adc40ddc85138602 SHA512 0db45fe151406b4a3259e37d846bf464b3805621808d34b096a3133980a50f5fe1ade131892e9c50c631baa5fb1af2ec50b3a0eed2901df2edbf51c07765835e
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/files/projecteur-0.9.1-dont-compress-manpage.patch b/x11-misc/projecteur/files/projecteur-0.9.1-dont-compress-manpage.patch
new file mode 100644
index 000000000000..e7c96648e0c7
--- /dev/null
+++ b/x11-misc/projecteur/files/projecteur-0.9.1-dont-compress-manpage.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -223,14 +223,7 @@
+ 
+ # Configure man page and gzip it.
+ configure_file("${TMPLDIR}/projecteur.1" "projecteur.1" @ONLY)
+-find_program(GZIP_EXECUTABLE gzip)
+-add_custom_command(
+-  OUTPUT ${OUTDIR}/projecteur.1.gz
+-  COMMAND ${GZIP_EXECUTABLE} -9f -n "${OUTDIR}/projecteur.1"
+-  WORKING_DIRECTORY ${OUTDIR}
+-)
+-add_custom_target(gzip-manpage ALL DEPENDS "${OUTDIR}/projecteur.1.gz")
+-install(FILES "${OUTDIR}/projecteur.1.gz" DESTINATION share/man/man1/)
++install(FILES "${OUTDIR}/projecteur.1" DESTINATION share/man/man1/)
+ 
+ configure_file("${TMPLDIR}/projecteur.metainfo.xml" "projecteur.metainfo.xml" @ONLY)
+ install(FILES "${OUTDIR}/projecteur.metainfo.xml" DESTINATION share/metainfo/)
+@@ -270,7 +263,7 @@
+     # PREINST_SCRIPT "${OUTDIR}/pkg/scripts/preinst"
+     POSTINST_SCRIPT "${OUTDIR}/pkg/scripts/postinst"
+   )
+-  add_dependencies(dist-package gzip-manpage projecteur)
++  add_dependencies(dist-package projecteur)
+ 
+   # Additional files for debian packages, adhering to some debian rules,
+   # see https://manpages.debian.org/buster/lintian/lintian.1.en.html
diff --git a/x11-misc/projecteur/projecteur-0.9.1.ebuild b/x11-misc/projecteur/projecteur-0.9.1.ebuild
new file mode 100644
index 000000000000..6a27eb2c8109
--- /dev/null
+++ b/x11-misc/projecteur/projecteur-0.9.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/p/P}"
+
+inherit cmake udev xdg-utils
+
+DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
+HOMEPAGE="https://github.com/jahnf/Projecteur"
+SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/udev
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat all warnings as errors
+	sed -e '/add_compile_options/d' -i CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 78ca22a79a68..e0123488b1c3 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 1962 BLAKE2B bc23252d309128bd8fdb779de0dda0b9f134fc94ffdf1048a009d6b6a4f2542916413e42574ff7501c6e53f909691efae2f6f803830b96b23df0172a5e0ea9a4 SHA512 6f99d5f613d7bfb5b5b95403c7fda042aece00e769e4377efeb2ec23a5079045a641aeaa34b8d4269311caf190479ecc13ae2a88fb1ef475d4ae471f627d1eba
-MISC metadata.xml 664 BLAKE2B 89016dc7ae9944887a57ec96172466d5bdc79eb74822eb3b2c297e29cae4cf2bbddff8fa927cb8d1fd550264b6cd3c69f285945b716fb964c0d3b3121a646eac SHA512 1f68f19b095c7f6ae7ea5e1069438262e53548532f4ac7ce6f3a3344ad0883b82100cfb94ad667ad36c0397338c98279e9397f4154c52a88cd8d9c604f674fda
+MISC metadata.xml 521 BLAKE2B 48e57eaa040e23149fc74d4c0ea8a3f729ee821c4327c97d1b6d7c918217dd9c7fda01f550e30fc3860363363385deab066b783de7bb84d56b94bf86b11fbe36 SHA512 cac6d1cfa17f2ed7f697d39a56c5e322ffa70dec91db7319976ca459ac4250f52bd863236817dc26c5b13a6d68bd9db6146963a5ef9b261d607e5171970bd959
diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml
index 5d4ec1bc0245..5cddf109fd26 100644
--- a/x11-misc/redshift/metadata.xml
+++ b/x11-misc/redshift/metadata.xml
@@ -8,10 +8,6 @@
     <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>
-  </maintainer>
   <use>
     <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
   </use>
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 9b77261467ca..762a8004d76c 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,6 +1,7 @@
 AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629a6074ba0fe6624b929ea74ff11385e347f7c56a598b53937ceefa32e2db86daa17e89c03c667b481a500be752ebfd SHA512 0e863458e14b97a1fcfb054cc0072ded458da4d9c9bf237fc91aa4937b41b207f024bdceca59dc1703c75405520afca8dd55ec9ef69259d52c9430bcdf3c045e
+AUX rss-glx-0.9.1-c++11-narrowing.patch 1207 BLAKE2B 1b23dafe33b43f559859da3c4ad4395fab9bab556dd09261c5764257a7992b0cb29453646ae02c4791a378cb18671c3233fa1351bd60d7c5ae970309d3cfee3a SHA512 8c262ca79cd9bfd263576868b35dc0ad6444d15a10c6d550439d1dc87dd7eb7f8058291193479de45461b2610bc068be6b6a9e140c329383a3792ad15d73e060
 AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r1.ebuild 3696 BLAKE2B 81d4a20aa44dd47efb5806d1fe95b097a9bfd89992989915ee2b8801a0f1a6fb5e619d915fd8b7050766d163109c74706019e165c8e387cb6f8a1616c37517f1 SHA512 38feb06443545b1b6f40cfb62f6dbe762d0757d50199eb7a1b7e6e4c646a536f9b91e7b4cc95d7c6cb6560c4c53a09b448fa52f32e262d79de528b95697e4b31
-MISC metadata.xml 335 BLAKE2B 6ffac028e510fc7e26e03b19ba6b0cfb7b66e6461a26446a32235a75204e959a8daa694e9a41bd5df193af51d5dfd33b21b58afe4323b6e54bee8c87bf34ab6b SHA512 9496f0e4b0358864b2028e4b26d9da56d961b7c55fdc6f6c89e023613ec1155dd26472a98be99d24c9bad25606708adab551cf509c5f7a81d282f73b420ee138
+EBUILD rss-glx-0.9.1-r2.ebuild 3889 BLAKE2B 683b3438bac0a26d25624a9a5a25af79cac0664258ae3ae63c9864b2f2a7863ce19840d8a6005c43f2c33bdf8c1e68dac31a60a470b797015a05d0627a539650 SHA512 59e7144e04ac084e85288d7dfedbdb78f2a7d34ef49cc15354c9f3a0d26620edef94460732e841ab2466583d5d22eebc3270e402ed16c6bf78cb999ba5f0f67d
+MISC metadata.xml 535 BLAKE2B c0dac8ef95340aa65fccd3b160ad6c281c2e6286aa8fda7d29f09a7fe4a51336a3d48bcc85d163253f84ff53c70daceaa6d8a4ab7c58e358e9d9c619a20deb23 SHA512 e9b3ee968ad5e87435f9ed27f22a2e6bb9540799b3df496126910e2f5abc8e9a6328cc8dbff217f5a9f86c96f1dba603f835a3bfc481a4eb88b999ee27eaee2e
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch
new file mode 100644
index 000000000000..c92f1162dd37
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch
@@ -0,0 +1,22 @@
+--- rss-glx_0.9.1/src/hyperspace.cpp	2009-05-16 23:41:52.000000000 +0100
++++ rss-glx_0.9.1/src/hyperspace.cpp	2021-01-22 22:54:20.297572792 +0000
+@@ -376,7 +376,7 @@
+ 	double flarepos[3] = {0.0f, 2.0f, 0.0f};
+ 	glBindTexture(GL_TEXTURE_2D, flaretex[0]);
+ 	sunStar->draw(camPos);
+-	float diff[3] = {flarepos[0] - camPos[0], flarepos[1] - camPos[1], flarepos[2] - camPos[2]};
++	float diff[3] = {(float)flarepos[0] - camPos[0], (float)flarepos[1] - camPos[1], (float)flarepos[2] - camPos[2]};
+ 	float alpha = 0.5f - 0.005f * sqrtf(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]);
+ 	if(alpha > 0.0f)
+ 		flare(flarepos, 1.0f, 1.0f, 1.0f, alpha);
+--- rss-glx_0.9.1/src/flare.cpp	2009-04-21 17:54:42.000000000 +0100
++++ rss-glx_0.9.1/src/flare.cpp	2021-01-22 22:54:57.808305771 +0000
+@@ -193,7 +193,7 @@
+ 		&winx, &winy, &winz);
+ 	x = (float(winx) / float(xsize)) * aspectRatio;
+ 	y = float(winy) / float(ysize);
+-	float diff[3] = {pos[0] - camPos[0], pos[1] - camPos[1], pos[2] - camPos[2]};
++	float diff[3] = {(float)pos[0] - camPos[0], (float)pos[1] - camPos[1], (float)pos[2] - camPos[2]};
+ 	if(diff[0] * billboardMat[8] + diff[1] * billboardMat[9] + diff[2] * billboardMat[10] > 0.0f)
+ 		return;
+ 
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index 6cf8d17a20e8..a8d95d93452b 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alex.miller@gmx.de</email>
+		<name>Alexander Miller</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="quesoglc">Enable support for OpenGL Character Renderer</flag>
 	</use>
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild
index 2faf1cb8c311..61300f4958c1 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils multilib
+EAPI=7
+
+inherit autotools
 
 MY_P=${PN}_${PV}
 
@@ -12,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+bzip2 openal quesoglc"
 
 RDEPEND="
@@ -24,21 +25,21 @@ RDEPEND="
 	>=x11-misc/xscreensaver-5.08-r2
 	bzip2? ( app-arch/bzip2 )
 	openal? ( >=media-libs/freealut-1.1.0-r1 )
-	quesoglc? ( media-libs/quesoglc )
-"
+	quesoglc? ( media-libs/quesoglc )"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
+	x11-base/xorg-proto"
+BDEPEND="
 	virtual/pkgconfig
-	sys-apps/sed
-"
+	bzip2? ( app-arch/bzip2 )"
+
+S="${WORKDIR}/${MY_P}"
 
-DOCS="ChangeLog README*"
-S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-quesoglc.patch
 	"${FILESDIR}"/${P}-asneeded.patch
 	"${FILESDIR}"/${P}-imagemagick-7.patch
+	"${FILESDIR}"/${P}-c++11-narrowing.patch
 )
 
 src_prepare() {
@@ -49,24 +50,31 @@ src_prepare() {
 		-e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \
 		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
 		configure.in || die
+	mv configure.{in,ac} || die
 
 	eautoreconf
 }
 
 src_configure() {
 	econf \
+		--disable-static \
+		--enable-shared \
 		$(use_enable bzip2) \
 		$(use_enable openal sound) \
 		$(use_with quesoglc) \
-		--bindir=/usr/$(get_libdir)/misc/xscreensaver \
-		--enable-shared \
-		--with-configdir=/usr/share/xscreensaver/config
+		--bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver \
+		--with-configdir="${EPREFIX}"/usr/share/xscreensaver/config
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
+	local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver
 
-	if [ -f ${xssconf} ]; then
+	if [[ -f ${xssconf} ]]; then
 		sed -e '/*programs:/a\
 		GL:       \"Cyclone\"  cyclone --root     \\n\\\
 		GL:      \"Euphoria\"  euphoria --root    \\n\\\
@@ -81,8 +89,8 @@ pkg_postinst() {
 		GL:     \"Skyrocket\"  skyrocket --root   \\n\\\
 		GL:    \"Solarwinds\"  solarwinds --root  \\n\\\
 		GL:     \"Colorfire\"  colorfire --root   \\n\\\
-		GL:   \"Hufos Smoke\"  hufo_smoke --root  \\n\\\
-		GL:  \"Hufos Tunnel\"  hufo_tunnel --root \\n\\\
+		GL:  \"Hufo\x27s Smoke\"  hufo_smoke --root  \\n\\\
+		GL: \"Hufo\x27s Tunnel\"  hufo_tunnel --root \\n\\\
 		GL:    \"Sundancer2\"  sundancer2 --root  \\n\\\
 		GL:          \"BioF\"  biof --root        \\n\\\
 		GL:   \"BusySpheres\"  busyspheres --root \\n\\\
@@ -91,14 +99,14 @@ pkg_postinst() {
 		GL:        \"Lorenz\"  lorenz --root      \\n\\\
 		GL:      \"Drempels\"  drempels --root    \\n\\\
 		GL:      \"Feedback\"  feedback --root    \\n\\' \
-			-i ${xssconf} || die
+			-i "${xssconf}" || die
 	fi
 }
 
 pkg_postrm() {
-	local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
+	local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver
 
-	if [ -f ${xssconf} ]; then
+	if [[ -f ${xssconf} ]]; then
 		sed \
 			-e '/\"Cyclone\"  cyclone/d' \
 			-e '/\"Euphoria\"  euphoria/d' \
@@ -113,8 +121,8 @@ pkg_postrm() {
 			-e '/\"Skyrocket\"  skyrocket/d' \
 			-e '/\"Solarwinds\"  solarwinds/d' \
 			-e '/\"Colorfire\"  colorfire/d' \
-			-e '/\"Hufos Smoke\"  hufo_smoke/d' \
-			-e '/\"Hufos Tunnel\"  hufo_tunnel/d' \
+			-e '/\"Hufo.*Smoke\"  hufo_smoke/d' \
+			-e '/\"Hufo.*Tunnel\"  hufo_tunnel/d' \
 			-e '/\"Sundancer2\"  sundancer2/d' \
 			-e '/\"BioF\"  biof/d' \
 			-e '/\"BusySpheres\"  busyspheres/d' \
@@ -123,6 +131,6 @@ pkg_postrm() {
 			-e '/\"Lorenz\"  lorenz/d' \
 			-e '/\"Drempels\"  drempels/d' \
 			-e '/\"Feedback\"  feedback/d' \
-			-i ${xssconf} || die
+			-i "${xssconf}" || die
 	fi
 }
diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest
index 33192f96fa9e..a573b6ec31f9 100644
--- a/x11-misc/screen-message/Manifest
+++ b/x11-misc/screen-message/Manifest
@@ -1,5 +1,7 @@
 DIST screen-message_0.24.orig.tar.gz 348147 BLAKE2B f8973c1af5165fa21061c8202788061a78100c94325f9e3dcc9628ef0e02cef43017a58439cf1ebb49378b84182ca5a3b6650306e38f691c87e0ced3992f1173 SHA512 0553c43fc4357c756d2a6ce6dab7e8d3fa880faf90a4bee68b706a0cd8b2a0b92a2e77bd3930e473deaeca75afadcadd946cd3d5c9d116786a4bd0f5cee80506
 DIST screen-message_0.25.orig.tar.gz 348684 BLAKE2B 04d067b71b5d23862a8750a3f403938e2ec243bd25c79f601770b89f86ddcf066e05a3550c26be8479707d5571e67f187d5d556af6662682099f35e45704f1ba SHA512 30fb47fa0d0707c7219517df5384f559c4a56b5b259d2d1940b50e05834052142d97c8c776d9b22d52f2fe502b7bfe15ee5667f7d2aaa8dc3a29f5677560be41
+DIST screen-message_0.26.orig.tar.gz 347704 BLAKE2B 5ba40db417fbb391aa3e3be44dc5cf78cdff4117df4d22f5d790906a90f7a5a338ae7c20fb31bd60fdffd4ee6d332a5fb87643a4906a2b59ebadc3f4237e41b3 SHA512 3364c4b2cedbadc40c0f885b2810dfbb3b57a067288b8c5bacc62f76c68a5293a4d5215fc31717310526e0ae3fb8b791ceeacf958587dbeef14debfe9bd346eb
 EBUILD screen-message-0.24.ebuild 635 BLAKE2B c21bf30ced19da5ba1ec5aaf62eba64bd9c6877469b21dd5764765caafc094418695538dd9833f0ef85fe7dcc7f21f3d2bd2e1cd12a5f1b52df337eedcd13600 SHA512 15eed290a2f17d0856a86ba9abfbaf411439dc8d2bf0fee4148e4d3172b3cfc807ff8dbcaec468cfdbe5c2ef118a53aa4aab2aba2e6732a0d5e33d50e606e321
 EBUILD screen-message-0.25.ebuild 635 BLAKE2B ff183f3000199f70f8acb38403adab6c6a656572965c4a1d613397c2cfc5d4f81af2eb83d06a05f4bddc8e5d797c3252a3cf50d6d58cf4313a9b7845d172dd64 SHA512 524953611648ad4c4246b8b53cdd0f447ba4b0393e53f9821369864fc4e052aa85e5f21421af22a8e2b9b2f4298d5acbd27c365c6f2251744065fca38b1a66af
+EBUILD screen-message-0.26.ebuild 757 BLAKE2B 169e0b13afb49f419568b9716d49d604273c9b97f79dfa21500f68252b7f12a9c6050b388664e4a825f9404fc5ac0ff77c1a33fffe35fdf2b85c7dfc51443f7e SHA512 da2fb6485ed7f19b0a728ef34296636f95ac0e8c2444f5bc93a4f2d58ccdec70a45f1e9105237723ea33049277062d7b8dcd112059bf86f78fd99ba847a1da87
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/screen-message/screen-message-0.26.ebuild b/x11-misc/screen-message/screen-message-0.26.ebuild
new file mode 100644
index 000000000000..a68ba782d880
--- /dev/null
+++ b/x11-misc/screen-message/screen-message-0.26.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit xdg
+
+DESCRIPTION="Display a multi-line message large, fullscreen, black on white"
+HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/gtk+:3
+	x11-libs/cairo
+	>=x11-libs/pango-1.16"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	default
+
+	# It's not a game so let's make it *not* end up /usr/games
+	dodir /usr/bin
+	mv "${D}"/usr/{games,bin}/sm || die
+	rmdir "${D}"/usr/games || die
+	sed 's|^Exec=/usr/games/sm|Exec=/usr/bin/sm|' \
+		-i "${D}"/usr/share/applications/sm.desktop || die
+}
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
index 95e4376c7414..f04b60f9066f 100644
--- a/x11-misc/stalonetray/Manifest
+++ b/x11-misc/stalonetray/Manifest
@@ -1,3 +1,5 @@
 DIST stalonetray-0.8.3.tar.bz2 155276 BLAKE2B 68041239df7d3441f9abd279cec55ff11deb0ef73eb984be8ad2f0348285164c112918c9e850e5fd2a994144a0c84429164e9f46a0baf81a29ed763b750ffce7 SHA512 b1c50d844b6497b586c1ad56b721675690ea305a4e3a2601ab5305af0e208c215825eefa8fa374ae0c392252156a8dffd5882992c943344f5b6a674fe6553942
+DIST stalonetray-0.8.4.tar.gz 94614 BLAKE2B 4def696bbd580960f2d7fd84516658e4b4112b40989523840566d34dac71ba92e3adf021796059db919515cc978ac0c5d7783a4ed41aa9f82c8cbcfd00bc958b SHA512 3afdeb7794171f490c5eca631c574003a00bbed863b9caf4024e1b064772d3c24ea3836f280eeab1d50def67928f4d08d3d375047f43bcc39f16a3250015ff2b
 EBUILD stalonetray-0.8.3.ebuild 739 BLAKE2B 365dcb844b7dc3c4ef8c1f08820ffe8f053e85e571a9c8623846fa8d2d4c992fdc98363990662f4cb80e2a44a2272c53f016669c1df97b874a0fe4cadbcf6603 SHA512 f73ad0d89b6510e46aea2fa3c4bf2a65ca1ccfc099d2542badd7e313a0619a1558956bc006c6f7c02846ed20ca079b3ac0c215a7aa14c5c33071812ac7959a91
-MISC metadata.xml 349 BLAKE2B a976992a09bcdc6d1f77a622bf627ba6732f771c4bb24f40c86b7f2c116edd28ca16401972cf91e39f3295dc5b22196cab2d91b0b61068e0ee2c0b02173cc8a4 SHA512 7bab253de4f5d8b158baa40e02594ffea15297c6431f838aca05a05c6adbf310ea21f9b2629e014530b78fef89f848240beb701e61de770db704ad85ac0be4e9
+EBUILD stalonetray-0.8.4.ebuild 852 BLAKE2B 27b96f95977d3d56b626c201e1eaefe42b23d7e1b73f37aa14fc9f5ee941ad802283fedc802207d934f1b1bb2aa4fc9b3854dfe13824c2411bafd0d62bc23163 SHA512 032c70b8aaa9ca28417a25a41cbdcfadd6dd0ea895b1f43ca8b198f8362f3d45bf615918b2f7ebd70a29194d78b083da081171ae369ef1de12c0b592c173ff64
+MISC metadata.xml 540 BLAKE2B 5b02c34af08f200811ec2ee2cde821e190b9b01eb2419a5e2dd89d6fe626919aaaa069c620445d58922fd717ff406f73ca86cf8a70d78abaab6cbd002162ebc8 SHA512 a02f795724207ba946ec1a2e989599624fb201c5e2ff691aa888b1615f2a26ae97ffb19247aade811dc1a0b0979ed1a016459b6f7df6078a0b4547a9be058c41
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
index 5f630340ef1f..c3b369f27a31 100644
--- a/x11-misc/stalonetray/metadata.xml
+++ b/x11-misc/stalonetray/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag>
+		<flag name="graceful-exit">use non-portable hack to exit gracefully on signal</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">stalonetray</remote-id>
diff --git a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild
new file mode 100644
index 000000000000..602d6943d3ad
--- /dev/null
+++ b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="System tray utility including support for KDE system tray icons"
+HOMEPAGE="https://stalonetray.github.io/"
+SRC_URI="https://github.com/kolbusa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +graceful-exit"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="app-text/docbook-xml-dtd
+	dev-libs/libxslt"
+
+DOCS=( AUTHORS BUGS COPYING NEWS README.md TODO stalonetrayrc.sample stalonetray.html )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable graceful-exit) \
+		--enable-native-kde
+}
+
+src_compile() {
+	emake
+	emake dist
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index bce180919e2a..03fd7c1765ec 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -3,13 +3,16 @@ AUX synergy-1.9.1-cmake-version.patch 2136 BLAKE2B e96bdfdc278e818be0f46eb2bef7d
 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-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
 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-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
 DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564
+DIST synergy-core-1.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
 EBUILD synergy-1.12.0.ebuild 2575 BLAKE2B 577b7b30f0319736860560ae50d89d717a2a55d29bd9afc49bdc44213477cbd24f8659486d84b3719d452a294d73904bd9f2751f1cf1ab3f1d91cd14ca76bcd5 SHA512 9accf85f2ceaef3b35879ad81471e57d4c699b3a0d81a94d756b7134fb51ae25f045614ca42ab0de545917f8590c5f91a57a4f4b6c3c7e17853cbca09195024b
-EBUILD synergy-1.13.0.ebuild 2411 BLAKE2B 2c087da1de993059611347140c8671d3cca039733ed985c28171d4b42200dca7489110cb33797b07ca87619f4c495f590af27692d9a22258f54738f02cdd5b2c SHA512 b21d69b829c6e0ba251750ed662fee7247eb0608bb6a824994757c7361859cbca293c89f6e137ba19fcc1ecc73de5700374a5db43590028fa39081add2c283eb
+EBUILD synergy-1.13.0.ebuild 2409 BLAKE2B f8d4f0ddeeba670c03d5607514db85ff146c558ca3ef4c8cc4613ee65018183b9b211201a6071a8ec6c1fe046a29b72e09933adb360b171d1b44d91de224d1a5 SHA512 4924b2d5c07ba3b450113db193aa31bd29248b99477449047f135ec30d6618026b338b055e49cbf76e9ab55df1f5d822ed944be9b7092e2edb33238142372964
+EBUILD synergy-1.13.1.41.ebuild 2478 BLAKE2B 99d7561e57104353b8f380edbbc2807fbcb0fd351f8e744bbef79ccda6e94f330553c2ccb855a65e298921bcbad8c36b5f493f9e35b34c96f2a814c926521efb SHA512 b7ea8abf7321baf6128cd45421676f2c5fdc136a7e84d496a3720366df97dd44a045b79dc4414359c77c6d15976399f64e637b8b3ae29240d78bb7ec1871600a
 EBUILD synergy-1.9.1-r1.ebuild 2564 BLAKE2B 5c4ec4856bef497f2b91275f74cc10244eef9bf7ee8d840dfa718a7bea971b5564d82589483a2eb3b65dc7ea01a9e856fde11b224efe48f5eb803f66f2cfede6 SHA512 633e27d190523b7f1609631cd2c3eda2f0ca921286e78f8e9631fbb2053349b24601bbfed5f86632f5d8ec3a00910629e70d55a0a7fb26a6dfe784aa5da5a0ad
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.13.0.ebuild b/x11-misc/synergy/synergy-1.13.0.ebuild
index 6f472773fde5..016540c6c84e 100644
--- a/x11-misc/synergy/synergy-1.13.0.ebuild
+++ b/x11-misc/synergy/synergy-1.13.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="libressl gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/synergy/synergy-1.13.1.41.ebuild b/x11-misc/synergy/synergy-1.13.1.41.ebuild
new file mode 100644
index 000000000000..62beeda69bf5
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.13.1.41.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 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=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6
+
+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/${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 ~sparc-solaris ~x86-solaris"
+IUSE="libressl gui test zeroconf"
+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
+		zeroconf? (
+			net-dns/avahi[mdnsresponder-compat]
+		)
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
+
+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
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYNERGY_BUILD_LEGACY_GUI=$(usex gui)
+		-DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DSYNERGY_AUTOCONFIG=$(usex zeroconf)
+	)
+
+	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/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
index b15d35dcc16d..f48208f67fae 100644
--- a/x11-misc/unclutter-xfixes/Manifest
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -1,4 +1,4 @@
 DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
-EBUILD unclutter-xfixes-1.5-r1.ebuild 608 BLAKE2B 0595141d50ea69ce9c9d917a716e59ee6224352afc677189483e6516657e70e72221aaf2ab28537bc0b762f7216354d3398c328dbc99dcbcedce8ddf32ef816d SHA512 6b4233a6d69e71bda7b19aaebb4ac74827c75eb06389b1f82b44452f0953fda1aff541330b5e56f40bd05eebc86c4edeeaa3b0e2786f2e252ea6a3fed6d113ca
+EBUILD unclutter-xfixes-1.5-r2.ebuild 728 BLAKE2B 14909fcc62c7e3e4cf50b6aba2b774158519a30ebd57cf2f7814a4659a2d6b15dade0f73ce88974125d107030573d23bff4bdea34c7bdbfc7889ae57970b159e SHA512 1dc96d9e81d8c9a60ec597bcb86bfbbcfad53500016636375918b90ae66eb45c20efe22a19f089ffae482ab0caa296a14205ff4149de97079c786b8f61461c75
 EBUILD unclutter-xfixes-1.5.ebuild 596 BLAKE2B 41d1f95efdbb17ed54b50761df21021c20a863fc70eda72948f7e590690d608fc23284f7635aefa935d85abf4c767a01056ccb2cefbd569a82cb6492879e93f9 SHA512 1f6a8675b04a66a9c9355be297d4e90074071c3b1f2d854749074ca2dba4396fb3fa70a7623caca5243d67073be7601966ace08e0d467c243bcc756972665078
-MISC metadata.xml 258 BLAKE2B 04a59fae336050f9b98d9fb78a883299aeee3969b8667159b3a01c518ab35768ea19f8b1f95e77b1da9e4431230f57a7a6fa30657fb2f84eeead9b0cf61131ac SHA512 5902ebe4a72169c10cbb7434b499767355723dd1322b8ab2146772926c97fe6fc64855ef75c2bb3da741cb8a3b2ca8981bc003f2a3e7aeeb1259eeada363efbf
+MISC metadata.xml 455 BLAKE2B 90cb58bbee37289b4da917dc29b8b76b4c6de8a8b86050c32627af103f8808560f2e569a7f8795abe36ba0ad3f0e132b85c6bb948dac58ebf43b46c2ab0a3868 SHA512 2f74be1a739a0479bcc7223bac9ca84a651c911d544c2ed022845b634013a5fb12839f0782de59c61b504a0a4b3a69ad79365f8d4bdb9cca379fae2896ab3fcd
diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
index 3b4eb9e4c1b1..08d4fdedaadc 100644
--- a/x11-misc/unclutter-xfixes/metadata.xml
+++ b/x11-misc/unclutter-xfixes/metadata.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Airblader/unclutter-xfixes</remote-id>
 	</upstream>
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild
deleted file mode 100644
index 3e79355700b4..000000000000
--- a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A rewrite of unclutter using the x11-xfixes extension"
-HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
-SRC_URI="https://github.com/Airblader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libev
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	!x11-misc/unclutter
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r2.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r2.ebuild
new file mode 100644
index 000000000000..7a792328069a
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hides mouse pointer while not in use (rewrite of unclutter)"
+HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
+SRC_URI="https://github.com/Airblader/unclutter-xfixes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libev
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	!x11-misc/unclutter"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin unclutter
+	newman man/${PN}.1 unclutter.1
+	einstalldocs
+}
diff --git a/x11-misc/urxvtconfig/Manifest b/x11-misc/urxvtconfig/Manifest
index 5ff8a307f491..a550a451ad07 100644
--- a/x11-misc/urxvtconfig/Manifest
+++ b/x11-misc/urxvtconfig/Manifest
@@ -1,3 +1,3 @@
 DIST urxvtconfig-1.0.tar.gz 17910 BLAKE2B bb51bb597eb7ded519a5e31e6b2a019076280dcb7315d5f028aaea0f1732a478135b8484207a46787e4f428d2ddb61d6c9ee5b82c87e2b40461bb1739255e91e SHA512 c52d5d23cf00cbbe9d3c3d22ec137596e5e3ace50a0c5aac9ff0c95fe52a00c232069dfb3ebfb712db0d523a46fdff613a0f0b0081203ca0ab1a444f496e4193
 EBUILD urxvtconfig-1.0-r1.ebuild 819 BLAKE2B 822fc7d140ea03be5a7a259cb1f9515da7f85d1a9782996ad0d2942ef9797b864eb38c1ec4091b9d8d2c2f3594a6a1411f328e92d3548fc7efdbf043bf6f05fc SHA512 ca61efeb269a7f3c2e701dca480050dac784955f09b1a1b1c50f6b2ab67c126bfb1612dc7b39ab7abd1fa854e5263ed1bf11826c94c795519af506c6ccef6d96
-MISC metadata.xml 451 BLAKE2B 1f4f4afa346653cdb31be6b682143d979f0ce610dcd12f76cada65a020e32197bbb9684c6ba38c2ae61bd9e8687518c9e6fa3cd718b21281a0971f26496d6854 SHA512 8d356897a2ccf8ab507eb95c9724c93d33ceac1d564598445b2312e7edc5dc08be2e0890bc175ef0c222df3f917cb7a1bab4224ac7557db40016315310b2c1f0
+MISC metadata.xml 252 BLAKE2B 09394fc19bd10c400752818c3763665331458d650bdf0de1f77bc9532cab6f537d7da647873d1977823254e2d8dc140f55eab80265dd628148dd43d5a7d9890d SHA512 b39cb2392e43ad575c66746021bb52377de026d3ed345fed4da57591d9f652977e5905b94cfd83bf42d7903dafae5a8fb47ebba4e9b8e63197fe68e59d9724b0
diff --git a/x11-misc/urxvtconfig/metadata.xml b/x11-misc/urxvtconfig/metadata.xml
index 3ff8b3dc6ff2..762136a35c34 100644
--- a/x11-misc/urxvtconfig/metadata.xml
+++ b/x11-misc/urxvtconfig/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>eckertdawid@gmail.com</email>
-		<name>Dawid Eckert</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">daedreth/urxvtconfig</remote-id>
 	</upstream>
diff --git a/x11-misc/viewglob/Manifest b/x11-misc/viewglob/Manifest
index acf6d71252c1..138c96c4f96a 100644
--- a/x11-misc/viewglob/Manifest
+++ b/x11-misc/viewglob/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo 550 BLAKE2B bcb14571e6403904ea35a0e8acf030986a7509a951921cb353
 AUX viewglob-2.0.4-format-security.patch 1112 BLAKE2B 6fd80a43df9a2dda0e45fc993c27e70a0edd46fd02e189a01f0ff4625edb8033c57a72a0a368219f9c18271ef571b6f1a44bc4932921e439bb0a1259ac635d34 SHA512 1273b51c4a4bf67c53630965d641a95d30916026e8307878335bac95cb1982c3d3705954a3caa600eef27b41c8319131fd00ac8fae5fc85707be90409e064945
 AUX viewglob-2.0.4-underlinking.patch 5015 BLAKE2B 721edfc97a630d303d56ec8df26c7a8ae153e01cb35f3815b9bc2479472e24d12afe225b8f28385b6055e7a2b2dab84734d27825afd0bbbfa995e404d65e527f SHA512 3dacc19e362bf5e69348eff097daf55c25bc4b9d3afe589ad49f28f01394da29f365708a15ce4c662918daefed95cb059b9d45d44b8269118812d5945a2997ee
 DIST viewglob-2.0.4.tar.gz 324752 BLAKE2B 149b6e6f6e6cc825407724c227295ad744b5e5329ff0a30d3d2b069920be06d80de8898bf56a47f9cc6fad4f9ef650469789e4228f18ba7eb287863bad21ef7d SHA512 95fb5ef6dc412804cbff6a961ec08bf8e114eefb9ea5430aa1be2f8b2bcbb7e76ab8392e31148d4275debd6f4cada81d1ebfb08a741b8a579f749efdb8f7adb4
-EBUILD viewglob-2.0.4-r1.ebuild 726 BLAKE2B ccb106673b64978a2e668b87195d9651ce56a1763db034dc3aa6da7e4130f4c1ee64d7ecc87ffa6a397eaa0907317b8a620ff01fb814319f510efdec05bc866a SHA512 c3ae299f14a0d9959c1e8556708fab4f50c474428a76cd1f5aea7ee7caf5350bbedfc0c3609c159f24ae3a7de4c19861e92c1812caa7d6a597b0ecfe202c03de
+EBUILD viewglob-2.0.4-r1.ebuild 763 BLAKE2B 383c68d8637fe122c0a73e8c2a00543d7acb9412a8e8a02ed1e091875d2ba0a4ea06a29f7efd468f495c11df3b80b8fbf3f0ac6f3bf64ca735819d6a4e71e5ce SHA512 d23dd165bb1b6e566dc1258b87dc90ed70430dde2e3fc06a5ec062a790de88328f4f637a7e7b6b1320b76c9dcfe72ac9ab1b5b4366963ea1035931f0d4d2300e
 MISC metadata.xml 730 BLAKE2B ca1d66271877923f1e4cb69468387dfb5672ecbfcac5769f71e1ccf389975a704fa7974a804696b531dadfc056b8fe329671dd77b0db84f208170a8a7f054081 SHA512 070d4c7e6902ca6edf386cdd8dbb59b2a6a3bd59852505f220a8da478630fdad0ff0004bac1d6055f860ee10ad7497ed50c17fc93221bc43e134f4ecdb37c1a3
diff --git a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
index 002f4494df2e..ebff9e4c1940 100644
--- a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
+++ b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils readme.gentoo
+inherit autotools readme.gentoo-r1
 
 DESCRIPTION="Graphical display of directories and globs referenced at the shell prompt"
 HOMEPAGE="http://viewglob.sourceforge.net/"
@@ -14,21 +12,31 @@ SRC_URI="mirror://sourceforge/viewglob/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:2
 	|| ( app-shells/bash:* app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-format-security.patch
 )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_install() {
-	autotools-utils_src_install
-	readme.gentoo_src_install
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 9e25c8d28c8a..f6508ab495fe 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -5,6 +5,6 @@ AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86e
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 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 2930 BLAKE2B dc45078b746e7d88ee1d3dc749975d48a9a1c5cbd9a88d94c76b04378f7d66a5106240e3f845a102ff56a35363aeb56c241883653472901f4acd74ac0d83920f SHA512 2b18743822305fb59ba1a5c6b57d4dc64cbe083390235712073d0d01a63f22fb56d7fe938afdfbedbd48427cad42a5d9a0d34ae9a53ec6dc4aeea5354d0c2866
+EBUILD virtualgl-2.6.5.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
 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.5.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
index 38ff0e247462..f537ef884323 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
@@ -14,7 +14,7 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 4604aa36d3f1..7709b1809c45 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -5,4 +5,4 @@ AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375b
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
 EBUILD wdm-1.28-r6.ebuild 988 BLAKE2B 42e455e0b4f7e0608eef95bc9db219b0e03a705e7ec81f7f4d9e5e460a09df33a7a403c67f05dc7b33f73ca16aecdc647d2415686722ed7bb115435437c2c84f SHA512 ba47ee3377bfdd322f8ee98392f19577d6995fb8a19774203e3caa1baa56cd5060744c1bf41bb9929a5e0f9016d63db77eebaa610f3c9b98b490250b4b59d8d9
 EBUILD wdm-1.28-r7.ebuild 1161 BLAKE2B 18d4fef0721d2b5ac7747795499c627a0b407a241d3ff556a033da82df248e2cc97891c22c709462f2a7ac2c5b843d4f63abcbb4436a1fb838f3e42a319b6181 SHA512 856c1faa33092f9111c215b2b10c4c55c8ddfcd0ffed3ef34c0bedaf6919b8a9dcb8a36e09620cd38d872be3ee5f148c54f6e0a0e630e2b3d67c4dd92f1c51fa
-MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
+MISC metadata.xml 241 BLAKE2B 971b1982f989fa94652f2545819185817501b44df93faf3584c6e763e6a2f02986af3e1e50832285a76305951f2c2ff6365963c8a703552d08f4e31f54a4881e SHA512 69338f79909dea3282489af1890b31cbab95afd2eb66a30c76a68f266ac3d4775403d0399ee417c13f6445ff5a10d4dc866bf270ca9936da41278bcd27ab7ba1
diff --git a/x11-misc/wdm/metadata.xml b/x11-misc/wdm/metadata.xml
index e26a95188b76..433464f2afed 100644
--- a/x11-misc/wdm/metadata.xml
+++ b/x11-misc/wdm/metadata.xml
@@ -1,10 +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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">voins/wdm</remote-id>
 	</upstream>
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index e3aa1649e35d..c18720d944a6 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
-EBUILD wmctrl-1.07-r2.ebuild 592 BLAKE2B a9f9e1a4c4ccc5320b852a66db99bae03b29b6a6cedd11d6b064a285fa170bae08e554f35a9b6b701283b00766664fb9d6105ab6c6cfb1ca6b9cf62d9ec1c1e8 SHA512 5fb13c999c00b2172c6c91e8bc9cd0753a5eb7de15cb0009d17c2541609139f7b37ff93e41fdc7e16ecc780ff1cf56c2f738b6b68ceef81025b4fd684f022904
-MISC metadata.xml 725 BLAKE2B 51248fb91da3dd937aaf5635c0593fd6ad53382f697fafeb12e489ffac96ea397dba3fb72a6ee0d7eefcedcd7af764dd7ab39d5a3bcb6870d928864ed0d71281 SHA512 40ab1356eedf0c9df493bd7647e789b60d38c49cc7d859605ece25743867e9b75e4083f2dbd71ff61422564e6d4172ca9ba02061e35cbef2ea885248abc8fbd6
+EBUILD wmctrl-1.07-r2.ebuild 590 BLAKE2B 6171168a8a9b176fa96fcd2cd376f38ae7928d8ac5a3c665fcb29eb66dc156829ff67e7265611b71f25411af3e8b5f7823e6a86dc926b6d1becf2117f9e8b11a SHA512 4bf9e402e54260433781c4d54f280686398f8faa415c914c7965e43c190b0178437b8c5612a8d525cef52e36089ec9f74aa0bb07b399728d32b5bba7ef7b73da
+MISC metadata.xml 364 BLAKE2B 780ff95eef4ae562c2c3919a6df525aedb055b94ad2faa57957b91010c9051b6503a9dd9d3d52c7dfe501a815b560bb76955af2d7f8ce96ca67467d9c1b67735 SHA512 aae50c8a6e6080b64b08ccf066821ac3beb51495bb727e9e4dbadfe60f5a9c1b73b575553dc35a0f696e70210799caa77ce6492f002fee9cd9b8afb08d18942f
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index d8d016215398..d91810780a67 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		The wmctrl program is a command line tool to interact with an
-		EWMH/NetWM compatible X Window Manager. It provides command line
-		access to almost all the features defined in the EWMH specification.
-		Using it, it's possible to, for example, obtain information about the
-		window manager, get a detailed list of desktops and managed windows,
-		switch and resize desktops, change number of desktops, make windows
-		full-screen, always-above or sticky, and activate, close, move,
-		resize, maximize and minimize them.
-	</longdescription>
+	<maintainer type="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
index 338af72ad91e..b5f3984fc9d9 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
+DESCRIPTION="Command line tool to interact with an EWMH/NetWM compatible X Window Manager"
 HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl"
-SRC_URI="http://sweb.cz/tripie/utils/${PN}/dist/${P}.tar.gz"
+SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE=""
 
 RDEPEND="
-	>=dev-libs/glib-2:2
+	dev-libs/glib:2
 	x11-libs/libX11
-	x11-libs/libXt
 	x11-libs/libXmu
-"
+	x11-libs/libXt"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
+	x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 05fc69221aad..0499b68ad2e6 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -2,5 +2,5 @@ AUX xbindkeys-apply-mask-on-release-event-status.patch 986 BLAKE2B fb8cd2b05f2be
 DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
 DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
 EBUILD xbindkeys-1.8.6-r1.ebuild 701 BLAKE2B 1b72bc9693648a4eee6c6233b5ae8505f73fd3181c73436f77a8ba6a7797643e56fc34ebc6b23bedaf7011163616ad3c837d94a4b7f77c5141720fe34d4c701c SHA512 c9e3d967375a19566a3c89407105faaf2f28d85113c0c61f91a1f91c2f25f682ed3743e99c9913e6a4e2bfc675171a5858291a0a681a26caa9b68eaa8fa6c7bb
-EBUILD xbindkeys-1.8.7-r1.ebuild 692 BLAKE2B cf9c27caf702264aa33a0e51f777bc1abc20b6426e3b80710919a064d947231b7844bd9d78f80cef52ac40836d97ce8b61975708cb06ff4fdd0930ebf906b5a6 SHA512 42750081b5d0d09778ec062071b47fa83407e91420ee55a709a424b308553207550d5f57ac5fbdc3b1dbdf5a78e38660bc3839e620d33cab8fabe52cb318efbe
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD xbindkeys-1.8.7-r1.ebuild 687 BLAKE2B 9426e2cb06298cee3f8c23758eb396d4abe99679cbd3a8bed9e8cc50725d65a57a80b170daa5d9829ccc2fad8fc14610512c0adb5e137071d7f79c0a6fc1cd4b SHA512 298ac5d7baf674b5cdd3bba28c59a9e1bcf8b750443d8ccb6c60c7982d4f1bda9d44115b39b7d9942f9549451eebd7402ad935659906196b919ea131174086aa
+MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/x11-misc/xbindkeys/metadata.xml b/x11-misc/xbindkeys/metadata.xml
index 2ba8e9e851e4..64b17e08bff5 100644
--- a/x11-misc/xbindkeys/metadata.xml
+++ b/x11-misc/xbindkeys/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="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild
index 28112e839030..70e4c2c73c49 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="guile tk"
 
 RDEPEND="
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
index 9de34a474f39..06cfb56f2f51 100644
--- a/x11-misc/xearth/Manifest
+++ b/x11-misc/xearth/Manifest
@@ -1,4 +1,4 @@
 AUX xearth-1.1-include.patch 231 BLAKE2B 803cdd036a1018ab85bd3acc30a6f6168a3596c04dd7de7196983b6c53b10e443d2ed043f61faa35b1ab87f28496f5865f128008b604efed41a74af3effc0d0e SHA512 9e4fd1d44eeda5c79ab22ceeb20fd005cab71869bcadd17adcb1cee10157c35145e7c7aa6d3c62f3da1be83cc79763b9ad77cfaddd4021dbcb56c8efcbccadb7
 DIST xearth-1.1.tar.gz 157887 BLAKE2B 2dfc43b1a8fadeb7d30a4234496f44171cd138975e84b295e60d0f9855c1f3b011340b2b3aecb98d75fde2a71fdddb4e959ba84e89204f246915b7cd1a76efc1 SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
 EBUILD xearth-1.1-r1.ebuild 873 BLAKE2B f3ed79afb2306ed7b166e00be122ceafb5a0affb325b78770dbec8e50a654a02f117a2c1064c15751bf1ab4e02b80d9c95b10440aaace158437d940d2c3af304 SHA512 c0f06f7772dfe7f7ffff190121b0bff693bfd286d7709ce4d4967445839af33f23488b0094cb46d5976a8b3ba52f3707f3922ac24443b43c4beb825d79ebe368
-MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/xearth/metadata.xml b/x11-misc/xearth/metadata.xml
index 66187a0f4213..7a38bb900964 100644
--- a/x11-misc/xearth/metadata.xml
+++ b/x11-misc/xearth/metadata.xml
@@ -1,8 +1,5 @@
 <?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-needed -->
 </pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7163042fafc6..7858b525db5c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
+DIST xkeyboard-config-2.32.tar.bz2 1742570 BLAKE2B 98374e1bbbeaf24268754df8f050c663f8d07cec770c8bb86cb11bc434f6463acc9221b75b8f5dec79c8e47ac9e77deeb919a8bd3377ba712aac1fe1ce64ccc8 SHA512 c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
 EBUILD xkeyboard-config-2.31.ebuild 1333 BLAKE2B c6bf1fb0084586a9d95df72346513dff5ed4f3d592bd44b7cfa9ea07305bd7a2583860d9d8b6da5dc8981566a0b18d351414b2364413445007a68fa2c9136019 SHA512 2d7aa022a267c5d660f92840d7d967d2b81481d031098ad42f8bb8c74cd215610ee8efd8408354d6b58d9871aaab01f851f4e5dc90a690ea93992c843c8db266
-EBUILD xkeyboard-config-9999.ebuild 1012 BLAKE2B 515c5f2dd3cff20373b451cc600032724c4f70a4ad5a4cf218144c32705f1834423ac4110ede0d3aeeb31d32fd6074c3fda4dd1f749c3214b3d6697ef3ea4016 SHA512 4c64889a4a37659bb9e2cb28a1c8d281936205956b85fde55a0f44235c44c4e515d89a92bb00b9fec698d45d41ee21bccd27fa502f276d5538f9ebced131017c
+EBUILD xkeyboard-config-2.32.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
+EBUILD xkeyboard-config-9999.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
new file mode 100644
index 000000000000..268d593d98c2
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index f4ee985f231c..268d593d98c2 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 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 ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 512ca0eeca26..41efde59807e 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -3,5 +3,5 @@ DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc3389
 DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c17aa89db36be7325f4f1caa1ab84a1ad386041841a0aacb62208fb5d59f5dd7a9d2bf071c76dff2901eb2c60 SHA512 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1
 EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
 EBUILD xosview-1.22.ebuild 1197 BLAKE2B 286bcd6eb9c228503ef7c1a55c88d4ddc5eddd82dc5e7121e0b3de69eeb2a7e79ae4940bc6812ca45965453890e10ac9d23555a586a761718da215fa0cc6cb54 SHA512 adc133196baa2f683241501e5f06e5a20574d36c6d783b7e20cbb58d3f334a08050ededaeffdf46118fc6e70d09daf242eebf30814fb6c749d8e94d3b39e69fd
-EBUILD xosview-1.23.ebuild 1201 BLAKE2B 6917cb2ed19336bd273fe0b7f4420a9a4c0c87e94b853a6e732db752c2b153166bcb499bbac29f225c6963b258350e160e7d498ff21aae448bc2c649bdb47b7c SHA512 fd72ef633909602cd40bfe7a695bd51565293fe422a2763390b375506fd82a82255ef1983ff8637b3a0223b7f58fb1dd20a42d546ceb6d35ae185f1af5089ce2
+EBUILD xosview-1.23.ebuild 1197 BLAKE2B 286bcd6eb9c228503ef7c1a55c88d4ddc5eddd82dc5e7121e0b3de69eeb2a7e79ae4940bc6812ca45965453890e10ac9d23555a586a761718da215fa0cc6cb54 SHA512 adc133196baa2f683241501e5f06e5a20574d36c6d783b7e20cbb58d3f334a08050ededaeffdf46118fc6e70d09daf242eebf30814fb6c749d8e94d3b39e69fd
 MISC metadata.xml 402 BLAKE2B b3cb5abdce2b509c7eaedc1dd22c04766c9993a2004e4f39985a120d4fe8ddd4ea961ad96b8e7e74f388fce7a3785d3f513a6527e921a5357c0ed7ea9d38cb41 SHA512 e4cb48ac26181681bf80b100a8b479e07218d297770f15fc096b60b2fc8bb66278e9c4181d11b5716abe504fc8ad40be942fc9b0496fd4cc4223da77cff55154
diff --git a/x11-misc/xosview/xosview-1.23.ebuild b/x11-misc/xosview/xosview-1.23.ebuild
index 43582f7a181d..e47a5770c69b 100644
--- a/x11-misc/xosview/xosview-1.23.ebuild
+++ b/x11-misc/xosview/xosview-1.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 011a3c70eb0a..c20a3cd02164 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -17,5 +17,5 @@ DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 EBUILD xscreensaver-5.38-r3.ebuild 3456 BLAKE2B 8b763b46b36728f636b6bfc431592d135821761fb9b626c5ed350192a64e9d6ece37ae000f2e39eaa88f40dadf68ac80ed49b29ccc6e2c4d589b1f40a2286486 SHA512 a17fbf3f34ab8cfd8ecc73d7ee2f157dfd480c21b722967f3a5a7d0acea059cbc045a5322b7be8c89ed58dd2f68cb8fc973fe02fcbf28ce5ec6f43cbd1ca977b
 EBUILD xscreensaver-5.43-r5.ebuild 3495 BLAKE2B 2cb73d9f446fcdd15c7653811a1d9fc6af0e87dd5b7f32227e920e933ea9abc610dc2adfa5e8c8c92e5262982848c94514727008cf099ec963062f45b15df744 SHA512 a3941d57310a2cf2c589ff2c9276057143ba19ef670159eb404a1c6ac61214c9d7350ce4d385af8a55f5c8a3701f3e975b2762282cf570a54497fc8e5475bdc4
-EBUILD xscreensaver-5.44-r4.ebuild 3814 BLAKE2B 1e49c4fc567c22481b9ca481f6b7ed9e2cbebe4f87bfcc461e4d00111b6be6ca210daa651a698ac51c6c7197dcebba7c037702b7d7acf7c977bf3a71cdbf7e78 SHA512 cb80c2ab1af5b0dba64cff321e3bd18a2eb8cc6d67b64011bcd8f495d240a58c07956eeff5230ee73d5eb8190c26a27df80fc77bf0f9c7e1e02127e37be20101
+EBUILD xscreensaver-5.44-r4.ebuild 3810 BLAKE2B b00db27ffef123bf9dab5cdd8016902a0b347ba2f9e1bedb254bf8de8eefe6f2e22739ccdc0fa18c7f7f2936f2af74d6706b48e33555f402297ddddd09f80a9f SHA512 23301aa03256b9c3c753ab47dc428edd37b7365feaf1a1e2a8d5a7eeab228ad5fdbe547cab80234e4fe4d8fffe33f53ccb80e2c445843acfdf8e1cfeb978f114
 MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
index 40e90de32b14..174562b657ee 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
 REQUIRED_USE="
 	gdk-pixbuf? ( gtk )
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
index ae1a7a4633c6..3fa2974b5e15 100644
--- a/x11-misc/xsettingsd/Manifest
+++ b/x11-misc/xsettingsd/Manifest
@@ -1,7 +1,3 @@
-AUX xsettingsd-1.0.0-add-cmake-buildsystem.patch 1418 BLAKE2B 981c9b2160a9bce572d7b703e08db93d9619767e39368e5f5eeb41126a78223fed840b41f5804b1a20e76bce695028f101ca5fc28297a02f93e55fd99c225349 SHA512 a3ff870af999745f873d1ab8f2eadfff73b82048a401f6ceacf79f1d7c9834c84081f09e3021af3fb977d80042e663ff40278cef0f72307f877608ba6617f041
-AUX xsettingsd-1.0.0-return-1.patch 829 BLAKE2B 9e6024303ffa9f7977187e6f718f03f993788abb5421989e31fcd55f366810903eb9c375c5281803d22ec23b61286ff799bb4096840e55ebd5fc29e0ad592e15 SHA512 f66b5c0fa5068ab5e0232d5de025a59fe8a1bcbbf9b6cc398610773d32c05eb05ef40a8dc7432f5baf153c06671f24f36f07868acd119471665b7c0450ddf6a3
-DIST xsettingsd-1.0.0.tar.gz 23627 BLAKE2B e9f7dcb9fd017f34ed88f29e1954e0824764db66eac5fbcfa55e7edef51c4bdec1cb9383efe0b6cb18b88c04818b106b9c4f95fb25daaf09a76b4b4ef4e0b75f SHA512 39077050a2fc3206c308ba399328719303884dd668b61f7756f0a3a4388ed25a3cda0849a713126c22c6b80466ab74c1317fdd9cb3e652169c80c54ba0a45790
 DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa
-EBUILD xsettingsd-1.0.0.ebuild 543 BLAKE2B b2d84af5b7091b0bab3b41122e2397bf7fb57d7094c7f942c9a6231d2d25d2f31023dc3adfaa1e23dc8c9e2a25ab7bc7447f2627aa304b5b52fc0e096549fb0b SHA512 355acc37e97dc3e33af015136676434cc55f8160abe1566530688093a50507faa9c7c527056f143808be81521718acbdf3cbe28e06e3c0b54f03e2611aac149d
-EBUILD xsettingsd-1.0.2.ebuild 682 BLAKE2B 49180b042c9528fe4a91bfba6dd3c8685253057531b7fb7ceee5b2d04c5e9a41c77759f7f2e5dbb4f88a8400620afbc75c6e7782a7a3baa59e8844b3e4dc63ad SHA512 f27ba0676a73fb0d4381ef369ad61807eac09f36a95bb130e1eef65c2a9f8980ba050d9ee7a42d6219d0dcf2d10a626cc88ab33a4716ec91a5f772c0ddd7d7ec
+EBUILD xsettingsd-1.0.2.ebuild 681 BLAKE2B cc742070d60fa4033db3cd0f708bbf97c0668fa6fe18b6bef09905fd2df193c00ec10707a69f93da8f5524396fed17fd890b88e27c19c687bdfe6b12f179dc58 SHA512 8e2dac41b20e834c14852713f1de3b768f89c46156db92afc37d0754228fa546f3218aa4cf90a2587658f6164e3f3503ea7fcd45d7238e9cbd3a5b2f4cb1578c
 MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch
deleted file mode 100644
index bb46f5e37b93..000000000000
--- a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7ddb3b8dec442fd1bd502dc7b97841bb07526cae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 26 Jul 2020 16:47:22 +0200
-Subject: [PATCH] Add cmake buildsystem
-
----
- CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
- create mode 100644 CMakeLists.txt
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..42dca7d
---- /dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,32 @@
-+cmake_minimum_required(VERSION 3.15)
-+
-+project(xsettingsd VERSION 1.0.0)
-+
-+include(GNUInstallDirs)
-+
-+find_package(X11 REQUIRED)
-+
-+set(libxsettingsd_SRCS
-+    common.cc
-+    config_parser.cc
-+    data_reader.cc
-+    data_writer.cc
-+    setting.cc
-+    settings_manager.cc
-+)
-+
-+add_library(libxsettingsd STATIC ${libxsettingsd_SRCS})
-+
-+add_executable(xsettingsd xsettingsd.cc)
-+add_executable(dump_xsettings dump_xsettings.cc)
-+
-+target_include_directories(xsettingsd PUBLIC "${PROJECT_BINARY_DIR}")
-+target_include_directories(dump_xsettings PUBLIC "${PROJECT_BINARY_DIR}")
-+
-+target_link_libraries(xsettingsd PUBLIC libxsettingsd X11::X11)
-+target_link_libraries(dump_xsettings PUBLIC libxsettingsd X11::X11)
-+
-+install(TARGETS xsettingsd DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS dump_xsettings DESTINATION ${CMAKE_INSTALL_BINDIR})
-+
-+install(FILES xsettingsd.1 dump_xsettings.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
--- 
-2.27.0
-
diff --git a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch
deleted file mode 100644
index 795e82ce002f..000000000000
--- a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3ec9deebd8e3496feacab83e41846dc4fffc3404 Mon Sep 17 00:00:00 2001
-From: Phil Miller <unmobile+gh@gmail.com>
-Date: Mon, 25 Jun 2018 10:58:59 -0500
-Subject: [PATCH] Return 1 to indicate error from main()
-
-The statement 'return false;' was most likely to end up indicating successful exit
-by returning a 0 value, when failure seems to be intended.
-
-This was flagged as a warning in the Debian Clang Archive Rebuild.
----
- dump_xsettings.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dump_xsettings.cc b/dump_xsettings.cc
-index f94a0c0..e9330b4 100644
---- a/dump_xsettings.cc
-+++ b/dump_xsettings.cc
-@@ -270,7 +270,7 @@ int main(int argc, char** argv) {
- 
-   xsettingsd::DataReader reader(buffer, data_size);
-   if (!xsettingsd::DumpSettings(&reader))
--    return false;
-+    return 1;
- 
-   return 0;
- }
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
deleted file mode 100644
index 494313069e74..000000000000
--- a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Provides settings to X11 applications via the XSETTINGS specification"
-HOMEPAGE="https://github.com/derat/xsettingsd"
-SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-return-1.patch
-	"${FILESDIR}"/${P}-add-cmake-buildsystem.patch
-)
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
index e26053ae120b..96b34c8aa5b1 100644
--- a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index 7b5c0eb7f214..749dba6463c9 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-3.0.7.tar.gz 322314 BLAKE2B 21c754daddb989a2f0771199d15342d0c08d23669525bbd9672537c200f7ff06d92708c256f2f89b483bb91947374195e4e95c2291425e630883cfe3b9898563 SHA512 1bc58d8c4542839ccc80c7612e472754f7471d2d72c61785b27d8a89d5e6826d40b892628bcea8c7dcfcf22e4c13db76a825a8c580a32f1ea74785f6c478fb79
 DIST xsnow-3.2.2.tar.gz 410575 BLAKE2B 212eec5744657ece2393c92c8210df23a323deb86e58cba7ecce191da23ee094590603cb267c8325ba8915a386325561ecbc165e27acf442426374abd113c441 SHA512 767aad07834b5af0be08f2e0f205cb4bb796b4ecfd4c38a187fea26b4d8c752d231a1f870494ba70b3437e54e8b5f0f745b69aa45f99d7b32d52a0d4b4cc8ba0
 EBUILD xsnow-3.0.7.ebuild 653 BLAKE2B 9aa2d2ece2d50a442984d421e7b1f70dd0411c61f4f86d02f8f5f13ddc75b3303ba1e5def1b466f29d9901d08b076113323b231bd83be4c3a931391d86040467 SHA512 e0ee72b552ae33421680fddeb7c5cc3b6a2bd61e19209550bf72828af2f55f917f1da39f58ba6f4021fb0d6bf32df3f646db07bb249acdcf4cd25a2ab15f4b87
-EBUILD xsnow-3.2.2.ebuild 658 BLAKE2B 9a5a19848fbc5162587eb45059d4009b66df49edb521beb96d06ea12854f2905d7fcbc4b204c123f8afde13c735eb8d43c1a9c226a8cbaee3bb897ac2254c6e6 SHA512 267c9d396b669551c202828a3fb9439fab1e2e97f8231588606bd45625d65342aed4101b969b35b172b691dbacd0bb07fb62120a65b403a24236ad6a0c1c1ead
+EBUILD xsnow-3.2.2.ebuild 653 BLAKE2B acc5631d824ab79c60cf35dd8c4c493a6a1e9180f1f74924137312b9e9c004686cb5c5d8d9d99cc18a7f3f3fcd7a10384c6fdda254d39ec8c929570323e19e6a SHA512 cb15d1f23a2bcdc0837e3df8dea15eeec94949525213f30f085663d4f4f46e83c209d8aada7e8c3a19f057b920f8d9776a900dbc04820a791c3e8e9a32e7067c
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/x11-misc/xsnow/xsnow-3.2.2.ebuild b/x11-misc/xsnow/xsnow-3.2.2.ebuild
index 1ff2e5e3a1ba..092d86340907 100644
--- a/x11-misc/xsnow/xsnow-3.2.2.ebuild
+++ b/x11-misc/xsnow/xsnow-3.2.2.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/xss-lock/Manifest b/x11-misc/xss-lock/Manifest
index ea2f34387947..798e75f9ced6 100644
--- a/x11-misc/xss-lock/Manifest
+++ b/x11-misc/xss-lock/Manifest
@@ -1,3 +1,3 @@
 DIST xss-lock-0.3.0_p20140302.tar.bz2 12135 BLAKE2B 8a69a2a4cac43974569867d27c28f4c32f0dda27e97434eb420908bd481dfecafa3f9abdd18fe86a7e38ca9d4e37aacb73cc3c94d62f6cd2b3d55cd0cddd86fb SHA512 366e203487fd6983baa646e3b181df75b7401cf7236c0f756d8b7a92c2b9a610c08b326e4a152ccedcabb9733faa3aaebd5bc9f0e2de3f523bb339603e53b179
 EBUILD xss-lock-0.3.0_p20140302-r1.ebuild 674 BLAKE2B 565dda97b5fac76e897b6bea24bd706521cdc18d702109888f8781c77ec200d62d9eeda35c39bec7dfc8bbac78f1a9c0b350b51fb87039683e82556e4c2492b8 SHA512 dd7c783b44d559ca13541ad3ad98bedf8d8618bad630e75888970a35f99e2b6c08397fbb3e7437883efac60b8b0bf60f3a6c1e11c36d78fbed9e76fc408be804
-MISC metadata.xml 863 BLAKE2B abdb6fc4f91c05f5ba891dc5d6955cdd43b2bc92aa302bace5a574f72fc2a9080884b29c0b980f6523addc60bca171e4019554f5087fe1abc0b46975b1a52f9d SHA512 da289c5cc992354b439fdebffa46426cb54511b574d755e15448b7861ca8c8d77fd95c426f13e2971cc9b3a70f921ea5e459148b647218ef096beed4c7e0a74a
+MISC metadata.xml 797 BLAKE2B 4cdec44c107400b61974dc54d58f80aace1b1f456c0949d98ebb74ced743677072f9324ae97c65defad602b626890195e5b7673d524fd03d049f0a7bc8c9913e SHA512 a21a4e52ea49b8049293fbc21dd5473d47269fe1938271cca0b756d3c23622c287c82ca014d3429df3e5ca0ae11672124c2229a1abe73da07d334d010c6ff75c
diff --git a/x11-misc/xss-lock/metadata.xml b/x11-misc/xss-lock/metadata.xml
index aa62c530159e..c43ea51ca322 100644
--- a/x11-misc/xss-lock/metadata.xml
+++ b/x11-misc/xss-lock/metadata.xml
@@ -13,9 +13,6 @@
 	xss-lock hooks up your favorite locker to the MIT screen saver extension
 	for X and also to systemd's login manager.
 </longdescription>
-<use>
-	<flag name="man">Build and install man pages</flag>
-</use>
 <upstream>
 	<maintainer status="inactive">
 		<email>raymondwagenmaker@gmail.com</email>
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /x11-misc
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)