gentoo resync : 20.03.2021

49 files changed, 420 insertions, 473 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 94c73073ee73..1c8c638f3cfd 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 28aa68ca8c97..6fe9a9b0c15c 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,5 +1,7 @@
 DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2 SHA512 f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4
 DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643 SHA512 c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c
+DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 2b0ca2a3beb3ee82416cb1d731704f43398db06bd9bc03dea2875a2d6a1f80dc14b9fe418bea1467caf29d5ba9d8e4feefe7451bb69734561a580ed012755a41 SHA512 1e834c163f1c236e1a2fbdf92e93e98e88ebd6da04b87be52087fa7f7f395a9bd90e111958f3b9473938e7563182ed5c37fd2d2c4ef683933cb16f3b4665d1b3
 EBUILD c++-gtk-utils-2.0.34.ebuild 746 BLAKE2B dd431696a569a2ac39d9d8d4bf2a750bcffc2fdf7ea4f40e82d88c557a3f873eae4545fdb07c99a2155e07df9741639c8a1d07a8528c6da0740b096062bd723b SHA512 08807c989f800413730a0591b1803c6295a960619eb5af48f4deae7b1da70d9d6aa2358e8329e7e1ae2f080ca7fcbd3831d1f4dc91e1cdb93515482df9f30d8a
 EBUILD c++-gtk-utils-2.2.19.ebuild 746 BLAKE2B 7e03e1d22caa067619be45fe7551551f34969f64011b25170f432c00f621e6e63a2a82b703b73ac715b43db3c78468574f8f515118cc2c030a610d073cc4112f SHA512 680c25fc481028baf29f172274824cc5960c13fa0e5be9ebc5ea95cf6e3e9dac8bcdfdad329e9fdfd1494b5fdb26f2cbf709d1e4088c6b8f73cb7b0348ec88d8
-MISC metadata.xml 359 BLAKE2B dbeed9c4bd60595eb059509d6ca0b7a0c5be034480fef5144b5221a58ac0284b1eb7dd4f1cae5ddc1487aed1f01d4ff79e3b3480bc3e46180e67cda078049e77 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de
+EBUILD c++-gtk-utils-2.2.20.ebuild 748 BLAKE2B 5614bd2c8872e1964c91ad5f1a5ae7686f2d4aec937bd8b9fdf5df7328ab795a313ec4bb4c08e7ab1d2a6cb3bc26f1ebf5be52452068c60fd69891436eef711f SHA512 7292990a733375947a06dc28f00b8a887e4e74204edd5bfb2a530179982b1f02767f52204ed82716a7db6645c8fbdd050cd1ef4c2692d21ea0f9a59650b58480
+MISC metadata.xml 435 BLAKE2B 361605abaf7edb08f9d13c55f070ab30f3fd5fd49668ac0010e87d32d338e485a78aa2136728ef5935bb1f01ad79ded96fa97005cd11517f6a5aa493b828e419 SHA512 250f66f08fa7b4644cae285f78156ede515132f443ed591843a1d1bfa3e8b8e3739de0085732341d6464d9dfd9663acbe047c337c1e4483d9a7185779eb374a4
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
new file mode 100644
index 000000000000..40a1c6ed5a62
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit virtualx
+
+DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	gtk? ( x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-guile \
+		$(use_enable nls) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
index 9378e9d7e25b..4213bf121d9b 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cxx-gtk-utils</remote-id>
+		<changelog>http://cxx-gtk-utils.sourceforge.net/2.2/ChangeLog</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index d3d4e099f166..be969714353c 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -2,5 +2,5 @@ AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc
 DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d
 DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
 EBUILD colord-gtk-0.1.26.ebuild 1653 BLAKE2B c846669f9fbf6e1a563437112243ab6fe96cbb8524439f3dd788b825bfd0b15e15600399a43661b23291afbefb30d53035c65a953c66febd939ffd2561306212 SHA512 bf9c41a78a92e03e9e7f5570e9a3ca0a981b499a87a6d62bd31e6b8f8a4bc7066697fcbad4cd13712c9675fef547b776574e8f4182e495ae7afaaeda08dd7694
-EBUILD colord-gtk-0.2.0.ebuild 1307 BLAKE2B 2d1373246db219ccc8eafe4f9143540f59b13446a2f2f312b696b1842f09f291e57863144405a150a69ab4a70fcf6771bba946c4a65f40b3721bcafd33070c91 SHA512 3291fb6230c06b57d385eeb824f085f5894d5c9d4b1058c6322e78517eb1544cd5cb38c098cfc58cd26aafa3175893a9cc54ab63b0b1531b56f33f20d5b44486
+EBUILD colord-gtk-0.2.0.ebuild 1344 BLAKE2B fc88042c54130cedc36853cddd02445657e0bf35c2c47989768b004384dfcf03f234e66bd7844689ba3982fd476ff9ef6a1b9ef556ad5471ce74ab4b3aecc38a SHA512 3788fed631f85c9ca87c9bc7a8002259645658f357e2e9b67c9faf1cbd5629c8c51390ad39b5eb6061643b17eee086bf2d6ced925d69449058392f5ff3e392e5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
index 20f2c5322418..4f5d8d29d964 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.9
 	)
+	app-text/docbook-xsl-ns-stylesheets
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	vala? ( $(vala_depend) )
 "
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index bdae18d786ac..a76b775d7e01 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,3 @@
-AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 538 BLAKE2B 50f8f178e5b97c2c54636bfe82a89cfc2274d24d9671a554d3214a7800e7eccf0fe929bb71e737f85aa7f39a078eba4c0a8059d3c686af30347e4f6e60c25b0a SHA512 9de8fa442bc1de861dffb6ee378ccf323f189a1056a027a52aa444bf31dc174b818dd0dbe68af961c9d13cbafa3f6d82c658dc15b369e2e4d36278088eace953
 EBUILD fox-wrapper-3.ebuild 550 BLAKE2B 6b75fbb550f8f0c9da9c21619d55f0bf2dc51e4fdb575b0246e7bd3f1f6c419b5c00cb5250df6c4bee3303ba294658e297664e94b68a60fd5ced5a84d5351584 SHA512 d218ecbaec29a6018d00a666679e20ff98c41a512af88a85de5fe89af9f94729fe5512b69e71b14ff0cf67a3d05943b024f966c618f15493f17898eadbcc37d2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
