gentoo resync : 03.03.2021

21 files changed, 210 insertions, 373 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ed161f6841d2..88082f456a6d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index cdaab80dfd67..bdae18d786ac 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
 EBUILD fox-wrapper-2.ebuild 538 BLAKE2B 50f8f178e5b97c2c54636bfe82a89cfc2274d24d9671a554d3214a7800e7eccf0fe929bb71e737f85aa7f39a078eba4c0a8059d3c686af30347e4f6e60c25b0a SHA512 9de8fa442bc1de861dffb6ee378ccf323f189a1056a027a52aa444bf31dc174b818dd0dbe68af961c9d13cbafa3f6d82c658dc15b369e2e4d36278088eace953
-EBUILD fox-wrapper-3.ebuild 553 BLAKE2B d94b4abb60954601e40b47fce3dad0441fdd75d97fee3af49d43cb77d2b52cf4063d99dbb78d013c75dedd6a50c7f75d58d061a853ad4fcc2f2a5905e11a0389 SHA512 d421a48a49eee5712cc923f13774eb472abebda6d290ca488c067e0355d7aa4e4b5eecfdfa2f8fc842ab5143cd52c3d5895b19bed68baf80bac725693314d1fb
+EBUILD fox-wrapper-3.ebuild 550 BLAKE2B 6b75fbb550f8f0c9da9c21619d55f0bf2dc51e4fdb575b0246e7bd3f1f6c419b5c00cb5250df6c4bee3303ba294658e297664e94b68a60fd5ced5a84d5351584 SHA512 d218ecbaec29a6018d00a666679e20ff98c41a512af88a85de5fe89af9f94729fe5512b69e71b14ff0cf67a3d05943b024f966c618f15493f17898eadbcc37d2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index d4ebbf63bbbc..ab818df4cbfa 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 7ce356bdb04b..e5bcd3fbde0d 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,4 +1,3 @@
-AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
 AUX gl2ps-1.4.2-cmake.patch 1959 BLAKE2B 28725bdca4ec50c4cdb19100d30d3af4fe5705709b0aad92c79ca9d732da862170d922e037da29a43e174bf16b773d9ec73c2034a5f67803dd9e3c97dbc2f4d5 SHA512 a76a7649e8b2b62de6669f1bf1d3f4797708ae659ba8cdf9b3da21319dbc56035876d1b233c5b8934ee93a6b3d1b6562376734c6ef1da8764910a30b8849fe17
 DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
 EBUILD gl2ps-1.4.2.ebuild 1175 BLAKE2B 1d93619d65949298724339055bd760349d077b0cc0e5aadc80a7041c652406c9a83352260795b06ab0ddb7f941067dae3c09a81ad73e4cc6de556243e3b0233b SHA512 5c290a4ed8ab7ebff21a729196c64e013fa8f7df6dc93f7ca98937c7f1aafa6f4560edb5746855bd6ce399e88101fba16ab76a1d4b5e6822880143d5c7bbfa51
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
deleted file mode 100644
index f22760fd6eca..000000000000
--- a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Sebastien Fabbro <bicatali@gentoo.org>
-
-Patch to add various enhancements to cmake:
-* use GNU standard CMAKE_INSTALL_DOCDIR
-* optional documenation building
-* optional examples building
-* do not install static libraries
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,6 +46,8 @@
- 
- option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
- option(ENABLE_PNG "Enable PNG support" ON)
-+option(ENABLE_DOC "Enable documentation" OFF)
-+option(ENABLE_EXAMPLES "Build and install examples" OFF)
- 
- set(GL2PS_MAJOR_VERSION 1)
- set(GL2PS_MINOR_VERSION 3)
-@@ -103,8 +105,6 @@
- include_directories(${EXTERNAL_INCLUDES})
- 
- if(OPENGL_FOUND)
--  add_library(lib STATIC gl2ps.c gl2ps.h)
--  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
- 
-   add_library(shared SHARED gl2ps.c gl2ps.h)
-   target_link_libraries(shared ${EXTERNAL_LIBRARIES})
-@@ -116,29 +116,32 @@
-     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
-   endif(MSVC)
- 
--  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
-+  install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
- endif(OPENGL_FOUND)
- 
- if(WIN32)
-   set(GL2PS_DOC .)
- else(WIN32)
--  set(GL2PS_DOC share/doc/gl2ps)
-+  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
- endif(WIN32)
- 
- install(FILES gl2ps.h DESTINATION include)
- install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
--install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
--install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
-+install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
-+
-+
-+if(ENABLE_EXAMPLES)
- install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
- install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
--
- if(GLUT_FOUND)
-   add_executable(gl2psTest WIN32 gl2psTest.c)
-   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
-   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
-   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
- endif(GLUT_FOUND)
-+endif(ENABLE_EXAMPLES)
- 
-+if(ENABLE_DOC)
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-   add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
-@@ -157,6 +160,7 @@
-     add_custom_target(html DEPENDS gl2ps.html)
-   endif(TTH)
- endif(PDFLATEX_COMPILER)
-+endif(ENABLE_DOC)
- 
- set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
- set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index b62d50597bda..5a8e913625ad 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -7,15 +7,14 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
 DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
 DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923f5f17f818d2284afa6ea9ac080a55d358afcd0b73f3a124d57959c7a07a90c479b784fc881a3c9a0b9e354454f SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520
 DIST gtk+-3.24.25-patchset.tar.xz 8884 BLAKE2B 34531ebe0c2ca96d276071bed6b512ccffae4eb8f50263985af3c9c3e74f252690d5fdf354a6bca4cd2e54f7aa2636b2ab676fca13554901b221f1284de7b13e SHA512 11ca6bc40199a11875a31624e29d2d36800ae67ae596d145a146b0fff835f02b7864f46aef3689a7108f53e5db18b4855e34ff1dad1a201937320a51a97716cb
 DIST gtk+-3.24.25.tar.xz 21417428 BLAKE2B 3a5ac2a453a6067bba43c2b712925dea150d1e5d5783d05ff5c1e01db5d04cee3bced6d327f66dcdcfbdd992ecadfe03e1ac1c545280bef4a4bb4d3d4afaff2e SHA512 e476e7900d5694ca538a5b0acce088a1485560dd697efb8839be93741e0c1ddda90c9cc73fc64af68d7ffacbf9b5cf9a74ab08454d684f182beda9fd09b6132b
