gentoo auto-resync : 09:10:2022 - 19:32:30

author: V3n3RiX <venerix@koprulu.sector> 2022-10-09 19:32:31 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-09 19:32:31 +0100
commit: 861ffe012c63c48053fb77b5110cbe900f651dfd (patch)
tree: 3c59644581a43a1bcde4f45d912b96b4dd44f446
parent: 759ce88b1b7c5011b611ddefc6c5ce8513210e46 (diff)
202 files changed, 1440 insertions, 2708 deletions
diff --git a/Manifest b/Manifest
index 428ecdc289fa..5481887f5610 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29611 BLAKE2B 6713d7172446bf02a44120c6a8a507e1ca527aa822750a1edb3e7618b8e0c75498cba4419fa63351dec73a7d8fdc0625a6abd40f28962a32b78d6a3d25219a1b SHA512 9be2e503bbe78530e1f64cac727bbad1f0c216abbc69123b91924307b2ec2c763181d9b11a81ccad7845b236f7ff4fe00f45c96b39dc682546cc7f4d33182b32
-TIMESTAMP 2022-10-09T11:39:42Z
+MANIFEST Manifest.files.gz 29611 BLAKE2B 28acadb8c0638723e8d70c436f877b0cacf9147e0b7181f8be39fe15523889a47896f61ef267f02efefc9fb19926246ce274ae3659f9d6b81eab2d910e844e9f SHA512 1f82876a51d49df204aa24f2042dc751fda67839716279a8c18d07839971df4847f154eabeb89cb431531d5acc564b8cc3109c981653b8ba3fb1e1034f4b6a9c
+TIMESTAMP 2022-10-09T17:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNCsv5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNDB2JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBlSQ//QTdBImbnqHk8TSdW+UgZawEvSMKH6ZwRQwZJXC0a7stvkI+jbYfWV7oe
-ZGIilxkDBHz0i03YiuCSHo1FUk49Kf8iJqrHlxDDijgX6lXIpRwsm4rsJkNLc4Dv
-yJC3gY8Hi0KXCKIiG9yuWEDb1BMCtqNwo/cgxr5YtJvOtcOY2ZIlw3RcfIz0lLA/
-yIoyndtRax4Lk8ZEhNtnN1yye9VGqEcOD/L7kyOjYeNQo6l2EHTdwXahZKU/UojD
-v4ay7RyfJ1NvQZJXloMEBlPXWdWIqidxkHciHPa/frz2PttZvmkTkUIx7SD0mVia
-YYNp8SZ8Wir1EMZ/CsvI5cp/cZNrQI5hAjbNjYDvnhIf8Csqn4n7olpQyJgCZqsZ
-FaTsdQlWBA9LmufBwIsu4xOkca8d5c9YJ0YIU+nzfKv32x8IrjV0J9FRUzt7/bYl
-6k0sRX1Pz0KG93nUNRw5CP/3vr84d8Ti+ApboJpR1LdpZhRxNlmqjVjOLlBC4Rrw
-Xnz8D14zmSozUIgOPY6s1DgvAPVc2jaEOqyR9iN2E3RHkmLOdDeJAbo97hCs4V4O
-e8US6Z+5voIUMGudn1u8Dy2nkkQK6ORAWVt7JXJrdii62ccEgdqqtbrVChWiGlYp
-dIyqmxolaCntKGFqSRHdu/aOs+RTBknPlDdFwL6NuQBkWyl8PYA=
-=PXW5
+klDvAw/5ASSk84p2yq/Z22Lnk45gx1+hLEYbuZ9V9hE4uc+yBfyIcfyRMn/3iQCq
+sZ2XotgmxvTDjHg1KbyUKZw+FMHbBypLJLf3+HCGSjF04vkKJTbSpu4zQv/SiWqt
+5V3K53RTphlqxKju4XpMLp88u7CgilQvN6P3OUqZaLs9UdUrxgoGWMgmCJ/zeldo
+a5ELuMs9feV6BWh8m30QU6eLunMXfudDArn/9JVgMUURL2wHqx1zXzEkNFaxFDrR
+jaK1NXZq3DvrsK6DLLAtkUqTmito7uKzHaTBAjlPh3XVWR+/Cc3xOcnZ3EtfvMDl
+3RQheVr5oP9qsLgej2goja3kDGzTesKHTp+UdvA3M1qwdgMgndYelQxpAVXEiICA
+K4kUyBH8bfcbE6OP//Eh0e712bCrhNrTu+LXVdRkg+fBo3Wrvg7wnsFLtIphFfol
+AGSQ9POnuil5RnKEh/ZLR3uTY4XnQKTWggdkxOon5kLzSuxMqtZtrywMA4JzMZbQ
+O5wvGNwg+pOEOK3EGltA5UkhovD+KhCGkg8+M9kPmSA1gnhxEikhQtchCLIMBUUr
+rD2vI82pq0kcccdNmRKzSHXawnbgWkp0l6JKEQlVnN769yQq+K5xJ9dm6cVnuEkq
+OkWm6qwwFwbtGNEd6aNhev0kycIrXou4F+T6zRxFY/9eU8kWr4s=
+=9js1
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a8662f1cdbd2..a4531ac22784 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 92bb0592ed7c..ad8005623e86 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index 4f93ac37e703..1f7987b2bc12 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914
-EBUILD fcitx-cloudpinyin-0.3.6.ebuild 734 BLAKE2B 09edc3d6d167dfb75602d8924cc8986c67fdf6cacce39aabdac16bf6bac1e8b833919ce628a7c528c93608936675b176a1d3af45e870d2dfc3ceec4a6bdf9ff7 SHA512 cb2bc4611218f4c6e6034d55cd2d273e53cf24c014ef05257cfd4fa23ef920643a5f8917adecfb140d2de362c129a5e8e47200b9b6dabe7510267e0f9e3616b8
+EBUILD fcitx-cloudpinyin-0.3.6.ebuild 741 BLAKE2B b8e457164793686a5e3cec035157034091a465a073b02371d7762ee8ad5296976db459c8fc516230c7514dea25e21f74de960d52dbfadc4c3c1a315085cd648d SHA512 45dc3a66dbe03b074e1b24917c27bbbcf6fbd11d1204eed1238d658a99d42f8ed9ea7b6403b3f257ea4d310e45d0e34bf004561e531bdb58029d98e6abed9c78
 EBUILD fcitx-cloudpinyin-4.9999.ebuild 715 BLAKE2B e5fab1a6ddb4188819efafb20adc30a60da16cef2b77515a4ed4dfc88f50165134f1b418a136016e6c3f24f4983d31c65ad7c34546c2f10d02c483a3bf965973 SHA512 5cd5055005d7caf9c63ab206a3646e96d9def6483698c2e58222fc0a80a0bfd2dc34de4f579255b01c4c4fa85a40119a898ec7500ca7136b6f8315e6d83ecfbb
 MISC metadata.xml 471 BLAKE2B d70e15c8604c2f71e3dd0aab694ab693e1b929653d00b2f20d090a26094c38fc0f0489c4a4c42aa4fb70c04d2ae8ec436cd7611181a352b446b46656d5e22786 SHA512 0f62c961d24973989b3b839aa3ddea03d4de67095bcf43b3d1e2420c4889170e69948f069b6c70cb8114d71d0258172dc86682fc28c89061853ccf4c42d1d522
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 23e8cb103602..4888a98e0b57 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7835ede0f914..d033f670e823 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 3c6fd9a90d22..2a5a849a8bc9 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -4,5 +4,5 @@ DIST joda-time-2.11.0.tar.gz 1055531 BLAKE2B 98b64e0419a1b7379d3467d012a1162afed
 DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3
 EBUILD joda-time-2.10.14.ebuild 2174 BLAKE2B c4809145324538d170986b0e14884554837175f39f27a871ee740cf9b2a881fdc453389e298744f28c8c93bda53da12cd28a28c3d089f1dab064e9a8d98b1afe SHA512 0eff6cd6eb595eb2026f0531d74eb02cd0bfab85bfa1253e65a00d09cdb04a6a7e86b3d0189e101e2a15c0382ac91d67b02d874d5c05dc64770965ad5a2cf3e9
 EBUILD joda-time-2.11.0.ebuild 2652 BLAKE2B 7021a8b46e3c6a935204f9154d0bd131a641257c5cb1a9de54ee048a9cc994600fd17839da7cbc12730938e9df80d74708bc84ecb6600991879b6c2cb486e3b7 SHA512 87f85c66aa3ae560200bc5a3320c86983796989042f145f79c753d2362cfc4c9b9cd545661880bfcd922acd60d9803bdb104cdffd7c5d0058030d5320ed32cad
-EBUILD joda-time-2.11.2.ebuild 2662 BLAKE2B ac39fe3bcf8cde7f8a262bb8caccc9bdfde5d7cc1092ec9096e5e17dc87e0143622381c989381fec98354d3dd7abf64e8170dae3321d79fd19eb7355c7942d9d SHA512 5e347e9a6a0fadb1673631035101f9d14e184642b5cac9d6af1d73bf6f958448ce05d93256851e2a378a052b760b95c70399995374f061e4d1c8846de6b6f42a
+EBUILD joda-time-2.11.2.ebuild 2661 BLAKE2B 52ea79933c1c9f89aacf8959047cbe860a95fa81e9ff55c231412f3157a8cba1158c44748a516247511e3a134aa078d12aa22ab4d76438f4c52b47e736c13afc SHA512 44c81c62a7bc68d5d95bf62e9b29a79ca8a0a6859fb243cd47ea2162bbd792247c47bf374d8c25209b11b6e30fece8d22ed4f405d44c9096cc46622a44a91c59
 MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild
index 127dbb0f8733..a088c3493f7b 100644
--- a/dev-java/joda-time/joda-time-2.11.2.ebuild
+++ b/dev-java/joda-time/joda-time-2.11.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index d09c117d0c90..0ef620dc0c46 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -2,5 +2,5 @@ AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b7
 DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
 DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414
 EBUILD snakeyaml-1.30-r1.ebuild 3101 BLAKE2B 1da7c1e114acd0fa56f9f0c6b9870d08ac7fb582cdf31ffb7e82bee10bc90f441c0945ac002b0419ab18c0052b4c1d2622b0d6ecae380c97c0fc58c82ef26822 SHA512 03d2025bf591ef340493e731bb227eb6d0f7fa7de2d1d5897df2aa949c5bbada51b185f9dbbf8ba502125d6cb1cb253cc38a41c5cf77b82a4ea496c9baf7919f
-EBUILD snakeyaml-1.33.ebuild 2343 BLAKE2B d10b52e154e0864e13c87923060eb6ce4d0f1ababe7bbd708511cc20a5d93409fa0129306e80c5c2564be54b2547e0d9146190020594313004c822f7825bc98e SHA512 270df1d5160f79dc5a3d2367a76ea98911de0c0e3398723b23b7513152da2a18350a711d4ade2cfb032b3c945d6c28df5ba64aee2352de38715fd84d5a0abd4d
+EBUILD snakeyaml-1.33.ebuild 2342 BLAKE2B 4be1373247b151bb7bff6167643dd28dc07d07a6b7b3d5013a1944e6363e5514dbd0fce2abc9f895a5722d40842d66d727326aaf00692fa92ddb140796b77e30 SHA512 15e8e7de03e94995dde4de403a62249a31c3fa39f781482a985257b3844596a28758a35193df166af9402b40d5ede99589db290f756163a421a993f509f35b7a
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/snakeyaml-1.33.ebuild b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
index f9978f4168dc..28d9adecc441 100644
--- a/dev-java/snakeyaml/snakeyaml-1.33.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.33.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3300a6c2e8ce..b6471583c9e3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgrapheme/Manifest b/dev-libs/libgrapheme/Manifest
index dff25190c6bc..b42698605c79 100644
--- a/dev-libs/libgrapheme/Manifest
+++ b/dev-libs/libgrapheme/Manifest
@@ -1,6 +1,8 @@
 AUX libgrapheme-1-make.patch 752 BLAKE2B 82e35485f3f0f0b2f0cc766ec83b82ef528b43a7dc56ec8ff5c8caade9859eb64cbe550c2e3c4be545cb79b4144de84cd1363a1a763dcbb9d3b03d9fc7c56b77 SHA512 89f0584efeb492b45d33750efef0f33abaa26923da3f6b5e96e6174dce0156dbacfc54a996a99db7a2b7af9c9db7dc2e76e325638e8a69a769ed1fa9023eb1e8
 DIST libgrapheme-1.tar.gz 67912 BLAKE2B 62e82018b2a45f7259811fbfbae45741252ffedafa095d8e373d62220fc50141afe359d171b723e007120ac307db540c03cfe6e60ecedf1eea0be5518caa9bcb SHA512 c0f3300d30707266e44ee01f359204720ae1770788cec509b03be914f8581caae144fb72952d111f108ebef21fd96b5ca2cf69463ee569bce4bba8645942ee05
 DIST libgrapheme-2.0.0.tar.gz 844784 BLAKE2B 02e52bbbf69276bf2ed43b7acb0b95d59ba5e435514d62827d2e41f1605ba207ab808864df149527798f51e8ae8025fe7880aac738c66dd35bec0ad042f34d85 SHA512 c5b55a4201958f10cabd2ad228cda8ea35b6fc3260d6018f2c01a82ce265369c2f4ebd36e7e66aabf7458f86791e97754b544acac136c8acd874ea708efe961a
+DIST libgrapheme-2.0.1.tar.gz 845666 BLAKE2B 872617d492e64ac0af2562e2842c0011e47f103551b72f0ed4979c1c486401fac0881614d7205da4db4b375c8cd89c00a02e1063428caea0110d5cd3a92602aa SHA512 bc52d4384332a2e2cb01a2697b21e8a3a9742e8ae95dd6e815b69de0a82fdaa2286c44038688a94812dde09d5479a625b0b5c9f839a69789e40d4b76a2def808
 EBUILD libgrapheme-1.ebuild 733 BLAKE2B e37db1f94ac597ca876c190ab56876668fb0653355fea0ecb02701108d48e20a62a331e840330792c508ba22367ab08241da643c1938da21fecd09366e81fefe SHA512 191b3f8b1828953b16409ceea2f4834366115e8072150d4eb90b7621e85cbceca9d8e49551b295777bccb7f9a51d585491c79ec94a3f1ea5413653cbdf5124f6
 EBUILD libgrapheme-2.0.0.ebuild 886 BLAKE2B 734cb8c041cdcffcd1e3eb680aeffa1c7b98309da7827c2adb1f5980b3f0fc5ea36fafd412907c5e391fb79976c555512ef3103e8a789bf1e19d55c70a8b4978 SHA512 75abcd99437fcd3db8882312c05e270c50e4e13358f4a761f7f4ec68fd586bbdf6e1fd381edc6286e935d5c2c34707f29fa51c98b0c82d842ce970ab0c99e444
