gentoo resync : 22.05.2021

28 files changed, 265 insertions, 27 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ca78cd6a15d8..8e0c1a55e0d4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 7f4a7f56a930..f0d56453aedb 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,8 +12,8 @@ DIST gtk+-3.24.26.tar.xz 21404732 BLAKE2B 8260b684b4d508af6b9a5060e47847254ae6bf
 DIST gtk+-3.24.28.tar.xz 22783312 BLAKE2B b0a8dd5619feacf44880bb1ef168fce5431802c401fbb31408a4a4a9822755ca76cc309eb0f271e98cce63ad7f5cbec4d0d6c947a631843bfbe509a81836778b SHA512 65856ae06e4a863c56b3718c0cc3d0ca9f61a62a02ddef30904432300cd455851efee3fa1e5661659eaacbdfca45650ee7c8a2d4eca004ad2936c1e26c720c15
 DIST gtk+-3.24.29.tar.xz 21396876 BLAKE2B 1675e54b185d813965a6279fa80a62784fc6216408710fad0b07a3300eb08301c80779e6e3a6b1109ce29bacca4e7ff4710b670a68ec0c6ffa68e44cfb07ccc5 SHA512 00f71024686c2d11d5c0cdd683365c35fe4d28b5eaad4937e79690777500788818faa5bd0c483e54ba8ce734aa6411388a39e398dc638cfcf0ec0e542aae6c2b
 EBUILD gtk+-2.24.32-r1.ebuild 9837 BLAKE2B 73bfdd872a661f1e1385541d72ca41d459f8308bcc8b1ee0872091d38cd849a0bb7f301508f027eb7e4b3f50cb4bdeb134dd5698d45e5729361ec5b1518dcf40 SHA512 88477844a33d88bf0310bc065bc784a560fba01391a6eb17df991da347deab396e8a6909bf0e8de5332d25c741670d8e8cfcf3d835ad14221a454419af913ca8
-EBUILD gtk+-2.24.33.ebuild 9805 BLAKE2B e3f94a76f67e3ca448f786be637e7152d31c6723ff35ee3f440d5fc5875a202908519f14ed7289dce6b0f93f5e6926da3c4cc3bf4b1098346369d5807536224d SHA512 ddd4b7c5292fb401bd6f7d97c2b7d5da7022377d74adc94dcedbf62883fb0ef2439df3d99d043277361ffca646c1449d77c8aaa0041026acafa91f814f509178
+EBUILD gtk+-2.24.33.ebuild 9812 BLAKE2B 4007b9d1b9464dd8b3960061c9e802557a2285226b6af3207d56eb60f58e134560e1d7956e1a70f190e116924aa3c692518a950b7489448de403906395cbcdf0 SHA512 b8c23fea9e84e96a59731492414d9c3d40def1559de55856f895574ec36780b25c6740ed942acf3df9643214702706ade64a0d212b43764d68f30543542afaec
 EBUILD gtk+-3.24.26.ebuild 7341 BLAKE2B 367ae9178237627f14d27617000c872814a7502d4fb81006d49314858ac089496220a53a9c0203b943c2d2361fb53849a3eb9811523a83c188be7a9158394de2 SHA512 430cdf514cf1b2ae6f215032a55e2b1b38237ba960eecdfe196ce5de542d0788568a68fb3f2f77daf35930d055fa5946e60048e3894bcf18bd0ed92cbfb0882d
 EBUILD gtk+-3.24.28.ebuild 7347 BLAKE2B 123f7b653d1410eecfbd2ea925faf17849efb427dd74b97e415064f1a949e3b4479ea2d91ce44229dae03992aa0233dbf97950a9b249af44217926eab03ae134 SHA512 6a77270475e499cb762a969a8ea4d25fba6acdcab4d9f3a57e9f8e7a766af0776e760863f07632294ed46d274356bb19a665e14959a5deadd37e86c2b3e4343a
