diff --git a/Manifest b/Manifest
index 3c2f69e86094..8f0d441b694d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29656 BLAKE2B ba9029911c5ffc9e68c3ba2ed176ede795a1f087075e0f22164333f121554a8fdf9be136be3417ed780dfcc840bf68f89c6a1870ae54e64b1481d5c31ade6fde SHA512 c6596923e4d2c814cf355ca4f442c36b2d81cfb34668a3218a961b369ac304393361363e759f00f04f1f2003b7a71062a86c41e4a92f4c31ab93cd9d29a5d43f
-TIMESTAMP 2022-01-11T05:39:22Z
+MANIFEST Manifest.files.gz 29638 BLAKE2B c8bf98c15818bc8e98ad5721c4476c7d397a306418172be9ed4c22fe5dada54f13d157164b5564746150e4c0609b0cd655cc520a08ab5427b94cfc4ed7931d1b SHA512 38008e4fbc96206d8e0c49352853780038fe19f654290ae1a822b149ada72e9764d11214cc210ff3d52271a20024428f9e4564614bf937c18f3370dcd9cf06ef
+TIMESTAMP 2022-01-11T07:09:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdGApfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdLSJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFkhAAnSac0cUEQOSqzDdhc5GvS6KqTQNi6Vg6t8lbTspVD/iWB/QfyPgrZRkm
-8CEPDOkZEY4v/imsYk6N0ueun5yWfDZ3GpztOqvZO862rNCK+eZG/Ak88yA57d9P
-LnQd8nT0ZM5UCBmU0iHD3ZNG1sGYKyi1uBUg0ZQleyaP3EeRJ+pQcwSt+Vnz2F2G
-8yxCY4ok/aPo0NcpWKO/dpnywvK4H9jfkCha+jOsogvC6FDv4ITaFJEGDY5WUJvF
-bJC19+Tf7gDz3Ziay2jm+njvVB0EE4+tT7fWTQehoOC8dYwYiUXh3Dacii4GWs5d
-hRdyVwuakUp+cOO3lZKgLtB0t5z/4pzo0D9zYAm5YM6D3HbNVakOSuxUXi90Ld+C
-nQZOlcv/Kqq+heDHdg9844ASOiWOUl+pUdOOi20UpZrIQ1Z/66w53ZVMmOhN6urD
-Erujq0DNgL02J03KxsbMMcpklsVCMj9nLaUw0OcVBB2MBQZHAcr9oSPuc9MbXLcC
-ISlnGeoEhGfqkpVvsXlBFrgSO2T4PrZZNm3dG0lNrQBSf1N9ziGGltCqgwp9Dya/
-x03dGEajZGI+oy72Uxx0EINvUJ7TV8iU0W55GjodFKDk9+Y6vNyV5fV/cUuRjabt
-g05ImMLeKDv+4AWYIrbVQZO+lv9HCeQtk9Z0oaEwwWRHhMtlung=
-=exsT
+klDUuw//XBAXDMA8ag65BVEs1E5h2UsSlj8V1sNiikJ00oN8E7vAqsyhwEoOVMnh
+Ejr7oHZh7U3S2LuZvTk8tPifl47wA84wSTQatRWHBsge3oM/BGKcsyNqvidsKCwL
+tWudm5jRlSkbFlp49MQj8fiM+2mXjFJ8x4C9BC5gtxYautKyDjWVaojtGF+Gg2Bx
+W4am0f6MSmgOGQJpBvTIFuGqZeQURvp0yNuoENGjiJvFCQyadRM1KsrEueNn43cG
+MgzWUHdrmix3SEOTAQOPzr/dSOUCzUISx5qLHpKBV84exfBHby9qhTwq++gUDdW+
+sKHveo5Pse/K9gWykuObxINTjGKJCkth/mH8Sm3E/1+12vfYWGNVCJxhvBwrBZVb
+Th4OmfOhje2cNDhxSLLx2PA/6kHlJVN2kbGniGzEQ8+cXC/f8mqWOUQThNcglUzp
+tLzN7Oly0tM1y3qPjEiyM+9O9xci1GJRyP0WXqpLdna5pDpzJP1Vjew6sa61OuPw
+ZasyS5IPZCpf4+T1YG20UVSJqFdzkTkRIRXHB5Bh/FuokjmfqfO1nmI6j7cIi7he
+/jnNcM+MMEEtk0FjTIhr4H0dr+MFF8EnMjK5KjlZYOuFeG3rQG5n+Vq+Mzkbkrm6
+cRKfYIHTEVC890JD0H4Qyc2GDf+oTdjuuzMcOSba0U9mWKMT9IU=
+=mjas
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5125353e470a..0158a6d6e161 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9a7a138bba28..6be7197a77a0 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 7c073720291a..93ec6a83b212 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -38,18 +38,18 @@ DIST mariadb-10.6.5.tar.gz 85061860 BLAKE2B 668fe327e6a46c66bc0b77339d71279cc8bf
 EBUILD mariadb-10.2.38-r2.ebuild 41778 BLAKE2B 77d309bc1784385c3cdb0ae708b9b90cd9daaf1fabdd8f60b725df068ea79a49e5c84af6e1658225526e3f18f3edde00d63dd784a1a5f8ca49d4ebeeb78933fe SHA512 a2bc372c1c360ad73832ce826dee5a0c8503f705cca5074da2880c17c616ac3821f84fb89d947cf3221a531a45e93b49607cafe859bc82210d5042248ecbd8c4
 EBUILD mariadb-10.2.39-r1.ebuild 41784 BLAKE2B b3597c2c2b4319978241d00e4852d9dbe971d32c9e075761be880847b72fa50d21c2af2755bd30c1c6bf0caf1060d2011a1f5bf3cc7cb9e2abc91738801f6b0c SHA512 713f4069a1b782e366481048eaf5d63b801ad88f6d0b2b260be9c4ee58fd643d6d72cb6dd06668726ac1e99bc18689d900178ee11ef11639a71d1dc9d53fd6ff
 EBUILD mariadb-10.2.40.ebuild 42592 BLAKE2B 43a4239ca6eea4bfc0518abb857e7ffa77e4d1b05a7a6b3939e73547d7009c88adfb5e7bbaf8bcbf0b40d6b2fb34c2bb700e840957c06267053fd825324724ff SHA512 54b49150dde6a02607cf8e0a1189d057235e6067cfdbc45d4ec1c7494ac2bac18010d409e67c56f9125809b1426bd12ebcc75f23ab7ef830bbfdb37b612ab774
-EBUILD mariadb-10.2.41.ebuild 42516 BLAKE2B 4445fba741ea21916ca8b361357b82c74a46af50c06363123fb55d8bbefbba1fb567c02b45983765825201668b0d305764aead8f637cd623ae5545b92eb889fb SHA512 853b8ee279767bcb635b84115eb2e5aa3a649d12007394013c933902df3fe58331354957cdc5930014aa700c915178a3981cb1273371fba153dcd18a2c8ace16
+EBUILD mariadb-10.2.41.ebuild 42515 BLAKE2B 12c8f4928a05f24b26b035d534f56ad448bbc03c363aff95cad830dc6f37312d68c7eab7f1b830f42829bf71c0b8d2edb84c6274fbcb87ed80c6a043f421e906 SHA512 212a1953624ab4c6038ba3e9ad8d56505b54db5af25c93e553c1831d065cac4a1ab11553b137a9da7739ed7daf5473274af5dd7914f28e514591afa3f7f783d9
 EBUILD mariadb-10.3.29-r2.ebuild 41335 BLAKE2B 60449bf1e598d7609b866ca9bbfb82d226daf01f2f70bba17cad02780ec1acc2f82417d44dcd0cccf2ac5f92feae1e42264af1cecd2c2bf0414a1c4d0bbc7cf8 SHA512 34f26dceb1ad04ac26b4d4c059efe61d3674885206ddb568e0a0abf17985a0d449db3b91c89ecc17835863bcd7c8a9ca0a56fcabbc5d8e482e643fa7126d03b5
 EBUILD mariadb-10.3.30-r1.ebuild 41340 BLAKE2B 0fa156292226a79bcb122fbea9c62e03ccfec5f5fefa55d9942d77a136c5ae6f09fd9cbbc9e3a64ad582a44a0739975ae454233d89fdc55e7d295b39c16dd498 SHA512 821bdf1efd994c7de8416fd602675d252f150f7bf0607dcfb7b1b34b63dd4bdb787bf69655736acf9cc979b6b6ddc777d77dbb961ce7185477d528d4e4f13ef8
 EBUILD mariadb-10.3.31.ebuild 42148 BLAKE2B 6bf255bf0b57037a7f4621f986671cbe89b77fd7031af422af76d6955961f132bce09a3b018faf18ffeb194a92c73a7c24622a1921de321ac4a093a488644396 SHA512 fdf1f08c54b2926eb72ce4bc791dbaf2f6244343fd4ed2a9afc5ec114c241a19c672e37b4ec7e03f72354897c86325a1196d63aeb6a91213f90cf5a226474705
-EBUILD mariadb-10.3.32.ebuild 42072 BLAKE2B 958a80142d79a93749ea4ccebe6779597913483a8b0e8b4d7aafa45a5f401a13278f79c8eba8ea0947a8e922ea63099a2b61af98610bf49c442e6ce3b116d59b SHA512 d5585c60080173990851873829354a990816509688451e7dd7a4a9089bfcad93c5cbdb5630220902aada611a557b2baf619af6a215bbe336d82b6a175fb7b5f4
+EBUILD mariadb-10.3.32.ebuild 42071 BLAKE2B ff3c87d0d5f373a915fc590fdef4b1f7fb4142a93148ed0d1878f4a2e12232be7fa6331ad4abca1a85f00904596c457fc357949d7c9a15aecf91c3235a3487f6 SHA512 f129d31b956e64acf16f881af374ff3f402dd94b48b9a6b0b3c18db5ccc2e7b04e885e41d07a9cef6fad279515b8482366d05bbee840ac08dad1a9243ac7931a
 EBUILD mariadb-10.4.19-r2.ebuild 42046 BLAKE2B b6f4beddbd27d517e09677ea35f5d8830be5db1283617404ef8fe92c0cf64dfd637c01b1ee8c0f5a96b2bf830df9eafbf4f819edd6375704a1e661e1a02dbd68 SHA512 185c4f71b319c038c90018f5621a674669261da26bcff1890ac9c5780e2c2e2d9efc388fa78753fc491930f0a54f35f256d187c8ef19030b5c8a478deb390b53
 EBUILD mariadb-10.4.20-r1.ebuild 42052 BLAKE2B d4aa73577cf7e76b59fb2b3317b73236124f2c7b941287c75bbe1e5f7fd337187e7e0e1f04cb4a29e9f58d5046cc3c8788fca6f30471f002e4447c27edaaf38b SHA512 4cdae3c948cfaa9dc28935a7fcb8ba3963ca554568d75c89f579f1ccc17abfd4b1246327f5e60b6e38113bd6cc3d85e99a1c832ea0b79af3bad75f8b93e51977
 EBUILD mariadb-10.4.21.ebuild 42860 BLAKE2B ff39ce3452746c749bb0c09340aebb0ad8487ad6b3b9b2d01b17efe4799087e3d05b1947520151fa0a57a925792c2c7a0f8d2fbae93808115fb2dcd42c0ff641 SHA512 1f076a734e32619184271a4df62ccb8296bd332854ef2a82e8044f5f4f00a2021be9047af45751d1b6ba7a1a8c271d16efbfc189a2a004c5619636fd14f085d2
