gentoo resync : 20.03.2022

27 files changed, 535 insertions, 230 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index c85867179e75..f7fab6a95b07 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index a6c797bc4ce0..b516af5cdceb 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,3 +1,3 @@
 DIST amtk-5.2.0.tar.xz 381328 BLAKE2B b97a4b27d33bf49a97d585ecbecad04c3f2ea4e08e378d02218be5bf4aed2fe26f260ed1fd1eaa09a5b9f0e30e49901ddf860087fc630794aaa25ecda353b118 SHA512 520c9e762bdef96907320ec8dd4d3a005f262064ee402527c1087652af91c61657868189be8aedb7c0bd17758cf6d7e976da4ce941eb8a54e2d3e10ce55dc9eb
-EBUILD amtk-5.2.0.ebuild 768 BLAKE2B 02ee3ca615d97d2d641827440afa56d50e05f3b8e0b9081282032df50f3c826fcea5acc5f03bb3213ee039b7483c6cee18fea6f60c40bbcb8598d8bbd1e15796 SHA512 2788b0a127cf565b275ecb585a8927f77d14732e5bb0b140f56034bd521ce287ae57604101d54f3671e78bae37e24f20e4a13a491e72976f0da0db1c3666e146
+EBUILD amtk-5.2.0.ebuild 767 BLAKE2B a44fed3f088fb4c961a686ffd0ae2748877048a124f8682441271c9dc77f3ec76c73a9b6db89113b54e103f25da4585e8d8a3d23cf1d41aefb64e184d8b747e2 SHA512 51deeb352f23af2ab0ffaac366d0b18d35393a413b8d0bb8ce20e296f7fedb69ebb15feb34d90eb9e52d51f2b14eca83e7bf54263fadd4c6af72f0dc2852070d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/amtk/amtk-5.2.0.ebuild b/gui-libs/amtk/amtk-5.2.0.ebuild
index 31bcb581a5a0..03d8571ed796 100644
--- a/gui-libs/amtk/amtk-5.2.0.ebuild
+++ b/gui-libs/amtk/amtk-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gui-libs/egl-gbm/Manifest b/gui-libs/egl-gbm/Manifest
index 42fc404248b3..1c67fae1973b 100644
--- a/gui-libs/egl-gbm/Manifest
+++ b/gui-libs/egl-gbm/Manifest
@@ -1,5 +1,5 @@
 AUX 15_nvidia_gbm.json 96 BLAKE2B ed3c97a8df4e80b969b479c46472143b81a986a9009d6cf9faed0bc99e59f977d0a9260204252151befe2d3454eac05c584776464d86aae263040f209df5ca8b SHA512 6a3e3bffb0f5352b4d8738f7b18003579664f69e062e2f50e5b8189f06a1161ee651d66e83dcb1b9338751908b4e410cbf9b98fc2e58c18269b66e3c2f2f3e34
 AUX egl-gbm-1.1.0-werror.patch 220 BLAKE2B c93b535d6f17ea35c39b61b8f655a1b9378b18260fcae319f22d94c28ec932557303d97b9e0b435006964ec5cc6a660e9e89b4823000893221dfe07a16efde39 SHA512 0c5eeea9eaaea637200314363da1cf1873a44b939287b27b0156cc05a99c274e311848ce6b69ce39df1fcf1b44deba5ec227d871db87a8785e7d0d27b447a066
 DIST egl-gbm-1.1.0.tar.gz 17165 BLAKE2B c83702635c7621d93968ed6813d3641bcc785b7e6fb0474d1e6edebf46942c799af52d22127865ff9484ef6b398a02cb6081dfc00a6e1ec8ce1882c0c980b116 SHA512 4b7856f496bd045d1ef56881ac793c9e5994bb6cfaa911de51f83bfd4adcf596c204a75cd9f1aef0418289dcef4812ace8cba23b44445e18e004bf6ad2b18421
-EBUILD egl-gbm-1.1.0.ebuild 713 BLAKE2B b680600bfc576b8d7f80aa9fcd1ebd41e4f24418b62b68e2a67a1e5879ab0c7c9e259d5091fe0d31961511424794b05ea3529c97fa77b7adabdf2e92ab76ac5f SHA512 d3e207b3f52bd6ed3cd1ba95cf20afc2c2ac49b2633c4ca7436da4d41fbfd7a5d7ee79584488954c8a507da0897d3d0caf24cde078f137c817133345ad5254a0
+EBUILD egl-gbm-1.1.0.ebuild 724 BLAKE2B 24bb33c4c9c6f286fff10290ade96c400f7bac32f042645fc5dd38f040030393791e02ac253d1484f8854fa3f4762d11b6427380fcb52c5bb49a1f98adf0dcae SHA512 5d441403ea1f2759ef01b8b7ffa5a99081869b9941afce5248aa7fbe6eb375cc9a8d75b1bba6d10225af3e5fb62ed48b896af4001b581925d6712ad17756853b
 MISC metadata.xml 325 BLAKE2B b7fe17481f96e0fabd321b64090bc12c09ee61de8251531a0853c668b799522480f700fd2382e16bf6aa956c3aa6d3dd0ceff76a27355994b7517cbce7d25094 SHA512 8a3bdde2a17fcec7bbc55af10d33774e4fa648a88949b06ea9f5c7c8c83b2a05c67a3a8cdfcff44eac757639184b790b17b55a574d449cd0a5186b7a5414e5df
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
index 4d1b664b6bb7..78535326e897 100644
--- a/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
+++ b/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NVIDIA/egl-gbm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	>=media-libs/mesa-21.2[gbm(+)]
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index f293da21e724..90bbce5747f6 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -2,6 +2,6 @@ AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be7
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
 DIST egl-wayland-1.1.9_p20211123.tar.gz 58900 BLAKE2B a5a08df06e302b573f1036264495e7b29ec4d3def9be0e9b8037206a42aab5c18d78b79cc3f3ffeede9708916e644f8090fadf34318429cf0040c3623da28ce1 SHA512 8de18c8c0c38ca672688a5197be20534cc90b0fecae9ea2f3d3bc851d5b50d3f148a4ce97b835a9576251c8273ea21f82f2c9694cf2b7bba28fa3b53850c43b2
