gentoo resync : 20.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
commit: 46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree: db33a91259730be84999e13a8d8168c799f50ac0 /x11-misc
parent: e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
63 files changed, 410 insertions, 244 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 953451062a3c..c4146c753dbe 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index 50174433ded5..dda91458849c 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,3 +1,3 @@
 DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055
-EBUILD cbatticon-1.6.10.ebuild 877 BLAKE2B bdd4ede897dde39c98210a79040e7a74dc4f5536e47a906d5dd00409d764c936ee93715438bc7a76b18dd41b0d0eaa8ae177c92046a055de7c7882d17099f3f1 SHA512 ff70f2c925cf4115f591e27cdbfe776ec4bd797579f909b67e76c883c38196e2bd17a78acab251fd460f8d9db818273b99188a579db1ff28370451cd45025e0c
+EBUILD cbatticon-1.6.10.ebuild 884 BLAKE2B cfe5c79b40894f34f68706ea30422df0836496a506bc019b5c9efa47927b1f6e99ab99adc08ee1f119e8f90a8c2a221d8a191a4dd0f26e5fbbcc47d02664b8c6 SHA512 324f2a83dc4876202743ebbc5ee41ac4dfacd6fad6980189be1ace8f6e00b8c7a2a5048331ba827cfa5a98c62daa848f8d920a18ea9f3b1fe3bf00ab7af33556
 MISC metadata.xml 325 BLAKE2B bd1eee6610c7863dfb492da2f16af43ea5ad15e92dd80ab968339ebe25554b7be7783cb282fc16522ebdff1594869efd47d5bdf737aa355f559cf218784ae327 SHA512 16771648d8e8318b78412c7a14b733ed185761fc0ed804e3739ba39bc67848a2f8a64b52229670263ca26fdeb8bbe2a7ca09fbb136304dbbc7b94abe7f43530b
diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
index e8b92011dab8..5992136aee48 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.10.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="libnotify"
 
 RDEPEND="
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index b130340abb0b..29fee724e500 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
-EBUILD compose-tables-1.7.2.ebuild 920 BLAKE2B c4951cea2f0baafd69bbca4676f0c87d99f6dab768c30b389e891e2b47af3a4fafe623d82a51907551162559d82c45407d7320350a91aa966048da5e9afd9a7b SHA512 3c45c31de684ca27133aea29c086da1690186b0a396af9ed1f79631cca17fcdbf21704e21e274fc095d67e24ad5d37ad300d299e16c19f3cbda68d2b6d7f1a5e
+EBUILD compose-tables-1.7.2-r1.ebuild 920 BLAKE2B c4951cea2f0baafd69bbca4676f0c87d99f6dab768c30b389e891e2b47af3a4fafe623d82a51907551162559d82c45407d7320350a91aa966048da5e9afd9a7b SHA512 3c45c31de684ca27133aea29c086da1690186b0a396af9ed1f79631cca17fcdbf21704e21e274fc095d67e24ad5d37ad300d299e16c19f3cbda68d2b6d7f1a5e
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2-r1.ebuild
index e6d977c13554..e6d977c13554 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.2-r1.ebuild
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 44f2964f0137..554e2ba9fadf 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,3 +1,3 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
 EBUILD compton-0.1_beta2-r1.ebuild 1618 BLAKE2B 6e591088f42a15057352e85c39f05f4c044c22338c4851d7949e8f369f993bca82e8b6f767a8dfdd3809f15fce39965105f8ea31edd4938b56bc130c743aab2e SHA512 4ffd1ada1439d583b36e87d55d130544785ad9f641639589b57ef0e3cc3256f48eb30bed209aa24ce0c45bd1e65c9cad12092dcbdd1c4560ce8259deaeb3d7b3
-MISC metadata.xml 485 BLAKE2B fdd928e582a604fd9eae1ef0e2624f92abd24e2b9eba0b52a3ead7c771bcc9c7fae691a8fd23b1c551fb828fe0973bb4a6f3818e77dcc29a96ac42827fd13fb9 SHA512 af66d004e08a2ab42de52a422a7094fff8995e074fa280dfe83ff12fcf7f89fda3cf19f4b28ff2c3169284d8fc0e0414aa31499dc8486232567015891c2f0386
+MISC metadata.xml 492 BLAKE2B 74c0a1f1a7099a52f157ff92aca2c82e57e8ac547ce8119962db0c8f29465e55d2c3d03a85b8a72585cde7195f77952673a98f8ab86715816cef77fcb214bea4 SHA512 fbb4101254eea39b9208d07f24ec6576b3218b34d8b6e8ff88930e95a252a619fd15db6f675940da9f5198268258ca361ad1079d98572da73b00424359159b83
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
index 55d1d1c95396..2ebce28929db 100644
--- a/x11-misc/compton/metadata.xml
+++ b/x11-misc/compton/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
 	</maintainer>
 	<use>
 		<flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 0e86320758ef..95bf8a362ee2 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,6 +1,8 @@
 AUX copyq-4.1.0-bash-completion.patch 562 BLAKE2B de24e0e04fe07335254d919a0bf8174b0eb69b4e984aa56823589773cabecc837c273789b22bba45725a4be735e79edc7648e6935660043025ae38751449debc SHA512 89bb0127031151ab6c841902deffe53ba838989163b70891806ab406ef8d5659ad82a9e3ba204d7b70a03330d29b7f7a1ca4661b26a0cb99995fbd8715c9b02d
 DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
 DIST copyq-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d
+DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
 EBUILD copyq-3.13.0.ebuild 1052 BLAKE2B dd57b2a42902f3f8320a14df65c153db481807cf938e17f922876464b39dc67b0ccfce67a15a3b62f201b80b4f89923de9ed57a06dd4085b991ecfba4ed0a1b0 SHA512 cedc36d6c41c9f6cacc970cdb84023deb125d8e27be00ca70f76d43ea32b4b71f7be2e46461886f89ee2de2437a8ccbe367cf618fa5bf06d548087b6a43b2310
 EBUILD copyq-4.1.0.ebuild 1171 BLAKE2B 051e8c39d2c53ba008b957bf9b970a15f1168f9351df033247566a1057073d062abeabf919e9a4f905e48ff6e36660f2aadc01526805f23bf81272648cbf3a19 SHA512 23ce5cfef4d7d09ef58ab66cb4619cd3f47b3ff72c88aa47b0de9d35d399985176b5e670e368e2e02f7fc5bfe39c85365a1127c6e1ebfaf984657931fd5edcc0
+EBUILD copyq-5.0.0.ebuild 1116 BLAKE2B 9b3ec608c4d55298f5c652fb178a6ea8e490e340be19bd54b5b2d159c2ef4885463b0f920b56b80c51d33d221d42d55c7996875c33083088c6bdf381fe82a6a4 SHA512 5d6c7ca5e4763ecb46c815d5306e7b9c2b8346c330c9f6d2441dd058c3661b77d697f4e09d5773669271a2926b4aad741793ef365a7b7654fb898af273d097b3
 MISC metadata.xml 465 BLAKE2B d260d3e829c7916619fb6cd5d4626421a71fc3bee933ac1ae565c0ef7404121bd715aa1030b43a21c1680659c3db13a9f49937d06e4452efd932274f47eec0b0 SHA512 a89ed269c2315e3c8d4c82096c26930933a01c987b936ef898f81418623750d929d59dd33b8c0d0edb9114c09c526fd60e1a9ef3fbd11ae743a0c3d9226971ca
diff --git a/x11-misc/copyq/copyq-5.0.0.ebuild b/x11-misc/copyq/copyq-5.0.0.ebuild
new file mode 100644
index 000000000000..a8356570fecc
--- /dev/null
+++ b/x11-misc/copyq/copyq-5.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CopyQ-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/wayland
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwayland:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/knotifications:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
+		-DWITH_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 46e546874738..780a8c24eb81 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -1,3 +1,3 @@
 DIST fireflies-2.08.tar.gz 134204 BLAKE2B 785524100d16361885907ec932cbb710c694c86c6f9e75b4630d9c5bd65dc8fbe276c6ac31c4787438281900279cd13f8939a60120b08d1e400e8e508e622851 SHA512 bbcafc74de04265462a863e8f9a34707fe89cc773eac86ffea47939d1411da9ba17dc8a9f217aee414af5b95b7177ada119206376abf339e7629813095fb6aa7