deleted file mode 100644
index 19d09b5b9ca6..000000000000
--- a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
-#
-# Executes the correct fox-config version, based on the value of WANT_FOX.
-# All versions of fox after 1.0.x ship with a fox-config script
-#
-#
-# Stable branches first, in descending order, then unstable branches.
-# After a new stable branch, prepend the new version and bump (or remove)
-# the last unstable branch
-#
-vers="1.6 1.4 1.2 1.5"
-bindir=/usr/bin
-
-if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
-	echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
-	exit 1
-fi
-
-if [ -z "${WANT_FOX}" ] ; then
-	echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
-	echo "             WANT_FOX=\"1.2\" fox-config $@"
-	exit 1
-fi
-
-for v in ${vers} ; do
-	eval binary_${v/./_}="fox-${v}-config"
-done
-
-#
-# Check the WANT_FOX setting
-#
-for v in ${vers} x ; do
-	if [ "${v}" = "x" ] ; then
-		echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
-		echo "             Valid values of WANT_FOX are: ${vers// /, }"
-		exit 1
-	fi
-
-	if [ "${WANT_FOX}" = "${v}" ] ; then
-		binary="binary_${v/./_}"
-		binary="${!binary}"
-		break
-	fi
-done
-
-if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
-	echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
-	echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
-fi
-
-#
-# for further consistency
-#
-for v in ${vers} ; do
-	mybin="binary_${v/./_}"
-	if [ "${binary}" = "${!mybin}" ] ; then
-		export WANT_FOX="${v}"
-	fi
-done
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${bindir}/${binary}" ] ; then
-	echo "fox-wrapper: $binary is missing or not executable." >&2
-	echo "             Please try emerging the correct version of fox, i.e.:" >&2
-	echo "             emerge '=x11-libs/${binary/-config/}*'" >&2
-	exit 1
-fi
-
-"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
deleted file mode 100644
index eeb9dd5e6bac..000000000000
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	exeinto /usr/lib/misc
-	newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh
-
-	dodir /usr/bin
-	dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
-}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 71e8b8ac49f9..e297126d909b 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -4,7 +4,7 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
-EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
+EBUILD gtksourceview-2.10.5-r3.ebuild 1346 BLAKE2B a9864ca00a2efd783c093c4842c86b3d8aca608926cc2cf1dcd6cfa41cd924e7a01907738fef31e913f508e062907a4f2724c3ede9dec6565d086e3234675166 SHA512 eb3e6a72c29af22c5184e8cacba0c50fd0100b03c27afa264cdd2a6ddb2e4250af5ddcc2a92f81e715adfe70ff89f89dca6cb9217a0de02deb0977bbcc844245
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.6.1-r1.ebuild 1741 BLAKE2B f5867f5eb784c3bf19117a5e6556146ecbd30b5d011bb84006a0a30252111654b15b6393ff07b0bd387c770207b196d9c19ed101f6e8559638f4df3a9b90bc02 SHA512 a44dcb68b000b6346f2063181f92591f00f7b065c6d5868e3c9fc8c11abe194935e9ae2a1d575b49213f3374be7d0c1cfacb8942621097eaa796e3e4b5ecc403
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index fda495015019..85b4ce8dd568 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.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="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 890796959d5e..655a07be54a1 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.3.ebuild 710 BLAKE2B 45b1dd1c312dd246d37050cfd29a2798f7783a6ccd229551ba69cf2102fe04889442f797b6118d64c67108d8c7bde896de6456ae5bb94f7c21067e9ac84f075c SHA512 a02f3b95e6fbe0e9ffa9aa34e2db3d51ff49bacb6d672d6b63da9a86aa654f333f89e5d47019d537dfda9e9f295972e6494e746277f17bc9e3c1a46a287ddbb2
+EBUILD libXaw3d-1.6.3.ebuild 737 BLAKE2B e7a9946155da58edbb71fe21f9496bb66ea4159f2024d154dc8b532abb746c37be6fb864c2b4ab1340f12efd7055c7d2142e09fa24b69b444137ca5635eef0a2 SHA512 0d144618d3b9d602f17069693863802e2eff73547231ae87b1902c3e23ac574ba2aa158ca68e7d8e2877d284ca84123a9b1b4a103fe8b4afd96911a116037dcc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index 5d7c268e916a..0cc685fca9df 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org Xaw3d library"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
 	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable unicode internationalization)
 		$(use_enable xpm multiplane-bitmaps)
 		--enable-arrow-scrollbars
 		--enable-gray-stipples
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 48ef2980b309..9f1f09a817c0 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740
-EBUILD libXaw3dXft-1.6.2d.ebuild 711 BLAKE2B f7df8b1cb6dca60d4689a6435630d4da462f5360baf6f7baf80a98fa070e771dafb6734e95d725e04449f43284e73093b2e6fd3fb5f745200d2175bb9ae1ac67 SHA512 3b9b0fb21387b68f302425e102a7be10a214918ad3751affa5cdfccd462d729403dd95734ab7b3d4bde0e9be459278ff509bbd7358b0c2b4cd187450bce6ed46
+EBUILD libXaw3dXft-1.6.2d.ebuild 737 BLAKE2B 7588db2950c7574fb799a1c067ba2ee916a28d473e1dae53f2bd942e437a3565028b3beaccd63a6e4fad7ff13d4f7fdbf71260ee8cc8b26fabb6bfdddb8a7066 SHA512 b2cacfb2d2dc7975d8f5e16b6391a32100b515e656947faceb42203d1455f5e8eec7648515ccf13007bec2b2d2db7db6596a537945b783e01a97decc71038fe9
 MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
index 705b95f8aae6..3523c3b1a0bb 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="Xaw3dXft library"
 HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
@@ -12,24 +12,25 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 KEYWORDS="amd64 x86"
 IUSE="unicode xpm"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXmu
 	x11-libs/libXt
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
 	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable unicode internationalization)
 		$(usex xpm "--enable-multiplane-bitmaps" "")
 		--enable-arrow-scrollbars
 		--enable-gray-stipples
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 6907597300ef..9b0835b1b3a7 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
 EBUILD libXt-1.2.0.ebuild 842 BLAKE2B d2f36c5d474d7327e45a55aa42420cc7b7a738b0bf0fcf5bf7cf5af0512ad61af5f33fd9c4091ed3487b0d1447f4467451f6caa38beabd625f25352c2e3b647e SHA512 60131554510d1e9f4e2231cf3f36b544586f82fe51e6df4b2e01cb22666be91c1ea89d1101c95cd9cfc8bca940b7183db05d38f2c9a6f38de29781f1bc224df3
