gentoo resync : 31.05.2021

47 files changed, 227 insertions, 560 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 16d138ba3446..46b362f2ea41 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index dfc2236be2dc..14330f798f4a 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,3 +1,3 @@
 DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9
-EBUILD alacarte-3.36.0.ebuild 815 BLAKE2B bcab60781f6e562b107c1dcc1832e2035e184c7d607d01e29e26f416014c2eac03c8d3c099e77c78f384347f7bef809ab916aaa0629e49ecb76364ecacb9834f SHA512 b8397835702b33b0e5a54019cfccc77f19fdb21683b25f347d73fefdea72cf84d31fe9e087dc14413e8098a81d1bd2eb5bbff00c69f98e491fa2fac39a3a7cf8
+EBUILD alacarte-3.36.0.ebuild 816 BLAKE2B 3badd1ee97ef7aa51a7d59c9038c711f859dd1f3a1ad009bec1ae3b00af19d1607963cffd2144a117fd3b55555eec0c95902a55bfbf7a1acf3e16e0df05defbe SHA512 322450a090a7592ce83f1e4e1ef44d4a27ccfbbdcd1e145335b41b3c3c4cb1e920dca8b679e85de4a46ce83909c4118911cb8edbf11d7959fe703750e989e047
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index 5a2ea11ced13..46c67df8409b 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 63f560c6454f..5772c4efa8b1 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,7 +1,5 @@
 AUX 1.4.5-optional-introspection.patch 2436 BLAKE2B d2572caf95e94e12f64a1a15bdb2f686a0fc5196cd29b66f2ff7f312bd904167442b60e6cce05c738ffec0c06ed8da280e6738082afca2a9117576fcafd5f0a8 SHA512 46a0b28dccb54adfe562f3f5763ae6160588be7ce7d4bd6f691d15e4df3007d08a28c1c4f787abe05eb37ae5d07a058021553989c584180c924e6ab4a6a06016
 AUX 1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch 1768 BLAKE2B b8620120b46b9095235d33d92a862971ed6d3944ed7cdbfb44eb161104e96c571327965267ee8de10cfac71fa3956639f87c6d16dde81571f5f2e0c7db073779 SHA512 ca08f1325fde85da14f7a348df054ff47bc2a008f57f33c7cb8a8f60394bdb453da1e94402bc69cd16a9ac4899f0b75766b879b1a1cd8217b39557d4a3856158
-DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
 DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
-EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
-EBUILD colord-1.4.5-r1.ebuild 3664 BLAKE2B 74774d26de158eed64280133dfcab40c9aec31f4a0ce0e858af92b924f1e715b48e09392462e0b210771cea1e75e7abbdee89712b50a9df8b56f9856f10852b9 SHA512 552f5e8c7652ad91a2331bc76066903aaacaff19593beb522d797d8fc5dc5dff95b7e9a68fac866da4ab924e061750cb54c1a39b922dd9579fc70099b56a1c09
-MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
+EBUILD colord-1.4.5-r1.ebuild 3658 BLAKE2B 374af8d4a2918a98111c5cbb87444083dd0e5dbc2fbe0ce1009f4ab5a6c1f9b12dbec62ceff65d0df3ce1494c1b897e83c2e9a82281f694a2036455186dcae5b SHA512 21e5c65efb78d1b9d8b562e1404e6775f4048ad89786661d11dd0839e83ad42e47c233cfc7be63622443a7dd4451c1f9582ab17b6f5298d76749da4c7a2e0853
+MISC metadata.xml 458 BLAKE2B 3816fee30547f80623e541e6557a7b07111bdd5490a0bd39a85e0361ac1c65480d76072eb97874e77a554123867085779aeaeeda59445495801fb6de2cb6ec08 SHA512 c51de7dcc0ddbe4a4504fc2494d0c5571e662ce3bda84e8686cbef34a92f44be9c3d220cd302e7677a2d23e25a842e94fa970d378153bd56bbd919d014cd683d
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
deleted file mode 100644
index e8a2b5c59e3d..000000000000
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 check-reqs gnome2 systemd udev vala multilib-minimal toolchain-funcs
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
-	gusb? ( udev )
-	scanner? ( udev )
-	vala? ( introspection )
-"
-
-DEPEND="
-	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-	argyllcms? ( media-gfx/argyllcms )
-	gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-	policykit? ( >=sys-auth/polkit-0.104 )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus
-	)
-	systemd? ( >=sys-apps/systemd-44:0= )
-	udev? (
-		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=[${MULTILIB_USEDEP}]
-		virtual/udev
-	)
-"
-RDEPEND="${DEPEND}
-	acct-group/colord
-	acct-user/colord
-	!<=media-gfx/colorhug-client-0.1.13
-	!media-gfx/shared-color-profiles
-"
-BDEPEND="
-	acct-group/colord
-	acct-user/colord
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )
-"
-# These dependencies are required to build native build-time programs.
-BDEPEND="${BDEPEND}
-	dev-libs/glib:2
-	media-libs/lcms
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use extra-print-profiles && check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# Adapt to Gentoo paths
-	sed -i -e 's/spotread/argyll-spotread/' \
-		src/sensors/cd-sensor-argyll.c \
-		configure.ac || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && tc-is-cross-compiler; then
-		mkdir -p "${S}-native"
-		pushd "${S}-native" >/dev/null 2>&1 || die
-		ECONF_SOURCE="${S}" econf_build --enable-static \
-			--disable-{argyllcms-sensor,print-profiles,shared,udev} \
-			{BASH_COMPLETION,GUDEV,GUSB,POLKIT,SQLITE,UDEV}_{CFLAG,LIB}S=-DSKIP
-		popd >/dev/null 2>&1 || die
-	fi
-
-	# Reverse tools require gusb
-	# bash-completion test does not work on gentoo
-	local myconf=(
-		--disable-bash-completion
-		--disable-examples
-		--disable-static
-		--enable-libcolordcompat
-		--with-daemon-user=colord
-		--localstatedir="${EPREFIX}"/var
-		$(multilib_native_use_enable argyllcms argyllcms-sensor)
-		$(multilib_native_use_enable extra-print-profiles print-profiles)
-		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
-		$(use_enable gusb)
-		$(multilib_native_use_enable gusb reverse)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable scanner sane)
-		$(multilib_native_use_enable systemd systemd-login)
-		$(use_enable udev)
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable vala)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		if tc-is-cross-compiler; then
-			emake -C "${S}-native/lib/colord" libcolord.la
-			emake -C "${S}-native/client" cd-create-profile cd-it8
-			emake \
-				CD_CREATE_PROFILE="${S}-native/client/cd-create-profile" \
-				CD_IT8="${S}-native/client/cd-it8"
-		else
-			emake
-		fi
-	else
-		emake -C lib/colord
-		use gusb && emake -C lib/colorhug
-		emake -C lib/compat
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C lib/colord check
-		use gusb && emake -C lib/colorhug check
-		emake -C lib/compat check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		gnome2_src_install
-	else
-		gnome2_src_install -j1 -C lib/colord
-		use gusb && gnome2_src_install -j1 -C lib/colorhug
-		gnome2_src_install -j1 -C lib/compat
-		gnome2_src_install -j1 -C contrib/session-helper install-libcolord_includeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/x11-misc/colord/colord-1.4.5-r1.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild
index a3b707ebd6d4..16edd7929b58 100644
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala"
 RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 2ca10f47e351..5a2462430db0 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -9,7 +9,5 @@
 		<flag name="argyllcms">Enable ArgyllCMS sensor</flag>
 		<flag name="extra-print-profiles">Generate extra print profiles.
 			Warning: significant build time and memory requirements.</flag>