+EBUILD libgrapheme-2.0.1.ebuild 886 BLAKE2B 734cb8c041cdcffcd1e3eb680aeffa1c7b98309da7827c2adb1f5980b3f0fc5ea36fafd412907c5e391fb79976c555512ef3103e8a789bf1e19d55c70a8b4978 SHA512 75abcd99437fcd3db8882312c05e270c50e4e13358f4a761f7f4ec68fd586bbdf6e1fd381edc6286e935d5c2c34707f29fa51c98b0c82d842ce970ab0c99e444
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/dev-libs/libgrapheme/libgrapheme-2.0.1.ebuild b/dev-libs/libgrapheme/libgrapheme-2.0.1.ebuild
new file mode 100644
index 000000000000..9cd9b0bf37de
--- /dev/null
+++ b/dev-libs/libgrapheme/libgrapheme-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Unicode string library"
+HOMEPAGE="https://libs.suckless.org/libgrapheme/"
+SRC_URI="https://dl.suckless.org/libgrapheme/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+# upstream suggests keeping the static option, others have requested it too
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	append-cflags ${CPPFLAGS}
+	tc-export CC AR RANLIB
+	tc-export_build_env BUILD_CC
+	sed -Ei '/^(BUILD_|)(CC|AR|RANLIB|CFLAGS|LDFLAGS|LDCONFIG).*=/d' config.mk || die
+}
+
+src_install() {
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		LIBPREFIX="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	emake "${emakeargs[@]}" install
+	einstalldocs
+
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 284879461532..f6cee9e95c6f 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index 80f70f56c444..ac26f8b4d907 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -3,5 +3,5 @@ AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c2
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
 DIST lwt-5.4.2.tar.gz 304541 BLAKE2B d474b20538af382c6f64072da2caa25e285f431c9b161c9796a44d1c84475f72e50d81baccb22ae908f82594c9dcaac6a874f54fe6332de2550128774d1280fc SHA512 9f46fb2e56dc7bd57a12d5ab4dc68719947a1462f336087a95e991d087bb9b5b8dee2592d0f7d35abc507d9a641dd221c44c949c81d00e26c673a067d94ba3f4
 EBUILD lwt-5.3.0-r1.ebuild 809 BLAKE2B 6879d70232201e22c5fb3a378e8f694ae244e010d6d891ef68b595c80766f84f58822dc48d56ea8aab9e43f5113f42a3ff13586ee77809992897c44b9bfb8b58 SHA512 07ebef96795dca668bd2768c57da64d817df39417c45fc0b82ebdda323ddb9ce4988d9d9665ca4964309b63737cdc4824b0e20ba87f823970f341055de755f59
-EBUILD lwt-5.4.2-r1.ebuild 739 BLAKE2B 65d8fca3f8f64717d74a274ff9ebeb5614ec5ac338b9a4a45fabfec056eef103e523117fe85342d39d830fb75dcff4d0b913f79ee72328b30de1ce9d2908dc7a SHA512 7234d64d774f876bc019e88eb34a524c32bc3e59af9be90daecf9e6c6760185cdd33989a5e2174400538ba7fd2b8dad109ccc8a0fcca2c5752392401b68100ec
+EBUILD lwt-5.4.2-r1.ebuild 819 BLAKE2B de3962ccc0a4b6866560f497338e2ec2c77c4704fbdbf9f4776ded06aab0451d7fb8e290dec6d2c8877b1dded8c36befc5afffae5210a464f6219836402b5cdd SHA512 f115e11ada07ddb5015d469585a3f5653aaac207a6e152e7f534c1bb36d39513b0d5cbc5121424b9a0ffe1c7ea381af4228816ce8fe348a4dc95f420022ec6a5
 MISC metadata.xml 414 BLAKE2B 34a1192334c52a4dfe3746119293c05cccc14f6a4b7b5faad4834ad33996a98be8c7854096eebe870a4a0bdc675d796f55788334503423a99632b1625d84b8d9 SHA512 09660f044d6132779e8e63fe6dbca02109317f70af905181b8b344348c72257df804022fedf884c84ddbfe2d60dbcb965e3cc273c30c593f70a083d80c2f92aa
diff --git a/dev-ml/lwt/lwt-5.4.2-r1.ebuild b/dev-ml/lwt/lwt-5.4.2-r1.ebuild
index 416c08864003..37deef97464a 100644
--- a/dev-ml/lwt/lwt-5.4.2-r1.ebuild
+++ b/dev-ml/lwt/lwt-5.4.2-r1.ebuild
@@ -27,6 +27,14 @@ BDEPEND="
 	dev-ml/cppo
 	dev-ml/findlib"
 
+src_prepare() {
+	sed -i \
+		-e "s: seq::" \
+		src/core/dune \
+		die
+	default
+}
+
 src_install() {
 	local i
 	for i in lwt lwt_luv lwt_ppx lwt_react ; do
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 21f752bbbe81..dda134e6e2bc 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 10ef0e76080b..8df63cb0f13a 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,3 @@
 DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
-EBUILD beniget-0.4.1-r1.ebuild 624 BLAKE2B 600a78a57e4420d2c427b3dc9ddbd816cc75d0052ccc87f48b95c0907de502223342dadee15777cf41381dd945e0ad3660e4612ceacf9ddaca9f8d3581db70cd SHA512 1022855f2473948449c86aaa1b0bfa4824e61fe67760496f85b5e553273bc8c9280a419b45b21f8fda2fd2a1a747179e493ed9eab529e53b084ede6e8ab1893b
+EBUILD beniget-0.4.1-r1.ebuild 630 BLAKE2B 245b1fb92af8454547d3fbde0f3a0b48dc7461a2abc088d3807a3cdc4d9c44a612be674e011578b0b180e1e657cb4075cdb928cfcb3b723f90c3fc20152cb82b SHA512 c58e5ec9620499beb9dd9d3198d95f31da1a574d8c1cb68c7ae937e17e8763718d09c70fa6763d390c8284f67f5ed48587eee12807c411eef6af36006eaa6122
 MISC metadata.xml 378 BLAKE2B eb443e862f02368c1521515425eb99835a1b9505ea959705f1fd4e5e02b764ad900dfeb96d849f3110bf154ae3d2bd0e5033e89edc1df0a7e18c085fab77e2c6 SHA512 87c1d109aceda4601ff65cf5f355c36e82a7e5ee7772d77bfac4277620f96644006186278bedffcadd5af75e692b0e22e0e6df76e8303c9218818a54aff06bb9
diff --git a/dev-python/beniget/beniget-0.4.1-r1.ebuild b/dev-python/beniget/beniget-0.4.1-r1.ebuild
index 91647c33dfe8..a5b15a558fab 100644
--- a/dev-python/beniget/beniget-0.4.1-r1.ebuild
+++ b/dev-python/beniget/beniget-0.4.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 7c6ec58dad6b..4f0579a8e274 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,6 +1,6 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
 DIST cairocffi-1.4.0.tar.gz 69851 BLAKE2B 8037d9bc619d2e96e655dc4682bb95a1e920d0b2188963088c1be21f2e157f7e791f3994f0ae7ecd338547baf2a65d03b175398bc1b3c92145ae6ea148420b5a SHA512 7ffdaf365c1251b202e2680a2f689ec6ea04c19eb75df38137624ffeb429ab61c6f54af450aec019b2570a4e91d2d701328109e4e0f5662a3b3b655ab53705ff
-EBUILD cairocffi-1.3.0.ebuild 937 BLAKE2B 1cf24a61eac110115d77194b2d22e6d747f415b066d73faaa8509c7cf941f8bb4a5b2562b10b139c9fa47713e6c844c210ed9d1c6313752ca729f104a9d6d8f5 SHA512 b5d253eafaef2725400374b741a44d243b341cfe0d74fb48724acffefc474f06c06ffc5ebaebbad29d4b2ec100545a67c44c419860ddcf8679113d246744cade
+EBUILD cairocffi-1.3.0.ebuild 931 BLAKE2B 2979d0c07db59eea86e753e79480b1a9550c2502c49435e24c609b20c22a4f84c409541d13f9d78e65ce76677b0cba33bf5b44667f8547dbd833a48459973730 SHA512 c993f3b94bd1481cbc0302bc04e90081870e1639921f4c713eaae4c22905beab8d2a73ed5a433439f2593fac4602021e55232d75d5dc8dbb8cbc1f9bf3474acc
 EBUILD cairocffi-1.4.0.ebuild 937 BLAKE2B c8a8ad84d0cab6ad142512bdde5fa04eb2c4bb59e3e6919f85d92b700446a79af811815416cd1797d8151cfde0ff6a95b3fdbee7dfb675f449d258b17d59e815 SHA512 7d52d7e82a49c3d51b105453e5c3cecef231cc56c1e303d6bd2147df9e6071b3322e6aa6b852515820623e1334c5fb761a28a62a5fe03a72eb0e045236223006
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.3.0.ebuild b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
index 38112b42afde..25e6bbae51af 100644
--- a/dev-python/cairocffi/cairocffi-1.3.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 1640c9110641..3b735f1a41e5 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,3 @@
 DIST dnspython-2.2.1.tar.gz 304861 BLAKE2B e6446b91579c6ec0a7266a354ceb58e2f881b55b7376648770ebc2c6104fd815214497516d305b75802e9211703d47a70d66745d872a43afb72f41e55a617652 SHA512 ec545468f604d6131f07259ca154c4f71d445d12c336ac1da0d2f025d6478ada76320a7235119312fed85da071ef309d2531e541d3c2340a50deaf3f4dd7b4eb
-EBUILD dnspython-2.2.1-r1.ebuild 1080 BLAKE2B a1c2b5e618584b5f82c40c0a449013a2eae24d99d89be5cb7996d579035e6f30aacafafb746879188f1e6d6da63397d1ab25017e910c46102bd61ea4818e9b4c SHA512 761d035b4f9e021b20b0335f6ee9a027db0cfcc7026700d170fc8834ff41ef53587f72decd964745cf8247001d3a900344494b394d1a4dea09517c49e97f1b0a
+EBUILD dnspython-2.2.1-r1.ebuild 1086 BLAKE2B cb990d19c6dff604bee4a23d68b5be923a3118615046fbd6937a2d0c14f3c31bf4411ecefeae248a0be32f307f193718c386339edb4409483d904602e7b5deea SHA512 3b3afa714f6ea90c7a094d785249054b680407c6e4c7987fb4fab6bf2e1b670c1bad13d4ae3c055fb2d06f57e49152fa6c28a1632a6941c1be8c2b48f98f9e8e
 MISC metadata.xml 1651 BLAKE2B ea1ce5f9d27de56010f40b2187ac0b5876c27f41163e966689cb8958304c466011ebea0e5979c73b2ce14e6ed406833d01251982e43af945f868ab57dfdc848f SHA512 3d66dff8a832f935110f27e0f397457940de38a09e158bafa275872f96f1c6c5bb7fd1fd558610a8db64e2a7b9fb91cc6c744d3a7dc2eab3a19b85d526c2975a
diff --git a/dev-python/dnspython/dnspython-2.2.1-r1.ebuild b/dev-python/dnspython/dnspython-2.2.1-r1.ebuild
index 19f3117844e8..990f0ef18bcc 100644
--- a/dev-python/dnspython/dnspython-2.2.1-r1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="dnssec examples"
 
 RDEPEND="
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 186b201873c1..59dd017ea45e 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,3 @@
 DIST gast-0.5.3.tar.gz 23455 BLAKE2B b7263e959178421a7ba1cdb41cb09edbe1c30680573e1ab3b4de114e0bd151d2278be799fcc1a01524bb5ee6f6d6764d9902dd0018e7cbe54ac7a3d1300bbeb1 SHA512 a836be76303591ca7c40596d98a29dbd53f281e277c8c23e3821b2003d4e8aaf4d806e7f532f27c0eadd4bdca5a28dc0a3902245505ab97497b9afbfee0c2e52
-EBUILD gast-0.5.3-r1.ebuild 503 BLAKE2B 748ff0237e02c5a688b90b4b07138c594367fba4b94bc8cc1cfc5cbd7c9fea0af169781067c0904fbc6ab3c6907f09585bb9c2bace4b1895e44cf4d247aa5f44 SHA512 6d4fec224af6dda68dd84ea49b94027c9621a9b00fa6757c97913df3b4ede6a9721a7d502b71ba03b5c3981ecbbbb7041b0083fde92ad8e8c6138b1ac95f28f7
+EBUILD gast-0.5.3-r1.ebuild 509 BLAKE2B 39d0254a384b192a576d46dc9f44426b0690e3c3ae3ecfc4bdcd644be618702efc8dbbf92e8c7b3c49cb4250b6a70530ffecfecf099b721fcb619b6527cbc29e SHA512 b875b22bf68fa8b458bcc1041925eb281a8d322660f5f481abfed6bb1dcf9bf8e08173a4595fccb6cc2893d701f3312ae5bc9420345aaeb6166083a0d60681df
 MISC metadata.xml 677 BLAKE2B 2c536c1a53fd3be71dae57488b28f71af9e27dadf2987ecf3967bd74e30ee688fcd598f995d7e0b1b74694668b92699036a8049c54698e389d71687a06df6587 SHA512 9330e92aebd0ca5ead979f70d86540c5b416b60580d45c6b7f8f02e4753bfab476d9b1a22dd7ba32f1167be5512983d275cfe07f57757c484aeb8619e836e13c
diff --git a/dev-python/gast/gast-0.5.3-r1.ebuild b/dev-python/gast/gast-0.5.3-r1.ebuild
index 49c418354b2a..b785559c68bf 100644
--- a/dev-python/gast/gast-0.5.3-r1.ebuild
+++ b/dev-python/gast/gast-0.5.3-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD PSF-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 905866a9616e..1ff9dbc10fc2 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,6 +1,6 @@
 AUX meson-python-0.7.0-defaults.patch 506 BLAKE2B 404c8d4803f4e6ca5244dc27c84f2c0440999e3fff87febeb12d1d304c7ed9f9358f6b958b5975d171995960bbf7681003180765d2bdb88e694e52c518a8381d SHA512 43b9825b9facdcf72f0b4b80a72aac8544ec1cedb14a79c53dbe37b190af170584acbb0d281d89ddeb199ea5ba720eb0de04c5294a3e7197019c58d7ee14d786
 DIST meson-python-0.10.0.gh.tar.gz 37739 BLAKE2B 028cbb191076b49946576b02d26a84079f412a178d9829bf85d579b8d3624e192e9394ade31524faf972ef4d105b7bf703e750529a7fafcbadf9a52d3c4876c6 SHA512 50d4d0bbf810948b4f218f25815058778b2a3ac8ff811d4d7cc699d1cfbcb75612d28789080b4e5ec3a47be03636389b7bf313366273abb733f77644758747cb
 DIST meson-python-0.9.0.gh.tar.gz 37253 BLAKE2B 29aa875dfc1c275ee4edab48bd2d46c783969fc0ab58f108be1a6443d5519028a2d36f666dc57c45d68ba77334cca2d11a0d4bfb8abb3822b537252c71b77286 SHA512 ae0927876533af65c5b1d8278ff6db3726f0551c160bfedcc602189fcad44c9412faa589738718aac2f10cf9497db8c632d89ccf1fb8519e6e7f4add78d8e52d
-EBUILD meson-python-0.10.0.ebuild 998 BLAKE2B 0ed9aa091c7866d5a2c9993339d7b1a93eb38bdc39e30416d5277d84a59568df269379d183c963250fba4c01eef8e2bc51c8d2b0a2e56f570007b445da63f3a0 SHA512 58d430ffc983e491ebbb5068d7e636a82afa29bedf35f2901aa3e9ae6e7b89fa50184e143ef0c9ff6d97c3d2f6d8f1bde3a0db2a546e0625255202ac6d576db1
+EBUILD meson-python-0.10.0.ebuild 1009 BLAKE2B e971bc66c28bb13e6f9c141288fc0debeff1d1b98831bf7a0512d2f25a39d24bb8c1cef43853ff454c29bf9f449dd3a3224119f5658874945fc47af413a0c493 SHA512 bbd0b368a9ccf07659165c08f792d707ef0b16be79b73ca8d3fdc992b146a421b738c8e32e7929877b41f78a2d7ce665f89f323e09c784ebacf1895489a68484
 EBUILD meson-python-0.9.0.ebuild 988 BLAKE2B 6e2465b93b4de894ced85af09ff9e227c0a466a99551f51ef5c8f8f72475c6c9fe28c4a707c2f3ce8a3a393de2ec3ac80d26d477bab9584a91b533dd13206953 SHA512 9b5affd60de454a84150808d87c13b85ceb778558f5dd4c1a6fe74d37868aaccca355e4d6a4991420bf6444a1afed476791012745a85a4fa2fe5f657c7670b58
 MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/meson-python-0.10.0.ebuild b/dev-python/meson-python/meson-python-0.10.0.ebuild
index 8e619a0187a7..a2a211fdf597 100644
--- a/dev-python/meson-python/meson-python-0.10.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 7fd0b24b2010..a7ef42b34e62 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,6 @@
+AUX pipenv-2022.9.24-inject-site-packages.patch 1155 BLAKE2B 61f296dd1f8168b86f17a55359c75febfc02807dd97c750217b46bd017b7bf73cf6fde0fcd2afa95908bd3e1cd7b50f626459f1a19f47b1c34ecdbea39fcfb7c SHA512 3a26ce6217fbf86eda1bb8266928dffe5fc1a55e4f7b66d0ade5ea31deff9cb68427f424995e4c8d402737e90ca9358a3a00364a4167667fae9a4bd018100ebc
 DIST pipenv-2022.8.5.gh.tar.gz 11841656 BLAKE2B 28869e75c1130285807b067720e696463106ed0ef1f4e685c95277d6e58e1d0371ed7afb1de4955d7a4b21b57b81163ea821e227ef26fc35b39dfc6df8dea873 SHA512 17ea8e99aaa54972baa25e2380e0a19c75f7d6cf5a8c238786f7c7c8269ef25ef316b8087483c9716e97493bcf4fe606eb9af7f082c09dd326547ec3cb4a406e
 DIST pipenv-2022.9.24.gh.tar.gz 11543711 BLAKE2B e875068383c8ca55864bfcb53288ae9a02adc578c09ad7392bf50a7ebe07e2eb5944bc225cfefad2ca8265d8dcbb17af96b34e8c0fd51a709921148207021f2b SHA512 d29a728d914d8c762469fd2d72de7be41050165b4587c3304ebc03235a1946967f78473651e1834e5a69a35395d0cf9087e1515fd746450057774fc22e61e092
 EBUILD pipenv-2022.8.5.ebuild 3230 BLAKE2B dfd93ccc38d554e4f336c88e309ead48db88035c2ba9a66b2a3d352f057e2ca8d111cae2825f64cce322be2d1c443e3f3058b807b067646b001688f9204f3cec SHA512 2f6d4ccf1c31ce0b86d84e1972c971435976f016b0f820f38e1168abef70be0b2f1dfc78148d6432df57bfad959670abe2b68a4f248ebbe3a88c30bacd80f752
-EBUILD pipenv-2022.9.24.ebuild 3065 BLAKE2B 22792aea8a60d9ec8ae9127a737f96c6d7d0ca6f21b97a5ea12b4621da58ea1c65c5e13756646f8a6ecbd3497da81bcd5e3bc09a14357716741aed46e5d92bd0 SHA512 6d406113c7423b06bb007a93f1b657507cc5590d8e71c7dcf897ddd4e6083038050f7e454b99a6fa2826acf4af2fcc43bb0a5d4c6cdf7ff7c2cb14debc8a189c
+EBUILD pipenv-2022.9.24-r1.ebuild 3137 BLAKE2B 5beb68c4ca7aad9d8d8c5f17dc09b7e8078a26357618c5fd7044b0107b77c5adf1983592ddeac79b98224f0cdc5ad3a39123e155a354fe1d57c264681a8b36bb SHA512 500e4bd9b9c5ff6359fd46c99a3c635827bc1ff7e6d0e4de19aa3ca62b4b92d260b9c04a3bb187ac158c1c322b361974ed7a237ddae055a995d08b1debed967c
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch b/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
new file mode 100644
index 000000000000..04cf0ed9e317
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
@@ -0,0 +1,34 @@
+diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py
+index b424ab20..79d52838 100644
+--- a/pipenv/patched/pip/__main__.py
++++ b/pipenv/patched/pip/__main__.py
+@@ -28,6 +28,13 @@ if __name__ == "__main__":
+     )
+     import importlib.util
+     import sys
++
++
++    SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
++
++    # Inject site directory into system path.
++    sys.path.insert(-1, SITE_PACKAGES_ROOT)
++
+     spec = importlib.util.spec_from_file_location(
+         "pipenv", location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py"))
+     pipenv = importlib.util.module_from_spec(spec)
+diff --git a/pipenv/resolver.py b/pipenv/resolver.py
+index 3fea0a1e..a0d9da29 100644
+--- a/pipenv/resolver.py
++++ b/pipenv/resolver.py
+@@ -6,6 +6,11 @@ import sys
+ 
+ os.environ["PIP_PYTHON_PATH"] = str(sys.executable)
+ 
++SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(__file__))
++
++# Inject site directory into system path.
++sys.path.insert(-1, SITE_PACKAGES_ROOT)
++
+ 
+ def _ensure_modules():
+     spec = importlib.util.spec_from_file_location(
diff --git a/dev-python/pipenv/pipenv-2022.9.24.ebuild b/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild
index 26627daa805b..b8d229b0fe29 100644
--- a/dev-python/pipenv/pipenv-2022.9.24.ebuild
+++ b/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild
@@ -18,6 +18,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 
+PATCHES=(
+	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
+)
+
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 64fd7d664aee..d05f1fb16a83 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,3 +1,3 @@
 DIST pydantic-1.10.2.gh.tar.gz 888288 BLAKE2B 9aac69ace185ccc56255cf36f9af472caf4c6bcbdcbb81eec66353f755673e9a240e7713c0a2ecff00a02e07b0069e4b3f1edda41f345698a979b79dd54b354a SHA512 dc2acfb271cd62b6de08bbaa48dbc76ec8d3a3f3142778ffa2cb9a2a1cad62dbdb3c7470a50e9a2825837b65a48c6aefb8736411f32c398aa9ca779841b53ac5
-EBUILD pydantic-1.10.2.ebuild 1966 BLAKE2B 19c1cc8ea90a0929936bdcdda219917b3403e16ae15f49699d91020f43bf72d01c0e9560b393f887889d84d85ab5fc7d880c62017b7491121a04556a59a53a59 SHA512 81def517e8758cfc7b4c491fbfd8c97e615d798cbcfe9f903e2271dd9abc010ee228d2c111cea681b34940cd623dd7d3e30af906bfb0fde80a5f1ae81d2199aa
+EBUILD pydantic-1.10.2.ebuild 1972 BLAKE2B cc2c7f1b162c7493df88f0281b2679e5f524c21c4ebb9089b006f6df186a369be1e02b40e382374a3db6d292127db3a0ba6745a9828735b0af2aec14dba94872 SHA512 2853d2978e1a610cbc963592d0a3f3dc1a7983f3a598b9b914c7475b5e39afc5d869d1898575b35834d06896fe73d406f313b4749deb1e33cb656ccbba72417f
 MISC metadata.xml 484 BLAKE2B 5537370a640fd44c6fa0ac0827695c276824909c084343b2f679ebcf1d775846e05e8a657ea4c279737ea808f59ede0b1bb80f163c87da4451aad2c74d8b0a56 SHA512 2af95840f5898f61813d1ada5b4338398ff212a7896904095aa007f95458a4f8bb174e288e8629b2ab29a5b372aba1f068a4faa64d43d8a739518ad740cc4f77
diff --git a/dev-python/pydantic/pydantic-1.10.2.ebuild b/dev-python/pydantic/pydantic-1.10.2.ebuild
index d27120897161..6d1ece776852 100644
--- a/dev-python/pydantic/pydantic-1.10.2.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index 61f7f4d8c455..4db1cc4b603a 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -2,5 +2,5 @@ AUX pyproject-metadata-0.5.0-no-install-tests.patch 279 BLAKE2B 51598be4b5d055e8
 DIST pyproject-metadata-0.5.0.gh.tar.gz 13816 BLAKE2B 8f5613c1279539116e99b6f319b687a08160360109e1ed71d5bc6c0434ee316ef7c0b7109d6769a03452a41c1b258765c849fe416b4632b4ba25990b6b3702aa SHA512 66cd447a01d0d01ab37611415bd620517600af667d7179a2696f763ae031c013393c8145ebd33f27b43629659333effa58596a02dfc5c217935c90475250b822
 DIST pyproject-metadata-0.6.1.gh.tar.gz 14047 BLAKE2B d97be3532450541f4f464eca8d3e241259463bbd9d8277df380e3bf38908b9fd4e279d4ec88051e974a51091da9afef0691c7d723213e244c9fb5a6b6fa1e7ac SHA512 4af84f9534a5c71e192e1355e1e99f99e82b97d01411c011ed2f1dff579a7420a0f5d982eea5a032de8549c14191b64334c8e2aeea22fe767837e662e8d8b588
 EBUILD pyproject-metadata-0.5.0.ebuild 664 BLAKE2B 0ad4c61e0a704bbaf6d7d7c5dc178691908223b8329c34fbd4df1693ce4271cc6cd981cdbb862ef09f024639235f0d09a52df09947c75b21068f69607ac2b1da SHA512 666b3d87777b5b4307fc5dc5bc1743b4aa39294a454fea51eaef1d4e3f042d40b4cf1368259a09dff6cbcf189859ed09a208d131c60755d2df50e559fe319de9
-EBUILD pyproject-metadata-0.6.1.ebuild 642 BLAKE2B 1fcf97a138a7d9b743c855e0cc628595b4b6d800f29d5c15550d0c5ac0e95ce5645d05b386c12616d56f5e734dbc9aa5a251121512d90d2d4234f64da7255493 SHA512 b73743021727f1c3e1159ae9ddd3be21425b220984e6a3bf54bb58e18eefb50f5daabe799ac3f1f7d27918585b96092c521e6ce3866f6c6eda1b4f165aebf2a8
+EBUILD pyproject-metadata-0.6.1.ebuild 653 BLAKE2B f2426a08652d609617c26f2247318ddeec2a3a53199230c717898d90b6b43303bb0855f390a38da02d50d9f97fd0b41da6965c8f851599d8a6c777602e41dded SHA512 c3fea74d20f4988dedd1f8ea7b4cf54a8509daf101a8dba5fceba9a4c619db43b9b8f2c186efb0ac1abf272b5f11fc7147ab639b560e27db45359c5a8fe64a10
 MISC metadata.xml 371 BLAKE2B 9495774fe62ac433fa655bb324c38b18242dfda38e0e331739b6c35b9a64563aa03b95395930ff8c2d20ff16aaaa1513673c27db973e88293fd6c8e09d2ef0e4 SHA512 5c8dec2e04b6f2e7ca0bead64c4987d3226e985085262870c9502b26f76270ffec818cc76271ccfca8c719e991884bc40e5da18d092cad801dffc8ccc5207b59
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
index 7131dccb6b2f..0d73cc3c5605 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 8e15f65d27eb..d4ce1ac6f098 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -6,5 +6,5 @@ DIST pypy-exe-7.3.9-1.ppc64le.xpak 11755620 BLAKE2B 09d9b8f9ae6abdd1b6cb9d7d3337
 DIST pypy-exe-7.3.9-1.x86-musl.xpak 10118700 BLAKE2B 5ab545378d9ba48ffe167aaf80449e97201b3607d7a2477420c4766347b23c3993b5b241ea776690e0c448b329dfa10a3b912cef859ac70b0d4f755dc37e5771 SHA512 48b8b8a89d1a7d533b8683de3335d18b6f680e0a13862b65b9d181b22eb70feef0ba1c14124bab5a2bd0b0bb43bbf417f58d1dd95f76e6c5baf482521d3a4d63
 DIST pypy-exe-7.3.9-2.amd64.xpak 13715525 BLAKE2B 17ace55d2c06a0e9a15cf980c2741aa68e2b91083acc5fbc64c736353d2abe325ac9949d0a3a6fd8b825e345ce76b372564434752c3541b663d9532eeecb1d73 SHA512 bae5a9ff57b708523eab2b95de564f7c7d5c5837cfb201e890a6cd7377b41d1ab0229e22d9596a3096f0641649d189ce1a88c67e71dbb578d24f420b83de6ccd
 DIST pypy-exe-7.3.9-2.x86.xpak 10199358 BLAKE2B 502748c1c90db9ee1d626c33ead656d472ec2f2e6df24fb185df251d40fc8aad033d693d4dc248fa210a26b63052a9cdba7b9d3998b6ede72e2df14631bdd31b SHA512 aca7a25757f479e3c684596662c173c687e3f3cb20f7b9a1a397a1642d45cc8ea98d35d173696146763ffa24e797882a8b9d35fb14533b432256ac874ec94a6f
-EBUILD pypy-exe-bin-7.3.9-r2.ebuild 2072 BLAKE2B 810538a06b5b36029500593b76234e2e587863628b1e0e0f043c21156813b66f1d495d7326b1015679373f50e298e438a063ad1dff9ed073992ab439053b2719 SHA512 6b71a2009518c640ae337821956d99eb87fc9770aab330980cc1cce12a833235e17d5c0c4d3e06fb08f8510d833b696694b96c4b1b4bc5d2a85bfa5af24c6ceb
+EBUILD pypy-exe-bin-7.3.9-r3.ebuild 2119 BLAKE2B 78cdc93d9f5b5f117c796de542653f1e6281c1725c3cd9158f3d67b12c9581f80eabadeb89e557c360eeda3aaa9799b7e7185e165c07543c81a4830d5eeae13e SHA512 89ae7ffc7027caccec44d0050233f450ea4a8f1842faf38d98bae24de41f1ef028e83de654e3e395df36265f5bc16df5b5443c7f144e5468f60244cbd49db67b
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r3.ebuild
index 6ce281fb0f66..938cab259ed5 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r3.ebuild
@@ -52,10 +52,12 @@ LICENSE="MIT"
 SLOT="${PV%_p*}"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
+# sys-devel/gcc for libgcc_s.so
 RDEPEND="
 	app-arch/bzip2:0/1
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/8
+	sys-devel/gcc
 	sys-libs/ncurses:0/6
 	>=sys-libs/zlib-1.1.3:0/1
 	virtual/libintl:0/0
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 828a4b032801..999b5cf08ff6 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -6,5 +6,5 @@ DIST pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak 6663514 BLAKE2B c8778a594f9999be4efe
 DIST pypy3-exe-7.3.9_p3-1.ppc64le.xpak 10930518 BLAKE2B fca375a3466ee51c9436587104d5f13cb4642a8efb347124fcc2880c2382bf56921889b2c3aa96f26d22fb734cbd27adcf5f0c8feeff92c2d625df1daaa38ade SHA512 ee33067b964c33701b687ace463cfc11795af37bf3302c8e3e2d1e0610728945d370f88d97d1ba3fd66ac9bbf905930857e78e5bc96c911d3a663c2e9c74a5cc
 DIST pypy3-exe-7.3.9_p3-1.x86-musl.xpak 9246639 BLAKE2B 7475f9a273157b55d1568e5d9f36a045969bb629047a8b8f478e6cd0e27bf2f46b0a141197047bd2779332acb5b36b069ad1bd371030a6a5d75b4dd0aadbb808 SHA512 783260846ec8057479808a7d7aab3c712ee6822293232099cfbe970cb3e8e5e3cf07ec08bb5ecd703c084c6a798dab70de5073146f8698430472196b351d19fb
 DIST pypy3-exe-7.3.9_p3-1.x86.xpak 9210827 BLAKE2B a740ef7e1d4559308c129399cda498b7c0fe8e654e4d36830ded5197a7788168dbc8b4f83908a41869cd51343dd9b371ba53de8e88655b2728b8f6351f502ef2 SHA512 bd2ef07e980bd37b7ecfb052a9304a80ee527c61f8a60344e8e9b1bfcdf1f50038e7b281257194c388e0452aa968f984f5b6bc7d9f7c89bf08279e9a169ed8e6
-EBUILD pypy3-exe-bin-7.3.9_p3-r2.ebuild 2069 BLAKE2B a791593f3cc73974789ad2f5f878acd5b2de5548c4ff7031d07233aa58678117e3c5c3c3ed63978be2c125e76c1c4521b227a8b22786cfadcc515205be75eaa9 SHA512 62679da1b6f69122d1ddee68499981a680999269362e6439dea7533a0d2e0bbe1720c173d97f0e311f508194a30ce3e7bcc4256e2389e6d3c569236201f440cc
+EBUILD pypy3-exe-bin-7.3.9_p3-r3.ebuild 2116 BLAKE2B 02d51678563325cd8a99a6f42f5164198b574e204cc200aec354a4a1af4bcbe2ec2e9f8e23e9d0660da5b7bf497244d61b81fb0246f6163a3aa648d3375f31fe SHA512 6b52470511fe28dc79c8166141cb99a8185c6d8f9c315e2bd43ebfa5c4f29247a82855a92bbe5970bff849003ecec05cb7e8577bdfb2e869bea6a9246a13cfc4
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild
index 4367d44c529c..36342b29c1b9 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild
@@ -52,10 +52,12 @@ LICENSE="MIT"
 SLOT="3.9-${PV%_p*}"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
+# sys-devel/gcc for libgcc_s.so
 RDEPEND="
 	app-arch/bzip2:0/1
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/8
+	sys-devel/gcc
 	sys-libs/ncurses:0/6
 	>=sys-libs/zlib-1.1.3:0/1
 	virtual/libintl:0/0
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 5ad3442b161e..d0570556fd09 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,3 +1,3 @@
 DIST python-dotenv-0.21.0.tar.gz 34984 BLAKE2B 5b2ac96e2c68afe04ec5e63da44c7109c0d142e1abad64fb9d4c87cfc84f36e62023854f72145f6a7f6b7e05bf58a57ee4b97ac8b84aa1304ddffba0a8795c6c SHA512 618335ad11a1ed8011d7cd0c6a83912b5cc29eddeb967c9594af32c6229ca178b571b08836776661612015ac9cd6753de1935f3f3e0e3b8feb733eccfbb262e7
-EBUILD python-dotenv-0.21.0.ebuild 891 BLAKE2B 4a5ac9e97725a39537a7e04d816a1eb75c9253d30f577eac08e49360f7173933f740c1ac852c38973d3927ed637516e2af74eba7a91cfed7d188883a04a647b2 SHA512 ef4b0714651a3d28cc643deb6511d600ba6615d08efba7552a6cd5fa8d2b4d48145f566ccb52830562212cfdba94003b06efeb22eedd889d0be1e9156376c385
+EBUILD python-dotenv-0.21.0.ebuild 897 BLAKE2B 8098b08dc386cf9fd919cd56ae88e95dee672ef864333a54999e86ce5c380f2f90a82e838d8eb07797b775bc663b486e97761e8bc962468d9d4d37e8d0498116 SHA512 a60651fbdc8d84a5d2e059e11a79a225eeded4da59bb8f4c0aeacc5050877cff556411d21d552a48a7f399dbd0c1e71b9f24e5a9592d1d7a615f6583193b764b
 MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a
diff --git a/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
index fd0032ec2992..bd85aafed4e7 100644
--- a/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index e0281d0ffa99..0d24938abc44 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -3,5 +3,5 @@ DIST python-email-validator-1.2.1.gh.tar.gz 24348 BLAKE2B 7cd19c07bd0b8c467c0f0e
 DIST python-email-validator-1.3.0.gh.tar.gz 28555 BLAKE2B 7b13b4093be2b97260d01c562a205d299570e63bfba2f8e411000bc19319e9b538e95f2f4d33962b03fe5dc47c3690b8a0134b792f6822386ab6b20b260a991e SHA512 b10139f8eb221fa15a12c44f2c87d17449e317c6edfd4c6a99dc122a9178dcc4c3ef20f99f0feefb6a5b4a9460169b22d835871d2be88efd59f1474ff3d9aa06
 EBUILD python-email-validator-1.1.3.ebuild 1228 BLAKE2B 2d434fe758ed5a45f7e2858158e6266e544d27bb97f8766148c2a89e37b19b202ab4e3093286f0a2d7fa29a46a9c2632ade095cabacad6a81074f9309d6462fa SHA512 5caa7ee4aba28db692c362e14aafd988468eaf2c8a19b58661861a87dbb04fda90335e773a859656762356e122cc6e6de54b530ad9e4838ac3ac78d17f951aff
 EBUILD python-email-validator-1.2.1.ebuild 1374 BLAKE2B 73d62090870886cfbd7af400621c1739737a74b2841a3ef7c8b6a31b17c78f238174c5a5d90cdf97b17d3e5421e838d8e8964647d970fb537875523b6b6fcb38 SHA512 f7ee783f90ad7bf44f36b60a1ac92c0e02177d10ef88326577b821e89f01c809bd48c02dc45bca9152a9fa9cc5a02fd8f8fda94b941d56b775be2827d28f6d6d
-EBUILD python-email-validator-1.3.0.ebuild 1395 BLAKE2B 7d543878e8bec8285f6f7f920a605ee8422ff3a8b7cb90a9deea7d643abf5817c5bc3baa4a4742fa5cb81308059064607f64442490774a324d7ac82c5af2296c SHA512 2c73b503cef688eeb2a3b764ee9783983c89d5a7b97926ed61920781fa70407ad420566392cfcdc4c5f6f014acb5ae831d9155fa529e0cf9aaf8227638613473
+EBUILD python-email-validator-1.3.0.ebuild 1401 BLAKE2B c9a8ffb6b4c8d44158d24524ca8ffc8b4a78bf5e408c6369b3f197b5825ce5c771cdc3aa33dac60f21ee08191d53ceb9872ada903e2197c7811cda0577f1d9c9 SHA512 65daabdccc510e8d517899e99465877514c8ed97f08c399429fce7e40222c202b9d29509a65f1af8114de9f0c923918c2cbf90f297979192b9f0e65df2f4f674
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild b/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild
index c6ab88c66c56..a64f07da6407 100644
--- a/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="CC0-1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 2e8e053332ac..915fa8d39ee3 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -2,6 +2,6 @@ AUX pythran-0.10.0-tests-werror.patch 480 BLAKE2B ac7b6fe2cd4b4aeed3be4baf2a433f
 DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
 EBUILD pythran-0.11.0.ebuild 1216 BLAKE2B 3bbdd186dec832ba93efc8681b36738f28779b6b30068b27309ce7a3701a15a95387e56878bf77aa7f7ecbd316328dc9d815178a2c471e0441bf12ca5deb86bd SHA512 78fdf9b66ddf94d3513a2a07203ac1274e9d1dc928afabea0a573e47716006606a5ae38c372a98c7e601195080bd876a3bb816e74c3aaaa49b9f3f56f106ea87
-EBUILD pythran-0.12.0-r1.ebuild 1427 BLAKE2B 7c94016973bcb98413b9a3952f8c02c86bf0b6101d10d3b428abba7b3da0c56b3023d3fbd541f2bbab3429858b3d9ca601cbf3cd8b3b93c7c0c311dd520e8d3a SHA512 9d21b2fd56ebf29578a14c5d92769e41de4d59693ac32ad289bb089ba97369f9a396a65d9f418655cf1567674756a5eaab8caf1a413625d76b9d99e2829c75e7
+EBUILD pythran-0.12.0-r1.ebuild 1438 BLAKE2B 8e9886ec0cf6b2f7e51d32abebf8c4d718c7722537a0d29a887a8ed1f29ded7e8fe160f517213a304ec0b24e628b494ea60549220285629b1194b8052bcf83e8 SHA512 08a540208a25712104cfc21668f972fa1eaa021d02e1e1980ae3576415f3ec08dce71f5296127295e687a154c0932649ad60ad0743c9a65e5e530252c94ce49d
 EBUILD pythran-0.12.0.ebuild 1190 BLAKE2B ef04054cb343d9a3c3e0bdc5fe2f6c41aef90bef6cb2eaf2d3fbadf35430677072a45e0888fc05a8874bfe6b61bb799b0cf9b86a93fc493e95a5e1c6e95dcce1 SHA512 794a5d327f8c9aeea34cdccd596726c7084a14e8a9a9af7ec604afad6f602409b814eac6fb042a7a8a8626a38a5e1e3aadcaa531d0233bcefccffe3647312dfd
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.12.0-r1.ebuild b/dev-python/pythran/pythran-0.12.0-r1.ebuild
index cc45846cc8ff..585d64925bd1 100644
--- a/dev-python/pythran/pythran-0.12.0-r1.ebuild
+++ b/dev-python/pythran/pythran-0.12.0-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 59ccc23f4d76..c317c21cff70 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -6,6 +6,6 @@ DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
-EBUILD scipy-1.9.2.ebuild 2349 BLAKE2B 37a3e76f0b2b3d43b6d3d88a8a6061aa8dbd28901d88b51c4b3b851dfb4e4930608ec57072af77e1d430f9a0c8ddbb76a60cbfc7240a5c637a729e9210adf529 SHA512 2d7fd770c079a35a73933caba60a807b4ca4fb586453232205c80cb2a4624751621900f602518ef1ee7f96971ddd9703f7e774985f8911348c229504613d82da
+EBUILD scipy-1.9.2.ebuild 2360 BLAKE2B 4461feef60a9df1d573a4dc523f28c5b5a69c623921bf54427d2fbbf9fee9845506464b6902c177b20f00af653099f6a8d497dfaf07575815ba5278c7c978d0b SHA512 0b27f11b9c104ce37d69217f0fecb7ba0e63eb7f76bee4b1eaa1badcbf896b1b323aebe023b5db0e64c426df61f21f542ddd3cb1365a950e6337750080ebc1fa
 EBUILD scipy-1.9.9999.ebuild 2339 BLAKE2B 8b34952534298e156de44cffe5552c1895c343095bf4ec0e9d199fc915dcff549ac9b44cae9255634b244f207396b31428f817b8a4920dcf8c8bafc6c89ac7d2 SHA512 fbdfaabc2de08aa51f6d27ca230c69c812590de18adaca11fb956ebac77d56e98c88a710f9916b88f1ae9e783ed4a89b4ed763fa5fd4b109829cddacbaa76da1
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.2.ebuild b/dev-python/scipy/scipy-1.9.2.ebuild
index 081b5f7652d5..a3764e438be5 100644
--- a/dev-python/scipy/scipy-1.9.2.ebuild
+++ b/dev-python/scipy/scipy-1.9.2.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc64 ~riscv ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
 	fi
 fi
 
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index d9f00122a55a..4c6ee7e430cc 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.3.tar.gz 62851 BLAKE2B e570b3d51bbabebc90a575aaa502dc448f5049caf7485763f7ca84bd30a1e19f37441e4217074cb75ee0094600d328b59693fffdb0647479478246e58c0f00a7 SHA512 f78b418a396b78b4d303846da222eedc7525dee8d200bf96d48054d91a82671d40e0f1f82eb406b16016752ff95c3b2360075974abc3a5a814b8cfe70528231a
-EBUILD sh-1.14.3.ebuild 711 BLAKE2B 028b46bb09d5ead9e612ebeca67425ef090507bb487c8c6bcc38b187469ed3964ecac59692df35bafe8e34a3b5a75ad0ceef911f17c99642dd73801ff698544f SHA512 de7e48877165f70bff99f84f82a67c2e20f4f7206889a847628243ecda8f59716f48a4c19dc9284b2acfea972fc2d7c43f3f9686310fa2038209630c12a9247c
+EBUILD sh-1.14.3.ebuild 717 BLAKE2B 8079852e49de3cd6ab170d7c95c952134a8637a9d4c17b5008d2433b4d7ff4cf2855c8b1ddaa30953ca5b10d269c7e42f37ab845fd0d28decf4f8686cb5d2a13 SHA512 f5da423978b9b0e447f5e5567ed9d6db8d1c79d161610733ee3657403440dbf85bb089dd7ed4e9f1fed8b40d141591dba69d55824f1dd9cb0d759e21740ae105
 MISC metadata.xml 802 BLAKE2B 4eb5ab2ef69633f88a1f16f226eb78a161632232ca2d127acd89e1271ab7b31d551aa9759ee5f327cd94f06a6b11e9463d6a6fe1432d4be84489afa009ce7f6e SHA512 b3b21507c5eb85f9289499ee87a2db852b254b2cd1e9feef61cb731a9cd035f0c6c8e3f7bcb4a1267fe97faa34655674354ba696ca26cc18247e7fd150f60816
diff --git a/dev-python/sh/sh-1.14.3.ebuild b/dev-python/sh/sh-1.14.3.ebuild
index e5b5affec692..dde9f3409bb6 100644
--- a/dev-python/sh/sh-1.14.3.ebuild
+++ b/dev-python/sh/sh-1.14.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f7e4757e8588..3674ad9a19ec 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index b964f5a407aa..3a05b4a64cbe 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -9,5 +9,5 @@ DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352d
 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
 DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
 EBUILD bpftrace-0.15.0-r2.ebuild 2025 BLAKE2B aeb49affb4e4f45ec1fb29527dc3f1f4a935073c75ff44e1af64729dde1343eb1587836c693a2c54dcf9821e8b61e6ddc2ee3da62f7896dcae666a1620f5a29b SHA512 ddd65b11dbb5c8e5b060b5f06645818501ef8d64c230b6ea4213023570f66cf8fbdd6bf294f63fd7fa2dcff68ec11bd41f42f07088b08ba8e9481c9ed3c84f72
-EBUILD bpftrace-0.16.0.ebuild 1820 BLAKE2B b272c6bc366e46ccbe06980822b04f259016a62ab3c8ccffe9e7a2c854ff9fb86a99d3d16f1af84c4e76c456345fde6af89f48ac23dcc192e7394be12b833e00 SHA512 83b550c3106d75b3106a9b6a740fa56cbcc7d783167d319dfe678553ddf045e495e5a6707b6aefd1bbfb3a1f8ef890a31bcf4102a0bec526f11d9521d8d2ece6
+EBUILD bpftrace-0.16.0.ebuild 1778 BLAKE2B 0ba4d8f9d842a73b1ded650f42f43efc68b4e921619d2300b5dd4e866ce2bfcd6c4e98e1b59699d83c79179802d5778a9e5e0a6ed87dce41bf7d466b65ac7346 SHA512 81b2e6a6a29785c888ae8aa324381bafeb6557615ae9cd77e1cdba33222ed95525ff2b3e58267505a2fb8663d42ce55a64c35e32d8778a7395077c8800a39ee3
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
index 6f9fca048fd6..26206e9ed27f 100644
--- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
@@ -55,7 +55,6 @@ PATCHES=(
 	"${FILESDIR}/bpftrace-0.16.0-install-libs.patch"
 	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
 	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.16.0-link.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 466b453ee480..dd06a84f6141 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,5 +1,5 @@
 DIST patchelf-0.14.5.tar.gz 124767 BLAKE2B f2e02fb468db7c8c0c4270c7f95ea6c8dc6ffab7ddb0a6479bd5d1dd0481cbc55982af21a13f42076504417264a11e74d50a9f15d3d5735e47019001abf33e41 SHA512 1b7eca84f6fe2d6f6d4469ca1ccdf35dc920d2052ba94b7daeba6c8cb41fdaff20b1e5bac7c8a7650ff12bf4156da87f84d32e75b09958636dc992a1b7b1a59d
 DIST patchelf-0.15.0.tar.gz 125803 BLAKE2B 08fc2cffd7d9e835c01c828c16762fb0b3c3e422990f2d0028a65a3e0ec849d01bdef699b6f68afa6bf307e34f5e76121fc94460793c95c055552e1d8a68d772 SHA512 3b2d3d6458be5b2d43cd2878dfb1a185a95cc13cd4c94abd0ee79979afb36f46e347acc292b8d9c2954a342b7291774e6a1b63930e9f90a1cf4179ec075ab046
 EBUILD patchelf-0.14.5.ebuild 551 BLAKE2B acd9c8b3dfef45e8449dd812861edf4441a6e54e529b8fab13048d64504ca2c9cf5058159a8b47ff06e552c4e4d74c6aa7da9afeb99d1aab70a264f3253ff8be SHA512 ce28a15e8d82eb2909d4ad3f3b111883988a37dd5495c05a6ac92b64819eae108488a1edad659d72ed94a174912dddc57495b42e4136de8cec23a4905da9bc57
-EBUILD patchelf-0.15.0.ebuild 581 BLAKE2B f7843d5dbb54638a59f1ccec05003fede894852480255404001181db0fe7725a0345f4c7975525f3edb4efb3fac0602747b38828c7c63dbe577f853d12187e87 SHA512 0bf1dae82de8c1ad08fd9c665f1aba8d466d8828a31a8fa46460f492e6a79446fd312bd730db41f215c5f018f6ac65ba9b66be372e8f6839ca7c1b995a97b8ae
+EBUILD patchelf-0.15.0.ebuild 587 BLAKE2B 6ae4b162ba692d9f0a9dda22ddbc7d0848088db62e36495f41591d8e90bd9734250414ec63e04cb77453e37ff32edcc59d5448b0961302718333f2d21b08d965 SHA512 6af22d1e95cc93eedcc54910472087963e860c0089d8a65a831ad4a621fca2ade1d193cdfafe68cc65aac5826e39fd740b69f7dbee694e062a7b645ccb00493f
 MISC metadata.xml 221 BLAKE2B 89c194836288a2092e342c7932283845027e33ed24c07238828996c457bbe637c44e0d39236fcf5f50db27dd3c66545a0239c4336f74e7f3b463bc2e7374a1a4 SHA512 3fb0d91be78f12317cfcafccc851b13b7e6a1fd588a5762e0dba27add0a9c6b5f8b22d3c27f2fcf6665cb8f8a5e36175d74eb4a97b42bd176afe6a8128254c10
diff --git a/dev-util/patchelf/patchelf-0.15.0.ebuild b/dev-util/patchelf/patchelf-0.15.0.ebuild
index d969300883cb..45b8be95445b 100644
--- a/dev-util/patchelf/patchelf-0.15.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.15.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index d2fe54c0f786..669f936a5afc 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 609c88b78794..b149822e929d 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,10 +1,11 @@
-AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c57200bd272ae37d5871793d5a0308cde8b4c3be9824b5549a23429d465f874e0ca018862f3072dc3b SHA512 d390c65f406cf8b43f3d493cd6513167c122a5811e3bc8614a66dc080eac21df9fc1d5f110503c8f6815f683eaeb5ddcdd833d310400ccc2426ae81c2b8159f8
+AUX Makefile.native 1068 BLAKE2B c256a0ca3ea704b841d09c6f94f2e7bd1c6e45248c3c835af15675a3f5859325cacd5488030c71a1e62839c3d4f92bdc5d53cb2f8af3c0fe87a8d3432c0eab98 SHA512 a25d7628ff50a74df5fd9c8456c88114290a449ab894c78c28e2c28ab0f340846e2324d9d249972c122638bab7cffff5cd597204fde47c4762a70c1b948df06d
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 AUX dwarf-fortress-0.47.05-missing-cmath.patch 202 BLAKE2B 2f735f4cc82d56015282acf2584678e3ded323c0740c5692752359f167b24f2c7439e6e75b82e65e48daa26eb8ab47e6072f6c0e76c259cd1d7f43595bdfb722 SHA512 548a4077ae40fc8edec75e655efe1c3032fcf49f59c1cd7477c1939e9a5313c4fa2a1589e4c43769290b4e3e27e5ca532faa9d153d0878919d2b3866f2e20f56
 AUX dwarf-fortress-0.47.05-ncurses6.patch 806 BLAKE2B 7c87d059476fafbbf7cca652574b41774e9a74c9b96852dc7a1743cca00280313864a585f7cd4892296d88d916c7f478f497006e94fe320989c5c4d591c77cb8 SHA512 febd94b0b1ec856f0b5cf57f7c68631435e3e369a72a0e692a6139d9068473ede37a647d51ff56e5fe8db28aafe95badd9af62c6913aa9fce92c91c93dda0e83
-AUX dwarf-fortress-0.47.05-segfault-fixes.patch 1542 BLAKE2B 97e0e460edcf96ed65d08f5dde98ef39a8d07300951545acaec36b577d81b5465b4f42f3d15db6d6be8a97d5d9a86149fbfb56cf0b283242ce24a178b86125af SHA512 82f710c6a10ca933fbbd4ef5a02b3c6f70012bef61665c0cf536996b57fbe8bbc6ddf3bf7e20430b82f9eda9503afcfc131e46b2956b6478b266861e12e3a7d1
+AUX dwarf-fortress-0.47.05-nogtk.patch 3239 BLAKE2B 1fb0bd61b2e95e3eab9f0e774d6df32b0412a037461b7311ae88fc73f885d1aa2565f1ddc68b7a239e7c15fc4de683a2590c030d66be39dd9347914268c7e6fb SHA512 475d66742ef71b1f52563c170a5b73b557fcdee5a2af9360041e76ef4798f56bd98a23a8e71ff9fb9aff7c4364a8935571d6d36c9c4939a4b4a3a508946c5f95
+AUX dwarf-fortress-0.47.05-segfault-fixes.patch 2045 BLAKE2B bb00cc01a60cf982806d4824e8533d1668f994b604742c83bde85a210b9f1526065899430c9457fb681000c1667e1e70112c3ef72a1753c73249e310e417b503 SHA512 afb17503a030e106ef60e8849a24a6e4d158923e8680c39b73239c87515eb45aee975fabb2bf483922ee4427e01d89d6effddeefbf5125527ff364504de57dc8
 DIST df_47_05_linux.tar.bz2 12725420 BLAKE2B 80987f05de2db2796a53cc8767ee7aa5c78674dff725efc0dafe07dc4118e56c7814cbf92507fe9b76a385e182405c7d6759cb6bcc942385110df1dc1a3b3af4 SHA512 9ea46fa12a80266cd09363f1aea8cdd059a5ebeefb453c4a46ffbb1115486409003c3caca95a1b6010da4040d04b781182c59e57a6cc033cd7de4507299f7534
 DIST df_47_05_linux32.tar.bz2 13487455 BLAKE2B be604dd2fd480c5609da801013dfdae26964760c0a92c4b3d2d8369800eee7ca9c1b1c2313cc67357feee3c6d425bf7f9f67cab53d2e771ab59055bc4c3329d0 SHA512 e9b9cf6995c24b403347159a35cfe4b57603bdb777c78639beb2799d9bf31317edec54fb92b17dbb90df6001b905d43285a35e9446768d12a746492b2fd34fe7
 DIST dwarf-fortress.png 271 BLAKE2B cbc14917de1556b25d3817298215beedc4cb01075b8454e38b2d314bdf22f8c20c4bf2332f0d731c7e4c6d6a60056361565221ce3db2c7a15fdf934bff01df54 SHA512 08bdc0e084f861b6e6a8b12e3bc93b9703f2a4cbc133d62d1c2931daf81ccd70b728853d5c05bed19a1ef477cf4ad10fce263bbab7d9cad3b60658f17063acf6
-EBUILD dwarf-fortress-0.47.05.ebuild 2367 BLAKE2B a270f71327f763e06230d33f7f8218f76e4bbd777ff144f39e02c71ebb8b92c5d8d6e6cc9d008beed7d976db9cc30c6abd3d27fa5608acd2443e61c3d1418618 SHA512 ebd6469dbfffc8aaccfd794375a25fce7bb5dde7e4df11e6cf35c59b165560cd8dddd3aaf7a43c1deaf07decb74915abadf8fb87e486c84f85580d46f9143e3b
+EBUILD dwarf-fortress-0.47.05-r1.ebuild 2437 BLAKE2B 9c5e8a472e61a3c60d4e092fcfe3c13670751a1028a799e9a5ff63d7fba9497800194c97285f64f2241eace6cf380ff0dbf3a7f9a21c5e5b3fa57d7a735968b1 SHA512 900b704bb0855f9539161378cb07dfd625ec5853a30a63ccb59be002b527f2d05ee0c1ecae7825b7fb7f15d7d93ee3fcc02d93bceb895956cd38eb05be6b6a1b
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05-r1.ebuild
index dac5c1c75c94..09f1a0c25b24 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/df_linux"
 LICENSE="free-noncomm BSD BitstreamVera"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="debug"
+IUSE="debug gui"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -29,7 +29,7 @@ RDEPEND="
 	media-libs/sdl-ttf
 	sys-libs/zlib:=
 	virtual/glu
-	x11-libs/gtk+:2"
+	gui? ( x11-libs/gtk+:2 )"
 # libsndfile, openal and ncurses are only needed at compile-time,
 # optfeature through dlopen() at runtime if requested
 DEPEND="
@@ -44,6 +44,7 @@ QA_PREBUILT="opt/${PN}/libs/Dwarf_Fortress"
 PATCHES=(
 	"${FILESDIR}"/${P}-missing-cmath.patch
 	"${FILESDIR}"/${P}-ncurses6.patch
+	"${FILESDIR}"/${P}-nogtk.patch
 	"${FILESDIR}"/${P}-segfault-fixes.patch
 )
 
@@ -60,7 +61,7 @@ src_compile() {
 	# -DDEBUG is recognized to give additional debug output
 	append-cppflags -D$(usev !debug N)DEBUG
 
-	emake -f "${FILESDIR}"/Makefile.native
+	emake -f "${FILESDIR}"/Makefile.native HAVE_GTK=$(usex gui 1 0)
 }
 
 src_install() {
diff --git a/games-roguelike/dwarf-fortress/files/Makefile.native b/games-roguelike/dwarf-fortress/files/Makefile.native
index 85383e5e2f1d..d22fb03f4694 100644
--- a/games-roguelike/dwarf-fortress/files/Makefile.native
+++ b/games-roguelike/dwarf-fortress/files/Makefile.native
@@ -1,6 +1,8 @@
 # Copyright 2014-2016 Alex Xu (Hello71)
 # Distributed under the terms of the GNU General Public License v2
 
+HAVE_GTK ?= 1
+
 SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
 	g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \
 	g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \
@@ -11,7 +13,12 @@ SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
 OBJS := $(SRCS:.cpp=.o)
 
 BLIBS := ncursesw openal sndfile
-LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
+
+LIBS := glew glu sdl SDL_image SDL_ttf zlib
+ifeq ($(HAVE_GTK),1)
+LIBS += gtk+-2.0
+endif
+
 CXXFLAGS ?= -O2 -pipe -Wall -Wextra
 CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
 LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-nogtk.patch b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-nogtk.patch
new file mode 100644
index 000000000000..7702362b4a69
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-nogtk.patch
@@ -0,0 +1,119 @@
+Removes hard dependency on GTK in favour of stdin calls.
+
+--- a/g_src/KeybindingScreen.cpp
++++ b/g_src/KeybindingScreen.cpp
+@@ -1,7 +1,9 @@
+ #ifdef __APPLE__
+ # include "osx_messagebox.h"
+ #elif defined(unix)
+-# include <gtk/gtk.h>
++# ifdef HAVE_GTK
++#  include <gtk/gtk.h>
++# endif
+ #endif
+ 
+ #include "GL/glew.h"
+--- a/g_src/enabler.cpp
++++ b/g_src/enabler.cpp
+@@ -1,7 +1,9 @@
+ #ifdef __APPLE__
+ # include "osx_messagebox.h"
+ #elif defined(unix)
+-# include <gtk/gtk.h>
++# ifdef HAVE_GTK
++#  include <gtk/gtk.h>
++# endif
+ #endif
+ 
+ #include <cassert>
+@@ -713,7 +715,7 @@ int main (int argc, char* argv[]) {
+ #ifdef unix
+   setlocale(LC_ALL, "");
+ #endif
+-#if !defined(__APPLE__) && defined(unix)
++#if !defined(__APPLE__) && defined(unix) && defined(HAVE_GTK)
+   bool gtk_ok = false;
+   if (getenv("DISPLAY"))
+     gtk_ok = gtk_init_check(&argc, &argv);
+@@ -734,6 +736,7 @@ int main (int argc, char* argv[]) {
+   init.begin(); // Load init.txt settings
+   
+ #if !defined(__APPLE__) && defined(unix)
++ #if defined(HAVE_GTK)
+   if (!gtk_ok && !init.display.flag.has_flag(INIT_DISPLAY_FLAG_TEXT)) {
+     puts("Display not found and PRINT_MODE not set to TEXT, aborting.");
+     exit(EXIT_FAILURE);
+@@ -743,6 +746,7 @@ int main (int argc, char* argv[]) {
+     puts("Graphical tiles are not compatible with text output, sorry");
+     exit(EXIT_FAILURE);
+   }
++ #endif
+ #endif
+ 
+   // Initialize video, if we /use/ video
+--- a/g_src/renderer_curses.cpp
++++ b/g_src/renderer_curses.cpp
+@@ -1,3 +1,7 @@
++#if defined(__APPLE__) || defined(unix)
++# include <unistd.h>
++#endif
++
+ static bool curses_initialized = false;
+ 
+ static void endwin_void() {
+--- a/g_src/win32_compat.cpp
++++ b/g_src/win32_compat.cpp
+@@ -13,7 +13,11 @@
+ # ifdef __APPLE__
+ #  include "osx_messagebox.h"
+ # elif defined(unix)
+-#  include <gtk/gtk.h>
++#  ifdef HAVE_GTK
++#    include <gtk/gtk.h>
++#  else
++#    include <unistd.h>
++#  endif
+ # endif
+ #endif
+ 
+@@ -112,6 +116,7 @@ int MessageBox(HWND *dummy, const char *text, const char *caption, UINT type)
+   }
+ # else // GTK code
+   if (getenv("DISPLAY")) {
++  #ifdef HAVE_GTK
+     // Have X, will dialog
+     GtkWidget *dialog = gtk_message_dialog_new(NULL,
+                                                GTK_DIALOG_DESTROY_WITH_PARENT,
+@@ -141,6 +146,23 @@ int MessageBox(HWND *dummy, const char *text, const char *caption, UINT type)
+         break;
+       }
+     }
++  #else
++    if (isatty(fileno(stdin))) {
++      dprintf(2, "Alert %s:\n%s\n", caption ? caption : "", text ? text : "");
++      if (type & MB_YESNO) {
++        while(ret == IDOK) {
++          dprintf(2, "please answer with 'yes' or 'no'\n");
++          char buf[16];
++          fgets(buf, sizeof buf, stdin);
++          if(!strncmp(buf, "yes", 3)) ret = IDYES;
++          else if(!strncmp(buf, "no", 2)) ret = IDNO;
++        }
++      }
++    } else {
++      /* just assume windowed if no TTY is available to ask */
++      ret = IDNO;
++    }
++  #endif /* HAVE_GTK */
+   } else {
+     // Use curses
+     init_curses();
+@@ -173,7 +195,7 @@ int MessageBox(HWND *dummy, const char *text, const char *caption, UINT type)
+     }
+     nodelay(*stdscr_p, -1);
+   }
+-# endif
++  #endif
+   
+   if (toggle_screen) {
+     enabler.toggle_fullscreen();
diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch
index 24c43be41188..11a820ac97df 100644
--- a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch
+++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-segfault-fixes.patch
@@ -7,32 +7,40 @@ https://bugs.gentoo.org/729002
 https://www.bay12games.com/dwarves/mantisbt/view.php?id=11564
 --- a/g_src/enabler.cpp
 +++ b/g_src/enabler.cpp
-@@ -591,4 +591,6 @@
+@@ -592,6 +592,8 @@ int enablerst::loop(string cmdline) {
+ 
    // Clean up graphical resources
    delete renderer;
 +
 +  return 0;
  }
  
+ void enablerst::override_grid_size(int x, int y) {
 --- a/g_src/music_and_sound_openal.cpp
 +++ b/g_src/music_and_sound_openal.cpp
-@@ -251,5 +251,4 @@
+@@ -250,7 +250,6 @@ void musicsoundst::deinitsound() {
+     alDeleteBuffers(1, &buffer);
    }
    // Deinit OpenAL
 -  alcMakeContextCurrent(NULL);
    alcDestroyContext(context);
    alcCloseDevice(device);
-@@ -481,5 +480,5 @@
+ 
+@@ -480,7 +479,7 @@ static bool init_openal() {
+ 
  void alEnable( ALenum capability ) { _alEnable(capability); }
  void alDisable( ALenum capability ) { _alDisable(capability); }
 -ALboolean alIsEnabled( ALenum capability ) { _alIsEnabled(capability); }
 +ALboolean alIsEnabled( ALenum capability ) { return _alIsEnabled(capability); }
  const ALchar* alGetString( ALenum param ) { return _alGetString(param); }
  void alGetBooleanv( ALenum param, ALboolean* data ) { _alGetBooleanv(param, data); }
-@@ -491,5 +490,5 @@
+ void alGetIntegerv( ALenum param, ALint* data ) { _alGetIntegerv(param, data); }
+@@ -490,7 +489,7 @@ ALboolean alGetBoolean( ALenum param ) { return _alGetBoolean(param); }
+ ALint alGetInteger( ALenum param ) { return _alGetInteger(param); }
  ALfloat alGetFloat( ALenum param ) { return _alGetFloat(param); }
  ALdouble alGetDouble( ALenum param ) { return _alGetDouble(param); }
 -ALenum alGetError( void ) { _alGetError(); }
 +ALenum alGetError( void ) { return _alGetError(); }
  ALboolean alIsExtensionPresent( const ALchar* extname ) { return _alIsExtensionPresent(extname); }
  void* alGetProcAddress( const ALchar* fname ) { return _alGetProcAddress(fname); }
+ ALenum alGetEnumValue( const ALchar* ename ) { return _alGetEnumValue(ename); }
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index a5436dbe4681..28037382c9e5 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 571d4ff93b01..17cd236b5d3f 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -2,5 +2,5 @@ DIST sway-1.7.tar.gz 5559075 BLAKE2B 702b9a209d603c88743f2e89d0787431b7a30e8b755
 EBUILD sway-1.7-r1.ebuild 2175 BLAKE2B 9847fd44899ef922fa04ddfeb810b0ad4c9ae930f785c2393b6b5e1d348c893b19c0e9f791fbd661b76eed3e4c4f9eb16ecaac1c794479f1e86680180eb115e9 SHA512 c25c1776915883c42113c358783706181402c5f052ef08a81c20380af4bae37da5e3c53b59f0ac9d6bdfc197f94b33ba713830d9e85ad4a9ed74d5b3825fd85d
 EBUILD sway-1.7-r2.ebuild 2629 BLAKE2B 09ae1cd2a056ff6b775225ecc3fd81012fdd44d66cd2ec97e68874148872931a09b4ca9988fbf10287f9b032ac4e8f52766ef8f44a2b052f41aaaf381d515aec SHA512 88398a3f549b9c356c305df3a40a86987a842c05df320826195230585ca7da2a9c7a5f65f62ef73f9fe8c7f331926c8b5efb18bfd0e064ef8a2e00552f5ba94e
 EBUILD sway-1.7.ebuild 1900 BLAKE2B 7969c477bc7a65cb67ad007e9105c7046af2a873bd3fdd1924ed37e74f60819973ca96061dbb5b97fedd20d47bd1832f939c4ad9ae0885c2549dc03972f980b4 SHA512 a702d1a00d4019c72e0bd54262ac4d0d7304835df6cbd92e93f94e8aee56f556331b0452c10c4dd3e221cd31fd04859804f62027d1080a2c1fece797b9359bdb
-EBUILD sway-9999.ebuild 2629 BLAKE2B cc04a618400c1acf3cbc9fc5e09eaaca2858a4950b987279a640101154dc164930f9a33c3f85c8919c278323d2a84cc6793e5872d8c2418fd8e2eb2a5ad364b9 SHA512 40bccbd3421981f061576a265369bb3da7b60ae1d27cff992e22bfc2cca8bfa1685708f47ecba2424028069507c5636b94165a287472c797175e458a3b2599d4
+EBUILD sway-9999.ebuild 2630 BLAKE2B 912a1baa69f5f63e79a23e0fb258ad0294ca6a2ee9e456d737ebe01c49cdc9d420f4c035f9b313b6242b7a1196977d6f788cb0dbe951b2cc9ae9d234cbea78d7 SHA512 1546cf71f1a24eb18201e93cd8defd9592aef5a50dc7cef540fe5436d99f334c0463910d413947229dedc4a594e9cb55e05b0a052337c58b42fe49fc5eaab2d0
 MISC metadata.xml 2165 BLAKE2B 5ebce1764fdd8aad171787dbf32dc5c1388506bbab5ef6a85c8990099f177edfed722c5d98a50e54620a7aad62c38072d2f8dbb34d28200902ad2d276e27164c SHA512 c8d70170b63cad752a666e75085f679b28ea520b460f01027d078dc178409dd43ab0f1b79033a149fbb2206a9e0fa6620623cb9df66343a734bdc3920c6c762c
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 8b8ee2335dc1..a84e8282f192 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	>=dev-libs/json-c-0.13:0=
 	>=dev-libs/libinput-1.6.0:0=
 	sys-auth/seatd:=
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	>=dev-libs/wayland-1.20.0
 	x11-libs/cairo
 	x11-libs/libxkbcommon
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 737a344c63c3..ba640f61af29 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 660e6c04c182..4da19fa26660 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -3,9 +3,9 @@ AUX projectx-0.91.0.10-bl2.patch 535 BLAKE2B aeeba4ee7d33c77c64563e48005260c68d5
 AUX projectx-0.91.0.10-idctfast.patch 1089 BLAKE2B 9dbef016e8ce6ac93f8554fe0414191434ac9364ddb51dafb9505c125a887e72dcd38e58f6eecd8595f9b735f099592730debf7948f97927ca3930c30731fa62 SHA512 309beac4a582a3abe25a4f28acf2a69d55f3a7824a18d845a2c46cfb3a05bd1fba1021a01da396eb395a633cc999a96527d53654b2b8cf3c5f87add9ebc2e24d
 AUX projectx-0.91.0.10-stdout-corrupt.patch 378 BLAKE2B 7a92d7c16688e75e6d0510a93a02ac52fec7aec83ea768b70011d5dc8016c7f31cb4194bfd44f6696b6067c0c4fd179e03bf922d49358846b62c33914641128c SHA512 22f859c66d723f501002ca507a3a246716adf584d94d84fbb75b870b3418d93f073b6f46495232a9a9215007283e0acbe21871a4af74695dcbd0fc3a3ecbb2f3
 AUX projectx-0.91.0.10-xdg.patch 1082 BLAKE2B 331e818365afb4aa09a4c6cc4498a674100720cdb76248662d8786cbc14ebcc8cd98a828683b56fd4da44333dc6249bfec1ede3ee861d6719f752954d58d58db SHA512 f41700446a6ff32a95a95f1388aaefdeb9cb3e22a77841ef7ae42e85d0d267d8e4c4581dc0923f98d94de9aaacc7283583554693003c81018ee2a876e02beb58
-DIST projectx-0.91.0.10.tar.xz 830104 BLAKE2B 511481dd2c391a6a26acfa0603f1c221d013d334593cf8ce6da0cf09505387424e58772705e17f9e90da546c43ce5aad313723aafd36063c5cd4a46d93634f86 SHA512 681dae4fd368a00a7ada37f8e64271c838a9c3737008b6fcd7f74679ca9fdf2cce140b0627a4c77a9a00baea76659bad0d2d710511b66026f9597ad153a2e725
+DIST projectx-0.91.0.10-r4.tar.xz 830232 BLAKE2B 26171e583dc608c181d3ab3de050beb569659dfa9cd681e161fd0ee7168c4d0bcdaefc1eb42323c8bf901a33f96ea627c01b0ba63f79519e1f6c5d7868331ec9 SHA512 004a8819736c426a27dbd896c125233a1014260ed2999911bdc7aa83b8aa220776297060755fdf6fb15c6a79e71b14ac166c7d423f3ac568a42e2a21ac8c3da8
 DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d85157aa71e4575003b8ef6e96cbe4b0b40b54bb15b6ca74c14f4bf1855c80f1f6db89294567a77f9e151 SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
-EBUILD projectx-0.91.0.10-r3.ebuild 3286 BLAKE2B 85a2811ecfc0fae87e7e7955e2a8380ee4e1912ee88b8fe1ed487b70fc1a536d06a9e8f7207f346b9c9e9e78818d76da7ad75fc5a0e903ed5f01496372686974 SHA512 646161a61b08a86469695f5a0f6b8162309566b92c01f249853f90437e0b0aab2c78cecb60c4d8f4f86cd6773f48d2eebcc33b06c8e8571be9378c5746822f8d
+EBUILD projectx-0.91.0.10-r4.ebuild 3095 BLAKE2B f708cbf96b9f67b01d580b3e36b623e5874408bf107db17dcf0355ebcfb8176488ca68c3b0e2157b08701280f3c96a7ec24a681fc58b8ffca0eecbc09d95c534 SHA512 197ffb29d545bb445959089998725d2245889e07726ba8f25bd1e70eed219226816e52d354467025abc9be4a2586ef6a60527d8357a5a21eb2c1fd4dd0d1a01e
 MISC metadata.xml 743 BLAKE2B 1100ef8186544c4605495d3cee7ba506559e124fd500a20b54a7cbd912a792b6873143040f46d9b30837c6dd79c0e1f18f6464d25b84dc1681b0886c209471b0 SHA512 7644cbc684eaaaec7838c38a7856b3421e4e9069dc208bad12c9b4c40567ecce706633148656d2ceb193ebd925761599856f6290126ecf88405f9b86af49ab25
diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r4.ebuild
index 25f2b25ae070..bc9ed20e4ba0 100644
--- a/media-video/projectx/projectx-0.91.0.10-r3.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r4.ebuild
@@ -11,7 +11,7 @@ XDG_P="xdg-20100731"
 
 DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
 HOMEPAGE="http://project-x.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${PF}.tar.xz
 	https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
 	https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
 	https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
@@ -33,7 +33,6 @@ DEPEND="
 	${COMMON_DEPEND}
 	>=virtual/jdk-1.8:*
 	app-arch/xz-utils
-	virtual/libiconv
 "
 
 S="${WORKDIR}/Project-X"
@@ -74,13 +73,6 @@ src_prepare() {
 	# convert CRLF to LF
 	edos2unix *.txt MANIFEST.MF
 
-	# convert docs to utf-8
-	if [ -x "$(type -p iconv)" ]; then
-		for X in zutun.txt; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
-		done
-	fi
-
 	# merge/remove resources depending on USE="X"
 	if use X; then
 		mv -f htmls resources/ || die
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index dd6ac649d20f..a7bea64c2c63 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 57edd362205d..ff2c97fec69a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Oct 2022 11:39:38 +0000
+Sun, 09 Oct 2022 17:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 37a85186d1df..62991c77c197 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529253 BLAKE2B 4870d0ebed8f73802444d2a3e204d4fe556355a8b2b4d4ffdd695d17206e94777c458bc34f39aee9fe92a996aea872cf895c73e601729b57032c40785dea2d65 SHA512 ca03ae189444f830ef68a97bf0be8dd0ed5045d9010eaead8695ce26c0591587965b16cbf215850d4c87fa27139a325c616d08f336a7213ad4483bb7e1f46baa
-TIMESTAMP 2022-10-09T11:39:41Z
+TIMESTAMP 2022-10-09T17:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNCsv1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNDB2JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDSCw//cdlKA+P0KmBBYkTz0IvKVEbFkSo9bgPwgzePc//RuzIzBtwYUjNrW7uF
-a+S1yNjqTC9NvKS8ryCiNTL7Sedp6QQLfSLrtX1UoP+q9TLmvkNhyXKg542/RnCs
-RRccHbn3DGiITjxr3kkqVj+Yzs025IFgnt4BpQR7eFaDOylrSaZfbVAfFoExK/9C
-O1tNT1umesPEZcsqU90qlKgPkY56xoHUJJWULny4TG3qnDUGUO2sHUbRhDN7STMP
-yEuDe/wcxtqvhgddAFlqAqMoDP81oiH8epAHA0z1iBWLd6jj8u3PhEjCeQQuVYuz
-hb0tFHMznKkKNq5QFYswR/rBMkdx4GmNb9vZ5pLzVR5+A9nDUBX2dcZFvzp2REZl
-auH0tZepQ7D+GWvxERWu/eH3UJAS0kZHwE6pqOwDRf4TQWI5lssuaf9Urr0JaZSt
-TQgr6KLSYL76JU0F4cHfeb+V8JZf4HPc4oRHFAZyVKP+x01HI/4Tw1zZg0gBs3XT
-HEH1TZqtLKZ1LQTGY8Oa1zat/LVrIsF0VBU3vyGRpHgSptzz761JIhuv9NZ8Wn2V
-KAqKfgampoDfgZfb8HKmJ7/47EW/9xlRKFZpRmOBCYeaBz7B8zbParMOZybobDsA
-c0StaOorvVXL+Ig9c28RGjdKVJ9IZ6R3muPQVMFgfDBBLwNrIiw=
-=LVG0
+klBGLA/9Fzk2OGXWLL8urDgrcXlwZtkJ7+/oQ/VrKSaGYRV5M/UC0vnp2YbALlfX
+nip3M3CKe8MW/Z92I0ZFdZ7lMo4LpUkuO85eVJoMEXJcS7hqjVkZ53OnYooT+XLl
+3X+LBjrUhAR/J4HT3cHfY4idaIznX+Nd3VMBhmTHSrL9AEFnrCcl33tUgNGR/ER0
+eb3HXONljUbOBX7l1sz9zmOuCaRdlFahMbYLqlJserncLvuJf5/7B34R2+PqQIVb
+e3maZC56QblyEZZ9dT7vG5f6kKbPoeMByrROtBmALwlhPWeuQdb4IQw5y1SVS09q
+fc9u1+SlnNnhtnQbc3trjkfPjY6eexu0aoHU8Cfpiq1tZS3cswZ2vs/ToE/DISb/
+k3mjxwux3nwCP9PMSaUjYMPN4/7NWGsqkFZoIE9Mjxcg8Px3Gc1hjFimRx7rJ+OJ
+vgrBEMMJUQgvbUvIYgUS+aYTcMhVIjGpV4QnwTszM1sU6MpkcfDI3mqFcLJvwcoN
+dEPlRItj/Efdj9oKeeTTgML2NhKZQnohZbw8AM9QeD8VqB9VgPBxlxWrkF7uyY3b
+LC+nvDpkK3l7jNZ0AlbH4xuq3sEt+YIN69agbq2s6dVDeSGmI6nAC1RVHViOi/YQ
+FNRWZHmYz64VqmiqLKuQ9ueN3rMXv+IJg2wNMYf0B1mR9NW4KPY=
+=HOuk
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 57edd362205d..804e9bfee3d9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Oct 2022 11:39:38 +0000
+Sun, 09 Oct 2022 17:39:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0c487d3d32fe..52b3a88d6610 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index d1ed5ba23887..4e2d92836aab 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
index a5b30a6089c0..bd926e15fda9 100644
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
@@ -5,10 +5,10 @@ DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
 EAPI=7
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin
 INHERIT=cmake
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4d891b93f5c898c0d6eea7204e18d2df
+_md5_=a3bbdb30deae4654b21443d42a712c93
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 89e6b91a1b92..0abfcef867db 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/joda-time-2.11.2 b/metadata/md5-cache/dev-java/joda-time-2.11.2
index 395037b2e677..feb2b4072a92 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.11.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.11.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.joda.org/joda-time/
 INHERIT=edo java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/v2.11.2.tar.gz -> joda-time-2.11.2.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=cb0872042b4d0cfd5ea0346bf752952f
+_md5_=f85f2d07a632373bc187d1b1f3311802
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.33 b/metadata/md5-cache/dev-java/snakeyaml-1.33
index b96e358dd352..c13c6418fd5c 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.33
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.33
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/snakeyaml/snakeyaml
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	f12881bcef20aecfcb172218e0b260f7	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=235984b446125e404b0df4a66bd3fa85
+_md5_=1eb703ee0a30bf2c960393927ecc5083
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 12bd388cd227..84fb2e08f5a5 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libgrapheme-2.0.1 b/metadata/md5-cache/dev-libs/libgrapheme-2.0.1
new file mode 100644
index 000000000000..cb833ff38c7b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgrapheme-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Unicode string library
+EAPI=8
+HOMEPAGE=https://libs.suckless.org/libgrapheme/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+SLOT=0/2.0
+SRC_URI=https://dl.suckless.org/libgrapheme/libgrapheme-2.0.1.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e048f5a317f6bdf44c5482db43ec67d2
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 5db533244d15..781eb03ccfd5 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/lwt-5.4.2-r1 b/metadata/md5-cache/dev-ml/lwt-5.4.2-r1
index 411ec3ac7db2..5f8e64a33981 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.4.2-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.4.2-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-ml/cppo dev-ml/findlib dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
+DEFINED_PHASES=compile install prepare test
 DEPEND=dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= dev-ml/ppxlib:= dev-ml/react:= dev-ml/luv:= dev-libs/libev >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Cooperative light-weight thread library for OCaml
 EAPI=7
@@ -12,4 +12,4 @@ RDEPEND=dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= dev-ml/ppxlib:= dev
 SLOT=0/5.4.2
 SRC_URI=https://github.com/ocsigen/lwt/archive/5.4.2.tar.gz -> lwt-5.4.2.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=bbedd63f9bd65e93de5d9ed8a1c6191a
+_md5_=9f538a3c00c741537c1f7706562f8de3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a8d2ddad8d95..d9a653bd7744 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.1-r1 b/metadata/md5-cache/dev-python/beniget-0.4.1-r1
index acc53afd662f..ccde5b8a8e6e 100644
--- a/metadata/md5-cache/dev-python/beniget-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/beniget-0.4.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/beniget/ https://github.com/serge-sans-paille/beniget/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND==dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.1.tar.gz -> beniget-0.4.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b9dfb5ed242a6f69b9f8c5d36f618b2
+_md5_=96411882a788811913abdc8644b00995
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.3.0 b/metadata/md5-cache/dev-python/cairocffi-1.3.0
index cd48545c550f..2dbf43581679 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.3.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Kozea/cairocffi
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.3.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=5201bc291e8c9c6411decfd45ee640c5
+_md5_=1c7b3b900930016a150b452416b05496
diff --git a/metadata/md5-cache/dev-python/dnspython-2.2.1-r1 b/metadata/md5-cache/dev-python/dnspython-2.2.1-r1
index 555979dcb716..3d06e20d98b2 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/dnspython-2.2.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.dnspython.org/ https://github.com/rthalley/dnspython/ https://pypi.org/project/dnspython/
 INHERIT=distutils-r1
 IUSE=dnssec examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=dnssec? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) <dev-python/idna-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v2.2.1.tar.gz -> dnspython-2.2.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bdff1bbf17daea862087fac125d8d79a
+_md5_=adb7ed1d4719cb9ef88a8082a9026024
diff --git a/metadata/md5-cache/dev-python/gast-0.5.3-r1 b/metadata/md5-cache/dev-python/gast-0.5.3-r1
index a2eb542ec408..318cff1d5c92 100644
--- a/metadata/md5-cache/dev-python/gast-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/gast-0.5.3-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/gast/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD PSF-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gast/gast-0.5.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3e88d00f5d487fdbe5aae6aa1c3dd559
+_md5_=c239fe3a7b2c3a6ba3cde61f121b1bcc
diff --git a/metadata/md5-cache/dev-python/meson-python-0.10.0 b/metadata/md5-cache/dev-python/meson-python-0.10.0
index e3894716464b..2a05a1eff6cd 100644
--- a/metadata/md5-cache/dev-python/meson-python-0.10.0
+++ b/metadata/md5-cache/dev-python/meson-python-0.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/meson-python/ https://github.com/FFY00/meson-python/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyproject-metadata-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/meson-0.63.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FFY00/meson-python/archive/0.10.0.tar.gz -> meson-python-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0936527048cf28c1e1b69ce61e39d4ae
+_md5_=595ff48a295612a1194ac0e248b4e242
diff --git a/metadata/md5-cache/dev-python/pipenv-2022.9.24 b/metadata/md5-cache/dev-python/pipenv-2022.9.24-r1
index c30adaae14e5..3e9fa578674e 100644
--- a/metadata/md5-cache/dev-python/pipenv-2022.9.24
+++ b/metadata/md5-cache/dev-python/pipenv-2022.9.24-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipenv/archive/v2022.9.24.tar.gz -> pipenv-2022.9.24.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=60ccd11b2e2d43ae3daa94854f5f2d1e
+_md5_=652c37e84a602f89e9fd57c7d8dff5ea
diff --git a/metadata/md5-cache/dev-python/pydantic-1.10.2 b/metadata/md5-cache/dev-python/pydantic-1.10.2
index 326fab658186..3974518705d5 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.10.2
+++ b/metadata/md5-cache/dev-python/pydantic-1.10.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/typing-extensions-4.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydantic/pydantic/archive/v1.10.2.tar.gz -> pydantic-1.10.2.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c0d3872819debdf9f2edd16d91868e76
+_md5_=a33a42bf68348410edc0c189b9aecc08
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1 b/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
index daf7c85e4697..6207b3bb01ce 100644
--- a/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
+++ b/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/FFY00/python-pyproject-metadata/ https://pypi.org/project/pyproject-metadata/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com//FFY00/python-pyproject-metadata/archive/0.6.1.tar.gz -> pyproject-metadata-0.6.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2300bdc5bf1d114bdaaf0218a54bb5c2
+_md5_=b06c4cf2f036413ac737be41ae5f8182
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r2 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r3
index e438d3b2a6a1..4a986fe538bc 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r2
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r3
@@ -5,8 +5,8 @@ HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( >=sys-libs/glibc-2.35 ) !dev-python/pypy-exe:7.3.9
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-devel/gcc sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( >=sys-libs/glibc-2.35 ) !dev-python/pypy-exe:7.3.9
 SLOT=7.3.9
 SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.xpak -> pypy-exe-7.3.9-2.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-1.xpak -> pypy-exe-7.3.9-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-1.xpak -> pypy-exe-7.3.9-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.xpak -> pypy-exe-7.3.9-2.x86.xpak ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-1.xpak -> pypy-exe-7.3.9-1.amd64-musl.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-1.xpak -> pypy-exe-7.3.9-1.arm64-musl.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-1.xpak -> pypy-exe-7.3.9-1.ppc64le-musl.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-1.xpak -> pypy-exe-7.3.9-1.x86-musl.xpak ) )
 _eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8
-_md5_=731cd63256e4ed789db607d976350417
+_md5_=581c90a3f586153ab67319afddefb9d5
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r2 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r3
index 4ebc956d20bf..00b69c728ba3 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r2
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r3
@@ -5,8 +5,8 @@ HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( >=sys-libs/glibc-2.35 ) !dev-python/pypy3-exe:3.9-7.3.9
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-devel/gcc sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( >=sys-libs/glibc-2.35 ) !dev-python/pypy3-exe:3.9-7.3.9
 SLOT=3.9-7.3.9
 SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.x86.xpak ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.amd64-musl.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.arm64-musl.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.x86-musl.xpak ) )
 _eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8
-_md5_=c707d74145a58572e226bb8cda90ed08
+_md5_=0a7aa25b683d41e0c3c13f22ab60f55a
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.21.0 b/metadata/md5-cache/dev-python/python-dotenv-0.21.0
index 2b2b3a027f50..f6713c623312 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.21.0
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.21.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/theskumar/python-dotenv
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.21.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c6f9440bac8f4c5ba579229a1b20fe9e
+_md5_=8b36b0e6b5f7172c6eed9a367483d142
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.3.0 b/metadata/md5-cache/dev-python/python-email-validator-1.3.0
index c7267a8879f1..3cb634d06ca4 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.3.0
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/JoshData/python-email-validator/ https://pypi.org/project/email-validator/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=CC0-1.0
 RDEPEND=>=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.3.0.tar.gz -> python-email-validator-1.3.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=61daa674985c69acf63524ac993219d0
+_md5_=d885d74922749cd788f9c6f0b561c797
diff --git a/metadata/md5-cache/dev-python/pythran-0.12.0-r1 b/metadata/md5-cache/dev-python/pythran-0.12.0-r1
index a4dd7f37cafb..c83408938066 100644
--- a/metadata/md5-cache/dev-python/pythran-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/pythran-0.12.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost =dev-python/beniget-0.4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.12.0.tar.gz -> pythran-0.12.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=20c0690778fd7b20573d91e8b8132093
+_md5_=b5bfdb83d9bdaaa76d91ed367816929f
diff --git a/metadata/md5-cache/dev-python/scipy-1.9.2 b/metadata/md5-cache/dev-python/scipy-1.9.2
index cae1bff7fcbd..1f2c670840d1 100644
--- a/metadata/md5-cache/dev-python/scipy-1.9.2
+++ b/metadata/md5-cache/dev-python/scipy-1.9.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing
 IUSE=doc +pythran test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 -hppa ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.9.2.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3135d4b1cfd1dd2abedcd1ba96d3df41
+_md5_=beed2bd4494112b196025d52b03c558a
diff --git a/metadata/md5-cache/dev-python/sh-1.14.3 b/metadata/md5-cache/dev-python/sh-1.14.3
index d418eca70637..68d53cd69d2c 100644
--- a/metadata/md5-cache/dev-python/sh-1.14.3
+++ b/metadata/md5-cache/dev-python/sh-1.14.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/amoffat/sh/ https://pypi.org/project/sh/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.14.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eca9d2b915e7f82f3e6ece9f860a8598
+_md5_=2496e80d3d9bcb36c7bd1d643281d263
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 223174c794a6..c7438f1b4280 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.16.0 b/metadata/md5-cache/dev-util/bpftrace-0.16.0
index b65b3fa28b44..69a407943a54 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.16.0
+++ b/metadata/md5-cache/dev-util/bpftrace-0.16.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.16.0.tar.gz -> bpftrace-0.16.0.gh.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5049e6272709403fe5e5b8384918534b
+_md5_=af7ac55f641cbffc05180f8513398a40
diff --git a/metadata/md5-cache/dev-util/patchelf-0.15.0 b/metadata/md5-cache/dev-util/patchelf-0.15.0
index ffcf13a93715..6b26eaca2304 100644
--- a/metadata/md5-cache/dev-util/patchelf-0.15.0
+++ b/metadata/md5-cache/dev-util/patchelf-0.15.0
@@ -4,9 +4,9 @@ DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executab
 EAPI=8
 HOMEPAGE=https://github.com/NixOS/patchelf
 INHERIT=autotools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/NixOS/patchelf/archive/0.15.0.tar.gz -> patchelf-0.15.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=36dc71542aa790cab6cd4070f0413660
+_md5_=b3572aa87afc44479f547c4a27e0ccbe
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 8d4131a7ca06..5e3ac9786971 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.47.05 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.47.05-r1
index 27a204b3627e..47c6b9b9cfe0 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.47.05
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.47.05-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=dev-libs/glib:2 media-libs/glew:0= media-libs/libglvnd[X] media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib:= virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses
+DEPEND=dev-libs/glib:2 media-libs/glew:0= media-libs/libglvnd[X] media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib:= virtual/glu gui? ( x11-libs/gtk+:2 ) media-libs/libsndfile media-libs/openal sys-libs/ncurses
 DESCRIPTION=Single-player fantasy game
 EAPI=8
 HOMEPAGE=https://www.bay12games.com/dwarves/
 INHERIT=desktop flag-o-matic optfeature prefix readme.gentoo-r1 toolchain-funcs
-IUSE=debug
+IUSE=debug gui
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=free-noncomm BSD BitstreamVera
-RDEPEND=dev-libs/glib:2 media-libs/glew:0= media-libs/libglvnd[X] media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib:= virtual/glu x11-libs/gtk+:2
+RDEPEND=dev-libs/glib:2 media-libs/glew:0= media-libs/libglvnd[X] media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib:= virtual/glu gui? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=amd64? ( https://www.bay12games.com/dwarves/df_47_05_linux.tar.bz2 ) x86? ( https://www.bay12games.com/dwarves/df_47_05_linux32.tar.bz2 ) https://dev.gentoo.org/~ionen/distfiles/dwarf-fortress.png
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c49185c42bec05b04945051cddc1e9e7
+_md5_=074641d52010c2e5c1974d9455cbb726
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 0906ab67d8c0..7e3ba17882ce 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index af13ffc56e71..930389723e6a 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/wayland-protocols-1.24 >=dev-util/meson-0.60.0 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X?]
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre2 >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X?]
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=8
 HOMEPAGE=https://swaywm.org
@@ -8,8 +8,8 @@ INHERIT=meson optfeature git-r3
 IUSE=grimshot +man +swaybar +swaynag tray wallpapers X
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=x11-misc/xkeyboard-config grimshot? ( app-misc/jq gui-apps/grim gui-apps/slurp gui-apps/wl-clipboard x11-libs/libnotify ) >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X?]
+RDEPEND=x11-misc/xkeyboard-config grimshot? ( app-misc/jq gui-apps/grim gui-apps/slurp gui-apps/wl-clipboard x11-libs/libnotify ) >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre2 >=dev-libs/wayland-1.20.0 x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( sys-apps/systemd sys-auth/elogind sys-libs/basu ) ) wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X?]
 REQUIRED_USE=tray? ( swaybar )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e72d61ff956a08cfac589d094bff3299