-EBUILD libXt-1.2.1.ebuild 846 BLAKE2B 3af9219fe92261e95a017a5e9261fda6f466fdb7e7b3ec9baf65a88372b7b77900c5fdc4b60a1885b491846f44e4a5fb29f4d863c173cf41e25dfe44e142a620 SHA512 dada038b6bbba7287bde40c7db0579e5640bedcc3223918e44f5a71a3e6179785dd49c6e078b6114a390e4cf025db1a58bf9c7e3554b28fdcf57e8d1de3dbfaf
+EBUILD libXt-1.2.1.ebuild 845 BLAKE2B c52ea791bab6c6de589cfb1bfb5fbdffc270bad98d072aa34152f8b6d276b5cdd5fd84453282172ac293e701be0a91805075dd1c7cf7641046d9cf4d069dbac8 SHA512 71f778c0db75b95f9b81071dc3c990353ac65982380d330d1d3082b6c7c6c61455cc55ac2ee6b2ec1bc36e357d9ea0d9a24c2994186d53045b0fdb1fde5aa364
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild
index bc29722b0110..7d5ece5a1669 100644
--- a/x11-libs/libXt/libXt-1.2.1.ebuild
+++ b/x11-libs/libXt/libXt-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 08190f8ac09d..cbe94dc7aad0 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.4.ebuild 338 BLAKE2B e2c39fd4bf3f59e2444684e4f2182f620ba677dd9119a260bbb3cee86a1bca56efa880653a75bb85ce5537ed5670c412579d02bd6e3a56a50db9f836de3d34aa SHA512 4dfb235121b6b877ad7cf29ca2a865717568a0cdbc969c54fadc4e47bc14a24b2801f6864f8273db6758fe116a18e5ed9da063110eaa4fb458f94500b810ff3c
+EBUILD libdmx-1.1.4.ebuild 333 BLAKE2B a80d3a224c2f411d8ed912aa4510c0f5f60a85c073b3e322a3293ba62bb968895015b9b590a94c426c9b62a31f12a11d1eb92d170d4f1f0ce29dea587fe7cba3 SHA512 07ee061e326ef680631206c0675b4670ba70565411096ad0662a0a4a3ac2a604152481e496a648c1025221d082dac7f84092429f1fd1b262c5520f1323de1d4d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 5cae09487b70..4af9be3851ce 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org dmx library"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
 
-RDEPEND="x11-base/xorg-proto
+RDEPEND="
+	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 039fd1b0a72f..7f893852cc3d 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
 DIST libdrm-2.4.104.tar.xz 419372 BLAKE2B 4f9c1d88e8e13e12b192b822aaddcbb01716771b85445f7468129600df3214a9dd3559539830eeec4df61f03c187fa88a6d0bb2d5278a5125d2aa11cef6805ea SHA512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e
 EBUILD libdrm-2.4.103.ebuild 1988 BLAKE2B 29c991df7e6d39b70b48b4e6056d944f12f630ab320d788b3e9560cf6e3b5e99b55c8aa100c475149b697a07e42a0fa27c22fa264f8aca5579e24b8c7792d79d SHA512 1247f74f71ed34d8b1cc7f5a1199e4d6f0bf0dfcf387db636c0ca2c0e179dc1e8ac757379bc584f4f489e559e73a92aa26391f38c58a6bd3d21b399be5b53982
-EBUILD libdrm-2.4.104.ebuild 1991 BLAKE2B 3e3b76ae35974371ad6739ca42784403872b99b2d4676ca31aab2b47bbe67a177b9d8af486af82c10e63f3d474be7ee787c04bc728d8a22b56d09899aade3b64 SHA512 a9a7c95d55abd926286cf3b6cee0f995c56ae6802e5345a856512e2c057585b744396caecb848018999da1bcd275eba3a4c0f33629e65e0cbbeafdb8cec5e911
+EBUILD libdrm-2.4.104.ebuild 1990 BLAKE2B de8b78f087a73a4e61fbdf65ada32592221b833676d7cd3d92ff8ef5604b3f0297c2fc1015f3f357c3137e96d951c7f491d7bc72749e0b7ac0cc4f77198f0b1d SHA512 93f130e657f603433283a23840593eb92adda3e1f4d3bcc02a59a655cf78cce8fe5ab4046f7506b13af4ee1eebf522d4c8102e0d91513de3724d2437f189d958
 EBUILD libdrm-9999.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.104.ebuild b/x11-libs/libdrm/libdrm-2.4.104.ebuild
index 1aada9fbc7db..c060531ec02e 100644
--- a/x11-libs/libdrm/libdrm-2.4.104.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.104.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 946fa81c8398..7e9ad5b11a5a 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,5 +1,6 @@
-DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
+AUX libfm-extra-1.3.2-buildsystem.patch 1691 BLAKE2B 25ac36d6e12b1d4cd0675730654aa19167928c450abb58a9ec58bf7364821377e11b3a76093a125b61096770e1e486987e473f7081fddf2a106ae6205989edb4 SHA512 20c435dc45fb51f269323b45a549a59ef4721864bb13c2e384eb1b60fc8cb4cd8045f8e6e94d32f29b92640d02d72e903cc119f6783099c1843fd1c4dec07491
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
-EBUILD libfm-extra-1.2.5.ebuild 2520 BLAKE2B d97fe8205b11a21c621712132a8e326ae745496bc07f636d5b1078155f648c96a51f914834ce71b0fd27bc37e8b6ae46c5fc40dc17ce37c39618da9405160c01 SHA512 4909f6e472342410f30d1867039f64ffd62963687fc4a01ae110d2ba464fba16e6d64bc0c5e159732804d6f427b3a0493eb64ed91ca17159002d94fc50b5dce9
+DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
 EBUILD libfm-extra-1.3.1.ebuild 2539 BLAKE2B b954e207f3f82911839f57a5104b630b970b0945359d0091d3f546f8d21717cfd268803f3155f1a15b37855eaf061b9b55ac6683c23e0cfc10e586c3287a598d SHA512 4a743ba0be2b59c439e96c219b50db2eb7fa701dc88a0577d7de54f275b250e74ab897172b8191ef95e13285b35f94449fc8c422b9dcc6ca7606fc82af9f7907