-EBUILD fireflies-2.08-r1.ebuild 828 BLAKE2B 1db86301b08ba68717f37cb1dd3c93c4ea781e2e585fd55329a8e909f28b962b36cb8eb89d4af17c22bb710e7e5a2afcc588862a2605c1b4cb51ed0e83f78cf2 SHA512 3d3e294ae7484559974720dafa4b791427106afc7c205c1243613941e6d953761449e784bf98de5d9101a9c107fb524a7a785a9f4806f400837ea0f629933a9d
+EBUILD fireflies-2.08-r1.ebuild 845 BLAKE2B 0622f72a9dced6ed68700bac6205f1cbd8fe1a3a74bf679bea9d6feadb16afa1c530f6347ac1caff7edbd3904cf0d694451affdbefb5277dbd7a744c0281835b SHA512 aeb7e6ef10ea8c96c219d47b5f87ed23923269d65123d22a63872797b86e49924b03853730ae12238b4cd472ac6a0493ef25593d65dc10701b721d58ec018a7b
 MISC metadata.xml 392 BLAKE2B 9c0fdb048a54184faea2e91869052f35293db974002becc301a90fdb053e13c34e8d46a9abfc4aadffd3787fb3f9e4565d5ad4f35abcdc50bbe3d1c725e6cbaa SHA512 a1e4d97691ec2539e75ec6b8516d01e17830a05a310fdfa3ecfa6130a8044f718b0fc093a719ac7150fdb90a28999dc22793c5a3ee6662dd05c3f2e87a895aff
diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
index e317d91ac42e..74dcafcc87e4 100644
--- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools multilib
+EAPI=8
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
 HOMEPAGE="https://github.com/mpcomplete/fireflies"
@@ -11,29 +12,28 @@ SRC_URI="https://github.com/mpcomplete/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2 icu"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="media-libs/libsdl[X,opengl,video]
+RDEPEND="
+	media-libs/libsdl[X,opengl,video]
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive"  # for AX_CXX_BOOL macro
-
-DOCS=( ChangeLog README.md TODO )
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive"  # for AX_CXX_BOOL macro
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
 src_configure() {
+	tc-export AR
 	econf \
-		--with-confdir=/usr/share/xscreensaver/config \
-		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+		--with-confdir="${EPREFIX}"/usr/share/xscreensaver/config \
+		--with-bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver
 }
 
 src_install() {
-	newbin {,${PN}-}add-xscreensaver
-
 	default
+	newbin {,${PN}-}add-xscreensaver
 }
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
index 440d3bb57922..7d19414932a2 100644
--- a/x11-misc/fpm2/Manifest
+++ b/x11-misc/fpm2/Manifest
@@ -1,3 +1,3 @@
 DIST fpm2-0.90.tar.xz 212972 BLAKE2B 2608b40fd39db18407da5625f07534021dee72456fe168ffcb0c7b1f0a86fae0c69cdec5a9bfbfd09838622afcf575051326b9be5c47eb69e0b089abc205f99f SHA512 e02ebbc7af4202538b85394ef2e91d6fe7b11fbe6aaec5c5bd521d473b557db4ca8426810d1bef69967496071c936a789112307fbf028a8e3771d792c97495b6
 EBUILD fpm2-0.90.ebuild 619 BLAKE2B 227bd7b0270bc173a7fdeff7e0313398470d4c16808f3306eaf4403af0a8ed669c4f2cca1a881fe7773c24f9e5832cb1ba2b07711a403c9ff0be0c3b360991a7 SHA512 213afc4e9f64221a323d7c0f47f8246c7d75943dc7f76c94b3e43bd3a16e9f03e416bd24612d7f35cb04e6f52a0552402324f6834b44b9c46d739314d82cf46f
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/fpm2/metadata.xml b/x11-misc/fpm2/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/x11-misc/fpm2/metadata.xml
+++ b/x11-misc/fpm2/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index 13e5896af45e..cde7527f718f 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,6 +1,6 @@
 AUX gtkdialog-0.8.3-do_variables_count_widgets.patch 214 BLAKE2B 7e8975b55ac8432ceeaa412b01c2a8362c1394575aadeb471ad93f6bb91e185f412c94c4c1e4122055b939723fce15efc8353587f1adc5f01d746b9143f7a5ef SHA512 befcd5644d268b734a15e8ce0d58fc410d61fca9b825cd97f14ba5000355d81684f42d6bbb65cdc84ec7fa01c3112901adb0ffabd6af0df4875f2441aa0a7235
 AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
 DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
-EBUILD gtkdialog-0.8.3_p20200202.ebuild 1077 BLAKE2B 3c64c762e7b867c6db7a7931cd0aa8eecac5fba66399a65a18e53495c8895be41c469d630cb8af20613ed204958d3a702aa98082f8e1dec3e1f21de563e7025f SHA512 d2d088500fa2411fdb1da1859e7988c133562d97ad944a4f28c95e8bc274e3a8a1687c986a0c148dc34f8c411f115f06873371f31961a0546f7a42e72ad11ce5
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1091 BLAKE2B daa3e9693c6b587e23770bb0aa8941a0b8ef2ffd9471292ebbd23b78fa1e28c30bbf71503b575bc626b228adf6fe4b22a5bde8a1655b89e66127b3383abefff9 SHA512 643e33af0139deea897c46bfd31de93361838fa6c7b9d44d3a0c3ebb0758170ad5da9511652bc4f42ab95d7a9d21cc1b26ffe6a29fb87940e1bef6ab1cd2ec04
 EBUILD gtkdialog-99999.ebuild 984 BLAKE2B 45f10fc9970e14219e457385e8d8e3ba28c29647a243192b124b88960aabb76655f39a4153e63ae493ffc23a46a6f56bb586a25ff3327d5b8cde32b3a16d6b93 SHA512 6e20dd7ccc761df933f7573ad6c999f4adf97935edc2e6c44aeebfcb96a2d83bebb124f8cf91e1e80aa839c910d78e61135d0af768f1e9bf0839b15d18fcc5c5
 MISC metadata.xml 953 BLAKE2B c296cbd3e36df8e3bc980989caf5f8db22870d18f1dc601e45082b80fff5b25a502fa825b01cd8e9747b422899cd03ce008a3e28992439672dc078380dbf11b5 SHA512 42f793ecd670fbdf8dc78ce05ee110c8e35e01d02c88943c64f79484f4e82ac31a1bd14c129946ef35d84a1609bbfbffe927b14629ded01b3ae80a4ad7e52b04
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index fa5542bd4063..98d5e081d8c8 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -6,7 +6,7 @@ inherit autotools xdg-utils
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/kbdd/Manifest b/x11-misc/kbdd/Manifest
index de59853d2d24..2e5960fd312a 100644
--- a/x11-misc/kbdd/Manifest
+++ b/x11-misc/kbdd/Manifest
@@ -1,3 +1,4 @@
+AUX kbdd-0.7.1-AM_PROG_AR.patch 166 BLAKE2B e5d4af231166dee644e86890130233d186ec06e9a59047f9c203c1a639a642af31c9ad2c630153edc3cfa4e5c1a7ff0bd63ad3ca7412edbcbce4e248703f5ba1 SHA512 db5b4d0b5b2761f72e0ad54cce1b3cb6f61fc3a9dbc5f4115cb6fceb4069643c6c128a461140341a6eae78630473cd52683e04778f83f43d8a78fb0db2428431
 DIST kbdd-0.7.1.tar.gz 33445 BLAKE2B e976eff90174dee79e96b0419459f074dfc5009b7b5f9c30b32765cde439f3076b3d0657849ef7e02e018d9528f18426f5ae4772a6c3880e7042971ce699ed48 SHA512 12246e6a64d6d826afdc4bdb019bf30298fc71de534d8b06b5cefbdd027c4416e30b0991a136f3a7988b79cf0ad48e2c67a732ce7c5a6d6ce356f6f34348dc09
-EBUILD kbdd-0.7.1.ebuild 577 BLAKE2B 0a62e9cba8f88a12c9a21166037de0b19dd92872aa3d295f71fb9e41ca6bb68ede1401fd306c48d2969818cbb54c73dc86e96a8c5f2fc814993e7afcd1524500 SHA512 5c1f9b4d8d3b6a20d576d3c7c5a94d0678c5149a94b08e3131843cdaf1f24d3526fb63318f6d5f9f25f143e0538160b1c2448255d9911bd57e938717c51226c6
+EBUILD kbdd-0.7.1.ebuild 658 BLAKE2B d3bde4b3c6e6577de578e9dd2dd5d28dc3dacb9a4eaad6d0a4c3362fd3defd699cec037fee274cfb9a89239ea9783641e7ec38595c2ddac0cc8ea9d6a33cbc2c SHA512 49ea1c4f93231814c4fcf6bfb8e3de398cfebbd4c21f0eee33c607ce614f91fa0dbc46a8a0ea807936e4d36452ec1c04d8faaa1783f4d9464046e118c74617b4
 MISC metadata.xml 247 BLAKE2B f66b662a020369d9670edc7135fc95df66e9ac1186fa5a3b930de5a0ac59f47b5009e51e6b8d476f6aa4bb4296ad877720384d40912fddca47bcb3ac12bad553 SHA512 b40a7cfb7a140a4b068ee413113861cc8405ca0bb56b871f926aea22a5f25d660cb9e141de8ca0fb03e67ca18e85b03585a320994b7ca5de71df2abe5efd9d81