-EBUILD mariadb-10.4.22.ebuild 42784 BLAKE2B 4e15729f13531eb198154f237bca17fbf986a20b136bf1aad27243492aa18e206420c73c68260c0bdd2861fe103a87f13f9867c1ed958e0c38d9356b5509a90d SHA512 95046c774f51ebf28ac23666c46acd318bde2fa00e96a978bc20299b4ea3c4a37b64721edb113301d8c5df7974ff191e2c4205751cd7741593c48e59974d5a76
+EBUILD mariadb-10.4.22.ebuild 42783 BLAKE2B ca0e5d9fa9e9d635c7049957d359ed693cbd08978e5bdcccbb56eb75a8111cf0fe6a87ab449d99ab747facd48f379b7cca1ab8cbcf11d1056028b49d9eb8c053 SHA512 87cbca7bc43de9d3b4ffd961a7ac621b27e9f0809431b15d91469ed854c05518b5666fd2b345b39cd2ef14b6b13582b358190653d2b6ecdf545947bc4352806a
 EBUILD mariadb-10.5.10-r2.ebuild 41471 BLAKE2B 1f4e6991cd21db2470d24a90dd8c0757c961bb42a9f2ac9a17756398f9ec9d7f543c84ba045f332fb2cedc900bd8f14f8bbd17ee4f68b9ce6867bb5068c917fd SHA512 d720b727d1b56074dffd0928ca2463a19a90a124266127f416fff095f551f0d83449e486c01fd0322fd77c0955f1481c023e2764220057b2d5841440b26d230a
 EBUILD mariadb-10.5.11-r1.ebuild 41476 BLAKE2B 3a73afbfcea1aa38f8d13f1db6f0707a4cb43b9bf407f93cefe433c893f504c88047f4ce7924912c8e6a238f5dd00d5fa6cada2d4214c814254ab27de3782d03 SHA512 0af663e45d2291d129962c96d66243d0a999b02bf573ed0e1d80e5f784df39c9d19575e5a5ecd74d547205fb033eadab3311fb18afc6e9d1a661bc96b9e6955f
 EBUILD mariadb-10.5.12.ebuild 42291 BLAKE2B 1639d616cdf556ef65f227d0caef6ad8fa100d0058cd7afdbccd3e49934cbf583fe02884396ef84fe64065fa616cd767b91a155345980c617d2070853a7db59c SHA512 cfbf194886a021e4e86c182f53de095231ddeb823efafb0274f0903e9aba55a114ecf7a469ac53427ab0529a1b3c921a0a1218f9895df5d4809275f9eafb6750
-EBUILD mariadb-10.5.13.ebuild 42479 BLAKE2B de6c0c85fb4a2ec30ec065f392252070c694613c5b7ddfe4d68ef4fbc685e67c3e9f3f830911c7007226991ad561718c77848896b4c20dbd0a39c9581c1058b3 SHA512 b36b8373b35e2ff902c2ee5051d570dc4ebbcec902664dad339f83a4bc5f49d26a826fa3757e7f4e292616b03ddc72e9cff62a19ddb6cd679f6017dc7b2f965b
+EBUILD mariadb-10.5.13.ebuild 42478 BLAKE2B 808c74342fb3db2c5c2ec40d0b4ca97ec0dea695bdfd31ab1a5e471ed5f15b6e85670940f6392934a50c97a1c85ab710c4dcbf10193396bc672a97ce6ae3a0b3 SHA512 82821b41e39bbebf038b60551ef34158e6ab415cdbe697c0fd4b8b37f79e04882542bd68f993e557bfdf1147d1e7f02f505021cfec9676e2a54176c4640427ee
 EBUILD mariadb-10.6.5-r1.ebuild 42708 BLAKE2B 5bf33b0b4f8d5a40cdb4f1535a82cdd7e6e6c37c89e43bb18b6980ad0e43d28e1f75a2fb0a78dd428712406031ee2bbc7daf6d3e1101a102c3bd9bbfd9e499ef SHA512 42d141f9639c923a049f1156ef5e3fc5f86780643d87c825d08a8bddbe4af55e04d4d26b7cb2687df404922eab5da08d879718b78d7feb024f15f8839486253f
 MISC metadata.xml 2626 BLAKE2B d545d75827f63ac4ff1ab5eafd559b36ef44d0d5059dcdd5cbbb162d42e3a5117ff09c2c2eba82af10bc2f6c53e366f5f0b6a9c744c35d76b8bab12c6e517b64 SHA512 adf783a34647eb8299041d9125ec290377fc17b910e9f1660a33ccacd0a380cc4cd338f55f34e958ddfab1aa6dba85e25033b0dfe8dbc8fed4656ad5df63f6d8
diff --git a/dev-db/mariadb/mariadb-10.2.41.ebuild b/dev-db/mariadb/mariadb-10.2.41.ebuild
index e86dd5747adc..5c6f490e2d78 100644
--- a/dev-db/mariadb/mariadb-10.2.41.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.41.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"
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.32.ebuild b/dev-db/mariadb/mariadb-10.3.32.ebuild
index 27f7a4a5ce18..736adfacd6db 100644
--- a/dev-db/mariadb/mariadb-10.3.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.32.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"
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.22.ebuild b/dev-db/mariadb/mariadb-10.4.22.ebuild
index b11372f1e1d6..98abd822b3a6 100644
--- a/dev-db/mariadb/mariadb-10.4.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.22.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"
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.5.13.ebuild b/dev-db/mariadb/mariadb-10.5.13.ebuild
index 04a827332cce..e6d621b36484 100644
--- a/dev-db/mariadb/mariadb-10.5.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.13.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"
@@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0f392d090139..fc25df9c23b3 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 605377ae0978..038d18834b72 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,5 @@
 DIST pillow-8.4.0.tar.gz 49364586 BLAKE2B f6a0fbafc0869c952bf88ad96146f27cf70c5680f372763bc9989cc49515bc74886a9d7648114797880ca06defc79e2e50d7ecf36bfa7adbd969450615ac0bd1 SHA512 d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
 DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d216280632d58ddaa7848e13a165587b9aca61c98f8b5380e53d6d59a4097320bacf6e016e236239af518ec7780 SHA512 d2fd74dd1b8824d994e3767ef9794175dd2f4adc8173612432a3e171705723ee8757d299a87fb1c010b40919792c1ca76578f41977ee3303ccb6f75165deb791
 EBUILD pillow-8.4.0.ebuild 2630 BLAKE2B 35acb4e2123562d6060a3987ace19eef820440419d6a12e12b45d49b43c97db02874b18161e40eb5fc528142b06564d90ff02c40efc4eaaba18d939bc0684ede SHA512 c92d71605566aed06473690ccfc80b4c7fea02b877e1a8cf287f35b6a263cb5ca28577cddc2a07d8487219a9573e0359eb7f6cd8cf47bedbc303775184f6c8bb
-EBUILD pillow-9.0.0.ebuild 2643 BLAKE2B be583289a7761e94b9480d5d769322abb23205e2ce5c09fd00611923f2ff4d037355f67718814d167c72051365eee87112fd9fc21c4a882cd6488e74677443d2 SHA512 52856dc35de8da8d19d398de4faebf15c8d6d23e54d18e314e8e7fdba1b0078be383af99b1739e53917be46198bd587c222198f81ab5e52d66d56ebc07ed3e1a
+EBUILD pillow-9.0.0.ebuild 2642 BLAKE2B 39ade08a223b2cee7577be64bab2e6baa47719a00f35e0028c7ccc669dda04953177349330345b2f61160248da4286590a03dc019ff39dda44248f3772266547 SHA512 abf6bbdf0eb5651e0e1b48019734103ece569634740e73061876f94ccbf8f1ff8467a31e2cf9835cdd31c73d0cc3b8970f7cb083dc769d8b9779954251255a1b
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.0.ebuild b/dev-python/pillow/pillow-9.0.0.ebuild
index f0d92c027bf2..b85f6bef35ec 100644
--- a/dev-python/pillow/pillow-9.0.0.ebuild
+++ b/dev-python/pillow/pillow-9.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 719139e2fa7f..432e73db11e7 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/jmespath/Manifest b/dev-ruby/jmespath/Manifest
index 62e966249694..052c8b14b477 100644
--- a/dev-ruby/jmespath/Manifest
+++ b/dev-ruby/jmespath/Manifest
@@ -1,3 +1,5 @@
 DIST jmespath-1.4.0.tar.gz 40899 BLAKE2B 45e52f649950b00205af6010084e009a7327600971fdf84e0569498a031e9307876e412a4491fc176724667246fe9f81317a80dd7ff6c44b7e24a135af224e01 SHA512 2b3923a5c853c527ae10ed95da49e3f4888f80ec4eec18fcec2eff16698765e6e875575994ce2fa681977fb5329b122d95cab77fb80ead3548fc26fcbfb33859
+DIST jmespath-1.5.0.tar.gz 40777 BLAKE2B b1143860b5b52835f42293ee1f61e21f1ff392b09707f6c53997f54b3ebe8c4ecc9128ee1336010bf623c2c220a6f25c3ef6796bf66cf1cf076d1fcc3ca22b80 SHA512 823404f2c5530d1888e9d9dfa22edfd42c8171a4c275f1a5965e56914c528ae0a20af8e69d62ec9876de57659f4dc8ac737c2092b1631b499c09c060bff21e36
 EBUILD jmespath-1.4.0.ebuild 698 BLAKE2B f20fd4fc99eea671bd702295b3cbc71ad7955b3f338521c798d03ea142ce83be0fbec45f5b58b2d98c082859aae5f4ed3516a751b07cd68cde40b088ec5f15bd SHA512 b06055a765afc6d04ef8065f723f9a65d3da7cbb9ec8188aac3853570e1900b005519610b22c0ac7d84c11b18bad8b6d09395f166fe9c3a781c23c3c273383ca
