gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /x11-misc
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
85 files changed, 1561 insertions, 470 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 46b362f2ea41..6c222aaf5c0e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 5772c4efa8b1..41af0be5d21a 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,5 +1,7 @@
 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.4.5-r1.ebuild 3658 BLAKE2B 374af8d4a2918a98111c5cbb87444083dd0e5dbc2fbe0ce1009f4ab5a6c1f9b12dbec62ceff65d0df3ce1494c1b897e83c2e9a82281f694a2036455186dcae5b SHA512 21e5c65efb78d1b9d8b562e1404e6775f4048ad89786661d11dd0839e83ad42e47c233cfc7be63622443a7dd4451c1f9582ab17b6f5298d76749da4c7a2e0853
-MISC metadata.xml 458 BLAKE2B 3816fee30547f80623e541e6557a7b07111bdd5490a0bd39a85e0361ac1c65480d76072eb97874e77a554123867085779aeaeeda59445495801fb6de2cb6ec08 SHA512 c51de7dcc0ddbe4a4504fc2494d0c5571e662ce3bda84e8686cbef34a92f44be9c3d220cd302e7677a2d23e25a842e94fa970d378153bd56bbd919d014cd683d
+EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
+EBUILD colord-1.4.5-r1.ebuild 3387 BLAKE2B ef98fae5639f7cd664aa89c871a206655d3baf243a46e647cebc301374cee84bb22d84d122fbfd3410e6d014baf3b9960a7064af69a97bf944aad330ef522795 SHA512 f6b19a52fe55567fee8bc4b9d128652202d4739ef787e425088e59f3cdda8543f80139ad3d2cf74e7fa2bdcd509551fbf0930fd5db92aa96a755995af95f22a0
+MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
new file mode 100644
index 000000000000..e8a2b5c59e3d
--- /dev/null
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -0,0 +1,185 @@
+# 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 16edd7929b58..6431f775af63 100644
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 meson multilib-minimal systemd udev vala
+inherit bash-completion-r1 meson-multilib systemd udev vala
 
 DESCRIPTION="System service to accurately color manage input and output devices"
 HOMEPAGE="https://www.freedesktop.org/software/colord/"
@@ -83,18 +83,18 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddaemon=$(multilib_is_native_abi && echo true || echo false)
+		$(meson_native_true daemon)
 		-Dexamples=false
 		-Dbash_completion=false
 		$(meson_use udev udev_rules)
-		-Dsystemd=$(multilib_native_usex systemd true false)
+		$(meson_native_use_bool systemd)
 		-Dlibcolordcompat=true
-		-Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
+		$(meson_native_use_bool argyllcms argyllcms_sensor)
 		-Dreverse=false
-		-Dsane=$(multilib_native_usex scanner true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dprint_profiles=$(multilib_native_usex extra-print-profiles true false)
+		$(meson_native_use_bool scanner sane)
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool extra-print-profiles print_profiles)
 		$(meson_use test tests)
 		-Dinstalled_tests=false
 		-Ddaemon_user=colord
@@ -105,18 +105,6 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
 multilib_src_install_all() {
 	newbashcomp data/colormgr colormgr
 
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 5a2462430db0..2ca10f47e351 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -9,5 +9,7 @@
 		<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 bf2d9577e225..d47eb7ddc649 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,7 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
+DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
 EBUILD compose-tables-1.7.1.ebuild 921 BLAKE2B 17b09ddcc3e3edb7f3680b303de817b1fa68e0b092b81e574bce64c738673a7406d412413f89f46fb5cd99b62e5f0e1db48ebfea0f7eaf0bf84d818820f959a5 SHA512 529bdff9f93c80a549f2dbee98aa78b5e4063ab4edf4dbcd93825b9fde10a847ff4a7af95b42cd71f56b9db39319331869101f3eb000daa65ef8d0cab07cd1b0
+EBUILD compose-tables-1.7.2.ebuild 928 BLAKE2B 306c0bde8c01204acf186e4f5dfac859bb382f4f6a1059d806ab41c86dbe836bea8935f461639c83f3796759f6c1401b155b16d20794638cfc039b81f6eaa6bf SHA512 117ef2953a815b3ffdf102c8e7ea8724b2f26ef19f930dad449e46eeba2a598bee22ba3fb59fb1096da7685a05b8d331a27411cff7f2153492f04d730b14a790
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
new file mode 100644
index 000000000000..759d3b58ed5b
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+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"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xmlto
+	--without-fop
+	--disable-specs
+	--disable-xkb
+)
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
index d3588ec30c37..2560f4f95dd2 100644
--- a/x11-misc/devilspie/Manifest
+++ b/x11-misc/devilspie/Manifest
@@ -1,3 +1,3 @@
 DIST devilspie-0.23.tar.xz 130984 BLAKE2B 86b1b472d23ba49fdcc27c1d5a48ef95e3edd1c236569a3d25e23c8947ed41d91ce35969939cefc8ee1b74eb65594f91617172d35350e873977f4e8856e71ce4 SHA512 6ea6c79d317b0f35d943ecafa010e8c6011870796d83ff0a24a4853ad0ebad93608173dd1c4b645254d53c5c182c667e6eba42a20f764f258c211ee2bcd19174
 EBUILD devilspie-0.23-r2.ebuild 657 BLAKE2B e3f25b47a3542710e76cb3ffbe7bc74ba4a39ad8f0ee00384a0eccbe46b67cacc3e4c12c5525131a536ef746eed323f4dd78d0feafc5f2deca34d3f4d12855e4 SHA512 566f45d28d0326914668c92c1d714b219fad96c58f041e648b0d921754d13085ad148304a11bcd0da486b558805c0ceeceedaa5b816d5ba58550b11e0387fc08
-MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
+MISC metadata.xml 245 BLAKE2B 33d86327929801f107536147a5d58d3550471eb2f1635cd44ef84803cd8f09fd38c022336ebca0a1f8469009c75e33dd94b4f6775433a7ab537c93fe6e4e36b5 SHA512 e2effe9206b78650b406186fc5c054f5b9e269de793af596a58d32e7a17b376eac0ddc3177738f6b74076f46c5d33c774c28db9683870d9791f2aad7954782d3
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index f65b774ed444..5350da507961 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index fd3bf222224c..d70bc83a148c 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,4 +1,4 @@
 AUX devilspie2-0.43-lua-pkgconfig.patch 551 BLAKE2B 915dc2939517efa56bafce78c748ab061885eb320b1b902642fe3bc42125c1c94b81bc085ca0a5763550ed3a87f8aef2c67e2e6b80b40c870da0bdc50a7dd57f SHA512 82b2acc0d858daf70ed44f6f8acdf69c54926ac0aa9f350b656f06a7d22e5bdff4b20293bff3fcf95149c96a63c68bfbc6f739f48bbf2c28810f6e8964166148
 DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
 EBUILD devilspie2-0.43-r100.ebuild 1041 BLAKE2B 82a3982c1e2be07735315f4209462b9aabc6142f74d90267e1269ce19a120be10c345a70daeaf9923980c8a914064857cb1ced83b903367ed6786cf26b37213e SHA512 21332620d2225c00d42d23140d1b0d6097871744aa231598703252e725934e6bd64a697ae7a0180d1a1461b14537d8d54202e59730a1f67ef453dabdf2419dda
-MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
+MISC metadata.xml 245 BLAKE2B 33d86327929801f107536147a5d58d3550471eb2f1635cd44ef84803cd8f09fd38c022336ebca0a1f8469009c75e33dd94b4f6775433a7ab537c93fe6e4e36b5 SHA512 e2effe9206b78650b406186fc5c054f5b9e269de793af596a58d32e7a17b376eac0ddc3177738f6b74076f46c5d33c774c28db9683870d9791f2aad7954782d3
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index f65b774ed444..5350da507961 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index 6887cbc4ad3a..d3abb1508c1e 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,3 +1,3 @@
 DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a
-EBUILD dex-0.8.0.ebuild 759 BLAKE2B d4ca740372c62e72c37d171f0cead803e26f0402119234ecb80a2658637ae54a05771281eb907892e3a5a676449e1cbf22649393dd191a82bfe3c230cb532268 SHA512 bbd521ece4e5ec59017df9fc154376b31faf2e0fe3609679622edb6fb1b5fc5d5af5e8aad24bc9e5279c17e5fcda81e4efaa83ed23c2a8369743e0c5441d53d3
+EBUILD dex-0.8.0.ebuild 764 BLAKE2B 777b79ead4f0fcb6283507afcbacde064f94337df2cf9c3b4ad0105dd67abd373812f30d6136d29ea1a47ef820045523e70688172466dc425c55fe27d26fcd60 SHA512 09c9691897e70c3b9a3ee2294d85e55314aa2d22f7f26d5f43aeab12e291ecbf037fa0bb96fc231931def057b78b5e1055c659360d63d5ae4b18acdf18887620
 MISC metadata.xml 320 BLAKE2B 13f35e27d7da69c6167f9187b75cf012fe33359467336f422478e113814b062bbbde0fe5bd4d25b3eac41cde9a45e55b61f912425049365e82afc0557371e818 SHA512 18ef7b2115ecf22f12afbeb064823e3cf2faba91730748d53fc182e557d5f1efa371fca86266fa58ce88d5c249785e2b6b6c9b29f7d504ac3867cebc55860fb6
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 02c2927fb3d4..0b4cd2340dbf 100644
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ b/x11-misc/dex/dex-0.8.0.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=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 inherit python-r1
 
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 08a50bcc0ac6..9ba6b5732ade 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,3 +1,3 @@
 DIST dzen-0.9.5_p2.tar.gz 38181 BLAKE2B 0e34228c3795864a1b6ac5a3ac9d0ab4a1b90e065a649caa34d704951007bb1239db920f7ed3e35303f614c6572b6232768d59302b23edab0c11793574fcde3d SHA512 e750ab9c62dad311bf478d79c15ffdc1ef108fe2c3ed5df82316d879aad000bee785d304048f5daae237468f6fe018f14fc05d0114d68d873f766dbf1dfebbc9
 EBUILD dzen-0.9.5_p2.ebuild 1563 BLAKE2B b7818e434aa3f6862b46a62a8d83cdcc0c1605bfa964bd7a8eb6524147348a0c977b155b62f43ba309a36055a09060390b358802b6ad57b722316ba2cc28f8bf SHA512 93724d93fa434650cdc680f701896164cc107ebcd5dab76c07544d1446c207e60642babdcc5df0acd9901e5538325db2de68cf03513e8199d026e59f7cac2bca
-MISC metadata.xml 468 BLAKE2B 132771e69a56bf54111dccc98115c990cf86a5afeb0b7e58a7c57df2335c85d31f06cef1b8b9e82b79da7001333dec21f17a5288f81e8ddc8f29b61e4462f9ec SHA512 f2f15df231fb32da4fddc300da705241c88eb81ac61aa9c3d25765838f11f3484d6f1c4d6de8c2a9a77e0ec47b7a5aadf9a73cca1d480d7ece9853d5deb46e28
+MISC metadata.xml 319 BLAKE2B 543d3f9a0f277a4c1665c9384552aa5022cc66199c0aca56ae519a4a3cfd0ca14ccc5866332d5bdd4b16c069bf1c7a885bab961c093907103db36afd37a22d6f SHA512 ff4d9fd7a01b36e1b1d8ed65267f656cb17bdfbdd871b0ba89ce895c04b40094dfdb2b4165b4d8aeebe0aa7bdad2574f1c4c4a8149b9aad061dc3b55854adc25
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index ae6e159abcf3..15a88de636e1 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">robm/dzen</remote-id>
 	</upstream>
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index 10a93b7089ce..c520fab5b8b9 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -1,3 +1,4 @@
+AUX evolvotron-0.7.1-gcc11-predicate-decl.patch 1065 BLAKE2B 2d5b22c2f239f211a321d0610ac573a0dbce528ff249d39d954bbb51e4b4a7cd58134e5833ddd73b8683db6c064928550c98f6600fa199e77b77c7f67515f595 SHA512 bee1abc69d8664ee977a45e0ab5f36466048bb6fbab1c96b98d7b28163070bc6f3bb9bd0ba2963f224f881836ddf2c8b3cce98771a664a6345485f849814a03c
 DIST evolvotron-0.7.1.tar.gz 179516 BLAKE2B b73c813fdf134e0e4c7882e06a12bc06acfb6dcdf4a38043c4c30027bf00da10df85d6877abdbd8ca6393496038ba9fa0c32a16b0f37dd14d72cc63c00a17d1c SHA512 74f48dc0881a82d999ccc910df026da80fcc46a906fe2fbb8edbae50a1fa42a3379087f00dd21fd9e5d69cee7c6fc745b80f8703b1af1ebc3a1cdb52ffbe16e9