-MISC metadata.xml 375 BLAKE2B 20d31a26454ffe8d7cbc1ff2fb90a432ac77759199c4453db00564d89c1516284fa327e67d6eded951a41d54bdbc12fdcffd702b7c98acb0d2dad26a07c39ad8 SHA512 291808293b725eedc1adec419b27b1053295ccf43ebbbf791ee9591633730fb05ff7d2add4bb4de34ba7361717241bb48a477cab0da17fd544da6ebffb1afcc6
+EBUILD libfm-extra-1.3.2.ebuild 2241 BLAKE2B e9a2096d9d9229832b9819d492587aca66d01f7f27523ff9f1e5afbeaac5654c802dc928c2ca2d4d2cf3352aa5d9f4778bf3541ab8f26925f42d2e4377d10def SHA512 1c0c4fcb266ed0a0c8bafb68d2c86337430daa919fd087d0f5baaf43a3be5775d1f9076f2fa876d3345cca70092671bae88e6a2b75854d72dfc64a5962bee8ec
+MISC metadata.xml 375 BLAKE2B 2df77024ebe8730d3640fc9abaa87a294758eee8bfb162679445da76973520cfa2dd4bcb1482ef64e9b49d722682d5a8c2ba14097a789c61ce9a122c9736126a SHA512 05aec39fac12a183440f723dfc6909da9f2961487c207a758333b9aedc146a82bc0100ecf81c132ce3de231c5acc6b9c8026de9bf079284e60f0150d31f18f23
diff --git a/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch
new file mode 100644
index 000000000000..fd9a0535a4c3
--- /dev/null
+++ b/x11-libs/libfm-extra/files/libfm-extra-1.3.2-buildsystem.patch
@@ -0,0 +1,59 @@
+From a5cabf67a7460ce27c73e66c9ac98481c6cd1db2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Mar 2021 09:44:40 +0100
+Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS, disable docs
+
+---
+ Makefile.am  | 2 +-
+ configure.ac | 8 ++------
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 427edae..f5fd4f0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ NULL=
+ DIST_SUBDIRS = src po data
+ 
+ # a little trick against gtk-doc is here
+-SUBDIRS_DOCS = docs
++SUBDIRS_DOCS = 
+ 
+ EXTRA_DIST_DOCS = \
+ 	gtk-doc.make \
+diff --git a/configure.ac b/configure.ac
+index bf6b07f..2f331ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug,
+ )
+ if test "$enable_debug" = "yes"; then
+     # turn on debug and disable optimization
+-    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
++    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+     case "$CC" in
+     gcc*)
+         CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers"
+@@ -323,10 +323,6 @@ AC_CONFIG_FILES([
+     data/lxshortcut.1
+     data/ui/Makefile
+     po/Makefile.in
+-    docs/Makefile
+-    docs/reference/Makefile
+-    docs/reference/libfm/Makefile
+-    docs/reference/libfm/version.xml
+     libfm.pc
+     libfm-gtk.pc
+     libfm-gtk3.pc
+-- 
+2.30.2
+
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index 69258a65c60e..dd331530d905 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -1,45 +1,46 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools xdg-utils
+EAPI=7
 
-MY_PV=${PV/_/}
 MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
+MY_P="${MY_PN}-${PV/_/}"
+inherit autotools xdg
+
+DESCRIPTION="Library for file management"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
+SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
 	sys-devel/gettext
-	dev-util/gtk-doc-am
-	!!<=x11-libs/libfm-1.2.3"
+	virtual/pkgconfig
+"
 
-S="${WORKDIR}"/${MY_P}
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
 src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
+	xdg_src_prepare
 
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
+	# disable unused translations. Bug #356029
+	cat <<-EOF >> po/POTFILES.in || die
+data/ui/app-chooser.ui
+data/ui/ask-rename.ui
+data/ui/exec-file.ui
+data/ui/file-prop.ui
+data/ui/preferred-apps.ui
+data/ui/progress.ui
+EOF
 
 	# subslot sanity check
 	local sub_slot=${SLOT#*/}
@@ -58,34 +59,30 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static --with-extra-only
+	econf \
+		--disable-static \
+		--with-extra-only
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${ED}" -name '*.la' -delete || die
 	# Sometimes a directory is created instead of a symlink. No idea why...
 	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
 	# symlink to it.
 	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
+		rm -r "${D}"/usr/include/${MY_PN} || die
 	fi
 }
 
 pkg_preinst() {
+	xdg_pkg_preinst
 	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
+	if [[ -d "${ROOT}"/usr/include/${MY_PN} ]]; then
+		rm -rf "${ROOT}"/usr/include/${MY_PN} || die
+	fi
 	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
+		cd "${D}"/usr/include || die
+		ln -s --force ${MY_PN}-1.0 ${MY_PN} || die
 	fi
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index c46e9eb9b836..4281b89a0888 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index b82ffa37e0a3..748d1eed2b4b 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,7 +1,7 @@
+AUX libfm-1.3.2-buildsystem.patch 1098 BLAKE2B 63cde148b2ada201d290550769ae7714324f72617629d801ce362dbc3f33b1de7e6a712959a6e4e8629e880244ad361c054ebc898f2b089d4e19f348120e9635 SHA512 d2dc9c220e2ce70c33809ecb9ce4e85529990946537970a63d60fad33577f1ec444b066abcbbf346611035e9dac5d2750ddce84105a391040c1dc8b179ec0901
 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e
-DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
-EBUILD libfm-1.2.5.ebuild 3651 BLAKE2B 3a5a6b83cbc6449e57ee866aa27efaee76b027849a4e8bb4ea310f5b3e427e7689a4e925a657200c7f9d581164dcd24b601203a5e948b7f52c4a9a7f5a0e0b75 SHA512 de52c77cde4bb2b336e2470864d9a7e817b4e9194cd776981c8cdd181bb9e2d5c734f874b5e25d134ef67cc9ed2ce6ef053e56bed52b41415522f991b1debf9c
+DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
 EBUILD libfm-1.3.1.ebuild 3580 BLAKE2B f98125bf71279106353c324e618b9e9c0293b26960ef85c070702063aa683bb10689aff7fb6819ec08bfc0dcea8d7c0a812a0a9dbed7bc741f1ce7dfa23af644 SHA512 f7bb2cdf588eaa9e76f393028330a7933569b7308f65c48d7fe86c1c0e6f31c5155f17d6e27d98f2600ca41415ac6248e47c7d8e4dad3c38270289c392dd33a7
-EBUILD libfm-9999.ebuild 3384 BLAKE2B ad18db8685c9b695490b2f22423c8513b9cbc545f212d7218ed3ed4ba6bfb64e2ae22bc2332be70a4430fa315e11e6ae5f701556e1d7007a6898f0dbe867168b SHA512 cb7d45eabf3084fb530ab1dd359bf1c91391e9dc699f0423a210d28e69bdd3e93617156028dd982c25decb6968b495bc828eb56fdf44971f28741597265d0d7c
+EBUILD libfm-1.3.2.ebuild 3345 BLAKE2B 487b03ad1e84224c412d4a453563fcfa2d107cb0e0a2cb8fdec8de67cc971a79b0c13d00294c9cacee3bdd0efac642d6c57c447d94a1f8a89bc19c71f5411326 SHA512 3fbab2ddc7f25b09ea4603cf55509b7ff84d0ed84650b5c45912e7a8646002d676bd49018a0edf00b0071a839a0b61ba4a778a8c7c6adb0d5c444c43fcc7dc30
 MISC metadata.xml 582 BLAKE2B 3e314b2f5accbb454ae1021d646393d30332919509ce60a48aa37a3285c4787a502315d74950f083f746eae9b5a7f1302a457418b3d6197195de88e0f390939a SHA512 eab4b456ea5035d3b0c358b6f871710bb3a69be67d918ed135c1acb199234d87bd2e8b1d426485490bb0b7cd9cbb66b6daaef43b39d3219a0fcf40145349dd62
diff --git a/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch
new file mode 100644
index 000000000000..3b5f2b5061ee
--- /dev/null
+++ b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch
@@ -0,0 +1,34 @@
+From 5db9cb19a2b33c89255b8d483f42d5fc647df2c9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Mar 2021 01:20:02 +0100
+Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bf6b07f..181eed7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug,
+ )
+ if test "$enable_debug" = "yes"; then
+     # turn on debug and disable optimization
+-    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g"
++    CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+     case "$CC" in
+     gcc*)
+         CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers"
+-- 
+2.30.2
+
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
deleted file mode 100644
index a94b843ec8e5..000000000000
--- a/x11-libs/libfm/libfm-1.2.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}
-	udisks? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	# Fix use after free bug, see
-	# https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
-	epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
-
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm/libfm-1.3.2.ebuild b/x11-libs/libfm/libfm-1.3.2.ebuild
new file mode 100644
index 000000000000..8bb9a86de8f1
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.3.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV/_/}"
+inherit autotools vala xdg
+
+DESCRIPTION="Library for file management"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+DEPEND="
+	>=dev-libs/glib-2.18:2
+	>=lxde-base/menu-cache-1.1.0-r1:=
+	~x11-libs/libfm-extra-${PV}
+	gtk? ( x11-libs/gtk+:3 )
+	udisks? ( dev-libs/dbus-glib )
+"
+RDEPEND="${DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' Makefile.am || die
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die
+	fi
+
+	# disable unused translations. Bug #356029
+	cat <<-EOF >> po/POTFILES.in || die
+data/ui/app-chooser.ui
+data/ui/ask-rename.ui
+data/ui/exec-file.ui
+data/ui/file-prop.ui
+data/ui/preferred-apps.ui
+data/ui/progress.ui
+EOF
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-html-dir=/usr/share/doc/${PF}/html
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable examples demo)
+		$(use_enable exif)
+		$(use_with gtk gtk 3)
+		$(use_enable udisks)
+		$(use_enable vala old-actions)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN} || die
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h || die
+	rm "${D}"/usr/$(get_libdir)/libfm-extra* || die
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	# Resolve the symlink mess. Bug #439570
+	if [[ -d "${ROOT}"/usr/include/${PN} ]]; then
+		rm -rf "${ROOT}"/usr/include/${PN} || die
+	fi
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include || die
+		ln -s --force ${PN}-1.0 ${PN} || die
+	fi
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
deleted file mode 100644
index 559e07188526..000000000000
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/lxde/${PN}"
-inherit autotools git-r3 vala xdg-utils
-
-DESCRIPTION="A library for file management"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2"
-SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-KEYWORDS=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	x11-libs/libfm-extra"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/glib-utils"
-
-DOCS=( AUTHORS TODO )
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	else
-		gtkdocize --copy || die
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	intltoolize --force --copy --automake || die
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libva-compat/Manifest b/x11-libs/libva-compat/Manifest
index 09d5c0d7ce2c..cf598bb734d6 100644
--- a/x11-libs/libva-compat/Manifest
+++ b/x11-libs/libva-compat/Manifest
@@ -1,3 +1,3 @@
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
 EBUILD libva-compat-1.8.3.ebuild 1991 BLAKE2B 7e0a7b2fb5f958320a270794e593ad3ae6c0acf934b471feea3753d9e065f5ff1fc705a60480e8d0b6458e994deda7df8978dd063632f7d23647b10f26c352cc SHA512 6c8eea6b2f6d66c342eacf31b15d78941026e4a24df64663f8aacad339dd169aefe9f71d9c6455a2315beef74a1ffff78a86bad8111c531ebee9cc3cd181aa33