-		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
-			colorimeter drivers</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 1f9dbb2a534e..bf2d9577e225 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
-EBUILD compose-tables-1.7.1.ebuild 923 BLAKE2B a16c544ea98f30284a77811f03b5a553afca851be5a252e6e7089eb60069886f3edd5de121e9cd14666faedb7a96b4703b9bab0cf9821272bef129fa6fcad461 SHA512 77cd00826542b0397b1cc954fc67d0a51df1d05cff191226536376f0bd179ff1a8c9d31ebc41f12bee0219b1134e4040dabfcf29a9aeb75b2dba982e0167a89d
+EBUILD compose-tables-1.7.1.ebuild 921 BLAKE2B 17b09ddcc3e3edb7f3680b303de817b1fa68e0b092b81e574bce64c738673a7406d412413f89f46fb5cd99b62e5f0e1db48ebfea0f7eaf0bf84d818820f959a5 SHA512 529bdff9f93c80a549f2dbee98aa78b5e4063ab4edf4dbcd93825b9fde10a847ff4a7af95b42cd71f56b9db39319331869101f3eb000daa65ef8d0cab07cd1b0
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.1.ebuild b/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
index f6965e30115f..4b1e8e42f324 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index a89fcf90af0c..acc98ffedd3d 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -3,6 +3,6 @@ AUX imake-1.0.8-no-get-gcc.patch 860 BLAKE2B 712c3c150ddcc57fea50d8eda31933c0cb0
 AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a67a426a77a0c4733f5b7bed990b7a2e5e59e524ea907c7b215b2232cf9674dddfa29974a90768487ddfa97399ac21 SHA512 1e5034209290387b3e0320f85eab876a5ed571896072c3da940e6fa13eb4a2ecb6b325104125738ae3502f420b5aaf00797ca9b71a832dcfda72a911df5e5029
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8-r1.ebuild 662 BLAKE2B 0824c55bf9009b28ce38ab5798984bbef4e35a3865b2def51226b3f526a8f3a763e7f96b3a43070dd02677ebb89643a52a0855de53917ef2100d2364654029a8 SHA512 07c1c881c62bbe98e36e8ecfd17d8a67543b748ce8b80e3d486b02f6636bdcafdb676eed20913a8c776f19a5af2775eee32f7e06a07ad95d71912cb13c2772d0
+EBUILD imake-1.0.8-r1.ebuild 669 BLAKE2B fffeced6a323ac87f412a39b1da3b3f26790c5586ed263b654eb988e1d9744e3a6040dbf7db58790ce63c4511fe1fdf1b200e6ff6cb6d1c5681864c63ad24922 SHA512 4cd1af98bbdd444b4e7edad26221691641fb84c68d3574c871efeb997d52863155611d313aee6cacc3da7c34adacda434d04a89ccb7c1f9866529fce79f2c323
 EBUILD imake-1.0.8.ebuild 508 BLAKE2B 10f2fc16413dc09c3ad1022bee49e7ee54c0186836a821bd279520d70877fe37bd27b5cecc8591c346437b9934e45aea3fa272689e0aee99cb6aab33e6952dca SHA512 f37a1fae560be0236d4919d0ed7cd83a2a93504de77d266d732d89382d28f5f2dce6c526ddc1a5dbfda3b9603b0e4101db136de5e7bc18b8e3ed3fb74a7f9266
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.8-r1.ebuild
index 288d12c0a9cd..830b9e883a5b 100644
--- a/x11-misc/imake/imake-1.0.8-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-misc/xorg-cf-files"
 BDEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 105e15236919..f3f15ee45330 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,4 +1,4 @@
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-3.20.0-r1.ebuild 842 BLAKE2B 74258d04a4a7c89663e7046e3e35cdf36ea0e4f39ac3e0cb52eeea8bb95ecb27be3701c0d9b06984984316285009bd36e8a511d1a2977d62a0ccc346770385e6 SHA512 21d68f573d7eaa846e6deb67b570fb8edde276087ed75f5cbacfcf76aa230de9c65c413f4a7eea6faece860792a61e0fe4101f527fd3255bbb0461750362d78f
+EBUILD notification-daemon-3.20.0-r1.ebuild 849 BLAKE2B 217199a1e274edf598d59c17c6f65f8a17b84ab0ab750fecadfc5575f5750042882d00424e2d0b84a6192d05bd91d54e9ec12179a4f6eac8994cd2795666f03f SHA512 2049a8f8f3cdd1627f3c16f2ca17ee83f0d434afd46cc7fa4cdbc129e267fe458eedd954804834f0d799f593a3a4d3a261c5e4bf7deec39f5553fe8d0487cece
 EBUILD notification-daemon-3.20.0.ebuild 922 BLAKE2B 82a6de852b65ea70b4516c41d6fe6521809a926f7eaa1e92905fc6113c0c14a22306a670666d7c7a3fdc8be7396034860636080efe55e8f3eeb4ddf87bb3bda3 SHA512 e08f853f4246530fb81e81ff431b9f95af71a28de6bcce35621995267ae68cf4e4cc3176c97fac6bb26dd5fe76117bcdd78464b2f3e1d22ba61a81f18ed6a319
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 0d5daee27e48..f68339f0a720 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 1c63db96c629..ecce3b806876 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,9 +1,8 @@
-DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
+DIST i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz 43693 BLAKE2B a84525b0bd00d4ab4ed8afed00fd92eee965efea9960670dcea3efaa259834df5bb7cf8e79a894dd4d4f92f28643ad1b43ccbb374ade96174c6c2f6fc63f5ddc SHA512 f4643bea5a78bd9518fecc9d56ece8d679539b99016440a6e4d45305984c02963d80e00c5375cc53ac7418e2f24f57279930428b331e077eaafa8d0717677662
 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.5.tar.gz 282816 BLAKE2B c6bd7283fa30197446cc328f52b0d9ed6eadefaf6b19327898f559f860009b43d9923ad1d00bcf173f6a3663af6813c368563a9b59e91828ab8966aef722eea8 SHA512 f4174e82871aafcd890145eba472fc8c3055dafff4ea19123fa844d8bce2e85152e0e597496df8af257ef00d676e744249d204bb52668e3f303cc57a6fe3fcee
+DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b077859dfc98d57072ad23f6140cc2e7d34c34f5af71aeaf9e86642d111f409c53baba0b9398d923ad9b4058a4 SHA512 5022f7876489cc28805a52894c8ea42c2afc0600c84f6ce27f1a7c738fcc48fbf5f5d5537472378eae4f3d5ca36fc2fc8b069b379e35b1047d12a3b294e1857f
 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 1847 BLAKE2B b90f7c59488451a139ee333f8d2968d259fa8233c305a942240fd308a01a2fa4875231287c0c6322ccbe0ca4e192a9de7280c9c307bfcaf574a15e33ba149db5 SHA512 8566dbb9a57dc6661eae3b59dfbee440063427f9a485849f7ab94c6432698df73907bb0047b57116d94972a9e6dee64ec3ab5486ab017440c6a846746ab99354
 EBUILD polybar-3.5.5.ebuild 1911 BLAKE2B 805f8315391694f97b9d61169e421dca938922ee03e86355481a27e38530f04deda99cb39fb0b9636f3b947311f955eb70e462a521a3aa3ad0ce7caa9c6029d6 SHA512 587b4f2310137041cab875d2997b3d87bf450573db3f523c25ad6a3cbb95039ba34253f774e9465710fb9cf6f3691a44a7f4559f9545614121fecf355c887fca
+EBUILD polybar-3.5.6.ebuild 1913 BLAKE2B 0366673fe7fbd17976d806adb6bb3595a0d2a9ed6d58edb831405a7ee8970716c53120483eb8509260404c4021080bdc97c86c35d15335f17c7dfba17caad11c SHA512 476d1ebb49c4bb61692483747c98167596e4071007b304667e2bda7beb8eb84f115463920fcb35665a072f775f8b41c33a66cc811d27ee36e42c097e5d440a54
 MISC metadata.xml 690 BLAKE2B a67ba0ba7acc59f754a50d95fbde39c861a0253845f1bf965b82d3b7e9ebaa699ff12ea60ebb2018a6518d7b0fbd3baeed05ff7496d302932bfd11aa3077387d SHA512 16b3f3e709976ac75c8c45d8963d7224d34c36a452cc7beb18883b912abbc901336dc0d9576ccaeb94f4c28edef5bf951306aca4fce0ca163dfbb970d031d88e
diff --git a/x11-misc/polybar/polybar-3.4.3.ebuild b/x11-misc/polybar/polybar-3.5.6.ebuild
index bb2d1dab4f8e..609e610e7997 100644
--- a/x11-misc/polybar/polybar-3.4.3.ebuild
+++ b/x11-misc/polybar/polybar-3.5.6.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33"
-I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d"
+XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
+I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"
 
 inherit cmake python-single-r1
 
@@ -15,10 +15,10 @@ SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
 	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
-IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
@@ -31,6 +31,7 @@ DEPEND="
 	x11-libs/xcb-util-xrm
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
+	doc? ( dev-python/sphinx )
 	i3wm? (
 		dev-libs/jsoncpp:=
 		|| ( x11-wm/i3 x11-wm/i3-gaps )
@@ -43,11 +44,11 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	rmdir "${S}"/lib/xpp || die
-	mv "${WORKDIR}"/xpp-$XPP_COMMIT "${S}"/lib/xpp || die
+	rmdir "${S}/lib/xpp" || die
+	mv "${WORKDIR}/xpp-${XPP_COMMIT}" "${S}/lib/xpp" || die
 
-	rmdir "${S}"/lib/i3ipcpp || die
-	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_COMMIT "${S}"/lib/i3ipcpp || die
+	rmdir "${S}/lib/i3ipcpp" || die
+	mv "${WORKDIR}/i3ipcpp-${I3IPCPP_COMMIT}" "${S}/lib/i3ipcpp" || die
 
 	cmake_src_prepare
 }
@@ -56,6 +57,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ALSA="$(usex alsa)"
 		-DENABLE_CURL="$(usex curl)"
+		-DBUILD_DOC="$(usex doc)"
 		-DENABLE_I3="$(usex i3wm)"
 		-DBUILD_IPC_MSG="$(usex ipc)"
 		-DENABLE_MPD="$(usex mpd)"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index efe3f255bef9..19a09b7fda1f 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.36.tar.gz 410011 BLAKE2B 29df68e75f652ef964ccbcb26da624fdb3934474f4d03c51dcc8fe8b5f49906eadecd2f53a1d30b7b9d97677b50b3b729f379f2354784ecb7c5b4ecf1017d7ec SHA512 a05a76ce9159407503d4667c688cf23944593cd04d17585a4077f6ee2410041ca420337790905011794aaea326ea2ff736b907d1b67270ed7577041a60b37ebe