-EBUILD egl-wayland-1.1.7-r1.ebuild 1132 BLAKE2B 8e4b03714a6ca4b8b46713becd2aa60863712bceff60078ebbef97d1c5ffcbcc7fd7cb6e1d16f44830310b731fc5d068df9debeaf2f26cd1052f4183f5be6a44 SHA512 01dece299473c23b5f0b4f7982a8fd413a327284bce7254f22d5753878f2d10b2fb6a3bdf3d40f565fabb781cba0a24392befae9056d78ef84331b2d60146522
-EBUILD egl-wayland-1.1.9_p20211123.ebuild 1104 BLAKE2B f7e4a668abe218e26b8d8549529e90052b4cfef6a2c2396a2b57a004e6f1222584b4846abbf8211478cb1cf7399c8d2ecad2cd18ccbdf8f796a11ad6f7b9167c SHA512 ef4f7bf93f5c283ee91d64e0cfd34b1fefc7bcb6524f123d723f0d1d6003aa8e4ae6c34128a2cd3ba98addf307ebed2331f9293c921a8581f7c3e7c403440710
+EBUILD egl-wayland-1.1.7-r1.ebuild 1139 BLAKE2B ec726bdb0cacc7653b8c4237383b28579cd3fd306f965e3195722b521a9db49076fd65b01c3568fe5c313a2a8ac135c2cc178d9fa62188418136c254e906d4d6 SHA512 3c39c694076655c0ae38c8eb4571efeb54b28c548deb21fd971bd154cdc92cab07c928137c81c60a0df25b58c7582c6f2eb12c3e840f9eb7450d5a82b9388cb0
+EBUILD egl-wayland-1.1.9_p20211123.ebuild 1111 BLAKE2B b17e574b838d73e58f40ff1620107e781cc2ce8b0378d64be07d76455d0088c27367a14004c79a8fad923eed2b8e7a6945626e65b79c602828cd11a816eb48ec SHA512 63e308b03dce88ae27f5f390c40181ae14bd8e93413a4e7d937f9c7599a8eebac85de4ba4d098aaecd367a59ea113db406f43dbc04def6952457b5090d4e0c21
 MISC metadata.xml 329 BLAKE2B 9763d8fac09a9b4902a2a5d61f0f109659ad580117b52d7f844785e449623480752356d31507d86be1198b56a6e38fa6a6fa20aa2151421f79f3ce94f98865a5 SHA512 ae3d6edba2229abebf7f87b448a3f1eacd592d28f6ff3bf80e50e14d8718f15e5a67ec8496cdf03f86532f9525638c3dab5020ba9f62d2a9a4495a16a617d4d4
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
index 088724525cf1..be21463cf525 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	dev-libs/wayland
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
index 797eb2b76f76..62302305e3f4 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	dev-libs/wayland
diff --git a/gui-libs/eglexternalplatform/Manifest b/gui-libs/eglexternalplatform/Manifest
index bc55f59512e5..59d98e4f31ff 100644
--- a/gui-libs/eglexternalplatform/Manifest
+++ b/gui-libs/eglexternalplatform/Manifest
@@ -1,3 +1,3 @@
 DIST eglexternalplatform-1.1.tar.gz 10372 BLAKE2B f18bd0c5244da34343b3bde8451602b8071972d33139ab4839e7bf68eae6be5fa69a12d5059b4b259bc4eac2e97f46d4d5fa734d48e45b6a6ae69251af86cdf0 SHA512 ee72c928abac060e28515807975a371d3792acd119fa9f9da926ae32105e1e528df8d9a3db57ffac0587b115293ede44997606d9da8e20e7f7061a01dd502748