+EBUILD jmespath-1.5.0.ebuild 706 BLAKE2B 710ca7ca408e988a2c5c13e71fd60c17f5e01e4b6533b2335acbf9bb458035eb8edee2dd5ed3e7ac6badd8b475a4c9cfe78a29c5b3333fd84ee0786462fa45d6 SHA512 0cf06482c19897c81530d9082338b7ebd020c120e9b3160e59f5f5078336cc43464d9846155143ba85e40db62f707f728cc728fcc018657fdef5740212e49108
 MISC metadata.xml 347 BLAKE2B 7219b16d2eb4568aff52005110e3c7ddc5c5375f64e8abff8a6d95ec52cf3dba44788a5a08ec73214bd3871a26a9944b501eb6fa42860d98cdeeb864f0197c66 SHA512 ffc19d6bba336d9abeb22a069170b684cb585072f14ac035270e3c14199eec963162b3e0d7a5545c10339fbb97347e1ac91900f2f963c151b3a2f00bab43c869
diff --git a/dev-ruby/jmespath/jmespath-1.5.0.ebuild b/dev-ruby/jmespath/jmespath-1.5.0.ebuild
new file mode 100644
index 000000000000..b640b015b668
--- /dev/null
+++ b/dev-ruby/jmespath/jmespath-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_GEMSPEC="jmespath.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements JMESPath for Ruby"
+HOMEPAGE="https://github.com/jmespath/jmespath.rb"
+SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}.rb-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' \
+		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 8124d3e07235..39f1243c01b9 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -2,7 +2,9 @@ AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
 DIST kpeg-1.2.0.gem 57856 BLAKE2B 6397792524e00594c7f64acc79b920781b6dca28d0954fa73de0c9644afc4788969fa2e807cf196807808d93e5520db0e1b1cdd412391a592334c8811f687132 SHA512 97a1e573dcff89f4a8a6832876e4ce737a85fae63ffe6ac8dad001db8ff8237f32d437813252f3487e68a0708c161ee5731b468e5f1b039e59d714b461722e7a
 DIST kpeg-1.3.0.gem 57856 BLAKE2B 783c0f6fad341139dcf8b69adb9bee829a302997917e07cc2beb7dfbabff759e26c31bf1c9b272193919a7a78d9b793db7db85ecde1b5c6ad7c5eeefd95e103e SHA512 a84aa2afd0bb9148dae3cd3c8e1f3104bf4b4997e7c89524ef8b3be1c6fa9dfe7364c931eb9c0e641277590b634b164ab78b8e8e499937fbea65ebb7aa556fd6
+DIST kpeg-1.3.1.gem 57856 BLAKE2B 73f589e0bbd1ebefc3b9068b96476a607214bd32a44920020a57964d705ff45b103bd4846bb2355d8fe30e0c8e585a29dbd2484385b78f87533c152e9ecf496b SHA512 73baedc77d44d671e6e9d074bc4f9053a19aa50fa62f7394206d328c4c102d5a869a4b69b52de16acadafa8c88573bef9593bb4e3278ccf239e7d0850cd63ea9
 EBUILD kpeg-1.1.0-r1.ebuild 727 BLAKE2B 0ffba3628bb74b9477789e47d091d96095903826b35351ef2e27d3c8d203938de758794947a266aab4ed486c48f2dcedb3f3ea4d9bb94d9d1de6ae40f3b083d5 SHA512 fb1f23a55bbbf40438e103b2977a1649bcd24ead55837ce739c758b93873b556ffd17a5c0343a470c72aa192bc6b8c4c11587fca24c5840985caf8d56cf95dcd
 EBUILD kpeg-1.2.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
 EBUILD kpeg-1.3.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
+EBUILD kpeg-1.3.1.ebuild 734 BLAKE2B fa0ce4a82ba3f906b83eb1221050cfd2a2382d63c5d825a8166929ed3f5f963f0ed0ead759837e225f0e5bff4926072cc0baabf3b7c9535f777e8c68190a957d SHA512 0dc340a86f9abd6fa63c65fec553d72be43d90b551ff8d09d9445ed25b609fd4ef269fef45534d6f3e5dcc2e0b275b420cfd431af90c0f39eee5cabc31b4556f
 MISC metadata.xml 339 BLAKE2B 84a27b2b24e20e2ec895782c175d959092397b5936b4c98daabab1ff20a24b7c3b3b951cb14622f8c824629131ba9d84404cf908c31003d17e049ea91868264d SHA512 ba4fc3f1c9f36619d257f5a9fc7fb2c0e47833e81ee5e092dd2649185d7e00ced6f865fce299e97d5e866b78184bd5b7350de1b874079d41b7337b2f4ef5a124
diff --git a/dev-ruby/kpeg/kpeg-1.3.1.ebuild b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
new file mode 100644
index 000000000000..145da7b1303a
--- /dev/null
+++ b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple PEG library for Ruby"
+HOMEPAGE="https://github.com/evanphx/kpeg"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 18122d2900b0..e21125ec5c8b 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 9038801a0214..84400ec6937c 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -2,9 +2,6 @@ AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44f
 AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44f2dc0daf90762a0307c56eb1777e0acd572c6e131e5494c6586c4af2154e0980d25c0f4d4ab3cf4df1747892 SHA512 924313eb0e23b3609b27e3984cc39545122fdecf69d6382d11f18e92962d7a2018a1846404329f21b5880b7baed9491c7506fec998081413fc7c2c4c6c4e6bd1
 AUX icon/thunderbird-bin-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-bin-r1.sh 2674 BLAKE2B 724c45ead31ba09110a30c2e36efef96314654873717c8da9236c12fae33b873bb034ea050ee4bc46e34e3325817f8bfc839be3098828d14fd66a80d82cfe0ba SHA512 aec35b1f7df0d4d94af03e248a68c13867b05eea73bb61bf1bb5a6a50fffa123808ab8635c2c2b627748568c9addb9298cfb22a25919715dea935f0a999fca8d
-AUX thunderbird-bin-wayland.sh 128 BLAKE2B 015511404f636845d7248fd3cec02eb9a4ec70567da442bfa5ca8f2168634347cb478c63161c422facbf47c8d5a6b7358ce7ee9cdbd48c4e555460248287e06e SHA512 9df7306d7046a9f51e60e70572e6e8e22d42e6065900416fd407dce5c083dab3212877ee9dfc7f5af7337996951577e7b7c75e583ab811d6ceaadf6e6c903a7b
-AUX thunderbird-bin-x11.sh 122 BLAKE2B 40fdde93db7c5c27174e22295b946834ebe37763b0499f710e4aa7030941654bdab714c886d4bc4ef4c8623e54819ca2ce6d6786901e8f5ce29213ec59228472 SHA512 907d34b5e67b8806dd3f546f67ab3818dc0fe5d487aa8706046feaf68e23ef69be6e0ead0a31c89c559151854f8837bda93fbeb336bf73d96839656ae649d1d3
-AUX thunderbird-bin.sh 2972 BLAKE2B f9cdb961ae34636c178df29094ef8e42ec29fd5f70d9aa830cfa4113b32c69aa5a47bed083e0923d2315b5b7a0ea72aabb298695b3457968a3338e28bd2c8159 SHA512 ce4afc6834268d3a42deea5da2173548fde02a4ea4a6ff69595f07af41886e7e31e1c8514abac1c52bdedf23e40a9366df83bbe8c2a00d9cb23fd2958dbf9fb0
 DIST thunderbird-91.4.0-af.xpi 560247 BLAKE2B af3a2fc1920244ebd4de83b4f074fbf203ccc59343c74bc7ec2cc3dc3d4e1ca6ac72f821e32be8ec1805dd34ebc20d532791de938ad92a467c7af4e8e1224b7b SHA512 e32b3261ad097a0633fe4a5f36f1d9d8f547f5da737ef84248a439093cc4817d67ee66781552ee63a0cfbb4c6096a155dbd9a348a8033dbc32b2b1ee36cded21
 DIST thunderbird-91.4.0-ar.xpi 660313 BLAKE2B 70411d5ee7732b1be976e91fb3c7244e5c06c111d3f5eb26fee548d5cfd4b66f97eeaa50d67580e58ea0bff08eee5deaafacf6b5ac6a89ce315c5834c6822e31 SHA512 007c9cddb50ef8dbbed6e118b607cd48eb5e93be60953d121adb3d6f0b358d6aed5db9cc17d7236d88f531c93ee84a56be23a98a2b23a5aed58cf8ef58c41fbe
 DIST thunderbird-91.4.0-ast.xpi 577052 BLAKE2B 3b8b5d0f23080dd8fa894af8e20508d1d6eb8d48b7ddaa8f22a58c54b30557e78a8d8d70499c338219c5b3c759aa2e9ff25c6ed2058d00d6dd032a7be5283634 SHA512 2b48118251da81317f3555ce03b1af928a8e6415331b7fdcd64f33ab28f3782f81ad26c21aeebb6a91ae2db37a29329b85b4a2305b794b3c0503487f5bfbf4b0