-EBUILD py3status-3.36.ebuild 778 BLAKE2B 8b0c7a516b0d05f1e3848f7ef7e50e3374df19c5a051518d59ab8a4a4c01ea23e277e9f4d02ca4fac98bcf0addaad27ab19bd74170ba4ddbce2ccbce31cd07ff SHA512 589cdc28ce2158df8aa1c3269d6a1ae7d243ef35c15deb89ccc9bf025b01e81103cd20efacb7178cba223dc6217b4cf7d01b4970e9debfcd1f3286d69b1b87ad
+DIST py3status-3.37.tar.gz 409398 BLAKE2B da4707290466a291f581c725f58021f5fe3b7248b4e906d1ec8ea5b1b3e07cbef34acc090b2fc418d50187827bec083c3d66ec8359f02b3b451db280934bac1b SHA512 97ad32c11e7a1cdac2e38583cb9a76e5311d109967f0ffd02b0f98070322a9ebbcf8753846f72e5d61d0db85e2bd9ba1138207fa723437298d8b3ddbbf65e128
+EBUILD py3status-3.37.ebuild 778 BLAKE2B 8b0c7a516b0d05f1e3848f7ef7e50e3374df19c5a051518d59ab8a4a4c01ea23e277e9f4d02ca4fac98bcf0addaad27ab19bd74170ba4ddbce2ccbce31cd07ff SHA512 589cdc28ce2158df8aa1c3269d6a1ae7d243ef35c15deb89ccc9bf025b01e81103cd20efacb7178cba223dc6217b4cf7d01b4970e9debfcd1f3286d69b1b87ad
 MISC metadata.xml 757 BLAKE2B 059448fb46b35c9db53995d542d06432e182c022a584351fcd45961f23fca4549ef405eb39aec4fbb59f7e7ec7082428766d917f79fc84ef5ed2684c2030baaa SHA512 3fa373a13f9889d91d863ed3369abb76045447168bd10f62981d14315889d445b523cab315e83afa052baca5881576d398931ee2333a6ec4bf6863e23fb138b5
diff --git a/x11-misc/py3status/py3status-3.36.ebuild b/x11-misc/py3status/py3status-3.37.ebuild
index 249cd9474c6a..249cd9474c6a 100644
--- a/x11-misc/py3status/py3status-3.36.ebuild
+++ b/x11-misc/py3status/py3status-3.37.ebuild
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 8628e9d7ce7f..fead293fa5fd 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,3 +1,3 @@
 DIST sunflower-0.4_p20200716.tar.xz 830248 BLAKE2B 673b320bf08c0e0600fae06a531f75403b0e76bd8a267918986da84537a5213f0a1d99c9de74820f15652b80959e9029566f4611138893f08919f389a66a8032 SHA512 0e30bbadb3d60a64e2a2b629104c2a3ad88d997d581c1c76ef593afa1d3c48aafd185b4cd36da25bed5c3e9b9d1389f0709aaa40e796e883dccfe71b214620ed
-EBUILD sunflower-0.4_p20200716-r1.ebuild 818 BLAKE2B fde070e88b7ff643158e4de317ed9693b2559078f51557a7105c74541c019dd65e7e3193bb05163ddcda213111a1d58939255c54b8d702078f3ce836c9bff01d SHA512 06a378e03f8c2a67cd9b5c93a434b943022a1262ed00e47868ba7e190cbae6cbfab2f5828589ea40a56ba6b279b48a123f61ab9df72cfda886e683a8cf161467
-MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
+EBUILD sunflower-0.4_p20200716-r1.ebuild 626 BLAKE2B 1b1d20279d2a414d9bfca29ae4e6521e6bab6b30cfa8d154b4f2cb9227df1a0b829b8b7b21e80b0b2480cabfb16c6a52015c46583fe85655ff59639f01b5ef1e SHA512 cab7653d51ed7f0859316644fcd872d73607bb7a62c60cddc4711c3eaab72c7551718480366d4edba79ba96e9feafbb820e31c2037f6e86713ff6faf1d39b45a
+MISC metadata.xml 391 BLAKE2B 6713b6c1550908b7cac3e3411dc06254fefe94d1275748f592dda802cd1402312b2f6c64fb1fa7548d97606fffdede3108067c7852629dcb6d056c18db76f101 SHA512 6ef8b9aaa7adbc8606ce421e1391987b0802a48251f1fc09d16b77cc7bcd52812c3e31974ee342336681c85e20e1e2927d95234180bc76834a7bb2e32262a59a
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index a92806229f30..dc8678ed582e 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -5,7 +5,8 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
-<upstream>
-	<remote-id type="github">MeanEYE/Sunflower</remote-id>
-</upstream>
+	<upstream>
+		<remote-id type="github">MeanEYE/Sunflower</remote-id>
+		<remote-id type="gitlab">MeanEYE/Sunflower</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
index 18bd85007e5f..957034424c2b 100644
--- a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
+++ b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
@@ -1,10 +1,10 @@
-# 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_{7,8} )
-inherit distutils-r1 xdg-utils
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1 xdg
 
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
 HOMEPAGE="https://github.com/MeanEYE/Sunflower
@@ -14,8 +14,6 @@ SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -26,13 +24,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	dev-python/pycairo[${PYTHON_USEDEP}]
 "