-EBUILD eglexternalplatform-1.1.ebuild 639 BLAKE2B 7d7209b02b84cb2d77a3f5109efd3fd65168a564bb8a70f49211d1b5efadc7aab091e81b453af65951a0f4868c936c215017ebe858b40a24d51110a47a616662 SHA512 63f9eb05dea63671518981a2d07c46598110f8e9501f0a6625518b67fe9b9d18951be094708bfbff8cc97884c914ebd1a5de74ce8f41a621863fee7d07ad5d20
+EBUILD eglexternalplatform-1.1.ebuild 651 BLAKE2B 5ed9a163ab0b26a3d9e3fc9d026f28b5098bc6d263a20dfaecfbf89e891c3acb3565a1f6554cef65cbf7bf5d49caf884a64792a0c1b98497d3be7edae3c89f5d SHA512 68111cd86c316b657f7c3e4b8967911585a4575ab960dec129abc0e5576322a50da089836246e8416282ce3e331b0cb9cc2b8a6e5254fef71113fd804da243ae
 MISC metadata.xml 337 BLAKE2B a2a7dfac350b1030e54a00a0dc2df248682dc3cff62063d5c00fb2b4f886fab8c8d514d82a47428762fc02cdc157cf2675f69d69907d8eecbd8d7cdd27072395 SHA512 11af8546ce5bdfb600f6bbf00de5d2315a345e8038888912a840370b6f8a866c0724eb016d3b1c009333773d0c007b735832a5e19a709a10ab5e1b90fe843a70
diff --git a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
index 5bb7ad87229a..f08b0f1981d0 100644
--- a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
+++ b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/NVIDIA/eglexternalplatform/archive/${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 src_prepare() {
 	default
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 2fe27d95ce8a..61e217370143 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-4.4.1.tar.xz 30031924 BLAKE2B c64d8c015e7cc2a0f21274af70be856bb37ef771af5df8ab8698455c70d25a02d6535a06718307c5c312915b4c3218c4d86f4d799d27e1b8ae4c0e877e218ee8 SHA512 4edf9c5c24a1853713dfabdf9a8853eca4477fdd64b391f55c25d8937bfa7e78fb2e357067dee30aebbc245a099244c637d07965a34a0bff51f090b8f45e3d16
-DIST gtk-4.6.0.tar.xz 22655868 BLAKE2B 197766af8b874cd0598eab1b2289ca329a61990240be55a07be13e25f1d35740ca220d099e1afa57a9c927818f4d2033ab287ea146d52567e696cf5db3f24e88 SHA512 9531d7183c46bd89e213eae6cfd64821536d1f4fe7371a5fef835e31cf2c8b3d5152baebe44633d0a69d3e1ddc34ef1e90123d6e7de9aa3f44d6e70dc83369fa
-EBUILD gtk-4.4.1.ebuild 4844 BLAKE2B 4114da371735c30a035c0cb018b28304a78d022e3ee2a391d48a7d09f42ff4d2f7aa06bb5005fcb9425c9a084953a35d0d9f5e5a46ff7c4c63ebc7844dc71e82 SHA512 ba82f014f584f848d6ce8a3ee952679ab8638860f9d7b8e2a73803bcbcf12222dff2dd019145b0376511afd2525ca430396bbe6efed2459dc333983e102baa81
-EBUILD gtk-4.6.0.ebuild 5324 BLAKE2B 00ffd4e5b2a98d04a8a6052bbdfadacae90825274ba9b5558535f5dff9cdbf0afb78b4951c52b09817cc202ec962f77c13669aa0aee9ec701b4db4fb960adbef SHA512 5a5c16e451d66c9120a3b74c40d04fc503671694689e231a08464be62482e50f92eef42b03c7b7327aa2ccfe78a333587abe5cc865f9d1ad0bd3a12ee7b089f0
+DIST gtk-4.6.1.tar.xz 22882528 BLAKE2B 921f57124af67523e9d820427b1f5a099d8dfe14982630437df9a821b9ba25eb3db6aa494e71aea26cec3dca4d76e958e150c515d128bdda51b1812bd7801c2c SHA512 7184c3a541172bcc712c00c0093426c5ff5cc54ad2de8529cfec17f8185966718b18b46cfb6c3d8067535909eb0275cd57e8887d2be7a2af459d14f5efb4d03b
+EBUILD gtk-4.6.1.ebuild 5319 BLAKE2B 9fe1b72fe22ce3ed8fc674dd1ec43e0ecde84273b7896b0813614fa59cdea5f72d62c76495f6b75500c1a75af37c2e7f5af3d9d6d17cfbd8854aced61667eb14 SHA512 d99383b49855da69ae30947db773467581dfe0b369c6197c7228dd5fe0b973125ca190fe7ec507b42bec4acc01d40496db6d8c289791beeba29340daa02a755e
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.4.1.ebuild b/gui-libs/gtk/gtk-4.4.1.ebuild
deleted file mode 100644
index 4435974a0396..000000000000
--- a/gui-libs/gtk/gtk-4.4.1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson optfeature virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	gtk-doc? ( introspection )
-	test? ( introspection )
-"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.47.0[introspection?]
-	>=media-libs/harfbuzz-2.1.0:=
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.16.91
-		>=dev-libs/wayland-protocols-1.21
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-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
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		dev-util/gi-docgen
-	)
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston[headless] )
-
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)
-"
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Documentation and introspection
-		$(meson_use gtk-doc gtk_doc)
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	if use gtk-doc ; then
-		mkdir "${ED}"/usr/share/doc/${PF}/html || die
-
-		local docdirs=( gdk4 gsk4 gtk4 )
-		use wayland && docdirs+=( gdk4-wayland )
-		use X && docdirs+=( gdk4-x11 )
-
-		local d
-		for d in "${docdirs[@]}"; do
-			mv "${ED}"/usr/share/doc/{${d},${PF}/html/} || die
-		done
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	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
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.6.0.ebuild b/gui-libs/gtk/gtk-4.6.1.ebuild
index bc4022bf2b84..9950bcb1a49b 100644
--- a/gui-libs/gtk/gtk-4.6.0.ebuild
+++ b/gui-libs/gtk/gtk-4.6.1.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	test? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
@@ -39,8 +39,8 @@ COMMON_DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	vulkan? ( media-libs/vulkan-loader:= )
 	wayland? (
-		>=dev-libs/wayland-1.16.91
-		>=dev-libs/wayland-protocols-1.21
+		>=dev-libs/wayland-1.20.0
+		>=dev-libs/wayland-protocols-1.23
 		media-libs/mesa[wayland]
 		>=x11-libs/libxkbcommon-0.2
 	)