diff --git a/mail-client/thunderbird-bin/files/thunderbird-bin-wayland.sh b/mail-client/thunderbird-bin/files/thunderbird-bin-wayland.sh
deleted file mode 100644
index c5d58ba1fb70..000000000000
--- a/mail-client/thunderbird-bin/files/thunderbird-bin-wayland.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Thunderbird (bin) under Wayland
-#
-export MOZ_ENABLE_WAYLAND=1
-exec @PREFIX@/bin/thunderbird-bin "$@"
diff --git a/mail-client/thunderbird-bin/files/thunderbird-bin-x11.sh b/mail-client/thunderbird-bin/files/thunderbird-bin-x11.sh
deleted file mode 100644
index 17e29fa05e73..000000000000
--- a/mail-client/thunderbird-bin/files/thunderbird-bin-x11.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Thunderbird (bin) on X11
-#
-export MOZ_DISABLE_WAYLAND=1
-exec @PREFIX@/bin/thunderbird-bin "$@"
diff --git a/mail-client/thunderbird-bin/files/thunderbird-bin.sh b/mail-client/thunderbird-bin/files/thunderbird-bin.sh
deleted file mode 100644
index 1f94e58f0c23..000000000000
--- a/mail-client/thunderbird-bin/files/thunderbird-bin.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-
-##
-## Usage:
-##
-## $ thunderbird-bin
-##
-## This script is meant to run Mozilla Thunderbird (bin) in Gentoo.
-
-cmdname=$(basename "$0")
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case ${MOZ_ARCH} in
-	x86_64|s390x|sparc64)
-		MOZ_LIB_DIR="@PREFIX@/lib64"
-		SECONDARY_LIB_DIR="@PREFIX@/lib"
-		;;
-	*)
-		MOZ_LIB_DIR="@PREFIX@/lib"
-		SECONDARY_LIB_DIR="@PREFIX@/lib64"
-		;;
-esac
-
-MOZ_THUNDERBIRD_FILE="thunderbird-bin"
-MOZILLA_FIVE_HOME="@MOZ_FIVE_HOME@"
-MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_THUNDERBIRD_FILE}"
-APULSELIB_DIR="@APULSELIB_DIR@"
-DESKTOP_FILE="thunderbird-bin"
-
-##
-## Enable Wayland backend?
-##
-if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
-	if [[ -n "$WAYLAND_DISPLAY" ]]; then
-		DESKTOP_FILE="thunderbird-bin-wayland"
-		export MOZ_ENABLE_WAYLAND=1
-	fi
-elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then
-	DESKTOP_FILE="thunderbird-bin-x11"
-fi
-
-##
-## Use D-Bus remote exclusively when there's Wayland display.
-##
-if [[ -n "${WAYLAND_DISPLAY}" ]]; then
-	export MOZ_DBUS_REMOTE=1
-fi
-
-##
-## Make sure that we set the plugin path
-##
-MOZ_PLUGIN_DIR="plugins"
-
-if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-else
-	MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-export MOZ_PLUGIN_PATH
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
-
-##
-## Disable the GNOME crash dialog, Mozilla has its own
-##
-if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then
-	GNOME_DISABLE_CRASH_DIALOG=1
-	export GNOME_DISABLE_CRASH_DIALOG
-fi
-
-##
-## Enable Xinput2 (#617344)
-##
-
-# respect user settings
-MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
-
-if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
-	# enabling XINPUT2 should be safe for all wayland users
-	MOZ_USE_XINPUT2=1
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
-	# XINPUT2 is known to cause problems for KWin users
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
-	# LXQt uses KWin
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
-	# should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
-	MOZ_USE_XINPUT2=1
-fi
-
-[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
-
-# Don't throw "old profile" dialog box.
-export MOZ_ALLOW_DOWNGRADE=1
-
-##
-## Set special variables for -bin
-export LD_LIBRARY_PATH="${APULSELIB_DIR:+${APULSELIB_DIR}:}${MOZILLA_FIVE_HOME}"
-export GTK_PATH="${MOZ_LIB_DIR}/gtk-3.0"
-
-##
-## Route to the correct .desktop file to get proper
-## name and actions
-##
-if [[ $@ != *"--name "* ]]; then
-	set -- --name "${DESKTOP_FILE}" "$@"
-fi
-
-# Run the mail client
-exec ${MOZ_PROGRAM} "$@"
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 6385a26bd89d..4278e926d0cf 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,9 +4,6 @@ AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
 AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
-AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71ffe40b2aa7179d8a5622fe9b837f9430f93371cc83582118682fbb95d8ed5f66b4019924cf9b023e67cb696c SHA512 41a680a7d615bbfceabb49c9753feac5efb1276ad0e709164ee16fb4a0655886da29ac60bf1fc6886e1d4c00b84b3889cb85f42f1ebbc72a52bce80817a4ead0
-AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
-AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-91esr-patches-03.tar.xz 17204 BLAKE2B 6ef1aa70708f9e5a5926f712d449bb40c86d449389a5d4c1730ada065d4af252b08cd17eafaee7cc01ea0c50c53b272c38a047760d3cf94ba34375ff77af534c SHA512 2c02a6ba36934f796a7b2d3ded0b68689ce4b21f21396004e829102bcc56e302c89357d18c4f353c62f45865dccde27230cdb016d99c42b3ae12b4e5a6a02e6d
 DIST thunderbird-91.4.0-af.xpi 560247 BLAKE2B af3a2fc1920244ebd4de83b4f074fbf203ccc59343c74bc7ec2cc3dc3d4e1ca6ac72f821e32be8ec1805dd34ebc20d532791de938ad92a467c7af4e8e1224b7b SHA512 e32b3261ad097a0633fe4a5f36f1d9d8f547f5da737ef84248a439093cc4817d67ee66781552ee63a0cfbb4c6096a155dbd9a348a8033dbc32b2b1ee36cded21
 DIST thunderbird-91.4.0-ar.xpi 660313 BLAKE2B 70411d5ee7732b1be976e91fb3c7244e5c06c111d3f5eb26fee548d5cfd4b66f97eeaa50d67580e58ea0bff08eee5deaafacf6b5ac6a89ce315c5834c6822e31 SHA512 007c9cddb50ef8dbbed6e118b607cd48eb5e93be60953d121adb3d6f0b358d6aed5db9cc17d7236d88f531c93ee84a56be23a98a2b23a5aed58cf8ef58c41fbe
diff --git a/mail-client/thunderbird/files/thunderbird-wayland.sh b/mail-client/thunderbird/files/thunderbird-wayland.sh
deleted file mode 100644
index 2cfdc5e1e53d..000000000000
--- a/mail-client/thunderbird/files/thunderbird-wayland.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Thunderbird under Wayland
-#
-export MOZ_ENABLE_WAYLAND=1
-exec @PREFIX@/bin/thunderbird "$@"
diff --git a/mail-client/thunderbird/files/thunderbird-x11.sh b/mail-client/thunderbird/files/thunderbird-x11.sh
deleted file mode 100644
index 2f4e410c8dcc..000000000000
--- a/mail-client/thunderbird/files/thunderbird-x11.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Thunderbird on X11
-#
-export MOZ_DISABLE_WAYLAND=1
-exec @PREFIX@/bin/thunderbird "$@"
diff --git a/mail-client/thunderbird/files/thunderbird.sh b/mail-client/thunderbird/files/thunderbird.sh
deleted file mode 100644
index 7345cfcdef14..000000000000
--- a/mail-client/thunderbird/files/thunderbird.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-##
-## Usage:
-##
-## $ thunderbird
-##
-## This script is meant to run Mozilla Thunderbird in Gentoo.
-
-cmdname=$(basename "$0")
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case ${MOZ_ARCH} in
-	x86_64|s390x|sparc64)
-		MOZ_LIB_DIR="@PREFIX@/lib64"
-		SECONDARY_LIB_DIR="@PREFIX@/lib"
-		;;
-	*)
-		MOZ_LIB_DIR="@PREFIX@/lib"
-		SECONDARY_LIB_DIR="@PREFIX@/lib64"
-		;;
-esac
-
-MOZ_THUNDERBIRD_FILE="thunderbird"
-
-if [[ ! -r ${MOZ_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} ]]; then
-	if [[ ! -r ${SECONDARY_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} ]]; then
-		echo "Error: ${MOZ_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} not found" >&2
-		if [[ -d $SECONDARY_LIB_DIR ]]; then
-			echo "       ${SECONDARY_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} not found" >&2
-		fi
-		exit 1
-	fi
-	MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
-fi
-MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/thunderbird"
-MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_THUNDERBIRD_FILE}"
-DESKTOP_FILE="thunderbird"
-
-##
-## Enable Wayland backend?
-##
-if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
-	if [[ -n "$WAYLAND_DISPLAY" ]]; then
-		DESKTOP_FILE="thunderbird-wayland"
-		export MOZ_ENABLE_WAYLAND=1
-	fi
-elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then
-	DESKTOP_FILE="thunderbird-x11"
-fi
-
-##
-## Use D-Bus remote exclusively when there's Wayland display.
-##
-if [[ -n "${WAYLAND_DISPLAY}" ]]; then
-	export MOZ_DBUS_REMOTE=1
-fi
-
-##
-## Make sure that we set the plugin path
-##
-MOZ_PLUGIN_DIR="plugins"
-
-if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-else
-	MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-export MOZ_PLUGIN_PATH
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
-
-##
-## Disable the GNOME crash dialog, Mozilla has its own
-##
-if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then
-	GNOME_DISABLE_CRASH_DIALOG=1
-	export GNOME_DISABLE_CRASH_DIALOG
-fi
-
-##
-## Enable Xinput2 (#617344)
-##
-
-# respect user settings
-MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
-
-if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
-	# enabling XINPUT2 should be safe for all wayland users
-	MOZ_USE_XINPUT2=1
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
-	# XINPUT2 is known to cause problems for KWin users
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
-	# LXQt uses KWin
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
-	# should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
-	MOZ_USE_XINPUT2=1
-fi
-
-[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
-
-# Don't throw "old profile" dialog box.
-export MOZ_ALLOW_DOWNGRADE=1
-
-##
-## Route to the correct .desktop file to get proper
-## name and actions
-##
-if [[ $@ != *"--name "* ]]; then
-	set -- --name "${DESKTOP_FILE}" "$@"
-fi
-
-# Run the mail client
-exec ${MOZ_PROGRAM} "$@"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b9b55a01f89a..60295f6b74c5 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 94a2f2c79a34..ff8f8cf37525 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jan 2022 05:39:17 +0000
+Tue, 11 Jan 2022 07:09:17 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6c09e21e8d9e..dabc21d5de83 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2022-01-11T05:39:21Z
+TIMESTAMP 2022-01-11T07:09:21Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdGAlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdLSFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA6cQ//RTHmy/QvCh0f44wDQRtt/MmdYmiS2NPa4UixBHz28suT21J6ILFJFsMa
-e+uS2XoHUzD3Gjc07DJ5MZsac36v0r8nz2xRy9v3CvVrC1uyFYDqPythgy56GxDN
-oT+YJOnivhV0F3xaaC3X7BP6zm6a+HWRnECjGKMsA1Uatdh/KQW+ni3+B9yDhCyu
-IXd9S9KKNXX2X6fg2/R7cXGquAaAM1xVEbT0KIXm1UqRU2G1ty0kXlzTpAaZ6IMA
-dkFa6x4YcVFaS8QJHGouKvPKeaQ7TQksb0NqqjXXmDFM5hfYfvWXstt0sLqrWl34
-DFKOvMVnWzT/dxsCcwCDb85VlnsuDZF5N8s5HxiPYxxHbgLHDga2lySJfgzgEnvn
-aQy0Ob4Tp6bf56KzDk31Z4981mAlgZVYMibUahVpfzLkbYsnQEaKcC18q8ii1IOa
-R0i5YcOk5HBunwCHTc4GBsOPpM7Ewtq/RtKb8RXGUKU0FT4jldEH79k19Me+ofA6
-EeWLjwg7qz0MiLgG+OKIynZgrZl3bYY60KLScIqGlwVtsiMs1r03q/ejAddhymA5
-7R3plZCxlY9dQqSkURrL10fCgsEtF33QA3ZCLXvWpXjdKdikdA3uSYn2hND1zAuh
-OuqkNqMk4eg4qRTRffQgbSOQbszBsEyhxOQN6PlWHkoQj3gFJNc=
-=5lW/
+klBpOg/8DBxvqDs2MaDjTiNfS7T+q6gBnmpGQj+GHw02gtJnqDM778LERdu4rkEe
+BTrqr5Cfu/MBDYpsM7xtOlWmr4Poz86Dd3EZqYdQolhLRgBHbqmAXcNmkqjCe6Kc
+Qlpb+6d428H92EYgI7fP2fP/xmmu5xGdBSIRSO/2AUzjsbHO0g7ru9FYor7wcih+
+H9kRjKueEqnLRhHGK7C9dQ6S/pePeGVPaloO7Dz62rUuSlFiFyWXwQ5rS7y7mUE7
+6G+sbJzs1GhgUVMAWg4mxqM5dcbppOTb9wSiR+jG0iR0eKqqUYnAO9rUWdfXxPC5
+diXyDZis16tG7TpaZlKNlcGAwMNqfjDfzUTSTUIa3wwdRWuEBdZw7FXkUf4/iQQl
+jGJ9M/e5wnjBdZv14UgI1tN8zpzusZt7Sd119keEKbin39ab9IPjomN7z5YXYNj5
+u+NmA8+qlrgA3/AJ/F/rAMTVd2vuMP+MWtBIAymbdu0+flHfsmT5QLMIwwLefrZt
+S98BGzkbRnGrJxjucnu26VQdiO3g/FWWmJsUiEYdndRq/YHPpZ6OOG9Iw/2oHt8i
+oOlq2QA16ygU9C+o0Sk9kDC1Zqi4kvPUm8Ffj1FedtC+W1K+0x8vsp93WK3j3vCx
+9fxiEk7BVFHiLZfKu7G81NklFCF0MZqzWYUYHWsi4NbdERMr1X8=
+=V2LD
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 846413f7b840..ff8f8cf37525 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jan 2022 05:39:18 +0000
+Tue, 11 Jan 2022 07:09:17 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 66fca4bad1a1..f00fc8f3811f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6ce874d3a697..5e71466ad2df 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.41 b/metadata/md5-cache/dev-db/mariadb-10.2.41
index fb91860836eb..43270bc5124e 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.41
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.41
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.2/18
 SRC_URI=mirror://mariadb/mariadb-10.2.41/source/mariadb-10.2.41.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.41-patches-01.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0559ff3de55b09f47e5081e9946087fa
+_md5_=3a71c3d7a4e4105a0cd6451d075d6ea3
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.32 b/metadata/md5-cache/dev-db/mariadb-10.3.32
index dff80cf68ae8..76ccfdc32a93 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.32
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.32
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=mirror://mariadb/mariadb-10.3.32/source/mariadb-10.3.32.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.32-patches-01.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=53bc34a15a720357c1866814d9e5c1ac
+_md5_=834a8bea63ba8f6a81f1faf527957f5e
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.22 b/metadata/md5-cache/dev-db/mariadb-10.4.22
index 3b33ee8ab919..bcfb634c942a 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.22
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.22
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=mirror://mariadb/mariadb-10.4.22/source/mariadb-10.4.22.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.22-patches-01.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=9cd01c529d77636add80a51ad10c0203
+_md5_=9dd1b4006764ab021e2f01c641e72238
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.13 b/metadata/md5-cache/dev-db/mariadb-10.5.13
index 468ba9456298..195bb41674bf 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.13
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.13
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:0= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.5/18
 SRC_URI=mirror://mariadb/mariadb-10.5.13/source/mariadb-10.5.13.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.13-patches-01.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=4f687af879304a6660ddb6bef7e239ef
+_md5_=aa273229db01197100a357916e1cee8d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index cdd7e91c9c09..c1379775028c 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/pillow-9.0.0 b/metadata/md5-cache/dev-python/pillow-9.0.0
index 82a3457ec0f2..f41d07f47dc3 100644
--- a/metadata/md5-cache/dev-python/pillow-9.0.0
+++ b/metadata/md5-cache/dev-python/pillow-9.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=8
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[tk?,threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk?,threads(+)] )
 REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/9.0.0.tar.gz -> pillow-9.0.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=17382083f90c55d1fe412ba042b0de2b
