gentoo resync : 15.06.2021

31 files changed, 245 insertions, 346 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 2e9675dd30df..f2b92d093df4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
index 07ae0f28c11d..9108a74b4a78 100644
--- a/x11-libs/gdk-pixbuf-xlib/Manifest
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37
-EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 970 BLAKE2B cccb15681884f89c17adc774b2daead5c7b70328921b1c01c279996f71e3345882abdcc59a2f21fcceec539f7bc74b93cb18ccfb4e4536af0b18a84cf841c569 SHA512 32d05d0d7ec4911b3d4c81e346a533009c217c21ce364bbec5e4e7bfff00f9bd789741d8570d9f73d2f6410e9aede6c88723f85bc2ab0505231b35a51d3cf788
+EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 846 BLAKE2B f2666e904b8d6f4c88346389cc3892ec2b41a4bc93c954057dae57924d4929e227de2d983107c26299b67c33e852759bd7eb2f16a455a0662057da68dc4be399 SHA512 85cd7e25d1fa3b8cd2c9f7ac8698bfa9e414c70ed7b883580779731b8471ab1276012b0a84096d3c60d7726e5440213bf16c469897e19b1cc9fa0435295099d5
 MISC metadata.xml 336 BLAKE2B b741dfbd8af9655d14c9d5794d0a421a0309b66a13c2d8e5800749b1acb3b68bc8084599fdb76a652e5cb2892d2206eb92a4d2915281089ad0e46022b59d3b1b SHA512 1af76541baa1ab105fa434b4caef8a0ca5e5caaad5be33823a7885f850836a195666f98e453e1c90e06aa3d869feba1383e49b3629a3672c4e5f4e8cdc344962
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
index aaf5f014db33..bb9698575a4c 100644
--- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson multilib-minimal
+inherit gnome.org meson-multilib
 
 DESCRIPTION="Deprecated Xlib integration for GdkPixbuf"
 HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
@@ -28,15 +28,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dgtk-doc="$(multilib_native_usex gtk-doc true false)"
+		$(meson_native_use_bool gtk-doc)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index fcca38905b52..b244de0b72c1 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,6 +1,4 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
-DIST gdk-pixbuf-2.42.4.tar.xz 7534896 BLAKE2B 87224c13a83848616ef52e65580239fcb4b81ccf2ab9e9cfdb55621c8b2a5b5c97ee152a83cbd1774bf3f868c6ce3779838c72877d2a5aa14d6cafad19f2d022 SHA512 b1eca16719e749d111c33592892ab18e2a1dc5f69a16762860bb54e0c97f535d7049fc388ce9daa025153ff2af56a367d8b164fa4025ee9a0131825a6108f772
 DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d