-
-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/superswitcher/Manifest b/x11-misc/superswitcher/Manifest
deleted file mode 100644
index bbcbee6b193b..000000000000
--- a/x11-misc/superswitcher/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX superswitcher-0.6-glib-single-include.patch 1031 BLAKE2B ee7eec43ebf740aad3a5bacbe26f51cf717a3fd6bfe16386a470f677c147f3ac07b4ebcefd417a825b901fded1540f9c913c3445d62d4a51f0272be6e076ec10 SHA512 76c6d4d86f0b6d41e5aa3c4e4a4cca1ffdaefc835faeda1077eb7721c26d2c45ce1738445a0e510657e2e3af22a83a333e03c44e9e156f34139a5e7d80d72534
-AUX superswitcher-0.6-wnck-workspace.patch 1934 BLAKE2B 5d252c5776363d739e6a490f53e232a9d57f63c31a2cc8d44a367771a6f051cd920a09987e0a2f9ef9dd1f8cd22410061c5ad1eb2c9b0dbda847ce3a9a31f6f5 SHA512 5800acd13ad6b4569762638d2d0c0186414987fbfccd14dff7fcadb4533209168317f7b2e36d718fc79787460d71b9ef22d676458f447b31ad91e1782d856347
-DIST superswitcher-0.6.tar.gz 183184 BLAKE2B c1f6abb573f34b6c2f823d66e2a7ebe0575b690823246705a7c37aa342e3776f1e2240791192af5b9544efb702925b81ec2c9f5a4ecbe868d11135224ba1d2de SHA512 7385c14537a81f3e78509ff7399e1caf84f46fae22ce844f70f7cd72c8865d3808af77229744443178da691dfbcf61cae908c2eb54ef1564c83473ed9ff6ae0b
-EBUILD superswitcher-0.6-r1.ebuild 909 BLAKE2B 1068d94fece9683b4af490468c936def9e17edea1575cece04cc2982084765e974cdc89aa62087c9eb82d8adf5838cf3690d362e413ad6c31efc121e7403dfc7 SHA512 995e85e53454a9e8da710bd1d181a70e2684ed1e42bfd8f05582ddecd6814de75895ba953d1627296208ec9c55ec3e64273a8d5cba2742ce4d1a28d6e6ac3d2e
-MISC metadata.xml 539 BLAKE2B ea00c513d117b24994a3fb2601737c2aad3ce3e77510fb933440021305b0a76e2fed9cbe2739268b197dc731d182055277d4f07572113f8160e1e49d2363bc26 SHA512 f4bd641770962c9f084460751b93cf88676dd04ec403013f638f1c441f6f70a9637e0e1a6e80b271e8d8a2d49640ed71f4cd362fb04bb7b4ed5fa4b3d544fa38
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch
deleted file mode 100644
index fe3249982870..000000000000
--- a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: superswitcher-0.6/src/dbus-object.h
-===================================================================
---- superswitcher-0.6.orig/src/dbus-object.h
-+++ superswitcher-0.6/src/dbus-object.h
-@@ -4,7 +4,7 @@
- #ifndef SUPERSWITCHER_DBUS_OBJECT_H
- #define SUPERSWITCHER_DBUS_OBJECT_H
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "forward_declarations.h"
- 
-Index: superswitcher-0.6/src/forward_declarations.h
-===================================================================
---- superswitcher-0.6.orig/src/forward_declarations.h
-+++ superswitcher-0.6/src/forward_declarations.h
-@@ -18,8 +18,7 @@ typedef struct _SSXineramaScreen SSXiner
- #define ABNORMAL_EXIT_CODE_ANOTHER_INSTANCE_IS_RUNNING  1
- #define ABNORMAL_EXIT_CODE_UNKNOWN_COMMAND_LINE_OPTION  2
- 
--#include <glib/gerror.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- gboolean   superswitcher_hide_popup     (void *, GError **);
- gboolean   superswitcher_show_popup     (void *, GError **);
- gboolean   superswitcher_toggle_popup   (void *, GError **);
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
deleted file mode 100644
index 90919a57485b..000000000000
--- a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-It seems like wnck_window_is_skip_pager isn't all we need to check.
-
---- superswitcher/src/screen.c
-+++ superswitcher/src/screen.c
-@@ -505,6 +505,7 @@
- static SSWindow *
- add_window_to_screen (SSScreen *screen, WnckWindow *wnck_window)
- {
-+  WnckWorkspace *wnck_workspace;
-   SSWindow *window;
-   SSWorkspace *workspace;
-   int n;
-@@ -513,7 +514,13 @@
-     return NULL;
-   }
- 
--  n = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
-+  wnck_workspace = wnck_window_get_workspace (wnck_window);
-+
-+  if (wnck_workspace == NULL) {
-+    return NULL;
-+  }
-+
-+  n = wnck_workspace_get_number (wnck_workspace);
-   workspace = ss_screen_get_nth_workspace (screen, n);
- 
-   window = ss_window_new (workspace, wnck_window);
---- superswitcher/src/window.c
-+++ superswitcher/src/window.c
-@@ -254,6 +254,7 @@
- static void
- on_workspace_changed (WnckWindow *wnck_window, gpointer data)
- {
-+  WnckWorkspace *wnck_workspace;
-   SSWindow *window;
-   SSWorkspace *old_workspace;
-   SSWorkspace *new_workspace;
-@@ -261,12 +262,19 @@
- 
-   window = (SSWindow *) data;
-   old_workspace = window->workspace;
--  new_workspace_id = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
--  new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
--
-   ss_workspace_remove_window (old_workspace, window);
-+
-+  wnck_workspace = wnck_window_get_workspace (wnck_window);
-+  if (wnck_workspace) {
-+    new_workspace_id = wnck_workspace_get_number (wnck_workspace);
-+    new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
-+
-+    ss_workspace_add_window (new_workspace, window);
-+    window->workspace = new_workspace;
-+  } else {
-+    window->workspace = NULL;
-+  }
-+
--  window->workspace = new_workspace;
--  ss_workspace_add_window (new_workspace, window);
-   window->new_window_index = -1;
-   gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget));
- }
diff --git a/x11-misc/superswitcher/metadata.xml b/x11-misc/superswitcher/metadata.xml
deleted file mode 100644
index 496532cac021..000000000000
--- a/x11-misc/superswitcher/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-SuperSwitcher is a (more feature-ful) replacement for the Alt-Tab window
-switching behavior and Ctrl-Alt-Left/Right/Up/Down workspace switching behavior
-that is currently provided by Metacity.
-</longdescription>
-<upstream>
-<remote-id type="google-code">superswitcher</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild b/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild
deleted file mode 100644
index 63e4756b5b18..000000000000
--- a/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior"
-HOMEPAGE="https://code.google.com/p/superswitcher/"
-SRC_URI="https://superswitcher.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	>=gnome-base/gconf-2:2
-	x11-libs/gtk+:2
-	>=x11-libs/libwnck-2.10:1
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrender"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wnck-workspace.patch
-	"${FILESDIR}"/${PN}-0.6-glib-single-include.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/-DG.*_DISABLE_DEPRECATED/d' \
-		src/Makefile.am || die #338906
-
-	mv configure.{in,ac} || die #426262
-
-	eautoreconf
-}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 2df8dc745be3..ae6242634627 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,5 +1,7 @@
 DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
 DIST synergy-core-1.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87