+DIST gtk+-3.24.26.tar.xz 21404732 BLAKE2B 8260b684b4d508af6b9a5060e47847254ae6bf647ae1dfa131bdbb35f2eaeb3f45ba749e9ad6e1920c05dab660d78424e38d974070928c56e91fc422a62d87db SHA512 d3023e9cd0c1f0de384266c4bd4549a7006ff475de82617de16378617a4a669645ad355cbabfe2ff43b19dddfbba7b9413ec98c14ed0f5ee3a61466b3d6eff76
 EBUILD gtk+-2.24.32-r1.ebuild 9834 BLAKE2B 75f9eb737608fc5ffe7748c68b6592bb96f1cad3d5f326f5567a906222dbe2db96beeacbb32e89499d5f3122b84d4b81cdbcd2fb5f253fc7f6721725e1978c8f SHA512 0a04b09bc637fda2d76c5be5b1807f6cba88af36bab11279d55dfdb8639272df743a9e717ae5916f500e7bff6f24bb017a75c95e0fbbfb905f5f9b50fb7a715a
-EBUILD gtk+-3.24.20.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
 EBUILD gtk+-3.24.22.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
 EBUILD gtk+-3.24.24-r1.ebuild 7301 BLAKE2B 104a0450e1a5743f69c664a44ba8860c281ee5312f01979794bc1f3e2e087a91d98a609dd69d605907767360a1f21decc6b52e57e757e98545214ee696b0d755 SHA512 0d1931b9432b9a3a16ba374bfdb88c9e4dd5bf5725088c66372aa4490900889d5e9ba7b2478fae466e69e88f40b3ed534c69bceb27241161a88d8d3c68d28c29