diff --git a/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch b/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch
new file mode 100644
index 000000000000..1715a7d2c6b7
--- /dev/null
+++ b/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,7 @@
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ #check for pkg-config
+ PKG_PROG_PKG_CONFIG
diff --git a/x11-misc/kbdd/kbdd-0.7.1.ebuild b/x11-misc/kbdd/kbdd-0.7.1.ebuild
index d6939d16bd4e..5914a9a50443 100644
--- a/x11-misc/kbdd/kbdd-0.7.1.ebuild
+++ b/x11-misc/kbdd/kbdd-0.7.1.ebuild
@@ -1,29 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools vcs-snapshot
 
 DESCRIPTION="Very simple layout switcher"
 HOMEPAGE="https://github.com/qnikst/kbdd"
-SRC_URI="https://github.com/qnikst/kbdd/tarball/v${PV} -> ${PN}-${PV}.tar.gz"
+SRC_URI="https://github.com/qnikst/kbdd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dbus"
 
-DEPEND="dev-libs/glib:2=
-	x11-libs/libX11:0=
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/libX11
 	dbus? (
-		sys-apps/dbus:0=
-		>=dev-libs/dbus-glib-0.86:0=
-	)
-"
-RDEPEND="${DEPEND}"
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils" #669674
+
+PATCHES=( "${FILESDIR}"/${P}-AM_PROG_AR.patch )
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 54190a5bd602..a79a6314bda6 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
 EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B b8c9fd85a019c53ffee70bd7f871da3737d063d0cc538ac0b08f1dcf248769a5055e91c0fe374245082e3546db3931fb7a5e749d8a7ba6bd2b86d55e6e5c8c39 SHA512 b5a8209b8d2c0775afd116469d0bc8ab79c5e2d9c28d48def08527d14d0491a68c49c80ea9994fac76a3c23346072d9fe3b2f512f313acd7f965d71c07365e92
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/parcellite/Manifest b/x11-misc/parcellite/Manifest
index 034e483bbd29..fc11e6912a8a 100644
--- a/x11-misc/parcellite/Manifest
+++ b/x11-misc/parcellite/Manifest
@@ -1,3 +1,4 @@
+AUX parcellite-1.2.1-desktop-QA.patch 269 BLAKE2B 4b604faf75bff0b8c147d506bc7214c6408d2c1c5d0ae05e15ecaa2385387f7b9b4264ffab1dc3471a9c5a84aa39228f25aa24f9d379b7f7faa5b09539cfe88e SHA512 568371144b0693815a45f6e6541ae0e07b5f45171da3a736a2ac2bea97f53b74ebdbbdff1c691beb4634690f581098fb5a4ae04c5b2b798bf610e3cd3479e841
 DIST parcellite-1.2.1.tar.gz 763956 BLAKE2B 487029ed2d0492a1b8fe5e8093ab5b1d488db22798b18dab130da339353d6bf6e5525cd4d5fbdf68526946156d646dd2ce1095d07167785d3aa23d81a163b094 SHA512 14b513e760e205666e00893dffb75ef3d42994aaeca3238b5adbed4af7495a7ed67cfabdcb163024fb9b0a7e832599bb31c54201217ac3fca88e0a4a22deb53d
-EBUILD parcellite-1.2.1.ebuild 917 BLAKE2B 0ad8e9f22bcb9b756dea536d4ef7f01e8f83315d8371319195793bed70f4600f5e247923bb7159cfa7fb89aa4eb9d22b7e316fa213fb5432b7dd5e6afe32f524 SHA512 758ab9d185efa59da38cbab49e3429d9d7c6f0adf3c45caf5b5f86f0f3385accc0c9e61fc93a414ca3761b68454f70af5eb29f8e32743b52aa984b2901ff0f80
+EBUILD parcellite-1.2.1.ebuild 698 BLAKE2B 6f664565c2ed5a49dac7e57ca0bc2b149a984b75a469059ad269f7a3d699e6299f91f0fb10f559af0d95dd8353e20f98bac69c152732377698a343b69989197c SHA512 d287e7710568a208d430c3d86ccc12d2314ca0951b58149ecadb0393b98ef8cb97adc855bce21dbf364490667449c21cd2e5657669aa7fd93b8252e7d92bda84
 MISC metadata.xml 357 BLAKE2B 94e74447b29de7114907b5e280b2e8d053036c3eafd692702219130dbcdc00edbb242eed3a381e07664e3bc8f6b85e87cc680d6525ae52b693427c6650bca2e9 SHA512 69accda4bd379c4c67616ed5cf40eb2fe2ecbfb722894312d2a51c09040f123ad8b775cc3b6d18537b5fae75baff96069e1b6eeba732c45e41686797d70eaf47
diff --git a/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch b/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch
new file mode 100644
index 000000000000..1590a76505bf
--- /dev/null
+++ b/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch
@@ -0,0 +1,9 @@
+--- a/data/parcellite.desktop.in
++++ b/data/parcellite.desktop.in
+@@ -6,5 +6,5 @@
+ Exec=parcellite
+ Terminal=false
+ Type=Application
+-Categories=GTK;GNOME;Application;Utility;
++Categories=GTK;GNOME;Utility;
+ OnlyShowIn=GNOME;KDE;LXDE;MATE;Razor;ROX;TDE;Unity;XFCE;Old;
diff --git a/x11-misc/parcellite/parcellite-1.2.1.ebuild b/x11-misc/parcellite/parcellite-1.2.1.ebuild
index b89ab441c540..d9bab58ad41d 100644
--- a/x11-misc/parcellite/parcellite-1.2.1.ebuild
+++ b/x11-misc/parcellite/parcellite-1.2.1.ebuild
@@ -1,51 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools eutils xdg-utils
+inherit autotools xdg
 
 MY_P=${PN}-${PV/_}
 
 DESCRIPTION="A lightweight GTK+ based clipboard manager"
 HOMEPAGE="http://parcellite.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.10:2
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
 	x11-misc/xdotool"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
 	)"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch )
 
 src_prepare() {
-	sed -i data/${PN}.desktop.in -e 's:Application;::g' || die
-
-	sed -i -e '/^ALL_LINGUAS=/d' configure.ac || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_enable nls)
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index fc9e90b83143..e2a3c185541b 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,6 +1,6 @@
 DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
 EBUILD picom-8-r1.ebuild 1526 BLAKE2B b016d3cbaa1b37d83866fc56923fe5d5d0c9d98f84b7ffaf61420cc929b902f2ff19c33f4a4f9b5220451c4124feca2e31aa53e48c9689510a1a92a12f6cfe25 SHA512 965f59726b168898fef69380c6d397632f19a9fcd7fb9b6458af815270700edd709ed845a37d59cf2b8329a6ccefd113516a03c2a57042b421c7b2c635f295ad
-EBUILD picom-8.2-r2.ebuild 1566 BLAKE2B b670c66324ebd845705367e77df8a7a5eb118e9fad48d07c61b9f7f7a71ac7daa879d221bc4c687f3b7a8070cdd919b45213f1e005bf7ad6880e5cd409e22180 SHA512 a399373fb4257f5ccae6aa71c2cf53669859081ba12a59f3337d67fc613215a9eed44049b3a499853c94ce61fadda06aea59b60b9dcc3bae59fe25fc641188f9
+EBUILD picom-8.2-r2.ebuild 1571 BLAKE2B 1a34b3747029521a437961651515852a0848e7b2eae64fedad08e33c08ae88c00c9165b500b5add7893a7b7fc430ccde5374b26130d716c38a1ce79677f4dd55 SHA512 9a705ae1291d4db41373465f3462badff819c1412f172d36b3ea10fdb3bb0c3f2851b027bcc3be187ce9fd5bc5e53b603e5fc0077816cdee62242433d4b036af
 EBUILD picom-9999.ebuild 1516 BLAKE2B 35d49008bffd1956f30f1038a23f4a34b242e5690fb84013ee2b968265b07522221720093a1b43eb01dbcdd6467bdc8cfb2ab66178b8b3d3f78072b2b4b1e69e SHA512 f51ef9e05acfd8d6e1dee42eccd6b029edc076395db79cf1e8235a696c856d322d53267d0dc68b5ccfe0ae2a8a1496409182a8c710acd8b3f048e6048f63c937
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index dbceb7f81df7..8c0a8512f14d 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 41da33003d5a..0bc95e25d9fa 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -4,4 +4,4 @@ DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6da
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 EBUILD polybar-3.5.6.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
 EBUILD polybar-3.5.7.ebuild 1905 BLAKE2B 266253f3680f8c2160c2681826b005af9433e2af5a8d9e3ba51b8dfe0a00c3c686568d3ba6751c74de09bedb13c46683a14e088b687ab02f319674fed2c073e8 SHA512 00fa80d9e76738de1a10d2a5e290d74129e8626df9eda2dc909c690c7d7ff0daabcdc644673309309eb7c241643937f5823fb036e7256c9569e398685c2b4276