diff --git a/gui-libs/gtksourceview/Manifest b/gui-libs/gtksourceview/Manifest
new file mode 100644
index 000000000000..4bcfed6677da
--- /dev/null
+++ b/gui-libs/gtksourceview/Manifest
@@ -0,0 +1,4 @@
+AUX 5-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595
+DIST gtksourceview-5.3.2.tar.xz 1255296 BLAKE2B 03f11cf0dde09266a441f5c6d66381b4eba0f2f0197a156a7e21a7a0d08f5a179cf3d6c42cf01f56c56785986fa18966f02820274b5c010e1f604baefb6cab86 SHA512 b64e0af95aff17bbee814fd7e8738d7e4cba9bc53ceb17243ad5fde01efd39a106377b5ae00ff7fdcf61cfc087d24dd9b222eb7cc48aba8485eb6f96e30c8563
+EBUILD gtksourceview-5.3.2.ebuild 1756 BLAKE2B 918f0dc165e5a13de383fca1b84d1f291b99ae514d027abc0b4109b8efa148cdc4a8087c357d1e59a200ce27d5cb549c7ad2813d99a6dfab8ad61bf5fc40bf22 SHA512 4ce27ca592e3f69f037d31afd39032e51ad45c3893f43ef5bf3d39da68bb3fed8a0e67ae1ff5cfca24864bf3b69e6038d1ed7a4d65a47ae06d008195f8884ac2
+MISC metadata.xml 372 BLAKE2B b688307985302494fc956df801d7ab8e4ac52ede6baec476031c31cabc013df8f0846ca3a0d67b613d4f3ba80edf69631f4d15bb43cadba82ecb1468b558651a SHA512 33dbeb75d42b8d42953d1db99e286baa90b0c7a2e6a93e945e2c1e2cb0287445aeef287bc41d44a53fcc243529880c237cf1acedc4962ee5ef5cc1e6424e102c
diff --git a/gui-libs/gtksourceview/files/5-gentoo.lang b/gui-libs/gtksourceview/files/5-gentoo.lang
new file mode 100644
index 000000000000..8d539a8a9f3c
--- /dev/null
+++ b/gui-libs/gtksourceview/files/5-gentoo.lang
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	GtkSourceView syntax highlight for Gentoo-specific files
+
+	Originally written for gtksourceview-1.x by:
+		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
+	Rewritten for gtksourceview-2 by:
+		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
+	
+	Distributed under the same license(s) as gtksourceview.
+
+	TODO:
+	- do not highlight "enable" in the configure options
+	- perhaps highlight portage variables and portage functions different
+
+-->
+
+<language name="gentoo" id="gentoo" version="2.0" _section="Scripts">
+	<metadata>
+		<property name="globs">*.ebuild;*.eclass</property>
+		<property name="line-comment-start">#</property>
+	</metadata>
+
+	<styles>
+		<style id="variable" _name="Portage variables" map-to="def:builtin" />
+		<style id="command" _name="Portage command" map-to="def:type" />
+		<style id="function" _name="Portage function" map-to="def:function" />
+		<style id="string" _name="String" map-to="def:string" />
+	</styles>
+
+	<definitions>
+
+		<!-- rewrite shell string to show highlighted variables -->
+		<context id="string" style-ref="def:string">
+			<start>"</start>
+			<end>"</end>
+			<include>
+				<context ref="def:escape"/>
+				<context ref="def:line-continue"/>
+				<context ref="sh:variable"/>
+			</include>
+		</context>
+
+		<context id="string-2" style-ref="def:string">
+			<start>'</start>
+			<end>'</end>
+			<include>
+				<context ref="def:escape"/>
+				<context ref="def:line-continue"/>
+				<context ref="sh:variable"/>
+			</include>
+		</context>
+
+		<!-- subprograms:
+			- $(..) is not supported currently in the normal sh.lang
+			- `...` is interpreted as string - I think the subshell behavior is more acurate -->
+		<context id="subprogram">
+      		<start>\$\(</start>
+      		<end>\)</end>
+			<include>
+				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+				<context ref="gentoo"/>
+			</include>
+		</context>
+
+		<context id="subprogram-2">
+			<start>`</start>
+      		<end>`</end>
+			<include>
+				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+				<context ref="gentoo"/>
+			</include>
+		</context>
+
+		<!-- portage variables - currently unused -->
+		<context id="portvars" style-ref="variable">
+			<match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match>
+		</context>
+
+		<!-- portage functions - currently unused -->
+		<context id="portfuncs" style-ref="function">
+			<match>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</match>
+		</context>
+
+		<!-- extra portage commands -->
+		<context id="portcmds" style-ref="command">
+			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+		</context>
+		
+		<context id="built-in-command">
+			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
+				<context ref="sh:reserved-word" />
+				<context ref="sh:let-command" />
+				<context ref="portcmds" />
+			</include>
+		</context>
+
+		<!-- gentoo is just a shell with the replacements -->
+		<replace id="sh:built-in-command" ref="built-in-command" />
+		<replace id="sh:backtick-subshell" ref="subprogram-2" />
+		<context id="gentoo">
+			<include>
+				<context ref="subprogram"/>
+				<context ref="sh:sh"/>
+			</include>
+		</context>
+	</definitions>
+</language>
diff --git a/gui-libs/gtksourceview/gtksourceview-5.3.2.ebuild b/gui-libs/gtksourceview/gtksourceview-5.3.2.ebuild
new file mode 100644
index 000000000000..55caf6f4c13a
--- /dev/null
+++ b/gui-libs/gtksourceview/gtksourceview-5.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+
+IUSE="gtk-doc +introspection sysprof +vala"
+REQUIRED_USE="vala? ( introspection ) gtk-doc? ( introspection )"
+
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-libs/glib-2.70:2
+	>=gui-libs/gtk-4.4:4[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	introspection? ( >=dev-libs/gobject-introspection-1.70.0:= )
+	>=dev-libs/fribidi-0.19.7
+	media-libs/fontconfig
+	x11-libs/pango[introspection?]
+	>=dev-libs/libpcre2-10.21:=[-recursion-limit(-)]
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dinstall_tests=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use sysprof)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# Tests fail in test-regex with libpcre2[recursion-limit] - https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/255
+	# Ensured OK via USE dep, as it would mean issues in real usage for syntax highlighting as well
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-5/language-specs
+	newins "${FILESDIR}"/5-gentoo.lang gentoo.lang
+
+	if use gtk-doc ; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/gui-libs/gtksourceview/metadata.xml b/gui-libs/gtksourceview/metadata.xml
new file mode 100644
index 000000000000..12d732e2c1cf
--- /dev/null
+++ b/gui-libs/gtksourceview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 498cc5d5e7ea..b11956dc7234 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,3 +1,5 @@
 DIST libadwaita-1.0.1.tar.xz 1559064 BLAKE2B 126b77cf7e75775a302b460a0912695839cfd69fb418f22290c2d3d03b85c5e7fe5e5d02064e29ae6e395b5c85d20b84b7a12b0af2e3b32f0624e213ed9a849f SHA512 0f5bb34e26f13853eb646190aaac45c5c168d86e4edf39463b850c0969dd5ed02d8fbc4a20758a2ff5b7592c2284a7f1ffb2cea651f793f9a29764066da237bd