-EBUILD gtk+-3.24.24.ebuild 7420 BLAKE2B 9aee21b006d166d6f9e47f12ad966cc05648254ce869bbe2b4b141290349415ef7bf98167d077dab6f7b5eaea20bfd8bef0af8a7dc1ee9d24a55d52195644ef7 SHA512 be0c566c3c41655e280ae7cf09a92fa8ba7d5e17ea3b58ce71cddbe8fffd88fc55dc79c37e75395762dda436a7794fd065b31039a41fbed2b8ea85f8c2105b1b
 EBUILD gtk+-3.24.25.ebuild 7475 BLAKE2B d8f366cc92d969e2f57bd1a3b72b26965c804884ddaa0d4f38599f9f54ccb96b2f4fcd96bde04e6436db64cde99fd94471941b79e0f80634a5702c4af6d86e20 SHA512 f6b27d5fcfbb1c50f7ecc16028b74da6a75bb9610ab61f8ecb96b59dddf188cf442711bb0c9563f9e2ea4885aa8d1988578857c93108033fdb74ae3438c2ac9c
+EBUILD gtk+-3.24.26.ebuild 7309 BLAKE2B 875985f2b459c9689d119d0cb3f09e05052e51b863c4a1d191de3fadbb6108bcb40ffa51c07b9278891c439a48797f5e65f0e9a4d5864b2fca151365b6d663ac SHA512 b8a9f0c14a802204f07dcff92aa499d783310f17c416b5dcdd1fd977255cbe01e3f794f4dd1e64600b2107876fa94abd31703a688a0f78b0cd24ec7222815dfb
 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb
diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild
deleted file mode 100644
index 1c4e24f58d1c..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.20.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	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"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.14
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable cloudprint)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-papi
-		# sysprof integration needs >=sysprof-3.33.2
-		--disable-profiler
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} that would get installed by default
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.24.ebuild b/x11-libs/gtk+/gtk+-3.24.26.ebuild
index 3620e65ca554..f3e43d0e35e9 100644
--- a/x11-libs/gtk+/gtk+-3.24.24.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.26.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 GNOME2_EAUTORECONF="yes"
 
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
+inherit gnome2 multilib multilib-minimal virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
@@ -31,20 +30,22 @@ COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
 	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
 	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
 	x11-misc/shared-mime-info
 
 	cloudprint? (
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
 		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	)
 	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
 	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.17
@@ -55,32 +56,22 @@ COMMON_DEPEND="
 		>=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
 		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
 	test? (
+		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
+	)
+	X? ( x11-base/xorg-proto )
 "
 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
@@ -95,11 +86,34 @@ PDEPEND="
 	>=x11-themes/adwaita-icon-theme-3.14
 	vim-syntax? ( app-vim/gtk-syntax )
 "
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
 )
 
+PATCHES=(
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+)
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -125,12 +139,6 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
 	fi
 
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
 	gnome2_src_prepare
 }
 