-MISC metadata.xml 691 BLAKE2B f5d1616119bcd28233990ef0d5ca6414835db0389629a9beb7b63f1e3475b946a162ad12d34f615fe69c52cbda1cc297f1b875064723c3f1006e9b6336e6666b SHA512 0301d41560a3ae53076a99235dfdd0acc297ce40e77c227148db37dd531a0bd30a6986b0a98d86d2bfdefb9a086544bb8bc725a6601966b0f8cbeb4da2fad282
+MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 5b53dd629344..f53f395dde65 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index d1309ba09de0..2bf22025741f 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,4 +1,6 @@
 AUX projecteur-0.9.1-dont-compress-manpage.patch 1117 BLAKE2B b75c1510f0c6561f935a7e7dba5a200f1b0a9cd0be892818ef1e5251b3d9ad6ac3e95200d90c2de6cf9ff38e61fe546560c3c2118eeb20e45a963b3fbfa4d2ff SHA512 ff3734d495ad94e0ed527cb2efc5d4627f45947ec9b75a960564b99ef6114ecd7efc260d1b1293db5d4835a8dc1450f322d8a6e3d1548e850d888d692580e425
 DIST projecteur-0.9.1.tar.gz 392308 BLAKE2B 31ec19b81b9f3cf8c60712a52d3cf4dd96a215115d2fffc437892f276b9f1e6a58cf0c2165226166f0c2067f6ab2180829c8bc8204dbe368facbeef398da837f SHA512 28e0030a481dd2adb9eaba54066f060b61f7e4477918f46e25fad1e1a1c841dd5500c24779d66d3fab643e5aa39f92b0dd0c2fd7a0b80b8de8f258ae7572ed36
+DIST projecteur-0.9.2.tar.gz 394033 BLAKE2B 576a16853cdb2ae4614b83946caf85636f364c268320bcd99cdd9312ac1e76fb663f2e6c7cede4202df581770b4640444283eb55747735ab1bbb125d5bb9c6c1 SHA512 75c7e30b9ef72b4c1fc5e1a8e42c1668ccf2698677c1617cea080c7f5db722098635098304a7557f93f1a14143f8f2f089e8aed9265d44b2cfcd82974363baac
 EBUILD projecteur-0.9.1.ebuild 1004 BLAKE2B 47138e26b5b730289878381fb101c92c5110cc6c2b76daaadec30eeb7f686bf4c02b823ff20ef7f6bea117837a12b458063dea27d3da912a22412c93a5381fc0 SHA512 0accd0ed067e4eddfd48c562251883c1779c69e2e7c6673f5ea1719e07a5808306866e953f6f111462f6b25b629032b7c462615152bb723f89d6f77783ef866d
+EBUILD projecteur-0.9.2.ebuild 1006 BLAKE2B 16654ae21dbfe9c1bdd689b8ed912860499520edd05433b976e187f8926209852df98ffb20bc2d3d07740adea0e453df67c30b2bc16c2e32cfe1f6335424fb6b SHA512 aea3af93e03cd78a7d000a529a00e30fa9d2ab4aaec0e88257f8024720ee52c84e48dc062f971199c1e7d2f05516d461104f4d44f33061a8f83d8af3944a0a71
 MISC metadata.xml 613 BLAKE2B 20b189f745ba58949951ba9011e77ef1be5910caf7ac9e3797ec4002ef213327b2135a976eb8aa731bde535ff0fc5c44119fe3953712ac333735b8280e5b607d SHA512 956a65649dc36c2aadbf372f88546d78dca360fea24b0d37b6eb04080a8ff91b02c04885abd4c576913769bde1c792bf9d1cf7f8a83eb54da240d7dbf29af3bd
diff --git a/x11-misc/projecteur/projecteur-0.9.2.ebuild b/x11-misc/projecteur/projecteur-0.9.2.ebuild
new file mode 100644
index 000000000000..cab723fe1e8c
--- /dev/null
+++ b/x11-misc/projecteur/projecteur-0.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 9424a1a91362..05668d38b217 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,3 +1,3 @@
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
-EBUILD read-edid-3.0.2-r1.ebuild 1016 BLAKE2B 3c1d26ff0c431df955817a45ba80db976611e5a397a72837937b3969da8d1f0c82fba2ccec985b9d0e159412c956fba0885caea1f6c18174dab8cd5c6f27dc1f SHA512 c45105555bf17975a9ce7bf1be37a4599e271c295bf1cc108f598ed34014993707cafaad472908f4f9e5968098190052c8bebe3fc0d8424e660ca0e96e36cb9c
+EBUILD read-edid-3.0.2-r1.ebuild 1023 BLAKE2B ba9aa13e47eaafcb89d4b2b50bd5ac66878afa9faa36985f8cef57c40ccb2cf47df6bd4435a87926eea123f397fb388e1f22d86c20b242443d7c487cfbd4b5f6 SHA512 dbd15be9bcea17fae6a809511f819ce6240e84ddea91ced61616e7b4b0e04f1403c78bf9ab3d25aefe1aa27f8cf7f46a6ddce43bb2c41f1ca9e963724010017b
 MISC metadata.xml 393 BLAKE2B 35b1d645c4d9e52bc475bfb14846b3e4fd854f8e39ae4d8f8277e4741327425496b9eb5e885fbd43b3c1a9456c838dece040605f69c21b0764622819e49edd2b SHA512 f07be82fafe3ef79faf4fdb22fd0a03b6b6ed367735884fa5f6adba11cee2915a28c40be85cf2fd7d1908ab525bcce4e6b06a1cc45a2e9c6f903e145b9759450
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
index 66c7ab83c0b2..31cb28351002 100644
--- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~riscv ~sparc x86"
 IUSE="vbe-mode"
 
 DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index fba0062336f4..b0d3270eb1fe 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,5 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
 EBUILD redshift-1.12-r3.ebuild 1955 BLAKE2B 9d6cbed8b116f5173c284fa6a58bb616ff00ac9af35c15945bf0615b2aeb90ee8084bb240e6a9ebe8c5cb79f846c58aeae35ed86cfd9bc7a3130f6ff3a437a9c SHA512 01007093bc7e4a841bb3eb66975c51d6f4e2a1b5ad664acf1885d26aa4914d8d4633f10e2d8cb051b1ebd07add545db4fa817d409b6761b6903d7c87af43f487
 EBUILD redshift-1.12-r4.ebuild 2032 BLAKE2B 6b3d47a74a0a93c8086b1db87a561467bcd238dd7af2e5551ce1576fb9e8758966694584590211ac377051b6b64c21f3221996a880902553b81cb7b3fa51c0d6 SHA512 b63ea2755fed84e4d5612ba13a36812e4b13b313cffbfa4a023a90158a9c6a04f009c0d70804380481b1fce805ce9809fc0a809f24fcff90245e6bd6de3f2d51
-EBUILD redshift-1.12-r5.ebuild 2117 BLAKE2B 0069596b439d23a6dd5a8a560b0c1097d8a156b4e5bbbaeeab71cb3280c5faf61b328b1e7aed8550fb2be8aef84050b531e6104029dfb4a61fbaa1560bbe4861 SHA512 3952dcf3f122b68843e4814dba639acb3c145ef0be2dca333edcdaac7c672eddd1acc716c4a91a6507c3615af560ec31e1624d2f075c753b13a96be8506a1231
+EBUILD redshift-1.12-r5.ebuild 2123 BLAKE2B 09c770afe6ac3b202ebd1b322a312bac23c7937953bd3ce2cd5df0c8ac132da4c44c433d605efc6869bc971e31ec5315a138fcec205c68cd87e50613c8b20310 SHA512 b46cda00f2687e022e9b0b6f931ed4c4110028838ee9904deec739a261d3a37a175a56066c5bb6950ee187620d94bdbbd7faaa91969dc5b935987576856d848d
 MISC metadata.xml 522 BLAKE2B db9be8da0b96a5f7d742baadda739df011a5f055a944d41b67b3ba3137b7e92acead9b0afd72410a4c4f203fedf300f49a052c809577351b3b107f447dbf4c6b SHA512 c5732a20ce965daea3c663ba00d2fd9ea484cade35c22011a9e4f051ce202a0da560c428c8775b5eefaa726c92f6f31014cc47780b4ba329db81c1dd7defbbbc