-EBUILD evolvotron-0.7.1-r1.ebuild 878 BLAKE2B 534a03152a5e38b5aa90c7db36c5b29d4ee65853656d87f0311b2a7afe2b7114ca0caba518d2f8da6b05ff2e60155930382b13d360b35255918905820eb88c6a SHA512 72d8245cdd4f378ab0a4412996dc2dd2384d6f18ba63b872f2530e83c63eabced18e3d989652a493054e36c033576948d15825a66d4977e875a1a55bd16843df
+EBUILD evolvotron-0.7.1-r1.ebuild 973 BLAKE2B ce6f5abd16fc5a35f0caa833b00128eb9d7780f3b00a6e7ca13139a44cfbd00f6e451ca1c3045196c1cb38a37b907bfdc713665bad39dcf83a6d211c797e7c2f SHA512 a7570e3a31295d74931d795c02a2e560fae2adb1160a256242b4ab5a827ee31dc4f6afe7db7967321b2042bf150dac482a9e189daa2037f139872f4098c57be3
 MISC metadata.xml 356 BLAKE2B bcffe50af78659801374955b8bb13970760d0d565c89a210d2ee98059078df0bbd5634e95f2cbc9e922e8b29f21cacb7b6339b6004ac4619b21706b7da85be14 SHA512 7cea09fe7cfe3d43572ab13f83921cd252cb4a12bfc9fb4e2629cbd96c90a07fef8613090514ad562ee112960f88bdcbbe18daa185470780bd714e95aa6bfb47
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
index 2cfacb68a556..52497e1e2485 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit qmake-utils
 
 DESCRIPTION="Generative art image evolver"
-HOMEPAGE="
-	https://sourceforge.net/projects/evolvotron/
-"
+HOMEPAGE="https://sourceforge.net/projects/evolvotron/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,13 +23,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-DOCS=(
-	BUGS NEWS README TODO USAGE
-)
-HTML_DOCS=(
-	evolvotron.html
+DOCS=( BUGS NEWS README TODO USAGE )
+HTML_DOCS=( evolvotron.html )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.1-gcc11-predicate-decl.patch
 )