@@ -143,8 +151,7 @@ multilib_src_configure() {
 		$(use_enable cups cups auto)
 		$(multilib_native_use_enable gtk-doc)
 		$(multilib_native_use_enable introspection)
-		# TODO: sysprof-capture:3 doesn't support multilib; enable multilib support once gtk moves to sysprof-capture:4
-		$(multilib_native_use_enable sysprof profiler)
+		$(use_enable sysprof profiler)
 		$(use_enable wayland wayland-backend)
 		$(use_enable X x11-backend)
 		$(use_enable X xcomposite)
@@ -207,12 +214,12 @@ pkg_preinst() {
 
 	multilib_pkg_preinst() {
 		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
 
 		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
 		else
-			touch "${ED}"/${cache} || die
+			touch "${ED}${cache}" || die
 		fi
 	}
 	multilib_parallel_foreach_abi multilib_pkg_preinst
@@ -239,7 +246,7 @@ pkg_postrm() {
 
 	if [[ -z ${REPLACED_BY_VERSION} ]]; then
 		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
 		}
 		multilib_foreach_abi multilib_pkg_postrm
 	fi
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index a368c18e35de..073f8e945825 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -6,6 +6,6 @@ DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5be
 DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
-EBUILD libva-intel-media-driver-20.4.5.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952
+EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
 EBUILD libva-intel-media-driver-9999.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952
 MISC metadata.xml 602 BLAKE2B 9448d1e88775ec7458fab88e284cd0ac184500f3c6d1b1007495e7de30eba245998b10bfef258a34d2b67d5f17438f0afe9f93e3e4001fa197fcffa22f6559dd SHA512 dbc361bd18283a1ca1feb4adea969783afeb7b0a105675b9603d946f8cc1da6d7e959b3c7f74e5bad5c95bb949687563382155a61de985b3fdd70a8cbb2b502f
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
index 33551ed4938f..7e51437dd247 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 93e98e9d510d..58e76080e3dc 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -6,7 +6,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 2236 BLAKE2B 78342bcc6f5907a1ddb079220e5dea1303ba14061a2175bd252dedc51d3d0f6eb974a81323138a0bd83feca36934eefa55c474c86a399b600954b0767d6cf265 SHA512 c6ceb43f829ebd618f78c74b2513df8ccc9def9be95fef17a6e98991b6433bf8132ba519d97028185cc4c55ba51507b0ced0461a3d98707b9bbe246a4e949d54
+EBUILD libva-2.10.0.ebuild 2234 BLAKE2B 1684a1ca0ad21d65fce1df0e252e3a72a05e9104e3c0821238f8c86aceb47ff9a387f3f6045d6f95def3f4f750fa0091857a48127f916702109a371b916c7e48 SHA512 60381b0bd057ceebc3861daf7613b466d6216e898ddef718a9461e3dcc5c7045f5eeb0e9dd627557ac27b3909ca555f111f0016be9ad081bfc98b6587401ed16
 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
 EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-2.7.1.ebuild 2193 BLAKE2B 331542be784f71417c51fda406846e3613976a5639492e3715f02dbcd1ffb2e1236700c164cc519fec7b14112c5aa150905a2b680d5810a9211897a4ed854a43 SHA512 bb0aa7dfac518d3b1c60fa99315de482840d8b5840652576977d10065f41cab3df44db4e78a33c65ac932e4a3e4317896abcb2ccbaefcaaab31feccc6978c57b
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
index 6dbd26cce39f..87e992634ed2 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/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 03b3544484db..9ba59a3933ea 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -3,6 +3,6 @@ DIST qtermwidget-0.15.0.tar.xz 181284 BLAKE2B a862821d30831c829e2391f33348e1499e
 DIST qtermwidget-0.16.1.tar.xz 182764 BLAKE2B ba041130d8d67c08db07b91a5eb513c6fee548df3abef3ac7d7ccc5114771f2a14fff3c3f01a762670d8e3d9887fd7f62e1c018ea98ee7cc8e68b77317871966 SHA512 689d067e259aa07b22e1d3344467180109e871a8d45551085625c04670f1422b821bbbf52caf2b67e10ce8e78214c8e65811e6eb4fc61dd246fc25598ed095c5
 EBUILD qtermwidget-0.14.1.ebuild 651 BLAKE2B ffe5762f8b8a6fdf86915371391831c7f5595ac9da8044baf8f400a92b6d7b3c109619d0308abecc9067fd088dbff79d6e1e9c4525592c76dc9ce0325e9def8b SHA512 1778f1ed57ca6e295a510ebb0c6fc6fca0be35dbbc43fe1c8663caf9ecaec1b8645fde0215653ada1cc501a248b71b55a3bf318fbfb13b26922a35712b3a8ab6
 EBUILD qtermwidget-0.15.0.ebuild 633 BLAKE2B 361ec82bc6d6428358972d52ae7e40b99dba35f17494b1b76926bcd16249f76de8092052b1fcb29a4ede0198abef84ec8f6a9d48668276c4e8bcc7639a631b8e SHA512 22efdd7fcf770f8b51cfea207bc02a0e04e90ef5ac857f51fccdc1274e3bb5bb30afcb680aa32dcede12a9bd2abf642be7d0b81bc4248b48d9c26e38e79aab2f
-EBUILD qtermwidget-0.16.1.ebuild 635 BLAKE2B bd3ea6e3166d6a08aa7b36fac143dcfef0144ed071f65ebbfce4c6b45f314456e5a4c626a106dfffafe1ccc9746562ff870dd57d2ecb8c8ece9dd1eef3a77065 SHA512 0f71788f9c75f21bd19dd8b4cd7aeef57eb6ae3f3dfe0600fc5b66c1c88e745fdcc6e9a0e36de91361f18cb5ea5efb6379884ef7bef577c34d2915da2d0351df
+EBUILD qtermwidget-0.16.1.ebuild 633 BLAKE2B 5c7d1f9baeea398f98e6a451df22bcd8706edc46345fca21368ab702ab948286abe9f35729738e9af095a6bd12c29e2cb8dbce61661a6cc9e785cb2e89cc27a8 SHA512 88c2036dd7fef67ec0553652a89a8b53e4bc715663149a6ad47e6cdbd23945530d927f03ffd7a428813b481ac60fe362c13c32ee20e81c56b588ad5052edc1a7
 EBUILD qtermwidget-9999.ebuild 635 BLAKE2B bd3ea6e3166d6a08aa7b36fac143dcfef0144ed071f65ebbfce4c6b45f314456e5a4c626a106dfffafe1ccc9746562ff870dd57d2ecb8c8ece9dd1eef3a77065 SHA512 0f71788f9c75f21bd19dd8b4cd7aeef57eb6ae3f3dfe0600fc5b66c1c88e745fdcc6e9a0e36de91361f18cb5ea5efb6379884ef7bef577c34d2915da2d0351df
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
index 8f022c1013f2..f739ad66dc10 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 5fbac298e5f2..f7dac5899649 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,4 +1,6 @@
 AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
 DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
+DIST tslib-1.22.tar.xz 351192 BLAKE2B 8cec9fe17b9aee7dac44bf54a78482b81a67072a7c1497b4c5a2a6703bb0e897a2481bc06df0fd91ca97fef3b4ebf17c475c3b717ce7f32fb677db5918630759 SHA512 8f51fc5e37bb1babb89e8d6d5302c7d7b712820525bed0253f980028a78b343e4100065bbe0ecafb828a7edf3a9b77f96929ab79205d516ebbf6c25b32af0008
 EBUILD tslib-1.21.ebuild 1539 BLAKE2B ba3adc3479f9dbaae520a8f6228ab36ee5e23ee768ac1882d5abc92120609981394ef78ed066dc5c3bbe80dea988f314aabc029fdabf289c8abda7999c90ebef SHA512 2208273e73145a8c983ea019c84feb832e9d50452b1d294550592ae8797073fb3c139fe4abbd9449423c6821a4cb19ed591f2f73ca6cff3d444b525d8763c53b
+EBUILD tslib-1.22.ebuild 1566 BLAKE2B 9c752864ecdd6358fe076155db96bded20583c936812b589ef33171cfc592c637bdcbe0694be0e11163b16b3cf916297f2c9edc6796030ca71073c45a6311c3d SHA512 679dad5f6bef3d2d8373e8fbf9fc73e0e1e47e3da02dbc23662b677ed4fa02da7874053b58ddfe75bc34dea5cf455096200e8613ec3ca976ad5d3808edbeb803
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.22.ebuild b/x11-libs/tslib/tslib-1.22.ebuild
new file mode 100644
index 000000000000..1fadd84c49a0
--- /dev/null
+++ b/x11-libs/tslib/tslib-1.22.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Touchscreen Access Library"
+HOMEPAGE="https://github.com/kergoth/tslib"
+SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2 uinput? ( GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="evdev sdl uinput"
+
+BDEPEND="
+	evdev? ( virtual/pkgconfig )
+"
+DEPEND="
+	evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README{,.md} )
+
+PATCHES=( "${FILESDIR}/${PN}-1.21-optional-utils.patch" )
+
+src_configure() {
+	my_configure() {
+		local mycmakeargs=(
+			-Denable-input-evdev=$(usex evdev)
+			-DENABLE_TOOLS=$(usex uinput $(multilib_is_native_abi && echo ON || echo OFF) OFF)
+			-DENABLE_UTILS=$(multilib_is_native_abi && echo ON || echo OFF)
+			-Denable-arctic2=ON
+			-Denable-collie=ON
+			-Denable-corgi=ON
+			-Denable-cy8mrln-palmpre=ON
+			-Denable-dejitter=ON
+			-Denable-dmc=ON
+			-Denable-dmc_dus3000=ON
+			-Denable-galax=ON
+			-Denable-h3600=ON
+			-Denable-input=ON
+			-Denable-linear-h2200=ON
+			-Denable-linear=ON
+			-Denable-mk712=ON
+			-Denable-one-wire-ts-input=ON
+			-Denable-pthres=ON
+			-Denable-tatung=ON
+			-Denable-ucb1x00=ON
+			-Denable-variance=ON
+		)
+		multilib_is_native_abi && mycmakeargs+=( -Dwith-sdl=$(usex sdl) )
+
+		cmake_src_configure
+	}
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index f1de346c9bc8..eb056a1927f0 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -8,8 +8,10 @@ DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d
 DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1
 DIST vte-0.62.1.tar.xz 444672 BLAKE2B 83cf49c8700792a149d572bae692d4909ada613b43a752b55cb658926dc37041b98d69364a88f813b1cc6d20f0667ea566f994e0f08bd1dd918731d20edb1376 SHA512 2f8f76953e0ea6c604357ab08630d3822a252051d8997cf7714553fec1688735468726bfd74e03f122dd1c8d0717e511ec7ec1e5463a086bd407afc6f7df91cf
 DIST vte-0.62.2.tar.xz 444888 BLAKE2B 07a9d302b3fe67fbc149f129da9e7482f516f3d8fb550bfcd2ddea000f059a24184e857b9f7c4c69c751e40a2b53c044d8596c990b722a22fa13b810a353414c SHA512 61ea130d43d60531dcaa8bddfecacfd4a934a2e868da69b598fad0a2feb04885fc0b5dd520dac4b0d3a4daf11ea70c5357066ed15759e36436346dae498e8ef8
+DIST vte-0.62.3.tar.xz 447152 BLAKE2B 2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7 SHA512 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81
 EBUILD vte-0.28.2-r209.ebuild 1865 BLAKE2B c5e05195cda70e92ecf2bf90b2d00094c8e3679d0cd8fe8ee3fb8f53a7a32671fe81c5daaaf5a60d3a511bb98cb09a95487931db519f5b28d1d3a935b1e60e8b SHA512 75e44dda5dfcccec43b57eaf2cf73667460700bfa91833b11e83d3cfcf8a2a84ba5ab239650b8f3276a8cd7341cfb3453317c01092f9a1c1623e9eaf287348b4
 EBUILD vte-0.60.3.ebuild 2202 BLAKE2B dda1b10be7bd337e1e5159cd251315d51ae3fd17be6ff75f82402a462d7491313919f563b6bf5702f8e7ac2ea4d58cffb6834377ac35e22a573084ba77dfc152 SHA512 7caacb773b7f53d311899fcd6f56171e3e96d5be3c997304c6e870d95d11beaa2ce0b63d3d8876713798648621bc46bd7b491a7ad40845ceec929befec41bdf3
 EBUILD vte-0.62.1.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
 EBUILD vte-0.62.2.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
+EBUILD vte-0.62.3.ebuild 2211 BLAKE2B fae36ce3c256be5a24e76c05fa1b1f702648c2a242e0b7c5732fbb9d875235ce793ce17a6e4439e283abd4ffcb57765ef2d97807c42e8da70d4e9ae4e875d188 SHA512 49f2441870fceba0c6f93c21bb3d56728def7330a84e43b12fd02dbee7a53b4cd930bcde3ca830ecd3ff1ab0094c0f0f048351841ea1de4fe4b653b59e8391f4
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.62.3.ebuild b/x11-libs/vte/vte-0.62.3.ebuild
new file mode 100644
index 000000000000..80301a89aacd
--- /dev/null
+++ b/x11-libs/vte/vte-0.62.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
+
+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="
+	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) )
+"
+
+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.62.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
+		$(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 3ccb43085d56..92d669e25690 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 2104 BLAKE2B 9f20cfe30dd54f071e484f10c0728e88cc15c49cf2e3cbd38ca0ce52066f37f38c14a5ab6f30883a83adb4471b0c9c758d07c7c8ea4c0bc9abbf5cc116d9c38d SHA512 ea471059843e8d5c732d4c7aed880626ff6787db97d3252278dbb43ae91e99a02dfbe7e847f600c9d881da2d927105299e70e119d6e2b9cf2d4c66845ccbdb4c
-EBUILD xapps-2.0.6.ebuild 2095 BLAKE2B 7405930942bee974d6e8168c5dcac6c489c98219addd40378f49f23a2b322576b65d54285f3825470cd3123c0d85070620f20ce84667d0cd1efd5e0cefa64c17 SHA512 7fb31aecc4ebfadc10513d9b0570fa6eb266e8c517ae1c47f01eecbaa5d2d5b32bd1d125a28d928247ac4cd66be39e43ccad19e996854198bae293f7d3e50619
+EBUILD xapps-1.8.9.ebuild 2159 BLAKE2B 15accf97f33c6fdc424b7f2bdadf3687d881ae03b459ba8bcb33dd199bde4580c8cf2617c5064f8a9aafcaa7d4f3524eb0ff02b4036f6b82eb333f0b9627bbd7 SHA512 65f7c1e45bc3dfaef4246ba025b55ab3601af36ff3e3d4dfcdda108fa4773f7a7a3acffec2a4797b503a001b5875b6b4ec04ce7914192d0bccbe826c2e603773
+EBUILD xapps-2.0.6.ebuild 2142 BLAKE2B b477ec01e1f7c69ad79d5079fb4b702016cdf0152eccff268f3325b9757f55d871b9b7c5d7dfc1b22d53fa69f9f59417802c4e7b24e8854f61bb8228dc179a7f SHA512 1792bc42eeb66d69267a2d55013a6b2115c8795ebd82f805e125c0e3a4fcf5fbcd7293de97c6f9f540c467acdfd357a8a933bfc16d45b9a633f9bb1367a89238
 MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-1.8.9.ebuild
index da3eb4f5ac9f..6245bcf0201c 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-1.8.9.ebuild
@@ -45,9 +45,12 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_environment_reset
 	vala_src_prepare
 	default
+
+	# Fix meson helpers
+	python_setup
+	python_fix_shebang meson-scripts schemas
 }
 
 src_configure() {
diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild
index 0dc60ed63845..3059ed0a95c1 100644
--- a/x11-libs/xapps/xapps-2.0.6.ebuild
+++ b/x11-libs/xapps/xapps-2.0.6.ebuild
@@ -47,12 +47,15 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_environment_reset
 	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
 }
 
 src_configure() {