+_md5_=e155245edcc4c314967c95cf590071b7
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 05fb65dfaf16..f2affaa28d6a 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10-r3 b/metadata/md5-cache/media-video/projectx-0.91.0.10-r4
index 1d9ccbc80df9..7114ea90ad2f 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10-r3
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-java/commons-net:0 X? ( dev-java/browserlauncher2:1.0 ) >=virtual/jdk-1.8:* app-arch/xz-utils virtual/libiconv >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-java/commons-net:0 X? ( dev-java/browserlauncher2:1.0 ) >=virtual/jdk-1.8:* app-arch/xz-utils >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Converts, splits and demuxes DVB and other MPEG recordings
 EAPI=7
 HOMEPAGE=http://project-x.sourceforge.net/
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-java/commons-net:0 X? ( dev-java/browserlauncher2:1.0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10.tar.xz https://dev.gentoo.org/~billie/distfiles/projectx-idctfast.tar.xz https://dev.gentoo.org/~billie/distfiles/xdg-20100731.java.xz https://dev.gentoo.org/~billie/distfiles/projectx-icon.png
+SRC_URI=https://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10-r4.tar.xz https://dev.gentoo.org/~billie/distfiles/projectx-idctfast.tar.xz https://dev.gentoo.org/~billie/distfiles/xdg-20100731.java.xz https://dev.gentoo.org/~billie/distfiles/projectx-icon.png
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d7377c4cfaa6b8bd7d1e17c54ccf4322
+_md5_=c4de92501c96e645502be8a11cb06bdf
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index fc21a4824cec..cc998769d24c 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/netwatch-1.3.0.1-r4 b/metadata/md5-cache/net-analyzer/netwatch-1.3.0.1-r4
deleted file mode 100644
index 95af5aa42cdb..000000000000
--- a/metadata/md5-cache/net-analyzer/netwatch-1.3.0.1-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses sys-kernel/linux-headers virtual/pkgconfig
-DESCRIPTION=Ethernet/PPP IP Packet Monitor
-EAPI=7
-HOMEPAGE=http://www.slctech.org/~mackay/netwatch.html
-INHERIT=autotools
-IUSE=doc
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://www.slctech.org/~mackay/NETWATCH/netwatch-1.3.0-1.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=59e655640cd1ab4e7e1f1a0cd0f5fe52
diff --git a/metadata/md5-cache/net-analyzer/netwatch-1.3.0.1-r5 b/metadata/md5-cache/net-analyzer/netwatch-1.3.0.1-r5
new file mode 100644
index 000000000000..363391f03d3d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netwatch-1.3.0.1-r5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:= sys-kernel/linux-headers
+DESCRIPTION=Ethernet/PPP IP Packet Monitor
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=autotools flag-o-matic
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=mirror://gentoo/netwatch-1.3.0-1.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=acb40cf3f676eede2bf1f386c593e447
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index cbb39caae2c5..4a4f7bbabdf0 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/amd-2.4.6-r1 b/metadata/md5-cache/sci-libs/amd-2.4.6-r1
index 4e7f407809cc..2ddaa8d5982c 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 INHERIT=autotools fortran-2
 IUSE=doc fortran
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0 fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/amd-2.4.6.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=557c34d24978d4a64a3328bcf1dc2875
+_md5_=59a69a883dbfeb1a32b75453a1c8e609
diff --git a/metadata/md5-cache/sci-libs/camd-2.4.6-r1 b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
index df8227f1ac71..a913b1843e95 100644
--- a/metadata/md5-cache/sci-libs/camd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/camd-2.4.6.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=95169c71f725a1e60c4d2e5b0aac6a61
+_md5_=6f4ef3577f59a4193170bccec619316c
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.9.6 b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
index ea1c30470aeb..e463791947e5 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
@@ -4,9 +4,9 @@ DEPEND=sci-libs/suitesparseconfig
 DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage//ccolamd-2.9.6.tar.bz2
-_md5_=d487b6ca3c59af0c7ccaa0c7ee3f807f
+_md5_=cdfdcdf2e1704bb058004715635601c4
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.14 b/metadata/md5-cache/sci-libs/cholmod-3.0.14
index 43a665212f65..a120c65ad107 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.14
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.14
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 INHERIT=toolchain-funcs
 IUSE=cuda doc +lapack +matrixops +modify +partition
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
 RDEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd >=sci-libs/metis-5.1.0 )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.14.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=57717cc7289df6f2e216987555724ad0