-EBUILD gtk+-3.24.29.ebuild 7347 BLAKE2B 123f7b653d1410eecfbd2ea925faf17849efb427dd74b97e415064f1a949e3b4479ea2d91ce44229dae03992aa0233dbf97950a9b249af44217926eab03ae134 SHA512 6a77270475e499cb762a969a8ea4d25fba6acdcab4d9f3a57e9f8e7a766af0776e760863f07632294ed46d274356bb19a665e14959a5deadd37e86c2b3e4343a
+EBUILD gtk+-3.24.29.ebuild 7348 BLAKE2B 0eec4769f531996fa45401aabda8121e21be651d4206f003c4db2642e3ad990c7ce81bbb2a8aaa3ab7029d1d1a11f64e05002a2aedbb7553b2a4dfa5f4d805b6 SHA512 eebcc1b5f82d129320e18db2a78869eaa9531d89555ba59c0dcdfff93cfd1537d84c10366d284c51ec09093e8bab178f9337a97175dbec3757aef7f14a9e5c15
 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb
diff --git a/x11-libs/gtk+/gtk+-2.24.33.ebuild b/x11-libs/gtk+/gtk+-2.24.33.ebuild
index 8a86eaa76115..8b97abd8271a 100644
--- a/x11-libs/gtk+/gtk+-2.24.33.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.29.ebuild b/x11-libs/gtk+/gtk+-3.24.29.ebuild
index 54b60dc29ad0..a5e531ff38fc 100644
--- a/x11-libs/gtk+/gtk+-3.24.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.29.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index f3c020076671..544796a5ac3c 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,5 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
+DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
 EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
+EBUILD libX11-1.7.1.ebuild 935 BLAKE2B 9e8a7054b6c4814ab04d57522bdc3229602f59955621cbf5f6a88f5ce4953c9982f9d2ff7509718b35788ad9d529ede211687d688dedad65bb6b4bb812b55352 SHA512 171027968d90f2ec36f3fdb998e230dfa00449aa60d810876fe8753d11142479bf8379d3aa8675c334e14647cc1b456f30f60f37f1ae3e2279d341c964d49721
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.1.ebuild b/x11-libs/libX11/libX11-1.7.1.ebuild
new file mode 100644
index 000000000000..17c989025960
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.1.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/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 70582ab95a7d..dbc1b61a27b1 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
-EBUILD libXcomposite-0.4.5.ebuild 619 BLAKE2B 5bed78382a36c9325d24c26a0aeb48f052b2b9e6c64202ff1f7d8aa3bc865f67060dc785e3729b2bf753f5ce62c04ce3c1f92f957885b980bb2127ff7ab085d3 SHA512 48204e88dfdf95eb3644a2e4ba900872a64a5d4904901d54e79bc57245a83cb6376cd2d4acef5766d2f1a052b63815a1c6ef625b7d2a8f81c071b1283dc9df7d
+EBUILD libXcomposite-0.4.5.ebuild 626 BLAKE2B 8f0334d717b9d51e83426a6f8002e23ca8ec8ade7d26de1e626bee5a067c9c7683cbd2b99d3583c6855c053670c52b233b68c4f821304591490635a55ab4a1ae SHA512 84e6375ab28853d52d851160988963681f1816b5ad85c217742039e29a0c3e5880473fb459e08686e91079def1bbde49675ac8a9aba8d91146eb6da2d5cc44fd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index 864a509b8df4..eb91b2f0c58c 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 902e3351a1bb..6695870cb41a 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.2.0.ebuild 875 BLAKE2B ee67c4eadfd3b54cdfff1a551ae87e28756aceba61f9973a4d0a057dcc2c9177df3d5e70bdd849f0db88f2deba499bfc0a2ff1c521fc4fe2fe71f7042de4cd4d SHA512 5e68d1933c01837257762d2b2317aa26b16cb7416c03c89ae14eab70473812a02007b4dac49ea7d1de549bb1311282277bde1f3d56f68a9c9d61f1038614d847
+EBUILD libXcursor-1.2.0.ebuild 882 BLAKE2B 75a699644c8d4a7405ff2e7190a18c86fee5e7c5fffd70748d7ef025d001fa2df369aa0b67a9f88b95b37f3d86a44e7354c5d5483682a6fce67ba050383d349b SHA512 cdfd66ca4635c1916cfb2dbc6fbbb0a7cbde7eeb5afe1fa1928cd74b35305364789d1380540f5325c9fd96f2e4b2ec8f0baa460a2e6ca89fe0239474ec309a3e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 22a4854b1792..22ce06996bf1 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index b350e9be076f..3d62c22513aa 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,5 @@
 DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