+DIST synergy-core-1.14.0.1-rc.tar.gz 8835075 BLAKE2B 45752196811736ca5790f098bd6d6dce2323b29f21c9c566549ded9fe1cc132b4dc29564a3df8417ed949382c2cef5252579be526a8054c3bb694c4dc530cd8d SHA512 dd8b01dbe07be879814d1ed90fab03280de552f6c87f470721bd2608ed372f5b7c0cb013249910436b8e0b2a5a024d402afa64a2ae7bb85a320cb37260cfc615
 EBUILD synergy-1.13.1.41.ebuild 2465 BLAKE2B 4c841e8b2643d6098a99f6ca929d4dc0e40dfddc797c27920a440c8d6488931c275aa2112489055912b51a5e1745bed54198a8d1452dbedfb7b9a1afb2f61be8 SHA512 5916ec2e135a39fd83491f83d5953f6583501d13f1527319ad777799721d1eede814ffb1840f5884d5490fa6704a5e724ddfcc5260be231effed43345c9c1b9a
+EBUILD synergy-1.14.0.1_rc.ebuild 2415 BLAKE2B 41e7f53b0093101befa373b87a2c1f2ffec5bff8ff8079f3bb07c772bec14999d7bbc2dd87313febb0e5a3893435b2230c468e20fedd655387475c52ca409a50 SHA512 b39d269e192138615d32dfbcd9e3953f1704cda8174a1063128978d7b79b31216f52f9e611f72b4eeb35a54eddc39c1512c319d836666e14398c184e3d9b0de8
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.14.0.1_rc.ebuild b/x11-misc/synergy/synergy-1.14.0.1_rc.ebuild
new file mode 100644
index 000000000000..e621bed9e265
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.14.0.1_rc.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
+
+[[ ${PV} == *_* ]] && MY_PV=${PV/_/-} || MY_PV=${PV}-stable
+MY_P=synergy-core-${MY_PV}
+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/synergy-core/archive/${MY_PV}.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="gui test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	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
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	gui? (
+		dev-qt/linguist-tools:5
+	)"
+
+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)
+	)
+
+	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/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7858b525db5c..ac28b65e4ca1 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-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-2.32.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
+EBUILD xkeyboard-config-2.32.ebuild 1012 BLAKE2B badc44dbcf680de7aa91a2b639f117fde7f799be42804179f99b86bc016dc66135689caebb93f6e504abeb49fd2c2d77bf19ed2ef805fb5ffc1430d7654a2ac8 SHA512 f063fa916ee24bd293037ca460d33d2725f1afc636e626a0db7f5e5d26a2e26d5f6e5832938e9bcf071376525c14c999fe5fcb204bdf76206fef6f983ec7199b
 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.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