+_md5_=e7d3cc152ae9f765244e6935e1756501
diff --git a/metadata/md5-cache/sci-libs/colamd-2.9.6 b/metadata/md5-cache/sci-libs/colamd-2.9.6
index 3b8383046111..a46788ffb0ce 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/colamd-2.9.6
@@ -4,9 +4,9 @@ DEPEND=>=sci-libs/suitesparseconfig-5.4.0
 DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/colamd-2.9.6.tar.bz2
-_md5_=23a759b4832b69ba9d41f756f4e9efc6
+_md5_=5332230bb3ca3cb73ae732ee71fc2601
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r5 b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
index d3a31fa8e552..c876149e230f 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r5
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 INHERIT=cmake
 IUSE=doc double-precision examples int64 openmp
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=!<sci-libs/parmetis-4.0.3-r2
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=281b2b5f8ffd61f5e478abb2b599bf13
+_md5_=23c8dc15167ae51b00c13305878786b3
diff --git a/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0 b/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
index 005e19a0e93d..39ce9e416f63 100644
--- a/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
+++ b/metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 INHERIT=multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/suitesparseconfig-5.4.0.tar.bz2
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=45f1cd2781a8414e49b763b0fc5faafd
+_md5_=9bd763e9b0e1be59992fd69f8f326c9d
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.7.9 b/metadata/md5-cache/sci-libs/umfpack-5.7.9
index 2e0721a342be..a5ad84cf5d83 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.7.9
+++ b/metadata/md5-cache/sci-libs/umfpack-5.7.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 INHERIT=toolchain-funcs
 IUSE=+cholmod doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( sci-libs/cholmod )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/umfpack-5.7.9.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fa14556f7c9c17028c6fa2ce49a15f4c