-EBUILD libadwaita-1.0.1.ebuild 1426 BLAKE2B 6ea8e128b43152486b71c6986dd63deac9a786b530ac3d69d3545caa95ed058f6b0b5aa2ad333cf75e6ccda4de3cad0c624977e96f487bd7a58ebfb29f056308 SHA512 71bd43f218bb6f226ab87796fd793ba73e8005ed058dfd4bec3c8d2f07ef92fa43884c604e1d05455b7f4056c147189e97a76a19a6d88f8c36e8b7f8ec518d71
+DIST libadwaita-1.0.2.tar.xz 1557688 BLAKE2B 7b357c06e221c02e5a98a3f776c650b4dfe6039206b135897b75058f4c79c1a8f6be46562025b42af481399e82839eb330b38fd909a72695c1641c29fc223cdc SHA512 c11d8f4d25044896bc2c5ac3cc6c3e6597ad894aa9025b4588e4aa26cdb87f58939508e211290baf10839428a56616aacae6ea6b35c9bc9d95f05bdcfb9e1023
+EBUILD libadwaita-1.0.1.ebuild 1453 BLAKE2B db91a232fb42d2ccad9f07d18daf27ee9ceacb32c1e96c3942f89512cd9bd711f394e909286e01d74b35eea074c1e06dfffe73a65d854292d36845ec52200ea6 SHA512 461f5dc5a80846843d9e6586665457b6d3266840c7e0b474b1e0cd9f022ea248b92d537aba2025a8079ce2a3d08c8182662bf811e08b3e4bf61e849056ccc450
+EBUILD libadwaita-1.0.2.ebuild 1459 BLAKE2B b50bb9974dc44553a0d33d154c272407ad57ef3775e3d524b1c667564bcfb51fad9fb21b63b6e9fdf4aa5c974435f1ee8bff83be44c4d3447e38c34d596aae8a SHA512 1cba1098c5bf0d6abb79762ddfa958c8e22852bc4af1786eb3032bc72d67643b4e439697e486becca49f118971ef777f32d64cdbb83b62f34a6f96785c067d23
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/libadwaita/libadwaita-1.0.1.ebuild b/gui-libs/libadwaita/libadwaita-1.0.1.ebuild
index 1ee9df61d7fb..13dde998ce1f 100644
--- a/gui-libs/libadwaita/libadwaita-1.0.1.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.0.1.ebuild
@@ -14,11 +14,11 @@ SLOT="1"
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 DEPEND="
 	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.5.0:4