-S=${WORKDIR}/${PN}
 
 src_configure() {
 	eqmake5 main.pro
@@ -37,9 +36,9 @@ src_configure() {
 
 src_compile() {
 	local etsubdir
-	for etsubdir in \
-		libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
-		do
+	local targets=( libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate )
+
+	for etsubdir in ${targets[@]}; do
 		emake sub-${etsubdir}
 	done
 }
@@ -49,6 +48,7 @@ src_install() {
 	for bin in ${PN}{,_mutate,_render}; do
 		dobin ${bin}/${bin}
 	done
+
 	doman man/man1/*
 	einstalldocs
 }
diff --git a/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch b/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch
new file mode 100644
index 000000000000..e21de137f746
--- /dev/null
+++ b/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/787101
+--- a/libevolvotron/mutatable_image_computer_farm.h
++++ b/libevolvotron/mutatable_image_computer_farm.h
+@@ -45,7 +45,7 @@ class MutatableImageComputerFarm
+     {
+     public:
+       //! Compare task priorities.
+-      bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) 
++      bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) const
+ 	{ 
+ 	  return (t0->priority() < t1->priority());
+ 	}
+@@ -56,7 +56,7 @@ class MutatableImageComputerFarm
+     {
+     public:
+       //! Compare task priorities.
+-      bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) 
++      bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) const
+ 	{ 
+ 	  return (t0->priority() > t1->priority());
+ 	}
diff --git a/x11-misc/fbpager/Manifest b/x11-misc/fbpager/Manifest
index 1aab4e22e83e..0308fe6ee34c 100644
--- a/x11-misc/fbpager/Manifest
+++ b/x11-misc/fbpager/Manifest
@@ -1,3 +1,4 @@
 DIST fbpager-20090221.tar.bz2 267876 BLAKE2B ed7dea903258544ff1ed3c506c0d01342d5a43b4af035b3b428cb722fa86e1cdd996c9e41e2e197a56fd3bee5eccdb2da3ef00ecfe3fc77c410b958b004e5343 SHA512 fca9a43a3f71b1eb7b27befb3de4b0010f4974cb8898050325bec6def19f1b99a8e549eec04c14ef7777da8d23c25f8e799798160384e08d5a213c9c202bfd7a
-EBUILD fbpager-20090221-r1.ebuild 525 BLAKE2B b122b8d3898fa7bf38084b5cf48dc64d471ddc5ef8d7b63729a7a7b2c56e59690d24c56c17d75a74569c4d337cf85f26db039e91f8ad4e6360039118e660f2f8 SHA512 416647deb2447cd3401aea309d2ec2c57f04be6fa649bdee02403fade38b417e8d4514af37c642fba14f0f5e932f282134bb21c406697bcaf9c7ec5af0e54aef
+EBUILD fbpager-20090221-r1.ebuild 606 BLAKE2B 365cbd9007a0d8c5c9484712cf1e9059fd7dd29ee038b02914a0c0e0c4c6b7f14a1450af0f01fe6d94bc72cf1c48650d176894cc433d8306f14f202db3944c97 SHA512 751fa29bde4363d79669f0e4a7d0a34813e4f4cb26dbddcfe15c67532274c860288e30e23d0b8056f68aed3cdd1e080acf1581c4bd798a3ae7c0efcadc97b793
+EBUILD fbpager-20090221-r2.ebuild 609 BLAKE2B 91a24c27c9dd885e3b5ea84e3e0a90c64f88804753602ee0fdffe5501043c8d20aca920b63957a023c8c14bcc0fb137f0147a00cda2d82f2c48351e1bab57f90 SHA512 e5b4f55c7011ac4ff56ecd4070891a3eb3bb1f8c6b6c74b5720d851f17d44d8d3ffda23a9f244e0c57351ec3f0bb36809f687ba7a4eba2580b7536e2eea207b7
 MISC metadata.xml 276 BLAKE2B 1ea68f71eafa2d8403685c082a3c438c5cfd9ba24867a7b8eb481fcd5a254af9c94df97b5f04b190ab37ab10a37761489fd5eb8e3d22795db6f28f6f16a90db5 SHA512 d76e1098807ba35b104af6ab87ec9e5616840fb7901b3d29b8d588338d837902d5d429864aa7804abb97220d4dcc8d086162891389a8b2df134b803577add9a9
diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
index 9a43ae1ded1a..f8cd87157bf5 100644
--- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit flag-o-matic
+
 DESCRIPTION="A Pager for fluxbox"
 HOMEPAGE="http://git.fluxbox.org/fbpager.git/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
@@ -16,6 +18,12 @@ DEPEND="x11-libs/libX11
 	xrender? ( x11-libs/libXrender )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	append-cxxflags "-std=c++14"
+
+	default
+}
+
 src_configure() {
 	econf $(use_enable xrender)
 }
diff --git a/x11-misc/fbpager/fbpager-20090221-r2.ebuild b/x11-misc/fbpager/fbpager-20090221-r2.ebuild
new file mode 100644
index 000000000000..6980614a4620
--- /dev/null
+++ b/x11-misc/fbpager/fbpager-20090221-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A Pager for fluxbox"
+HOMEPAGE="http://git.fluxbox.org/fbpager.git/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="+xrender"
+
+DEPEND="x11-libs/libX11
+	xrender? ( x11-libs/libXrender )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	append-cxxflags "-std=c++14"
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable xrender)
+}
+
+pkg_postinst() {
+	einfo "To run fbpager inside the FluxBox slit, use fbpager -w"
+}
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index ffb0ea721f87..d67f1ba339c2 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -5,5 +5,5 @@ AUX fbpanel-7.0-images.patch 274 BLAKE2B f587453d0e66c5fb8c93ad936dbf1cd1291d6dd
 AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807c9a0207058d5338dc59eb65643797d6aecc31f52eaf0134b26a3a4fa5364337fa577a641f05d58401441e14faca7ce83b0c5 SHA512 6791c1cd963f40db8df88b4758464fe99f308990ab86ee2e91c6e36c2e4f8ccf935275074352d432078ab4c3f8fb07f3535af43fb2627e0904153be087a5992e
 AUX fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch 801 BLAKE2B 49a0d7217b5e44c902200d9fc4cee57d245386cbf400e21a24672b2c121578d09dd440d56f05483afbe3e6083bbe65fdafb162e35624d7bd0f7f34b1639d2737 SHA512 d4fc104faf4bc4c9ead54530c3e00e82d9ab3c356d635c824d206dd2fa64c64b8ff57594cb6fbbef9725df30f10994de3a213aff8f1eb7fc8b59cd08498e3148
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0-r2.ebuild 1580 BLAKE2B 8be6ddb7d12ae057af8e3f37f915a68723809eecb59371b4fecc856ca31f4716e0bc52fd23d3fd0bdddb2bfd1a09fcfb03e5b41476d41a9de4764a6a1eca7b2e SHA512 551d8468b929e40e09e9fc9dbdc0347cac2616b4b1c4918cdd5aa14a1a7c69ce2ea70d9202b6e7661a6aedd121abe894e893a17e4a9fa41896d749cc723bfe16
-MISC metadata.xml 421 BLAKE2B f33f57d552b2410bf7f1f8295755f1c8fc6822497693be9e9ce0a2a9748d24c3dfe98f64ed1380398fa18b6fc41a205805f06113d59639e13277a9561ebe8789 SHA512 1df1dae010dafca7f9799e447f1ed629207ae6e0b35f79d823cfcde4d52bfc87d376d7576108d69fe6c0d5ad10930dcb8aa31cbe7e2b71eae0c3a23ed4e8c059
+EBUILD fbpanel-7.0-r2.ebuild 1582 BLAKE2B 141f8eed5167071306306a67bc542cd43417576def9a8022a98fff0e6dcf8641d6557946305c7b8c8392eadffb12a706fa6cbe62029fdc965ef4f61ebb3f0a73 SHA512 be28ced7e4bc1b75e4601d700ef784b857fb66eb054dda8990d76baea73e793bfa35d381b05e8f23575c10705787504afe67dfa5310eec669124a8073aba1677
+MISC metadata.xml 251 BLAKE2B 28a0157abc8c4d177e72585b3bbf5a5c363222a45747549e7268b05aea9a53638b3deb0e582a82a90824246f8fa25a905ae6986de852d41c0e4c11f03965fe13 SHA512 fb8eda5374a8f1fa0314e29e13abf7e416d1ec79186b80c85132ef8350f813b86b0ec47b193be36e8307d75f4c8e8c24a70697a98b3010aeca79d92f9a9dc53c
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
index 1014743e1e72..bec7e0e0220b 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -1,8 +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} )
+
+PYTHON_COMPAT=( python3_{8,9} )
+
 inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="light-weight X11 desktop panel"
diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml
index 2e82215a4205..f2b886e8710e 100644
--- a/x11-misc/fbpanel/metadata.xml
+++ b/x11-misc/fbpanel/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+<!-- maintainer-needed -->
   <upstream>
-    <remote-id type="sourceforge">fbpanel</remote-id>
     <remote-id type="github">aanatoly/fbpanel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 0426db8dfb1c..9690d5500df6 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,4 +1,7 @@
+AUX i3blocks-contrib-2.0.0-respect-CFLAGS.patch 1391 BLAKE2B 4d2f1d6a567074dce73aa4d5ecec38cc6cba130e94efbb3074c53ea5253f167bcb01e8b37f8d35f6802961a7e610ffa606e31d91fc9f4936ee55425b0b128719 SHA512 ab137c15781f6874cbbb731810ed8fdeb022374048670571e46048e823814e5961e9c8f8b749197478494073bf97d660d03b93edcde500da662ef90513382c23
 AUX i3blocks-contrib-respect-CFLAGS.patch 654 BLAKE2B f3633b4046a55d31d5ae694b37517ac72cffb01ff3d6c6ab58a38df5fcdce64ae3532cfb9629e7d51dc9cb5d1b399623d275456ba3ef84f9376f2a2797e003a2 SHA512 a60f83fd008deffd819a6997b0061474ead9b37b5a069c592b6afb79c0a11b360e5bfadedfa2279919990923e9283adf6c1851972cfdedfdbf27addc44fc58d0
 DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
+DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835
 EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 1624 BLAKE2B 6d3f5b71827ba487e3ac28f5cf96e78e2b989cf04365de398cf588ed028684a5e1ef7fa734d607dbb0428de3b7cf00d4a6381acdec9da6411b6c93d2074557be SHA512 6a1fc2e5d85a16d625f7d102e5727cbb6d170553fbeab8d9ccbf26c9d34ef871bd6308ab0ae008cce389f187d73fcb053a530118e428982198c24c6cc7341acd
+EBUILD i3blocks-contrib-2.0.0.ebuild 1922 BLAKE2B f803a2e88353b291057ec0cb4e02d2a17695ecc9671a8875d687562ff934301c96341593f593c3d7f195e0786a995e003caebc752efaac8cc88e75646e83696d SHA512 e1b278894d337fb1d2fa04ad00506de585f20130d8c9e99490a632e03179f70907de18a45941fd08630768d29e58f62f81939c33b9fcda0596a08ae7f8122d10
 MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
new file mode 100644
index 000000000000..764cd4b2b73c
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
@@ -0,0 +1,68 @@
+--- a/bandwidth2/Makefile
++++ b/bandwidth2/Makefile
+@@ -1,6 +1,6 @@
+ P=bandwidth2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
+--- a/brightness/Makefile
++++ b/brightness/Makefile
+@@ -1,6 +1,6 @@
+-CC=gcc
+-AS=as
+-LD=ld
++CC ?= gcc
++AS ?= as
++LD ?= ld
+ OBJDUMP=objdump
+ OBJCOPY=objcopy
+ SIZE=size
+@@ -16,14 +16,14 @@
+ 
+ PRG = brightness
+ INCLUDES := -Iinc
+-CFLAGS := $(INCLUDES) $(DEFS) $(WARN_LEVEL) -pipe -O0 -g3 -std=c11
++CFLAGS ?= -pipe -O0 -g3 -std=c11
+ 
+ debug: CFLAGS += -O0 -g3
+ debug: all
+ 
+ release: CFLAGS += -O2
+ release: all
+-LDFLAGS = $(LIBS) -ffunction-sections -Wl,--gc-sections
++LDFLAGS ?= -ffunction-sections -Wl,--gc-sections
+ 
+ SRC_C := $(wildcard *.c) $(wildcard src/*.c)
+ SRC_A := $(wildcard src/*.s)
+@@ -41,7 +41,7 @@
+ 
+ $(OBJ_DIR)/%.o: %.c
+ 	@mkdir -p $(@D)
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $(WARN_LEVEL) -o $@ -c $<
+ 
+ $(BIN_DIR)/$(PRG): $(OBJECTS)
+ 	@mkdir -p $(@D)
+--- a/cpu_usage2/Makefile
++++ b/cpu_usage2/Makefile
+@@ -1,6 +1,6 @@
+ P=cpu_usage2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=gnu11
++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
+--- a/memory2/Makefile
++++ b/memory2/Makefile
+@@ -1,6 +1,6 @@
+ P=memory2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
new file mode 100644
index 000000000000..88dab674b534
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="A set of scripts for i3blocks, contributed by the community"
+HOMEPAGE="https://github.com/vivien/i3blocks-contrib"
+SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="!<x11-misc/i3blocks-1.5
+	>=x11-misc/i3blocks-1.5"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
+
+src_prepare() {
+	sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
+	default
+}
+
+src_compile() {
+	tc-export AR CC LD
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
+
+pkg_postinst() {
+	optfeature_header "The following deps may be required for certain ${PN} scripts:"
+	optfeature "backlight" sys-power/acpilight x11-apps/xbacklight
+	optfeature "battery{,2,bar}" sys-power/acpi
+	optfeature "colorpicker" x11-misc/grabc x11-misc/xdotool
+	optfeature "cpu_usage" app-admin/sysstat
+	optfeature "disk-io" app-admin/sysstat
+	optfeature "email" dev-python/keyring gnome-base/gnome-keyring
+	optfeature "eyedropper" media-fonts/fontawesome x11-misc/grabc x11-misc/xclip
+	optfeature "github" dev-util/github-cli media-fonts/fontawesome
+	optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop
+	optfeature "i3-focusedwindow" x11-apps/xprop
+	optfeature "kbdd_layout" x11-misc/kbdd
+	optfeature "key_light" sys-power/upower
+	optfeature "kubernetes" sys-cluster/kubectl
+	optfeature "monitor_manager" "dev-lang/python[tk] media-fonts/fontawesome x11-apps/xrandr"
+	optfeature "purpleair" app-misc/jq net-misc/curl
+	optfeature "rofi-calendar" x11-misc/rofi
+	optfeature "ssid and wlan-dbm" net-wireless/iw
+	optfeature "temperature" sys-apps/lm-sensors
+	optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv x11-misc/xclip net-misc/youtube-dl"
+}
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 08a1270aaf9f..00570cd660fa 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,4 @@
-DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840
 DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae722066493bd6aba083a07b1ebbf10eea69afa2a8f9d80a92b60dda3e8472a55851b70e84cf7c10e0bf3428c2278dd3ef5b6f65d0d SHA512 f215444dbe7e70ae137404beb25d5a60c5a618fb2d3d20eb9b4cf3f94cbc93a7e42a5fa82efdea082e2fa229c95d86c02df91c59f4a51c067e47ccf5dcf79fa7
-EBUILD libinput-gestures-2.48.ebuild 1334 BLAKE2B 150af52798fa9fad1d4446221852a2ee1062aa3acddd146d2448e3f33c39dbd17787ef888b12c22a05cf903c87da2a94bb7fb97154d811dcf5e728093d7a7276 SHA512 b030bc7acbe902bc53dc3c2934ccaea622defd5abb8c4d6bda381a10d5958cd9f8f036a628fb49c558d55b34479cff74f2728c3ebbdd99dd9c4bffdcfc0a4349
 EBUILD libinput-gestures-2.56.ebuild 1276 BLAKE2B e2fb273e83cb986067bd22fd7ec3f724ed6c3927fe4ff3e0695272320eb5ede76c547cea5e30fc79b3597ad0762cb66702bca6cb0a6ad080dff5b66ff0143531 SHA512 a3827dbfd3160c6b24bb3fc5fee9988ac1a30e82c7dc62580ac5798076862c9b18748d2688e90447c5be6fe7d7f50ad39aaf9ae3004af0bcea9a0aa42e731057
 EBUILD libinput-gestures-9999.ebuild 1276 BLAKE2B e2fb273e83cb986067bd22fd7ec3f724ed6c3927fe4ff3e0695272320eb5ede76c547cea5e30fc79b3597ad0762cb66702bca6cb0a6ad080dff5b66ff0143531 SHA512 a3827dbfd3160c6b24bb3fc5fee9988ac1a30e82c7dc62580ac5798076862c9b18748d2688e90447c5be6fe7d7f50ad39aaf9ae3004af0bcea9a0aa42e731057
 MISC metadata.xml 855 BLAKE2B 7bbc889af3d1c5a5c25a6309ff30bc6ed0c8100443314a790895650b36e700a026a387db3200b63ad10b06ee59bdffd8be806f05d4d2f99c360ff664e42fb5ec SHA512 e1489e05889680fc13506b81b3eaa933fcf1522dbd7ff02b9ac4a77c9e371a37ce4b61cd149c9dab7558c9c6da0dc25f7770d126bc830a358650faccc0285da7
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
deleted file mode 100644
index 17b89dfda602..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
-	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/wmctrl
-	x11-misc/xdotool"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils"
-
-src_prepare() {
-	default
-
-	# Fix docdir installation path
-	sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
-		|| die "sed failed for libinput-gestures-setup"
-}
-
-src_test() { :; }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index fc204059ecd7..eb6459e6f366 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,3 @@
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.2.1-r2.ebuild 1761 BLAKE2B 5dc0fc0863d530f33ae1f9b70c5ab6d86f328acf914083a7fc3996cf4e891aa448b610b9f3ea652cc2e5e22cc5e5057ee635f98e50932b5bb8ef8f32c2d194be SHA512 ba5e223b3addb51f2f13dba4075908f50805e9e9ff9670be48a2d727d93b223246f2a8e019d767a8e0dc8b18dfb04d028dda4225c344cea48b2fe6f51334a6ad
+EBUILD menulibre-2.2.1-r2.ebuild 1744 BLAKE2B 094183062103b05c28d3fdcfb4f59d09acad077f0e9b46e0f0b7a2709222534e511ca8f5eafc5867765171677c5ccac0ab716e631e53cf8eb2e7ced996a89698 SHA512 f2c2a23b362528a2a32241d1130cac6a91c354ed47689ce1859beee74efb3acfa4638b676c8a5243b3278ab1774ee9a2d57fc9d04fe0c7d65d86c1c6c7cd8c83
 MISC metadata.xml 244 BLAKE2B 074f1e921f4d984a8bb58f3ff2800ddc85868c9d33c331dfd7a19503c02563f9e291876e99a3f4bc9afd171fcd8299e5c22d46bc24ec9ca475fa88d1535fb112 SHA512 0929c8d7177ffd5ac6e346f4bbfcafa764105312388307b7a8cf240d72f385437beb275aa530b4ad0248e807e5f42fa4f5437affdc94557baa1ece5a9f5586fc
diff --git a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
index addb2bb8bd7f..49bff656b3a7 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r2.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
@@ -6,10 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit desktop distutils-r1 xdg-utils
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="Advanced freedesktop.org compliant menu editor"
-HOMEPAGE="https://bluesabre.org/projects/menulibre/"
+HOMEPAGE="https://bluesabre.org/menulibre/"
 SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 7abaacd57ae3..1cee752b1e85 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,4 +1,4 @@
 AUX menumaker-0.99.12-AM_PATH_PYTHON.patch 2600 BLAKE2B bd7b4b3628c9628ca9b381f292e5919c093d492b2f87ce6ff595be15e57d4e8b92e417fcf8856ed8e7625a1eea337a361c321c0b6f87a23f462f5dc1a79d1756 SHA512 db92e8bde59afa52a3d38681deaab37642830964b717a4bb39134afc607d46f33d983f081e9b96848e63d7f7ea99a3ecdc8df7c0bc3dda5156c3e0d9f8bcaca0
 DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
-EBUILD menumaker-0.99.12.ebuild 893 BLAKE2B 7056604320104a158ac866216548e7f4d74d385f5b04cebba13c8dc75b0eac706842a4ddb9f79df9f3718e5747f31d5e0b35935bfc42da7e49c6dfc06b6798cd SHA512 1a07ff69c1af53dc8fce9417d261e12a5c4a34cab82c704fec5e88a3371f7cb54bc7b475bfdc3fcd6ac45dcaea7c1a92692eb5de905b3e17d15fe5464a39bd17
+EBUILD menumaker-0.99.12.ebuild 895 BLAKE2B 3cd04853dfef2a648d0f1dc92688349b2f313ffd9b5f9775fa0acdd14c21109091bd9e0e911efd23c9d1757246059df915f960bc142c92a7feef596c2103fa5d SHA512 270fc8aa8d958190f7b8935fd1188707da42b5f4b1e7026406f8196a9308753f7a97be223666490803603d7297dffad67744ee4f4369df59a28ae5be721a0830
 MISC metadata.xml 270 BLAKE2B fc16ae5dd7a1ce8280ce48ede6dc4604eff8234d44d7942c55b2da8fa4e7858e1697cc1bb6112de8091ef152dea2a2d78552a7381aa10b169beb6f460b2efd2c SHA512 d2a12e7e1d81c06c24660de56376cc73981ccf24a55c9f4966ccfcc9608ce590ff1c32bbc354bc77c0648f2af4caab57c80203823111a45a1538cfe09aa9ba3c
diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
index 1c1fad134bf1..c865064930c7 100644
--- a/x11-misc/menumaker/menumaker-0.99.12.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-single-r1
 
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 4f177969a7c6..33b28a89935f 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,4 +1,3 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
-EBUILD mozo-1.24.0-r1.ebuild 1307 BLAKE2B a4e55fc8b3228628be14cd3bbacb586a80d6dc24b107b6bf1deaf98b1762520b30598ce760191f5b2dd21d2d5b5a99405dd01c020d75bb021503d652cedc7092 SHA512 ceefd56a3f567855628548e3dc41c0014ff6698bfd949492ac85abf2d9e69c193c335752b2d66e74468d71ba3fc91e396b98fe78f1c214cf03632a3c54b66815
-EBUILD mozo-1.24.0.ebuild 1305 BLAKE2B 5e236804dd509d7642779b32a234cd973a6fdc9dd8da14a5eff289926bd79d7c8d417c839398bb4edc727479a68f7e1c8d646d0bbc4f76fad0188427de03f1fb SHA512 b274d1eaefb87f5814cd73cd792112b5ead29e1a0a7c00ba458286fedc2c3afea7a343bf790844c3c1b1b4892dd482253eeedc87261cd2732ffe26eb2ce1bbc4
+EBUILD mozo-1.24.0-r1.ebuild 1306 BLAKE2B 7a74f935c11b69f25805582fa9ecbce944a2dde952edf57e400fc428172e397a6502dbd28b2f9d7ef39350e174b59bdb99cbbe0e50768534714ef6d9ccfe45c3 SHA512 e88938967f3cb8a244b36d83d7c0ddc1d719a01c23d04d447a2d388a267ee23652093a5aaa5f85fac0f8c79bfe7d0845acce4085ef2cde0c11e6fda0e6a41196
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 2ef330c227b0..b47cd465c038 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-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=6
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml"
 
 inherit mate python-r1
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
deleted file mode 100644
index 44cf4f3240ed..000000000000
--- a/x11-misc/mozo/mozo-1.24.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.21.0[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	!!x11-misc/mate-menu-editor
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-		python_optimize
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 8d83f157d02d..f4c949e77488 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,4 +1,4 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1-r1.ebuild 1010 BLAKE2B 99479182b095994a923a392b5f13663d54a573eb91314e8859ac5535754aa85cf8975b36720b35021f02834812e21441650362119719d1ed073b8bac951a61a9 SHA512 4a11b6fac49eecf94e1abd4605184c88fadc8b3938d47a854deff9fec4637c476901e423f3cd1e02fa7cd6446f1cf66bec7c764b7c2634aea325b5b8e328f629
+EBUILD nitrogen-1.6.1-r1.ebuild 1000 BLAKE2B 7b9ee1fa0730358308da8ff0158e07968a461f7493673eda294e89063ce55c36e1eb7f6fdde5b0ab1b03f21f5043b9a3f752a5f0e6ff8e89b69190d1197dfc2f SHA512 356d8d60b759689ea87f5c724b18435bf6b3282b4ee7e549cb808cb2ebc48c751234c82a1b35b93f9ce707b6ea55bffbac4cfec2aa2ecb2dd4427cfd9b8d7ed7
 EBUILD nitrogen-99999.ebuild 948 BLAKE2B 168dbbb5637c1f431f2445b60d418c9349c0113f8cccab5059f58d57f4e259876336730c7d7dd4cee0e347abb164c8e9456f0fa861a4114bb702c198bb67e4d3 SHA512 22b99582b6a06275f88539dd0bebabddb704bd3ba6ef12ebb0921e03a23505f4c514e57620089270f904817e41c6d3584b7ae3fa749b82ea1f00bc04d470b4de
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
index bc1b97e1eb76..6f49eba8f496 100644
--- a/x11-misc/nitrogen/metadata.xml
+++ b/x11-misc/nitrogen/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
index 52647c78a86c..2f606225b1a5 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic gnome2-utils xdg-utils
+inherit autotools flag-o-matic xdg-utils
 
 DESCRIPTION="A background browser and setter for X"
 HOMEPAGE="https://github.com/l3ib/nitrogen"
 SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz"
+KEYWORDS="amd64 ~ppc x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
 IUSE="nls xinerama"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-cpp/gtkmm-2.10:2.4
 	>=gnome-base/librsvg-2.20:2
@@ -22,7 +23,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-base/xorg-proto )
 "
@@ -43,11 +43,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/numlockx/Manifest b/x11-misc/numlockx/Manifest
index 703bbf5e7909..65f29b7bb042 100644
--- a/x11-misc/numlockx/Manifest
+++ b/x11-misc/numlockx/Manifest
@@ -1,3 +1,3 @@
 DIST numlockx-1.2.tar.gz 82703 BLAKE2B e874671fca1991c541022859bae6606d550fed66b4f40ffdd1bc2cbd74ce65f8148845014d7290db7fe7a333aad526ec186197cca989bac2b519915aa374214f SHA512 efaaa67e8b2723cb1e8461dde664f1f8e9b21f34edfe2e1135a6b756fa2843aed1a386f2f9d70bd62ddae9aedfeeff856a18da8b542f2cff440f93b38e5a853e
 EBUILD numlockx-1.2.ebuild 696 BLAKE2B 26c868db36e1525dd6a9e99689d607fc10cff48c0890a5c66fda8a4549130c6d8c201a367a4099a4341a8232eb5a617eb8db86fb40bd02fe30d8c4e97053fd8d SHA512 f68f6d1349220159fe60efd7ef3888be5632b9c024cdd8daa5082b3eb25e0be14d559ee74a834a703662018d2ea0c5d64e415584918a20c4c99ec7520dec4cce
-MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
+MISC metadata.xml 245 BLAKE2B 33d86327929801f107536147a5d58d3550471eb2f1635cd44ef84803cd8f09fd38c022336ebca0a1f8469009c75e33dd94b4f6775433a7ab537c93fe6e4e36b5 SHA512 e2effe9206b78650b406186fc5c054f5b9e269de793af596a58d32e7a17b376eac0ddc3177738f6b74076f46c5d33c774c28db9683870d9791f2aad7954782d3
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
index f65b774ed444..5350da507961 100644
--- a/x11-misc/numlockx/metadata.xml
+++ b/x11-misc/numlockx/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 6a8369ddce4c..5062804cb5fa 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,5 +1,3 @@
-DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
 DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
-EBUILD obconf-2.0.4.ebuild 800 BLAKE2B 7b1347909fae8830eef9781a31126397e857fee02769a8cf719fc2db8bba8678c49e19e4e0372ce7c3fbdd91a4b44fa3412535e5d7e5c2d37276005ca0f50d6c SHA512 a74608f458dc0d372cd5ce8f9137ed53a283babb2696bc3e76ec4b93d0279267cf695f220c0899c33c25639c34125c3e754972615a6a297ee5af638204b58ef1
-EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B 3d534b9bb0647112d086c20b5b3820d18198740cef818eefb67eb8ed1cc2cf397690d5c846482bda19ee201521d137c4fec67486a66ed1e24cf344f2ea2e0b7c SHA512 6d6052a0b24da24783991d1f0e047c5470006b4fdc52c8569d87577a615c50d9b0112caeff64d4ca834c5fee9d0ffd93e3ddedc675e96c0c9451ec7bf3afdb85
+EBUILD obconf-2.0.4_p20150213.ebuild 976 BLAKE2B aec99c9fd2f2484c4d6354cf270ad54251403f69a065030b530c73e6a01a2816b750319fdf61d5da51a041dbc1efe4a62671969eea14a798a33de126c4c0833c SHA512 ae2642d9d7c25c2168628e4638a7768c40e782fd7b9b874f4fb9147f8d0cced60072bc68e4ead366d04935beb639272f566196e283d2f4468d6f821be1b86617
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
deleted file mode 100644
index cdca961153a9..000000000000
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xdg-utils
-
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
-HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
-IUSE="nls"
-
-RDEPEND="gnome-base/libglade:2.0
-	x11-libs/gtk+:2
-	x11-libs/startup-notification
-	>=x11-wm/openbox-3.5.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
index b20d7f915a06..ffe3dca0ef43 100644
--- a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT:0:7}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 8ce47b5f53e3..566a4f1a75e8 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 1393 BLAKE2B 98d6ac86569ea21777a86c2d47191a9c45f54e55ff6654835e0c3022b29194c946c70132462100cfd90420946dbac54dec9026b889b550f30b9e3bd912bae514 SHA512 38dc9bcd19ec7d7199140ff7435c349a05e7abc79030aedce62ae63d57d68eeae248d0bd02a41e3782d58c74b4a283987eea23bc29634928bef00f623092a399
-EBUILD picom-8.2-r2.ebuild 1435 BLAKE2B f93a31b0e6b298f84fa6b4b451643c811f6d2efedd10af3bc1f9d129eaf101e52e54c499e4e144441978ae4185749fdfe6e3a18f28c593457dd58ce0cfbc16a7 SHA512 114865710cbec12676514dcc22ee5692c2a36f0dc5936872e4b6ed2ead6f18d8301e972b7c310dfcfe03f8d8107158112bba7e7c4533bbcdab05c8259aa11247
-EBUILD picom-9999.ebuild 1070 BLAKE2B e205156372dd7195b6124ca4a419f7cbd66ef37ad30e49c882dcf3d285b5f8e46f2b3ce8aeedbacd139d9f2b611b13036950ba7e86501906e7b3aef50fab69ad SHA512 231d1ac258ab08334d7cd6d67d1cf1850dec8b35f5b335873265f6589abf1e7799f909de22e8278babbaebc9de2a510e688dddc027691cee4e1b37b9d0ecabfd
+EBUILD picom-8-r1.ebuild 1526 BLAKE2B b016d3cbaa1b37d83866fc56923fe5d5d0c9d98f84b7ffaf61420cc929b902f2ff19c33f4a4f9b5220451c4124feca2e31aa53e48c9689510a1a92a12f6cfe25 SHA512 965f59726b168898fef69380c6d397632f19a9fcd7fb9b6458af815270700edd709ed845a37d59cf2b8329a6ccefd113516a03c2a57042b421c7b2c635f295ad
+EBUILD picom-8.2-r2.ebuild 1566 BLAKE2B b670c66324ebd845705367e77df8a7a5eb118e9fad48d07c61b9f7f7a71ac7daa879d221bc4c687f3b7a8070cdd919b45213f1e005bf7ad6880e5cd409e22180 SHA512 a399373fb4257f5ccae6aa71c2cf53669859081ba12a59f3337d67fc613215a9eed44049b3a499853c94ce61fadda06aea59b60b9dcc3bae59fe25fc641188f9
+EBUILD picom-9999.ebuild 1516 BLAKE2B 35d49008bffd1956f30f1038a23f4a34b242e5690fb84013ee2b968265b07522221720093a1b43eb01dbcdd6467bdc8cfb2ab66178b8b3d3f78072b2b4b1e69e SHA512 f51ef9e05acfd8d6e1dee42eccd6b029edc076395db79cf1e8235a696c856d322d53267d0dc68b5ccfe0ae2a8a1496409182a8c710acd8b3f048e6048f63c937
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/picom-8-r1.ebuild b/x11-misc/picom/picom-8-r1.ebuild
index ff42b3981ea5..a266247cac0b 100644
--- a/x11-misc/picom/picom-8-r1.ebuild
+++ b/x11-misc/picom/picom-8-r1.ebuild
@@ -42,6 +42,14 @@ BDEPEND="virtual/pkgconfig
 	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
 "
 
+python_check_deps() {
+	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index b0f968999550..dbceb7f81df7 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -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 x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
@@ -44,6 +44,14 @@ BDEPEND="virtual/pkgconfig
 
 DOCS=( README.md picom.sample.conf )
 
+python_check_deps() {
+	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index ae0a2c9641a2..7551a069f44f 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit git-r3 meson xdg
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit git-r3 python-any-r1 meson virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
 HOMEPAGE="https://github.com/yshui/picom"
@@ -11,8 +12,10 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="+config-file dbus +doc +drm opengl pcre"
+IUSE="+config-file dbus +doc +drm opengl pcre test"
+
+REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
+RESTRICT="test" # but tests require dbus_next
 
 RDEPEND="dev-libs/libev
 	dev-libs/uthash
@@ -33,10 +36,20 @@ RDEPEND="dev-libs/libev
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )"
+	doc? ( app-text/asciidoc )
+	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
+"
 
 DOCS=( README.md picom.sample.conf )
 
+python_check_deps() {
+	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
@@ -48,3 +61,7 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_test() {
+	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
+}
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index eaed887485e8..2e8a2ac76ddc 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,6 +1,3 @@
-DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
-EBUILD read-edid-1.4.2.ebuild 398 BLAKE2B b148b8369304073919a5af6b03aa2376400246edddc0357572d5c155d6029c2feef0599252a8e700f5708c4bbe87319879344d7a948e291fdf0d7efefc105739 SHA512 67b788582eed4a5fff82932ca8a10e0aeee71f4bd3e3d8e14821cdc8fd99881bb1f2cf255f4bcbed9510144206bd3b28b69dc3c508e6e24d912e882d8a59274d
-EBUILD read-edid-3.0.2-r1.ebuild 1019 BLAKE2B 837f398a39cdfd15a9fee4ae7a9bd4cb68c5044868cbf9c17c19595525ebb11792c6a8337af0672b0a86da4e50f5b7bd07b91a596427e0d0a736746ac7537d9c SHA512 ead4772dfb2cb0dbdc36bf921374a3d19983e518f8f22089a9db9f895a6a0d375e433f4582a9ba9f01789dcdddd75efe5823861100b283bd8f19efd7a1c5735d
-EBUILD read-edid-3.0.2.ebuild 629 BLAKE2B ef065bcab0c70fa24c771c7a07949652d6c4b97b0e210915bbe4cdb109f115765102db2754f10fdede931a9c66938c55f3aba3bddb346432b67da4cab6d2398e SHA512 9d07fd2d4045c9d73c3f422dbf6a1dce609568c58a666ae2e7e3a548cda236f79f30b3f0b493df1710ada9b2541293fe1d9154362bc84a31b74e3e302d588708
+EBUILD read-edid-3.0.2-r1.ebuild 1016 BLAKE2B 3c1d26ff0c431df955817a45ba80db976611e5a397a72837937b3969da8d1f0c82fba2ccec985b9d0e159412c956fba0885caea1f6c18174dab8cd5c6f27dc1f SHA512 c45105555bf17975a9ce7bf1be37a4599e271c295bf1cc108f598ed34014993707cafaad472908f4f9e5968098190052c8bebe3fc0d8424e660ca0e96e36cb9c
 MISC metadata.xml 392 BLAKE2B d9477711f154ae3dd3b22254d6e8117c27840af5629a7296a3a2dae88bbed00174d30dc8a658eb5c0400b7db2b9b38d9f598916256b40ddae0dd33830e532f89 SHA512 76a7b26f9af8ae7ca060114b5aa077610916880c4d75b565bbe766beaf0ef7a86f92f0c71dec57f9f7aee07c003dc2455f12e1b9c4529b505466d904ba0eb5f1
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
deleted file mode 100644
index e21cc086c588..000000000000
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Get EDID information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-
-src_configure() {
-	econf --mandir=/usr/share/man
-}
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 a0505646508a..66c7ab83c0b2 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 ~sparc x86"
 IUSE="vbe-mode"
 
 DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
deleted file mode 100644
index b0e3a798eb3c..000000000000
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Program that can get information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-libs/libx86-1.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-cflags -fcommon
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 9078832555d6..2eb017b9d5da 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,9 +1,11 @@
 AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629a6074ba0fe6624b929ea74ff11385e347f7c56a598b53937ceefa32e2db86daa17e89c03c667b481a500be752ebfd SHA512 0e863458e14b97a1fcfb054cc0072ded458da4d9c9bf237fc91aa4937b41b207f024bdceca59dc1703c75405520afca8dd55ec9ef69259d52c9430bcdf3c045e
+AUX rss-glx-0.9.1-bashism.patch 234 BLAKE2B 6470a46c9824cefc0c0aeb4fa0a31ce2fa94040c723111978ebe2d083b885e7cfc7ba91486ec70f5f2e2d5c89bf947270d8c2cc232ce33c78bdadb9ab550a438 SHA512 5a3f6d57602efb2601b313cd13202e4effe668bcab7620b782fb56d23944ac51b459cb684db9c851b555e606a6efb64798e1fc8f53d37b620841fe26ae49d777
 AUX rss-glx-0.9.1-c++11-narrowing.patch 1207 BLAKE2B 1b23dafe33b43f559859da3c4ad4395fab9bab556dd09261c5764257a7992b0cb29453646ae02c4791a378cb18671c3233fa1351bd60d7c5ae970309d3cfee3a SHA512 8c262ca79cd9bfd263576868b35dc0ad6444d15a10c6d550439d1dc87dd7eb7f8058291193479de45461b2610bc068be6b6a9e140c329383a3792ad15d73e060
 AUX rss-glx-0.9.1-hang.patch 299 BLAKE2B 2ce93ea94ee9d53d5eb5e9669799bd6423e0fe6de328e014403c9f315eddd7155e5fddd19145e380d0d163ebbcdb6c1509d265f528d150350d6487e951a04690 SHA512 9c8eb930360e39b53bd2d8878f5e9f35bf3015734164bb786f1d808bbcd4c0d0c91828daa154d545e7cc99fa51d1f12f15a0c6e06203e7793de37582ef76cfbf
 AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
 AUX rss-glx-0.9.1-matrixview-copy-font.patch 518 BLAKE2B 39ca9c83c71f88cf967731115fd8df28feca7d63cc1f462a8cacedcb332c1105445354f262f49a428a0f393b6217cfb3b1e5b9c35b61cfe29434f33b8649f554 SHA512 da60ea89d341a951f2880c86b0c624ea7f2e1f04350387db23229496a06b3bd6392ee1a4b723b69eeadcfd538eda01ca8dba6afe33e92ef4c88ecded05615fea
+AUX rss-glx-0.9.1-missing-include.patch 188 BLAKE2B ef9c6ae3e4ad4ad3ca4f28897516784efc650f341ba7e5e6ce3c76b04752bedeca0eefae481cdb52aade1b2801db81eb2249b108218d07410a5def4fae0f0ecb SHA512 608d19114f8cd2fd9a443df8c8f7ace26f304c94c00fe1789a79dad659963978bb51765a6541ad19ed39ee7dce6ee5b7a686c619a0a6f32ed3ba603facabaff7
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r3.ebuild 3963 BLAKE2B 1bf58b04e85b9d8bbe5aec2b39b8506a429fc1a0cdb5279635b8c09d474c6e9be0cf100da13acd2aac6a39adef8118ae4d14e19928ffc4275517727f458ff859 SHA512 ef65c54899cdf09e4015ebf957c2689c90a217dcc19a46ccd379791b15ec69127fb415b466484792b48a848f43c170d63b55a49897812f890eea305983200b80
+EBUILD rss-glx-0.9.1-r3.ebuild 4039 BLAKE2B c612f74f57e8de9faea105f8cfaf458eb6ba4459ea65f8cfdec0d2fdaed2104abd994591439cc8bfd9f395e24056c150be0bcdb24052faedff709262dd1cc48a SHA512 4a848e25e7d3436d1ce776883a5cba79439954b682ea92b63fe659006ff578aac50954fceddf74f3cf445b3621a2f4feb5002c2de82343342c487cf717c7da4b
 MISC metadata.xml 565 BLAKE2B 12058c9f2b265ad0871edf45d3432ee605ccecbf7b9c0f3dab5752dbaa061100203653ac01cf2bf251e3698163d542d133d6ceca26d2c7ddb3c1b885a3876c3f SHA512 acae3bfe457c4c171b9cb8458cfd455ed6e9d8b253dc3db659aa5d843e01fdfb68645911d34f200fc140bf2fcb9f19228d2ad169ad75dce5e2f9bc8f21f2f33e
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch
new file mode 100644
index 000000000000..4527f8710f83
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -52,7 +52,7 @@
+ AC_HEADER_STDC
+ AC_PATH_XTRA 
+ 
+-if test "x${ac_cv_have_x:0:10}" != "xhave_x=yes"; then
++if test "x$have_x" != "xyes"; then
+ 	AC_MSG_ERROR([X11 is missing but required.])
+ fi
+ 
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch
new file mode 100644
index 000000000000..6a6e286f873c
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/Implicit/impSurface.h
++++ b/src/Implicit/impSurface.h
+@@ -25,6 +25,7 @@
+ #ifdef WIN32
+ 	#include <windows.h>
+ #endif
++#include <cstddef>
+ #include <vector>
+ #include <GL/gl.h>
+ 
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
index 28f3cef7b41c..7db369224cb7 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
@@ -42,6 +42,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-c++11-narrowing.patch
 	"${FILESDIR}"/${P}-hang.patch
 	"${FILESDIR}"/${P}-matrixview-copy-font.patch
+	"${FILESDIR}"/${P}-missing-include.patch
+	"${FILESDIR}"/${P}-bashism.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index f823f563d71f..760e89b3dda8 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,7 @@
 DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
 DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
+DIST shutter-0.96.tar.gz 2558287 BLAKE2B cce48a08345502b97be67c6299fa1a011c813519620c7c4c1ff09bf25d6fb525e71b7439037fcbed96900b191e18f551dcac8af1ef0bdce756d4489b2b0b9d95 SHA512 0c7d13950bed216571278cec730a4986aae87effbf385d39805c0f0206c9fda30ec0cba4fe7cb36eebd9cd228c4ada35e21fd5170c9c442eee6934dac41c0c0f
 EBUILD shutter-0.94.3_p20200621.ebuild 2344 BLAKE2B 8519e1ca1c0e45e8712ca98795bf24a65ea26482abd896d9c9fba923cee8c3a4363fe184c9ce68a759428dec94add0316c65ffadd14818352cf6302b2c11c7dc SHA512 1bbf7d90fc522878d9c9cb82bb9f83966e51be028adf8c1a7060d6e0619f9362b577314feb024583eed075c4a32b2a8b37476eb3e2f18dde51cd75fe51c2dde9
 EBUILD shutter-0.95.ebuild 2101 BLAKE2B 9dbc3526fc832f35ecf43b4f6f9e71ba4bf163d77aafc84745abd8dbe5c2c819c5b099e25ff73a397477e2fa9324228429731a4ba970e84d4a6082e0c6780694 SHA512 e5d94e24724be26f6dc6d6a7b78c55f8ef7cbb1cc261369b12671304276d1b37185904c193b527bfba0622be301f46a5e6aab0a9341d550f004be03e78107f68
+EBUILD shutter-0.96-r1.ebuild 2133 BLAKE2B 110e656054c1268a0f3d1033452b905c106c6b9397836cb242a770772a9c814e16d80fd80f228306a9b5fe75f6afb7d9f511db04ae7b2c5f684808fed6ad874b SHA512 d18f9ebbff1bcf5c553d1fa25e6bfa8e06e8f92a0e77583ea02582c7fffe8a7b266a7e6a3a974a66daa718a6c5c5c7d71350d41afc0a956347d515ee61bd091b
 MISC metadata.xml 403 BLAKE2B c07092357bb7c9820fe97d4c08081d1074576757c53e81ff0836f4c6b9b4ae7bd604d1c8272c40bf40c0cbc76ea09501ed261d6a65798cde887d85acbf93005b SHA512 69fb60834dd62cec6ec79c6d2d4adf2eb0bcec46914f1794ad6ec611e999919a1dbafd9e648341d7cf2bb03dfd35004293a1192b5392682534ca331aed8681b1
diff --git a/x11-misc/shutter/shutter-0.96-r1.ebuild b/x11-misc/shutter/shutter-0.96-r1.ebuild
new file mode 100644
index 000000000000..a93ac100854c
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.96-r1.ebuild
@@ -0,0 +1,81 @@
+# 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/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 7a6a6b8a9717..0339bd2636c8 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,5 @@
 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 638 BLAKE2B 442c9b5c50be2f13d16976f53e0b775403af6fc5b95c43451b3f6c76e06799a80fd4b6d40409879758c0dea2e85c42a93f08914797e815db4b57d1e3b2ffd7a0 SHA512 c3df01cd27a4400272d95b61fcc6178bf53bca665e930d28e97262ffb96a6a3da07bcdba4b054a74adb26825625ee6b20577ba737382b41c22b92a7d4489e7ec
+EBUILD sxhkd-0.6.2.ebuild 660 BLAKE2B aa45349c8cb332e204201991a5c52de18b3e4eb9e7893aa00d3e94e30ce38613dbb70c96ec4125f25eae82f8668ba6351f39b0ba6cd7fdb355f53f74e1d0de91 SHA512 66b15c4bf975886f6cac5123d576f478dbbde6d8b1e857024fc0c5bbb44dd220549679699c82d7f127470932a31fd98587d4e7846dd76552d94cd94f66197943
 MISC metadata.xml 327 BLAKE2B 2f3ca988674ff92fd3295c19c9ea30c7d55f1ca7527a5a92a677c4eaaa8d1030dad4acf3589ea9c6d1d81499abc74d8d125a915e02b108bbab8b38d56023a671 SHA512 ccb2545217cf7ca34ec62c6b1c41aa02209bfa8d4d2dcced53df8755850c109ffeefb1a1b7c3824efe1de28778cdfa4460ba22e08d58bab795817390231061fd
diff --git a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
index da492d24eb92..0bb670aea4e9 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
@@ -22,6 +22,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr DOCPREFIX="/usr/share/doc/${PF}" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" install
 	systemd_dounit contrib/systemd/${PN}.service
 }
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index ae6242634627..01a0ebf097b2 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -2,6 +2,10 @@ DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f
 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
+DIST synergy-core-1.14.0.3-rc.tar.gz 8834856 BLAKE2B 7021c251fe7d6f620c7f7efab7bcd17876e1a749a4268957e424aa9e0f8cc2454632d1caaa28b727bb4215369f36914f656fd87011bd83ec9eae475d3386cd81 SHA512 be070483ae8028197d1e2550b0dcb77e28ffc45a348757277e30127ebc21ae3f7795aaa016def2a62580699c9312c2c1730f151121ddfe4ce780fcebdced4e10
+DIST synergy-core-1.14.0.4-stable.tar.gz 8835907 BLAKE2B 56e59eb3494e9823feca7744602c9ce1ae709a6d74c80c6d06f861333d938331760eb02b83d980afd932e1760a638849ba498fc0d919eeb431e54d3a1602f77e SHA512 278ff319c5d308052e9f89a8ae53a99aacaa2b394d28e353b3779a4ee672cb09d91f37a4b0564788456d8e0bed90936d924739e74f7aa2a85482926164dc2fc8
 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
+EBUILD synergy-1.14.0.3_rc.ebuild 2415 BLAKE2B 41e7f53b0093101befa373b87a2c1f2ffec5bff8ff8079f3bb07c772bec14999d7bbc2dd87313febb0e5a3893435b2230c468e20fedd655387475c52ca409a50 SHA512 b39d269e192138615d32dfbcd9e3953f1704cda8174a1063128978d7b79b31216f52f9e611f72b4eeb35a54eddc39c1512c319d836666e14398c184e3d9b0de8
+EBUILD synergy-1.14.0.4.ebuild 2415 BLAKE2B 41e7f53b0093101befa373b87a2c1f2ffec5bff8ff8079f3bb07c772bec14999d7bbc2dd87313febb0e5a3893435b2230c468e20fedd655387475c52ca409a50 SHA512 b39d269e192138615d32dfbcd9e3953f1704cda8174a1063128978d7b79b31216f52f9e611f72b4eeb35a54eddc39c1512c319d836666e14398c184e3d9b0de8
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.14.0.3_rc.ebuild b/x11-misc/synergy/synergy-1.14.0.3_rc.ebuild
new file mode 100644
index 000000000000..e621bed9e265
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.14.0.3_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/synergy/synergy-1.14.0.4.ebuild b/x11-misc/synergy/synergy-1.14.0.4.ebuild
new file mode 100644
index 000000000000..e621bed9e265
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.14.0.4.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/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
index 55fc4702f9f3..42ff2b74e2a7 100644
--- a/x11-misc/unclutter-xfixes/Manifest
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -1,3 +1,3 @@
 DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
 EBUILD unclutter-xfixes-1.5-r2.ebuild 727 BLAKE2B 3088ec27606defbe47ec80e8beb5baa2f79e1099eff3059f3542203bb3478edd892f1422adb51a28b735d30195e6c432cfb449d47d419ce48dfb347025d92966 SHA512 30f102c84a2b7b5ea2f0e41093e82ce435c89b90c5428f8b4d7a826f3419ceec2816fd727580fe9c6f5d9551d4ab039cf1a8150fa8bf343cfdd547f4c9d12be0
-MISC metadata.xml 485 BLAKE2B beda121958aa7220652868343c0149cf546f1ddaec6b89cf737d4c68c70a508db1ca7e351c33e1dcc0b83c063b0dbe60ced4a27b71e0507aaf2523e6bdc5fabb SHA512 5bbaa4e4f20bef7c6bd99fdc0af7683e50f8281a5ddcbe7b1598ab8ea78b1b1cb3d1e877f49fc4dd06e417111c32cd162f0e192d51ed5afe8874ad676b9c303e
+MISC metadata.xml 336 BLAKE2B f6aeaa90ce878d78131f3ed04692eae6d49c77885ceb09b1ecab2a3684978eb194ba3dd5ba17fe43e8d618685206467be6c1eb6a4a152bd68450d9c7badc39bf SHA512 e66195b0b713c0eb9c165205c43c331fed9ec7fdf48fc47cd6e5e45e5199c153872ee8816ab0fb1fee8331328d15616f7b51fa57b2e79e371fff311d10cbbe84
diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
index 981765a60f18..db59f9b725b2 100644
--- a/x11-misc/unclutter-xfixes/metadata.xml
+++ b/x11-misc/unclutter-xfixes/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">Airblader/unclutter-xfixes</remote-id>
 	</upstream>
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index 60a1df3e9a00..3a9deb325089 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
 EBUILD wmctrl-1.07-r2.ebuild 590 BLAKE2B 6171168a8a9b176fa96fcd2cd376f38ae7928d8ac5a3c665fcb29eb66dc156829ff67e7265611b71f25411af3e8b5f7823e6a86dc926b6d1becf2117f9e8b11a SHA512 4bf9e402e54260433781c4d54f280686398f8faa415c914c7965e43c190b0178437b8c5612a8d525cef52e36089ec9f74aa0bb07b399728d32b5bba7ef7b73da
-MISC metadata.xml 394 BLAKE2B de321c70a09c8788f2d8e2e41361837d7bc473781342668ae8d75badffed70f30463f0e9ddcabdc5fcae99b76019c245cc0a6680087a4cf72be10fb3d982994e SHA512 ae4d892c3b223d94ac532d7c3916af6b2c791ad25433fb673b8f7591f1c425bc72684f877066b7012db1dd7b2b2edbc8ed416f450fd32966c30dbb22fe9ffdbc
+MISC metadata.xml 245 BLAKE2B 33d86327929801f107536147a5d58d3550471eb2f1635cd44ef84803cd8f09fd38c022336ebca0a1f8469009c75e33dd94b4f6775433a7ab537c93fe6e4e36b5 SHA512 e2effe9206b78650b406186fc5c054f5b9e269de793af596a58d32e7a17b376eac0ddc3177738f6b74076f46c5d33c774c28db9683870d9791f2aad7954782d3
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index f65b774ed444..5350da507961 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 4e542fe2b2c8..5158b900a6a3 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -3,5 +3,5 @@ AUX xaos-3.5-build-fix-i686.patch 708 BLAKE2B 9c857438f7272a173b6047a3050e57311a
 AUX xaos-3.6-buildsystem.patch 2460 BLAKE2B 7f8c5fe68e1f7f626236ffd687bb1e33ce1a064cf5555748fc7680b19b041db054a06616391a25e7fd9f37b0ae5a34bcb7773676d15d9222b4e416bc0fb704cf SHA512 79d1a738c709510dd36d4cbe17eb4376c212a81af2e08c45d292a182e9862f2f3e1f5075f488789f490d857f2b7eb76409d558caca93eb14914522f36f78d5cf
 DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
-EBUILD xaos-3.6.ebuild 1880 BLAKE2B 7f1b025b5372d9125cccb463f936a9ae6468c4dbaf030e495dcfdc5b7148c3aa3dcbb9ff2fac220cb5e5cd1f6d187ae8e7b86ecf2bf7df6afa02319826dd31ea SHA512 ca11ce2a5be825ed36317798f157b5ebed5682063ad0e56cb1eca857eb542ba77baa522f6940cc317d88297ddc2201f29fc737a00c6d82f8489ceecd8e389ae8
+EBUILD xaos-3.6.ebuild 1879 BLAKE2B 839069ebafdbbe422ec0032e61f87fddac50c4a95bb0a91c670dc49240a6ec3cf93b0a176d94b82bc7c6fff3add4df5c9eaaf9b3ac988bbc05d26b53190eb127 SHA512 eda78844e89fdf1920c8b0f174702737c2d891e217dd4e49d33230ba854f2d295e50cc6816e8001df30cffcccad1d35355f414956a23da8297551a7a8788d752
 MISC metadata.xml 766 BLAKE2B ca6be3fc4134359d4c6ea3eb8498b5235c87694bb76981747651c78b1fe00fa2d7d1c736910d3144101762fad9b26819df46af0270a4db5b0b39e623bef5eca5 SHA512 8e3ff6323fadbb15a6144c80bbbe33056072758dabb6e96e8b331f3327ea7e99b2a2c9b87b3532e70a1bd331b9d0e59be8b22c2fcad262eacf317c5b33647519
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index e5f86137a933..ffe1c9122b52 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aalib doc -gtk nls png svga threads X"
+IUSE="aalib doc gtk nls png svga threads X"
 
 RDEPEND="
 	sci-libs/gsl:=
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a6d6ecbd35a7..1ae3fcbf0abf 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,15 +1,19 @@
-AUX xscreensaver-5.05-interix.patch 1033 BLAKE2B 0267bae00b42dfb6ee8a5be2001c5fa2a66efddf43d2d0477d017196a99f64cf38a6430f2576bcefe6d3ffe4df487ba12e940d3122f51ab974d4d80e9fb3edc0 SHA512 61201dba2e4a1332db179f619452dedd67a6576f6002184d35109d25079c7a9b8a71267a0713c1c2d32a59c08867d2642edd9a1c22a39dd324b0be3fa3d13dd0
 AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b7e5dca4911a76de46372751c82a060ae9c0ee5ed35d1efb33f02d6ffbfbd5903ba5f823e1db5ba9d2762a8841cefacf SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557
 AUX xscreensaver-5.44-blurb-hndl-test-passwd.patch 247 BLAKE2B fb88708de900b90fdb846608cc0a08706c339792e10099e7873aef00b7c66a408dba71489d0938b59e619345c739e4f6a35a9c97b1ae83cfa040035df3499434 SHA512 bd7f0e3f670e99ad1297306c88e30ac9cc381adf2a54cfd52192c1f562293ebdfcf3e956990cd2f3d877a2ca0d2f5b13332de726304ef93510c5bd08ae39a819
-AUX xscreensaver-5.44-gcc.patch 549 BLAKE2B 9e8b626fd7a9f3778c1bc62a3f161cd2d94b70769fc4adc06c64dd2c7515fbc5054257560326a7d15c124fa90e93b907bb5f3c5954bbe11c123540625b0f2e57 SHA512 d55908911b738e3fc5245627ca79f9c2880402921d38f80247e2143422543396399f5529fd70f4f473935d2606f10dbe3501d2e64af158b38fc03d995345ff10
 AUX xscreensaver-5.44-gentoo.patch 1368 BLAKE2B d74cbe8effe8feb4c682f8df537a2a1897defa31c0838bfb34967642ab2e66e8058b3306c98e360e3c5f81ff4649b759d5386e6e2613c59fb945f439c3b0cc02 SHA512 bba16c093a2a16e57e3bbe77ed7a54201e7e9e1c9a3c5a65065f275a4faa6898327865b62a56be0c538dabde1fb4571ccfd567035911b85688f31ac1cba128b1
 AUX xscreensaver-5.45-configure.ac-sandbox.patch 4763 BLAKE2B ce28548f02c5e8c769d1c02329a15422bf172b8a4feaff09c2c36e706139949c1f9e21b797378bc492226d077e8f2679b8afb32c0e078c0a6acf98ca01d36cd4 SHA512 18bde1dd95775d8afbc6636900844cfd5b317e1e56aa42014c9a988815c1b544458d88e27018d53abfa9354ca816fc7b3a086a59ad61bf561a35fc2605ace109
+AUX xscreensaver-5.45-cve-2021-34557.patch 1567 BLAKE2B 1ee8105b3f4d9f1772b29138ccdd915d4ae7c9def97d773b7369bc7aa01ffc12b0718815e151ee2ae2893ae240193e111f743368a156d53d7af4def15b7d4b95 SHA512 f6db9516a56c0fa65a7fff558c6db11e632d095c5cd505df231c54211d7fa85ddec30a3d809555cbe0910b589eaec9f70771546a0d188e9ce56716dfcb949aa1
 AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c84a40344b408d3261b60a9b6f4357070644ae5c2d6cf1f4f93229cbf5e66d0f893d71e5c6baa13d77b96d17d09d33 SHA512 6549885e1bf7515845c1e2f47ec211e2c948b22531e14a5cab0cf700863450d6bfff8b1cd385a8a083771c73591a5f65fbd9f1b4d0280cb08edeea31236aeca6
 AUX xscreensaver-5.45-interix.patch 950 BLAKE2B 6bbebbc4ff8eb2dc0a3179441c2813559bfb2ad1727db1295fb847dff0b4510a31b32b7982fa83f059e99f1c58f5cd12f84600e2183273417cb1e0e17843929a SHA512 94937b43f1f0ea1b72fa0ae95b967481702362b2b6f9aa4acbc7dfd2919c69d1cc302cbb9bb8a953da22b7eb29b3874a160cf741c7ff8f4c9b9942b8af7ba6d4
 AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf32302bef97f846edf1585659340d1212710654dc1162d3be0e2ecfc8846a04732976c40b0167630fca0d12f64a6cc0d04fabbe0b323dabae83 SHA512 552a9674d2954168af666a0e61bbe8b7302fab8630116196482507c595b3a9a902eceb58387973a23ad931e54c8f3f35953dd86357e25492f03a552a168ef88f
-AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1b3e9644d79d10a768baea64fbbed6301dba0fdaa1d575b85b2e8322eda251030a79835f7476020680a8b5a05354d279db8aa06943475 SHA512 6e55932f6be85042eb6f88a79d32b90fe51734b90f9e15aeebfefcdfe087af85b6cf5bed8c3c4212c1e8a91a77dda49eb6fbb64b829dcd02230710b803863a7d
-DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
+AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
+AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
+AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
+AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
-EBUILD xscreensaver-5.44-r4.ebuild 3809 BLAKE2B 92f6ea9bc641d75c47dab18a4e0339f68f8ae9c3f621efb306a874155b5aefdd7a08f09edcd4c047972ed982df6ca432647c934d9ae2baf3d488e1c678c9cbd6 SHA512 c076b5263170f3ce709971a1a65468a475d9b5d511c28e41ec47c7b3fe8cec179cc4c0ed8f78a132ade7e23afcd08d685220adf78a3abc2321e4209f0de5a9c0
-EBUILD xscreensaver-5.45.ebuild 4091 BLAKE2B 3d6281d6a5b320a10d2496e009a6742b07938c04555754203f42ae7366aa759132c723078df5739542a8111b2a85a6d3de2ef2bbdacca263ab37f219f7689229 SHA512 b3e2d732f8cae62065f13a54f76eee810ac09efa90a334e4d291747b447588b7c47e6bb1a7041df1dbd59496945e35bc3069c88d5d99c3f97e54a5acdbc03dfa
-MISC metadata.xml 789 BLAKE2B 9f4d6ec06c763d685b8c6006747fd6482ae5199c4eeeac8ba1bc13f34eaeb8d1dfd67ee0762edd0d4d0199759b26bddd077c07bafa7373f4e6c4069c893757ed SHA512 5f839da92e2f2564d22a93d14ae62b0fecb70be706b89ba2829196859cebd11cfe2d4745e34a33a767d5efe92135fc0fc9686c175dc2774278a3dc944ffa515a
+DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
+EBUILD xscreensaver-5.45-r1.ebuild 4131 BLAKE2B 0fa4330d7c2acb39688420e83f3abdf6069186cd99053c868536177f4d0c58a725dfdf0f7b08d067c6946334103c07908b87e1c392f58a1a4ee8812d721cc4bf SHA512 3234a48dbd91cfac9cc4cee61ec7dafe64cc20a8256922466cf79772f3c54a516bd8b6933ca4dc66c75b1cb04bf1391beb3d22a1ea454d889b490fc7507120aa
+EBUILD xscreensaver-5.45-r2.ebuild 4124 BLAKE2B 26fc34c31d5554b0b4e7d70f8808f3718ed35fdf033d707f72e8ece210f0455d224727c3b6de81254d87755e18a1e3c1958b246abfd0d0893c18bdacd0680606 SHA512 bbb6e4157485bee126775f8f72b0fe54f88da06dadbefd33d2591754b5814e1a9a2addecd7f52448ff4478fa03c4b9d61007e9b25a75cff35d11e790d95ea445
+EBUILD xscreensaver-5.45-r3.ebuild 4229 BLAKE2B 48001622291dac1d5fb4016a8edcf35f0e88042f810d939c558b1cc0e5fd50bac6a975b5be353101322b802326bf02f63f7052775b09d5ba1dbce97759e36a9a SHA512 7c95bb90ecca5a45d53d471bddbd9f1256d97ce767b4a7c8969e4e878da880dd6f25cb2cf71900fcc17f50e4d2b44386b082fe66182cca5db70a3c32cce719f2
+EBUILD xscreensaver-6.01.ebuild 5058 BLAKE2B 370ccbde16ad859690b1482539809c27c922568b52a87e81e71e048a6a25018cc6ea6912800602edf545a18dd9daa45f333de6dc8f3cd540236298f1ab0dc892 SHA512 8e90f353d68ea66667f6e319279e2b53659a129da37b2f181344a5ef0e5a5b1e4f16fc45806b1a052a31ae543529307b05df4835b117d4c78855db1697eaf50b
+MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
deleted file mode 100644
index 2a5eead4879f..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
---- xscreensaver-5.05.orig/driver/prefs.c	2006-05-24 00:03:47 +0200
-+++ xscreensaver-5.05/driver/prefs.c	2008-03-11 09:20:58 +0100
-@@ -951,9 +951,12 @@
- 	{
- 	  p->init_file_date = write_date;
- 
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* Since the .xscreensaver file is used for IPC, let's try and make
- 	     sure that the bits actually land on the disk right away. */
- 	  sync ();
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c
---- xscreensaver-5.05.orig/driver/setuid.c	2006-02-09 03:33:29 +0100
-+++ xscreensaver-5.05/driver/setuid.c	2008-03-11 09:22:59 +0100
-@@ -136,9 +136,12 @@
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
-+
-+#ifndef __INTERIX
-   if (setgroups_needed_p (gid) &&
-       setgroups (1, &gid) < 0)
-     sgs_errno = errno ? errno : -1;
-+#endif
- 
-   errno = 0;
-   if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
deleted file mode 100644
index 16493e1fd1dc..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -468,11 +468,11 @@
- 
- AC_DEFUN([AC_CHECK_GCC_ARG],
-  [if test -n "$GCC"; then
--   AC_CACHE_CHECK([whether gcc accepts [$2]],
-+   AC_CACHE_CHECK([whether [$CC] accepts [$2]],
-      ac_cv_gcc_accepts_[$1],
-     [rm -rf conftest.$ac_ext
-      touch conftest.$ac_ext
--     if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-+     if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-           grep unrecognized >/dev/null ); then
-        ac_cv_gcc_accepts_[$1]=no
-      else
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
new file mode 100644
index 000000000000..3d002b40877a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
@@ -0,0 +1,40 @@
+From c1e43f7fa01b7536bc90ad5a9b61c568f4db4dd1 Mon Sep 17 00:00:00 2001
+From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
+Date: Tue, 18 May 2021 15:41:55 +0200
+Subject: [PATCH] Fix updating outputs info
+
+When an output is disconnected, update_screen_layout() will try to unset
+a property on window assigned to that output. It does that by iterating
+si->screens up to 'count', while 'good_count' signifies how many outputs
+are currently connected (good_count <= count). si->screens has few more
+entries allocated (at start 10), but if there are more disconnected
+outputs, the iteration will go beyond si->screens array.
+The only out of bound access there is reading window ID to delete
+property from, which in most cases will be a bogus number -> crashing
+xscreensaver with BadWindow error.
+
+Fix this by allocating array up to full 'count' entries, even if much
+fewer outputs are connected at the moment.
+---
+ driver/screens.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/driver/screens.c b/driver/screens.c
+index 5aeb55d..16d6ec3 100644
+--- a/driver/screens.c
++++ b/driver/screens.c
+@@ -1020,9 +1020,9 @@ update_screen_layout (saver_info *si)
+         calloc (sizeof(*si->screens), si->ssi_count);
+     }
+ 
+-  if (si->ssi_count <= good_count)
++  if (si->ssi_count <= count)
+     {
+-      si->ssi_count = good_count + 10;
++      si->ssi_count = count;
+       si->screens = (saver_screen_info *)
+         realloc (si->screens, sizeof(*si->screens) * si->ssi_count);
+       memset (si->screens + si->nscreens, 0, 
+-- 
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
new file mode 100644
index 000000000000..fe56f927e208
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
@@ -0,0 +1,120 @@
+From 0f4d029102c651ccbc69860bf222126d2c58e36e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 13 Jun 2021 23:41:42 +0200
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 96 ----------------------------------------------------
+ 1 file changed, 96 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b8641e..2eaea28 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4833,102 +4833,6 @@ for bad_choice in xscreensaver xscreensaver-settings xscreensaver-command ; do
+ done
+ 
+ 
+-# Warn if there's a previous RPM package installed.
+-
+-rpm_vers=
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-  # Don't bother with this test if we are currently *building* an RPM.
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras
+-            xscreensaver-data xscreensaver-data-extra"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  pkg_vers=`(rpm -qv $rpmnames) 2>&- | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.].*\)/\1/p' | head -1`
+-  rpm_vers="$pkg_vers"
+-  changequote([,])
+-fi
+-
+-if test \! -z "$rpm_vers" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  pkg_bindir=`rpm  -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+-  pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-  pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+-  pkg_addir=`rpm   -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-
+-  if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+-  changequote([,])
+-fi
+-
+-
+-# Warn if there's a previous Debian package installed.
+-#
+-deb_vers=
+-if test -z "$pkg_vers" ; then
+-  debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+-  pkg_vers=''
+-  for dpkg in $debnames ; do
+-    if test -z "$pkg_vers"; then
+-      pkg_vers=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+-      deb_vers="$pkg_vers"
+-    fi
+-  done
+-fi
+-
+-if test \! -z "$deb_vers" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  pkg_bindir=`dpkg  -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+-  pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-  pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+-  pkg_addir=`dpkg   -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+-  changequote([,])
+-
+-  if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+-fi
+-
+-bindir_err=
+-hackdir_err=
+-confdir_err=
+-fontdir_err=
+-addir_err=
+-if ! test -z "$pkg_vers" ; then
+-
+-  err=" (DIFFERS)"
+-
+-  if test -z "$pkg_bindir"  ; then pkg_bindir='???'
+-  elif test "$pkg_bindir"  != "${bindir}/"        ; then bindir_err="$err" ; fi
+-
+-  if test -z "$pkg_hackdir" ; then pkg_hackdir='???'
+-  elif test "$pkg_hackdir" != "${HACKDIR}/"       ; then hackdir_err="$err"; fi
+-
+-  if test -z "$pkg_confdir" ; then pkg_confdir='???'
+-  elif test "$pkg_confdir" != "${HACK_CONF_DIR}/" ; then confdir_err="$err"; fi
+-
+-  if test -z "$pkg_fontdir" ; then pkg_fontdir='none'
+-  elif test "$pkg_fontdir/" != "${FONT_DIR}"      ; then fontdir_err="$err"; fi
+-
+-  if test -z "$pkg_addir"   ; then pkg_addir='???'
+-  elif test "$pkg_addir"   != "${APPDEFAULTS}/"   ; then addir_err="$err"  ; fi
+-
+-  warning=no
+-  warnL "There is already an installed package of xscreensaver"
+-  warn2 "version \"$pkg_vers\", in these directories:"
+-  echo ""
+-  warn2 "User programs: $pkg_bindir$bindir_err"
+-  warn2 "Screen savers: $pkg_hackdir$hackdir_err"
+-  warn2 "Configuration: $pkg_confdir$confdir_err"
+-  warn2 "Extra fonts:   $pkg_fontdir$fontdir_err"
+-  warn2 "App Defaults:  $pkg_addir$addir_err"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+-- 
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
new file mode 100644
index 000000000000..41f8d7b7d089
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:30:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
++*dpmsEnabled:		True
+ *dpmsQuickoffEnabled:	False
+ *dpmsStandby:		2:00:00
+ *dpmsSuspend:		2:00:00
+ *dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *verbose:		False
+ *fade:			True
+ *unfade:		True
+@@ -62,7 +62,7 @@
+ *textLiteral:		XScreenSaver
+ *textFile:		@DEFAULT_TEXT_FILE@
+ *textProgram:		fortune
+-*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL:		https://planet.gentoo.org/rss20.xml
+ 
+ ! This is what the "Settings" button on the splash screen runs.
+ *demoCommand: xscreensaver-settings
+@@ -103,7 +103,8 @@
+ 
+ 
+ ! The strftime(3) format string for printing the time on the password dialog.
+-*dateFormat:		%I:%M %p, %a %b %e
++!*dateFormat:		%I:%M %p, %a %b %e
++*dateFormat:		%x %X
+ ! DD MMM:
+ ! *dateFormat:		%I:%M %p, %e %b (%a)
+ ! 12 hour time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
new file mode 100644
index 000000000000..72aa6535f139
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
@@ -0,0 +1,30 @@
+diff -Nru a/driver/prefsw.c b/driver/prefsw.c
+--- a/driver/prefsw.c	2021-02-19 02:52:32.000000000 +0100
++++ b/driver/prefsw.c	2021-05-07 15:20:09.280321274 +0200
+@@ -798,7 +798,10 @@
+ 	     sure that the bits actually land on the disk right away. */
+           /* Update 2020: Apparently here in the future, this sometimes takes
+              3+ seconds, so let's not. */
++/* Interix has no sync() or alike. */
++#ifndef __INTERIX
+ 	  /* sync(); */
++#endif
+ 
+           status = 0;    /* wrote and renamed successfully! */
+ 	}
+diff -Nru a/driver/setuid.c b/driver/setuid.c
+--- a/driver/setuid.c	2021-02-05 16:16:23.000000000 +0100
++++ b/driver/setuid.c	2021-05-07 15:21:05.987949943 +0200
+@@ -104,9 +104,12 @@
+   if (uid == (uid_t) -1) uid = (uid_t) -2;
+ 
+   errno = 0;
++  
++#ifndef __INTERIX
+   if (setgroups_needed_p (gid) &&
+       setgroups (1, &gid) < 0)
+     sgs_errno = errno ? errno : -1;
++#endif
+ 
+   errno = 0;
+   if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
new file mode 100644
index 000000000000..c98d5297e9b0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
@@ -0,0 +1,28 @@
+From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 14 Jun 2021 12:11:32 +0200
+Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
+ --without-gl
+
+Symptom was:
+/usr/bin/install: cannot stat 'sonar': No such file or directory
+---
+ hacks/glx/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
+index ed07a1f..6ae969c 100644
+--- a/hacks/glx/Makefile.in
++++ b/hacks/glx/Makefile.in
+@@ -320,7 +320,7 @@ install-program:: $(EXES)
+ 		  $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+ 	   done ;							\
+ 									\
+-	   exes="$(SUID_EXES)" ;					\
++	   exes="@SUID_EXES@" ;						\
+ 	   if [ @SETUID_HACKS@ = yes ]; then				\
+ 	     sinst="$(INSTALL_SETUID)" ;				\
+ 	   else								\
+-- 
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 79ffcd7098cf..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-libXxf86misc is the client-side code of an X extension that has not been
-supported by the Xserver in more than 10 years. Since xscreensaver's dependency
-on it is automagic, we have to patch configure.in to safely remove it.
-
-https://bugs.gentoo.org/720158
-
-diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in
---- xscreensaver.orig/configure.in	2020-05-02 18:09:23.169324761 -0700
-+++ xscreensaver/configure.in	2020-05-02 18:09:52.578233240 -0700
-@@ -104,12 +104,6 @@
- 	    (It's available if the file /usr/include/X11/extensions/XInput.h
- 	    exists.)])
- 
--AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
--	    [Define this if you have the XF86MiscSetGrabKeysState function
--	    (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
--	    sequences to be temporarily disabled.  Sadly, it doesn't affect
--	    Ctrl-Alt-BS or Ctrl-Alt-F1.)])
--
- AH_TEMPLATE([HAVE_RANDR],
- 	    [Define this if you have the Resize and Rotate extension.
- 	    This is standard on sufficiently-recent XFree86 systems, and
-@@ -1888,25 +1882,6 @@
- fi
- 
- 
--###############################################################################
--#
--#       Check for XF86MiscSetGrabKeysState (but only bother if we are already
--#	using other XF86 stuff.)
--#
--###############################################################################
--
--have_xf86miscsetgrabkeysstate=no
--if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
--  AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
--                [have_xf86miscsetgrabkeysstate=yes],
--                [true], -lXext -lX11)
--  if test "$have_xf86miscsetgrabkeysstate" = yes ; then
--    SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
--    AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
--  fi
--fi
--
--
- ###############################################################################
- #
- #       Check for HP XHPDisableReset and XHPEnableReset.
-
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 8893ad3c39cb..31e771cd6ac0 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -9,6 +9,7 @@
 		</maintainer>
 	</upstream>
 	<use>
+		<flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag>
 		<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
 		<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
 		<flag name="locking">Compile in support for locking the display</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index 593985b9f95e..661463a8b2b8 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -2,13 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib optfeature pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
 
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+DESCRIPTION="modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -77,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
 	"${FILESDIR}"/${PN}-5.45-gcc.patch
 	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+	"${FILESDIR}"/${P}-cve-2021-34557.patch  # bug 794475
 )
 
 src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
index 46e166226f08..22af82cbaec2 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
@@ -2,24 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
 
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+DESCRIPTION="modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gdk-pixbuf? ( gtk )
 "
 
 COMMON_DEPEND="
-	>=gnome-base/libglade-2
 	dev-libs/libxml2
 	media-libs/netpbm
 	x11-apps/appres
@@ -48,11 +45,13 @@ COMMON_DEPEND="
 		virtual/opengl
 	)
 	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
 	xinerama? ( x11-libs/libXinerama )
 "
 # For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
 RDEPEND="
 	${COMMON_DEPEND}
+	media-gfx/fbida
 	perl? (
 		dev-lang/perl
 		dev-perl/libwww-perl
@@ -69,23 +68,25 @@ DEPEND="
 	x11-base/xorg-proto
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.05-interix.patch
+	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
+	"${FILESDIR}"/${PN}-5.45-interix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
-	"${FILESDIR}"/${PN}-5.44-gcc.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+	"${FILESDIR}"/${P}-cve-2021-34557.patch  # bug 794475
 )
 
 src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
 	strip-linguas -i po/
 	export ALL_LINGUAS="${LINGUAS}"
 
 	if use new-login && ! use gdm; then #392967
 		sed -i \
 			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
+			configure{,.ac} || die
 	fi
 
 	default
@@ -127,14 +128,15 @@ src_configure() {
 		$(use_with opengl gl) \
 		$(use_with pam) \
 		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
 		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
 		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
 		--with-dpms-ext \
 		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
 		--with-proc-interrupts \
 		--with-randr-ext \
 		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
 		--with-xdbe-ext \
 		--with-xf86gamma-ext \
 		--with-xf86vmode-ext \
@@ -159,3 +161,8 @@ src_install() {
 
 	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }
+
+pkg_postinst() {
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
new file mode 100644
index 000000000000..584b0e0ec509
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic l10n multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	caps? ( sys-libs/libcap )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
+	"${FILESDIR}"/${PN}-5.45-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.44-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+	"${FILESDIR}"/${P}-cve-2021-34557.patch  # bug 794475
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_enable locking) \
+		$(use_with caps setcap-hacks) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
new file mode 100644
index 000000000000..a3c8734ec8ef
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		$(use_enable locking) \
+		$(use_with elogind) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index fea76960e243..35156a7a9762 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -8,5 +8,5 @@ EBUILD zim-0.73.1.ebuild 2002 BLAKE2B b971044002f24335c7f3daf11968169b09afdecac1
 EBUILD zim-0.73.2.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
 EBUILD zim-0.73.3.ebuild 2004 BLAKE2B d6478af537b4a15014f485eda1244ebcc8731ea2cc25b674982a393fab6772694722dd4049a04d9f59a41df128d7c26d669b0a94e0eefd9e05a98f9484f0daf7 SHA512 76ffbc31bae087720a1a4dea30d0d38b5e377e4bba1fff7a42df28c4652ba76421012ff0ba82f22fc4573654d7f7c4d876ffd05d68a3972ca06d3e857380b8e4
 EBUILD zim-0.73.4.ebuild 1836 BLAKE2B 48ba230f3107c73756959d990fa50760a274bd6041aefd635a1e71176598532ccf2cc031ddbd7184c1fabe8eb023be97f84533e0dbc1d50e0a468948e314d106 SHA512 4e1b01089107eb7bd13cb5c55245d7b8eed655428c2e92afa49b3bbdb494222931c4b4a29c09e7ce465e4bd49616a0a44ceecb171b9273e44ada685bf24478f2
-EBUILD zim-0.73.5.ebuild 1836 BLAKE2B 8b948039c8c348d0e03e4ad5dfbd6f8753f52afd6624651cf696781235468c7ee787a5d1761f7491ef791abd0a3cc62677861826fe6e82dfb9db44152050b96b SHA512 8c99951b620ec4553010355733b52b1b4b4635ca7fc035b130fc529f95865492a50ade1994485872b41ef95808590455b97f5a22251ed00f8239cc5eb43ececd
+EBUILD zim-0.73.5.ebuild 1834 BLAKE2B 24c1e73ef3b410816917da6680b4f9996284bcc7589255a28fd080d1bb1a44a26a5e01f1f4bfa9c7b431e7227739ddade33aae10aaadd2069ddf258e0f5b159c SHA512 147ec7db53eea984d7732d3cec990c91d6e915c7b46492b41a47c69a9bfa13339a8a2b023fcde86ee9a7bd2bcfbda15cfa03bfc6ba878553f1e21ee232d21198
 MISC metadata.xml 804 BLAKE2B 3b238d0a00d1ff9edc20e2b65b06aefa6b324e71c70e545372e3d05fb4020a67a2be45ade5065439f7974eaea6fa25ae8d65addc9e940d5c3762f7bd4c6ea1d1 SHA512 95e103028935e95fdb0d3ab00c1695db0f82a6f9cb33c0defd298edb50adf69ba5b00194ea2dbc6adb8b2da500fe45d17451e6354b6020ff9a75de837653244e
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
index 3ddba84025c2..2f81c04016f3 100644
--- a/x11-misc/zim/zim-0.73.5.ebuild
+++ b/x11-misc/zim/zim-0.73.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 RESTRICT="test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /x11-misc
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)