+_md5_=f6ed37ce7c3f1e6539d0775edf9ee5fc
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index fd2a5be98065..b4893457b2a1 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.39-r3 b/metadata/md5-cache/sys-devel/binutils-2.39-r3
index b09c1f6ee88d..9a1897322ca0 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.39-r3
+++ b/metadata/md5-cache/sys-devel/binutils-2.39-r3
@@ -6,6 +6,7 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 IUSE=cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=42c0d03131745507f68932737e0dba89
+_md5_=f9b5036f2636e94a0bdd500a285f8557
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r3 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r3
new file mode 100644
index 000000000000..4c871583a745
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r3
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DESCRIPTION=Tools necessary to build programs
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+INHERIT=libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
+IUSE=cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla
+KEYWORDS=-* ~hppa
+LICENSE=GPL-3+
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+REQUIRED_USE=default-gold? ( gold )
+RESTRICT=!test? ( test )
+SLOT=2.39
+SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4c0cafb191e239de4560da946a851aa1
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index a6e58033e4aa..509243b6aae6 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-6.0_p1 b/metadata/md5-cache/sys-kernel/pf-sources-6.0_p1
new file mode 100644
index 000000000000..9d68b761b60e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-6.0_p1
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=8
+HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
+INHERIT=kernel-2 optfeature
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.0_p1
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v6.0-pf1.tar.gz -> linux-6.0-pf1.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.0-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.0-1.extras.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5efebbcec7b9ad7645decc7fcd5fc620
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.18.16 b/metadata/md5-cache/sys-kernel/zen-sources-5.19.13
index 97a5605c0aec..49b9331a2e14 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.18.16
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.19.13
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.16
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.18.16-zen1/v5.18.16-zen1.patch.xz
+SLOT=5.19.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.19.13-zen1/v5.19.13-zen1.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=95c873030eaccf7a04d03258a87f310a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 43c663fc0da6..881a9a5d3179 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.39-r3 b/metadata/md5-cache/sys-libs/binutils-libs-2.39-r3
new file mode 100644
index 000000000000..e6823cefe9b7
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.39-r3
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+INHERIT=libtool toolchain-funcs multilib-minimal
+IUSE=64-bit-bfd cet multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
+SLOT=0/2.39
+SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=217fa07b2e3cd595f2b7ae351c5d61d8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 244f7bbf5679..7b1c112e9f83 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/novnc-9999 b/metadata/md5-cache/www-apps/novnc-9999
index 6590dfed7e9b..4742925545a7 100644
--- a/metadata/md5-cache/www-apps/novnc-9999
+++ b/metadata/md5-cache/www-apps/novnc-9999
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=noVNC is a VNC client implemented using HTML5 technologies
 EAPI=8