-MISC metadata.xml 439 BLAKE2B 39b4502d38eb5d2f055a484224930efa991aa5c60960fa62fc64c9662d804c6b9b40bea27089a1b42452376e0517751d5ef1bcc81c512fd2d90d720e43b5befd SHA512 d54a22cf550c696c0078182457f412c0d8dfdf59e6b9a119fdcd629f42e75ffab403cb93815e9b184c5b388ae12d3b1c053119273082f549e440104fe9b2ae5a
+MISC metadata.xml 439 BLAKE2B 57fb312f206c07e728f5b6c591c83abbb5e881a409fd91989190237d8e803835af48f1a9860bf0b41777d47a96574c1164ef25ddd7ab4b3afd59aba3ec864ea1 SHA512 18884fd14172886b365c30633a20b262d13c2a279613be573425f9a3e88bd33b901e86af7d95693b4684ad2fa93ad269dc914b3570ea82c12185adf80a6d270c
diff --git a/x11-libs/libva-compat/metadata.xml b/x11-libs/libva-compat/metadata.xml
index 39b6984b394d..99ca258afefe 100644
--- a/x11-libs/libva-compat/metadata.xml
+++ b/x11-libs/libva-compat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 6135e6787898..d7702b878d28 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,4 +1,4 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.4.1.ebuild 1312 BLAKE2B 2631a8b68421c285c1718c381b58f88367893b72894033f75230e7627a36a027af5fc4ab10088e5f91eb2f5e837b52e90b8f2fe272f895b97d30e603b3181238 SHA512 d1e5af4a00a0adf6c1bb04473d6bcf72144697e14f5e59c7b82cb5da855083084a3144e4974633c4d8ce2630fbf110a496e296ef82c8f78b035bf550772c7993
 EBUILD libva-intel-driver-9999.ebuild 1314 BLAKE2B 10eaf18d44d1e5a583e665c7e423caaede7909748fc62dfc270affcb3b0e9db3ce7ee8e9c00cfca3d5aa936857e50a019ec7295a28489281e28a80915393ec66 SHA512 225cacaa64b8a4dbdf2d1c7ea29e45d90422fd15fdf938d8957de1e3ccf2d60951e52663f9f5bee9a08e267ff60ca7595816f74d2829f29f5693e389b310ae84