diff --git a/x11-misc/redshift/redshift-1.12-r5.ebuild b/x11-misc/redshift/redshift-1.12-r5.ebuild
index edd82c298964..9c1e4b29422b 100644
--- a/x11-misc/redshift/redshift-1.12-r5.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
+
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit flag-o-matic systemd autotools gnome2-utils python-r1
 
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="appindicator geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index e0e63db100f1..cb3beba56498 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,3 +1,3 @@
 DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f
-EBUILD revelation-0.5.4-r1.ebuild 1166 BLAKE2B 9e8f83a6f6b4b8a60a1ea22cdb7eb53b579c71bd3d8ecb66649d6879ef06f799a91bb1f8b0240326bc8dea0debfbb5f6b8ceb01a184a88d9597272f429ee1139 SHA512 7379d19e249bf98f024987a791906f3c55d3c58a1d8981f1f134c23c9caa1f3c392b8205baa04fb091624b86a9b4c0286163ed0be90ec86caf39ed0fc8d1b0cd
+EBUILD revelation-0.5.4-r1.ebuild 1171 BLAKE2B b8ded17b2056a1108636bc83b14385864b906b249e9e50c22c6aaa4eba989fb95a50cf9589a97fad68a004ed9932b415227197e2ac25ff3602eb6cbacd52bb2c SHA512 7fc74966a8a8b6aa84c849f158ade16daaf44a566a63ae49c556d011e34caab4c32a273b08cc3c5861e1fb53b42a90e223fe80b8c190e8cb56240de21626f89f
 MISC metadata.xml 413 BLAKE2B cf3df69453155e356f6f30026a06610f4cd5639d8de0ae4842b82442234c235b3c8933bf6943193674b0f7ca894f00b8aebceb2de65f11186ea0c66c42e6bab9 SHA512 e00344899c210aa59b4ac218773745d418730c934784cf4cef0a71511bd7ca4888a9591ef0fcf4603579b189cb78ef2f8b7654c53c8839f75ce6d400bfc3d408
diff --git a/x11-misc/revelation/revelation-0.5.4-r1.ebuild b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
index e7a9a4ea2c77..61972b294f01 100644
--- a/x11-misc/revelation/revelation-0.5.4-r1.ebuild
+++ b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome2-utils python-single-r1 meson xdg
 
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 559236522a9f..ffc6010cfed4 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -2,6 +2,8 @@ AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a3
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
-EBUILD rofi-1.6.1.ebuild 1220 BLAKE2B 19ef083739612c9b4ad1e018c447f6e21131a74a278473d584523d9f2fdafa612b2e8b033126f2385d9d4166ad68b895b784919f10df49094cad83350d2f6437 SHA512 43401b44db501d72e76a5ae39bab30996dc5b4703d8286a3151e8e1781efd78b0a33785973b4e159d7f2e433dfadf68e099a6875da0adc22cb888186372e32c6
-EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
-MISC metadata.xml 373 BLAKE2B b7c92350ddd79f73e25f619f77ddcaf93b18e65cf129f95804c8560afefcfd0edf379fba697ea18a41bb159d656e330d84605454522f27e910fb3af0765a3bdc SHA512 3e5b29269fb95b948f0401f5bef699b4dcafcc3d43312e5ecdcf57d977292ffa9c804159a6ad7f46e69ffadc21d2d51d7723fd5e5ed2dbdcb15cb2c7391728ed
+DIST rofi-1.7.0.tar.gz 902294 BLAKE2B 281f48702650f65e4b037fdbbe6861e173dd3465cf6a80a1d2038271511a9f85ebdb19d8e7a1854f82d52172bbfea6eb1b1685228fc4ff874773033406c9267b SHA512 84a42ecf519c7eed8093c4af3b66731b890939a2bf2a63290e599103705f6bacaba59ade1b8a1bc854f6b767e8d44ee42c20e44f63886bcacbfdbe0468d350b4
+EBUILD rofi-1.6.1-r1.ebuild 1247 BLAKE2B d92fbb93dad604d5dbe58a90c1c63825952246d5581478578c056f82372d84ab5cd26fe4954601383193714cacafbed45371f913f4a311676e12069e68349324 SHA512 3b1bb1ac88c01a84841a3266fe86aa7c22101c85ef022356768eb04c49740b63b1469c83080dee49cda61260b18e16e24acbdb51f8c37dafbab1d020bc60bbe0
+EBUILD rofi-1.7.0-r1.ebuild 1590 BLAKE2B 9f8fce1d0fedea2eb2b2c3880a01a6bf655d6c2b33d60a2d63cbdf07cc635a09526e92d0cfbc3d18abdf2993b4cc7569c8c94ced76f9b51ae6a1577306cd2945 SHA512 48fece0953f6d794b032d619b12fc0b6d134b236023d8b1699e4399a67e11cfba156bc86c5fbea4a2b94ec154a9a91d86f68f9ecfc812e0b293ac729f029e86d
+EBUILD rofi-99999.ebuild 1055 BLAKE2B 1ce7aba0e86b1087bc207613e258bf8e9191312a51c097b4b473f10f2d1f1fc0789c6a847e28dbe750c390c4a9e01e24da0b91a34eba0107e76b2965aa57a566 SHA512 2091ea3513e3f0c601964dc1b5ecb7e5151735bc1771dd2fb2d2caee9c186f21e94ece539e2431efd631a215ace11ab63bae38fd34bf9da04d6fd60be9a29705
+MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 87511edddce1..040d877273ac 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<use>
-<flag name="drun">Enable desktop file run dialog</flag>
-<flag name="windowmode">Enable normal window mode</flag>
-</use>
-<upstream>
-<remote-id type="github">DaveDavenport/rofi</remote-id>
-</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>petrus.zy.07@gmail.com</email>
+		<name>Petrus Zhao</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="drun">Enable desktop file run dialog</flag>
+		<flag name="windowmode">Enable normal window mode</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">DaveDavenport/rofi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
index c919a190ff0f..e654777a5b58 100644
--- a/x11-misc/rofi/rofi-1.6.1.ebuild
+++ b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 "
 DEPEND="
 	${RDEPEND}
diff --git a/x11-misc/rofi/rofi-1.7.0-r1.ebuild b/x11-misc/rofi/rofi-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..813b6e07de00
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.7.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
+		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.7.0; then
+			elog "Rofi 1.7.0 removed the (deprecated) xresources based configuration setup."
+			elog "If you are still using old configuration setup, please convert it to new format manually."
+			elog "The new format configuration can be generated by 'rofi -dump-config > ~/.config/rofi/config.rasi'."
+			elog "For more information, please see https://github.com/davatorium/rofi/releases/tag/1.7.0"
+		fi
+	done
+}
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 81f8f9cf847d..080d70670508 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
@@ -11,13 +12,15 @@ EGIT_REPO_URI="https://github.com/davatorium/rofi"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test windowmode"
+IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
+	virtual/jpeg
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
@@ -28,28 +31,26 @@ RDEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	test? ( >=dev-libs/check-0.11 )
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	tc-export CC
 
-	econf \
-		$(use_enable test check) \
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
 		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index bc11a97bd182..54ea85ff154d 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -5,6 +5,6 @@ DIST safeeyes-2.1.3.tar.gz 354494 BLAKE2B 5f7977a8de280f5022cb226689c5b1d48f4949
 EBUILD safeeyes-2.0.9-r2.ebuild 1061 BLAKE2B f1f2da8fd981b9bae189691a6f3da6313c2b70138f3282cc536e20e0e30d9953236b81a65d8fe0f823129c1a4306673b530571da5a7c3959387bf9983335c2b2 SHA512 e9e1d7fdb90c1be5640bfa0457dcab4fdf8069198d76c9d66ea3011004b7b9963023a9b4730d8cf96dd6b0b5bcecfac78cdd003b64a37446c6dd69207c484a08
 EBUILD safeeyes-2.1.1.ebuild 1100 BLAKE2B b2bea10c80ec9014257debd33a69caa149ccbb0b3243a8f59e183ab04deefedfe6cd41147af6aba636368e5b5f00dba7e268b044c7efc7ee46c567298fb8ce5f SHA512 c93e668802febe7d6ca873017ada4f096c852da76fd06cc7752d3c1eab76eb437d53df7e856dbfd870100ee2adaf12d042be4f36dfb7c1338bdaa4411e2bdce0
 EBUILD safeeyes-2.1.2.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