-HOMEPAGE=https://kanaka.github.com/noVNC/
+HOMEPAGE=https://kanaka.github.io/noVNC/
 INHERIT=distutils-r1 git-r3
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=LGPL-3
@@ -11,4 +11,4 @@ RDEPEND=dev-python/websockify[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7ccfd502e8bc2414c87f99f2bdde6598
+_md5_=3de800d6113cf2e323d1bb5e359174cd
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 2c76e6a36b8d..0e2e4ffb5ea8 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-106.0.5249.103 b/metadata/md5-cache/www-client/chromium-106.0.5249.103
index b49c0f7f8c7f..be59ebe94610 100644
--- a/metadata/md5-cache/www-client/chromium-106.0.5249.103
+++ b/metadata/md5-cache/www-client/chromium-106.0.5249.103
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chromium.org/
 INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
 IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-106.0.5249.103.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-106-patchset-3/chromium-106-patchset-3.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3f044eb8cac5e36c53f34f1b462a593e
+_md5_=0004a7a14a87dddc56ead5a04681dba2
diff --git a/metadata/md5-cache/www-client/chromium-106.0.5249.61 b/metadata/md5-cache/www-client/chromium-106.0.5249.61
deleted file mode 100644
index f8a01b8797f9..000000000000
--- a/metadata/md5-cache/www-client/chromium-106.0.5249.61
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=amd64 arm64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-106.0.5249.61.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-106-patchset-3/chromium-106-patchset-3.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5672addd60183fd516c6249eaa47be4c
diff --git a/metadata/md5-cache/www-client/chromium-106.0.5249.91 b/metadata/md5-cache/www-client/chromium-106.0.5249.91
deleted file mode 100644
index f25fa99e2a51..000000000000
--- a/metadata/md5-cache/www-client/chromium-106.0.5249.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-106.0.5249.91.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-106-patchset-3/chromium-106-patchset-3.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2921a77c1563f56c4959d1a5d26d3524
diff --git a/metadata/md5-cache/www-client/chromium-108.0.5327.0 b/metadata/md5-cache/www-client/chromium-108.0.5343.2
index 65ffb4aeed76..dd859028e764 100644
--- a/metadata/md5-cache/www-client/chromium-108.0.5327.0
+++ b/metadata/md5-cache/www-client/chromium-108.0.5343.2
@@ -1,16 +1,16 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=8
 HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
 IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
 KEYWORDS=~amd64 ~arm64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/dev
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-108.0.5327.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-108-patchset-1/chromium-108-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9addd16e2bb873df000fca3bcfe60d66
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-108.0.5343.2.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-108-patchset-2/chromium-108-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=39cd1dd398ae08d77b87240ade7d7f70
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-108.0.5327.0-r1 b/metadata/md5-cache/www-client/google-chrome-unstable-108.0.5343.2
index c629f32e7913..cb56359a01ea 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-108.0.5327.0-r1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-108.0.5343.2
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_108.0.5327.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_108.0.5343.2-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a60e12e83b7e93af00bfed9f56f9135
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index d2ea5c342987..a6da948f9e68 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5327.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5343.2_alpha
index 7c50f7234493..cd17cba5d6c4 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5327.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5343.2_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_108.0.5327.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_108.0.5343.2-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 5395cc9b3b55..62d14f060727 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.33-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.33-r2
index ed481e66dc22..bf1ee5cf527f 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.33-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.33-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3 virtual/pkgconfig examples? ( x11-libs/gdk-pixbuf ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !aqua? ( x11-base/xorg-proto ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-themes/hicolor-icon-theme ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !aqua? ( x11-base/xorg-proto ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-themes/hicolor-icon-theme ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gimp ToolKit +
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
@@ -9,10 +9,10 @@ IUSE=aqua cups examples +introspection test vim-syntax xinerama abi_x86_32 abi_x
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-themes/gtk-engines-adwaita vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard !<dev-util/gtk-builder-convert-2.24.33
+RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard !<dev-util/gtk-builder-convert-2.24.33
 REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.33.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e5424350217756694af4d9e50eb18d55
+_md5_=272b8515b9a41372b176bd913285bf78
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b9bae925c156..9fa172dfc1ad 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
index 694ffd520160..5a6f05365821 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
 INHERIT=xdg-utils
 IUSE=+keybinder libcanberra libnotify wnck
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42.0 media-sound/pulseaudio:=[glib] >=x11-libs/gtk+-3.20.0:3 >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3 ) libcanberra? ( media-libs/libcanberra ) libnotify? ( x11-libs/libnotify ) wnck? ( x11-libs/libwnck:3 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.5.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6604b80e996e44de86094d2f2a103c9d
+_md5_=fcc0260bfbd2f7e3e6cf5c2746c7b452
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 47aa72bb0b25..a429045d1009 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-09T11:39:41Z
+TIMESTAMP 2022-10-09T17:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNCsv1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNDB2JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCJWhAAgzRc3LTWZOuVSpSqx2ObhioDHLMwn8BB96txdcG6k4F4qFT17D+HpO2i
-eyNsDZB3CsjXZzXSWi52XnIgN2RnX2WtZaTtLGudDZDTUVREv+K+raFOKyvTIiZk
-6dRyDJIQOePtgb0w+vPN20DPSLJ2S7bcbAKibUktwYf0oc1Dv/jyQwRKn+MXnqtU
-FIVh46TT6Kajr64PB7kD/1ebqodi2GhacLyLP6gJJLIifzSPAHizCSYj0WWKP6cx
-mOJuqqXEeAYFg5mQe8DrkK8FucfqVUI0QaE17htkuFJQrFVB9OT9fqGhpUO4+MSx
-2DKoQBeCqYCJyKQ97ex9Vj05AdPRI25MqZKjTjEzLpM4xCcyWOmuDUuymFcXOEAO
-M/0eyaANc9qMsjiLPyUodaSGQCfHf7qHBrgV2lZmYYu3dbAM8wXLqLmPGaOamtmQ
-+scVXy8Z6hz3LRSCviVbji/qTQlyb/DFIMP861ff0zrRCGmCEPJucPgULGaeEjZD
-TGyUquiBA5bxsoJRNcg6SS9atGuhjC42rUvmpM835Rz2tPOEybkY6E1yv6fvRYME
-jHXiqZ2jN1XIOOEi6m/v7mzj2poAKI4l0Uy444ENuPhe5JvPW9us6BygAQTXQHX9
-GN0yfouzB26hJ7IiVssPi++snbNSQkWUWNmKeMumD2fxql0dwd4=
-=3PDI
+klApPhAAs2GVfA7soiqeQ/zyxK+IM9AXfaBQGRoinQ6tldcbtytKuHfiJr+3P7In
+E5gpXRwKyFUFqpiccKAmmKI+9tCdgPTIgGOrTx9VnHIq6AQGonaztc2Qz4fOP1u7
+pqNtc9OcEr2eOBMhuk0oKoaV7f7SLgwHrFgq64XUd3iPzBGqqbpNVc0GAc/KVXB5
+i/nth3gsG9AchqictpdmdZegHpqZbYLyhApGsoUPxjn1Cg0x+5bwFE+Wq8G5Q+Sm
+UhT6uKrKob5NZevQ0V4Iy9hTw/q6BAueDVHD3D77qLdwFGwG2o3U0fCveopXP946
+Th/zmGFFnmls40oxeffQxLp1wR/t2Gz9QBf5pfj3Gg1GycMISWKRDVH1QUF8KJKk
+xfapXasy4RutfRE2KQRenKcpKHnZPuJewNVqeLsCSTns9/4Iw2u1WhOmiyOfGEoL
+Sb/bUb+glhjow5gcoDVDDN8Wj+8wXfgT5jDGtG88V/fKqCszQBFClPWOpdUj4nEL
+vC0Rgo+jYcLPN4DgtWLQ4A1Jn35U5Iz3te0vDbypgYDbO/O6mJLj4Mtvv/EbbkR5
+RHf7TjbbMopubX64njLdFPjlBr7MJ6sFco74lqJ9ytJTJtpj6RHsAuQb5lQ4G2x0
+VgmV+7utXyezMBPTdgd3Beb396qi0fMSx35fSTF28p3MAlAjHwU=
+=K+ow
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 57edd362205d..804e9bfee3d9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Oct 2022 11:39:38 +0000
+Sun, 09 Oct 2022 17:39:43 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a99f43ae39dd..bedada0cd18f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Oct  9 11:39:37 AM UTC 2022
+Sun Oct  9 05:39:42 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5a09856205db..1f4fa0f33ee0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Oct 2022 11:45:01 +0000
+Sun, 09 Oct 2022 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f826af2f65b5..5d0fb4c00574 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-52f383cc7c5301b7c5dd7819fdc3b9f3777978f0 1665314426 2022-10-09T11:20:26+00:00
+1e8098ff475a9a3db44bf6f5d659ea97784f3deb 1665334310 2022-10-09T16:51:50+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5f1d76da6e2a..ced334c0e25f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1665315601 Sun 09 Oct 2022 11:40:01 AM UTC
+1665337201 Sun 09 Oct 2022 05:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 57edd362205d..804e9bfee3d9 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Oct 2022 11:39:38 +0000
+Sun, 09 Oct 2022 17:39:43 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8d125bf1e561..ccd5e3251f5f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index 62d1dc874ace..22cbef0db0f0 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -1,10 +1,12 @@
 AUX netwatch-1.3.0.1-append_ldflags.patch 558 BLAKE2B cdfe908ef103ba484ab6e375dabd6b7bd60bd1c93d4b834d1da640a73ce3912541f75632ac8ee51c3dbf38a4168b7301c73c3986bbe043890071da761f4e73dd SHA512 afee222f8f0c18de7b1c5f62d0f3705e40dccb09827410c67f61da9a0dc951c2d01b0e02cc4b6154d17ef8aaa625dd4265c4514a97d7df9dd9dc14da8a851338
+AUX netwatch-1.3.0.1-clang16.patch 448 BLAKE2B 4a13862cdc3414a74177637c535d105205b13e33b7b72e64f07a5886df2c17bf5e403a55dd77a0d3a402aea106438295d9b92d5df999fa85a56695d809b709f9 SHA512 e228fdcce607c8cd6fd4bc62a7d64979af1c98fd00de33c1bbacf0cc9a7a84288cbe9d6840751767980fc09c1d356eca0a1e0e6fd0e0f60294be8185e8fcb7b1
 AUX netwatch-1.3.0.1-do-not-call.patch 307 BLAKE2B 686d4d6d5ada26620ca8a2b02021be1fef17d3ba8da8149bb7dc037c386e1590f44a62357d779ce87732496cc8f9957a1df9e29947f6def7d18cf4e8b3dc29cb SHA512 988516e66e0f02edd484854488fe232c6ae8158d135a2e26837b9c2178650111cf2d33c29bee3f9c0b01b21d7ded0eebf93b39fa7a714a04e3d99f490f7690ea
 AUX netwatch-1.3.0.1-fix-fortify.patch 313 BLAKE2B 1f5d672118dfd3ef9b907e77b8a575f1e025d66b584dc4c74ac500ccf03a353dda5841a19a920a97224cd6fe784adfb40878ccd43ed82387d0ffa4ffd76f2ccb SHA512 ed33d1df73293c172982f016d033bf2bd35fca50e89e20433ae867b418446a44614da49b161f190c7579b21cfb1d01e514fc77fddb3ca5f469f0daec2acab0cf
 AUX netwatch-1.3.0.1-fno-common.patch 1075 BLAKE2B a2329a590a088ff0a5b4e985945d6f92cbe02dd2865ed0f4caaa356671aba03cabbf9850c3f0651416fc93d5e794b528b72814d478fe32d90b1cb5f8dfb5504f SHA512 a257ce4ca20abcdc268cdf86a2ceee683f016f67af78622f620f18d9aaa4a0f3c0cfbae0edf8fefa718996d86353f094a4c6b886edda6ccd906f408398377789
 AUX netwatch-1.3.0.1-includes.patch 489 BLAKE2B 9528ed80f11b33652824e9239022b85e1ec8331b2b1e31c5000d8f8ae863d572fd12d15d003b829c4487faee09b28fd29ec51579072b2a731f01990b597ddfbf SHA512 dd1005f58772aeef3909342df0b4a1f14bbd509b51361ab52f752b274fb51ab3a45a93b6af4feaaedb4fbace94ae55c7e153c9f1eb8257f66549c72a957885f1
+AUX netwatch-1.3.0.1-lto-mismatch.patch 215 BLAKE2B c453e8cf574253cd6b3b82e2c0b5b80b0625dc380a580dd99ca4dd657706588ab64b2e33b2740672e31394bd0950a8dffa6ec4188454ea20ee5a51c2dde074b2 SHA512 9c5f10c8f83892438ec6da49ae7788b411b86edecc2b04bb981675a99d05933b3a0e4ae9dece4d31ed0c797fcdbaa123a181778ae23458fab39b34faf19d29db
 AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc6b89a215c979bc3086b3d4a5834af9a4c461dc24ffee4163c6d544f1e3f2eaf2fba7e638eb0ceecd11e1c00396e0 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54
 AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d
 DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a
-EBUILD netwatch-1.3.0.1-r4.ebuild 999 BLAKE2B a3b45439e6990af3dc189ecf97ea0fdd9f0bdd85b37282f8e6cf548fa82a03513058fd52fe8738baf2cb2704b7a6c0b458805739aee9baf3995d3b35de6af1ee SHA512 789bceef3363ee9724fda0f52add9abc898122c32ef862ebd535363821ada9dd75ce76c1bc1839e9ec14e547e14969f21990c0cf1eb408cc087b6a03b1f94e3a
+EBUILD netwatch-1.3.0.1-r5.ebuild 1031 BLAKE2B e1f73c25447540421611ca037d04b678bdb973f23b837f76941c6cbcb5f51e27a8640edf3b35bdf494cd1853959e53acb2f9fa43b6f65254fe922d74b6412760 SHA512 93c3d018b1c438b0ce1492919804e0c8ccfa9daae699c983c91d60ab38310bd13906c6f418c782f8f25914ba14733ca5dc17714027bbb9bc0275e26f0104c449
 MISC metadata.xml 275 BLAKE2B 79c07c01842dd8c7c484b4c0858920f89194e28b6758abe7a609d581acc1ea2a497477cb475ac5fee7eabef706c6979440deceef97a2ae217d022d0209cf3aa4 SHA512 70ffec14d622d6e1b030e86a35278c2967b1d0a374f43bdd6b4ee89a4afbcfc8541f8400643bd317693ce91b3e108ccdd3715176e3058548d51340ad9a40bf67
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch
new file mode 100644
index 000000000000..e1b0cbd115b2
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/871375
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -42,3 +42,3 @@
+ 
+-extern destroy_program;
++extern int destroy_program;
+ extern Semaphore masterdo;
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -608,2 +608,4 @@
+ void findaddr (u_int32_t searchaddr);
++int doeth ();
++int gh (int opt);
+ 
+--- a/netwatch.h
++++ b/netwatch.h
+@@ -220,2 +220,4 @@
+ char *servicenm( char *s, int port);
++void uthread_wait( long usec);
++int dokeyin (int force);
+ 
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch
new file mode 100644
index 000000000000..7a89ce111e9a
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch
@@ -0,0 +1,8 @@
+Fix failure with -Werror=lto-type-mismatch
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -96,3 +96,3 @@
+ #define MAXSTATUS 14
+-#define STATUSSIZE 200
++#define STATUSSIZE 256
+ extern char status_lines[MAXSTATUS][STATUSSIZE];
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
index df2471e3538e..a7215c4e36d0 100644
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools
+EAPI=8
 
-MY_PV=$(ver_cut 1-3)-$(ver_cut 4)
+inherit autotools flag-o-matic
 
 DESCRIPTION="Ethernet/PPP IP Packet Monitor"
-HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
-SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}-$(ver_rs 3 -).tgz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="doc"
 
-RDEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses:="
 DEPEND="
 	${RDEPEND}
-	sys-kernel/linux-headers
-	virtual/pkgconfig
-"
+	sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-append_ldflags.patch
 	"${FILESDIR}"/${P}-open.patch
@@ -29,22 +28,23 @@ PATCHES=(
 	"${FILESDIR}"/${P}-includes.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-lto-mismatch.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
-S=${WORKDIR}/${PN}-$(ver_cut 1-3)
 
 src_prepare() {
 	default
+
 	eautoreconf
+
+	append-flags -fno-strict-aliasing #861203
 }
 
 src_install() {
 	dosbin netresolv netwatch
-
 	doman netwatch.1
-	dodoc BUGS CHANGES README* TODO
+	einstalldocs
 
-	if use doc; then
-		docinto html
-		dodoc NetwatchKeyCommands.html
-	fi
+	docinto html
+	dodoc NetwatchKeyCommands.html
 }
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 980585426d67..dc4beeac5ee2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 82d10be32930..3e9c1f1ec89c 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,4 +1,4 @@
 AUX amd-2.4.6-dash_doc.patch 488 BLAKE2B ed5872a7b0a2dc90bf69a2c74db9dc9379afd54831c87ce4ba577a3d70f2a5f2cdcda1a8ea2b1932974c18a45ab6b8043d0de8217054464881476c2041ca1e29 SHA512 7ac31c0b64b3986c6c6e44babe326c385eacb8a4a5c542ea1e7bf8b566eceb3e70a3d3cdf48a783507c9ecc1b21b53487523838d8f2936e0d2cbae688e30bee2
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6-r1.ebuild 906 BLAKE2B ef37b6d947f90aa35144b194ca5d7a6379d51d77833cb1339d26ed7637ebc3844322acecb028f7eb09fd483f8089cd9f911875df9846113802bf3a49715b7945 SHA512 a8bd604f4cc96b2192e8201bd47cdfa132ee7ca40639c6ef0b7df01ff55a4cda6f6c3b3fe823cff6c9ae8572a02aadf4de9c2f9d41fda3468d81ab068cd7ee93
+EBUILD amd-2.4.6-r1.ebuild 912 BLAKE2B 560ae645916a5a165c290465c5c5436c47be4aff2a76b126ccb4f72c7f1829f9457a6045dda11b61eb4ac9c73e136578ff1250eddb373ca48d97f065f031f3e2 SHA512 76f0684908e92e62fae588a488638a68d9f3aff28c5e565cfefa14f2938ac3fc6d6435660868994b08a6c19b01c76980c5d038d052db3a48eff7239b7d267837
 MISC metadata.xml 493 BLAKE2B 791bee04f2535ac8e03bd7f74fc51462b5d0eccc2cf1b382aa41019c59e4cee6e9ebf438678842f2dc50173e2ed346b74a49a942779e1e61346914a7683c9af4 SHA512 a3b82b5d90b1c4a8c09944df1e8b318dfd0002caac0e891e8e3ba79ae604442cf687725c44b3efbdebe44001fa083804aa68605a3c614c9a5825c8bc588d488d
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index a080f8979ac1..467b95771979 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index f3dee8eea3f4..be47ad740724 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,4 +1,4 @@
 AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6-r1.ebuild 839 BLAKE2B 8d3c096c6b51b4d8b7876e89293eaf21dfb907eac34665b3f8755637556f276752d51f86acd92a4283e7ec94dfe8d528f9a5fa1e736988f265da0b3364232aa8 SHA512 eb5d7db8b9ea7228537a1de51fe09e621114391e8e5a99cb0fd227f1d5c57318808c74f6bb26256163515e7b35732a6575dadbc35aff542a3bafbc056011a3ff
+EBUILD camd-2.4.6-r1.ebuild 845 BLAKE2B f70f1acee5d4a9fe45bf02c1d4c5dec9dd19ffa2221922ec91bcd5c7c254dacd98d9c804a93a212b7a696919cffe30575aa792281e1965aebdc9aafc2f1563fd SHA512 5d83442bbe80a1bd3a37922f997143b27dfd12f8cf9e5c91a19104233c7c77f20d2f51d836ef653fc3e907e76ebf5008c35a41f36059f4a7a091769c99f0cc51
 MISC metadata.xml 495 BLAKE2B 2e1538f1c7790483dc922b57bea2ef1732ab16c0a3e1d8bbebd2072c3a22a510b17e18ff5b8ed428e7a182296e27ac4620c183efeaef67ce97ae60227cf3414e SHA512 8330a349ed15588e3455fc47dec441618a721eb25b7692175781a5c3dbe0d0b28b4e9a657cb999f08059face82ddf8ef06766187932110ce0576828ba5d90a36
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index 74e087194477..22246b5531b8 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index 3cb8448c5957..e805983afa19 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.9.6.ebuild 653 BLAKE2B 5114799817376c87cef3f8bff4a05cab2ef877ccb173dc5fd8a6899ef19ebaa822630fa1369b58609bd98781795085b2d7641f07db0e6ad042361cdb9f3c8a68 SHA512 694d11491a0999467ada4f46471d1a784be40681d83717f25bebbd42904f58bfa8a1070ef70df698723b3fa500f64996399ce3edaec24421cd9876adc8f59460
+EBUILD ccolamd-2.9.6.ebuild 659 BLAKE2B 5942bddd3dd890d90e8883af651300688d8edcaabd923b181582a36b6ec44211bb474959f26b54147cb2c2a50694efff73e0859106a5ecbda6f0c2134adb8942 SHA512 573714096bb0562ecd9db143f80e06088f68dfb2d080ce9d2d366902626c975af34f63ac8fa0f39b0a20a44e7f2c0d4b60e11c1e9904986bbcb3cc9a3b17259f
 MISC metadata.xml 471 BLAKE2B 7d7e42d8404b828b5d0493406654136a413dd9478bc269657e2fa34dc4a2ee45fadbee2f9056c83507cdc8c21dac12210afa20ba6787cd69e85943303277ae06 SHA512 9f21e10ec3f9b67a167f180c91b904e7df13647bacacb69f07fa9da4c55c24394cf50fd1d045a939cbb38c01c68df390bc8ef83c423f34281c6e807a36da5a48
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index a34ba16ca8c5..ca4714af2abe 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.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
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 52e98f252212..11d5a01c1250 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,5 +1,5 @@
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
 EBUILD cholmod-3.0.13.ebuild 1627 BLAKE2B 048e38fcd2db3af79b6f42d8c3d7001e5eb85c3a197ed91f95c9181c394a6b3225fe5790c0b950137cf7f82ef67ab440e922c48a5e894c2c57f8a83d1c7c74bd SHA512 da32e2d9b18a4dd1576646fab8e920c7e6070303b48da0b49521fff1be0d3e0f05f99f181bc6f78ed1373496c47c09a8dbf19870218ac1394a6f2c77537ec483
-EBUILD cholmod-3.0.14.ebuild 1609 BLAKE2B 4c02785d996dcddb8024ffde1918ef73788c2243a0079bea4e2363bb8399e3dba6e4351dff6293248b69043d6d30adfd19705f558361246ded0337de9d62f24e SHA512 c2d57530410cdff7eb5741e5b027f7c26649ff14721ce46b497aac0f06868bb55eeb7b609a41a9abce599c987b726731f5c82a932ad8e420fe9131e38af30bc7
+EBUILD cholmod-3.0.14.ebuild 1615 BLAKE2B c90d65165df310ca84d33152178fec894273584d13162ae153249deb7061c8472553296ebe4a57cf21b8592f951ced9ff2401ff7cdafa4dc6ef1843104fb2de5 SHA512 27358258d484775a423084b5e2531e394b315fb564bcf46fbbcf8a86f0e18c2d5e72cf88b4d0db045fe09bc8d247be47e10fe01b2e353eb930ca002f62d9b433
 MISC metadata.xml 808 BLAKE2B fb5a3c0c876e6dac5f4efbff1c22597f8749132a00c52594711d5a660be2522b66b664db2c3f5928c1678c6bf8fbdb5e369c687089197f32db229990c22248d2 SHA512 da085c315c54f7e8110efe130b152c87dad1508b91686da13ea16ef902b0e3d355deb0c414e341bd12b030065cea637843c321b779a07e7341266bde439a565b
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
index 111b80f90346..c5f84334ee83 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index d7a24193af2a..37fc43650a56 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
-EBUILD colamd-2.9.6.ebuild 655 BLAKE2B 521c037ee706d6f61836688dc7a6973cf1ee9ccf61217590baaf34b23e87d7cc64943e21887348696b4cbb915956fb759d6243fae7d5215a71491daf121e122f SHA512 f2ec9112718ae2622e65cb616e40af7ada8fee1a052c436f648f1a78973f8d03150f5d4b18524bbb4c86a1180d0827164e31db28f82f1f595c035202a9558889
+EBUILD colamd-2.9.6.ebuild 661 BLAKE2B cb8088ce5f7c50db43be79aaffd2d674e35a1adb60e8d5ea88bf7aa54f8e246e3de2895042552b5d6b23bf370b8784ab7b7c8625d5590c075d8a74ef396bc512 SHA512 fb7cf6f6718dbb52a945577b1412d263ab505812cd3f221ca8cffbc5a2914fb7b6a66112b2f230c3fda6b39d374795ed9625c62a757707ae48389ac05cf1310e
 MISC metadata.xml 828 BLAKE2B 19a5a4db3147bfca76b622490cb1c6ed05a03d6f66e10a17127d8cc98cde7422dc20c4b9a8bfce5e57265582302024d11048262ff85316db40c79627020936de SHA512 2d4e66e940092d0a666e3a4c57e3234ac63c769437b887cdc7945be96a544a0ccd6217cb5767b9ef03b70d3453265b6e3a514699c9d74585c4b8d7fdeaf7f23b
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 2332384731eb..450bcbea42ac 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index a4753b60cf92..5ffa06d62e45 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -2,5 +2,5 @@ AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a0
 AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-5.1.0-r5.ebuild 1814 BLAKE2B 243320a8921de80e1e72661f937bf7799cccb2941ec97fd4f9716c33e65d88c999f6e101b92f4e62011020f9823944b12b77525d375c421cb3a34afe3a8607cb SHA512 dae4ac996aa4b640a5ea32a5aa6a1fc8454b65bd44ee2803cef4a1d35a1d287fdeb94bbac817698f18498bf18d96201aacf695583e23b487346d87d660412e35
+EBUILD metis-5.1.0-r5.ebuild 1820 BLAKE2B 78c10fb6330f74ea9669aa415cd494752c73256c856d7458f3de2ba0b6eec2408db079f609b27944266608216b4ebe54cea10b7ede75fdc08b7ebb9f687fa7fe SHA512 ed29fb581d86aa773dbcad85135513207b817dae4a355fa0f40ac3124775a20fa36d9336bc0aa233df2a09cc5d78307c486bbc6b5f18d22e30acdf8d84d1ef4d
 MISC metadata.xml 862 BLAKE2B ae00feba4b79f981b8c730758a8b4fb39b93e9bad64ec6b2ea5cc109682d828a7a3c7cbaa4209c18fe26e49f240f0af1b6ba76834961d941d568b635b3f7f729 SHA512 a596e61e9fcd162594e56f68c787c9b8b516e02eb18667c60e13aa012fbd262b1bddccb7e70f05da96bc0480c803c1219935c3595b47fd2acbaac26b388af544
diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild
index decb391e3801..8ea641d2d459 100644
--- a/sci-libs/metis/metis-5.1.0-r5.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples int64 openmp"
 
 RDEPEND="!<sci-libs/parmetis-4.0.3-r2"
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 97522cc288ab..032f25a12758 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,3 +1,3 @@
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
-EBUILD suitesparseconfig-5.4.0.ebuild 791 BLAKE2B 0e71b045967e5d0502f7ce1881cccf3b0f6fa5d604277344f357013bd333863594dba2eba4749802416864a1de3471d5710177ce124cbe805f485c6edf7efbb0 SHA512 4d671bd6a920f3d5880594195f7bb7920327a1307712f7385bcc16ec6fa15c749e34b514a6aaca42342374eb9ebc8d94b1e6315bde3d8428d21bc210c04e4d25
+EBUILD suitesparseconfig-5.4.0.ebuild 797 BLAKE2B 23db9b52db642a5043f58fc7bbd8759776439ed551fc739a7571b80924f39358706806d36bdb79098223fde09d2fa3c6a3d6f098af2fc3220c61842e46578bc2 SHA512 622a5f0edf5dcc84d835cdcf46dab4f4b77ad18b166c7da3e2c00a5cfbe59a5b1bf02f760e40073aab4b14160327b365971efe40ec86a5f9c7e43314760bcbf6
 MISC metadata.xml 477 BLAKE2B 27f41d436108a530032cdf301d9d6f7d179d1acdfc91c6fc89df2323de61f780668698e5d920a63906d93bf0df48ebcf5da0795ec3c0e641be790acfe91b5b07 SHA512 c7f225dc954e778f07469e31d93bf4c6e6d726700d58420c8ac4875f284a15dc502b885be6e241ae28537f33b64aece5f08d940ba1193d10c95861aa4ad1e660
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 62045055d198..7c5b8b967ddc 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index fd94bd510bbd..56f50864de76 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,3 +1,3 @@
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
-EBUILD umfpack-5.7.9.ebuild 962 BLAKE2B 59bcdc2ba82de1619395654faa263987a1d21743387e3f673b79d8d50ae9e4554c2a12200eef514f24929b7ef5b7b599084242ff221a99ee86794cca92a8425e SHA512 bd39011b24e397b3e85ddf6aae36e901c967671ab07cbc2f0144c4a540df112fd8775d295b453dd2093eaf38bc5be8837a532c339452610f653adf4499a1a5bc
+EBUILD umfpack-5.7.9.ebuild 968 BLAKE2B 4644734c3ae7fb890e0497e4bc9e15a9257ed65471d551625b57b1b73f470b1f87ee563e86d36f6c1b8a0d1c35aa59f3dbcc778437d0fbda27efd80aeffdd8f5 SHA512 396625af7de8a3d457ffc391ade707022e33df37e6d3b9e765a382a29bc7abd30b1421e451d68d34154520422526083e6a70522c569a207d06900344aee8f016
 MISC metadata.xml 668 BLAKE2B 4df801c40c5bb87e1d5e0919b0cbda91ac8f246d90127303dc35878fdb8d9b55f53d4cecb91e02b8428bde417891b690c4fe535ffa058d3b51845d81ce29b917 SHA512 8a34b055da328549424745922743c5e44964d8ac7812202f56dbe02656f5a4c98420a318ac8115c17a2455f1cda4cf661426b742787382dfe272f67aabcab8f2
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index cdb347c9c849..f887cf3a1405 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0f2fb80f81a9..ec86cbf9fdd1 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 1f43b9d4b06b..55b8087f9b3f 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -3,8 +3,10 @@ DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c22
 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096 SHA512 6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290
 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
 DIST binutils-2.39-patches-4.tar.xz 62880 BLAKE2B 5cc335769d9c88417583ce059c61d0d7655f3ab9ac69647e6e2f65bd3a9dd143fe34c50bb68ab81d4226ddd0e4ef405d7102f67375a672eedc3d01b92b8ef497 SHA512 ef81350979af64cf35800b39982c84657a5c01362c01d221164a43d8f0dd80276c9f052c55d24516fad457e6671a58d467d71b5edd6c1f53fddbdb31172a21ee
+DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7 SHA512 4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 EBUILD binutils-hppa64-2.37_p1-r2.ebuild 13250 BLAKE2B f212de7136a4ca923843729776d978b8cb3c1b4b8b860724e90082096562675b90f1a28cc7ca0795107b01e1d3b4a71fab0904d8d24b449bd2de0773acc99e45 SHA512 0f13f09a88dadc7de1e1063bb28dc487fae6fafcdf21bb4be0fd002d8fed1557981334bf5885a21d612b5908044811692e1b3106d0ff4d5d7ff937585704f6d2
 EBUILD binutils-hppa64-2.38-r2.ebuild 13277 BLAKE2B 296b60c5f558a6c425ed914d142b2e7a211066f0b43c9f6e8bd63ba00d24239fe852a12f32764ce2bf2cf94129a6fe3428ee8d608a08a92c61cc2078543d3133 SHA512 17758d608e40428df756fa3e6177eba34e63035031ccaf9b0b28cd4a45f8abbab211e807d7f833960c2338876cec749b4942498b7a8ea8c5e13ea9e3def48707
 EBUILD binutils-hppa64-2.39-r1.ebuild 13278 BLAKE2B 2cc1fb2b74e46669acf21b9d926b49857e8ff43fe98f66377e7df8d95bd3d960d224cdfc8c87cbdc258cea46198d405943f00d12bf9bc2d0a7408816b08d94e7 SHA512 ff6511563043703d74fcfd3084b5fa6d5956473d890b5793d8f3e415915be6c88181305fe963ec393f2bf3e4f255a574fa3c63b0290cdb178c2465e385ae798f
+EBUILD binutils-hppa64-2.39-r3.ebuild 13278 BLAKE2B 29c18793494b0738ecfbca2f1be1c534e2009a1828cfb28d71489aee8f7d3031e31c1ace2d2dff9139362c89d7a4068ade3a94c93a9c12fd078a6976affc8218 SHA512 ff55e744be75f7c3df24c0efec1f216046ce7f3fecc8372b5e60a5efeadac63b508b5a1dbf74a17b383b78c1668c1c7e7b94e64cf720da3336fd350736538ce3
 MISC metadata.xml 849 BLAKE2B f805232fa3bc00d1899778d3048d4f3221bf64315333983f527cd2f91293d8e4e463afe0fa26d748ad29f2f2b4432c35ba5491939aaafd19a50d27bc664edd63 SHA512 d814c5d43ab2b69f281fc59425b1e595826c10949664af6ebdc227d223741bb413468d57aea55ff51b06919c734fc2500c2a5af0b4e4a8279dde1c3af45da1c6
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r3.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r3.ebuild
new file mode 100644
index 000000000000..e1508bce3ca7
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r3.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CTARGET=hppa64-${CHOST#*-}
+
+inherit libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+
+LICENSE="GPL-3+"
+IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here  (ignored for live ebuilds)
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=5
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SLOT=${PV}
+else
+	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+	PATCH_DEV=${PATCH_DEV:-dilfridge}
+	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
+	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+	SLOT=$(ver_cut 1-2)
+	KEYWORDS="-* ~hppa"
+fi
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( sys-apps/texinfo )
+	test? (
+		dev-util/dejagnu
+		sys-devel/bc
+	)
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR="${WORKDIR}"/build
+S="${WORKDIR}"/${P/-hppa64/}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patch || die
+
+		S="${WORKDIR}"/binutils
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		EGIT_CHECKOUT_DIR="${S}"
+		git-r3_src_unpack
+	else
+		unpack ${P/-hppa64/}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
+
+		# _p patch versions are Gentoo specific tarballs ...
+		local dir=${P%_p?}
+		dir=${dir/-hppa64/}
+
+		S="${WORKDIR}"/${dir}
+	fi
+
+	cd "${WORKDIR}" || die
+	mkdir -p "${MY_BUILDDIR}" || die
+}
+
+src_prepare() {
+	local patchsetname
+	if [[ ${PV} == 9999* ]] ; then
+		patchsetname="from git master"
+	else
+		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
+	fi
+
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+		if ! use vanilla; then
+			einfo "Applying binutils patchset ${patchsetname}"
+			eapply "${WORKDIR}/patch"
+			einfo "Done."
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered, bug #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible, bug #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through, bug #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}" || die
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches the bi-arch
+	# logic in toolchain.eclass. bug #446946
+	#
+	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option, bug #497268
+		--enable-install-libiberty
+		# Available from 2.35 on
+		--enable-textrel-check=warning
+		# Works better than vapier's patch., bug #808787
+		--enable-new-dtags
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. bug #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+	)
+
+	if ! is_cross ; then
+		# No LTO for HPPA64 right now as we don't build kgcc64 with LTO support.
+		myconf+=( $(use_enable pgo pgo-build) )
+
+		if use pgo ; then
+			export BUILD_CFLAGS="${CFLAGS}"
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}" || die
+
+	# see Note [tooldir hack for ldscripts]
+	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake V=1 info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}" || die
+
+	# bug #637066
+	filter-flags -Wall -Wreturn-type
+
+	emake -k V=1 check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}" || die
+
+	# see Note [tooldir hack for ldscripts]
+	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin || die
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
+	cd "${ED}"/${LIBPATH} || die
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH} || die
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-} || die
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			# No die for now, dies on hppa?
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		# TODO: add || die here, fails on hppa?
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}" || die
+		dodoc README
+
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} || die
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# the hppa64 hack; this should go into 9999 as a PN-conditional
+	# tweak the default fake list a little bit
+	cd "${D}"/etc/env.d/binutils
+	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 6781216ab1ff..2db2b3d30edc 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -29,6 +29,6 @@ EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bc
 EBUILD binutils-2.37_p1-r2.ebuild 13024 BLAKE2B e67ed4a55a9f07ebd064c82901bc6b5e23933f562c8b6258d32649571f38cbc81061fcb886feaa70619d46d47c52cd701745c173ccf060e47c5cfef2d202a8ca SHA512 480b1921ff344b943b1cf2c1ea9960cd5252f8055a4bffc109f096b038d4d1fc2dd670d696ce7217fd1d827eef5c07cc81c7d0886fc554d939535582d5300f26
 EBUILD binutils-2.38-r2.ebuild 13402 BLAKE2B fddf3f8d081a357e1b961dfd2b2d6938bcabc9f3c20564f356753c2618c87728a4acf793bca578a0fb9e9641d0e5e8274ebab7b4a2b40a4125921def0c9f4ef4 SHA512 1820d1745b1985268eeaf00d4e38078c745c5d81b1ac6b9037a1d3ecbc0314aebf26cdb54554cc4c879a4133f4c980e104d32664ea35ac6ad7c9e2d8d33a5cdb
 EBUILD binutils-2.39-r2.ebuild 13885 BLAKE2B dd0fa36e393a831caeb57461242953c6b42ef48473ba8a6ae9f16088a36f99f8a9ec0885fc0664c70e1f55252a4c8ebfbe80241aeddf857bd3458a61a210adcc SHA512 270947482d08b64735821f6cd2ad63c1cb6e03b7296fea1953f7a04e43e3a59e3d7af4bbd1fb42972e2bfa40bb6090b48b827d57470092445af14e1bdd2cd7b5
-EBUILD binutils-2.39-r3.ebuild 13886 BLAKE2B 969920bb2e940577ad1160867cc2777bed195f638abd62669ae240d5a0cd1e4e3a479235f28f47540ed67903455b189429f59b6c58b5678eeffcd98a1bd5bb44 SHA512 ca1cf0cb1dfb1a3be1b699a4f5cf624d73b3385d3c96e83ae10d39a992d6923f5ee6b802063566d8b7be8368ca0af742230b4ee39be7bafc24d703ceeed2dd45
+EBUILD binutils-2.39-r3.ebuild 13885 BLAKE2B e6310b020c665c84a4aa8fced444fe1596d70e5e7ff8d445dd07f3feca776e864a5e04ddf2b0aba2bb1f18c6d569d20211023b9bc704ef1cd20532efcc0c329c SHA512 4bfd1843c38292d6b51ef3f7f6528bd7c23a69df2365c782b85189fbcc0535153e1f66b6ab11301bcfd5547102e1f9091c8d237208f4304c919151c83aa49404
 EBUILD binutils-9999.ebuild 13938 BLAKE2B 04485bbd32e29fa58b213f6be49fd4d74d05808e45a7fe932071ae975f1d905ed480c723d6eedafd3bee385e7a52f417a597be7aeb9df45ce57af538b391d4ec SHA512 22d275b15f676cab7cac37a1b47e1923b982e8bd9259164efa9d265d006fb412d72d4ea92a43bfa822854ff47af6e6713b7d85c62a0b3ad11c8aaa1b9f2e40df
 MISC metadata.xml 889 BLAKE2B 9a627ab3db90639c30e19df93a064f9129d684ffe1176159d526ba7ba2e68c4c2cded8437382ceb97a5e2578fe79583042f6914a2b7650bb777ec1ce6bebd425 SHA512 b691e0335c2b059596557a3943047b0b8e718cc84c4fd885d44fe9887d3d170fce1317ba9949c3921a6e242434a24041777967e67beba911edf6932fe9f3d3cd