+_md5_=2911c93a43040c171d7303a1cae48db7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6a5d33ff418f..705639e07cb3 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.5.0 b/metadata/md5-cache/dev-ruby/jmespath-1.5.0
new file mode 100644
index 000000000000..a85ed962cf8e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Implements JMESPath for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/jmespath/jmespath.rb
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.5.0.tar.gz -> jmespath-1.5.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f40b34e10ceaf97e123de511739548ca
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.1 b/metadata/md5-cache/dev-ruby/kpeg-1.3.1
new file mode 100644
index 000000000000..8fb459958336
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A simple PEG library for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/evanphx/kpeg
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/kpeg-1.3.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c11366de809d9292bc37e3ff4e1b2f58
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b65e96ae3020..5019f7485122 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15563 BLAKE2B de135e6488ddf981f69c63c25215e6facf104d70eba96049c2ef35d70db344af8a2ecc031fd47d2ade8f7e7131a3ebb547dacc9d95347170ac2b98c3bd550280 SHA512 3b03ad337a567fa9bf851b48bd8ba4f0370167f9223bb3f373724110c6bf3ac60c2ced7a79dc0708b9299b94c92153c55cc42185a0fff58ab1fb7d32efd15e42
-TIMESTAMP 2022-01-11T05:39:21Z
+TIMESTAMP 2022-01-11T07:09:21Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdGAlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdLSFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlexAAod/xrKeguCcZzyum13KgI42lm4OpivSzICAGFoVxCB4Qqe8BBlhNyOjJ
-cg1W/QWfg77jI6s4Izj7wX6Pthc9FVLce/Va+0T8CYomn/1knUaukEvOqwth2UMd
-eQKlJsgRbZYfJcIItRM/JJ2UgnVW6yXXcGh2S1RyKnXcEYmkCVtpsh6PDFYdaCQz
-crXoVJu9AWtJqevMDLdn0rQpGvXwdFS0zayYoUNn5GHAODeI9lfqa6C/IihXMOR3
-A+94pnGX5R16NGx3p+pFV3y8Hu4NU789zaUOJci+4ndUoW5l+iWNUlafDLSJEBlu
-Mv0E8QG78yuiDkK0EXcEKLk4kbdgPdzQi4wA8v6QQMHBb074pe/MkBT7kTD2z4aj
-83mq34KJEak0u111YBQikeT7uZLGDjDm/Dymg981SIwzLx5t9H7ldSZamLTyR3P9
-FhHw/yPEbnvVpiuikcsqcI/BndoFzC+iKzB1TIUJMyfBSoEY4/1pMKJUwERNlChn
-6NH0CUUS0nCAtqOhmhABPibtt/HcsTw87cnM2E1lU1eGFvCz6OYzOdM+DVr6AqbC
-IyvMqN1LMc8TwVrmdmTeAp3E3TEGAJnYPGdfakvmQ4cQhVG0NnpMCvEcPLKDd2/n
-RMM1L3qZ+P8wXHSV9nvXgQx6s7sw0RNGU6T10FU8x+1kVMobm8Y=
-=sHwv
+klBrrQ//X0Q+VRC+dQxL9EjQ4rg7j0zY5Wwo3g9Xm9cJGdf1dIb7o7pSk9bH/bKT
+iUf28iHJk9ESEmnpIWMrsfJGywBKv6CkkdmkEq2ICrUt3syZkO9ym+ttWnljxJwn
+QSKs9Xu2rbl6BtSBXxfnV/xQmMyGvGIfaHm/QyK4BhVPO2RgI3//0EE8pZC3DYXr
+305OnAxKUFnFacSohz3SQaQZk0mKH3LeVtcK5CwA3br2+CNozkTLvFaI/u2k5j4+
+Yr27RckYLt97JJsRjtZiOH7uRtplSC2p7cvDQFVQfVqR7FI68f8fmDEAh36If9a3
+c/7v4Qu9aa0zs94IuNsYEsvVr3tKMQGzjRrDkhdbay104CChb5372qMiQSI4LgWc
+JhBcpg+AEWaeG9BZD/bAIiwSi1luyQw7FM0oSdGFD4s2BsBsa4AFtGNYVqkYSRlp
+7w2vpe27kfFTQVEviD8CPOd+GOQSWs/infJKN8ocVsEhiNbUp7YXzwXTb5PbI6TU
+TD7u9VkaNyfKxPAiAcJ47/EXo/zarAKkkSjrQsKyAyfJE7THxJmyfbeg25lojHde
+EA814T/mLWqL27zpVIvxFky6yx3QaP9OG2+DCCZj81jfzOEh0DtKx4D5gtMzh00p
+BecBH/WJdsFv0/wtgRXfagSa9L/tFYufSjanxGEKYPlBFljA82k=
+=KgFL
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 846413f7b840..ff8f8cf37525 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jan 2022 05:39:18 +0000
+Tue, 11 Jan 2022 07:09:17 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index dfb0a61a5e12..331b5a784678 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jan 11 05:39:17 AM UTC 2022
+Tue Jan 11 07:09:17 AM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 123e811ad483..7229ba9d8d3f 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -5332,20 +5332,20 @@
 2108180139 ./dev-db/mariadb/mariadb-10.2.38-r2.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.2.39-r1.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.2.40.ebuild
-2111181839 ./dev-db/mariadb/mariadb-10.2.41.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.3.29-r2.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.3.30-r1.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.3.31.ebuild
-2111181839 ./dev-db/mariadb/mariadb-10.3.32.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.4.19-r2.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.4.20-r1.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.4.21.ebuild
-2111181839 ./dev-db/mariadb/mariadb-10.4.22.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.5.10-r2.ebuild
 2108180139 ./dev-db/mariadb/mariadb-10.5.11-r1.ebuild
 2109050513 ./dev-db/mariadb/mariadb-10.5.12.ebuild
-2111181839 ./dev-db/mariadb/mariadb-10.5.13.ebuild
 2111232039 ./dev-db/mariadb/mariadb-10.6.5-r1.ebuild