+DIST libXfixes-6.0.0.tar.bz2 297270 BLAKE2B 082f321bb10b02f34c439adf45ed5f9cf3c3045d68673144261aae739bad063b02f235fd80398acd2632e10816f09382c4ea661c5db4cd868d24ae1b3486b83b SHA512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d
 EBUILD libXfixes-5.0.3-r3.ebuild 494 BLAKE2B 767cf1d5d2958ac1a0bdb2522ab3c06bd08e1f996d92b420f1cc69cbbde7d2c028f52e76ba95fd4d6fb8b4729269acf90ebdf6af7ef8f35ef6a7270e387e812d SHA512 c9924ddb7264d36ed7223359baf2e79859af91e1ddee96d5c2de2fd61b84923bf5fb99b13463d852a387a0289f2f6eb679d3d6a1451d1511cca6ae43501f9ab5
+EBUILD libXfixes-6.0.0.ebuild 510 BLAKE2B f024da575a807fe49150d4564fd090085b7528de0a2fee124a87dcea44787550a8bf47187113f56f8a1624372c3840fb19a4d55fd5aaaf15aebadc85c0c1fe1f SHA512 72066cdecdae223646c5bd7a7db4b319e11b2aa9b71c5e372cbb8dda8b19a6713f81a2009e5ea2978e995223f046683f58eb2a95c66617106e073c6c646e65ea
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-6.0.0.ebuild b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
new file mode 100644
index 000000000000..68e19b63f2bb
--- /dev/null
+++ b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
@@ -0,0 +1,17 @@
+# 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 xorg-3
+
+DESCRIPTION="X.Org Xfixes library"
+
+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 ~x86-winnt"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=x11-base/xorg-proto-2021.4"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 5909471302d8..fa40b529db8c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,10 @@
 DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
 DIST libdrm-2.4.104.tar.xz 419372 BLAKE2B 4f9c1d88e8e13e12b192b822aaddcbb01716771b85445f7468129600df3214a9dd3559539830eeec4df61f03c187fa88a6d0bb2d5278a5125d2aa11cef6805ea SHA512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e
 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.103.ebuild 1988 BLAKE2B 29c991df7e6d39b70b48b4e6056d944f12f630ab320d788b3e9560cf6e3b5e99b55c8aa100c475149b697a07e42a0fa27c22fa264f8aca5579e24b8c7792d79d SHA512 1247f74f71ed34d8b1cc7f5a1199e4d6f0bf0dfcf387db636c0ca2c0e179dc1e8ac757379bc584f4f489e559e73a92aa26391f38c58a6bd3d21b399be5b53982
 EBUILD libdrm-2.4.104.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
 EBUILD libdrm-2.4.105.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
+EBUILD libdrm-2.4.106.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
 EBUILD libdrm-9999.ebuild 1995 BLAKE2B 1785382e25415793ed04d7d677cbca02a25b1b99cf3f725f484702045e5495f268d1e21336261aec4bc02902522212847eabdac6ddf240a0b9f36643db1bb99b SHA512 4150f030c174192d4c29b14a5bd2a1328bd6ec02fed3eef3d1be9ef9684d8445212df93c919c018a12eef8702709f153f39388d715ff8d73663b6e70e024f7ae
 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