diff --git a/sys-devel/binutils/binutils-2.39-r3.ebuild b/sys-devel/binutils/binutils-2.39-r3.ebuild
index 620758c6608a..27930510b19c 100644
--- a/sys-devel/binutils/binutils-2.39-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.39-r3.ebuild
@@ -33,7 +33,7 @@ else
 	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 #
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 2f34f0d0af49..dd00c29dd519 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 5bbeef277b9a..60051a02ca59 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde6
 DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0def63969e5c4dec52d4d5259a6b3b6d27406883e45d2ad4d0fe576a1285121037fb88fcdeab58a5fabbb58d4847cbfbbfe SHA512 0182a96feca475471d1dde2e8326067e98f8f43a6e9122e29635a52ae4ca56eaf6ac349b189a0198704c9adee62cbdbd2def7e90d2dad564c72bec2f8ff32ec9
 DIST genpatches-5.19-1.base.tar.xz 4080 BLAKE2B 27fe512fd700cc6fc1946ebe0b39b423f35fbdce3b6c2181e1e1c197dccf436c6ba285b8bbf74500c80c64c486831a88f0f548cbd787d925eefafe740764a839 SHA512 8ff90b26202ddb80890ce8a33debbb8b6b85432412e7f76fdbdd98e257e9be23ffa5c03c81cb8482b7a35099083dec800f766354b5886d4f8f7647e3354f97b6
 DIST genpatches-5.19-1.extras.tar.xz 3772 BLAKE2B 1d418c3d5d328e9704ba10d7483cd562e511f345a5cc6799abc52e6cdeca20efa61417f62eaf7aae2078a8bb05c7dbabe4f4ddba7ad4221b458bd5c589f29b47 SHA512 479d957a3348485baf6504a08cf06b334938656701b15067512c0f48e530c2e87ca281ad3af6e55c75a53d2e9e584d94fc030ee82c538a97a85cea9a9c8fe214
+DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a14108c86e89d2611e7886459405b743e690b5fa9f682a3e8ad3215c821f4e04552978da0e309be9cb586f0e2fb53c50f SHA512 da56f7e72c400aa149d481fc42651debea9ff90144b4d731dbd167cd5061da63f34b1b4fc937c8a3508f9bcdbbe3b645d25cfa67ce05db1d5c25667214840d9d
+DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
 DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
 DIST linux-5.19-pf1.tar.gz 212145719 BLAKE2B 20264648efeac1589dfc76fc065860d9c7134661dd5ff1bb76996864ec7fee1f3cf6198d76da0d7cb5c1b9ca5fb1cccd2c63bb33e4d5fc9ba012c2cea8a38357 SHA512 eeef1d04add939a7826e7a25f5286606070e508c8ca4817a7e7616f947bdb1684819954d068e45964aa297df105a26dd996ee4662a182b3726010607df98edf7
 DIST linux-5.19-pf2.tar.gz 212143056 BLAKE2B 75f4c627ac88de7d2ab4b62d6b463d6832534e96353819ee1f7b2dc37473fe659dab613908f358824d91605c8223e6c5da49d6ecec7f84f4e56f345c8694d7ef SHA512 36f2381177de874f199d6549425be592aab4b86081d2db33bdb351614a426b3c529e707beef26d57e9d0f9270ad495acd574ab0b89f3f09125b37ee9f052adc0
@@ -9,6 +11,7 @@ DIST linux-5.19-pf3.tar.gz 212207383 BLAKE2B 9630bbefdee791020ee623da621811e6142
 DIST linux-5.19-pf4.tar.gz 212225287 BLAKE2B e6e96c998336bfd39725f5f7da8e91e12911d2c9c04917665a2b058884f4d2a362aa9c0126d93ebbec60e4d76e58ee7914616015b7a01b0803b680bce50f5256 SHA512 29138616917f890ee3b3d0e4ee5b855236efedf464bea73ba0cdb701882e35112e9757fe183231c063fffdddbddef5e550f345c26446a4af1704e0e661bc55fd
 DIST linux-5.19-pf5.tar.gz 212240899 BLAKE2B dcdd4208335427217662e571c60373559504c0322d8718c22fb72f7d6dca3fbb1d95c9ef1b480938508ae22338d229285b3da5f6c2b0050d7f70d4b792761b0f SHA512 3b0887cf21272c22d3d4e821ec36994af7160ca66b84910c7103d46d72449d3e8c1f8bfdaf1e568111c7c601b61a521bada3f10696b5a27f4f41494b746c76fe
 DIST linux-5.19-pf6.tar.gz 212237665 BLAKE2B 7ecace44c0bff940009fdb1cd8924096cc4cc337688c7d73883a996bc191d40b9589efbca2e30ba413e1516b790ad48be4839f9d48bb8ad5c40d3f8549a63db1 SHA512 7f5e60c20ba577102818139b0eb61fff5d8b2f3ecdcd42e3ad116fdebdfa58da4f08dd151844cd6e1d764aad5f5a2254e4a1c5aad5b3628df9d03911a2cd8e3f
+DIST linux-6.0-pf1.tar.gz 218275822 BLAKE2B bb283adca2398ef3e09a9c02e5a6609f898c765cc322376e5621c736a2b38832e1e13bc53fc3b21b1dae8214bd039ce43be57e97e7b129624124e58cd1123f51 SHA512 e97c449693b5702e18560c86a65dac2022828d2d57a8734a3cd26b304f8c0d5aa5773041701c8bd5a63b31481191b501070ad9d811a08382e8c846517a7930e0
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 DIST prjc_v5.19-r0.patch 271689 BLAKE2B 6bc109b462670602eba8ccba55cbcf9902402c627e40c62a3a574828847a518d84d35d30e786b2f1edd4365a3eaa3a2b358f20c013bb2789b30804c37fe12d45 SHA512 27011aa6586ca8c7ec953593f68289b437a7ddab841eb5e45dfca1fdfed5ddb59cf0e197703d4c62c2cd792fca9f2c97f341ffc5ee48a9ca3aff26f9505280ba
@@ -19,4 +22,5 @@ EBUILD pf-sources-5.19_p3.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530
 EBUILD pf-sources-5.19_p4.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
 EBUILD pf-sources-5.19_p5.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
 EBUILD pf-sources-5.19_p6.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
+EBUILD pf-sources-6.0_p1.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p1.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p1.ebuild
new file mode 100644
index 000000000000..3f80ddc991c8
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.0_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf"
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
+	# to manually eapply the genpatches too.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index c98bf17a52b4..b1d04305f2a2 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,11 +1,11 @@
 DIST genpatches-5.15-2.base.tar.xz 3920 BLAKE2B daaf8d0aff88921062186f2b45f070358492a0daaf65fcc33509ebd2c1a3840504f918c63aa0deedfda0e70b6bf313bbf33b2be768fdd74e81680de5e552b7c8 SHA512 aa00e8593fbadd7fa2bedf36dc9b806b6b3351c7488c8720fac47960ef2de7cba7c021acc599642f1979d67143d50524ea43303b52fabd8e26cbdfde5fbb3dea
 DIST genpatches-5.15-2.extras.tar.xz 3848 BLAKE2B b108b14fd532554a8baa91a623704a867c2df4a23597fb0576382e959e4586616dc2e5a094ca673a62faa80148cab041459e2a5b7bb2c2daf2c17297b42eaf6d SHA512 5800709ba9cbe1bbaa3b8999d9c8ac8377a45c6c1be61894fee51af6e506f3d603ab4640df4471db021f0d3747c35ae90f87b6a35aecb971aa0cbf6384ab79ba
-DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde68b1c2655567a27a6dff8b94df675cde779f940735824766d2267c7d09df970522ed3721b3fe661dc12e64c4b105b4c99 SHA512 461037cb2fc9246f1e778123a9fd58682ed2749c95acd8d30dddc1a31a66cc4961bb5b133a05fd6fb19aea1a83bf0be8a76f9e6422fb4d696010d248609534a7
-DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0def63969e5c4dec52d4d5259a6b3b6d27406883e45d2ad4d0fe576a1285121037fb88fcdeab58a5fabbb58d4847cbfbbfe SHA512 0182a96feca475471d1dde2e8326067e98f8f43a6e9122e29635a52ae4ca56eaf6ac349b189a0198704c9adee62cbdbd2def7e90d2dad564c72bec2f8ff32ec9
+DIST genpatches-5.19-1.base.tar.xz 4080 BLAKE2B 27fe512fd700cc6fc1946ebe0b39b423f35fbdce3b6c2181e1e1c197dccf436c6ba285b8bbf74500c80c64c486831a88f0f548cbd787d925eefafe740764a839 SHA512 8ff90b26202ddb80890ce8a33debbb8b6b85432412e7f76fdbdd98e257e9be23ffa5c03c81cb8482b7a35099083dec800f766354b5886d4f8f7647e3354f97b6
+DIST genpatches-5.19-1.extras.tar.xz 3772 BLAKE2B 1d418c3d5d328e9704ba10d7483cd562e511f345a5cc6799abc52e6cdeca20efa61417f62eaf7aae2078a8bb05c7dbabe4f4ddba7ad4221b458bd5c589f29b47 SHA512 479d957a3348485baf6504a08cf06b334938656701b15067512c0f48e530c2e87ca281ad3af6e55c75a53d2e9e584d94fc030ee82c538a97a85cea9a9c8fe214
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST v5.15.10-zen1.patch.xz 758564 BLAKE2B 36948979a90ee57c131caa3500f669032bfb5e971a1a72a5847f5289fe8184961addab53f476ac0b8c5b271417115ad8a05ebf537dc91b9e86cb74f028faced5 SHA512 c0d11cc498fe97838e6caa5c1d9d628445729c15f2a16c089de5a50b41739925492476eb2819fad4a61db810b02cdb334f48fbcc6a2da849e7d07e1e65df6eca
-DIST v5.18.16-zen1.patch.xz 1000796 BLAKE2B a4bc153fbae9152ed58f9f4f55a0705abc1928cdd43af2f5734ef58777258c6bb3b6dc5ea1bbff3a5831b1ab7b33e1c1684bddb7a5ebeac1c2b654ea04eebf7c SHA512 3f55a4141af5139fff783637f132515b86d3cd1366edf80f39d9e8e90e8af602425a921824b5b4f7e63931f0f547a896e05016c348485a822aed0472a463340b
+DIST v5.19.13-zen1.patch.xz 974944 BLAKE2B 3b3996617265674c04c92e27fe2dafca6aed54e6d1adf221eb5368a93abc2c8a2b5214b670183818d7f50edf46a86424da32a8fff922130741ab09a923ff4e9d SHA512 49bd30ea96037db655811cc94a61048bb552d57a7ff0abde5fa8adbfc622cc4cdc9154f6efdebd2b3db766b7118ca0b2b26092639d96cf7326943f535af14bc3
 EBUILD zen-sources-5.15.10.ebuild 1125 BLAKE2B 756fe1384c827dbec95be9a4943955c75041b9dff175851f4a89e58c4b23c1dcc6842d730fc6972ba264f9bacc631bfc867526be87a6e5514d3e1c9777bfaf97 SHA512 55c8ad6863c8fd88b410bf4999d7a37cda0f1798bae42d490bf48210e676291aee14578ae5b090c00d1b00bd8eb6cde63f1d3dba4aa5dcfccf7f97bf26e6a017
-EBUILD zen-sources-5.18.16.ebuild 1118 BLAKE2B 1899d93d3888fcab9ab500ddec42e766e53f51a050f596a7d564d663c0d9ced97ab2c42b9ae8c18a00992fe917abbf5b308d33bb83122ccfa1e5f30caed252c8 SHA512 1798ba5a249e9d6919c195c47162c50931823051d7e6c6b1f88b4ebdafde83749dc3270966cc3eb389f63d598811ff9e94eec1a58fc07e85819d8993ca3fecd4
+EBUILD zen-sources-5.19.13.ebuild 1118 BLAKE2B 1899d93d3888fcab9ab500ddec42e766e53f51a050f596a7d564d663c0d9ced97ab2c42b9ae8c18a00992fe917abbf5b308d33bb83122ccfa1e5f30caed252c8 SHA512 1798ba5a249e9d6919c195c47162c50931823051d7e6c6b1f88b4ebdafde83749dc3270966cc3eb389f63d598811ff9e94eec1a58fc07e85819d8993ca3fecd4
 MISC metadata.xml 404 BLAKE2B 1836329a9cab0f03e4ee80056d5db141d5721875794ef39844c014c0426fd558b3a2bc6f1a7bbcb72d99ad81f4a071f451da9adc4a6fdb380e8c7bd7bb10ed2d SHA512 2c48e149eb08a53121a799256eec33895daa0dce32ea5325f5f3b055c3a661de8294e21f114f6c7ad609818215261c57c53d124fc0d3679f87168039905a9516
diff --git a/sys-kernel/zen-sources/zen-sources-5.18.16.ebuild b/sys-kernel/zen-sources/zen-sources-5.19.13.ebuild
index 795d10246fde..795d10246fde 100644
--- a/sys-kernel/zen-sources/zen-sources-5.18.16.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.19.13.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 4ed943d3d665..497f545be9cd 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 0e682bf82ea5..38bf05d5948f 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -10,6 +10,7 @@ DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c22
 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096 SHA512 6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290
 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
 DIST binutils-2.39-patches-4.tar.xz 62880 BLAKE2B 5cc335769d9c88417583ce059c61d0d7655f3ab9ac69647e6e2f65bd3a9dd143fe34c50bb68ab81d4226ddd0e4ef405d7102f67375a672eedc3d01b92b8ef497 SHA512 ef81350979af64cf35800b39982c84657a5c01362c01d221164a43d8f0dd80276c9f052c55d24516fad457e6671a58d467d71b5edd6c1f53fddbdb31172a21ee
+DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7 SHA512 4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 EBUILD binutils-libs-2.34-r2.ebuild 3678 BLAKE2B 2ecd619f2dd9968a11a3c8c2cf8f65d30d7191163bc6fd5ae1fc7d6dfad4bb30b061e5029fc7d2a23c1b7d0a4ca142532b8175b593d9d0ac408338c39cc02e60 SHA512 3ae489fa333ea206ce758f102a56ebbde7a59fa817720503eb1287c4d1d156598cbe7bc78beb2f0ab85f6f60c32f753d4c66cb0428dcbeb13d873407a4c86335
 EBUILD binutils-libs-2.35.2.ebuild 4100 BLAKE2B 521acb4f160e171efd6500aba598825f50c19b62f77689b208dcca260396aa1a2c769937db49b147a51e7645baa1fd72f13559fa15e5fced7c8bd57088575027 SHA512 628c171049d6fae374538a96ad7cc76463d78e562d16fbd5877ab7b0800b026e9c72f3b346ec2e3e92a9c5836c483e0eec226c5ac2ecc8e71c2c66c6c8c5b844
@@ -17,4 +18,5 @@ EBUILD binutils-libs-2.36.1-r2.ebuild 4053 BLAKE2B 1d2c9609ce0fa3aff3222d89ee237
 EBUILD binutils-libs-2.37_p1-r2.ebuild 4126 BLAKE2B 63dcef180b378d47d48f714e095ff2ce98dcd027de0d176c64179fcfe1f48df5f451468fb974176ade21914f4ba731487b91b03223eba11662be17cb3b42c9c1 SHA512 c659774de8238e81669507dfd5b2a565b5deaa8c54fe12ee02f5b3b204a147b2aea5bb9a6707930d0ac3ca10225ce486f294e510402b37c99ee1f6c170c31ecc
 EBUILD binutils-libs-2.38-r2.ebuild 4803 BLAKE2B 60922f7c60d381f778474a74497a70c652033a92f0fbbac3fab30a2fe4c4a88afcb4931a3914a4c5ca6a853653f83f941253398128dddf21636e8eb95643265e SHA512 f479a863a002bc373c188ccc55c5ad9c2791d32dc64af9cd3e5896204b6e0438a52035622697888e7fc16a0bf7d3df79c3eea2ec8c2e3b4c443b82637a1dbd0d
 EBUILD binutils-libs-2.39-r1.ebuild 4819 BLAKE2B dcce84713099056fd4436eaaa5b304a80f502d9205ecd9f78c82c5e1441c347136fddb51cfdc037997784e7854fb9f6d11aac9386a9918de09c6902e9514f365 SHA512 4d68b0aea20a41d5e53630ef9d957c9bdb7ecab78d04a41f1351f320e49ba78f9bfebd016fa572ca980176a8162e99c9e6cd6b9d89351893105eb77ac7a010c8
+EBUILD binutils-libs-2.39-r3.ebuild 4819 BLAKE2B ab21c2cbe79b9ea63d0ed704fd39e5ad2de2a925be27d7d88f9d97a5c9b0bbf2742ad6da44ab0d20998735d58c2072f14ee2f293ca8d0fbbb6610285e5888d7e SHA512 67973ea47726a1789ff4ecd69aa716ed8fec5330e49f869adf59e5e62a483127f73316f2c473bf61d4560e58dccb1f64268c44e8497b32aec900aa204e613d65
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.39-r3.ebuild b/sys-libs/binutils-libs/binutils-libs-2.39-r3.ebuild
new file mode 100644
index 000000000000..e456c27e99b2
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.39-r3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=5
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV%_p?}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index db4b5a259f3c..14491254f19f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 6a4d2153bd99..b3b43f2d2229 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,4 +1,4 @@
 DIST novnc-1.2.0.tar.gz 1356408 BLAKE2B a84b767afcdaa641a21943d19ac93c9200074c24c83c899fe2452a82eef526ecd74de92da47b3caa85abe9d51f2fb8d5078f3bf66c0868a241218d22a9088239 SHA512 461490da7bb983e9c94b8ce39f8455ee6609b5a9df8d88254bcc37ebaa5153f5ee9db6afbd88b51762d6d55661bc5cde6fbe70616597583bfce1203e337adf75
 EBUILD novnc-1.2.0.ebuild 1079 BLAKE2B ee4bad76f19301917ac09cb5b480fedd3f47ca5480c2bb38d2ca27f9044819622f8bb2b30e60fff2572e4abae934bd2f853fa52ea65cef1515c2e14d01aef00a SHA512 381e2030a98e8722cf63342558db862172a5c2b9ec22699fffe3dd1e64ac41ec62237be2ea3babb5fdfda19fa045896873895b4abf2dbfbee514de22a9ddb43f
-EBUILD novnc-9999.ebuild 1078 BLAKE2B a24ce5ec1999ed553b211d49e7725a5aba1ed8050cbad360e5710ea99e1565de3334ac300f28c5f3b73b6f8d4bae16122970c69a611d3d8f64488a64fab9ea07 SHA512 7dc0e286f88eee0018a56b7e31d585d9abe42d5f42115cd0c00cc6df4fdb6e843385269cf58a1a62f5986817b28d52cab1b55ef68dc889083918cb0f3b9d9ad9
+EBUILD novnc-9999.ebuild 1077 BLAKE2B d65452de84429b566f55a52378fb3888d94b9f9efa8445ac8a7ce5420d0dea4bc5be2eed28c5777115a86cb7b36ad7d365853d7da4ed9614bfebf86eec54dfc4 SHA512 f3a99157007f747a5f5e81903ed3d0c740efff6ba67ff4f69f90335f9c8e311a822d19b6b5f50c9da3be262c7e3f857d9702239a8429411de48b29a95cfd3668
 MISC metadata.xml 367 BLAKE2B 3c3734e6bec10d5312464c3bf27ba6c3e1cdc7689165b461f617ca3fffd9c95739821c280ae78ea3ab69d6eb2166b82dcee2330c132dee527753522a75df2045 SHA512 13ee4b658e79907c7c59bf69160d41e9db7f7e865329fd03a9be6024b134a9a8a832f7b2b218ea29c647dfcdf3c61d0932c539e6f02117d4192a20fa9f74fc8e
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index 6b01b8479bea..6ca0e8b5ed54 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
-HOMEPAGE="https://kanaka.github.com/noVNC/"
+HOMEPAGE="https://kanaka.github.io/noVNC/"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index c9acde2e1431..7964de806fb6 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6d1833556891..e57e8ea29353 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,6 +2,8 @@ AUX chromium-105-swiftshader-no-wayland.patch 401 BLAKE2B 2ebed22d234c2ab5d21515
 AUX chromium-106-python3_11.patch 274 BLAKE2B ead8672e3282994444ed28660ccc99d4354b39b8026fc8906469bcc30f2f2c78916ac97be75b8b90b9654680a2ca23cc3eb794003fac42fb07db5c3ddc1211e9 SHA512 2e189ee099fd940320eea71d282565a2730bef76aa9dc6b467f2828c756359660aa1bf7a1a80aa27ace8de7fab5793b9fe76bad0c1b3383f8a1130484e391d2b
 AUX chromium-106-revert-GlobalMediaControlsCastStartStop.patch 1472 BLAKE2B 2d2fd29509037d7f8a965edcb6e15f1ea76efad9f99ff7bb5620cd36a4952c21edc763ac302886b8b6314b497a4e984d872ba52e39b6758249b03474c2853ce9 SHA512 a843a404c4e9c7504fa3f116079868393bad68afcf1a63a3498dd95cb86f25a6fecf4c6e96841ff72c8a9e6f00e80cb66a480c685e7bfbd625fb7f358d23aece
 AUX chromium-107-system-zlib.patch 423 BLAKE2B 041cfcf5840fcf28b382f27275b3ab05751f5ae75fd404175d6f4ffaf3b029fb47fde473bcdf4bd99289f10d878f9d9725b3557ce97153abc7e4a1ee0d7959b9 SHA512 70ca4fef99b3bd8e533b6a223a6d6f4989ffba890728453434e5828565d0373319a7dfc7f272cbab9064308ab35b32cf9a7b0c34e13cf71fab0de913e73392aa
+AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3fd77b019356a6f9eaaad154cdae03e63f52c3bfa8bb0ed90467ac0806c58f6a2e7a351fd48c7e7a5e9b7ab317b4b8e2a75cb SHA512 3419e3dd6da21c8791d1335170547b3ac9fca593fe8eb01e17dd3eb916e6795a32848c4762051558cf98d0379592910ff9b267f05fd6b3c83d5e1c1073ba717c
+AUX chromium-108-revert-GlobalMediaControlsCastStartStop.patch 1389 BLAKE2B 0596eeba11801e7aed3331d7b42c407214d0e7d45dcf7c96b9320f0f5a4da8a01b7e6b02888971d0d1dc8c23d0e02286f07b5f1ebf336d7dda1cc7bbb018897b SHA512 6d1eacab96ed3b41a905a282e9ebf71bd906541bcf094dc55543a66382a5ae28bf698ee31cea5485925cd538cbff0c35d195016fbc9ef6a54f61fbaca1b6a1e0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
 AUX chromium-98-gtk4-build.patch 3044 BLAKE2B 782dfd31a3a82d62dc0b8ffbb85cf2dbbef1c6cc47dbd8409dc0777be8d019c4ca082d75e6114b09f880f4f3e886d0f4b9631e66d46a3129e41468b70d71404c SHA512 e8acbf85274813ec81d575727b0e5d107749242d1df80e05035c9273ca0466d7358a8d7cece16c09f6996cb49ad3b1e0dcdf052af45023236f53fa6262b4e441
@@ -13,16 +15,12 @@ AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c46330
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-106-patchset-3.tar.xz 6672 BLAKE2B 4c56702e84c761b5b4e5ea84a3e9bed0c9c81cbf448998c51b149a5f3b745944e8c824384a879798fba284eb96d76ebbc22ce038971daf9a574ea02d52f204b5 SHA512 3e58bf2811a6674bbe04ab12c0404faad5e6b17c7a5de213e661a7cc34dd4c3329b8736e3b1ffd43a442eae4ad132ff05b042ef904d451bbe0c9a76554499b61
 DIST chromium-106.0.5249.103.tar.xz 1611232904 BLAKE2B 8c16faf7b450a9e55e19c607afc7252d6fb013d1735ff1fe8e4d54953fcc3bf7a5a5416ae0bbdf8cb15074841a63ad4485e1ff24fdf557e5b76bafd483f7418d SHA512 a01d34473e2fda00389aceb7a1024573c4346423e7a5de3398508130bf9f2f1aff22c23bbd613cc2bb46f0a907f19887b28decdb9d57bccdb5d3f7a14d1866db
-DIST chromium-106.0.5249.61.tar.xz 1621965008 BLAKE2B f15043eeefb898809adf580c6ef9258f9512ec29f9f0688865c226b13a47d6dd8733a51a64c6a0e5ba0b67e5d5b54419e5264401fa4ef96112dcbdfb70c4aa17 SHA512 472754e11472d4b6d7545d3dfb784b3ca6ecb951753e6e966b5a2ee18aab35e185872d55bece98a99d4d2c2d1ef38e07a29a4d6989e5a287046108100a799ac1
-DIST chromium-106.0.5249.91.tar.xz 1611228868 BLAKE2B 75703b23a0538bdae74b2ac42e36e6d13297e3b6aaead6e5a8b97ed8f2cdd2d5883752c6d90f13fd1c2fb68828558f269c0c4f7ece4587de30e2ea8d878a9073 SHA512 741e3a3331a7e3f666bdbaa16cc8a1d829d73396bd34cb8f5f030e7704970dd5b5c4e274a1f69d05c1a9cfac148bc7740f56648c53bb20b782e6edd9b248a92c
 DIST chromium-107-patchset-1.tar.xz 5736 BLAKE2B 581ca307d63635ef91aaa907aeebb8c735be6d6bbfcc3fe064fed7531b8848b5d918e017031ee606ed3bd8f0fc23aa6d2f8af4b36d33483dbeee2b5c8eacac82 SHA512 acbfb41c31a510a689cad3b0686e24925b018bd7a2a8f56f74b730dc36d878c266a11b3bb76b131e66f7b859f483ff00e16cbaae1b2b6944010c7396310c03b8
 DIST chromium-107.0.5304.29.tar.xz 1688306728 BLAKE2B 2e00ce9cdfe41ed20004ccdf11f7d0f5824f1b23ac706e18c3891ff189983815f1ccbd26e1a12862db0688f6bc045fcf49d7694043883a608b182994cd8f2cec SHA512 871c373b44b18167126deef82ec835e33772c27d5c9d89585a1752efdcade8696c3be5d2735999838b13e3ce2e06d431f30f3591e861d1dcd7a80281817851eb