+2201111009 ./dev-db/mariadb/mariadb-10.2.41.ebuild
+2201111009 ./dev-db/mariadb/mariadb-10.3.32.ebuild
+2201111009 ./dev-db/mariadb/mariadb-10.4.22.ebuild
+2201111009 ./dev-db/mariadb/mariadb-10.5.13.ebuild
 2110201010 ./dev-db/mongodb/mongodb-4.2.15-r1.ebuild
 2110201010 ./dev-db/mongodb/mongodb-4.4.8-r1.ebuild
 2108280010 ./dev-db/mongodb/mongodb-5.0.2-r1.ebuild
@@ -12070,7 +12070,7 @@
 2201010439 ./dev-python/pikepdf/pikepdf-4.3.1.ebuild
 2106052109 ./dev-python/pilkit/pilkit-2.0.ebuild
 2112080609 ./dev-python/pillow/pillow-8.4.0.ebuild
-2201102240 ./dev-python/pillow/pillow-9.0.0.ebuild
+2201110909 ./dev-python/pillow/pillow-9.0.0.ebuild
 2201011409 ./dev-python/pip/pip-21.3.1-r1.ebuild
 2111221709 ./dev-python/pipenv/pipenv-2021.11.9.ebuild
 2201090439 ./dev-python/pipenv/pipenv-2021.11.23.ebuild
@@ -14878,6 +14878,7 @@
 2009190909 ./dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
 2102020909 ./dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
 2010010339 ./dev-ruby/jmespath/jmespath-1.4.0.ebuild
+2201110940 ./dev-ruby/jmespath/jmespath-1.5.0.ebuild
 2105110909 ./dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild
 2008161939 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
 2008161939 ./dev-ruby/jsobfu/jsobfu-0.4.2.ebuild
@@ -14892,6 +14893,7 @@
 2107211339 ./dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
 2110210909 ./dev-ruby/kpeg/kpeg-1.2.0.ebuild
 2110310809 ./dev-ruby/kpeg/kpeg-1.3.0.ebuild
+2201110940 ./dev-ruby/kpeg/kpeg-1.3.1.ebuild
 2103170909 ./dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
 2103091209 ./dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild
 2112250310 ./dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
@@ -35349,19 +35351,15 @@
 2201022110 metadata/md5-cache/dev-db/mariadb-10.2.38-r2
 2201022110 metadata/md5-cache/dev-db/mariadb-10.2.39-r1
 2201022110 metadata/md5-cache/dev-db/mariadb-10.2.40
-2201022110 metadata/md5-cache/dev-db/mariadb-10.2.41
 2201022110 metadata/md5-cache/dev-db/mariadb-10.3.29-r2
 2201022110 metadata/md5-cache/dev-db/mariadb-10.3.30-r1
 2201022110 metadata/md5-cache/dev-db/mariadb-10.3.31
-2201022110 metadata/md5-cache/dev-db/mariadb-10.3.32
 2201022110 metadata/md5-cache/dev-db/mariadb-10.4.19-r2
 2201022110 metadata/md5-cache/dev-db/mariadb-10.4.20-r1
 2201022110 metadata/md5-cache/dev-db/mariadb-10.4.21
-2201022110 metadata/md5-cache/dev-db/mariadb-10.4.22
 2201022110 metadata/md5-cache/dev-db/mariadb-10.5.10-r2
 2201022110 metadata/md5-cache/dev-db/mariadb-10.5.11-r1
 2201022110 metadata/md5-cache/dev-db/mariadb-10.5.12
-2201022110 metadata/md5-cache/dev-db/mariadb-10.5.13
 2201022110 metadata/md5-cache/dev-db/mariadb-10.6.5-r1
 2201021453 metadata/md5-cache/dev-db/mariadb-connector-c-3.1.12
 2201021453 metadata/md5-cache/dev-db/mariadb-connector-c-3.1.13
@@ -35507,9 +35505,13 @@
 2201091144 metadata/md5-cache/dev-db/postgresql-14.1
 2201091144 metadata/md5-cache/dev-db/postgresql-9.6.24
 2201091144 metadata/md5-cache/dev-db/postgresql-9999
-2201110810 metadata/md5-cache/dev-db/Manifest.gz
 2201101840 metadata/md5-cache/dev-db/lmdb-0.9.29
 2201110810 metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
+2201111010 metadata/md5-cache/dev-db/Manifest.gz
+2201111010 metadata/md5-cache/dev-db/mariadb-10.2.41
+2201111010 metadata/md5-cache/dev-db/mariadb-10.3.32
+2201111010 metadata/md5-cache/dev-db/mariadb-10.4.22
+2201111010 metadata/md5-cache/dev-db/mariadb-10.5.13
 2106290046 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
@@ -43072,7 +43074,6 @@
 2201101009 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
 2201100939 metadata/md5-cache/dev-python/rdflib-6.1.1
 2201102310 metadata/md5-cache/dev-python/GitPython-3.1.26
-2201110710 metadata/md5-cache/dev-python/Manifest.gz
 2201110010 metadata/md5-cache/dev-python/argon2-cffi-21.2.0
 2201110010 metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0
 2201102310 metadata/md5-cache/dev-python/cfn-lint-0.56.4
@@ -43083,7 +43084,6 @@
 2201110010 metadata/md5-cache/dev-python/furo-2021.10.9
 2201102310 metadata/md5-cache/dev-python/mkdocs-material-8.1.0
 2201102310 metadata/md5-cache/dev-python/natsort-8.0.1
-2201102240 metadata/md5-cache/dev-python/pillow-9.0.0
 2201102310 metadata/md5-cache/dev-python/pycountry-22.1.10
 2201102310 metadata/md5-cache/dev-python/pylama-8.3.7
 2201110540 metadata/md5-cache/dev-python/pyscard-2.0.2
@@ -43099,6 +43099,8 @@
 2201110210 metadata/md5-cache/dev-python/sqlalchemy-1.4.28
 2201101440 metadata/md5-cache/dev-python/wcmatch-8.3
 2201110710 metadata/md5-cache/dev-python/xarray-0.20.2
+2201110909 metadata/md5-cache/dev-python/Manifest.gz
+2201110909 metadata/md5-cache/dev-python/pillow-9.0.0
 2201021453 metadata/md5-cache/dev-qt/qt-creator-4.15.1
 2201021453 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2201021453 metadata/md5-cache/dev-qt/qt-creator-9999
@@ -45603,9 +45605,11 @@
 2201091144 metadata/md5-cache/dev-ruby/rbst-0.6.5
 2201091039 metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
 2201091039 metadata/md5-cache/dev-ruby/ruby-oembed-0.16.0
-2201101040 metadata/md5-cache/dev-ruby/Manifest.gz
 2201101040 metadata/md5-cache/dev-ruby/thor-1.2.1
 2201101040 metadata/md5-cache/dev-ruby/tins-1.31.0
+2201110940 metadata/md5-cache/dev-ruby/Manifest.gz
+2201110940 metadata/md5-cache/dev-ruby/jmespath-1.5.0
+2201110940 metadata/md5-cache/dev-ruby/kpeg-1.3.1
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2106290046 metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
 2106290046 metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
@@ -60072,4 +60076,4 @@
 2201020139 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-release-20220101
 2201061409 metadata/md5-cache/sec-keys/Manifest.gz
 2201061409 metadata/md5-cache/sec-keys/openpgp-keys-kovidgoyal-20220106
-2201110840 metadata/md5-cache/Manifest.gz
+2201111010 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1601ab28cc3b..4b4457d3ef1f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jan 2022 06:00:01 +0000
+Tue, 11 Jan 2022 07:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6bfce5a8b188..6bee9b1c3e15 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d80cfec8a88da6bbfd86841e9c6bf06760ea22f0 1641878095 2022-01-11T05:14:55+00:00
+787e68d0b20ee200d0180df5b62b8b4c0aad0b32 1641884139 2022-01-11T06:55:39+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6caf907f9892..b9575f7e5c87 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1641879302 Tue 11 Jan 2022 05:35:02 AM UTC
+1641885001 Tue 11 Jan 2022 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 846413f7b840..ff8f8cf37525 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jan 2022 05:39:18 +0000
+Tue, 11 Jan 2022 07:09:17 +0000
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 97991344fd68..463f6a7b96e3 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 81454989fdea..f595c2d95d84 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,11 +1,7 @@
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX firefox-bin-r1.sh 2644 BLAKE2B caee879dbaa5f45dbe55c4c4a7b2bcff02a86e41adfebffd8a51a9fd98b3378219dc7a10aafd048e8869d9fbc8b5bb607cd03df1e10a46afdf09eeef64ee2104 SHA512 d79cf2090405486d3508abe120b4f99e769710704ef497a4e9d18ff41a796f4e35afed6a2b861813b249e744c6be48dab8cff4a8e99ea348a042c2401c667304
-AUX firefox-bin-r2.desktop 7954 BLAKE2B 48580dd537cfb1c85a42c711ddb6f0cf2a9a5ac116713080b130763be42b7a9d969a57cbd2517b4c75d6bb19720a3a0dc31cd52aea97b42133159180214346e1 SHA512 b4c12ac9c4741828bb0f3e214c378e6022acdaa0f62d59b8567baa74549d87171e6733f553792879591016040141a229bb060d2fe631a26ddf28114910314343
 AUX firefox-bin-r3.desktop 7933 BLAKE2B a5d1321dee90aec33a1f485d751fc065424eb029369bc744a4e7f61546cf3c894bb147853c6ffbdca49197ba789faf73bda4770c5b8c124feb462e1b5fc8b37e SHA512 38b78752fb84f8f4d3dcb43e2f0e4c6b6a609aa6451b6af17e92c64ca42df47e35d785e45daf456f4e368884811926f0260bb3e7c98a5912231dc4623f47c483
-AUX firefox-bin-wayland.sh 117 BLAKE2B 0b52edd5d4910d14a92d9c4498d1eae41a6b3f91da58582c774d31f60477fcd80ddde139db03b3b4641b02a982337477c46c172079029127d29c0a9a50b1cc2c SHA512 eca0384752925b1f1ce5e5430e91670cef42541b8685d9993c1cc5a1e756adc27265c1ef0b4a21c184f9ec86fe2c242630f092ec326d6dc2fff512c716249f14
-AUX firefox-bin-x11.sh 114 BLAKE2B 3364763147b27192611592afd29ff6954a66b3fa6926f0d0aa85583bcf1055b3eee056782f2b13f12b1d032efce7d9a6da331b196c8cc3f1fbc1501b5eb283b2 SHA512 5f3b0c2ebeed7e28dfb446b8998f9207604313cef8b75ddf4d7c82a5d2ecbf36e675290d8e64cea88673c11716f26d9f6d9cac5ec7264fb5cf8be4b0f702f550
 AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd310f3f82de2b0fe07412d9768f6be2f467e3e315d89f501b1fe2cc319ffa92f072f4fa6cf6e2af4c2d20 SHA512 409ec95a1ee449e2a0a915358fb9c8c3e4bcec8026cb503f1b7dcd815bda9ff5745158ed01cc190c9a0adf5b4e9d644efe5ee3e0232bd8419324c1b6600c863f