+	>=gui-libs/gtk-4.5.0:4[introspection?]
 	dev-libs/fribidi
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
diff --git a/gui-libs/libadwaita/libadwaita-1.0.2.ebuild b/gui-libs/libadwaita/libadwaita-1.0.2.ebuild
new file mode 100644
index 000000000000..b70296c62fd8
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.52"
+inherit gnome.org meson python-any-r1 vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME applications"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+IUSE="+introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.5.0:4[introspection?]
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	>=dev-util/meson-0.59.0
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dprofiling=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_use test tests)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test --timeout-multiplier 2
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install libadwaita API docs unconditionally, but this is intentional
+	doins -r "${S}"/doc/libadwaita-1
+}
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index c479f07781d0..255ca2ec209a 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,5 +1,5 @@
 DIST tepl-5.0.1.tar.xz 126068 BLAKE2B 2c3038326660f6326c5030cb944f8cee885b794a481f6d8f1b5d87a8ea7121ded381d28b36246a99b57bbea5fd9e6d2d4f65f9dfc54d8154ee8aabbccd7e3cb5 SHA512 f363d182185976447d235cf1201148e5201cdabd1fa8b88d7a763a965896f87bd222a0161c11e93662afaf4e474bbd0308643d28559aadc27b9d48974f4c458d
 DIST tepl-6.00.0.tar.xz 141908 BLAKE2B 200693a8cf760d18e1c53647abb8156f7e067557b4cefbd05b03c5a3ec83c3c5807ab93e0464178b68fc9f2572c3175fbf9355f4131df1fe7f79b5e2deb3961e SHA512 e36877b9f33943715a50546d82ed61e65fc07b71dca2c85ff350a305767e96eda74dc14f30b2a430e14deacd4ee8d49697fe01df1f5023afab3747e5e9c95e2e
 EBUILD tepl-5.0.1-r1.ebuild 929 BLAKE2B b919d3aefac8169ec2412485a219331d79ed0748f578183e5145755b3b6c038dad19e84780dfa73e0da2eb0a4b923d58fad9e0611630310400d0faa122da1021 SHA512 4a6caadaf99b71899edec65ad36499be8867444f46e63ed037258ba5067c4ba8d9d32411522ed07456cde904d21bd0866631c4e0955602a839630c77ccb02144
-EBUILD tepl-6.00.0-r1.ebuild 929 BLAKE2B 0267095f95ca64105082c2cd8b5bc7beb688523eba0052e59abb81f71126b97d0899300a5d9158bf3b8d33e296941a516e169b7cf975cec188792ae757c6e811 SHA512 a2727be69f84ed7f006749d3edffc0cb0f0c5f549b09a695a8c5f3f7cfec198ec037b7709705aef1657db76c396236bd873c9e618f30c3294d4f29802bb880f4
+EBUILD tepl-6.00.0-r1.ebuild 928 BLAKE2B 666df259f69368bad83aa92e2e6289a1f05254a81a831d7443625a14e511a090909ad2da868b11a18a00913bb95d0a399a221a62bf621d951e856c7f463fc409 SHA512 6800ee436f0971678d9c6b58e63181c82738e47469893a781adb910a68da726b33b9915b033fcea7c35ff0070892bd563c0d4d32eba8bc70bb4358c9b7d59895
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/tepl/tepl-6.00.0-r1.ebuild b/gui-libs/tepl/tepl-6.00.0-r1.ebuild
index a326610d4dd2..f2bc28d63218 100644
--- a/gui-libs/tepl/tepl-6.00.0-r1.ebuild
+++ b/gui-libs/tepl/tepl-6.00.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
 
 LICENSE="LGPL-3+"
 SLOT="6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 080876b4059f..b589644811c8 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,8 +1,12 @@
+AUX 0.15.0-59b9518f.patch 3473 BLAKE2B a90910cb8be97f3c030afb3fcab3613fcff29acdface938165b33801a5e72366b1bdd77210262ba0eb803a489f8947b36d5a875fbf8fe20c9e8dd100b4637f9d SHA512 252ff3eb1ae8ad6d06d52e69f3703dbd98abd3491f2871d2f00f72b05e48ada78ffe8bad84a0e3df5e708d2e5a41cd75b5fca2f99378bf57e5a12439519d6a88
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
 DIST wlroots-0.15.0.tar.gz 565059 BLAKE2B d98529b4548e3b751a505a26af143be585ed42fb9617bc67b4a10747bb494f1359d7bdb75d1730a72396e7c550fe481e858a5ac88621d61671698439e3656920 SHA512 730b1e0cf003dabae23101664c6d1993636bd3a8ecbdb3c165eef415a92811c4d5228f48e0275f75361d8528f118dfb8a2298cfb05dbf6364539224ceedca447
+DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677
 EBUILD wlroots-0.14.0-r2.ebuild 1500 BLAKE2B 766fa524353658f542c648281b05e9871140ee5272f160fbcbc36a28a48246d83494c6bd3e02ebbd16e1527c61139ea00ec00085d68a2a0b87b2b06347b2fa12 SHA512 22fc3dd03ec1c1a719bba7990b264dbb789445ba56afbff0c8e6aec6765b9a0a30ad4a27469f7d5a5ffa95848e861615aaa75a418ad6c771caec5b2179feeb21
 EBUILD wlroots-0.14.1-r1.ebuild 1503 BLAKE2B 12a12358ec5b012bb94a58d2aa20bbff7ddbf3fb34f06c1b6380429cec6fe9952ec53c85ea6607d1b0261a9c00060bdae71a23a40bc4f217c4fb8e0d28ee2853 SHA512 2a555ab4b3dc620394a4a9a975cbad6075757f27c85ee120448e6e0eb28c92ead7bbdd51ef935a104efafe8f5cb2f163f95f8fba6668258d8be996328027402f
 EBUILD wlroots-0.15.0-r1.ebuild 1673 BLAKE2B 2bca9e82c6fc86221ded32517c88bc8bcaf573dcbe92ae47887c763bc62fb53a31d7962e4cdd85dca5a3e5c3845230e24d87218c407cc18f5bada1f19b271c92 SHA512 0d5e34031d57c598913eaa66fdc9e7cac613e2ea7e25adc3f450aa395a2218632b3f84028d3fcfa28213812b9a54ea82767b5a477bec22052c464b970293d109
-EBUILD wlroots-9999.ebuild 1688 BLAKE2B 54d38429e05901724e4a81c398da94cdb147125c5b8ad68efe81a716068022f141b0363d0c6849d40fc5823dbe9cf982db51ba526611f2299175fd146685b2f9 SHA512 fb44f6a7eb908d4504843c07d038c97131f42e969ac52a51036af8cb29d9827ddd73f0b61d8defb952667df4513183ef2de7ad074a3dad80a5e86981731a596a
+EBUILD wlroots-0.15.0-r2.ebuild 1719 BLAKE2B 8ebddc0765cd61eb9ee4bf219e79c3388bba10f75348efe32de09bb13d46f4af5412037367a76336ccf885a106741708d470f25f009a946b692622a19827a2cf SHA512 c0a9ece186c59cc600d55fe8a60b7b1ac5faca3bd55fe6532a9f43452c6955e2f5fb02b7c5b017bed7ee9a52ad0ec7170d79d092b857952375f6ca2a00f1d88b
+EBUILD wlroots-0.15.1.ebuild 1683 BLAKE2B bf1425c40b8760d5bfd33f87e7c629ac4ac3d23e0d102cd64e66a41896b6b5526db2bb712ec8b429b2eba024c70ea1355526d5af39427005ec47476d6cd6c7ea SHA512 17e6bd10ed1aee3f74072afb804fc8b63b168a7a307c9091ecf0c6a6a639cde9a9aa6f12cd83f2439d15cdecb463363d6357fa7e291faec109a4c9f92c361f5d
+EBUILD wlroots-9999.ebuild 1683 BLAKE2B bf1425c40b8760d5bfd33f87e7c629ac4ac3d23e0d102cd64e66a41896b6b5526db2bb712ec8b429b2eba024c70ea1355526d5af39427005ec47476d6cd6c7ea SHA512 17e6bd10ed1aee3f74072afb804fc8b63b168a7a307c9091ecf0c6a6a639cde9a9aa6f12cd83f2439d15cdecb463363d6357fa7e291faec109a4c9f92c361f5d
 MISC metadata.xml 1545 BLAKE2B 561769f8f3911ce04fabf9300f08f264a15c3196009a1334601f3094409eef2c869b622997f5e31d7c7c5d9e05507124d62306e8aa0d635b535b6bbcd7d9e7ba SHA512 4f1ff86f60ec2c723682d0cdc9f4dd696af73c77e68937f53ab11641e8fc443f0a99c8f28ec6b844fe230bb493749e676a243a16bea7096635f68c3ae432f0ae