-DIST chromium-108-patchset-1.tar.xz 6344 BLAKE2B d5febda6415d0573d86f1c85dcf4449ab63633605b8d3cb5815bee0ed26dba8348554f8c7e06eb0450932c1062d388d5ad8817ef698afeb978bce1a98fcb3c5b SHA512 d5f47692388c66099d6af75c781866bc45e05ffb7fa91c354243fcd1dd83f5de3279706809b3f65039e07d2c3b03d86b7dadcf6d14d93d9aa53562f1b8318b01
-DIST chromium-108.0.5327.0.tar.xz 1672115480 BLAKE2B c92636436fb8017d4a6b5e7daa7518384149ea6478998e511dd04e17c1cc788cfa2fe5484c1f732e134d4f351fa9f37f68bab306904307cf2de5158f825a5efe SHA512 a073b08ea7cff74440510c08cc90105a80f91f8bdf49e74de9f048be54821a7ef246078775260ffeff00c925a849d9958c0643e9bdc1f31edc798d4bb0928efa
+DIST chromium-108-patchset-2.tar.xz 6480 BLAKE2B 2a40bb741fdd305b3525b790f82c2b36f6c909680788527a31aa2a11f519ff630aa12ffe7c53553b717f1909978c77e7db07a02a86c8e7d12d63375402802d7a SHA512 3fe182f0f928baaf0f5521efa8763080de765240b5608d5126e84e49335eb5edc788ab406aa71f5fa97c371afe1f6808e93e2e082c7f65169b5f157ff6c3e00b
+DIST chromium-108.0.5343.2.tar.xz 1669214708 BLAKE2B e022bb908b15a5ae645d23cc5ab1e268ab87b77af3ae9ac352f6dc2fc9ba36f9e212cd53f4e3fdb18bb114f89ffada3f0fbee2b2fd46b6824fccaa68e21d930a SHA512 ff74eae98a44ebfc77a729ee65b4d338fcc39f04f2168247eed039d5c19c945d90c2b6aa5a12ca96d493c5116c2dcf9c959c74ffe2dc25ea6717176f699342b2
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
-EBUILD chromium-106.0.5249.103.ebuild 37269 BLAKE2B a803c4ae42c30e0ca579b532baa663f901c41df24cca59a3a7a6d0a831b3bb73d952352aea543334a84eb8e5e595c614659b4c00d8045e87acb0399bb8b95238 SHA512 87febb65b120669dc007d981d77141c09a7ad33d06ae1f2fd0fb5d85365316147c13a4e6a13004357ae883c79add39cd44a66fe58935c3bc375b9d39539aff48
-EBUILD chromium-106.0.5249.61.ebuild 37058 BLAKE2B 96947a02d1a60de3a829aa4b3084066caea320d13306c81c31e8b28b8682d519c3f3920ae5bf8a73aaa39134c90c5972c66af5bb73d428c1ce412b0c0bc8a633 SHA512 5d818660493103d2f3b98016d283143eefe911a92781229be91cb98a3cc309463a9d3795fef3bb04c8b643ef048613969f464adba22e5d4e5cacbc9b75d9ba88
-EBUILD chromium-106.0.5249.91.ebuild 37059 BLAKE2B 65acd6465413b3588c3d6ad18603f5cff20807867eb94a7a90165afbde6399e6db5f0468598f3350e979bb695f4b61e17257792320a7be666886e210c3f8597c SHA512 53b59fa110d400e78fbf8bde9559e3dd7cf84a379800d832fceab4a4dac2c1d5f8fdb04c4c0a4bafb7ede433208daa1e73dab6179c32c8e5e1d7159e91d71c71
+EBUILD chromium-106.0.5249.103.ebuild 37268 BLAKE2B a9eb56e489c480e61c73b0f43cd42901b4d1f6efb8c21a2a14d9e5b5f70a8ab19a2305acab01d767243973ce85df06c14179a79eeada51b17f57ea946e9115f1 SHA512 554c7cdf1e897312fb869108495245acd5ff9dde8be9aa9fe96ddc990015f3dc55dc081c2813783f9e5ccaa2a2b2091a96fb1fd2278aad5474ccfb234e255fc0
 EBUILD chromium-107.0.5304.29.ebuild 37536 BLAKE2B f0b3e491c3ae2fe3f973f3f2eae9f9d9f209fee1b4416896091a17ed9f804054f45d8f666cf39814394ac00b2cc9100f073caa4fbe0dd8b559e7027768405d29 SHA512 878a3798199f44fcdbab361e867f15bc5a0b01b7ca4d0e6b6334a860331e7535b43a4bb9085950e588cbee98c373ad10af19b652ab9979899a39dc2f65b7178a
-EBUILD chromium-108.0.5327.0.ebuild 37503 BLAKE2B d81453e1213ec09afac3b202259209ed75ce8633921a2a8d9713bf879a7c2e19a8fdc0a98da24e5982dca5ada2c239557e63790e2bbbc067eda32a237d3d0f6d SHA512 0d6adc3e12a514f6b0f5ab58f887c7932f61dc93c7d20b87714e6ec946a00cf2cb3255b3c2efa6348fd3ed78b4c8d7082893b1102d35c884c5ed86cd01d06e73
+EBUILD chromium-108.0.5343.2.ebuild 37493 BLAKE2B 1c133c672b80baf1732aa2095f6060c9ff79d90d843dc001ccb3fec638119cd95e98b88feedf8f698979b50ae0d5952d869f33f625f267d6f830a0f1c31e35fd SHA512 8fb7a44da1de704c97ddab04d1e003c36bc8c4f067b1728f13f8193e9e6f3185a35293a8c6d00132cdd0757deab87bc7c809ec4123e551118cd1d94926639791
 MISC metadata.xml 2128 BLAKE2B f78ae4671e2a0c0df19c9c43b8500b2de2226ee6b3979dd060d6430872c33072c380ea2438063a68b5aa413bce265d3c5b04097e09b11dfd92fe0067e66dfeea SHA512 4693a4782ea679520e4a09a5d4905dc202fc8d422757864069c455692b56101acb68aca588f3c8e07597ef3c6dd37dab7c7b1184c6d1c0f907d838f99097a4fe
diff --git a/www-client/chromium/chromium-106.0.5249.103.ebuild b/www-client/chromium/chromium-106.0.5249.103.ebuild
index dccdddcc2720..51bd19ec0ca3 100644
--- a/www-client/chromium/chromium-106.0.5249.103.ebuild
+++ b/www-client/chromium/chromium-106.0.5249.103.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
diff --git a/www-client/chromium/chromium-106.0.5249.61.ebuild b/www-client/chromium/chromium-106.0.5249.61.ebuild
deleted file mode 100644
index 37a1fc99c8f8..000000000000
--- a/www-client/chromium/chromium-106.0.5249.61.ebuild
+++ /dev/null
@@ -1,1189 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=14
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		|| (
-			>=app-accessibility/at-spi2-core-2.46.0:2
-			( app-accessibility/at-spi2-atk dev-libs/atk )
-		)
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		x11-misc/xdg-utils
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="13G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
-		use pgo && CHECKREQS_DISK_BUILD="20G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-105-swiftshader-no-wayland.patch"
-		"${FILESDIR}/chromium-106-python3_11.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/bidimapper
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-		# only need the .gn files
-		rm -r third_party/wayland/src || die
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_wayland_scanner=true"
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-106.0.5249.91.ebuild b/www-client/chromium/chromium-106.0.5249.91.ebuild
deleted file mode 100644
index 497bdb9693b1..000000000000
--- a/www-client/chromium/chromium-106.0.5249.91.ebuild
+++ /dev/null
@@ -1,1189 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=14
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 ~arm64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		|| (
-			>=app-accessibility/at-spi2-core-2.46.0:2
-			( app-accessibility/at-spi2-atk dev-libs/atk )
-		)
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		x11-misc/xdg-utils
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="13G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
-		use pgo && CHECKREQS_DISK_BUILD="20G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-105-swiftshader-no-wayland.patch"
-		"${FILESDIR}/chromium-106-python3_11.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/bidimapper
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-		# only need the .gn files
-		rm -r third_party/wayland/src || die
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_wayland_scanner=true"
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-108.0.5327.0.ebuild b/www-client/chromium/chromium-108.0.5343.2.ebuild
index c7fa92deec98..867f0101686f 100644
--- a/www-client/chromium/chromium-108.0.5327.0.ebuild
+++ b/www-client/chromium/chromium-108.0.5343.2.ebuild
@@ -12,11 +12,11 @@ CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu
 
 VIRTUALX_REQUIRED="pgo"
 
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="1"
+PATCHSET="2"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
@@ -167,7 +167,7 @@ BDEPEND="
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	')
 	>=app-arch/gzip-1.7
-	libcxx? ( >=sys-devel/clang-12 )
+	libcxx? ( >=sys-devel/clang-13 )
 	lto? ( $(depend_clang_llvm_versions 13 14 15) )
 	pgo? (
 		>=dev-python/selenium-3.141.0
@@ -190,7 +190,7 @@ BDEPEND="
 : ${CHROMIUM_FORCE_CLANG=no}
 
 if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
+	BDEPEND+=" >=sys-devel/clang-13"
 fi
 
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
@@ -253,8 +253,8 @@ pre_build_checks() {
 		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
 
 		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
+			die "At least gcc 10.4 is required"
 		fi
 		if use pgo && tc-is-cross-compiler; then
 			die "The pgo USE flag cannot be used when cross-compiling"
@@ -262,8 +262,8 @@ pre_build_checks() {
 		if needs_clang || tc-is-clang; then
 			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
 			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
+			if ! ver_test "$(clang-major-version)" -ge 13; then
+				die "At least clang 13 is required"
 			fi
 		fi
 		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
@@ -296,7 +296,7 @@ pkg_pretend() {
 	pre_build_checks
 
 	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
 		for myiuse in ${headless_unused_flags[@]}; do
 			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
 		done
@@ -322,9 +322,10 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-98-gtk4-build.patch"
 		"${FILESDIR}/chromium-107-system-zlib.patch"
+		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-108-revert-GlobalMediaControlsCastStartStop.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
@@ -433,7 +434,6 @@ src_prepare() {
 		third_party/fusejs
 		third_party/fxdiv
 		third_party/highway
-		third_party/libgifcodec
 		third_party/liburlpattern
 		third_party/libzip
 		third_party/gemmlowp
@@ -591,18 +591,14 @@ src_prepare() {
 			third_party/libaom/source/libaom/third_party/x86inc
 		)
 	fi
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
 	if use libcxx; then
 		keeplibs+=( third_party/re2 )
 	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
 	if use wayland && ! use headless ; then
 		keeplibs+=( third_party/wayland )
-		# only need the .gn files
-		rm -r third_party/wayland/src || die
 	fi
 	if use arm64 || use ppc64 ; then
 		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
@@ -926,7 +922,7 @@ chromium_configure() {
 		myconf_gn+=" use_system_libdrm=true"
 		myconf_gn+=" use_system_minigbm=true"
 		myconf_gn+=" use_xkbcommon=true"
-		use qt5 && export PATH="${PATH}:/usr/$(get_libdir)/qt5/bin"
+		use qt5 && export PATH="${PATH}:$(qt5_get_bindir)"
 		myconf_gn+=" use_qt=$(usex qt5 true false)"
 		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
 		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
@@ -1073,6 +1069,8 @@ src_compile() {
 
 	mv out/Release/chromedriver{.unstripped,} || die
 
+	rm -f out/Release/locales/*.pak.info || die
+
 	# Build manpage; bug #684550
 	sed -e 's|@@PACKAGE@@|chromium-browser|g;
 		s|@@MENUNAME@@|Chromium|g;' \
diff --git a/www-client/chromium/files/chromium-108-EnumTable-crash.patch b/www-client/chromium/files/chromium-108-EnumTable-crash.patch
new file mode 100644
index 000000000000..661ec33c1d0d
--- /dev/null
+++ b/www-client/chromium/files/chromium-108-EnumTable-crash.patch
@@ -0,0 +1,76 @@
+diff --git a/components/media_router/common/providers/cast/channel/enum_table.h b/components/media_router/common/providers/cast/channel/enum_table.h
+index 842553a..89de703 100644
+--- a/components/media_router/common/providers/cast/channel/enum_table.h
++++ b/components/media_router/common/providers/cast/channel/enum_table.h
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <cstring>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/notreached.h"
+@@ -187,7 +188,6 @@ class
+   inline constexpr GenericEnumTableEntry(int32_t value);
+   inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
+ 
+-  GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
+   GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
+ 
+  private:
+@@ -253,7 +253,6 @@ class EnumTable {
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+ 
+-    Entry(const Entry&) = delete;
+     Entry& operator=(const Entry&) = delete;
+   };
+ 
+@@ -312,15 +311,14 @@ class EnumTable {
+     if (is_sorted_) {
+       const std::size_t index = static_cast<std::size_t>(value);
+       if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
+-        const auto& entry = data_.begin()[index];
++        const auto& entry = data_[index];
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return absl::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_[0], data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -348,8 +346,7 @@ class EnumTable {
+   // enum value directly.
+   absl::optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_[0], data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : absl::optional<E>();
+   }
+ 
+@@ -364,7 +361,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -376,8 +373,8 @@ class EnumTable {
+ 
+     for (std::size_t i = 0; i < data.size(); i++) {
+       for (std::size_t j = i + 1; j < data.size(); j++) {
+-        const Entry& ei = data.begin()[i];
+-        const Entry& ej = data.begin()[j];
++        const Entry& ei = data[i];
++        const Entry& ej = data[j];
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
diff --git a/www-client/chromium/files/chromium-108-revert-GlobalMediaControlsCastStartStop.patch b/www-client/chromium/files/chromium-108-revert-GlobalMediaControlsCastStartStop.patch
new file mode 100644
index 000000000000..650e94816f49
--- /dev/null
+++ b/www-client/chromium/files/chromium-108-revert-GlobalMediaControlsCastStartStop.patch
@@ -0,0 +1,35 @@
+From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
+From: Muyao Xu <muyaoxu@google.com>
+Date: Thu, 20 Jan 2022 23:46:21 +0000
+Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by
+ default
+
+The feature is rolled out to 100% stable through finch for M96+.
+This CL enables it by default and fixes some unit tests failures.
+
+Bug: 1287242, 1287305
+Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416
+Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
+Commit-Queue: Muyao Xu <muyaoxu@google.com>
+Cr-Commit-Position: refs/heads/main@{#961658}
+---
+ chrome/browser/media/router/media_router_feature.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
+index 862329e..47c8912 100644
+--- a/chrome/browser/media/router/media_router_feature.cc
++++ b/chrome/browser/media/router/media_router_feature.cc
+@@ -54,7 +54,7 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+ #else
+ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+              "GlobalMediaControlsCastStartStop",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+ #endif  // !BUILDFLAG(IS_ANDROID)
+-- 
+2.35.1
+
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index c9feaea20978..ee6df23589d8 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_108.0.5327.0-1_amd64.deb 92322408 BLAKE2B 3f09ef4207976d898acd4e3965a399453a95efd47a9ff9237a58052f7b4fc0926893168dec027ac36057c59c711fa8f3bee220f60f8c0513e5949835600930bf SHA512 cef0b88339bd5468520a2d60341af6dd4d516e39fdf260a0e19f132b286306756b8d9c594e8a2d82cc465d13cf5707f35ce9e4dae306196cac56129d1207e358
-EBUILD google-chrome-unstable-108.0.5327.0-r1.ebuild 2806 BLAKE2B 82e4335c41d1ee4da1294f3347411fd4ca6a467b9978b0eb18f2361e4c3926303880da39df21ac6439392a0214d43da98f680515fac2db628c61d69160d41701 SHA512 432c17513412573ff0b15006b5a4ffcd5fc854ef2a358c6d14a019f45f1995177f4b159f2833a6d4731dc0de8037f177f35865e70177909a878f3491cc41cc81
+DIST google-chrome-unstable_108.0.5343.2-1_amd64.deb 92647740 BLAKE2B 4c50bd1f433f9698fcac61270d5e596b04899db3f4ab351de3c0bd5959208ccdd6c948f6bfcb23cb0747380b0301f516742374e82746a18a3f8c6e3b96cf2033 SHA512 f398a692456c0e2177c4d842237876cfa56360e99fe6611cb37d80093c54e724d43ea50c87b7250617f87e0f3ca62f6c3ea307646b7fef55178e94c690466d15
+EBUILD google-chrome-unstable-108.0.5343.2.ebuild 2806 BLAKE2B 82e4335c41d1ee4da1294f3347411fd4ca6a467b9978b0eb18f2361e4c3926303880da39df21ac6439392a0214d43da98f680515fac2db628c61d69160d41701 SHA512 432c17513412573ff0b15006b5a4ffcd5fc854ef2a358c6d14a019f45f1995177f4b159f2833a6d4731dc0de8037f177f35865e70177909a878f3491cc41cc81
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-108.0.5327.0-r1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-108.0.5343.2.ebuild
index b1fd61130859..b1fd61130859 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-108.0.5327.0-r1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-108.0.5343.2.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 82f2a8950ce5..2603c5776433 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 4a16763aebe3..2c605d72e7b1 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_107.0.5304.29-1_amd64.deb 92716112 BLAKE2B 33639ce65caecb9418b5556505fd57d3728e105fd7e350421840835fe86a5276498220494a2110ccd97e6929eae446e78a105d469d2e60a675b3eafe911fac84 SHA512 e28ffb903cb687dca5b2d1cdc7f754e01e51015ec672af5117d838f1c853d19fdc5b8fc0fb90398b0dadbd680d9651d9db950435b11d9712ed817eccfb0646f1
 DIST google-chrome-stable_106.0.5249.103-1_amd64.deb 92243056 BLAKE2B d8fefc40013ce91d67555186357ca1934d18a6c136a007a641a1e058c3b07b4e0187ca6c963838c59bb0785a3bfaa970b546fbd8b862687e4801dd17a499e489 SHA512 5d362c349eae00be7899e8b89dc122783c99ded7d715a0e235335608c5bfdc974f33c79d6c3269ff18cf145950e1489ef9a470468f7af93bbe3c235070699003
-DIST google-chrome-unstable_108.0.5327.0-1_amd64.deb 92322408 BLAKE2B 3f09ef4207976d898acd4e3965a399453a95efd47a9ff9237a58052f7b4fc0926893168dec027ac36057c59c711fa8f3bee220f60f8c0513e5949835600930bf SHA512 cef0b88339bd5468520a2d60341af6dd4d516e39fdf260a0e19f132b286306756b8d9c594e8a2d82cc465d13cf5707f35ce9e4dae306196cac56129d1207e358
+DIST google-chrome-unstable_108.0.5343.2-1_amd64.deb 92647740 BLAKE2B 4c50bd1f433f9698fcac61270d5e596b04899db3f4ab351de3c0bd5959208ccdd6c948f6bfcb23cb0747380b0301f516742374e82746a18a3f8c6e3b96cf2033 SHA512 f398a692456c0e2177c4d842237876cfa56360e99fe6611cb37d80093c54e724d43ea50c87b7250617f87e0f3ca62f6c3ea307646b7fef55178e94c690466d15
 EBUILD chrome-binary-plugins-106.0.5249.103.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
 EBUILD chrome-binary-plugins-107.0.5304.29_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
-EBUILD chrome-binary-plugins-108.0.5327.0_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-108.0.5343.2_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5327.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5343.2_alpha.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5327.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5343.2_alpha.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7dda92907c10..32b407ca8c70 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3bd8f578d158..d809636a1110 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -7,6 +7,6 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.34.tar.xz 21587592 BLAKE2B 708e03ee9e62f1a1742faffb63a352ec2d90a1dc46a4e0162e343bf68355ab80fbd30c1f2261b5e5339cbb66a02cfb48addbc5ecbc2b8a37f97aae86c5af1405 SHA512 95af4441b53be175acf16121a90b1db7a152cbfb3e5ed2dffc59f622b2eb5a4d74720ae8e05dc1421b6b23588f28e09e0f153f0b92777c836f522881720fb0a2
-EBUILD gtk+-2.24.33-r1.ebuild 9815 BLAKE2B c3a7819e9bd078e33d42dfcc5ffa32ca9e85d6415f20086505faa897865d700b6f4f3f36d48000aec6f2a87504f3797ba6ff45972934d9f309641605a05c22dc SHA512 42b55bc7daca2999d7a46bf3f90b585c22fa687edacedac7b9a6949d2b50c048d3fb6bd50a784fa7e3b87fb8af144896c06aa336d19da17ac9d84178df298188
+EBUILD gtk+-2.24.33-r2.ebuild 9818 BLAKE2B 5a631aa842e0651ad920e7e759af97d08083e39c167697b25fbaa72fb52cad031befc60922734aef5f2eaf7b7ab3d17bc7d2330e9029d4672126d466f4800a9b SHA512 878d48c0009433cb5d15eba3f26d5c137f79b718238b4920ac34fe7c61276ab2bd15dd5f76383fca2febad56fff3f8a7f99f9ce72ff5044a83885f1176da4d0c
 EBUILD gtk+-3.24.34-r1.ebuild 7213 BLAKE2B de7bf8b74b60cb663bc93c8af0ce70f5aa84fdbb09262d9305797a57e85e5f33e2802b85545d9af9a81a4231c28ee59c265371d3e65472c9b924d5a6860add9b SHA512 c92a024e99eda30848aabe805af9fdd0652cde94848edbd604210d9f38a6bf860432788a7fe1ba49317e5969bf49afd1e37b82ffc7561e4393ddecbb2c289873
 MISC metadata.xml 875 BLAKE2B 40b9f97f4db18f276bb80587843146c5227b5b803306da704ad99f8c7c34fb22cddbfb9f1df3395e2288ed258970851cb9d100f40b846f95d414e2b47ab78f99 SHA512 02b9c2674783308f54bde4d983185d36b372f64f1ee5d9d2cd797fe1158e3653a1edb8ece51a0be143775e9b85d71d4375769e2682778a9286fff42cbf18836b
diff --git a/x11-libs/gtk+/gtk+-2.24.33-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild
index c83a6edfded1..ee0d251e3c97 100644
--- a/x11-libs/gtk+/gtk+-2.24.33-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	!aqua? (
-		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
+		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),X,${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 541ee45dd12f..dd7280d39342 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 5e59b5ab2346..6c871b3e5542 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-pulseaudio-plugin-0.4.4.tar.bz2 389978 BLAKE2B 36f990aeac3fb07c19fe42
 DIST xfce4-pulseaudio-plugin-0.4.5.tar.bz2 394671 BLAKE2B facd79419b36741791b91d76da0212a99dfd2e807eedac691a5978b85365052702797cf67d2f0f8af294e9c0141fcedad49a92595acd4bbeadbf470889d7e16b SHA512 9250189af2d40f9b87687ef15e37983a95f797c2ba0aaa18cb8e510b7b1caff7f762a18db4e5a3780001b5cd46e00849d427801e14854c45e849c5d014a1375b
 EBUILD xfce4-pulseaudio-plugin-0.4.3-r1.ebuild 1509 BLAKE2B 191b2997b151e35e7e75aa7677a1a55da60a95fd7f70acd125a8e5d580a99171380ab7cb0f96e0611c6e91103a193a3bd1da12a6b8487cbd140bc3e51dde092d SHA512 3cdedbb259d8df2b84ee3d6ccbaec42bdbbcd06876b5bae4e7f6658449774ba542041849b661a6c9b2dc0f8e92dab30ac0b8dac8596bdaceee7fc45dddb0d0da
 EBUILD xfce4-pulseaudio-plugin-0.4.4.ebuild 1515 BLAKE2B 3fa0bac31bc975a2096f6d6d4fb980f902839718698fad7fd3c93f28e930d9b306b02c3df81628fa01463d5f85a5e8011bc7b1f31f70d79a29f344c680dcd199 SHA512 9f106907f74738f6ea60a6df3653145626093f67c5a83815f44ab3952d83ca23d0b9213c433069021881b3aea7f9c962f248ce30d4d1152c3ec5419606850083
-EBUILD xfce4-pulseaudio-plugin-0.4.5.ebuild 1591 BLAKE2B 1c0b2610a4db0c3948281fddab7b3d9a519c4913f9ee3d5b30010584019179e0f8d302ce16cfbb6101ad649551e5be4d8e592dd0f08be84777e1e52fb0a7c023 SHA512 dae54a1ba9450b02844d0c21ea2c9b633e4839ad1a9356e04008fda6423726c3b1d503d3584862d660eac536f94458ad9de3de5f50032ca6dce03db78bac702b
+EBUILD xfce4-pulseaudio-plugin-0.4.5.ebuild 1590 BLAKE2B d4802187f179276be924e5c6494b0251e8d9fefd9efa3fd6df93c1d6f8bdb59388bc2a1ec29cf4b23f318bd2945712c93d5d2059772dda40770bade0aed05f61 SHA512 eadae713915dda6262a85cb9de97b25996bfcedaaabd4e0178fb6fe504f4ee2091306db879e84a34bc5e6dc6a447717d2f05b296b3cc18edcf3124fe978cb178
 MISC metadata.xml 691 BLAKE2B b7db9900de060a5781f5d5c34b640deabdbda817fdd63b5681f3e1db8f8eaefdd2ef02fdcf99499f1d1ba8f389001e375163992890b8266af29cb94dcde3b51c SHA512 2d4520865ce86415c48a9b3c65151c50d846c3995b739cf337367bfe1e5c0ecaf4c9a3950e4f33cb12df6fcce0b26c69fd0c2c810461588afbc66cca6b5fb051
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
index 8cde7b380cae..1d819524fc96 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="+keybinder libcanberra libnotify wnck"
 
 DEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-10-09 19:32:31 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-09 19:32:31 +0100
commit	861ffe012c63c48053fb77b5110cbe900f651dfd (patch)
tree	3c59644581a43a1bcde4f45d912b96b4dd44f446
parent	759ce88b1b7c5011b611ddefc6c5ce8513210e46 (diff)