-AUX firefox-bin.sh 2930 BLAKE2B cb10a59067ab05342c344c72a6692e44439c6943d91d22f0c6007a27b56d5b163dd54dc9c9858bdf2c0385e367b1811fe966b1613f22bbb48256aa5102016f1d SHA512 6eb5f9ec2a3135b68d41bb7421a074a04146e431f4aed94043d41c493dfa0063bb2cb77884036473be69de97862271aaa5c5ce7556af0e5cf15929777e803a52
 AUX firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
 AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8ea8110d9417ea1f7efd5307568a3e099acf921ec5abad64b36075d716fa5892f4e5600f32bbad9e36a0a1c45 SHA512 5a55cd2ae13ce6ef01646c0a6188a3fd81e1eab0e547b2ba292eb42094aff0f5d5ee383686131bfed845d1e4b34bc1bd11e145e65eb151f0e342a1d49e0c688c
 DIST firefox-91.4.0esr-ach.xpi 451228 BLAKE2B 525aac7e80d504b87a565f045f6ffefb5b8743d9f0606564d6c10dd2ba6ede526d451bd08bdf9ff4abea578f55cbf7dde1c0542ff8ac3640c3c8bda920d146fb SHA512 42be3bdc43b561b2148fcc08be8c4645c6ec15ebc1d689489f922c31234df2a88fa1dd481b7d8122c822b8487e2d1cd4e7a546909000603cc1d056afa83ff5e5