diff --git a/gui-libs/wlroots/files/0.15.0-59b9518f.patch b/gui-libs/wlroots/files/0.15.0-59b9518f.patch
new file mode 100644
index 000000000000..95ca0becd618
--- /dev/null
+++ b/gui-libs/wlroots/files/0.15.0-59b9518f.patch
@@ -0,0 +1,88 @@
+From 59b9518f072527ac59593e51df7f5d5331a34f0e Mon Sep 17 00:00:00 2001
+From: Thomas Hebb <tommyhebb@gmail.com>
+Date: Wed, 5 Jan 2022 00:16:59 -0800
+Subject: [PATCH] render/gles2: don't constrain shm formats to ones that
+ support reading
+
+commit 44e8451cd93e ("render/gles2: hide shm formats without GL
+support") added the is_gles2_pixel_format_supported() function to
+render/gles2/pixel_format.c, whose stated purpose is to "check whether
+the renderer has the needed GL extensions to read a given pixel format."
+It then used that function to filter the pixel formats returned by
+get_gles2_shm_formats().
+
+The result of this change is that RGB formats are no longer reported for
+GL drivers that don't implement EXT_read_format_bgra, even when those
+formats are supported for rendering (which they have to be for
+wlr_gles2_renderer_create() to succeed). This is a pretty clear
+regression, since wlr_renderer_init_wl_shm() fails when either of
+WL_SHM_FORMAT_ARGB8888 or WL_SHM_FORMAT_XRGB8888 are missing.
+
+To fix the regression, change is_gles2_pixel_format_supported() to
+accept all pixel formats that support rendering, regardless of whether
+we can read them or not, and move the check for EXT_read_format_bgra
+back into gles2_read_pixels(). (There's already a check for this
+extension in gles2_preferred_read_format(), so we're not breaking any
+abstraction that wasn't already broken.)
+
+Tested on the NVIDIA 495.46 proprietary driver, which doesn't support
+EXT_read_format_bgra.
+
+Fixes: 44e8451cd93e ("render/gles2: hide shm formats without GL support")
+---
+ render/gles2/pixel_format.c | 14 ++++++++++----
+ render/gles2/renderer.c     |  6 ++++++
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/render/gles2/pixel_format.c b/render/gles2/pixel_format.c
+index 31bb3908..b155bbbe 100644
+--- a/render/gles2/pixel_format.c
++++ b/render/gles2/pixel_format.c
+@@ -98,6 +98,10 @@ static const struct wlr_gles2_pixel_format formats[] = {
+ 
+ // TODO: more pixel formats
+ 
++/*
++ * Return true if supported for texturing, even if other operations like
++ * reading aren't supported.
++ */
+ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
+ 		const struct wlr_gles2_pixel_format *format) {
+ 	if (format->gl_type == GL_UNSIGNED_INT_2_10_10_10_REV_EXT
+@@ -108,10 +112,12 @@ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
+ 			&& !renderer->exts.OES_texture_half_float_linear) {
+ 		return false;
+ 	}
+-	if (format->gl_format == GL_BGRA_EXT
+-			&& !renderer->exts.EXT_read_format_bgra) {
+-		return false;
+-	}
++	/*
++	 * Note that we don't need to check for GL_EXT_texture_format_BGRA8888
++	 * here, since we've already checked if we have it at renderer creation
++	 * time and bailed out if not. We do the check there because Wayland
++	 * requires all compositors to support SHM buffers in that format.
++	 */
+ 	return true;
+ }
+ 
+diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
+index 527d85bf..67b8ead4 100644
+--- a/render/gles2/renderer.c
++++ b/render/gles2/renderer.c
+@@ -441,6 +441,12 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
+ 		return false;
+ 	}
+ 
++	if (fmt->gl_format == GL_BGRA_EXT && !renderer->exts.EXT_read_format_bgra) {
++		wlr_log(WLR_ERROR,
++			"Cannot read pixels: missing GL_EXT_read_format_bgra extension");
++		return false;
++	}
++
+ 	const struct wlr_pixel_format_info *drm_fmt =
+ 		drm_get_pixel_format_info(fmt->drm_format);
+ 	assert(drm_fmt);
+-- 
+GitLab
+
diff --git a/gui-libs/wlroots/wlroots-0.15.0-r2.ebuild b/gui-libs/wlroots/wlroots-0.15.0-r2.ebuild
new file mode 100644
index 000000000000..9c30f69fea8b
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.15.0-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+	SLOT="0/15"
+fi
+
+LICENSE="MIT"
+IUSE="vulkan x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.20.0
+	>=dev-libs/wayland-protocols-1.24
+	media-libs/mesa[egl(+),gles2,gbm(+)]
+	sys-auth/seatd:=
+	virtual/libudev
+	vulkan? (
+		dev-util/glslang:0=
+		dev-util/vulkan-headers:0=
+		media-libs/vulkan-loader:0=
+	)
+	>=x11-libs/libdrm-2.4.109:0=
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/0.15.0-59b9518f.patch" )
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		"-Dexamples=false"
+		"-Dwerror=false"
+		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-0.15.1.ebuild b/gui-libs/wlroots/wlroots-0.15.1.ebuild
new file mode 100644
index 000000000000..f6a2d61c92a4
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.15.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SLOT="0/$(ver_cut 2)"
+fi
+
+LICENSE="MIT"
+IUSE="vulkan x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.20.0
+	>=dev-libs/wayland-protocols-1.24
+	media-libs/mesa[egl(+),gles2,gbm(+)]
+	sys-auth/seatd:=
+	virtual/libudev
+	vulkan? (
+		dev-util/glslang:0=
+		dev-util/vulkan-headers:0=
+		media-libs/vulkan-loader:0=
+	)
+	>=x11-libs/libdrm-2.4.109:0=
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		"-Dexamples=false"
+		"-Dwerror=false"
+		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 47b97d1e07e4..f6a2d61c92a4 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -13,9 +13,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	SLOT="0/9999"
 else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	SLOT="0/16"
+	SLOT="0/$(ver_cut 2)"
 fi
 
 LICENSE="MIT"