-EBUILD safeeyes-2.1.3-r1.ebuild 961 BLAKE2B ee9c691e3970d5d8543f359c526e03dcbf54c58ee0973650a6e4741a77d2e8faf8b6fcbb3dcee1ac36da38466943f0ff51ccc1f431a9b7f89956a5f4a5a4d307 SHA512 43d06bde372d78d0ac9e43342fc4d529e2dd47060494fa8654e6c17e21e58cfaee00c61ee6b4a49a123e90af82024d2f6062ff6197aafa0deb4a52309d720ec2
+EBUILD safeeyes-2.1.3-r1.ebuild 968 BLAKE2B 5e1a806a624f0355aeb52f2d0e698e82187dc923d4f9789f2b2f5bf15666d30acef200c11d71dd95c0f94d6f2f811cda61adc10575fa730f1ffc21ef357b4a24 SHA512 7b0442c1016c2a8615df8c5228f357baa0f81aecabc3cc83f0292be953587770a36a5ec83064053d54fa1e9c3e29cbbcbdae26640e5375784f9fac9d1a968903
 EBUILD safeeyes-2.1.3.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
 MISC metadata.xml 347 BLAKE2B eda163f3ff13421872558f176120fc2fa5488afa1c9e2b2bd1c3aae6bf76e4e73758f35ba2af529beaf73d5677970ffe6319e8db22279c5eb7885f9f135e9243 SHA512 c09ce25d4d00dc7d322ab1505feb17b0bdec7aa1ec9e4a847705889ec38b76b03758d0a9bf1fc01fd6131d278850ae38462256ab8c968f183523e48dc2692aca
diff --git a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
index a8758f0a686d..d32153bf1daf 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit xdg distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 0d84d3bd162c..7050a360e664 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,7 +1,5 @@
-DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
-DIST shutter-0.98.tar.gz 2560060 BLAKE2B a7b48df221d8640a4705f2ffc856fd0ec50646cb26900aabe4bbafcc8b2595ae86aff158aed9c3522624ec5433e111ff322ba35a7b2cd8623356a3b68e90db7b SHA512 5a3321db635a81f6f67d5789cf374d846f21003a9bd3fd748bb58481d8a5fde450a1c4b5ad4d3edee49804cee6dd8da6ad7b4422eaef96bb333b8b3059cb3e41
+DIST shutter-0.99.1.tar.gz 1733952 BLAKE2B fcf5f9a34ce54f674a4b0f9bba2493917bf27141ea7f7e1d8528ae439eabfb33e4e6805bd3cb96131b297748046c9797747520952ad57cc033cf7f7362c4606c SHA512 4d6ee699d3b31194c6685019a9493968d7a4988ee86f9348cf5aaa15c573b0a5f515ba6e5d786faf8054762ae134fea5ca2add10dbb3e14905247daf1303c751
 DIST shutter-0.99.tar.gz 1734356 BLAKE2B c261d7792a2a7508fb8e73b968e1e07edbea0338b857132674caee5ec1bb7a3d58eb2e35645c581af652027007a27df6120b035218c41d8671bc53293b6548e7 SHA512 335c85730f49978d4b69ee2d5bbaa5d660d652d386a70618fdeb46c639bd209cee99743b44a8ef1019404f52328692de91bfbe47b14bea202efd089f80d36f82
-EBUILD shutter-0.97.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
-EBUILD shutter-0.98.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
-EBUILD shutter-0.99.ebuild 2158 BLAKE2B ffc42ed37d1158d2d92cb7c357580a6ac7239075ba2c749ca5ade60e017c540d07afc79c2ce711fbbc2647ab2042581be10851b6ce522f7efc68e49c4607327e SHA512 307521146637420a94847d11f5810c4fc5c9906f920045bf02a72f68de108d2ec7d4d2d7ed869b85124dccf0ff713e9c3f67d31c46e2ae6078c9d1037744f485
+EBUILD shutter-0.99.1.ebuild 2159 BLAKE2B 5f827b65e6c014b28579ce94f9405bd14f7a82a578472ef3813c496ac5a5691376bbc8b7bf4a04bc2786a968e28311527f0b5fceceb46417430a46e4881eb6e0 SHA512 0cd07998924c59db93b8bda4695d06409b3e29506d963cabddad46da4dfc4409008317d9ed16d80a2ee296992bca14fadc77dcfd1969f63e135986a55c1559e0
+EBUILD shutter-0.99.ebuild 2156 BLAKE2B d6462cf8be7f1f84bb51c4db29378c52b63fa7a9fcc0238abeaa89f80cfd13a7bdd9961754517c9600e723ed56997a2c9a9f69bdcd5b6eb90ca728baf70f83a8 SHA512 3402387ead7393b75773829b259f37932b8fcf83a5cb536754ba258767cac71bf0b3bef2105b5062a28e3b20a63fc56bc2943aeae4c7b127e0aaecd70e2ef68a
 MISC metadata.xml 404 BLAKE2B 89b0c69e56bace083baf4e82ff7deb14bddc671f418233e32c268056477328c4a22d427147fde4d3ad6093ad51d9b3c5e64bc28297add868281f1fe25382f450 SHA512 4fe92d2d4e6d8a0179df9c2748f6740d7c8f0cabab18650baab8df6ab1008a61f48fac5f82cf65f3f08341679dc3e554a37ddd98bb5cb0912d0cac4e6302f22d
diff --git a/x11-misc/shutter/shutter-0.98.ebuild b/x11-misc/shutter/shutter-0.98.ebuild
deleted file mode 100644
index 9d00eb454695..000000000000
--- a/x11-misc/shutter/shutter-0.98.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature prefix xdg
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Carp-Always
-	dev-perl/libxml-perl
-	dev-perl/libwww-perl
-	dev-perl/Glib-Object-Introspection
-	dev-perl/GooCanvas2
-	dev-perl/GooCanvas2-CairoTypes
-	dev-perl/Gtk3
-	>=dev-perl/Gtk3-ImageView-9
-	dev-perl/File-DesktopEntry
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/JSON
-	dev-perl/File-Copy-Recursive
-	dev-perl/File-MimeInfo
-	dev-perl/Locale-gettext
-	dev-perl/Net-DBus
-	dev-perl/Number-Bytes-Human
-	dev-perl/Pango
-	dev-perl/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/WWW-Mechanize
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	virtual/imagemagick-tools[perl]
-	x11-libs/libwnck:3[introspection]
-"
-
-src_prepare() {
-	hprefixify bin/shutter
-	default
-}
-
-src_install() {
-	dobin bin/shutter
-	dodoc README
-	domenu share/applications/shutter.desktop
-	doicon share/pixmaps/shutter.png
-	doman share/man/man1/shutter.1
-
-	insinto /usr/share
-	doins -r share/shutter
-	doins -r share/locale
-	doins -r share/icons
-
-	insinto /usr/share/metainfo
-	doins share/appdata/shutter.appdata.xml
-
-	# .po doesn't belong to installed system, only .mo
-	rm -r "${ED}"/usr/share/shutter/resources/po || die
-
-	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
-	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
-		|| die "failed to make plugins executables"
-	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "writing Exif information" media-libs/exiftool
-	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
-}
diff --git a/x11-misc/shutter/shutter-0.97.ebuild b/x11-misc/shutter/shutter-0.99.1.ebuild
index 9d00eb454695..8a35f2c4fbd4 100644
--- a/x11-misc/shutter/shutter-0.97.ebuild
+++ b/x11-misc/shutter/shutter-0.99.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop optfeature prefix xdg
 
@@ -9,9 +9,9 @@ DESCRIPTION="Feature-rich screenshot program"
 HOMEPAGE="https://shutter-project.org/"
 SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/perl
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-perl/GooCanvas2
 	dev-perl/GooCanvas2-CairoTypes
 	dev-perl/Gtk3
-	>=dev-perl/Gtk3-ImageView-9
+	>=dev-perl/Gtk3-ImageView-10
 	dev-perl/File-DesktopEntry
 	dev-perl/File-HomeDir
 	dev-perl/File-Which
@@ -42,6 +42,7 @@ RDEPEND="
 	virtual/imagemagick-tools[perl]
 	x11-libs/libwnck:3[introspection]
 "