-EBUILD gdk-pixbuf-2.42.4.ebuild 3501 BLAKE2B d3a9f64e4afb20f77bd38857f04ffe89c2a807e2bf215a9060f89834befab33651f2d5ae472947f615a4ba24072d43ecdd413d61f0247e323ee87d309e6befe1 SHA512 2efad5959ea0c2d9e4795ecfe3df94277ce1e7269f09236e8cf2d84eb32f10ab0dd36ed4cd0f55336ed058467674c323d7bd6d2ad549073bbe2f17c8f28317b6
-EBUILD gdk-pixbuf-2.42.6.ebuild 3501 BLAKE2B d3a9f64e4afb20f77bd38857f04ffe89c2a807e2bf215a9060f89834befab33651f2d5ae472947f615a4ba24072d43ecdd413d61f0247e323ee87d309e6befe1 SHA512 2efad5959ea0c2d9e4795ecfe3df94277ce1e7269f09236e8cf2d84eb32f10ab0dd36ed4cd0f55336ed058467674c323d7bd6d2ad549073bbe2f17c8f28317b6
+EBUILD gdk-pixbuf-2.42.6.ebuild 3467 BLAKE2B e1934dd2c398046a273ae1928f66fb1d6d9dacff34a414529febe94ee286046ab43ca36ca644abc81a45735b7e5fed3d8d705b0056335463f5425c342bbdb975 SHA512 7a4a174301713b54748e54db5ba835af3840e0044b5fbe80c313533c1919e3b217f05ebbb69907e8e659d2e6664f4a9d04c6cc2b22f0f5478c64d31a945f8d4e
 MISC metadata.xml 331 BLAKE2B 4d198ee50a72d8d34a4cce94c2c7fecccf3fd4918b3100e182bdea1b80132f6773ac7d741ce5d55faef04c22158f8ea6b6ebff10908b8ffcc1f6d1e0caa15837 SHA512 3fe8410456df610566e862c010f9f5a3eb407fb72a842ab22e77d9400c7be98798296d2eab93ab2c97042779c0c5a19df1ad7e6c4ba71f82e17901cefcc4fff4
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
deleted file mode 100644
index 00c3b1618014..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc +introspection jpeg tiff"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-DEPEND="
-	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	!<x11-libs/gtk+-2.90.4:3
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=dev-util/meson-0.55.3
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
-	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=true
-		$(meson_use tiff)
-		$(meson_use jpeg)
-		-Dbuiltin_loaders=png
-		-Drelocatable=false
-		#native_windows_loaders
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			$(meson_use gtk-doc gtk_docs)
-			$(meson_feature introspection)
-			-Dman=true
-		)
-	else
-		emesonargs+=(
-			-Dgtk_doc=false
-			-Dintrospection=disabled
-			-Dman=false
-		)
-	fi
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}/${cache} ]]; then
-			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
index 00c3b1618014..146867dc375b 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
 
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
@@ -30,8 +30,10 @@ BDEPEND="
 	dev-libs/glib:2
 	dev-libs/libxslt
 	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		dev-util/gi-docgen
+	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	>=dev-util/meson-0.55.3
@@ -68,33 +70,20 @@ multilib_src_configure() {
 		#native_windows_loaders
 		-Dinstalled_tests=false
 		-Dgio_sniffing=true
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
+		$(meson_native_true man)
 	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			$(meson_use gtk-doc gtk_docs)
-			$(meson_feature introspection)
-			-Dman=true
-		)
-	else
-		emesonargs+=(
-			-Dgtk_doc=false
-			-Dintrospection=disabled
-			-Dman=false
-		)
-	fi
-	meson_src_configure
-}
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
+	meson_src_configure
 }
 