-MISC metadata.xml 348 BLAKE2B dcf3a9c208ab7377f3e6e8fdb8e790f894cff749b32f5cd2840a2bb25aaa74ddb5a6260c8fa7cc332b8d49d3ab51277658d8a7d7814200839f9bd64f0d09ffc2 SHA512 438300201f9bef74270eff620b64bde08d4ad5952acd18adae4e73c20ee364e133f19fa885332aa1e14ae9a874669057c6fed8a10536ce5f9b2bc6c949da5ee0
+MISC metadata.xml 348 BLAKE2B 26d40bdce3aadf9278d1095b72b2d8e97e9a1ae3d3d5801a1d421d73ac3b50445579be814471b908f36856a34f9aa62d8d58acc93d2f6a62f8d60b9e0805cfaf SHA512 2d12ec69c643cecb50f2d0542f8b4104e6719d8b2613c3f99c72ca24fe0df8f20eca1e2cf1b53f98f1046c9edcf44095ddd965074ff767a718395389a1015a24
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 7949b9ce5161..66f13678f5ff 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 073f8e945825..39db7630766a 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -8,4 +8,4 @@ EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
 EBUILD libva-intel-media-driver-9999.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952
-MISC metadata.xml 602 BLAKE2B 9448d1e88775ec7458fab88e284cd0ac184500f3c6d1b1007495e7de30eba245998b10bfef258a34d2b67d5f17438f0afe9f93e3e4001fa197fcffa22f6559dd SHA512 dbc361bd18283a1ca1feb4adea969783afeb7b0a105675b9603d946f8cc1da6d7e959b3c7f74e5bad5c95bb949687563382155a61de985b3fdd70a8cbb2b502f
+MISC metadata.xml 616 BLAKE2B e47d0c35b3aca0abfb57bbdc677e7e7f3bb45d92fa6af6d894291b370032e5d15d324aed4fc2752eb810b0f3603410eee91b20f368d64304e35cc5cbd827088f SHA512 3a546df85f009136e8e36c20c38ed61be10fb198cb1b443ef7b1ce3c43957aff2490e82fab0052f24067ff642ea8dc847770b08914721724b36db639ab24e53c
diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml
index dfe0d9d8141b..7c456c68af97 100644
--- a/x11-libs/libva-intel-media-driver/metadata.xml
+++ b/x11-libs/libva-intel-media-driver/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>k2k@narod.ru</email>
 		<name>Evgeny Grin</name>
 	</maintainer>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 58e76080e3dc..2ddd2a7e2708 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -14,4 +14,4 @@ EBUILD libva-2.8.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3c
 EBUILD libva-2.9.0.ebuild 2203 BLAKE2B f17547730d5133eea144d8e6a582dc180284650cb47b1e76926644f9c95bba1d5b48caf21df4172f6d288157c056ed9a7b1a9ea1204279894d1b95f63666f891 SHA512 5e7a024dd37094c8c9726c5907a9feffbbb74a81693ba475b892d9377c0f52b9d58f78aa16b6781fa49b96529aa84473145f395ce975f77e047f8365416836ce
 EBUILD libva-2.9.1.ebuild 2536 BLAKE2B c454fcb746f256f118e638307e8e3214f6a9120b2843e1583b0f2ac46acf2c7a51bed11d2b047408bcc056e124837a385abb53b1ffc1a2c0b9d3782e271ff822 SHA512 9d6df49bb14d1cdf943cdf62a0a86a01f5a803099b4675f60327d92d5786f37d2fb643ea75e060daea44f12c5e38426d425955cbdb45afb2ead0f9d2f4fb29e3
 EBUILD libva-9999.ebuild 2547 BLAKE2B a5ad3a164861a344fa5ac0c2bfb0da1a2701b2e72e90366346f3ad2f12f3bad62d00354f66fc8e26ca792d2685969c778073eb426001ac8bfdc8fe01eb0641d9 SHA512 8eddaef78665a1e99f57e53bebaf538e11879b8d1d320d7dfabdc923fbc4a4d3dc81fa5a9d853b1137b5212c9f77889f8f875f242f95076799bc918d5a31d3d0
-MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
+MISC metadata.xml 469 BLAKE2B bb59d0877431717ea6a387c793e39c1d810204f04619b92a9496f8d6e0f42f4455a54aae850da47b25cd133f97a9444043b64e46f539279325b806092c503d04 SHA512 e7ea387d560ce5b8e1b51d26e14b6ff8173e726124fb6d4e437ba3108f8d8f4c587730d9581e7a5ad8c844da9a9243cedbcc1ad554c724b4b78c3c7d2b70d95e
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 7f3149fdd2bb..7c9953aceeac 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/x11-libs/metadata.xml b/x11-libs/metadata.xml
index 875590a5fe54..33f939ef9262 100644
--- a/x11-libs/metadata.xml
+++ b/x11-libs/metadata.xml
@@ -31,4 +31,3 @@
 		Kategoria x11-libs zawiera biblioteki powiązane z X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
index 32010cac4f15..b204d5fb5ea0 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,5 +1,5 @@
 DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
 DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366 SHA512 7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9