new file mode 100644
index 000000000000..370a65ea93cc
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
+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"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		# 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)
+		# 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/libva/Manifest b/x11-libs/libva/Manifest
index c512e58d871d..31ce0fe7dccc 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -7,7 +7,7 @@ DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe568166
 DIST libva-2.8.0.tar.bz2 478734 BLAKE2B b11393a9b9ec7ef4cf91d20d4005d42ad3d0e6a4a8e4d8cda67816bc5b9d3b23900754b5e8af92386dcf99a11e53af70fc4723ffecc715328c8fbf3d40486098 SHA512 329c5fc2262a6f4fddfcb13bd9644589248be6ae18fa1481cccc6b33874b91b60ad3f16a1777712f7a4817ba576db984834aa8735e6ad13d99b2f5aa13e9ddfa
 DIST libva-2.9.0.tar.bz2 481556 BLAKE2B 5509f3d7df11a11602331a3b6bb78d3a5d3dfbeff024eaa77594918c49cd48ec9e8ee017d8ac7b4aa1dbd3252a23caecce9a10a8a9e12ef4c483a8a34e028b20 SHA512 496358b73cd525d8c9dc1fcf3dbf992ec997ecc8f7be31f0e226ded173aecf29d8d4b60cc7cc5ee7beac538061659841145f67f449a03a04236a6ee7ae6f8323
 DIST libva-2.9.1.tar.gz 240934 BLAKE2B 76333a9ce78783c3d94798a19ea6a52d95768ca7e5a547094290313d4f5c610841787d4420d19e0553174933beaf5fbf68e7e849ad38682173f670de0d9a76e5 SHA512 79fd0b41795ac5de68bdd6470389fad6caf016fa4a44f2cd775c0a65d6d8f270a7e237d3b2e42a90376c103d2d2e2c010fe47835c7a15d79b94beaced02a2884
-EBUILD libva-2.10.0.ebuild 2284 BLAKE2B 527bfb9b0531349f839a15a4f5e94a06642f009e897637d5203c801a86a19aa36b970c83694d3db43e1f8a1191dd238175d3e98725107fac4512c170daaf2938 SHA512 32f609b3de8f81238b31bc278082d48094df19349f6f3825bc1fd004d4b5542b5f55f92395848abe4eb45e938126d292eb0cd86170e43b1b13f0ba054fa03b08
+EBUILD libva-2.10.0.ebuild 2283 BLAKE2B d10f3af7aea6285c4beaf66d9a2d17d6b31017b0f4458ef44777412edd6c6e14373ea1567df06bb57a8c3d9cd346201b6e5c508dd18c2fd5f8b0204e2e46285a SHA512 113a7f36c60a92bf49ec2a6ebe58ec4b124b188a71e9a1e3abebd1adbdd13c3f7778995bfd83b5e76ad535f62f1d0f492a3902c8c1f64172e58d679e26b66459
 EBUILD libva-2.11.0.ebuild 2481 BLAKE2B d0744d77fbba87fb1ce8f470ece7ddd1d07c5a1dbbd3e5619759de9be0d62a93a4c9fef4e669649b3a23a1c21a8d4153798b72ce0a101d24f010902827a658de SHA512 e2534cc6d1c0635f3f71d8be64dfc610670690d8d077b73713b0dd2cf1e41c7a6c562a3b5f07f8a9622161f983434e155d66a05b00b9c851131a429a137ceb80
 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
 EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