-multilib_src_install() {
-	meson_src_install
+multilib_src_install_all() {
+	if use gtk-doc; then
+		mkdir "${ED}"/usr/share/doc/${PF}/html || die
+		mv "${ED}"/usr/share/doc/{${PN}/,${PF}/html/} || die
+		mv "${ED}"/usr/share/doc/{gdk-pixdata/,${PF}/html/} || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2cd6b9b4e5c8..0bc15e5847f6 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/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 libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
 EBUILD libX11-1.7.1.ebuild 933 BLAKE2B 3f04d4391f7a64679b7a10aeb3f68b1178ad9bf6389bd6607fda2cb654694a9b862da89856dc7e60e951a11908f065ca269a829f7181bf7b20300ba7dee73fba SHA512 8dc77dae5065e805a0f8af0c0f2c95c3c2541fc9b5cc19decc064cda661640673ecc2d8ca56daeb95e0ff1618fdd109376f6d0b13f7d54022789afe051e76ff7
+EBUILD libX11-1.7.2.ebuild 940 BLAKE2B ea5def42121b86284e0e2b5bf5f8aa65d05d39eeb5c15f90b86a2dff0fb164b8d4b4e640f0688a9d615ac910ba87edc325e5f008463833459dc7dc57a9e1d7bd SHA512 ad1d7ba5efde59606e7d9a7904d3cadbe5f7b45d21d57ce39266703524192bd0c0ea126c82453d0d0b01bd40068fa8fd05f2c703493e56ee62a719b458aa461b
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
new file mode 100644
index 000000000000..bf033e3cc6be
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 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"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	!<x11-base/xorg-proto-2019.2
+	x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index cd376e466b71..7e970d12d19c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.105.tar.xz 420376 BLAKE2B 1443dd378263358e7af64ee63ac6d25d2c5efaacaf2f76be1a0021f03dd08ce4580ef8531af076504c5a29e538d5c66d1773fb0439dd8bc312f3a038535dd07d SHA512 083a04af7208e58be21b89c6ebdbe2db3ba00cd29f0d271bd38bfe97dfca741edafddaaf9b5b95c20fac2c9b700434ea5b21397de26f7073169ad6f5b090f715
 DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
 EBUILD libdrm-2.4.105.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
-EBUILD libdrm-2.4.106.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
-EBUILD libdrm-9999.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
+EBUILD libdrm-2.4.106.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
+EBUILD libdrm-9999.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index 370a65ea93cc..f603cf783700 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal
+inherit ${GIT_ECLASS} meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -40,32 +40,20 @@ multilib_src_configure() {
 		# Udev is only used by tests now.
 		-Dudev=false
 		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
+		$(meson_use video_cards_amdgpu amdgpu)
+		$(meson_use video_cards_exynos exynos)
+		$(meson_use video_cards_freedreno freedreno)
+		$(meson_use video_cards_intel intel)
+		$(meson_use video_cards_nouveau nouveau)
+		$(meson_use video_cards_omap omap)
+		$(meson_use video_cards_radeon radeon)
+		$(meson_use video_cards_tegra tegra)
+		$(meson_use video_cards_vc4 vc4)
+		$(meson_use video_cards_vivante etnaviv)
+		$(meson_use video_cards_vmware vmwgfx)
+		$(meson_use libkms)
 		# valgrind installs its .pc file to the pkgconfig for the primary arch
 		-Dvalgrind=$(usex valgrind auto false)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 370a65ea93cc..f603cf783700 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal
+inherit ${GIT_ECLASS} meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -40,32 +40,20 @@ multilib_src_configure() {
 		# Udev is only used by tests now.
 		-Dudev=false
 		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
+		$(meson_use video_cards_amdgpu amdgpu)
+		$(meson_use video_cards_exynos exynos)
+		$(meson_use video_cards_freedreno freedreno)
+		$(meson_use video_cards_intel intel)
+		$(meson_use video_cards_nouveau nouveau)
+		$(meson_use video_cards_omap omap)
+		$(meson_use video_cards_radeon radeon)
+		$(meson_use video_cards_tegra tegra)
+		$(meson_use video_cards_vc4 vc4)
+		$(meson_use video_cards_vivante etnaviv)
+		$(meson_use video_cards_vmware vmwgfx)
+		$(meson_use libkms)
 		# valgrind installs its .pc file to the pkgconfig for the primary arch
 		-Dvalgrind=$(usex valgrind auto false)
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 4a8e9111f8b5..1c8e73dec7c3 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,5 @@
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
 DIST libnotify-0.7.9.tar.xz 98148 BLAKE2B 4728d00a204cd1003e8171a54c23bb975c0477c245c1175558f27555763113ec8bd7abd7ef81f6bad2b98604efe436d843958e77473436e68560775804473383 SHA512 8a842b50777279efdb7d96a836a546c47decad158a4f03f7ffc818860d1f6276a657619e4f4a19a4e2f5ad55e0371c793420d50d802983700e8c342273b73874
-EBUILD libnotify-0.7.8.ebuild 1476 BLAKE2B 0262ae0edf5139932adf0c1d8a6ccb3ac49288b0520e468954001525f696daddb8fdf474e07e56a9c587966db07e90950063b8af453628470174aa22f63839f3 SHA512 7e15b6f2682dd6db1675f3ca739e1e79835456f7e9de5d6eea4d23b26408846d630699a63b3a3791d5f27ac12d8500fc97244b2cda87a45c559563035583bef2
-EBUILD libnotify-0.7.9.ebuild 1538 BLAKE2B 64d34d18017dc46caeedabe1b6245dd49c8f4b9ff69df4f38c2382afac0d6bebc9a9f2bb71339a21f7432ea2eea23dc84449e67afe70572315f1cdf3f45acc3f SHA512 628d61c7877b7443e78c76ab1057fa4a5e869853367729baae09c772b37f761110c92a5443fc78ba9d7fe85952ae8a9f259beee7628bdbb7864e0066e038f174
+EBUILD libnotify-0.7.8.ebuild 1415 BLAKE2B 58e0de2826dd0c2e43cb47061464f308cf9539bc5d8f7a09cd96dc5d3be00d2685fca27c62a135e8e68e1fcfd7b35822582844528f29d83dd186ed7620b42f41 SHA512 fe35b1f045ddad13aaaafb067feeaa261d275369ad97fd871cd640b0a5d250db337e19e555ce2b043bf0431c350707315e4e88b6853fd044831a6524f55b582a
+EBUILD libnotify-0.7.9.ebuild 1477 BLAKE2B 41954abaf887c51ecfc56e85b7095a6c26e86a5ea17561bd27bf2ea268b91dfa2f26cafe2deb96b6230218de8e9c87897cb780d4e42164718d1d4fcbd9bef891 SHA512 9776171a40786986c2c6bff4176669aab30d6cf3fd8ab44129cade811ea3f20e3cb433ceae3eaead55af1a64ba9057464a5099b5d8fecf611de821a009202c30
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index a8d1d6225459..aac07f1f95dd 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson multilib-minimal xdg-utils
+inherit gnome.org meson-multilib xdg-utils
 
 DESCRIPTION="A library for sending desktop notifications"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
@@ -38,9 +38,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dtests="$(usex test true false)"
-		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_bool gtk-doc gtk_doc)
 		-Ddocbook_docs=disabled
 	)
 	meson_src_configure
diff --git a/x11-libs/libnotify/libnotify-0.7.9.ebuild b/x11-libs/libnotify/libnotify-0.7.9.ebuild
index febe3785ff60..c06d463dd0d1 100644
--- a/x11-libs/libnotify/libnotify-0.7.9.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson multilib-minimal xdg-utils
+inherit gnome.org meson-multilib xdg-utils
 
 DESCRIPTION="A library for sending desktop notifications"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
@@ -40,9 +40,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dtests="$(usex test true false)"
-		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_bool gtk-doc gtk_doc)
 		-Ddocbook_docs=disabled
 	)
 	meson_src_configure
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 41f33d2fbd1e..53cd7f225968 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,4 +1,4 @@
 DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01