-EBUILD spread-sheet-widget-0.3-r1.ebuild 472 BLAKE2B 64bf85bd487ad0d34e01b8f27abbe8690c67a3cf42edfe3ec5b22b57c700bd75213723b094d41dbb4085309fab262a0167dbea4f6c98db54313dbcd7fea47ae1 SHA512 7724b9fb842137f3c01a20c50d02095cb7d38f6a647d774605e16661bc7fb018d99a438c82914e69cd55e92feb1145517e00af6258b20ab1aa4f56383ae10ed6
-EBUILD spread-sheet-widget-0.6.ebuild 474 BLAKE2B 3cffa9ca357d614ff54d2d281c4a9043d6aa366c26c1dff6184532f671c87979bbd8a1c6a64516c34fecb396b9dc92324a79cbd49099a255a2e536f141acf409 SHA512 a26c6cb70cef9279c222d177f893ef4f70e6ae502edda28f0251baee79fe752ea423e9ba93c0297e7d6ecab8bfb073502fbf471a545d2fa9444fa15993c32ed6
+EBUILD spread-sheet-widget-0.3-r1.ebuild 479 BLAKE2B 0f39da86bd4a8edfd38e75bc2b448e9a7add3b33d433ab0e7887cd7047e4d255d3b63a040d59ab96eefa3f05b261b1782b70bc4e150e979dcd87f1ae90d213cd SHA512 9d3214012b40635fa03de29679898282f0f5919128e9cd77de5debdcec87b39f52ad9bfdf93911944f276184ff7ada6fae028a012cc89ab0283b75f748bc56f7
+EBUILD spread-sheet-widget-0.6.ebuild 481 BLAKE2B 7720c8ec7517e859100b22149c404cc1d320cfe5099e19f1ebe9e5803db29913201750a384835fd83be005088e82c572a2b52aaa67e1e7a562d4f8f8cdeaf3c9 SHA512 9dfeee13140caf1ec0e493e07fe7dbb01439e5881d0b6492fd507b8f1f644d201662ac8a3b5427f12f01858d8392c3b12237888cec9616a1134eccd71d892944
 MISC metadata.xml 783 BLAKE2B 352fc49d73a0037151ccb02d9d14d03a9f71eddbdf1add8e7b805cf398fbe7dae6d7a6bd985ef84bc34092f0fa4fb525d6cc4ad39f76cfb5944cf9897b68568f SHA512 9bc392c1064f078db2e1356c0736db3660339f81d20dbfa9039f01f0e8907c660285ed5a8c98b62feafe2e902351d52bdc2bc2c6538c5f7c1c8e79cf08e5df83
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
index 2558d389b354..0069e657f950 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="GNU Spread Sheet Widget"
 HOMEPAGE="https://www.gnu.org/software/ssw/"
-SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
index 87e31eee3ade..83ccfcaab678 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="GNU Spread Sheet Widget"
 HOMEPAGE="https://www.gnu.org/software/ssw/"
-SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index b23e82d2ca3f..14f11e1c9926 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -13,5 +13,5 @@ EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee44
 EBUILD vte-0.60.3.ebuild 2202 BLAKE2B dda1b10be7bd337e1e5159cd251315d51ae3fd17be6ff75f82402a462d7491313919f563b6bf5702f8e7ac2ea4d58cffb6834377ac35e22a573084ba77dfc152 SHA512 7caacb773b7f53d311899fcd6f56171e3e96d5be3c997304c6e870d95d11beaa2ce0b63d3d8876713798648621bc46bd7b491a7ad40845ceec929befec41bdf3
 EBUILD vte-0.62.1.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
 EBUILD vte-0.62.2.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
-EBUILD vte-0.62.3.ebuild 2210 BLAKE2B 186a255da6bfbd4f4ad690d7bdf1348f0f0d24c1c08996a76d862182e29355966a984356e61479486248b167f7593968ce125c45bd6918a931f5c57946f569c2 SHA512 0e4c140887750ac550186037a7e5810f3beca42a08abc5825feea1a93b3920cbd098a08232a46bc9a1c8adab13bf41697857af3b1070919ee94635b96e9c6019
+EBUILD vte-0.62.3.ebuild 2209 BLAKE2B b9cec5efffc2410b51376973b6aa0cd7370a2802f19c1732fcd364e44c2998ae78466e99e5d07152d198d6de20c076bdc533bd3eccdb8e5d8556fe80255cb936 SHA512 324540be5c39a7968e7db00894801ad8b2888b3cf6225de8e7cc934e9c410adc40a162c52f15bfa88ef2f05ca6ff82ac14e6bd8171018ce7daaeb025516b0149
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.62.3.ebuild b/x11-libs/vte/vte-0.62.3.ebuild
index 269a295cb1d8..e6c46e0c1d64 100644
--- a/x11-libs/vte/vte-0.62.3.ebuild
+++ b/x11-libs/vte/vte-0.62.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 92d669e25690..bd2fd750fef9 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -2,4 +2,4 @@ DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c0
 DIST xapps-2.0.6.tar.gz 231023 BLAKE2B bc3907966c132c683e75769f8f45839d45229c77933ef861f58b03a21cca15a4f3dd610acb6a19fc16d35ddb189340cdef80704e78c89a3e49659a2f82be121e SHA512 bac6e105e2b1e237958fb610a9bd697a023c10a45131da7dee984532986022895414d81849f53bc0007c319c2139c6d39474e2e7fd9ce4e53365517f4ba4f012
 EBUILD xapps-1.8.9.ebuild 2159 BLAKE2B 15accf97f33c6fdc424b7f2bdadf3687d881ae03b459ba8bcb33dd199bde4580c8cf2617c5064f8a9aafcaa7d4f3524eb0ff02b4036f6b82eb333f0b9627bbd7 SHA512 65f7c1e45bc3dfaef4246ba025b55ab3601af36ff3e3d4dfcdda108fa4773f7a7a3acffec2a4797b503a001b5875b6b4ec04ce7914192d0bccbe826c2e603773
 EBUILD xapps-2.0.6.ebuild 2142 BLAKE2B b477ec01e1f7c69ad79d5079fb4b702016cdf0152eccff268f3325b9757f55d871b9b7c5d7dfc1b22d53fa69f9f59417802c4e7b24e8854f61bb8228dc179a7f SHA512 1792bc42eeb66d69267a2d55013a6b2115c8795ebd82f805e125c0e3a4fcf5fbcd7293de97c6f9f540c467acdfd357a8a933bfc16d45b9a633f9bb1367a89238
-MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
+MISC metadata.xml 621 BLAKE2B 63fd7221ebf1855af42a8ef0271608d308826118b6b4198b026773c0f936ea5bbf307639f9c8d93aa23eb98b7b35c8d632f18e425b7922cbcffc204ca8ea7869 SHA512 92b3b883df66a337d4e24b2cb6a935bb637c9bbe9fe1e10c61896431f98d044cefc1de28bdf20b17669cd9f33cb3e0c3bb69bb495bdd25778a5c2278f84c28e7
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index 24251f3f0eef..47303987d492 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index c7e2dae224b5..0939594061f8 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1,5 +1,5 @@
 AUX xpa-2.1.18-include.patch 249 BLAKE2B 9ddd35eefbcf2c2e538c78dd71047cd31ec384b9d4c394c0bb15a24e20baeed5d65c392fa430364d5ddd24b599d760869cfd45a1e72726b2434e60b5bb00056f SHA512 341980f141b4587e9ab6825976c302ec3d831cdd761fc52be13fec9736045532b7ff10dc9969d7cd2dbe631ba2e5d35dcfbfca5700c13e6a678df1c27ff7a540