+BDEPEND="sys-devel/gettext"
 
 src_prepare() {
 	hprefixify bin/shutter
@@ -67,10 +68,10 @@ src_install() {
 	rm -r "${ED}"/usr/share/shutter/resources/po || die
 
 	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
-	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \
 		|| die "failed to make plugins executables"
 	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+		-name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables"
 }
 
 pkg_postinst() {
diff --git a/x11-misc/shutter/shutter-0.99.ebuild b/x11-misc/shutter/shutter-0.99.ebuild
index 144918c4f2d6..b1392c23fefe 100644
--- a/x11-misc/shutter/shutter-0.99.ebuild
+++ b/x11-misc/shutter/shutter-0.99.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 9db0129d716a..f2056e9ce6b7 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,3 @@
-DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
 DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa
-EBUILD sxhkd-0.6.1.ebuild 617 BLAKE2B 855913b42866ff8bac062f42d6215bf60b95ff76b120c795fc9288cb0e5719ca647b8668e0afcd7750a7e4be93a6e2a3b3c94e330b1fa1f61490256304656046 SHA512 4a31ec97909773124d3fb04bf3b704b232c09d3f0221a4e1e25eb2ef24f2052b5fb7e19d96b3f2bc1fc41ece9e7e1debb3a13f7af9dff87bd681437b977eee38
 EBUILD sxhkd-0.6.2.ebuild 667 BLAKE2B 7f066bf4563c1bedb2ca00c383cc4f9fc85ade14c1241ca6ecc07eb947d2273aae67ec8c08dcd8d085afa6fa69900c2299cf0b104a4e9be0e4b4e1b01b6aa2ee SHA512 32c4aaa0cf8020a71edeadda136db6a124c91ddb3d14898c09011060e536bbe2b5a58fd913bdf94196c676ee810ca1d09fcb6b20e9db740282b4fb4628b776ad
-MISC metadata.xml 328 BLAKE2B aa08b578e236cce8a5be46e77ad4ebd03b72f961e7f5a5434cd2b0943c9fb7d2272d8ade5eba20ce070490e6268303b46b9f6319f506c5a962b558baf997c106 SHA512 4c3a54be8d3b61920b44da68a64942c3fab360921fda741abaaa4284562151e1418dc84e83b49ce4aa500d83b0e054343fc81821446ca75c5db5a5d595560ced
+MISC metadata.xml 328 BLAKE2B ef5ee0d2400003eedf0d3a6371233fd6dee54b0c372458c25c14754959f7553731ce8a989029fe23462afcdd0a5d184a23808e619c465c483c1b8e72a77a6f48 SHA512 3ef7078052da12bb622dd64e3c6df6ede3e271953a2e9bfe49288a19d862e22bd085cd0b1aafd6e7bb16cdb9deae4d63c293f40f62ea4a0abc23b248df091a00
diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml
index 5fda34c202f8..1f1b477b4371 100644
--- a/x11-misc/sxhkd/metadata.xml
+++ b/x11-misc/sxhkd/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">baskerville/sxhkd</remote-id>
diff --git a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
deleted file mode 100644
index fcdc146ee0ca..000000000000
--- a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Simple X hotkey daemon"
-HOMEPAGE="https://github.com/baskerville/sxhkd/"
-SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="x11-libs/libxcb
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}
-	x11-libs/xcb-util"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	systemd_dounit contrib/systemd/${PN}.service
-}
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 65460a004b29..32609c781cd6 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6-r1.ebuild 975 BLAKE2B aba3153ef2ae976380555aee19a390f02421886562c98f4b12f4a489522aa066121bacc8399e30263400922c181b3d74b6533a8dfb912166e15d1b2ce310f570 SHA512 2357091f0c4f889700e6946bab5a239de0e18fc02bfb822b13153fe3a7eca70f02c5f7575fb2af26652b9d4a27ee0248457c5dcd1b7987c0edc58d3f1958b85a
+EBUILD tabbed-0.6-r1.ebuild 974 BLAKE2B bc2c127509ba7e31f84712d7b5c246c5b0844b2ae567fed5d8589c5b48eb193f49d70764a722cd10aecd46d7705a7e2e2d2d2f546d6f978d79f4d24dce783305 SHA512 41ffea7ca5d761519f30e77a968706ae7be7877804d569e4c6cf0c2957d7ae68f3ba993206f27ef1e59ed66a1c7ecb6bdd84739dd717deebc2db8775e5cda19b
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
index 790999dd6b2b..7351759f0314 100644
--- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 85232b0bd665..b27971e9778d 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 AUX xdotool-3.20210804.2-no_hardcoded_pkg-config.patch 1073 BLAKE2B 570221beabbad51f324bded0398afd68e9d3d4f30216b7a643dc9f8c76163721bd32778137fd322faffc2edafbc63d10cc036ec5311496b24410c737735f6482 SHA512 cb206c2b708835d8f3c656778edb07f08faafe3f9c1b407526e45321dc44b59981617b0c7b96865d6c1b968c855d40c0302ce888e8a1f57719b87ee9e774449e
 AUX xdotool-3.20210804.2-no_ldconfig.patch 493 BLAKE2B 044f6896b2f1279795a4263107309886518698125a818522a771374f3a1f2242f00446e87eaaff3b5eead3840459fc249405d49d47e7cd6568f5c923e096fb34 SHA512 7b3d4fe4a532e81358d81ebe9fd6e212bcceb08700df37d7d4c7fc16d95177c8f39ec8ef5a986eb6a08e7c6d209efaa8426483732dcedec39617b203de2faac5
 DIST xdotool-3.20210903.1.tar.gz 115051 BLAKE2B d1be4fc2f5c86991804b63b85c95748dc04098f85a515b3427d980dac3d355133da0408d3e91a39e5363ae6242b02d268a8b5bc014fdd5faf51e43e24fb54176 SHA512 446ba8d354031df6a21957df92220c7dcaae5bacbb8878568a57f31097db72a88701717ec8bcd35cca3f5356bfaf47eb3ed65d2159f03b0c7a7ae5550a9b1dce
-EBUILD xdotool-3.20210903.1.ebuild 1407 BLAKE2B 5b6599002f4e59db685c8cf4621e2ad2f0f25ab4317c6b70077c1c1e38563467baa9af93a5b3897f91c87c7ac0b6cb5055e8709384d741b7af340b73fdeb6c7e SHA512 52bc7955d5190c9ebc0b17a4aa2aab979660beda8ad0b550ef7ba5d0a29002966646fda704ec0f29b8aad46805aad4408df8c3ec91e4b19cd4c9c01555a771df
+EBUILD xdotool-3.20210903.1.ebuild 1414 BLAKE2B 122aec097283e3d75980d9639d982719a0ce3af7501dd2877ffad27d7e17358a369913b4aaad97b04d5e7d46d4a0e88492b18bd17f49bebfab660b34e226faf1 SHA512 da30202930aef39942f58d6f1b9a24cfee833e4ec69f50f43c50d2fe0e1f49dc4f9d86d7b5722f3226ba7d8efcdccb35cd06af71e7f29ab4cb7c09254c05905c
 MISC metadata.xml 560 BLAKE2B 9977cd6c5efe52174f07e4ef10141b7742c904c86afb7305ee82f9f222b2cf62a5b052f171f13d69cf3a7b00bf53f759f4cd108e7b285fafec5f5995828c0888 SHA512 381d5c1933c426b1847d2f239de60c68ec4877b482e6c33b60dffa74c7ff729cd5c62f852adcdf92b830ae8081f0b4c1a498b58416022f49bbae2013ca82ee74
diff --git a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
index 74cc0440567f..dd2a934b7fd1 100644
--- a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="examples"
 
 # Many the tests want to manually start Xvfb regardless of whether there
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index 936b72b9ae4c..9b3c2b243720 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,3 +1,3 @@
 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
-EBUILD xfishtank-2.5.ebuild 793 BLAKE2B f5e21a60bd5e740bfa2467dfb80659443cbfd55aa3878c73b985f76d619458016d3ee9b46103d582e666cfa1b57acb645b643addae2c173fc4a6dae8960987bb SHA512 09f6e410bf05471891dde26f8e549913420c5a176cddf0f685c9638fd194b6cae7b83162a8a68c4f7677e9786ecd92845db54d3de0f425f00c85e5afabff040d
+EBUILD xfishtank-2.5.ebuild 807 BLAKE2B 04870b17b7819646d3df34d371ce2f03763a4b5aca7620e333e41507e9cd073c94c3aa5dddc642bb010da0fc86dace11cbbc8d881a938b3184acb86a20054519 SHA512 7b93cf3e87cee2b3dd0a85d7491e1eb9c72a095fb317388912c497a78090a081d96a313f0bacc8289a92219e63461cf424f0ea14a50537cd405a62d67716d3e5
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index cda06f5cd4d6..c8e58903ac86 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Turns your root window into an aquarium"
 HOMEPAGE="https://jim.rees.org/computers/xfishtank.html"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 7528b8adc582..b8cd7779b175 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -1,5 +1,5 @@
 DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9
 DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
 EBUILD xprintidle-2.0.ebuild 653 BLAKE2B 8f17fd7c476ec814022435caba734d1cbe0cb21dc8d9c522d52a267304efd1ab0b96f73166e6ca0efdc63d793fff03f674bd094857fb36108c5e35c9788f3e18 SHA512 94c94b601d05b720c99c080074af43276a74415f3ecd670a517298945f96c5efdfa393483028edbb35ef7f4a6fe4a80ccf35b44cdb0466205f1b540c081a343a