deleted file mode 100644
index fd5be0d85601..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 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 autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="${LIVE_DEPEND}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_test() {
-	:;
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
index 268d593d98c2..45904724f424 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.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 ~riscv ~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/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 63f4c2bf65e6..da9eaa7e7166 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,5 +1,5 @@
 AUX xorg-cf-files-1.0.6-no-ar-l.patch 495 BLAKE2B fe86e089f8bf374c9fa17b2608aa4b9e84201aa55065f0a7d9bbcf2ee921e85d2694ec31cb6f570fbb4bd37d15d2bb49c930528640416b0e7434b8eb037dbbc8 SHA512 6227ded01e55325946160131c6742fd8b13d145ac9f64b69d08db44dd809063e8886ab8fa97c52bbf34ff536f3b17c988d49d2bc6d1837770c13ba4d8242a9b1
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r2.ebuild 2116 BLAKE2B f25d7e0d50e9cb92d1521146badef66c3bedcd2b0fa6a0983c8fa2addf1f2ba11b8731e3ed55a1f16d8832ad6d5735a110cf19c8e18e41fedcdb286e356285e6 SHA512 abb3042cbc4094dcb2a2febf53f73fd9d30b0f64bffedb82ee50c8eb1252efe4df5df43890e9db5f5f440668b9f907cc24c1d234ad15049a6252e996dbec7639
+EBUILD xorg-cf-files-1.0.6-r2.ebuild 2123 BLAKE2B 8a5f9dede53e80a256f151ebd12b88b97ce43eb4a4dccb6343fa8cb93afee17eac50a53ad02e756ab1fa9ac27802f9fa184d45893a333f5f9ed4cfa7b15c1f12 SHA512 b87c68d66f7cd591a90bfe178e3bb84fdb273b2e54f64ff5ed2d5ff993dba5ff6b94803cf01795e9cc25e87d2d46b22576aa442e8aa473f0a706c1d834c3062f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index c44c96e2fa9e..728aed4cf895 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
@@ -37,7 +37,7 @@ src_install() {
 	default
 	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
 		"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
+	sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
 		"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
 	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
 		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
deleted file mode 100644
index ce560223637d..000000000000
--- a/x11-misc/xstroke/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xstroke-0.6-sigsegv_sprintf.patch 438 BLAKE2B 2fd171ebaa99bdb4201e04c885f40f848b3d81a5c2f5b131621d6560109afc9994ebfe0dcb8b979eb6ee65fd74c70d4353cb9da30135253540b43d12ba182cd7 SHA512 6ac7fd2b4b64021926c9ec6999df6fd7142b7d42f31012a63ca31ffd6db9848c9687875af508b0f63e7c49dc1cd01057f2073c0bd99409998ec578c44d61f384
-AUX xstroke-0.6-underlinking.patch 443 BLAKE2B 2fe878bae0e5081eda6f2c9855c142ccb706860b17961a564d91fbfa534b971a370e2c76cd247f82a9437af40fe03439e3df8fa7f61a6ca77f37294d10579585 SHA512 ef219a2d56bf52df8187cbfee704d1e0dd91f7f742fc2b83c63dd469eb1f6f2297dc8cd09ab2444ad18f94aff5c95bfbff0055084202363426434f3185074c84
-DIST xstroke-0.6.tar.bz2 140237 BLAKE2B 0419c0375e8579d758730d129c2d2db0de8ecc2f0c73a026b08db8e18818dc2c4d1c4ffff6e9794c48bd645176decbce2e477e182cf78402fc859234438266a3 SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a
-EBUILD xstroke-0.6-r1.ebuild 715 BLAKE2B 8eb529aa6e2efe073b1af286b057cdf89716a415af291ad34f6500a0c77fcc0daa0d5538ec6bf6e8964be98e99b04689997dcd3eb144865333a961dec61b72a7 SHA512 09d9373bdc654d732b3755cb3e67026f93da7308c3d80648171c483c884a5462771aac73bb6b08b49637482c64f9844e6e2a1967bcd2a480bd9afa09e74c265e
-MISC metadata.xml 351 BLAKE2B 86fcbcc77c2532340f1cf6841caa8328012f5d475cb7acc6d3efd69f7c2d758a4fc8a5053622bc61f7d8183beb4be4897a1c96face70a232b1e50688a71d2c8a SHA512 ad9389409b86bb91a79c9706d3662f0794507ee881b689e310b77cc50fcf8079b32340ff0b4231a5584365e9417b4331bd326c99ad3e514e8b44549072991319
diff --git a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
deleted file mode 100644
index b36958849f53..000000000000
--- a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru xstroke-0.6.vanilla/sprintf_alloc.c xstroke-0.6/sprintf_alloc.c
---- xstroke-0.6.vanilla/sprintf_alloc.c	2005-11-26 01:55:32.000000000 +0100
-+++ xstroke-0.6/sprintf_alloc.c	2005-11-26 01:55:55.000000000 +0100
-@@ -74,7 +74,8 @@
- {
-     char *new_str;
-     /* Guess we need no more than 100 bytes. */
--    int n, size = 100;
-+	/* yeah... right... */
-+    int n, size = 512;
-  
-     if ((*str = malloc (size)) == NULL)
- 	return -1;
diff --git a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
deleted file mode 100644
index 52b39ddf4512..000000000000
--- a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,7 +40,7 @@
- BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c
- AM_YFLAGS = -d
- 
--xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst
-+xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst -lX11 -lXrender -lXext -ldl
- AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS)
- 
- EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet
diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml
deleted file mode 100644
index 4150784c3af2..000000000000
--- a/x11-misc/xstroke/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="freshmeat">xstroke</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
deleted file mode 100644
index a3662daa1904..000000000000
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Gesture/Handwriting recognition engine for X"
-HOMEPAGE="http://freshmeat.net/projects/xstroke/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXtst"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sigsegv_sprintf.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index c5191c6dc5a9..03633f43e099 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,5 +1,3 @@
-DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
 DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1
-EBUILD xtermcontrol-3.7.ebuild 372 BLAKE2B e79fe3ec397bc714f2123e71413202fd3436de53cfd6944c5248ab6d194a30f2259793638485092db965b89eac548a37666f7a8f60eeb8f9e78914205181b1ef SHA512 949eac5ba6192597f9a3d80762aeb1b52df81a9659d0f2c02c6ad120df407b7cae9ffac1816d64c078ecb229eeab420c948fdde3468ac4fda75c8e3333662718
-EBUILD xtermcontrol-3.8.ebuild 368 BLAKE2B 1b3b390da7ca10f9c4f9428d83a8054917c996fd7929893eb2d926055acb56c3186ebdd60d9bb480f6f56e8f343aab87d1fd4e8e77b72c5b2c64adda4d8de86a SHA512 31fc15b2b2e7b16fb12bed4862d2822154620e7ac1cf36aa508d21ed7abe9a2bb9f4574db9086b4cd4eff6f430b7ba41cb9ee26151d4f790af28073b188103c7
+EBUILD xtermcontrol-3.8.ebuild 364 BLAKE2B 2e8e28e4f851bb874b77844cd922755ed5937da5e0c52c8ac84da10e751469f2e3e18804596a57dd1818afdf407fe51de888e34c25ce20fdc78094ab4d779378 SHA512 b19b36dace868b3baa7f80cd5d9638581095c4746dc357ae5523c8cf884778974d402a840bd5f6387c39d7fb0022440d68c4d05191e2a88548931414032b6a7b
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
deleted file mode 100644
index 857f12bcce57..000000000000
--- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
-HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
-SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
index d31df69220d9..5a84b2b84a63 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 7c74623ebe6f..165883b1358e 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -2,9 +2,11 @@ DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b
 DIST xwallpaper-0.6.4.tar.xz 82752 BLAKE2B e81a1a9ec56ffe0a1953f1186c945c9ebb143ff683b8c0c01b819506b79520738935d04725420a24b38119221cbb71d9a5562bffd03e03736c65ba7e3c6a1713 SHA512 531910957c44f7e5ce7357fa46737967f673aeca53868012211eb91507f78bd028f8d84fcbee6e1237107816a09f8247cd0445c0907b60792ff5d07416630d56
 DIST xwallpaper-0.6.5.tar.xz 82696 BLAKE2B 8c12bcce2a2eeb9580038b172b51284cc9fa851f01bef34e7cfeb13ccc05879f5443ef0b7fd39a4f0d5abcc399ec614db28f6f6db6847505855128348fd22d4b SHA512 99c911c6a4f7501101d85532cfb9956fa4affb57f7836e9216e5e0d873ed34c9e7d0a9983def442a4728a682a3351268905e22174dc9a14d003dc36c42ed9615
 DIST xwallpaper-0.6.6.tar.xz 85368 BLAKE2B fcb0861d4cecbafc980208b3d2a174b9931a93cd8110b6f2c38eddae19e890295ce5d6d75dc4f09924279a2b0463234f4efdb4dda758ed14ed728abfec6b9bf3 SHA512 e37055b9adfa6950fb423228ff880afaa03dbdf2a7ced6ab1e110dbf4813f68aae3c9147668ebd20665b582bea195470c39b6948cd36879afe54d61c90b6f8d9
-EBUILD xwallpaper-0.6.2-r1.ebuild 1023 BLAKE2B e285ddbab7b2fec704a7eff51e7b3a26eebd6c5e2c4721fcc8aa61ded8cfe20c54891930d4d53e36280c2a2e911cd9511bcae7b6d4f2430a4b0547f63bb1c7dd SHA512 810271ad0ce334df6adf60d69949f8a0e16b66753d872dd82190c66c97b7b37a98643b90ede10949a86086cf72e28ce36756cbcda5af9c90471b97056884a619
-EBUILD xwallpaper-0.6.4.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
-EBUILD xwallpaper-0.6.5.ebuild 957 BLAKE2B 4b98ca3eeeb452114cac1659db79ce06013706d2640eafbe9232a6850f9b5782ccc0ffc96d9e014d8ae01e0583bb8370601d24ba93b57df8611ed3b30395d821 SHA512 20d58283aea3edc79637a5715db014d9002b5acce8351688bfb0cfe00612795498589c6aa09e1849a38abd9e581ace669e861a1d4f8e1da1d93b91050e6efcec
-EBUILD xwallpaper-0.6.6.ebuild 957 BLAKE2B 96e16c2ed2eb70fd0014adcefaaa5d8f24a4062730b46de2550334516d246b2156c7c4bd4fc7e4d1aed5ce1afe8979998faa43883773357f33a0e2869b2c1e9e SHA512 8fd6054a3e737b4c67c85c746b5ef16bc9970672821de6abddfbf0b62874b24f54a33d0a8d5f4bc09a4b5a6d94fae4eb24bb08f9db3815e345e68e3115857ba5
-EBUILD xwallpaper-9999.ebuild 957 BLAKE2B 96e16c2ed2eb70fd0014adcefaaa5d8f24a4062730b46de2550334516d246b2156c7c4bd4fc7e4d1aed5ce1afe8979998faa43883773357f33a0e2869b2c1e9e SHA512 8fd6054a3e737b4c67c85c746b5ef16bc9970672821de6abddfbf0b62874b24f54a33d0a8d5f4bc09a4b5a6d94fae4eb24bb08f9db3815e345e68e3115857ba5
+DIST xwallpaper-0.7.0.tar.xz 86224 BLAKE2B bc201d2136b8c0f04e54a83b624d4cdd45409cdc451f2103a826e261fe7fbee2dd450297f67a9f9411b8723c82bc8032c2177ab318eaa95dbcad1007c47c982c SHA512 b8b01a1c0d5768beba9e57c376b89f5d777360ba27edd20d0fab0bb018f25a11cb3bcd1aa36099dd1bd43f689d470aa07c0c0a52ab782ea0cf12ba13ba4cc818
+EBUILD xwallpaper-0.6.2-r1.ebuild 1024 BLAKE2B eb508e6d509780fcb20cdadd0236f0b83631c33068307b610ed7804e7711e0e94162d1fe951cefda24906f98646198ff4c736f1041d30576f74594abfe53b289 SHA512 6e6ace948ae2d8eb48f2ae50fb877c69bdf5d07524cbaf67ccd0ea19a79c1b7e0b920a7ce30feb0887e280682dd137b2589f825c4bafb6a361d6f42f58832669
+EBUILD xwallpaper-0.6.4.ebuild 958 BLAKE2B 71ce61bd97279271e16e8a5607c47b82c853b0f9546a9eba0e521de1657d0889e59ac51ff0632af5b36d7641c4544d6fcb462222f911c08d3f1b522252a734d8 SHA512 ac96a6311aebf8d273e6acc78afdcd6a592495db0fcd55e6b1229d487118ab3fe06517568e9aa43622a2b114baf78731bab6fc815a3d56d1db7fc1f9ad8b4fcc
+EBUILD xwallpaper-0.6.5.ebuild 958 BLAKE2B 71ce61bd97279271e16e8a5607c47b82c853b0f9546a9eba0e521de1657d0889e59ac51ff0632af5b36d7641c4544d6fcb462222f911c08d3f1b522252a734d8 SHA512 ac96a6311aebf8d273e6acc78afdcd6a592495db0fcd55e6b1229d487118ab3fe06517568e9aa43622a2b114baf78731bab6fc815a3d56d1db7fc1f9ad8b4fcc
+EBUILD xwallpaper-0.6.6.ebuild 958 BLAKE2B 71ce61bd97279271e16e8a5607c47b82c853b0f9546a9eba0e521de1657d0889e59ac51ff0632af5b36d7641c4544d6fcb462222f911c08d3f1b522252a734d8 SHA512 ac96a6311aebf8d273e6acc78afdcd6a592495db0fcd55e6b1229d487118ab3fe06517568e9aa43622a2b114baf78731bab6fc815a3d56d1db7fc1f9ad8b4fcc
+EBUILD xwallpaper-0.7.0.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
+EBUILD xwallpaper-9999.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
index ed317b228bd9..7552811e1d3c 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.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=7
@@ -37,6 +37,7 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
 src_configure() {
 	local myconf=(
 		$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
index 2b1e1615823f..c91d1b571afe 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.4.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
@@ -37,6 +37,7 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
 src_configure() {
 	local myconf=(
 		$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild
index 2b1e1615823f..c91d1b571afe 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.5.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
@@ -37,6 +37,7 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
 src_configure() {
 	local myconf=(
 		$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
index ce50a5f57642..c91d1b571afe 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
 src_configure() {
 	local myconf=(
 		$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild
new file mode 100644
index 000000000000..4b3d25796853
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index ce50a5f57642..4b3d25796853 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -27,16 +27,17 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	xpm? ( x11-libs/libXpm )
 "
 
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 src_prepare() {
 	default
 	eautoreconf
 }
+
 src_configure() {
 	local myconf=(
 		$(use_with jpeg)