-AUX xpa-2.1.18-makefile.patch 3382 BLAKE2B fda26e82e3179838cc79d97e469b85a576e9b43419de58238950ddbd10c34294cb84fe70f29d2a5bb7387d7c6677abf4f9a5504a47f48aae2bfa73cac7abcb96 SHA512 f13a64cd033fdd7a9bd087ad4edceb222f89b3d363cefaca38a710d08a9117754be95e5b1aea0bfcb145e31b232ab6600cd8a70aea98da3c6fe4ad5b6f9fb392
+AUX xpa-2.1.18-makefile.patch 4292 BLAKE2B 544ca028d44c5bc22ca90fc70d67b115b980535dfa4c15434bda5a021c1d35fe79b2000d64c23387e2b4595f46378f473e23a5283125044e01232057fcb7eaba SHA512 a416774e5d5ac329bf896fb1ead760b9c201e9385f6167f712730b991ce7a5cbf0b9622b4878f252c1524733012fc846bd824741fd170a3f0b2a95342dcbfdf5
 DIST xpa-2.1.18.tar.gz 900579 BLAKE2B bce33b30235e17309979e6e91d6508286403b476ee890c437985a434145992c442b1b3fd923da2658bb7d0dd6656ffa93bc20d2e8ff8bedb7438b9cbfa48e6a1 SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19
-EBUILD xpa-2.1.18.ebuild 1221 BLAKE2B b89ecc8ef83feaada40d2ba2f8f65f225ba4bef9ac1498903f926a850aafcb3479615d0e94409f4d2c7a3a801603318eff8296ad98930dc4a540de18d4f49232 SHA512 f9a3717b05a948de728505db02d44b98904ea8d5dd898f0b59272dea986ca26bc84f5cf325d4c34f88430732c6ab9380edf9d3cbd675b629073443221893dc3a
+EBUILD xpa-2.1.18.ebuild 1247 BLAKE2B 5677baca53d968378dd5f01940a59eff6209675dff1671d8bb7954d8309c300ea097bed7ff25bc3666935e26d773d94ebf34edda4ad27ef190f6468360b4b6b1 SHA512 12c70596aff631bc9bcd788010c7a13ff67aead7beca75a83e368cb946c3ce30352012cacad521d46db136e3e0aa6c9e82cbfc7fe76dc027937f8c2a823ff543
 MISC metadata.xml 1072 BLAKE2B 41e28666089a2ea7fb726abcbd92cacee49dce705d193be11e172bf90072429a8d97059682ca5d8d40fc8ad36431e07ad5c2421f6c3d77b6d7861ce3e58e7875 SHA512 64769fd2b90a2dcdcc2de9cc97afae34fc4af8b3a2c7d62c80c17b2491e7a06cf26bcb99e28098e2dc199884f388f08ad1587a63da3c3c9edbfa1dcd1bea94f7
diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
index 34aeed5b39dd..1ceb29dbfcb2 100644
--- a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
+++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in	2016-12-19 19:21:28.566222982 +0000
-+++ b/Makefile.in	2016-12-19 19:23:23.795246443 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -28,6 +28,11 @@
  
  prefix =		@prefix@
@@ -37,24 +37,33 @@
  
  # Platform-specific X compiler flags (include file specifications)
  X_CFLAGS = 		@X_CFLAGS@
-@@ -177,7 +182,7 @@
+@@ -173,12 +178,12 @@
+ 
+ $(LIB):		$(LIBOBJS)
+ 		$(RM) $(LIB)
+-		ar crv $(LIB) $(LIBOBJS)
++		$(AR) crv $(LIB) $(LIBOBJS)
  		$(RANLIB) $(LIB)
  
  shlib:		$(LIB)
 -		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
+-		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
 +		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
- 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
++		(cd lib$(PACKAGE).tmp && $(AR) x ../lib$(PACKAGE).a); \
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
-@@ -193,7 +198,7 @@
+ 		CC='$(CC)' CXX=$(CXX) \
+@@ -193,8 +198,8 @@
  		-lwsock32
  
  tclxpa:		$(LIB)
 -		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+-		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
 +		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
- 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
++		(cd libtclxpa.tmp && $(AR) x ../lib$(PACKAGE).a); \
  		rm -f libtclxpa.tmp/xt*.o; \
  		CC='$(CC)' CXX=$(CXX) \
+ 		./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \
 @@ -275,7 +280,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -108,3 +117,26 @@
  		cp -p -R ./man/* $(DISTDIR)/man/.)
  
  release:	dist
+--- a/mklib
++++ b/mklib
+@@ -211,9 +211,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+ 	fi
+ 
+@@ -248,7 +248,7 @@
+         elif [ $STATIC = 1 ] ; then
+             LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
+             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+-            LINK="ar"
++            LINK="${AR}"
+             OPTS="-ru"
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild
index 623d26c31983..984f56d2241d 100644
--- a/x11-libs/xpa/xpa-2.1.18.ebuild
+++ b/x11-libs/xpa/xpa-2.1.18.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
+EAPI=7
 
-inherit eutils autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Messaging system providing communication between programs"
 HOMEPAGE="https://github.com/ericmandel/xpa"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1"
 SLOT="0/1"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="
 	dev-lang/tcl:0=
@@ -26,12 +26,13 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \
-		-i mklib || die
+	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" -i mklib || die
 	eautoconf
 }
 
 src_configure() {
+	tc-export AR CC
+
 	econf \
 		--enable-shared \
 		--enable-threaded-xpans \
@@ -47,11 +48,16 @@ src_compile() {
 src_install() {
 	dodir /usr/$(get_libdir)
 	emake INSTALL_ROOT="${D}" install
+
 	insinto /usr/$(get_libdir)/tclxpa
 	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+
+	mv "${ED}"/usr/$(get_libdir)/libtclxpa* \
 		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+
 	dodoc README
 	use doc && dodoc doc/*.pdf && dodoc doc/*.html
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+
+	# no static archives
+	rm "${ED}"/usr/$(get_libdir)/libxpa.a || die
 }