diff --git a/www-client/firefox-bin/files/firefox-bin-r2.desktop b/www-client/firefox-bin/files/firefox-bin-r2.desktop
deleted file mode 100644
index 969315c73f8a..000000000000
--- a/www-client/firefox-bin/files/firefox-bin-r2.desktop
+++ /dev/null
@@ -1,230 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=@NAME@
-GenericName=Web Browser
-Comment=Browse the Web
-Exec=@EXEC@ %u
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=application/pdf;application/vnd.mozilla.xul+xml;application/xhtml+xml;text/html;text/mml;text/xml;x-scheme-handler/ftp;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
-Actions=new-window;new-private-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Name[ach]=Dirica manyen
-Name[af]=Nuwe venster
-Name[an]=Nueva finestra
-Name[ar]=نافذة جديدة
-Name[as]=নতুন উইন্ডো
-Name[ast]=Ventana nueva
-Name[az]=Yeni Pəncərə
-Name[be]=Новае акно
-Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
-Name[br]=Prenestr nevez
-Name[brx]=गोदान उइन्ड'(N)
-Name[bs]=Novi prozor
-Name[ca]=Finestra nova
-Name[cak]=K'ak'a' tzuwäch
-Name[cs]=Nové okno
-Name[cy]=Ffenestr Newydd
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[dsb]=Nowe wokno
-Name[el]=Νέο παράθυρο
-Name[en_GB]=New Window
-Name[en_US]=New Window
-Name[en_ZA]=New Window
-Name[eo]=Nova fenestro
-Name[es_AR]=Nueva ventana
-Name[es_CL]=Nueva ventana
-Name[es_ES]=Nueva ventana
-Name[es_MX]=Nueva ventana
-Name[et]=Uus aken
-Name[eu]=Leiho berria
-Name[fa]=پنجره جدید‌
-Name[ff]=Henorde Hesere
-Name[fi]=Uusi ikkuna
-Name[fr]=Nouvelle fenêtre
-Name[fy_NL]=Nij finster
-Name[ga_IE]=Fuinneog Nua
-Name[gd]=Uinneag ùr
-Name[gl]=Nova xanela
-Name[gn]=Ovetã pyahu
-Name[gu_IN]=નવી વિન્ડો
-Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
-Name[hr]=Novi prozor
-Name[hsb]=Nowe wokno
-Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
-Name[id]=Jendela Baru
-Name[is]=Nýr gluggi
-Name[it]=Nuova finestra
-Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
-Name[ka]=ახალი ფანჯარა
-Name[kk]=Жаңа терезе
-Name[km]=បង្អួច​​​ថ្មី
-Name[kn]=ಹೊಸ ಕಿಟಕಿ
-Name[ko]=새 창
-Name[kok]=नवें जनेल
-Name[ks]=نئئ وِنڈو
-Name[lij]=Neuvo barcon
-Name[lo]=ຫນ້າຕ່າງໃຫມ່
-Name[lt]=Naujas langas
-Name[ltg]=Jauns lūgs
-Name[lv]=Jauns logs
-Name[mai]=नव विंडो
-Name[mk]=Нов прозорец
-Name[ml]=പുതിയ ജാലകം
-Name[mr]=नवीन पटल
-Name[ms]=Tetingkap Baru
-Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
-Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
-Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
-Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
-Name[rm]=Nova fanestra
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sat]=नावा विंडो (N)
-Name[si]=නව කවුළුවක්
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[son]=Zanfun taaga
-Name[sq]=Dritare e Re
-Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
-Name[ta]=புதிய சாளரம்
-Name[te]=కొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni pencere
-Name[tsz]=Eraatarakua jimpani
-Name[uk]=Нове вікно
-Name[ur]=نیا دریچہ
-Name[uz]=Yangi oyna
-Name[vi]=Cửa sổ mới
-Name[wo]=Palanteer bu bees
-Name[xh]=Ifestile entsha
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=@EXEC@ --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Name[ach]=Dirica manyen me mung
-Name[af]=Nuwe privaatvenster
-Name[an]=Nueva finestra privada
-Name[ar]=نافذة خاصة جديدة
-Name[as]=নতুন ব্যক্তিগত উইন্ডো
-Name[ast]=Ventana privada nueva
-Name[az]=Yeni Məxfi Pəncərə
-Name[be]=Новае акно адасаблення
-Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr merdeiñ prevez nevez
-Name[brx]=गोदान प्राइभेट उइन्ड'
-Name[bs]=Novi privatni prozor
-Name[ca]=Finestra privada nova
-Name[cak]=K'ak'a' ichinan tzuwäch
-Name[cs]=Nové anonymní okno
-Name[cy]=Ffenestr Breifat Newydd
-Name[da]=Nyt privat vindue
-Name[de]=Neues privates Fenster
-Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
-Name[en_GB]=New Private Window
-Name[en_US]=New Private Window
-Name[en_ZA]=New Private Window
-Name[eo]=Nova privata fenestro
-Name[es_AR]=Nueva ventana privada
-Name[es_CL]=Nueva ventana privada
-Name[es_ES]=Nueva ventana privada
-Name[es_MX]=Nueva ventana privada
-Name[et]=Uus privaatne aken
-Name[eu]=Leiho pribatu berria
-Name[fa]=پنجره ناشناس جدید
-Name[ff]=Henorde Suturo Hesere
-Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[fy_NL]=Nij priveefinster
-Name[ga_IE]=Fuinneog Nua Phríobháideach
-Name[gd]=Uinneag phrìobhaideach ùr
-Name[gl]=Nova xanela privada
-Name[gn]=Ovetã ñemi pyahu
-Name[gu_IN]=નવી ખાનગી વિન્ડો
-Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
-Name[hr]=Novi privatni prozor
-Name[hsb]=Nowe priwatne wokno
-Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
-Name[id]=Jendela Mode Pribadi Baru
-Name[is]=Nýr huliðsgluggi
-Name[it]=Nuova finestra anonima
-Name[ja]=新しいプライベートウィンドウ
-Name[ja_JP-mac]=新規プライベートウインドウ
-Name[ka]=ახალი პირადი ფანჯარა
-Name[kk]=Жаңа жекелік терезе
-Name[km]=បង្អួច​ឯកជន​ថ្មី
-Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
-Name[ko]=새 사생활 보호 모드
-Name[kok]=नवो खाजगी विंडो
-Name[ks]=نْو پرایوٹ وینڈو&amp;
-Name[lij]=Neuvo barcon privou
-Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
-Name[lt]=Naujas privataus naršymo langas
-Name[ltg]=Jauns privatais lūgs
-Name[lv]=Jauns privātais logs
-Name[mai]=नया निज विंडो (W)
-Name[mk]=Нов приватен прозорец
-Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
-Name[mr]=नवीन वैयक्तिक पटल
-Name[ms]=Tetingkap Persendirian Baharu
-Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
-Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
-Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
-Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
-Name[rm]=Nova fanestra privata
-Name[ro]=Fereastră privată nouă
-Name[ru]=Новое приватное окно
-Name[sat]=नावा निजेराक् विंडो (W )
-Name[si]=නව පුද්ගලික කවුළුව (W)
-Name[sk]=Nové okno v režime Súkromné prehliadanie
-Name[sl]=Novo zasebno okno
-Name[son]=Sutura zanfun taaga
-Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватан прозор
-Name[sv_SE]=Nytt privat fönster
-Name[ta]=புதிய தனிப்பட்ட சாளரம்
-Name[te]=కొత్త ఆంతరంగిక విండో
-Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tr]=Yeni gizli pencere
-Name[tsz]=Juchiiti eraatarakua jimpani
-Name[uk]=Приватне вікно
-Name[ur]=نیا نجی دریچہ
-Name[uz]=Yangi maxfiy oyna
-Name[vi]=Cửa sổ riêng tư mới
-Name[wo]=Panlanteeru biir bu bees
-Name[xh]=Ifestile yangasese entsha
-Name[zh_CN]=新建隐私浏览窗口
-Name[zh_TW]=新增隱私視窗
-Exec=@EXEC@ --private-window %u
diff --git a/www-client/firefox-bin/files/firefox-bin-wayland.sh b/www-client/firefox-bin/files/firefox-bin-wayland.sh
deleted file mode 100644
index 6107d5073858..000000000000
--- a/www-client/firefox-bin/files/firefox-bin-wayland.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Firefox (bin) on Wayland
-#
-export MOZ_ENABLE_WAYLAND=1
-exec @PREFIX@/bin/firefox-bin "$@"
diff --git a/www-client/firefox-bin/files/firefox-bin-x11.sh b/www-client/firefox-bin/files/firefox-bin-x11.sh
deleted file mode 100644
index 915ac2cac193..000000000000
--- a/www-client/firefox-bin/files/firefox-bin-x11.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Firefox (bin) on X11
-#
-export MOZ_DISABLE_WAYLAND=1
-exec @PREFIX@/bin/firefox-bin "$@"
diff --git a/www-client/firefox-bin/files/firefox-bin.sh b/www-client/firefox-bin/files/firefox-bin.sh
deleted file mode 100644
index 38c7ee26a967..000000000000
--- a/www-client/firefox-bin/files/firefox-bin.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-
-##
-## Usage:
-##
-## $ firefox-bin
-##
-## This script is meant to run Mozilla Firefox in Gentoo.
-
-cmdname=$(basename "$0")
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case ${MOZ_ARCH} in
-	x86_64|s390x|sparc64)
-		MOZ_LIB_DIR="@PREFIX@/lib64"
-		SECONDARY_LIB_DIR="@PREFIX@/lib"
-		;;
-	*)
-		MOZ_LIB_DIR="@PREFIX@/lib"
-		SECONDARY_LIB_DIR="@PREFIX@/lib64"
-		;;
-esac
-
-MOZ_FIREFOX_FILE="firefox-bin"
-MOZILLA_FIVE_HOME="@MOZ_FIVE_HOME@"
-MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_FIREFOX_FILE}"
-APULSELIB_DIR="@APULSELIB_DIR@"
-DESKTOP_FILE="firefox-bin"
-
-##
-## Enable Wayland backend?
-##
-if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
-	if [[ -n "$WAYLAND_DISPLAY" ]]; then
-		DESKTOP_FILE="firefox-bin-wayland"
-		export MOZ_ENABLE_WAYLAND=1
-	fi
-elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then
-	DESKTOP_FILE="firefox-bin-x11"
-fi
-
-##
-## Use D-Bus remote exclusively when there's Wayland display.
-##
-if [[ -n "${WAYLAND_DISPLAY}" ]]; then
-	export MOZ_DBUS_REMOTE=1
-fi
-
-##
-## Make sure that we set the plugin path
-##
-MOZ_PLUGIN_DIR="plugins"
-
-if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-else
-	MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-export MOZ_PLUGIN_PATH
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
-
-##
-## Disable the GNOME crash dialog, Mozilla has its own
-##
-if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then
-	GNOME_DISABLE_CRASH_DIALOG=1
-	export GNOME_DISABLE_CRASH_DIALOG
-fi
-
-##
-## Enable Xinput2 (#617344)
-##
-
-# respect user settings
-MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
-
-if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
-	# enabling XINPUT2 should be safe for all wayland users
-	MOZ_USE_XINPUT2=1
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
-	# XINPUT2 is known to cause problems for KWin users
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
-	# LXQt uses KWin
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
-	# should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
-	MOZ_USE_XINPUT2=1
-fi
-
-[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
-
-# Don't throw "old profile" dialog box.
-export MOZ_ALLOW_DOWNGRADE=1
-
-##
-## Set special variables for -bin
-export LD_LIBRARY_PATH="${APULSELIB_DIR:+${APULSELIB_DIR}:}${MOZILLA_FIVE_HOME}"
-export GTK_PATH="${MOZ_LIB_DIR}/gtk-3.0"
-
-##
-## Route to the correct .desktop file to get proper
-## name and actions
-##
-if [[ $@ != *"--name "* ]]; then
-	set -- --name "${DESKTOP_FILE}" "$@"
-fi
-
-# Run the browser
-exec ${MOZ_PROGRAM} "$@"
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 56f6a475795f..29c206afa82d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -2,9 +2,6 @@ AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44f
 AUX distribution.ini 1090 BLAKE2B d1ec76caf937a8d3d0898979c236b8cc39004d2d2c467da16356350fa59938f75f43a2b6830783ea4193cfb896a0d39c0b147527e0459ea5b4e6963b6e1b363a SHA512 6b7221646aeb7c8e08dcb800e54263407ec6cc8529dcc4438d52b36a5bb59431396a561958d405a33d0f455720fc1621adae4a667ec04e612c8b142eb6e80092
 AUX firefox-95-fix-fatal-pip-invocation.patch 466 BLAKE2B 301e23604488087b234d416162a79155e22d185ee10815977daddf68b6d0385aef096fa8e2ba00de4c0d72694495429aefe85388ff3d885996884b50077316a6 SHA512 733829c2809876e3bf886816f00032f9bbca5f1bd0a043e190714250ee15dbeb8cbed0cec0cb7b6d0943b0c32d18269653442c9baa0088f713e6c391544bdc4e
 AUX firefox-r1.sh 2836 BLAKE2B f2a80753f78bcae89f52ca161a0c558c3df5dd40d52f3aecdd1999dced5b025d222399d6603df17116539376f86ecf9cb615c592f7f6953876655609a69c0ac2 SHA512 8f174aa111416ebd2a092bbfd906c1b8e7fc7100da484a5d337c07cedbc761c443efa777df7340526da0f1116291550db08e150de326067b49fd4547db7f7a88
-AUX firefox-wayland.sh 110 BLAKE2B 60875713743e7a65b0c5a7649b8a016dc5005b723640378c4b60ec29f017d7a227cdcddf3b77faa2cae33683b1b8dbf0688968071d9936def4bda4f66ca0aef1 SHA512 58d6b3fb5e9af26ce9c55d0da304eec65a5380ddd58e16dd28cc80ec035a9d1b88bd3815cb74a6999125d1540e77a42182c15e142803b326ddc9c3626e8cb484
-AUX firefox-x11.sh 104 BLAKE2B 8d374235286fac0cfd113f851b0f48e9b23685f6890c6a959e4a071c6c2a58fd274aa7a88c750496420ce6918c06825d2c03cb159638db6567e3d773f3168cf7 SHA512 59cae56b34507f463c4480a7335ea25070beb450e3c93d3adcb782e070cb558544f05c7a784419d48f33cbdca7ed7b2c740c361da8ea081d0323677ffcef79ef
-AUX firefox.sh 3103 BLAKE2B 43066a1aa148d2162f7c6ac422dd6983d7c4504ff09271da2ccd22adab9f834b5343e7970271ca995e2a85c17455988cac0d6235cfab40eff033ac29d33efb08 SHA512 7d443dc42bae690d22437be1cd025d8b21c7d31debdde1995495e6cab8ceb94ab0bcd63513ed5f68fefd2e1991db414c7134bb621f3079772e60e4ac9876903c
 AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8ea8110d9417ea1f7efd5307568a3e099acf921ec5abad64b36075d716fa5892f4e5600f32bbad9e36a0a1c45 SHA512 5a55cd2ae13ce6ef01646c0a6188a3fd81e1eab0e547b2ba292eb42094aff0f5d5ee383686131bfed845d1e4b34bc1bd11e145e65eb151f0e342a1d49e0c688c
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
diff --git a/www-client/firefox/files/firefox-wayland.sh b/www-client/firefox/files/firefox-wayland.sh
deleted file mode 100644
index 44280250fb9d..000000000000
--- a/www-client/firefox/files/firefox-wayland.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Firefox under Wayland
-#
-export MOZ_ENABLE_WAYLAND=1
-exec @PREFIX@/bin/firefox "$@"
diff --git a/www-client/firefox/files/firefox-x11.sh b/www-client/firefox/files/firefox-x11.sh
deleted file mode 100644
index 756556690cf3..000000000000
--- a/www-client/firefox/files/firefox-x11.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#
-# Run Mozilla Firefox on X11
-#
-export MOZ_DISABLE_WAYLAND=1
-exec @PREFIX@/bin/firefox "$@"
diff --git a/www-client/firefox/files/firefox.sh b/www-client/firefox/files/firefox.sh
deleted file mode 100644
index c08d555196d6..000000000000
--- a/www-client/firefox/files/firefox.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-##
-## Usage:
-##
-## $ firefox
-##
-## This script is meant to run Mozilla Firefox in Gentoo.
-
-cmdname=$(basename "$0")
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case ${MOZ_ARCH} in
-	x86_64|s390x|sparc64)
-		MOZ_LIB_DIR="@PREFIX@/lib64"
-		SECONDARY_LIB_DIR="@PREFIX@/lib"
-		;;
-	*)
-		MOZ_LIB_DIR="@PREFIX@/lib"
-		SECONDARY_LIB_DIR="@PREFIX@/lib64"
-		;;
-esac
-
-MOZ_FIREFOX_FILE="firefox"
-
-if [[ ! -r ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then
-	if [[ ! -r ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then
-		echo "Error: ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2
-		if [[ -d $SECONDARY_LIB_DIR ]]; then
-			echo "       ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2
-		fi
-		exit 1
-	fi
-	MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
-fi
-MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/firefox"
-MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_FIREFOX_FILE}"
-DESKTOP_FILE="firefox"
-
-##
-## Enable Wayland backend?
-##
-if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
-	if [[ -n "$WAYLAND_DISPLAY" ]]; then
-		DESKTOP_FILE="firefox-wayland"
-		export MOZ_ENABLE_WAYLAND=1
-	fi
-elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then
-	DESKTOP_FILE="firefox-x11"
-fi
-
-##
-## Use D-Bus remote exclusively when there's Wayland display.
-##
-if [[ -n "${WAYLAND_DISPLAY}" ]]; then
-	export MOZ_DBUS_REMOTE=1
-fi
-
-##
-## Make sure that we set the plugin path
-##
-MOZ_PLUGIN_DIR="plugins"
-
-if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-else
-	MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
-	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-export MOZ_PLUGIN_PATH
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
-
-##
-## Disable the GNOME crash dialog, Moz has it's own
-##
-if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then
-	GNOME_DISABLE_CRASH_DIALOG=1
-	export GNOME_DISABLE_CRASH_DIALOG
-fi
-
-##
-## Enable Xinput2 (#617344)
-##
-
-# respect user settings
-MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
-
-if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
-	# enabling XINPUT2 should be safe for all wayland users
-	MOZ_USE_XINPUT2=1
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
-	# XINPUT2 is known to cause problems for KWin users
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
-	# LXQt uses KWin
-	MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
-	# should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
-	MOZ_USE_XINPUT2=1
-fi
-
-[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
-
-# Don't throw "old profile" dialog box.
-export MOZ_ALLOW_DOWNGRADE=1
-
-##
-## Route to the correct .desktop file to get proper
-## name and actions
-##
-if [[ $@ != *"--name "* ]]; then
-	set -- --name "${DESKTOP_FILE}" "$@"
-fi
-
-# Run the browser
-exec ${MOZ_PROGRAM} "$@"