index e5936f8fb8a7..f25b39d46beb 100644
--- a/x11-libs/libva/libva-2.10.0.ebuild
+++ b/x11-libs/libva/libva-2.10.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index a632df27f76b..575d0ac4d296 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -5,5 +5,5 @@ DIST libxkbcommon-1.3.0.tar.xz 455256 BLAKE2B f53a47005dd411855d1d5c39a33ef58d22
 EBUILD libxkbcommon-1.0.3.ebuild 1432 BLAKE2B 5514381f7eb6cc03053fb2544516395fc6c67a59d7e1c6fe7348167c6ebc719428aa28e6e5b37181fdb49cdf4f36167df8847f41ddc484f2c76a9f44eb0ffbd8 SHA512 44dd4acfa62d35cf1a0a8f0cf39c56872c4c589ef6a0c67d7b4e7bc09e0c77241f6cd8bf68632c864993feddc3fa72d5be7096992316956f115609795a3f8eca
 EBUILD libxkbcommon-1.1.0.ebuild 1484 BLAKE2B 1f2dc69b9799e90f1c0e10e1aea913badb6f9ed56eac8b1b2607992c89b8286d222344a6d96b4904523bf1325e1747c274ef5ae9edebb237ecca54eb29de68dd SHA512 50619d539aed08f4f3fa84b573814d3b51f79ed07b8cde27a85b31c00e5c738107d2bea6d2b1d5d53bfacadd090e3d69c78304dc78de07663e2a6bfb746d25d4
 EBUILD libxkbcommon-1.2.1.ebuild 1439 BLAKE2B 0e39989ff26c13f2c25501cde2b99df369ab325d9ee5a9a06a284f327d932f1f625d5cc9fed3662e5bb493a08579e3f36ca6f161728dd663f7c95dca510f921c SHA512 6eae5aafbbb1e12b193929ed6170647b1682ffd88e27a3d596c391db31b46f1a13e2a530c9580a4e227b3ba43122e18035d7fb5a7b5c0e94fcf9a0454516f3b4
-EBUILD libxkbcommon-1.3.0.ebuild 1454 BLAKE2B e82a282a3d1d52337b40d23938784b739c6f0bfd34e18f5d4920d03eb7dc17a85c15b6d25af6afe3e3076bfacab426f8ff53948a3ea96bb19f2d7b1f87510ebe SHA512 d80635ab2dca8e99b545f77413c659d1a33c25665981755e8c10abe62f55e7d1b547cb05a134d6160cb32633c08ca3160e03af892612ccd4a887e3546dd65c47
+EBUILD libxkbcommon-1.3.0.ebuild 1582 BLAKE2B 156849159c55e883d2483d3a7de8f19af56c179ef537a7e157a6637a8e41be88e74314851b1d32af4e4a28793cc5d0517f2fbcd00e2b10922545402616338bda SHA512 ae17567e5b7ca7ecb620d4a195c61736384078165ac5bfba8eca2bc6880db22f8ed02bbadb6d19f404a688c95fd9e1a03a34ed6b7633be4ad5394584dc3ce3db
 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 ce2e09668261..38cc5c15931e 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
@@ -18,7 +18,7 @@ inherit meson multilib-minimal ${GIT_ECLASS} python-any-r1 virtualx
 DESCRIPTION="keymap handling library for toolkits and window systems"
 HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
 LICENSE="MIT"
-IUSE="X doc static-libs test"
+IUSE="doc static-libs test wayland X"
 RESTRICT="!test? ( test )"
 SLOT="0"
 
@@ -26,14 +26,18 @@ BDEPEND="
 	sys-devel/bison
 	doc? ( app-doc/doxygen )
 	test? ( ${PYTHON_DEPS} )
+	wayland? ( dev-util/wayland-scanner )
 "
 RDEPEND="
 	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
+	wayland? ( >=dev-libs/wayland-1.2.0 )
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 	x11-misc/compose-tables
 "
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
+	X? ( x11-base/xorg-proto )
+	wayland? ( >=dev-libs/wayland-protocols-1.12 )
+"
 
 pkg_setup() {
 	if use test; then
@@ -45,7 +49,7 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Ddefault_library="$(usex static-libs both shared)"
 		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Denable-wayland=false # Demo applications
+		$(meson_use wayland enable-wayland)
 		$(meson_use X enable-x11)
 		$(meson_use doc enable-docs)
 	)
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index fcc94e514ba6..a92eb22651b6 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r1.ebuild 3057 BLAKE2B 44c7004b5932c72732e752e10ea0d4b3220a57aba58c49f1e29177cf3b20cc05de6f5d2ebd9b01ac23c772a5cf2c64a7e9291ca768f36cd5335a3b376b3a8c42 SHA512 576885fb72431bd427cc67b2499ce906e98eaba08594674e4a7ed8c7696205b50c089c3a34c29a75b95213df863e67ddcb1a6fb99bc20cf5b885e4959fa3cc63
+EBUILD motif-2.3.8-r2.ebuild 3074 BLAKE2B 3e01e72622c45f49e3de21fb70aa632ec23a6dbb76eb54e8e5efaa40687c2d254fe84f5f1cde80134454db9ba53cdc613c81738cc394e19e98a9bfa146a58eab SHA512 bf551debd99646bcac258faf588bbca6821b4b02690f8a42135cc99eecb18af97b2e96e8f2869d901836cff865d9124aa3733df209d07b462f625087acbc807a
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r2.ebuild
index c93bbbd119e8..6e1c40835654 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
 