-EBUILD xprintidle-2.1.ebuild 512 BLAKE2B 9c5cdd449e651e540626d6f0dadc0a405b0237c7c404456b93a2c09c7df188c987b3e2515991d77bfd25ab83a9a365bd7a2bae279873f3238c25d59cd52aa5e0 SHA512 ff01449cd64f7e82e211a3d46e04838104124bd63aca3d221cf09f67ad1c89fed04b583310f89681e06f5e6be2018bdc1d9cfd5481e6ed52eda5adab4ef10f42
+EBUILD xprintidle-2.1.ebuild 519 BLAKE2B a9502c5105358d9d6b2899153e4272d0104bb6d80a118acfb07963ed03d436cdbbddaeae664f137a48a619a3b33b92b1f90ce29acc21a7ddf0281c64b9e16cae SHA512 2ccdf6b7464894210c060db044311b4d0bbf8915fce8f9e3db3274ac224528d81fede1a35fdaca619f2dfb90461826595615d327035f448804f865eefbef1af0
 MISC metadata.xml 305 BLAKE2B 30358c219bb97538c65b0f57f3e931a5a8011e6597d091c2ab159e08d788f3f450fb0779b1229acef0ed02fc11653b0bb6f49cb47a241dc5aec28c1d2ac9b7e1 SHA512 ccc0edcd4814004c6bb6fb768a4e6789153b4c8d8387a5d3fccb42a9f3c8b61548ad7be9924da7aaab16320be8009c32512c8fcd578dfac8b8d2d147f3145a98
diff --git a/x11-misc/xprintidle/xprintidle-2.1.ebuild b/x11-misc/xprintidle/xprintidle-2.1.ebuild
index 6ec6053ea3aa..22c3a3eccd91 100644
--- a/x11-misc/xprintidle/xprintidle-2.1.ebuild
+++ b/x11-misc/xprintidle/xprintidle-2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Prints user's X server idle time in milliseconds"
 HOMEPAGE="https://github.com/lucianposton/xprintidle"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index 5fac74d6d2de..5f603b91283f 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,5 +1,5 @@
 AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r2.ebuild 723 BLAKE2B 9e83d5c5fa743211851cfcbc4068d30fbac6df92f391ed1b8ac96f979afa77c2c626618a1d513b6602c14c16878fc7bc119d010a2cf0d27d0283a1338816d80a SHA512 3ed0de8a105352e5b11d2a6a779fc4032869648efa8cb4e65256fff49751658742976ee798041d7da3089abbe873778dce357e89f5f8503ba276510635ccaeac
+EBUILD xsetleds-0.1.3-r2.ebuild 737 BLAKE2B 5836d66c4667bfcbabb226d7518cf6d77f27efee7a3a209a59300435f398266bc995e26242a512a7aa923286b76c32bebda28068c3c49c4757e7499866a5e53e SHA512 e90c1794944aa246d12b750d7ea56e820560b550915c8920f13b5bd9b83439fd777e10890d00098a208f54701b7c102259759be4d60abf5a5f55e9bde0f9c1db
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
index 741d565b461c..1de8663792e8 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="small tool to report and change the keyboard LED states of an X dis
 HOMEPAGE="https://github.com/bmeurer/xsetleds"
 SRC_URI="
 	ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz
-	https://dev.gentoo.org/~jer/${P}.tar.gz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz
 "
 
 LICENSE="GPL-2"
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 6b11f1a16076..699fdfad4b76 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -8,5 +8,5 @@ AUX svg-appdefaults.patch 777 BLAKE2B 5fb362d421569377f907a07446b437270e01b75acb
 AUX svg-flags.patch 7143 BLAKE2B bb05bf9e8ad16983dd82670283c7c8a7915f358556eebd065b7a70b66c54b6c9ec37475f192bdd49c7734d5fc84c15939512b7f484667cf3dcd49aa2fc6a94e1 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd
 DIST xxkb-1.11.1-src.tar.gz 38123 BLAKE2B eb7cce9a6e64cdcf1a75e375f81f43edd312f443294959fe7b169e5bad1fa107a2e8294edc3b13f1022055027fdae8d52aa5fddef57bbb9f283a63e369b93de6 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f
 DIST xxkb-flags.tar.bz2 2541 BLAKE2B cb8d181ea21dc29881450b2a12e381c72e98f70c225b25db53b183337436d30e300b34d983b060a8618b927afc7a43d10a015f841d4fba663a9856238904bff4 SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9
-EBUILD xxkb-1.11.1-r1.ebuild 1702 BLAKE2B 9a043cfb89efd153c476d25f12806b6bfde20ed7e898cc9f1ff3abb4072ae43fad31588f9a2270ecaf3244df1b931a73208dd26f41ef5185095aac3e2cd8dd48 SHA512 cbc8701aed9ac8656e966b3d18712a81c248d00d7f5dc3f92d2c2b8cf608d3a4c2f45d933883931ad2f6481dbda8a5d33ee0ece8d83bf74d2369b92c29a90cd5
+EBUILD xxkb-1.11.1-r1.ebuild 1716 BLAKE2B 20c5fdfd1d55af1df111c2b57fae4fd0ccbb9c23ece83e93e8baa1a92289d135636ad05074133ccea361e0c35f1b93ca6a753684ee925f4e5c633edeb190f049 SHA512 4e68639a1d60b3b93cd227472d935aacc31facd74df052f2184de3b4e14ffd9d3ad8d7dd9d41e9d7e204c78017016493107b9479f02a24e2c83a10507ce0ed4d
 MISC metadata.xml 351 BLAKE2B a8344cc173184a570e48ff949d23953825f584c595ae890e38df788cb1b70df6ab3076cc5f5ab57925fbe3c1daa4e552761ced55c49a9e403c952c9b51f19fc9 SHA512 45599b1edb01d31d0ea557d7905f80353088fd1bcfeac1e6b1790b6ec9115c7bf8e7944ea25fb0605af516869e2e0c63173cffe32125ea2ea24fbbf78434b0ba
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
index f95535a71bf9..b0977944da0a 100644
--- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
 HOMEPAGE="https://sourceforge.net/projects/xxkb/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}-src.tar.gz
-	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+	svg? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-flags.tar.bz2 )
 "
 
 LICENSE="Artistic-2"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 208c13b7bcc2..0a9c1c11ed95 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
 DIST zim-0.74.0.tar.gz 2917916 BLAKE2B 32b1086395142d07b46425264e3ee6d6782d62f138fb661c0bc392b09054f0664e7a2d8b75f409a843b1e85c93a11e41e041019f69ef657e11d311253ba804ae SHA512 39e3849c14bc474b90583a708c8ead287b27a8eb5f714ad63f168f205fb6584c4ff2f9df45755aa3e3b012639891587c7153ae4e0fef71276241ddce6e32c01f
 DIST zim-0.74.1.tar.gz 2994036 BLAKE2B 9de89ce74bc08ec0b60f34d693ffdb3b8220efe6f03e3d77686c9d3db135713d7eb5e0beed35eb6f979e489f12b9d65b9b66e0e7449c45b955711684154ae6b8 SHA512 f78bf1ee6082488efe2e581984c85ffbddbfb7e5adfdf491232e93a8376580275f329e2d02c482afd70bbc70f62ca6f0b3bce636cff58b0a1d592dd4b8194e3a
+DIST zim-0.74.2.tar.gz 3008954 BLAKE2B d0ecf666804931412f6e32aef54193ed96c67049e0fd3e7a373973d4826f16a9483eaa0940cc953573c104c704115905b036e5d0355961c0be86bebc6189bd9a SHA512 112c1e9d28a10643711f665e03c8a37259637b3471338aaca0a834afcc96c658ca5bf863e63bd5f01ce1fcdfb3eef3f2dcf1d10f8113d2158af2e91234b023b9
 EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff04a8063993da14b88c05a52c695e7d5163e15992795d3669554c26aa13b12e1d0093f8c815ad57805ef3d5 SHA512 6b82081c2ade2497a49db760a3cf2ea0c7e073de9ca639e2deeeff5e68c0d5a299c93b35839c96fcd6764f8f3c939504f4541fb0d296d390680131def695b5d7
 EBUILD zim-0.74.0.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 EBUILD zim-0.74.1.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
+EBUILD zim-0.74.2.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.74.2.ebuild b/x11-misc/zim/zim-0.74.2.ebuild
new file mode 100644
index 000000000000..131369dc0283
--- /dev/null
+++ b/x11-misc/zim/zim-0.74.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
commit	46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree	db33a91259730be84999e13a8d8168c799f50ac0 /x11-misc
parent	e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)