-EBUILD libvdpau-1.4.ebuild 1175 BLAKE2B 4c52d0809b52ba6497bc1d79244a676c6c862a684c0a1433e768964d9a71e244b6b7e3fec21cc9589fceb9af9994bad973e164bd8989049b8a0ad6c67dcb2be2 SHA512 26e6815ba39b14023a95c54940e7153491d11968e0c0dad7733d8bde610aca8e69e3626d79c2a48ac7b6c8230d22fc16f26a30e4d6f4aee21209e433371c0c1d
-EBUILD libvdpau-99999.ebuild 1131 BLAKE2B 2de73faca85b1957d53681cc68b5303de26a9a078ab862cab6d4e43f412b258f488ea5f801cae576179206097473e5705bebcf6ce6010e8bff2e6e16b28ecf4e SHA512 6f5a03ce02de0815cb199b307289601088094a5ccbd376164c6b3e6d6506c0a608b81a07fdfa45774b7eedeb128c65d39b2cc21b02d4b9e54b6dbe0086cd03d5
+EBUILD libvdpau-1.4.ebuild 1028 BLAKE2B f63cfa2124df8ba2aaf07ae483e14da0b42d7bcc6bf4761f299ee61207fa57eec2fa16fcbbc3a2b7190497fad44ee0c8357269255f38ad8f4fa8176f26d7ffac SHA512 a5f0e95051d22a30b5f013826fb42c856e9300a304ae5ee651902383a5a5db3a3fde002d79ffea6f2c71a02752c93f8e303f9e58175f5d1a6b44e43d8ebb27f2
+EBUILD libvdpau-99999.ebuild 984 BLAKE2B fa50879c53fc97416694af3ba7e2cfd20bc50f52206cf0aae8ac7cde334ebc2c7f910a914529c65223635c3cad4cd0947b5c6768e60878e28941514ae0fae9ea SHA512 370f7c80450503e798097acb85769362130b8488b065bda0dd9e4651b8bd713858fcaa2b78e55137d9596c4f64ee57ee7ab5a02b8452f3278cbcfce4d46130dd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild
index a531acdf58b4..ab328e5779fd 100644
--- a/x11-libs/libvdpau/libvdpau-1.4.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIRTUALX_REQUIRED="test"
-inherit flag-o-matic meson virtualx multilib-minimal
+inherit flag-o-matic meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
@@ -38,20 +38,12 @@ src_prepare() {
 multilib_src_configure() {
 	append-cppflags -D_GNU_SOURCE
 	local emesonargs=(
-		-Ddri2=$(usex dri true false)
-		-Ddocumentation=$(usex doc true false)
+		$(meson_use dri dri2)
+		$(meson_native_use_bool doc documentation)
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
 multilib_src_test() {
 	virtx meson_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/libvdpau/libvdpau-99999.ebuild b/x11-libs/libvdpau/libvdpau-99999.ebuild
index c5bd93bb1cb6..2817d03b9638 100644
--- a/x11-libs/libvdpau/libvdpau-99999.ebuild
+++ b/x11-libs/libvdpau/libvdpau-99999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIRTUALX_REQUIRED="test"
-inherit flag-o-matic git-r3 meson virtualx multilib-minimal
+inherit flag-o-matic git-r3 meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
@@ -38,20 +38,12 @@ src_prepare() {
 multilib_src_configure() {
 	append-cppflags -D_GNU_SOURCE
 	local emesonargs=(
-		-Ddri2=$(usex dri true false)
-		-Ddocumentation=$(usex doc true false)
+		$(meson_use dri dri2)
+		$(meson_native_use_bool doc documentation)
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
 multilib_src_test() {
 	virtx meson_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 61fd281f0aa2..c04119461502 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbcommon-1.3.0.tar.xz 455256 BLAKE2B f53a47005dd411855d1d5c39a33ef58d22982b2d4c2014320722f7fe9a9b468366c6090fadd067e50a846f22de7b80164b684615a8bcb1b14a478609cc4deb74 SHA512 9585ab1df7f2d95b991a786ee1f1de0a645aa315edb93cb093f3409fc76ef7b8f8189a6a7bfd179dc01c5d105d9c9eea40a395762eeffe0618b0c3ee116c0d18
-EBUILD libxkbcommon-1.3.0.ebuild 1575 BLAKE2B 74bff597ea95206000fd086497e88fbae6e45da4a91f1d39ddc8bb6c55ff090908b16d14cfaeed2705dd2438b5b786ca05afe32129dfb1c3253176d9cd533d1b SHA512 587d7e5a6cf8b1be257fb1087465537811f537b342caa1b77aa9b204ad3870ab1aef73d4a2d085e3d061bce7769bf6dd993b670d2d0777790093a45e24bfb395
+EBUILD libxkbcommon-1.3.0.ebuild 1473 BLAKE2B 1899976239bf7e21b0d58228d85f4411a39551b378734b8d5d1d4dbcfb0d56dcc90da3f563c3603b2722f148075da2c0ce7458fc0c18b1ae06301c806ab8e8b2 SHA512 304e75d388e86b30239cb7d846b5cdb7ae5bdaa7b5ea08cffe237eabc159a69d1bb6733612525a0fe0259369f2d40563439f1f2d7712540171554e556885c88a
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
index d851287d4e14..7d5c2eb01689 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
@@ -13,7 +13,7 @@ fi
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit meson multilib-minimal ${GIT_ECLASS} python-any-r1 virtualx
+inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
 
 DESCRIPTION="keymap handling library for toolkits and window systems"
 HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
@@ -56,14 +56,6 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
 	virtx meson_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index c1bf0bf4ed7e..7c2b500bfe21 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,5 +4,5 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
-EBUILD pango-1.48.5.ebuild 2394 BLAKE2B 4b9fe6485727a78fabf1ac570c236181bbe99628775a32abb9d5ac8f2743aa4442f519254214f490a4b660b5dbfadb651b6abc6ec72fb44a240f8111e7121e65 SHA512 57d0164f17a6a131013f74b180b0099a34bf2e7537f082c121fb313dd0dc5ba9fd5f5ff2b7f75da6fee616b9e6804ad78d7dd4e7647371bcdc2f99b30078a2e8
+EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.48.5.ebuild b/x11-libs/pango/pango-1.48.5-r1.ebuild
index 02943d287652..382eb4b77936 100644
--- a/x11-libs/pango/pango-1.48.5.ebuild
+++ b/x11-libs/pango/pango-1.48.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
+inherit gnome2-utils meson-multilib toolchain-funcs xdg
 
 DESCRIPTION="Internationalized text layout and rendering library"
 HOMEPAGE="https://www.pango.org/"
@@ -11,10 +11,9 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
-# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
-IUSE="gtk-doc +introspection sysprof test +X"
+IUSE="gtk-doc +introspection sysprof test X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
@@ -34,7 +33,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	sysprof? ( dev-util/sysprof-capture:4[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
@@ -63,28 +62,15 @@ multilib_src_configure() {
 		-Dcairo=enabled
 		-Dfontconfig=enabled
 		-Dfreetype=enabled
-		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
-		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
 		-Dinstall-tests=false
 		-Dlibthai=disabled
 	)
 	meson_src_configure
 }
 
-muiltilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
 multilib_src_install_all() {
-	einstalldocs
 	if use gtk-doc; then
 		mv "${ED}"/usr/share/doc/{${PN}/reference/,${PF}/html/} || die
 		rmdir "${ED}"/usr/share/doc/${PN} || die
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 2f0c00d1efa2..1677ab30dfa6 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.40.0.ebuild 1801 BLAKE2B 4bc57aa82f61824eca7b8b4131461c7252411d5453c0923df1020dd2b4529725343c3d4568fc7f0d4fe30134230b0c73eb29e54bd9a3657d268c656fa8948c9c SHA512 e562a10444b1ace4a4690d497d29e186fd436dad42a428753ff8cca26112d20911faf5e3e69df3bd26d67706cde6e6e97b47400d4369f488f5a49f9099f69387
-EBUILD pixman-9999.ebuild 1802 BLAKE2B b45fa739a8bd44494c80c4efd3e7de7fcf625269913757a9992e659d95cd7178a3a7e26648b221df2bd24ebf21ccd6ca94196ef8949bda2152b90eb5968f8617 SHA512 42a1d3b48f1dca95b2f9fb1069bfa5f302dd8b22fc32a3960e34e12c0eb2dce25496e27f79f91c9bb4a97484c0f96ad05740a7e7ee6b8a4bb790f9108e519bfe
+EBUILD pixman-0.40.0.ebuild 1660 BLAKE2B c33785d34facb8218a6826e44bf86d4dde5d1bfc4e7296ef0a2c8e408745b72cdbedf8bdaadfeaf7d9deb56865ad154e1ded0d677bfd2e0eb1884f70d9a0984d SHA512 f7fe9c0703050119a91791a2ff9939aad162a2ab7a5f90ca2cfff012e6b06c752d7265939c704c5f37e94597b75211f43b22eecc17f966e177e8c25ee018fcf3
+EBUILD pixman-9999.ebuild 1661 BLAKE2B 50684ad73e5be11ede13f57afbd56ba5653550774654cfc3f6fb82b2501479e72db9e5e67277b17146e4517e643ba0c0ab30bd2057524dfadb4ed52cdbbd8cc2 SHA512 168e5004344045e3146023463bd5f364d073a71ff3c1097b84f6a4e1c93552ea16d2649d5c1597f68bde71d0cb53c12eab190db0177c6da33a7c6a4073ee7709
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index daac74216757..65d7123b398b 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
+inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
@@ -45,15 +45,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
 	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-multilib_src_install() {
-	meson_src_install
+	meson_src_test -t 100
 }
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 316d0b79f709..d79304a2d1a2 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
+inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
@@ -45,15 +45,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
 	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-multilib_src_install() {
-	meson_src_install
+	meson_src_test -t 100
 }
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index faf6e9f2f88b..cde2208ba0e2 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,6 +6,8 @@ AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 B
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
 DIST vte-0.64.1.tar.bz2 486720 BLAKE2B bd8fb1f471a43aadf015cce8ae38c646521ca66e37652b72f7e94cec15a2a0a844d67116e9123ede44ba1b6ee569d1ecd0ff5e83067f6231802f5a77a798e446 SHA512 38bbbb4ed3d86740091c9ddee83f97bf5cb5c69c48e8a78592dd46e8f9334859a6c523e7b16dce110de71cd4a9a3b8b99a11816b61eae6e251dfc20cdbee6716
+DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
-EBUILD vte-0.64.1.ebuild 2512 BLAKE2B b1936e89ea0e87b6d784ad4d19840cd42d44ae0bfbb825158ae460e6bb7f7e5016fd0264c519a2c48f3b4c697c150c8389ea6074f01fe3c86e496380dd177c71 SHA512 82245bf415556851b554aeba6c27edc26bdcfbc3127dd30f11bb57aea663f9658f324cd7c4449fdd3e8986c4789f7e434befcf4a150a5f0001a3300539fb25dd
+EBUILD vte-0.64.1.ebuild 2519 BLAKE2B 8bc513c5b6b024735dc09dd72c10d3a45020470a0ee1221750e249e2afacce105c833360cf812086af95eb774c5f99e46701627b5ba92de433281783d4ed973e SHA512 fcf3ed398d972b5e661d0396995e9cdd4d9d15dfc4a88e441084f8805673d6f933da05618ab80c5babd7c689883129976e9b8d9c4f9439c367ef6d00ead66bee
+EBUILD vte-0.64.2.ebuild 2526 BLAKE2B 95aacd09bc88b0b14012db2c647e9fd09dea5f25aeb13858d3f960e9e418dd921e4bde5b42d7c8504bd85041d1f6a826f9b856d2b6afe1eb6976e25ec99f666f SHA512 a745d9c6f8f0a252328a984338915c0965f93ae60a7515055f3b10da52542ada554fe9bd174ea1181131cc3d0532c68e61ab20d4de27299693087843e3d58d22
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.64.1.ebuild b/x11-libs/vte/vte-0.64.1.ebuild
index 88d64617c963..f41c77ca5132 100644
--- a/x11-libs/vte/vte-0.64.1.ebuild
+++ b/x11-libs/vte/vte-0.64.1.ebuild
@@ -14,7 +14,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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 # Upstream is hostile and refuses to upload tarballs.
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
new file mode 100644
index 000000000000..66065238917a
--- /dev/null
+++ b/x11-libs/vte/vte-0.64.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.64.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.24.14:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.64.1-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index bd2fd750fef9..64e0b81ca168 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,5 @@
-DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
 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 621 BLAKE2B 63fd7221ebf1855af42a8ef0271608d308826118b6b4198b026773c0f936ea5bbf307639f9c8d93aa23eb98b7b35c8d632f18e425b7922cbcffc204ca8ea7869 SHA512 92b3b883df66a337d4e24b2cb6a935bb637c9bbe9fe1e10c61896431f98d044cefc1de28bdf20b17669cd9f33cb3e0c3bb69bb495bdd25778a5c2278f84c28e7
+DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
+EBUILD xapps-2.0.6.ebuild 2137 BLAKE2B 7d58cac8c262526bcab27af3cddb3ace003d65f89b4dbb41566e516a3e67fc515832115085c6c1f42e6a93bb02fdba198b665cf11a0ed0f246dad47bd51065bd SHA512 52d1fe7c51936c187a9c2bbb5ab7df97e657fa8a1ca5d0f874913bc75f5f25498abd28dc56c1fabd785d867f2cffe50abe36428f2afa8ea1797532eecc45e901
+EBUILD xapps-2.2.1.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
+MISC metadata.xml 484 BLAKE2B de6e513c5b0bf8090a3987c27f28c2c178ea1d4b7c90711dfed21e881989dd5894ee7a822f85135a4f2e0ca240d37158bce8206063892f4d9712387e6586926e SHA512 22a7d6e00716057a38f97ae73d4cb906bbc6c3aeabc23d586ba1788be0f77ebac6930870f55f931ab0fb6fa8ad41e7a6ac8e94eab3c459ebcb5f296b7f6dfcde
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index 47303987d492..a87c17eb9a80 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>olivier.laurantin@laposte.net</email>
-		<name>Olivier Laurantin</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild
index 3059ed0a95c1..bade1ef0d30b 100644
--- a/x11-libs/xapps/xapps-2.0.6.ebuild
+++ b/x11-libs/xapps/xapps-2.0.6.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"
@@ -74,9 +74,9 @@ src_install() {
 	install_pygobject_override() {
 		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
 		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
-		mkdir -p "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		cp -r "${D}"/pygobject/* "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		python_optimize "${ED}/${PYTHON_GI_OVERRIDESDIR}/"
+		mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
+		cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
+		python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
 	}
 	python_foreach_impl install_pygobject_override
 	rm -r "${D}/pygobject" || die
diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-2.2.1.ebuild
index 6245bcf0201c..a7434062a552 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-2.2.1.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
+PYTHON_COMPAT=( python3_{7,8,9} )
 VALA_USE_DEPEND="vapigen"
+
 inherit gnome2-utils vala meson python-r1 xdg-utils
 
 DESCRIPTION="Cross-desktop libraries and common resources"
@@ -13,7 +14,7 @@ LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"
@@ -21,36 +22,40 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/glib-2.44.0:2
 	dev-libs/gobject-introspection:0=
+	dev-libs/libdbusmenu[gtk3]
 	gnome-base/libgnomekbd
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
 	x11-libs/libxkbfile
-	dev-libs/libdbusmenu[gtk3]
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gtk-doc? ( dev-util/gtk-doc )
-	$(vala_depend)
+DEPEND="
+	${RDEPEND}
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	$(vala_depend)
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/glib-utils
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
+
+	gtk-doc? ( dev-util/gtk-doc )
 "
 
 src_prepare() {
 	vala_src_prepare
 	default
 
+	# don't install distro specific tools
+	sed -i "/subdir('scripts')/d" meson.build || die
+
 	# Fix meson helpers
 	python_setup
-	python_fix_shebang meson-scripts schemas
+	python_fix_shebang meson-scripts
 }
 
 src_configure() {
@@ -63,22 +68,18 @@ src_configure() {
 
 src_install() {
 	meson_src_install
-	rm -rf "${ED}/usr/bin" || die
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
 
 	# copy pygobject files to each active python target
 	# work-around for "py-overrides-dir" only supporting a single target
 	install_pygobject_override() {
-		PYTHON_GI_OVERRIDESDIR=$("${PYTHON}" -c 'import gi;print(gi._overridesdir)') || die
-		einfo "gobject overrides directory: $PYTHON_GI_OVERRIDESDIR"
-		mkdir -p "${ED}/$PYTHON_GI_OVERRIDESDIR/"
-		cp -r "${D}"/pygobject/* "${ED}/$PYTHON_GI_OVERRIDESDIR/" || die
-		python_optimize "${ED}/$PYTHON_GI_OVERRIDESDIR/"
+		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
+		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
+		mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
+		cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
+		python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
 	}
 	python_foreach_impl install_pygobject_override
-	rm -rf "${D}/pygobject" || die
+	rm -r "${D}/pygobject" || die
 }
 
 pkg_postinst() {