@@ -29,11 +29,12 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	)"
 
 DEPEND="${RDEPEND}
-	sys-devel/flex
-	dev-util/byacc
 	x11-base/xorg-proto
 	x11-misc/xbitmaps"
 
+BDEPEND="sys-devel/flex
+	dev-util/byacc"
+
 src_prepare() {
 	eapply ../patch
 	eapply_user
@@ -102,7 +103,7 @@ multilib_src_install_all() {
 	newins "${FILESDIR}"/Mwm.defaults Mwm
 
 	# cleanup
-	rm -rf "${ED}"/usr/share/Xm
+	rm -rf "${ED}"/usr/share/Xm || die
 	find "${D}" -type f -name "*.la" -delete || die
 
 	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 3f7005015d57..9a74121d989b 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -6,8 +6,10 @@ DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b83582
 DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
 DIST pango-1.48.3.tar.xz 565956 BLAKE2B 6860ae9df2b8629bdd1c5acf03453e1c6d62d8fd100752a6d5762ab1e0f2b3cbefb55e0f3476e53209d07541e7f8dffc680507378e94ab39b49601582a35e9a7 SHA512 769ceec71c5d64c08b91a0d78c5e39f6599fa199ae3f9d6dc4b94e5898a41e7f4b3d3f9c16a92f03d0e558778a4ef5bbe2967eefef17173211d53ffdb3d72041
 DIST pango-1.48.4.tar.xz 1791332 BLAKE2B 281e1ba5b52b99c61bcd90dcefb3de64e45a6de0eec5a375e209cb4316562a03e81dea73e6fb8921a631ef854dca8b035e06b3cec7ff73bf8f0033151d2cd20b SHA512 ce754c5e915ed18ba0f0ec89d74a1094e5b235821514b247d16afba7b74ecf1d850ad2b7b7d0a43da83da126c74be1b2e4c4400dbcd447e388e75e6b3c8b4dbe
+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.44.7.ebuild 2095 BLAKE2B 9a07720373325ae342c1a11216270f79783cec72cffc5198a38af6877019688466bd6505692dab3c2e509c6bbed815ce0b7897c94c7263dab692d070dfec7758 SHA512 6194aaebf76ef26476ba68bd0ee5fee76e08efd5104c4c67cd4d6b6f766bb97391ec10e14b90a9dc18d4051b87299c5514dfd3bad733aeb9061e72060942aeec
 EBUILD pango-1.48.3.ebuild 2203 BLAKE2B 283d1f214dbf1c94accbe73cb113978adc609d3451c6c68146a8c50d33e0bfab5a865fed6a4df577f41deb37e604605a1da0b3272b8cee95c969c789f443b225 SHA512 6cc8bcadc61b038f54e3c209bddd3d16b522c88aaa69cdc2fa826909c06e0a84f81c74001376b819de4d1d9a25b64c0d11c4cf522dd7291387b91cec9e0e685d
-EBUILD pango-1.48.4-r1.ebuild 2307 BLAKE2B 0ded4024655b8a46deb4e2dd6c6b84f41bd37bf068ee700f17640b2e050e89750f1113a18e5d3ed7d9f20fdd6ad76cb850d4aebb085165f0389a2c484377614e SHA512 51302701395798d5692afff2d064d445f6d428b083cd6e668b061708a737456d31864be1a6c2450e61ad5beaa0a38bae66495a41560485592f00f8745ad51b49
+EBUILD pango-1.48.4-r1.ebuild 2321 BLAKE2B a89427775ae3485bd75f27dccccaa9fb600f3b0e43aacc2016e221919532fa3c50614f71f2c78347422eedfcaa447abab1c6f2795a95167a6defb29fda6ac6f6 SHA512 6483bfe7515c8c70a30ca64e38e5413ff1423204662baf80a67c1d6005137c6bc739cb4fc89977b12e7835a350bab3414806ebbd2b80f2e1512d66dc102a6356
+EBUILD pango-1.48.5.ebuild 2321 BLAKE2B a89427775ae3485bd75f27dccccaa9fb600f3b0e43aacc2016e221919532fa3c50614f71f2c78347422eedfcaa447abab1c6f2795a95167a6defb29fda6ac6f6 SHA512 6483bfe7515c8c70a30ca64e38e5413ff1423204662baf80a67c1d6005137c6bc739cb4fc89977b12e7835a350bab3414806ebbd2b80f2e1512d66dc102a6356
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.48.4-r1.ebuild b/x11-libs/pango/pango-1.48.4-r1.ebuild
index 280ffa4c218b..f647bd75feff 100644
--- a/x11-libs/pango/pango-1.48.4-r1.ebuild
+++ b/x11-libs/pango/pango-1.48.4-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
diff --git a/x11-libs/pango/pango-1.48.5.ebuild b/x11-libs/pango/pango-1.48.5.ebuild
new file mode 100644
index 000000000000..f647bd75feff
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/"
+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"
+
+# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
+IUSE="gtk-doc +introspection sysprof test +X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	sysprof? ( dev-util/sysprof-capture:4[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+	)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		$(meson_feature sysprof)
+		$(meson_feature X xft)
+		-Dcairo=enabled
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
+		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
+		-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() {
+	if use gtk-doc; then
+		mv "${ED}"/usr/share/doc/{${PN},${P}} || die
+	fi
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index c078b41236dc..b3b67af5035e 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,5 +1,5 @@
 AUX startup-notification-0.12-sys-select_h.patch 928 BLAKE2B 048e3a834d6ec993d629bd72d13fc3008b7c52885cd34f5b057c77c5be3b8601e05d5280443eb567696ff5e590f49f3b6f184971c92e8bffc8b94cd1103e9b81 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd
 AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 BLAKE2B 2ed2cd342d606e6d3a2065aa127b7c1e2f6352c9e8142795d2a3a654706d771ec5a8cd1c26d5f75538d8961d081577cc3738d1c169790ebe954d3ade07f1721d SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d
 DIST startup-notification-0.12.tar.gz 355285 BLAKE2B 9822de9745fdeef28d7c6422d2a967394ffc329e7f37e1676c79e900f8e776578698ef47ff199fa05aa795540382f5eab5cb63f6cb20512328897236df1ab152 SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab
-EBUILD startup-notification-0.12-r1.ebuild 814 BLAKE2B 6538888b108641fe76af49b4871040a8c4964ddaeacd8a446ac9e5c59be8171f93bf3eb7ee780c3d530d8da617ad4082513c9d09ead612911d4f652b4edf25ed SHA512 664c55f82066788252f5d155c1ac0e4ab925f29bd4d309ac5e9ff6872526b9f6358148ea315554945c4ca2833dca5211cb5ce65557a406f1a76f658a413631e3
+EBUILD startup-notification-0.12-r1.ebuild 821 BLAKE2B 4bfafb660ea6fcdee17bf238a7eee1a18839bcba87f64f8b0e44c390cafea022ce97fbc0ef7e7afed3880ad767dc330ecd3ac5175518c988e22de5fea324d1f3 SHA512 3e883fc06d7284274cee99ffc7ed5cb511a239f98c35c3b2c6d0370ccadb43230438a2332ce0f5432a22473702a1e5f9a9749f65b46e94ce5ddfff5a9bb64e7f
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index abacdffee5ff..e0ea86087e05 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.4.3
 	>x11-libs/libxcb-1.6
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index ac169c7e9d0d..fa4f1c1d83a6 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -9,6 +9,6 @@ DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651
 DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
 EBUILD wxGTK-3.0.4-r2.ebuild 3600 BLAKE2B 019f83f1fb028982123b691988bc1513fc7f71ef517e6fa696b693ca53baa88ce424c1c779c1904e75956d6629a5f42b1977a6ac2b1d78bd5a7533714cbc1976 SHA512 c687c3bcddaf4c934e1616651d982bd0b175db8eedb4babb6820a39503f1b6484dd2b219a685f12931f0937e427d2d068065d0247c364e6dfe55aae73655a66b
 EBUILD wxGTK-3.0.4-r302.ebuild 4824 BLAKE2B bc5a1a4266fe8dad373ed7efc86ed6b4df84e119047146b2aceb2ddd085399184ff38b9bdf7adf1b1543f907db56d210a271e67d8ba025331802d453ae603207 SHA512 9d3c39b3a9c5350eb75f35822898f29f1e7941bb449ec8e1221edfd75a4c51bfd4649128163827c3ba76b1c23eba03444e00e45f519d4929fc6b417897d7e6bf
-EBUILD wxGTK-3.0.4-r303.ebuild 4929 BLAKE2B a88b9b5f2425073d28503e48feaffde017b8740270f1ccb2b5de25c89dada239a8938bc6d85767043d071a739c376b2748ab6a15be8d0fd123fa5ca3e4f0e89e SHA512 535ba5ee43e62bb46050bedb0b399233746bb7d366660876af40f891a1793e6e6174373c837e8279dc3136fbe0701606bd1d807708bccccf02693c5d7c28bb6d
-EBUILD wxGTK-3.0.5.1.ebuild 4949 BLAKE2B 46d7da77412960327cdc9cfd9afcec77c2de2b5b20999de37cd4745dd4c043976942676948697b665ba794b5ab198e7ed6941308eeea7cf137ff3b33e4f3768c SHA512 4d937a1eba09175b3cf7286cc69c70bc75ec2e80afd49c4c54d2f2ca3936f82f0c542b7dfef61e767793af57ae7e9d154391aee8257ca1324908c8c353f7742e
+EBUILD wxGTK-3.0.4-r303.ebuild 4970 BLAKE2B e0494ec1cf4ea602048cc4d344efe7fc55f17dc9d35845f1629700e155c0483d47f04f5b908a3fa1e269a55390a356c2d2697924fb72edf5742f4c0525fe403d SHA512 9e4fb18d9f6aa3f5123a9e988fe9957845779961764e29360e76909559f14ff8a4bcd6d022a9ba38a074c26c5707a72c78993e9323decd97bdbbd94fa5a5ef0b
+EBUILD wxGTK-3.0.5.1.ebuild 4990 BLAKE2B 07ff10bc224d87c99d870e9f70fdaf2fb1aebb3693ee3a448ac0754f4bc07f799722afaac19b4fe731cedf17ed6062a9901fce67488822a5aa13f2e7212b453f SHA512 cd0829233d458a6945ec1563297dc94aa14e7ddc8601983f39f9343acfd59351a1ac46ce7179915399920a1c6fb6d946dc998c23512c550ebf342c7af98ac05a
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild
index 65d027d2d111..2259503a09b8 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild
@@ -144,7 +144,8 @@ multilib_src_install_all() {
 	rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die
 
 	# Unversioned links
-	rm "${ED}"/usr/bin/wx{-config,rc} || die
+	rm "${ED}"/usr/bin/wx-config || die
+	use X && { rm "${ED}"/usr/bin/wxrc || die; }
 
 	# version bakefile presets
 	pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die
diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
index e43f2597c1a0..752bedf56e7a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
@@ -144,7 +144,8 @@ multilib_src_install_all() {
 	rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die
 
 	# Unversioned links
-	rm "${ED}"/usr/bin/wx{-config,rc} || die
+	rm "${ED}"/usr/bin/wx-config || die
+	use X && { rm "${ED}"/usr/bin/wxrc || die; }
 
 	# version bakefile presets
 	pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die