gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /www-client
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
68 files changed, 2388 insertions, 1394 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 7e5eb0065faa..f33d5fa40057 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5962861f7298..6b6f5ebb0d29 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,25 +1,23 @@
-AUX chromium-93-EnumTable-crash.patch 2863 BLAKE2B 72025b6fb1b8a2c3bb6d54ca9063c0cca8b8dda1344813abf55d361d197b28ccfffcc9d0bab7ef685752a8f9a4848f13b1de61e676b1d4386ea59b5cc137b68c SHA512 8a56fefbf99f9bb0262251685fa47166b27786f283ee3b84664a3b054da160647d7e359bbd051b6516c92472e5b19e55b1ff23b0021877712a78c8fc2d81963e
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
-AUX chromium-95-eigen-avx-1.patch 12740 BLAKE2B 326f2209ace9ec5816be308b07daec301342b9b32f73f8072bf3cb9b148d333d125d75e546233d35806433fd98504a19262b592e03a2752bd283559c47b59ad2 SHA512 103ed3a3c3e8adba8c54c30aa43d7c597b5c4520d40ee3dfaca591a5fde176c4ef1c90bfbbcef37d8e22dfaf2f9eaf5bc3aeac2a679ce7c5c18c98fc11fad136
-AUX chromium-95-eigen-avx-2.patch 1903 BLAKE2B d9a217723c8ebdb5371e93b85a925a24b46b16300d5f125f2208cdad3630ce9a0262a9132e1f449bc80315af617bd13f327dda6a7c8396a7fda0115c0685a600 SHA512 7c9d9a8335768156b9f54e46fa8e41e7caeefe6a0c58c1cf52af4eafb8c20faf9eb17f0a5686819ce111d31c6ab23e67806751bb467fb0b2c418eccb41ef83f3
-AUX chromium-95-eigen-avx-3.patch 1981 BLAKE2B 3a38ab5600702415d779c3b725785270d2deaf3008ae46b1e69eb3ca19412c87e94afd3171ec9e9149b7a8203bd9324bbccda2533ca32a0d2496afbafe43dd1a SHA512 bd8417df9804437b25a8cdc5b2552bfb6f9e4d26c325416f72d98b64fb6a587d2493e67d6cfb1538b5e41256e191c8958ee937bfbc02dbd49bf27a99e17eebb7
-AUX chromium-95-harfbuzz-3.patch 1540 BLAKE2B f40fa435623da8bdf1075e27ada445cf1c3b642cb01ab10ef1a3a608abcb6b232721b897d4c83db66e331e86346c96d864c93fe37b677f1357c79dbc4657435e SHA512 ddf6b5ebf439d29d34d206a2f8d753458f7e242c2e3241dc87f77a6593bf27319f610b45b75d4977c4f58302d17ceb912915751f6ce56439bc3ec2d589d38381
-AUX chromium-95-maldoca-zlib.patch 445 BLAKE2B 2793d344ff3083cfadc572bd1ce6932643cf00f11d1cd596f8aaff68363a12a79c4b42a389b1a1843fbe6d760de8960cafc5d3b2f7769f4ea04ff4ef74703839 SHA512 962834cdc6a32be31d61ac526067c7e73fe322c3e3cb72c234735e08d6cd15830ed461493c41febe35d40de60120fa85d2da7b3a62dafbe180b1e213e3d8940c
-AUX chromium-95-xfce-maximize.patch 1151 BLAKE2B 300e4239250e61042ef75887071ea0945242cc7299fb888bc3081f2539f27c0fa2b58bc5b4cfe025b27f61f4bb7f4e23524f27421c7e371977814b9b25a795d7 SHA512 e9af0a43f6978d2a5f50ba103a8e2c1e3e501e7f68610874acc3dc8e9c02726c5af0fc9fd6227db63a647c5f989eed62831fabd0d60f183616c7ddb99b7327d4
 AUX chromium-96-EnumTable-crash.patch 2850 BLAKE2B 196f5f739e96cab32d9ac7585ad4a04505f71e2e147b03e5f6e618ceed5cb37591240fdea48e388c0aefc567ecf6b369026a1d9c250112e4c0b2bf7952fcd21d SHA512 c968cc19160a4d91e0000a7ff2efdaaf97a1cd43ec68dbb335493f1bb1ff3798a6b5f33baa836ddc601c7017863655b00cf4d32cd9c9c94dbfcea7187dbec937
 AUX chromium-96-freetype-unbundle.patch 361 BLAKE2B 15c7681df3a4142bad4e0aed759d13f48681a19124bd5735037475b8028b1147b55b3fa2457ae9fca2ce7395f0c3b13c28c815b6c9487456a2b2c0bb26caefd1 SHA512 ee477b8799033f53cc3c2a2fd0e588f4091be1c2c9d5c82c7fe9db00167ff2a4de7d99e48fa1b9fe5fed3a03c1b8e0bbb3d192d35895c6a52f585d6bb1c9f84b
+AUX chromium-96-xfce-maximize.patch 1963 BLAKE2B 9cf8f834ae387b06817f904a70c06d780d609d4ed435760ecbad87df63432a6d73ae23076da7968692a7bb118e72877630509586d1388c634ecaba3704098857 SHA512 92010639061ab164b0979298f2b001f5f308409285f1b5d0ae7b92582fa1914a51939248f5bb3b3010bd447c71f40f2919d2a69c73a505002f90bbf417ec60c6
+AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
+AUX chromium-98-system-libdrm.patch 1018 BLAKE2B 0d3a3b20846569fc52199cbdb003a015415c0d7fdda65fb159b007063fa817c22ed676b1e5531026a7b450145071d72b249b1ec56e51a757e1bef1e55adaec0c SHA512 22c5fc39859b6a9c000111b8b2a5875b5cdd278ba55cd22f95d3e8baf59e2c92c1a8c9df83f5ae8f83d6a63df7ba397f1253a878e2d11362b3b72ebc5081bdca
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
+AUX chromium-glibc-2.34.patch 2089 BLAKE2B 637acb95df4efebd2cda65e4780dd2b042e67e2fa52bd9f8786ca250627b90f1b3b171d1e114d7fec616fc985881816b21efd8ac8fd80d124e997214edd2087d SHA512 85cf5f24f8c1cccc919bd5264cea7d3e46391084bc58c889d7236677f925251d0323ba4b312c363484d48d0158376b6a93e1d0c3d015a38f48031244a1676b76
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
-DIST chromium-95.0.4638.69.tar.xz 1213470900 BLAKE2B 31619448fd42bce74dac4fb3b7e04c59a2eb05461358e4fa59ab7122b07cd2dc6632a1a8c92a9bacd93c78c37a9e7fadfa7b9ded6371697177c419ce4e6665a5 SHA512 e8845a3add5f784342c51c530ed4fbf144f8ab16701d9dd6a2eedbd255167f39c26cf400d22f246ef5ad4afbb6a6133e17d767711587dd4bae18e3b5a997f95e
 DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282
-DIST chromium-96.0.4664.35.tar.xz 1221769064 BLAKE2B ea81a4a521b5999f7bc485d2fecbcdc8950bab91a0d0ff9b30347f2de00cf7bb82b717293d0d302e298a30fa75f2653e7e97aa382a8a779d5f48604e70356088 SHA512 974467c24e245cf4f70a68282e4acdd6542e709e258d39304bca4b8b917095fe3bce34a20526e0e1a160b2362c03bbe2f1b76e05a1a97327c18ab777cded3ad4
-DIST chromium-97-patchset-3.tar.xz 3444 BLAKE2B 3005964bfc9f1a373868dd7fa7fa66b30b62dbd8059f7ae3b259d5ca5841861cc47dfa218a9d154a862145e45798eb5c9869eb37b4b94a70eb0dedadffaa8fc1 SHA512 14d1336fb96efee954713f9e8534f4a3c78061b402b9fb582a295595c711d42787861fd176ca27c327d92bb80594c533e25092d1199797243bcaf877f1288a2d
-DIST chromium-97.0.4688.2.tar.xz 1223299644 BLAKE2B e1363e0c8425b9689168a05fae51e190a5d67a6ce7e817c0b8edce5be721789729ec62b98f4005a8b36bbedb44eb39a7dc2cd0cfdcb788c7837ee8a38c2a77bf SHA512 980aac2e3a73704a3df16a8a79409c890b21fd465978afda445af2b2ac7caceed8355600687bb854b7010f5aaab4a7e30d20d02d0eefd5d82c7e8cf5c1098a45
-EBUILD chromium-95.0.4638.69.ebuild 30274 BLAKE2B 9b36636e2780cf8539cc6f0f073c4104df592d73dc18b3e262beb9fc6ca87d53d2be3dc93b4253eb6d0a786f83573d45145f276b0ea3e9592c5e1e8c29f3d1c3 SHA512 81e1a786311ec3b3c51e8011c4958a4639ed7294800134c7dc5cdcadcbaee097d4867525c5f922b28f777be803d24fc41cc38cb97bd8ac91fa41ec5c5678449b
-EBUILD chromium-96.0.4664.35.ebuild 30107 BLAKE2B e2f3b67965c8b2dfc4240eb0aa6f0ef1a3c46de952111deaf5b74e9edf2a69db1c4ba8d7d1f60d5c8707559ce168d403cba8a83be7abbaa1f3d40b26d6ca2d64 SHA512 b65468e18ed3e3597e452e03f1f09f4bfa838368d23477118766fda46f98d73c7257464d696bd360fc9615870b11a267390230edb5bbc9e02d7af6cd73912703
-EBUILD chromium-97.0.4688.2.ebuild 30173 BLAKE2B 64e26f2be0a8b8f06ba5669d977aca113c369c7182ce602ce130960ae561eb7c89c26d1595076fd6ba4b768c346b3ccdedb4cf8ae2087857b5268afbbfc71169 SHA512 6c563afe2c9053c8befe556e61528f018e09184f3af69e3de7e5257a21529ea8c63b22f06c640bb22a5d1ef86835b14e7509584b119bf3001d3e19c66b281f0e
-MISC metadata.xml 1775 BLAKE2B 2fa038c0f6ebe1d86427cdf0806400dd690e31a9ee2667ea9f4f744478a675b9da89f0f541869bfea4ae5e28af1210d67b2766474d16752322407aad401d2c37 SHA512 0f4430b96a7d4dea4f2f1707cc81b184445c0f9da1d5c35a84c7958a037c13068b1a1073edc4576d7131564fc14c2f3b41a97cb8665f45e5a18eddc428c9ed23
+DIST chromium-96-ppc64le-1.tar.xz 29224 BLAKE2B 3369a3b15eb4f42761e01758135995a1f34e40cecbfc0372a4bc17b393d50b276ea5a0813d1c57f73f0dd34cf2a021356d25c2b4dcaa95998ffc082545dc915c SHA512 256d64fbf192e55d77c6580d36766a67dadfbd0f1e34e49bfc6d55114da7f2252d783db0dd09123996a71a01ec4a3d5c70fd1a5c8852db135857b8495f7cfbf1
+DIST chromium-96.0.4664.45.tar.xz 1221965612 BLAKE2B e990a2c3f0ae6d8bc4b6dddbecea2c640bb6491d9b321a301c1f168a35ad37553a23b8290a28dc05d50be005d3ad57fa69af2d3574266b9c83dcd24e65116c35 SHA512 0b1ccaf95697c14cb080dcb22e8584817ddcd98e704d081bc4f35a22dcfc8cca82dcabc4b82ad89ed0cd64752d226f389941bfab33b615e3948e2f778b9d9028
+DIST chromium-97-patchset-4.tar.xz 4240 BLAKE2B 450d013b6fd68f7e0bcb21a2b0828d531eda86965e636fe24fc36c2e7e1f74fe93f27f0d4b1d03e67c605797e28db37de4949ff78d5106e07b0362bec4bc5d8a SHA512 181c706c83bdbe07b2e7f02b654922a860aea761ad267e6545fb7d56b66373b003c1c79fae5cd45eeb3be8917782fa45df1c05bbb00e170f0146e7385f4246c4
+DIST chromium-97.0.4692.36.tar.xz 1213467240 BLAKE2B 5a21c2b94fce104bef4dba895f170b496167154d0c364631f2f02d62a4ebb3fd0fa9143f570e4aad50d6b84214a6682b297aeef3cf6963fe7948a9b420c777bd SHA512 8aa99149c0bdf740988a0ba2d8e397f29df5b4372c6ab1e6700893e9a5978153c7d9701439ce7925de2ae521da689e5a1116876977e06d0c36350d03e10f8fc0
+DIST chromium-98-patchset-2.tar.xz 6732 BLAKE2B 8d742607a5dbdabeed1885fcf69486628a1364980f885f51e729291c392d5ff63190ae6c77687dd0096dc8a5208c14606777b92a19fb66a643e6a23f382c014b SHA512 a94004e165f1437d9955aaeb600a8809443d2d5bc852967740c420c64da4a1cdde006cff1be9e0cc0f4fef15727349ae8f2526f0bcfcff702cc5a60515fbf873
+DIST chromium-98.0.4736.0.tar.xz 1228878072 BLAKE2B 433b349f52eff009ad995b5d6920900a78c845df98e6c25c0b20ea972eedf0d7f29be0f973311dc6a139d013f32f776fb923e2c2e956546b14ca870bad8969ce SHA512 32aed341ab400400608c33efc59e654ea2ef533cd5ef637566bf3c8229562996d45ede60ddd1374c850a8ff3d3dea1565eb394db33d23a3606198049f336a55f
+EBUILD chromium-96.0.4664.45.ebuild 30442 BLAKE2B f8b9f5e21a8b0e5122c4b1d658af038817c4e4b9f2dbf81e91d6c2a96d715093b22f47535f651d7255cb92e2b8d07202dc1ae6fdedbd5bc0e62fde3f5804ff0a SHA512 d534a1e4bc412b28fdb18c7c247d1f1ea495ee1e93c93406c92b13e248fa157529c69c890cfa0c0b17c0a77c876fbc7fa69719523c58beeae26c0eefd7932835
+EBUILD chromium-97.0.4692.36.ebuild 30405 BLAKE2B 018edaeb8c8a99919d9ed48cf000f8e1c41b081c7222f68b00fc63be25ce6613343cd4cf955ba3ba24663f90591a782311dc7d0593a6a5818c330c3955bac8c5 SHA512 5ebd93ee1fcf68101b3b3124fb008d1cb382d0837a9f3ca56269e451d089b5c247ed87aa694c5b46524e9ad0e2a2a4bd6d975c9aececa1d531005fdff54015b9
+EBUILD chromium-98.0.4736.0.ebuild 30607 BLAKE2B 05b557867f9ddc66992644f6da0ce4828c29dc45eb77ef71c052f4393d1f8c0bd828fad25a48fc48e5ff5b5c5e1fc217198707cad8c9395ac3cfd631d82d8f0e SHA512 e5956b8af6469b28b5c041dc1e61e9cae2b791524b162ac98e22f077f1db96a6524578fbe61ca0179beb0eb2c14dbbf34f16b6349af752d2235b5899dc4d89a6
+MISC metadata.xml 1854 BLAKE2B ecb1c85380dcf8f3b76159eee3aeb27746b35c4f9b6cedc56a011d1cff4524f5ea8fcfd7530c1b627f54b6612f9934cb49119c7e22640e6232812f8c846c5cd7 SHA512 3ff27b3eb1568590c1e5ff90d9444a4ce573ca57502be51c3e11496580152883ea43a7ecc4f56fb5b23299d4be58dc068e74a1375720f97222e019eac354425a
diff --git a/www-client/chromium/chromium-96.0.4664.35.ebuild b/www-client/chromium/chromium-96.0.4664.45.ebuild
index 43a88629c0b7..5e7bf8cb0468 100644
--- a/www-client/chromium/chromium-96.0.4664.35.ebuild
+++ b/www-client/chromium/chromium-96.0.4664.45.ebuild
@@ -15,12 +15,14 @@ DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
 PATCHSET="4"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+PPC64LE_PATCHSET="1"
 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"
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-$(ver_cut 1)-ppc64le-${PPC64LE_PATCHSET}.tar.xz )"
 
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+SLOT="0/stable"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
@@ -114,7 +116,6 @@ BDEPEND="
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	virtual/pkgconfig
@@ -231,13 +232,16 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-95-xfce-maximize.patch"
 		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-96-freetype-unbundle.patch"
+		"${FILESDIR}/chromium-96-xfce-maximize.patch"
+		"${FILESDIR}/chromium-glibc-2.34.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
+	use ppc64 && PATCHES+=( "${WORKDIR}/${PN}-ppc64le" )
+
 	default
 
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -745,6 +749,9 @@ src_configure() {
 	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
 	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
 
+	# highway/libjxl fail on ppc64 without extra patches, disable for now.
+	use ppc64 && myconf_gn+=" enable_jxl_decoder=false"
+
 	# Disable unknown warning message from clang.
 	tc-is-clang && append-flags -Wno-unknown-warning-option
 
diff --git a/www-client/chromium/chromium-97.0.4688.2.ebuild b/www-client/chromium/chromium-97.0.4692.36.ebuild
index a78067d2771c..7d53bac24055 100644
--- a/www-client/chromium/chromium-97.0.4688.2.ebuild
+++ b/www-client/chromium/chromium-97.0.4692.36.ebuild
@@ -13,13 +13,13 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="4"
 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"
 
 LICENSE="BSD"
-SLOT="0/dev"
+SLOT="0/beta"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
@@ -114,7 +114,6 @@ BDEPEND="
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	virtual/pkgconfig
@@ -231,9 +230,8 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-95-xfce-maximize.patch"
 		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-96-freetype-unbundle.patch"
+		"${FILESDIR}/chromium-glibc-2.34.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
@@ -839,6 +837,11 @@ src_compile() {
 		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() {
@@ -897,6 +900,9 @@ src_install() {
 	doins -r out/Release/resources
 	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
diff --git a/www-client/chromium/chromium-95.0.4638.69.ebuild b/www-client/chromium/chromium-98.0.4736.0.ebuild
index 53d1b4a46cac..e1f151131338 100644
--- a/www-client/chromium/chromium-95.0.4638.69.ebuild
+++ b/www-client/chromium/chromium-98.0.4736.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
@@ -13,15 +13,15 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
+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"
 
 LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
+SLOT="0/dev"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
 	screencast? ( wayland )
@@ -57,7 +57,7 @@ COMMON_DEPEND="
 	>=media-libs/freetype-2.11.0-r1:=
 	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
 	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
+	system-png? ( media-libs/libpng:=[-apng] )
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? (
 		>=media-video/ffmpeg-4.3:=
@@ -109,12 +109,11 @@ BDEPEND="
 	')
 	>=app-arch/gzip-1.7
 	dev-lang/perl
-	<dev-util/gn-0.1943
+	>=dev-util/gn-0.1807
 	dev-vcs/git
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	virtual/pkgconfig
@@ -230,14 +229,10 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-95-maldoca-zlib.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-1.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-2.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-3.patch"
-		"${FILESDIR}/chromium-95-harfbuzz-3.patch"
-		"${FILESDIR}/chromium-95-xfce-maximize.patch"
+		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-98-system-libdrm.patch"
+		"${FILESDIR}/chromium-glibc-2.34.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
@@ -329,6 +324,7 @@ src_prepare() {
 		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
@@ -447,7 +443,6 @@ src_prepare() {
 		third_party/tflite
 		third_party/tflite/src/third_party/eigen3
 		third_party/tflite/src/third_party/fft2d
-		third_party/tflite-support
 		third_party/ruy
 		third_party/six
 		third_party/ukey2
@@ -492,6 +487,9 @@ src_prepare() {
 	if ! use system-icu; then
 		keeplibs+=( third_party/icu )
 	fi
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
 	if use system-harfbuzz; then
 		keeplibs+=( third_party/harfbuzz-ng/utils )
 	else
@@ -599,7 +597,6 @@ src_configure() {
 		#harfbuzz-ng
 		libdrm
 		libjpeg
-		libpng
 		libwebp
 		zlib
 	)
@@ -609,6 +606,9 @@ src_configure() {
 	if use system-icu; then
 		gn_system_libraries+=( icu )
 	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
 	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
 		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
 		gn_system_libraries+=( libxml )
@@ -787,6 +787,8 @@ src_configure() {
 		myconf_gn+=" is_cfi=false"
 		# Disable PGO, because profile data is only compatible with >=clang-11
 		myconf_gn+=" chrome_pgo_phase=0"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
 	fi
 
 	einfo "Configuring Chromium..."
@@ -841,6 +843,11 @@ src_compile() {
 		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() {
@@ -899,6 +906,9 @@ src_install() {
 	doins -r out/Release/resources
 	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
diff --git a/www-client/chromium/files/chromium-95-eigen-avx-1.patch b/www-client/chromium/files/chromium-95-eigen-avx-1.patch
deleted file mode 100644
index 21d520cc4d44..000000000000
--- a/www-client/chromium/files/chromium-95-eigen-avx-1.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From 3d4ba855e014987cad86d62a8dff533492255695 Mon Sep 17 00:00:00 2001
-From: Antonio Sanchez <cantonios@google.com>
-Date: Wed, 1 Sep 2021 14:11:21 -0700
-Subject: [PATCH] Fix AVX integer packet issues.
-
-Most are instances of AVX2 functions not protected by
-`EIGEN_VECTORIZE_AVX2`.  There was also a missing semi-colon
-for AVX512.
----
- Eigen/src/Core/arch/AVX/PacketMath.h    | 83 ++++++++++++++++++-------
- Eigen/src/Core/arch/AVX512/PacketMath.h |  6 +-
- 2 files changed, 63 insertions(+), 26 deletions(-)
-
-diff --git a/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h b/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-index dc1a1d6b0..247ee4efd 100644
---- a/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-+++ b/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-@@ -262,10 +262,6 @@ template<> EIGEN_STRONG_INLINE Packet4d peven_mask(const Packet4d& /*a*/) { retu
- template<> EIGEN_STRONG_INLINE Packet8f pload1<Packet8f>(const float*  from) { return _mm256_broadcast_ss(from); }
- template<> EIGEN_STRONG_INLINE Packet4d pload1<Packet4d>(const double* from) { return _mm256_broadcast_sd(from); }
- 
--template<> EIGEN_STRONG_INLINE Packet8f plset<Packet8f>(const float& a) { return _mm256_add_ps(_mm256_set1_ps(a), _mm256_set_ps(7.0,6.0,5.0,4.0,3.0,2.0,1.0,0.0)); }
--template<> EIGEN_STRONG_INLINE Packet4d plset<Packet4d>(const double& a) { return _mm256_add_pd(_mm256_set1_pd(a), _mm256_set_pd(3.0,2.0,1.0,0.0)); }
--template<> EIGEN_STRONG_INLINE Packet8i plset<Packet8i>(const int& a) { return _mm256_add_epi32(_mm256_set1_epi32(a), _mm256_set_epi32(7,6,5,4,3,2,1,0)); }
--
- template<> EIGEN_STRONG_INLINE Packet8f padd<Packet8f>(const Packet8f& a, const Packet8f& b) { return _mm256_add_ps(a,b); }
- template<> EIGEN_STRONG_INLINE Packet4d padd<Packet4d>(const Packet4d& a, const Packet4d& b) { return _mm256_add_pd(a,b); }
- template<> EIGEN_STRONG_INLINE Packet8i padd<Packet8i>(const Packet8i& a, const Packet8i& b) {
-@@ -278,6 +274,10 @@ template<> EIGEN_STRONG_INLINE Packet8i padd<Packet8i>(const Packet8i& a, const
- #endif
- }
- 
-+template<> EIGEN_STRONG_INLINE Packet8f plset<Packet8f>(const float& a) { return padd(pset1(a), _mm256_set_ps(7.0,6.0,5.0,4.0,3.0,2.0,1.0,0.0)); }
-+template<> EIGEN_STRONG_INLINE Packet4d plset<Packet4d>(const double& a) { return padd(pset1(a), _mm256_set_pd(3.0,2.0,1.0,0.0)); }
-+template<> EIGEN_STRONG_INLINE Packet8i plset<Packet8i>(const int& a) { return padd(pset1(a), _mm256_set_epi32(7,6,5,4,3,2,1,0)); }
-+
- template<> EIGEN_STRONG_INLINE Packet8f psub<Packet8f>(const Packet8f& a, const Packet8f& b) { return _mm256_sub_ps(a,b); }
- template<> EIGEN_STRONG_INLINE Packet4d psub<Packet4d>(const Packet4d& a, const Packet4d& b) { return _mm256_sub_pd(a,b); }
- template<> EIGEN_STRONG_INLINE Packet8i psub<Packet8i>(const Packet8i& a, const Packet8i& b) {
-@@ -300,7 +300,7 @@ template<> EIGEN_STRONG_INLINE Packet4d pnegate(const Packet4d& a)
- }
- template<> EIGEN_STRONG_INLINE Packet8i pnegate(const Packet8i& a)
- {
--  return _mm256_sub_epi32(_mm256_set1_epi32(0), a);
-+  return psub(pzero(a), a);
- }
- 
- template<> EIGEN_STRONG_INLINE Packet8f pconj(const Packet8f& a) { return a; }
-@@ -419,7 +419,13 @@ template<> EIGEN_STRONG_INLINE Packet4d pmin<Packet4d>(const Packet4d& a, const
- #endif
- }
- template<> EIGEN_STRONG_INLINE Packet8i pmin<Packet8i>(const Packet8i& a, const Packet8i& b) {
-+#ifdef EIGEN_VECTORIZE_AVX2
-   return _mm256_min_epi32(a, b);
-+#else
-+  __m128i lo = _mm_min_epi32(_mm256_extractf128_si256(a, 0), _mm256_extractf128_si256(b, 0));
-+  __m128i hi = _mm_min_epi32(_mm256_extractf128_si256(a, 1), _mm256_extractf128_si256(b, 1));
-+  return _mm256_insertf128_si256(_mm256_castsi128_si256(lo), (hi), 1);
-+#endif
- }
- 
- template<> EIGEN_STRONG_INLINE Packet8f pmax<Packet8f>(const Packet8f& a, const Packet8f& b) {
-@@ -445,7 +451,13 @@ template<> EIGEN_STRONG_INLINE Packet4d pmax<Packet4d>(const Packet4d& a, const
- #endif
- }
- template<> EIGEN_STRONG_INLINE Packet8i pmax<Packet8i>(const Packet8i& a, const Packet8i& b) {
-+#ifdef EIGEN_VECTORIZE_AVX2
-   return _mm256_max_epi32(a, b);
-+#else
-+  __m128i lo = _mm_max_epi32(_mm256_extractf128_si256(a, 0), _mm256_extractf128_si256(b, 0));
-+  __m128i hi = _mm_max_epi32(_mm256_extractf128_si256(a, 1), _mm256_extractf128_si256(b, 1));
-+  return _mm256_insertf128_si256(_mm256_castsi128_si256(lo), (hi), 1);
-+#endif
- }
- 
- // Add specializations for min/max with prescribed NaN progation.
-@@ -641,17 +653,25 @@ template<> EIGEN_STRONG_INLINE Packet8f ploaddup<Packet8f>(const float* from)
-   // then we can perform a consistent permutation on the global register to get everything in shape:
-   return  _mm256_permute_ps(tmp, _MM_SHUFFLE(3,3,2,2));
- }
--// Loads 2 doubles from memory a returns the packet {a0, a0  a1, a1}
-+// Loads 2 doubles from memory a returns the packet {a0, a0, a1, a1}
- template<> EIGEN_STRONG_INLINE Packet4d ploaddup<Packet4d>(const double* from)
- {
-   Packet4d tmp = _mm256_broadcast_pd((const __m128d*)(const void*)from);
-   return  _mm256_permute_pd(tmp, 3<<2);
- }
--// Loads 4 integers from memory a returns the packet {a0, a0  a1, a1, a2, a2, a3, a3}
-+// Loads 4 integers from memory a returns the packet {a0, a0, a1, a1, a2, a2, a3, a3}
- template<> EIGEN_STRONG_INLINE Packet8i ploaddup<Packet8i>(const int* from)
- {
--  Packet8i a = _mm256_castsi128_si256(pload<Packet4i>(from));
-+#ifdef EIGEN_VECTORIZE_AVX2
-+  const Packet8i a = _mm256_castsi128_si256(pload<Packet4i>(from));
-   return _mm256_permutevar8x32_epi32(a, _mm256_setr_epi32(0, 0, 1, 1, 2, 2, 3, 3));
-+#else
-+  __m256 tmp = _mm256_broadcast_ps((const __m128*)(const void*)from);
-+  // mimic an "inplace" permutation of the lower 128bits using a blend
-+  tmp = _mm256_blend_ps(tmp,_mm256_castps128_ps256(_mm_permute_ps( _mm256_castps256_ps128(tmp), _MM_SHUFFLE(1,0,1,0))), 15);
-+  // then we can perform a consistent permutation on the global register to get everything in shape:
-+  return  _mm256_castps_si256(_mm256_permute_ps(tmp, _MM_SHUFFLE(3,3,2,2)));
-+#endif
- }
- 
- // Loads 2 floats from memory a returns the packet {a0, a0  a0, a0, a1, a1, a1, a1}
-@@ -662,7 +682,7 @@ template<> EIGEN_STRONG_INLINE Packet8f ploadquad<Packet8f>(const float* from)
- }
- template<> EIGEN_STRONG_INLINE Packet8i ploadquad<Packet8i>(const int* from)
- {
--  return _mm256_inserti128_si256(_mm256_set1_epi32(*from), _mm_set1_epi32(*(from+1)), 1);
-+  return _mm256_insertf128_si256(_mm256_set1_epi32(*from), _mm_set1_epi32(*(from+1)), 1);
- }
- 
- template<> EIGEN_STRONG_INLINE void pstore<float>(float*   to, const Packet8f& from) { EIGEN_DEBUG_ALIGNED_STORE _mm256_store_ps(to, from); }
-@@ -723,13 +743,13 @@ template<> EIGEN_DEVICE_FUNC inline void pscatter<double, Packet4d>(double* to,
- }
- template<> EIGEN_DEVICE_FUNC inline void pscatter<int, Packet8i>(int* to, const Packet8i& from, Index stride)
- {
--  __m128i low = _mm256_extracti128_si256(from, 0);
-+  __m128i low = _mm256_extractf128_si256(from, 0);
-   to[stride*0] = _mm_extract_epi32(low, 0);
-   to[stride*1] = _mm_extract_epi32(low, 1);
-   to[stride*2] = _mm_extract_epi32(low, 2);
-   to[stride*3] = _mm_extract_epi32(low, 3);
- 
--  __m128i high = _mm256_extracti128_si256(from, 1);
-+  __m128i high = _mm256_extractf128_si256(from, 1);
-   to[stride*4] = _mm_extract_epi32(high, 0);
-   to[stride*5] = _mm_extract_epi32(high, 1);
-   to[stride*6] = _mm_extract_epi32(high, 2);
-@@ -803,7 +823,13 @@ template<> EIGEN_STRONG_INLINE Packet4d pabs(const Packet4d& a)
- }
- template<> EIGEN_STRONG_INLINE Packet8i pabs(const Packet8i& a)
- {
-+#ifdef EIGEN_VECTORIZE_AVX2
-   return _mm256_abs_epi32(a);
-+#else
-+  __m128i lo = _mm_abs_epi32(_mm256_extractf128_si256(a, 0));
-+  __m128i hi = _mm_abs_epi32(_mm256_extractf128_si256(a, 1));
-+  return _mm256_insertf128_si256(_mm256_castsi128_si256(lo), (hi), 1);
-+#endif
- }
- 
- template<> EIGEN_STRONG_INLINE Packet8f pfrexp<Packet8f>(const Packet8f& a, Packet8f& exponent) {
-@@ -989,16 +1015,27 @@ ptranspose(PacketBlock<Packet8f,4>& kernel) {
- #define MM256_SHUFFLE_EPI32(A, B, M) \
-   _mm256_castps_si256(_mm256_shuffle_ps(_mm256_castsi256_ps(A), _mm256_castsi256_ps(B), M))
- 
-+#ifdef EIGEN_VECTORIZE_AVX2
-+#define MM256_UNPACKLO_EPI32(A, B) \
-+  _mm256_castps_si256(_mm256_unpacklo_ps(_mm256_castsi256_ps(A), _mm256_castsi256_ps(B)))
-+#define MM256_UNPACKHI_EPI32(A, B) \
-+  _mm256_castps_si256(_mm256_unpackhi_ps(_mm256_castsi256_ps(A), _mm256_castsi256_ps(B)))
-+#else
-+#define MM256_UNPACKLO_EPI32(A, B) _mm256_unpacklo_ps(A, B)
-+#define MM256_UNPACKHI_EPI32(A, B) _mm256_unpackhi_ps(A, B)
-+#endif
-+
-+
- EIGEN_DEVICE_FUNC inline void
- ptranspose(PacketBlock<Packet8i,8>& kernel) {
--  __m256i T0 = _mm256_unpacklo_epi32(kernel.packet[0], kernel.packet[1]);
--  __m256i T1 = _mm256_unpackhi_epi32(kernel.packet[0], kernel.packet[1]);
--  __m256i T2 = _mm256_unpacklo_epi32(kernel.packet[2], kernel.packet[3]);
--  __m256i T3 = _mm256_unpackhi_epi32(kernel.packet[2], kernel.packet[3]);
--  __m256i T4 = _mm256_unpacklo_epi32(kernel.packet[4], kernel.packet[5]);
--  __m256i T5 = _mm256_unpackhi_epi32(kernel.packet[4], kernel.packet[5]);
--  __m256i T6 = _mm256_unpacklo_epi32(kernel.packet[6], kernel.packet[7]);
--  __m256i T7 = _mm256_unpackhi_epi32(kernel.packet[6], kernel.packet[7]);
-+  __m256i T0 = MM256_UNPACKLO_EPI32(kernel.packet[0], kernel.packet[1]);
-+  __m256i T1 = MM256_UNPACKHI_EPI32(kernel.packet[0], kernel.packet[1]);
-+  __m256i T2 = MM256_UNPACKLO_EPI32(kernel.packet[2], kernel.packet[3]);
-+  __m256i T3 = MM256_UNPACKHI_EPI32(kernel.packet[2], kernel.packet[3]);
-+  __m256i T4 = MM256_UNPACKLO_EPI32(kernel.packet[4], kernel.packet[5]);
-+  __m256i T5 = MM256_UNPACKHI_EPI32(kernel.packet[4], kernel.packet[5]);
-+  __m256i T6 = MM256_UNPACKLO_EPI32(kernel.packet[6], kernel.packet[7]);
-+  __m256i T7 = MM256_UNPACKHI_EPI32(kernel.packet[6], kernel.packet[7]);
-   __m256i S0 = MM256_SHUFFLE_EPI32(T0,T2,_MM_SHUFFLE(1,0,1,0));
-   __m256i S1 = MM256_SHUFFLE_EPI32(T0,T2,_MM_SHUFFLE(3,2,3,2));
-   __m256i S2 = MM256_SHUFFLE_EPI32(T1,T3,_MM_SHUFFLE(1,0,1,0));
-@@ -1019,10 +1056,10 @@ ptranspose(PacketBlock<Packet8i,8>& kernel) {
- 
- EIGEN_DEVICE_FUNC inline void
- ptranspose(PacketBlock<Packet8i,4>& kernel) {
--  __m256i T0 = _mm256_unpacklo_epi32(kernel.packet[0], kernel.packet[1]);
--  __m256i T1 = _mm256_unpackhi_epi32(kernel.packet[0], kernel.packet[1]);
--  __m256i T2 = _mm256_unpacklo_epi32(kernel.packet[2], kernel.packet[3]);
--  __m256i T3 = _mm256_unpackhi_epi32(kernel.packet[2], kernel.packet[3]);
-+  __m256i T0 = MM256_UNPACKLO_EPI32(kernel.packet[0], kernel.packet[1]);
-+  __m256i T1 = MM256_UNPACKHI_EPI32(kernel.packet[0], kernel.packet[1]);
-+  __m256i T2 = MM256_UNPACKLO_EPI32(kernel.packet[2], kernel.packet[3]);
-+  __m256i T3 = MM256_UNPACKHI_EPI32(kernel.packet[2], kernel.packet[3]);
- 
-   __m256i S0 = MM256_SHUFFLE_EPI32(T0,T2,_MM_SHUFFLE(1,0,1,0));
-   __m256i S1 = MM256_SHUFFLE_EPI32(T0,T2,_MM_SHUFFLE(3,2,3,2));
-diff --git a/third_party/eigen3/src/Eigen/src/Core/arch/AVX512/PacketMath.h b/third_party/eigen3/src/Eigen/src/Core/arch/AVX512/PacketMath.h
-index 6ce15c677..0810f66ee 100644
---- a/third_party/eigen3/src/Eigen/src/Core/arch/AVX512/PacketMath.h
-+++ b/third_party/eigen3/src/Eigen/src/Core/arch/AVX512/PacketMath.h
-@@ -1028,7 +1028,7 @@ template<> EIGEN_STRONG_INLINE Packet8d pldexp<Packet8d>(const Packet8d& a, cons
- 
- // AVX512F does not define _mm512_extracti32x8_epi32 to extract _m256i from _m512i
- #define EIGEN_EXTRACT_8i_FROM_16i(INPUT, OUTPUT)                           \
--  __m256i OUTPUT##_0 = _mm512_extracti32x8_epi32(INPUT, 0)                 \
-+  __m256i OUTPUT##_0 = _mm512_extracti32x8_epi32(INPUT, 0);                \
-   __m256i OUTPUT##_1 = _mm512_extracti32x8_epi32(INPUT, 1) 
- #else
- #define EIGEN_EXTRACT_8f_FROM_16f(INPUT, OUTPUT)                \
-@@ -1037,7 +1037,7 @@ template<> EIGEN_STRONG_INLINE Packet8d pldexp<Packet8d>(const Packet8d& a, cons
-       _mm512_extractf32x4_ps(INPUT, 1), 1);                     \
-   __m256 OUTPUT##_1 = _mm256_insertf128_ps(                     \
-       _mm256_castps128_ps256(_mm512_extractf32x4_ps(INPUT, 2)), \
--      _mm512_extractf32x4_ps(INPUT, 3), 1);
-+      _mm512_extractf32x4_ps(INPUT, 3), 1)
- 
- #define EIGEN_EXTRACT_8i_FROM_16i(INPUT, OUTPUT)                    \
-   __m256i OUTPUT##_0 = _mm256_insertf128_si256(                     \
-@@ -1045,7 +1045,7 @@ template<> EIGEN_STRONG_INLINE Packet8d pldexp<Packet8d>(const Packet8d& a, cons
-       _mm512_extracti32x4_epi32(INPUT, 1), 1);                      \
-   __m256i OUTPUT##_1 = _mm256_insertf128_si256(                     \
-       _mm256_castsi128_si256(_mm512_extracti32x4_epi32(INPUT, 2)),  \
--      _mm512_extracti32x4_epi32(INPUT, 3), 1);
-+      _mm512_extracti32x4_epi32(INPUT, 3), 1)
- #endif
- 
- #ifdef EIGEN_VECTORIZE_AVX512DQ
--- 
-GitLab
-
diff --git a/www-client/chromium/files/chromium-95-eigen-avx-2.patch b/www-client/chromium/files/chromium-95-eigen-avx-2.patch
deleted file mode 100644
index 1cb8007b6a6a..000000000000
--- a/www-client/chromium/files/chromium-95-eigen-avx-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From def145547fc6abd14236e103b9443a36064f664f Mon Sep 17 00:00:00 2001
-From: Antonio Sanchez <cantonios@google.com>
-Date: Thu, 2 Sep 2021 16:21:07 -0700
-Subject: [PATCH] Add missing packet types in pset1 call.
-
-Oops, introduced this when "fixing" integer packets.
----
- Eigen/src/Core/arch/AVX/PacketMath.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h b/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-index 247ee4efd..8da9031dc 100644
---- a/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-+++ b/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-@@ -274,9 +274,9 @@ template<> EIGEN_STRONG_INLINE Packet8i padd<Packet8i>(const Packet8i& a, const
- #endif
- }
- 
--template<> EIGEN_STRONG_INLINE Packet8f plset<Packet8f>(const float& a) { return padd(pset1(a), _mm256_set_ps(7.0,6.0,5.0,4.0,3.0,2.0,1.0,0.0)); }
--template<> EIGEN_STRONG_INLINE Packet4d plset<Packet4d>(const double& a) { return padd(pset1(a), _mm256_set_pd(3.0,2.0,1.0,0.0)); }
--template<> EIGEN_STRONG_INLINE Packet8i plset<Packet8i>(const int& a) { return padd(pset1(a), _mm256_set_epi32(7,6,5,4,3,2,1,0)); }
-+template<> EIGEN_STRONG_INLINE Packet8f plset<Packet8f>(const float& a) { return padd(pset1<Packet8f>(a), _mm256_set_ps(7.0,6.0,5.0,4.0,3.0,2.0,1.0,0.0)); }
-+template<> EIGEN_STRONG_INLINE Packet4d plset<Packet4d>(const double& a) { return padd(pset1<Packet4d>(a), _mm256_set_pd(3.0,2.0,1.0,0.0)); }
-+template<> EIGEN_STRONG_INLINE Packet8i plset<Packet8i>(const int& a) { return padd(pset1<Packet8i>(a), _mm256_set_epi32(7,6,5,4,3,2,1,0)); }
- 
- template<> EIGEN_STRONG_INLINE Packet8f psub<Packet8f>(const Packet8f& a, const Packet8f& b) { return _mm256_sub_ps(a,b); }
- template<> EIGEN_STRONG_INLINE Packet4d psub<Packet4d>(const Packet4d& a, const Packet4d& b) { return _mm256_sub_pd(a,b); }
--- 
-GitLab
-
diff --git a/www-client/chromium/files/chromium-95-eigen-avx-3.patch b/www-client/chromium/files/chromium-95-eigen-avx-3.patch
deleted file mode 100644
index 44e9ef4e0ec0..000000000000
--- a/www-client/chromium/files/chromium-95-eigen-avx-3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7792b1e909a98703181aecb8810b4b654004c25d Mon Sep 17 00:00:00 2001
-From: Antonio Sanchez <cantonios@google.com>
-Date: Fri, 3 Sep 2021 10:41:35 -0700
-Subject: [PATCH] Fix AVX2 PacketMath.h.
-
-There were a couple typos ps -> epi32, and an unaligned load issue.
----
- Eigen/src/Core/arch/AVX/PacketMath.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h b/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-index 8da9031dc..41cb7af9c 100644
---- a/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-+++ b/third_party/eigen3/src/Eigen/src/Core/arch/AVX/PacketMath.h
-@@ -663,7 +663,7 @@ template<> EIGEN_STRONG_INLINE Packet4d ploaddup<Packet4d>(const double* from)
- template<> EIGEN_STRONG_INLINE Packet8i ploaddup<Packet8i>(const int* from)
- {
- #ifdef EIGEN_VECTORIZE_AVX2
--  const Packet8i a = _mm256_castsi128_si256(pload<Packet4i>(from));
-+  const Packet8i a = _mm256_castsi128_si256(ploadu<Packet4i>(from));
-   return _mm256_permutevar8x32_epi32(a, _mm256_setr_epi32(0, 0, 1, 1, 2, 2, 3, 3));
- #else
-   __m256 tmp = _mm256_broadcast_ps((const __m128*)(const void*)from);
-@@ -1015,14 +1015,14 @@ ptranspose(PacketBlock<Packet8f,4>& kernel) {
- #define MM256_SHUFFLE_EPI32(A, B, M) \
-   _mm256_castps_si256(_mm256_shuffle_ps(_mm256_castsi256_ps(A), _mm256_castsi256_ps(B), M))
- 
--#ifdef EIGEN_VECTORIZE_AVX2
-+#ifndef EIGEN_VECTORIZE_AVX2
- #define MM256_UNPACKLO_EPI32(A, B) \
-   _mm256_castps_si256(_mm256_unpacklo_ps(_mm256_castsi256_ps(A), _mm256_castsi256_ps(B)))
- #define MM256_UNPACKHI_EPI32(A, B) \
-   _mm256_castps_si256(_mm256_unpackhi_ps(_mm256_castsi256_ps(A), _mm256_castsi256_ps(B)))
- #else
--#define MM256_UNPACKLO_EPI32(A, B) _mm256_unpacklo_ps(A, B)
--#define MM256_UNPACKHI_EPI32(A, B) _mm256_unpackhi_ps(A, B)
-+#define MM256_UNPACKLO_EPI32(A, B) _mm256_unpacklo_epi32(A, B)
-+#define MM256_UNPACKHI_EPI32(A, B) _mm256_unpackhi_epi32(A, B)
- #endif
- 
- 
--- 
-GitLab
-
diff --git a/www-client/chromium/files/chromium-95-harfbuzz-3.patch b/www-client/chromium/files/chromium-95-harfbuzz-3.patch
deleted file mode 100644
index 33fe9556aaf3..000000000000
--- a/www-client/chromium/files/chromium-95-harfbuzz-3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
-From: Dominik Röttsches <drott@chromium.org>
-Date: Tue, 28 Sep 2021 15:31:50 +0000
-Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits)
-
-Fixed: 1252284
-Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
-Commit-Queue: Dominik Röttsches <drott@chromium.org>
-Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
-Auto-Submit: Dominik Röttsches <drott@chromium.org>
-Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
-Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#925776}
-
-(only components/paint_preview/common/subset_font.cc)
----
-
-diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
-index 45daea7b1..43a448e 100644
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -79,7 +79,7 @@
-   // Retain all variation information for OpenType variation fonts. See:
-   // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
-   hb_set_t* skip_subset =
--      hb_subset_input_no_subset_tables_set(input.get());  // Owned by |input|.
-+      hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
-   hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
-   hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
-   hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
diff --git a/www-client/chromium/files/chromium-95-maldoca-zlib.patch b/www-client/chromium/files/chromium-95-maldoca-zlib.patch
deleted file mode 100644
index 1f64a66ddcdb..000000000000
--- a/www-client/chromium/files/chromium-95-maldoca-zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/maldoca/BUILD.gn b/third_party/maldoca/BUILD.gn
-index eeab205..29a0a2c 100644
---- a/third_party/maldoca/BUILD.gn
-+++ b/third_party/maldoca/BUILD.gn
-@@ -224,7 +224,7 @@ source_set("maldoca-ole") {
-     "//third_party/libxml",
-     "//third_party/protobuf:protobuf_lite",
-     "//third_party/re2",
--    "//third_party/zlib:zlib_common_headers",
-+    "//third_party/zlib:zlib",
-     "//third_party/zlib/google:zip",
-   ]
- 
diff --git a/www-client/chromium/files/chromium-95-xfce-maximize.patch b/www-client/chromium/files/chromium-95-xfce-maximize.patch
deleted file mode 100644
index 296d97873ddc..000000000000
--- a/www-client/chromium/files/chromium-95-xfce-maximize.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 603d765ca5154db27718d89a2ee9be2a95a64254 Mon Sep 17 00:00:00 2001
-From: Alexander Dunaev <adunaev@igalia.com>
-Date: Fri, 29 Oct 2021 20:54:46 +0700
-Subject: [PATCH] [linux/xfce] Set zero insets on maximising the window.
-
-It turned out that Xfwm handles the frame insets not the way KWin and
-Mutter do.
-
-Bug: 1260821
-Change-Id: I69e71049157c03b74d78bc5edb7a60bf39cdda8b
----
-
-diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc
-index dd381747..706f19c 100644
---- a/ui/platform_window/x11/x11_window.cc
-+++ b/ui/platform_window/x11/x11_window.cc
-@@ -676,6 +676,13 @@
-   // save this one for later too.
-   should_maximize_after_map_ = !window_mapped_in_client_;
- 
-+  // Some WMs keep respecting the frame extents even if the window is maximised.
-+  // Remove the insets when maximising.  The extents will be set again when the
-+  // window is restored to normal state.
-+  // See https://crbug.com/1260821
-+  if (CanSetDecorationInsets())
-+    SetDecorationInsets(nullptr);
-+
-   SetWMSpecState(true, x11::GetAtom("_NET_WM_STATE_MAXIMIZED_VERT"),
-                  x11::GetAtom("_NET_WM_STATE_MAXIMIZED_HORZ"));
- }
diff --git a/www-client/chromium/files/chromium-96-xfce-maximize.patch b/www-client/chromium/files/chromium-96-xfce-maximize.patch
new file mode 100644
index 000000000000..77cf410cfe95
--- /dev/null
+++ b/www-client/chromium/files/chromium-96-xfce-maximize.patch
@@ -0,0 +1,51 @@
+From 245e71ae8de3f4b5f3478739be819981bb12dfab Mon Sep 17 00:00:00 2001
+From: Alexander Dunaev <adunaev@igalia.com>
+Date: Sat, 13 Nov 2021 06:35:35 +0000
+Subject: [PATCH] [linux/xfce] Introduced a hack for Xfwm.
+
+This proposes an alternative to [1].  Either this patch or that one
+should be landed, but not both.  See the linked crbug for the details.
+
+Setting the frame extents via the _GTK_FRAME_EXTENTS property turned out
+to be problematic at Xfwm.  While the issue is agreed to be a bug in the
+window manager, for now we disable setting the frame extents on that WM.
+
+This patch introduces a logic that disables setting the window property
+on Xfwm.
+
+[1] https://chromium-review.googlesource.com/c/chromium/src/+/3275653
+
+Bug: 1260821
+Change-Id: I4b734ac0dc2b97d7ed6b1842564a33ec6e4b4035
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3275272
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Commit-Queue: Alexander Dunaev <adunaev@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#941444}
+---
+
+diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc
+index 2b20835..4fa2992 100644
+--- a/ui/platform_window/x11/x11_window.cc
++++ b/ui/platform_window/x11/x11_window.cc
+@@ -1016,6 +1016,21 @@
+ }
+ 
+ bool X11Window::CanSetDecorationInsets() const {
++  // Xfwm handles _GTK_FRAME_EXTENTS a bit unexpected way.  That is a known bug
++  // that will be eventually fixed, but for now we have to disable the function
++  // for Xfce.  The block below should be removed when Xfwm is updated with the
++  // fix and is known to work properly.
++  // See https://crbug.com/1260821.
++  {
++    static WindowManagerName wm_name = WM_OTHER;
++    static bool checked_for_wm = false;
++    if (!checked_for_wm) {
++      wm_name = GuessWindowManager();
++      checked_for_wm = true;
++    }
++    if (wm_name == WM_XFWM4)
++      return false;
++  }
+   return ui::WmSupportsHint(x11::GetAtom("_GTK_FRAME_EXTENTS"));
+ }
+ 
diff --git a/www-client/chromium/files/chromium-93-EnumTable-crash.patch b/www-client/chromium/files/chromium-98-EnumTable-crash.patch
index a5c2defa0ae2..f058ec18327a 100644
--- a/www-client/chromium/files/chromium-93-EnumTable-crash.patch
+++ b/www-client/chromium/files/chromium-98-EnumTable-crash.patch
@@ -1,5 +1,5 @@
 diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
-index a63ae86..83ada65 100644
+index 842553a..89de703 100644
 --- a/components/cast_channel/enum_table.h
 +++ b/components/cast_channel/enum_table.h
 @@ -8,6 +8,7 @@
@@ -9,27 +9,24 @@ index a63ae86..83ada65 100644
 +#include <vector>
  
  #include "base/check_op.h"
- #include "base/macros.h"
-@@ -213,7 +214,7 @@ class
+ #include "base/notreached.h"
+@@ -187,7 +188,6 @@ class
+   inline constexpr GenericEnumTableEntry(int32_t value);
+   inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
  
-   template <typename E>
-   friend class EnumTable;
--  DISALLOW_COPY_AND_ASSIGN(GenericEnumTableEntry);
-+  DISALLOW_ASSIGN(GenericEnumTableEntry);
- };
+-  GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
+   GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
  
- // Yes, these constructors really needs to be inlined.  Even though they look
-@@ -251,8 +252,7 @@ class EnumTable {
-     // Constructor for regular entries.
+  private:
+@@ -253,7 +253,6 @@ class EnumTable {
      constexpr Entry(E value, base::StringPiece str)
          : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
--
--    DISALLOW_COPY_AND_ASSIGN(Entry);
-+    DISALLOW_ASSIGN(Entry);
+ 
+-    Entry(const Entry&) = delete;
+     Entry& operator=(const Entry&) = delete;
    };
  
-   static_assert(sizeof(E) <= sizeof(int32_t),
-@@ -307,15 +307,14 @@ class EnumTable {
+@@ -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())) {
@@ -47,7 +44,7 @@ index a63ae86..83ada65 100644
    }
  
    // This overload of GetString is designed for cases where the argument is a
-@@ -343,8 +342,7 @@ class EnumTable {
+@@ -348,8 +346,7 @@ class EnumTable {
    // enum value directly.
    absl::optional<E> GetEnum(base::StringPiece str) const {
      auto* entry = GenericEnumTableEntry::FindByString(
@@ -57,7 +54,7 @@ index a63ae86..83ada65 100644
      return entry ? static_cast<E>(entry->value) : absl::optional<E>();
    }
  
-@@ -359,7 +357,7 @@ class EnumTable {
+@@ -364,7 +361,7 @@ class EnumTable {
    // Align the data on a cache line boundary.
    alignas(64)
  #endif
@@ -66,7 +63,7 @@ index a63ae86..83ada65 100644
    bool is_sorted_;
  
    constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
-@@ -371,8 +369,8 @@ class EnumTable {
+@@ -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++) {
diff --git a/www-client/chromium/files/chromium-98-system-libdrm.patch b/www-client/chromium/files/chromium-98-system-libdrm.patch
new file mode 100644
index 000000000000..f2f18beda3db
--- /dev/null
+++ b/www-client/chromium/files/chromium-98-system-libdrm.patch
@@ -0,0 +1,34 @@
+diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
+index a5c8945..d742d80 100644
+--- a/media/gpu/chromeos/BUILD.gn
++++ b/media/gpu/chromeos/BUILD.gn
+@@ -32,6 +32,7 @@ source_set("chromeos") {
+ 
+   if (use_vaapi) {
+     deps += [
++      "//build/config/linux/libdrm",
+       "//media/gpu/vaapi",
+       "//media/gpu/vaapi:common",
+     ]
+diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
+index 2d77cd9..1883fd4 100644
+--- a/media/gpu/chromeos/video_decoder_pipeline.cc
++++ b/media/gpu/chromeos/video_decoder_pipeline.cc
+@@ -4,6 +4,9 @@
+ 
+ #include "media/gpu/chromeos/video_decoder_pipeline.h"
+ 
++#if BUILDFLAG(USE_VAAPI)
++#include <drm_fourcc.h>
++#endif
+ #include <memory>
+ 
+ #include "base/bind.h"
+@@ -28,7 +31,6 @@
+ 
+ #if BUILDFLAG(USE_VAAPI)
+ #include "media/gpu/vaapi/vaapi_video_decoder.h"
+-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
+ #elif BUILDFLAG(USE_V4L2_CODEC)
+ #include "media/gpu/v4l2/v4l2_video_decoder.h"
+ #else
diff --git a/www-client/chromium/files/chromium-glibc-2.34.patch b/www-client/chromium/files/chromium-glibc-2.34.patch
new file mode 100644
index 000000000000..64c03a6adae6
--- /dev/null
+++ b/www-client/chromium/files/chromium-glibc-2.34.patch
@@ -0,0 +1,50 @@
+From 600d63c2c59a9892dbc5423d7d8bb1565a9f91e7 Mon Sep 17 00:00:00 2001
+From: Michel Salim <michel@fb.com>
+Date: Thu, 04 Nov 2021 14:22:40 -0700
+Subject: [PATCH] Handle long SIGSTKSZ in glibc > 2.33
+
+`SIGSTKSZ` is no longer constant in glibc > 2.33 but a function
+returning a long. Cast before taking `max`.
+
+See https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=85e84fe53699fe9e392edffa993612ce08b2954a;hb=HEAD
+
+Signed-off-by: Michel Salim <michel@fb.com>
+Change-Id: I197f8ff3053eede80d6aed096be4f0113dd43241
+(relocated to chromium repo, removed static)
+---
+
+diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+index ca353c4..5cdabcf 100644
+--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++  const unsigned kSigStackSize = std::max(16384U, (unsigned)SIGSTKSZ);
+ 
+   // Only set an alternative stack if there isn't already one, or if the current
+   // one is too small.
+diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
+index ca6b595..1c1ee42 100644
+--- a/sandbox/linux/services/credentials.cc
++++ b/sandbox/linux/services/credentials.cc
+@@ -11,6 +11,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
+   // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
+   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
+ 
+-  char tls_buf[PTHREAD_STACK_MIN] = {0};
++  char tls_buf[PTHREAD_STACK_MIN];
++  memset(tls_buf, 0, PTHREAD_STACK_MIN);
+   tls = tls_buf;
+ #endif
+ 
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 6797780530d5..dcdaa4ce4a04 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="system-harfbuzz">Use system harfbuzz instead of the bundled one.</flag>
 		<flag name="system-icu">Use system icu instead of the bundled one</flag>
+		<flag name="system-png">Use system libpng instead of the bundled one.</flag>
 		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index f9f7acc392ee..7c3241dea452 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -388,16 +388,114 @@ DIST firefox-94.0.1-vi.xpi 564307 BLAKE2B bf5d0f3fba85514abb76cfbb6f0401da3ee128
 DIST firefox-94.0.1-xh.xpi 420859 BLAKE2B 68842d4622acbf1a23fed065eb73d9ee82922e142b006c71cff39aa36fe0e28a7ae9a637dd0487e3563c751da6ae02df07721797baffc20bc4da6e44d89b5e01 SHA512 3ef6c9dcbe24babb7adcff536536b30788e63504be96263bbffeccb21f56d23a8665c83fdd049636cd44b9fb1c745ff96cbcb9519140fbe3a5cea5e25489a2fc
 DIST firefox-94.0.1-zh-CN.xpi 565916 BLAKE2B 319fc21bdccf3989caffc60018720afda13be5c42bc109a9513b69e2ad5ad7c693fc91f8cc71f946567172969a798fcce9ebadd98732f46f11bf870e32de9431 SHA512 9f1e6321a0add7866bfff43acd1d128976eb46666fe672ec3ad632a556b1e20bf771b9e297becb136bdcb209e3b8f9e0dfcacadabc6c8b2f91c52dae230696e6
 DIST firefox-94.0.1-zh-TW.xpi 566573 BLAKE2B de71dcc798dbb394b9400d5801bda945cd80ded6c68c6e6c4c02bb269d16edfa00c02f21c361ab497071b25a2abf7520a0bca89b370c1bcec9b032c12f08c72f SHA512 8ec5f1fbdfc8d7ce5669f652b2bd7392048559fe8ff9e9f9ab43bc3071ef4272ddeb5c607148ee426e1722fed38cccebe972ba0b7fa6539f09c84ea804610a9c
+DIST firefox-94.0.2-ach.xpi 447241 BLAKE2B 45ab6c5afa8f211801b2e5fea93c0bf0c70cf7a3e5c6b8880472d82cba0fa74250676e71e5602702e4f3cea5958fa5cd571f1f9315dc912c72c4b1fa435d24e0 SHA512 ec020c6d306e1a948924ebf4981f408870a7ddb3c4f234a28b8dc02e0c62f354411817ba3cc482f2c2f11a3a6e4a980453de05b348fbb9ba36c0cd0e09929e33
+DIST firefox-94.0.2-af.xpi 418686 BLAKE2B 688ef4c0cf5ec982549c0983d765409eab54624fe7e9d056c216626dfb0f9614b8c87e3eef58ed2cfd25f18fb481993458611828252b26110e970e550902cf36 SHA512 f5f8e4d0767de05266e7bd708de617a5f0e62e395c4b3b8569504e59407613a47af0c83ff18f568fc70f8e533cc07163c1c9477cbec29b53dbdb98335ae573e3
+DIST firefox-94.0.2-an.xpi 494464 BLAKE2B 26ce20f2c8bf400a19f2fafa501420ce340c027176ed9898760df1d491677e57ce622f953c83256afddf565a858328fcc678240f2c4591b7b16696b66280bb5d SHA512 0e72c470664fb899b7149467dc09baf808ab598e5a196733dbf81015218130b5c6a4736ffb0629030a2f9cebfe6384de8ac370b3fc4da2ab8843bef63060675d
+DIST firefox-94.0.2-ar.xpi 553194 BLAKE2B 8e5399faecbd123455d68012dfcaecc327d0bf0d39fcdd79354fd9e8bd32adac35ad0bb251d12fb3ad47ebc68762e5a06fff4343c3868d5cb7992f4ef5fbd387 SHA512 60b4586507ec55a97b37699d1a8ac0cd83a2dbd902536fb515ac2af48249d2c88b45784a445f33d841778e8ac52c1d63e36c8ed8f9b1030ff8859597687126b0
+DIST firefox-94.0.2-ast.xpi 492807 BLAKE2B 33da379ea64ce2bea60dc90538f68ca744c0892fee90dafcca586a20ac54ce7ce29a2623661f556f2b261329fa05d2a74df5c8c92d3eb35383f26e8c101fb22c SHA512 d3b254251cc2116765344b444c0c8a30d91bae14241a4160bfd7b271ef17cb3413ff0eae5fa59327c800973e8e92b3d52458cc4a1666fc726f75f9b40f183b8e
+DIST firefox-94.0.2-az.xpi 482933 BLAKE2B 3554916b8eaa6286e04d6e9482c9fb6160c02776fd925d2463ad776d6d8906596e3bc8d70fe32464ed053ae7282a6ac992e37c6fcef3132ac130797b6a67c5b3 SHA512 c719aa86485138bdc440fefb2310af32ed8b5a829fb718e137ec3cc670857631f9efcf4ef647d16a9a29b4f11f04ef2c3d919e6d8ee567bfa327b0ce0d0e91e4
+DIST firefox-94.0.2-be.xpi 612140 BLAKE2B d70c5edaec128c881a5a3aec89df266f41ad38edd464726a5db6bcbcc4607d37ca37704cf85aaa4d865f28135b6ce924b0e23ff8a5159b2095d08304132abef3 SHA512 a7db1120e5c0c304df64af6d9b7986eccf200dbd5d6c31c9053c87550668eb6410353c765ffa0eeecac7beb93c578588fe435496b5a43c7a396bf94a690d3b0a
+DIST firefox-94.0.2-bg.xpi 561583 BLAKE2B 944ca406c6325efc03335027510fd33a41411705c3ed926f4ca3179cdaf4a84e71f110f2be7268b331536bdc3d92e15d30ea5024e43c3788d95b0c1e3d7c3c0f SHA512 8ddf87b6c45ee8c31be1df9dac94c5673507a6e2a040dd1dbd412edd4a269b030a49fe7e4768d75078154d30a097b2eac01ed981a4fa4675411a259afde09580
+DIST firefox-94.0.2-bn.xpi 549624 BLAKE2B d3c299b557cdd0afe464e27a6816257811e12f41f446255fd1f2c40631927ab9ef1d765ef9375b3266d27e106853a754298f65b2acc2a0b89dd766a9d66d6cdf SHA512 e6c19ee05eb5fbfa7fb5d755bb22997e1ff645a636424a03166e609ff0947276ca70166c48ac681aba9c7ee3e14aeebb406086f1969eaaa53cf074fa54caafcb
+DIST firefox-94.0.2-br.xpi 518905 BLAKE2B 4cc925352c984328035ee4af4b348edccec50623f4a910ed6d818fb84333b7a8ffc8e97972eb8e33f33e7cb92e4875c45080cad973c8880d857e7b1333a78fda SHA512 102092ecf445616c6331f21c760feff7f2f1fdaddd8881cee06bb4e8eba5d96b784f134fb44ccfd3ac3b19904aa6bf5962254ece0ce03dc9f4ebb24376052664
+DIST firefox-94.0.2-bs.xpi 457706 BLAKE2B e55946902028f0b78e9029e8bf1594502187c6b6193c53afa3e79668280d7a03d506090b108e2799e254a60c3d6732fbb2fa5dadd54c47ecc150bf95f24d055e SHA512 ca59825b983f9a5f9561cf150419240f967c1bafe184adadf12819da3c7e2a1941289ad5625ed222a308a11ba3dca818e9806a386dac7890b51f7cd917a894c3
+DIST firefox-94.0.2-ca-valencia.xpi 523066 BLAKE2B 2decde5c9fe01eb4f7a9d99b0d17569eb29934613b69a1b18e3cad6cb85be1e6b3d0ed1ebdc4bc5a84d9c66376b6af50afdaef84cfd7701ecb4e70e67df9084b SHA512 54c51aca43d74f7ee447dcd091895036ef81c22cbd54afbd22790085b53c8a7b0a238d3eb8849b4c5549d742cc7d3d7278ff40b0f480d2a93bfa85b7373ddd14
+DIST firefox-94.0.2-ca.xpi 523662 BLAKE2B e0ff8d1f14e6181402c63d0987053cf86f141919121b8d17c26eed0a6423cec6dbad57455ecd617ec7a6d8aedfdb0302a0b04fc5fd46d824c0f38d2c888c5f03 SHA512 8ba8850570206a89bccf8fe5a6d49ab6273547db2e62dc9841916fb8fa1c973def60031cf3bcb6890935b2e5fdc7d2bc489ea4d5ec05042a635fffc5325986fc
+DIST firefox-94.0.2-cak.xpi 547147 BLAKE2B 7dbabb3ed8e2b168de9ced2b25a434974eb6f6aabbefb09068d9592c2e951c5aaa17018c45978c3ace458e3943d7e539901dece19a0d4c64fc5a985570b2d1bd SHA512 9be5f51886a00ace70345ac69bb9ea6e58a58aa8c35de176bbd9b21d94c7b1f93702b7f38f92c78761463234b031515238d8820d04401319dbf91141d0c17629
+DIST firefox-94.0.2-cs.xpi 555218 BLAKE2B daf21053d5b2ebe535a9cb83e1a6848add513f66d0fb18ec4a80bce0425907a5f12b020b38ba0bfbd4f88d629de31d19cb6c31f5d5ff463c3100fd7cdd9599ab SHA512 4ca3434e3e4b9869d01070d23fa2a4abfe40c92bf0917c14e7e49a92d02884a7f768e3008d37bdca9c0df6ae9333717f661356415c3501b9456dd2d35a0cacfc
+DIST firefox-94.0.2-cy.xpi 533601 BLAKE2B d7fc74e0f52a114874d2f2cbc308f97773e907c44bcebe05881387cbf75098e0b3a77bbd381d9851e5673baf8d15f0fa0004d6f5b97071fd727f6a51a755454c SHA512 a777f48021b2f0b9ce36c88489999bfae5fc53fcec07d1e609678a84ecb9cc9259043d1c3837a92bcbc2cb27e25cec8b9da32af8e80ce920be7f9e0d455aa1d1
+DIST firefox-94.0.2-da.xpi 525484 BLAKE2B c56dd25b8becef8ca454f0782aae86e708fd8015594c6eff7c509fd8b45c29ef40c3534b9ad561fea53fa4925a63693669a5f200a27e25f72c4c6238f5819d76 SHA512 fed02b6865402a2ad4fddaa6916da5948ed2b0e69e06211ed29f615970c5940676d64c6d78e80ab465f3377aa2b75198197178e83f09ae743e155af22147a4a9
+DIST firefox-94.0.2-de.xpi 544439 BLAKE2B 37c346cff36d08de547073b1754b52fc76fbd9612ac472ea0be2912a9d4b441d448d91002b675ff9569a048fdc9fb5faaaf975f0fdf62157d7f818642a5fed76 SHA512 d51293f16402c73f2e233de57b38250cbbf7deae94ac6ae730586c0599d9c76a1257a3dfa8a54d1e18836647e66ef2a8a540b44b13de4814cbb1d6602655fef0
+DIST firefox-94.0.2-dsb.xpi 556987 BLAKE2B 1a0808ba177c13ac1489cb9ee61276c4d9d60eb41da5652cf061d2364d08b9ac5ff3ae94a0a04fea172d85978f45c0cf53ab996e626afcab32e6a18342fedd9a SHA512 fd9d171db4bc27bb38d7a6909b5fc6ea01ea106fb8ef6918a192fd24782bd97b1c77f81aff9e116cae4e6da8b4ff58cae419401933e97a90484a572c1b0bd339
+DIST firefox-94.0.2-el.xpi 628739 BLAKE2B 3b455a0660c18017cba3f56ad41fcf9ec1c5c9dfcf8458be523afbbe90ed96b40ac7db6160ddafdfe47de15372e7fbfabdb1cb30ab714ee7e03bf1a637d66124 SHA512 504fe04376d5782ca538b63945b4744f744b4929b2b81db8f0838d7f5ac8af811aa3d8c6ef18ae6f4929688472bc2d7e5bad3b71ba4e91d412ca59d4c99ac3ec
+DIST firefox-94.0.2-en-CA.xpi 502078 BLAKE2B 358f757912ba094351319bff00c958320a4423729113eee165f30cb73f16a45e01d79df3b7d70a2ea6f380eb30c144eb7d139958337a959356fc3bf903ed3fe1 SHA512 b509c317e8c890aec87586c1ce90ebed7e14410bcf3266a57ea0a400e95a6487d52d55ede0d03816489ea90df05d9c802a2679b62ab1fc71f212ed00486ee4ec
+DIST firefox-94.0.2-en-GB.xpi 502586 BLAKE2B d9f3f3d497902c8cfe31dcb62e893053ec66e046dcda3dfb97b5712a594329b09d281be5ce6c1377a48aeb9372dbf801da3a02db2eee1973b76ec0a54798d95e SHA512 d2aaa2faf36aa8f61fa9a9d02d7c41170205089c9070b5bf13ac3f930d3e521e4cb8f6eed7a1dca15c0cd722b8bb7e76683d1d772f1bae25ae2a30ba9831e6f5
+DIST firefox-94.0.2-eo.xpi 524537 BLAKE2B 9637e339a8a35f8e4f35e6321e45eeea2d84cb586aa26401a41b3bfa8618eff9be845c2dab6837e59af9a3cba7337f77c66e581cbd3135f6337dc83f90c15f31 SHA512 cb69432c7ca6df7d81e61fa32b8a69d5337d169c9218605be96eba6463145e51b2e4078cbcb37450d59f8630b6139c0812d05a6c4ae27cbd1918f40f42f83ee2
+DIST firefox-94.0.2-es-AR.xpi 538014 BLAKE2B 6b979232a3c21b1dfb04fe9f3bd29ff4ef3466e153357226cf8cf7d5ab82e1888cb3f178a0fa08a02d86a1654f958735c779422c69f4ed44440953205d382b7a SHA512 b1a3a27298396e05f6fe167ca769be5a3fda8253f81e0f395bbe6ba69649a2606d1851642fbe8aa45021912f7f3436630d39ebe21e41b263352001eeb5e99045
+DIST firefox-94.0.2-es-CL.xpi 537549 BLAKE2B 62332c3785d4431a720174a76ba369995e4d9cd72fa66a87669e8b9b57448445633bd54a1b4cea570d165cb1334ff7f50225c1767cb04be2200ffc44f832ef10 SHA512 13a1fb2f8d7f0c29009cca0f83ba474f2d0491a2fbc75c5f9608034493323d04b1910a4fccae7602aece17437c2aea51246df57cdbfa22114810e3a610fefcce
+DIST firefox-94.0.2-es-ES.xpi 528306 BLAKE2B 26f92ee9d9e8cd6a1962fa476cb3999c8bc37ff912ad7ad49a47ec4e758ef6df8f887a28099ae7feecbb1ed4482d5da55100703a23c6a1374e187cb2796c3d5d SHA512 8a968018cced56048dbbea3cb05823ea82e144701e71e537b7e923a2eec3690171fba8a2ecb76d75d4f4316d399205489fed6eb229dfbc0467417a455091e6ba
+DIST firefox-94.0.2-es-MX.xpi 537717 BLAKE2B 4fdd83f784e62451854300b14a24c5a5c48681c98fd158253bda6860bb427495c8256921301f955229e79e044129948ec0279a756b33b01dfe5ca6d708057a61 SHA512 04cfdc6b5b330926111b99ac191be07495dc2aa1d3825be6034e7069029a43b4bfbfc85fe037c3a2f68cd1fa743857adb7170e022050751f7fa7b2c19aea8a50
+DIST firefox-94.0.2-et.xpi 476279 BLAKE2B a7e0d032c7fe9e591ada8031798726b66f674434329604e28be24557ba67c51a9405ab6beb36bc6d7fdb077abb2a530cec0e742efaa4a4b78d7b169cdd2574d2 SHA512 c51912680984fa5f03fc4c1b7b097d3fcba6cca80ea5ae9663dfa19e79a16d5f881c30bd8a68758994e4a46e31835e6b061ebe7bac3d619163fe25e636ea091e
+DIST firefox-94.0.2-eu.xpi 527862 BLAKE2B 5bb985414ef6fbc11fc94410ea8b04232c6b3273da002fa4aecba2a361425e03aa1ce54bb035f1db54f11b1271c7746c5c5832730336199be933584c5744c69f SHA512 1cff76c9782bc3a0fe2bfd909f16bc460d9814b1ad9b1dfda75d7d2ab9054182816e050f24f0ed2eff81b76a0b85f7793da8ea0383728d94db12367b190ed852
+DIST firefox-94.0.2-fa.xpi 549491 BLAKE2B 49cc0d17fd86affe21c48add896075d59b1e89be7da79abe3b5c89b0916e878a22db42305653ae46edf67c462d0350eb4504905bdacc3c61703bd0cbe947c1bd SHA512 de8ca0076795f1f7a2157a40a8830a814c42b4582eec71576e55291faefcbe0cc8109663eb0f5718df29cce216a42875aa592e09b7817863659041bbdcd0cc58
+DIST firefox-94.0.2-ff.xpi 465162 BLAKE2B 48b906dbf341f839e2d85d0957e23ebab7cca06bf24bd59560371aed848e15b8aa4b962e401ed1a70f761a855e3454b61005661bfe7d8b619f3b6bb21db148e1 SHA512 6d461ad28576d2b68bf7e9cb6d07a36476aa8313a99f22ec2f0b2cbaa06a19711b633067d8e455a9a888baff2b3d81d92a5718c806dfaa1435f4cf0be78dba87
+DIST firefox-94.0.2-fi.xpi 521930 BLAKE2B fc7540d31ed78481dbcbe61ba6317bd476a72b4ba5284bddb3ca0258ecfbc3dcfe2d579478eed7487f17cc64b882e13965f607d7e0d2d773412eb76ed68ebc27 SHA512 227d347a11878045a8dc9769a5cc3a42e703f18ce55de5fe83affc1e42d140bf3653d46d8a58b66cc0cbb38d03d04d5ba7addc00baca52cb382bac682234a68c
+DIST firefox-94.0.2-fr.xpi 548695 BLAKE2B c9820a1d717471c79e6a75274549d3b61a11d2629aa9bbec62550ccaad70c03cdaec35ee8989da512f3300a948757deca712932a3407b9c84148a6403c1128ec SHA512 6b216502876f0c4a2249036657f9dd524630f800d6f56e222b9d9ce17dedd4c9fb3957bedc9c5ab9d72d75017fb568a906ba423d70ab828813bea29200d69db9
+DIST firefox-94.0.2-fy-NL.xpi 534445 BLAKE2B 64c91aa7877fa4edee358829601e7ca386704daf0bbac789d91c9c9d6b5e68e5679ed3e4fe43d05359f347545567647f40ab191cb58d8c2e5cfce5a90ac7b847 SHA512 3d74117bd5365c15f67f905846d1f4b497af2b4f00b8c933d81faba7496c08e23c0ebfd3f44e0dff961b3a24e55980f46da2448a9728939ec53a0943621ab745
+DIST firefox-94.0.2-ga-IE.xpi 453332 BLAKE2B efc2dc6616c87151845b3e07605997af96179b6c258b67f0995f5c9ef7a8cb45cb51bc0273b08401334877a5496afd3511f6c50e6fe4194e67494960dee7bd79 SHA512 63f900ebc7bb2e5d37da544807f94379e2b84b059a5570f2296cc08fb490c64ff4f024d1be1159213379f92e33699cb27f35df88834492755a2024afa42c20dd
+DIST firefox-94.0.2-gd.xpi 525506 BLAKE2B 81216eddb619142f928738e2ed078c45de9fb6a826db120f6dd3831dcb2de3412aeb1901d6544d4b1fcfc6e98c658f0c2a4e1e19f1d5817b4cd1b83b23c83f08 SHA512 0b69b62f04192e82b1a78ce36b3402cd20966c7c229fb5c5cc641cc616409374658bad0b64c2c67c738e8085b44c827d44b711f0ae13636167f299bd012c967f
+DIST firefox-94.0.2-gl.xpi 533070 BLAKE2B e70d280bcf7de7797e4d6840ec6e110303cc1b3f17885f29e89322bc8fdfbbe2432cfac5625f791ca31bef8e1f30e1815e0ceacadedabd38ad679bc9c67c3aee SHA512 150f442e6f698e162a4f66bef67246bc20b75f13e9c7876aaca324852f8a356054f4497531b5a4b363933f842d97c31026cc72864ab8f6b0eb94010ae31d3619
+DIST firefox-94.0.2-gn.xpi 549083 BLAKE2B 1206abf3ad515b66e1c7171d21b3aaa959aaa8e6af8b24409741000401bd6d86f9f7db4849bfe5acab25eb1f3e87b9515ccdd6009aebce19f551a558c5b53331 SHA512 67159f16c4c5f613f53403610b4ee9d9157677a48a866bb019b2830ee10376671793afff5da06551c786966f9a2cb16608cbcb66b9b91c209d8e1f2b4afc39de
+DIST firefox-94.0.2-gu-IN.xpi 522304 BLAKE2B 734b01f9316e5a4e404208ff8ae13b36650342c25097eddf17177c35f3c7bd11e50cc6a12ba265d737205d8b036507bdd6786ef0d7afe203ce78988819ce59d8 SHA512 32824093a11e4726c8ca0a80b61737275df096403a3756c12ec60776da73448624800f7725500a684f75af99b3c596dbf2a777261e3ee32c548d29ce6b03e17b
+DIST firefox-94.0.2-he.xpi 548396 BLAKE2B 4cfbc715ecd7a4fd0e2a0972160215e30c40ae46ed9fda258d56d7a99a9d1a83a1d6c8cad77bd258e6a29ed83a502f591e819b09faa558883171d7b012224eac SHA512 aa8df7d8f38add33ca814ad2a2df09837b7820e8eed1f03c5cb3a39f214551522da2f84d0397f61ac5a1454a63acbdc862d11c201c3bf9f23d576d7a7f887dbc
+DIST firefox-94.0.2-hi-IN.xpi 549945 BLAKE2B 857a41445ed57fa127d5d115752f3d88527383104ee49e488f4fa149ca8351da6d7ff81064d1178bb2f8edfab4de5c29990c9d5d1a92ecacd4343759b3eab8de SHA512 f400cf5f672e232775af0d07f324921f29b12a368cdaf80b6d68db7cda343cca69988a66835ee0c45bfe36cdc505d3714bf3ab901b2ce020f7eec7a4602ffccb
+DIST firefox-94.0.2-hr.xpi 524458 BLAKE2B b1b098b59a133b9df1bb66bc6b960aa843da60a621696ac433f01bd8cbca601ca2d8909a707652f5d00fb6695c833d15d04a43f89af7fc0903d2117b52d3de98 SHA512 35d566be8614be5e9264ee618d3128e3a26db7552f88784d08d9a7e9bade25cd16d2c7e0b7f1f37574bc105ff89d0ea4faf215c691906d5d6ede56800d29afea
+DIST firefox-94.0.2-hsb.xpi 553063 BLAKE2B 450366b43ee00152275fdf398703a8882aaaa3a3f5a4cd3c1e2b97e09db24da1daf0d677690d01ede0f339c069d2690cc6bbd8da75cb3489df0b9fe0ebcec969 SHA512 315ab12db114872919e1813d85d638b21e926f75deb7c5ab2ac76f5e77ada90b9ce68bfecb2d5963db52a1507398e9b8c8f3eb0bfc8e9ab85eadffc15719302a
+DIST firefox-94.0.2-hu.xpi 556846 BLAKE2B a4e07ee7cd71f876393d0818b61f74373b5172dd460c628012b1ade50035658ad3a89bc0a446f270f9b101d0c12db81be7b29a6f5b6e7795177878e6ef53c92f SHA512 2fe86f270a290df8adb1f70f8835739fb62f8e25327692d5e35d080db2f03ec94d9c097f9502a4615de84c33a82279085024bbdc70a1ea41c6cf2bb69e090f8d
+DIST firefox-94.0.2-hy-AM.xpi 571835 BLAKE2B 538218d30b5e1bccbac63d343e65753fabd6982f9c95e24d6d62ca8e9d98936b51c132c740be98f5812959ae673a47537ad61e4f728964d68f8d2579797ad1bf SHA512 aa23c25ecf7ba4e6fc490fe78af3a9ed383dcff0e2afeaf3ccaf093da00d2a4c6f04a1c55e62fd94bdeaa144ca804568dc82089b7512677f87a7847825cc6077
+DIST firefox-94.0.2-ia.xpi 523712 BLAKE2B c9d6880548ab5ad240f4b9cfba5f080d2522eb46c1acf55edd0f1123af80609c0d2a3364a89227c13de129eb47ff3302c2125f8d25845c609cc0a9a8b1259fd3 SHA512 192810aefd0a8527f9b6389de53d511b83ed01ca5bb674bbcfc3246a90c1a1d80dd826f528175b8253fdc47f090bdd5c4d5a7d16a28b648e822c1b3dcd068e8e
+DIST firefox-94.0.2-id.xpi 514576 BLAKE2B 4df208eaffd4d1d483b03727cff684cbbe896cbca27cd0b31e39232cd502b0a7c02063400a10133fd0fccd363b48573a5ec4cb763a70cb9e5995a043ac1d4a5d SHA512 8625c881487aba8ebf242f12a28cd127788c7f02bafd8a087c15cd5e30e9bb9c05bcd94fdc27436d7949d9b5fa006804e9588f037f18a47c28702da13a474b16
+DIST firefox-94.0.2-is.xpi 463841 BLAKE2B 7eef44a0d439b434fd6eced9e538d0a4c280fa9aed2bfb126c3479eb8d831469f3233ec2fa6aff5ddd1eeb44213ddedc57b5f53d2b040a6da527d2806da9d722 SHA512 96b67b975d0e67840ac1e4c2bb5465e36af0473819993f0abbb458d5d7261d4ac05cf902670326a70b541f353562259e6309a780765cfe138de6e27feae8e43f
+DIST firefox-94.0.2-it.xpi 452233 BLAKE2B 044962343d5debe74ac7bb5cbeb56090bc14044d0cc471a6e7eb34345adfd8499f4306f426635a96799c16a544dff605e270563464d3defdd25b19211e63cd50 SHA512 1ed85ab4692e1e125815c3af771c6172854bd2c56f2ed2ac85ac4173b18a0d0a884475d0546e8f0fa8bf639c5b8a6218dcd30829e90c9ecf8ebbaebb1ee57d40
+DIST firefox-94.0.2-ja.xpi 578700 BLAKE2B 36932449855551a578a1a9c4bf33170812df4d5663f3256544745493b602eca35ca95be878cdae1a43734c1bb68893602ecabd8c48a5562174b5b8c712776ee1 SHA512 4cbd33c2a53bfbb6517eea5c58bfe1599ebff52db4395398dbecb6bd369925d4bec6e9f1a5cc07199d6b5154df96b29514ee04d9e2da015395380cb13442ac32
+DIST firefox-94.0.2-ka.xpi 577468 BLAKE2B 21258bbb0a60cab7d8c7d330e1a229448138dc103de9828efb6ba47237cf8ada8f48f75df57769dfcb20d64e5d61c77c1651c43a7cfab9a42cd630cf207b007a SHA512 efa08fb14fc31ace656b7a7bf81e6c8cb8ed1900ff927f30655d28243f3c982e1333bfd39ed11171c680c32f14729323b52bb4fd3b0b4c139fa18ebd32fa7613
+DIST firefox-94.0.2-kab.xpi 538086 BLAKE2B 186f84bb7e6167b87c0e9db92830384536d25d9d27fcaa5636fb963a4b047bff7192f7344c6bce67f6efe7c0e93f49eb3b651fc45c3d058e673d5393683bc25e SHA512 b0862bb0521fdc6ae2f01fefcad830dc544fcabdb0ae8601c5ba6bcceff466babe69fa2e79b5e459fa21ca3bd5ecc2bcff5369dfb7f83f597c787f96be876d0c
+DIST firefox-94.0.2-kk.xpi 597580 BLAKE2B 00db302742d9ed714b072b5ef06fb665fd253e753fad7f0191af1ecb1fe42430ac5feba2f471c5dcd89e4d1e2c4cb45c4e4a18e9ac1c2355221faa338af45f84 SHA512 2ce2467e43e62f1a312bed7f09dc561a5f23b76171915f47d964e470f914f391b15fb93948e0450849fe83f3497fc0544dd80364249bbec71e99ce7865a8989c
+DIST firefox-94.0.2-km.xpi 525523 BLAKE2B 983f37f782593dad90246954c7c9bf705611b98091e7c200503aab575afb9cc819651d25ccc3355faed0f2baa3cdfe01387de6ba9a38dd0eab3e9b9c613a799f SHA512 3de801e2dae88e9c9d7a0feba5197333d2f8ef664100597744eddaef7d62ce975d975fecc27a763140643eef1ae5059eb4ae3d6b440a7e43d697ae220f85506c
+DIST firefox-94.0.2-kn.xpi 490615 BLAKE2B 8f7bb52298e9ceec108e90de61c9eb2e8fe1f55b78e16f8a6d26226651802d0d1baf203c371a2527732ebbea9336dab1f7b9494205fa82f9f7bb6ea08ab53bf4 SHA512 bca36cb7bcfc64b08e8e8230a948aef698a523eb3613bd38ca9e9f4917ead6ad15709994e5015015712208403e03b6469f89bbf02b9f382fd121d2a933596ad2
+DIST firefox-94.0.2-ko.xpi 569651 BLAKE2B 87c2b70d08cd9d92aa3ae4b2f3904193fd7812f79be219f6615b7bfef282dc8bfaee89adb2d5e21a99e5afcd2a7ae4ced3826d7c94758ff5e809be1b854efb9e SHA512 ac1a43e5af677e95506122105ecbc38fd5c583e576a764f37b1db91e5100298d377e997fcbd71c502cd49aa62c0563934f7d1b9d07601f99a6cfd98d8f7b0b11
+DIST firefox-94.0.2-lij.xpi 464138 BLAKE2B b1568ba6af9e5635251bea307c0b2f28e7fdf48f89996e2d3e21d796e7cacecb6dcc018e77293afa9d1966774278ae1529005daf99288f6ccd4536cfba311b7a SHA512 722a9f800d955a9f38dbf876d219b2f0b83c90511502be723ae28cc1a4884a49786c7b2c0c672ee6b271b76e796bae4d6b2c12b5d8e0334be2cabd037279200c
+DIST firefox-94.0.2-lt.xpi 551591 BLAKE2B d035ec450f3c04e3aa7c74eb66c014c6fd1474912526a1ec5f259e0967e84406accdf8a2282530bd1fbc26895be6fb692b9bd6f2149154b447f06a44e6557198 SHA512 c08f442ca54213669b641fdb5b9f2379afc5caf8020fc6f78550e2c27fd8ac9e3fc80673fe2f3ac93b175e8aab591ca08bbc9dc53612b59749807a890feaff0d
+DIST firefox-94.0.2-lv.xpi 455940 BLAKE2B e7ffc5012327d99db8db74c51aa63c04b3bfd712b420184a7d70fa4aa10908626e7877d4afd626380730bbf4e5a7fc2730b50cbccccd7bb7c2786cc74b3c83ef SHA512 2aa638651be14b78d2c65945708473cd34996465b6f1800d250f42b7e6f2d43ee13046902327f8620298f6bdfa9814def88faddb75deb3c0e45c93ebc697601d
+DIST firefox-94.0.2-mk.xpi 457960 BLAKE2B e1515eca79db422388ee19f86231761274ad36c42eb0bc89cca1d6746e16c3338dfda02d892d75641605a2b2336372bee7a26477ca6903d01c3999afc13d78d5 SHA512 210c16a4664638c7e381c795361413dfd91a19c36ec59cf07d4edf71d0ce0433d43b2c31e9348d45b220309a0b2d5a4067750cba669a7a8a58f4007b6a83f013
+DIST firefox-94.0.2-mr.xpi 525235 BLAKE2B 526b979165480922b34e8b82a3a760591e86238cd9130d49a51ff56c276994d51dd9e3d347e756eacd255aa85cff5961a76658aec59278e3ddc0764adcb2115b SHA512 b84e19de492c187b4b152f0498248cce68e7cfd63bc9a284659156a24927f7719b2e85ddf1fc3218d7030141093e73c1d082eff6a57385428cff4351e8b5aa2c
+DIST firefox-94.0.2-ms.xpi 441057 BLAKE2B 8ac9392bbc8c504cd04e2a7c138874052de3b2b9343ff5d07b222b5465c45da7a54127a56e092bcea707d10acc04b25b617b6302f43dcf35965bbd17b7ecb46d SHA512 93d0d0ab0cc7d0d26a7cf0b31d9f163ea43b534ecb649b92f5ce6de74c0bd12c157466b8f3246d4e1c09ba5d98f9218366128f58d279e3450a69f5e54639222a
+DIST firefox-94.0.2-my.xpi 509497 BLAKE2B 2d060045a1a9fa7e44989c9c829bdae661d5c9d176ba9d25baf4827ed9935a7887aca420fab12a9976f0a29f8f198b25de7cc248810e9e8f791afb82e1ab56cc SHA512 63883498a51f5678e6d347fae82bf00ee340bb2c1b45869d1dc7ab1f4b61ade479e63cdcbd3d09f9ef332ab253374c77743a3b4d2e5be2f8e9404f20ef260ad9
+DIST firefox-94.0.2-nb-NO.xpi 521046 BLAKE2B 340855390db573b72b196a379614a3cfeab4313b6e60615047714b261c6af3eca2a3403d472deb7a3d6df0081a89f1f1dec8fcad04206fee298874a16dfd7fc6 SHA512 7dfd8390165d2e509e1affbdd25566d20a8e944f6a54fb8a1f48423c33708b85925e48c885a9890ff1855f7aeb82c765e588089c5ffaefe9a9ed17766bdf0a83
+DIST firefox-94.0.2-ne-NP.xpi 468907 BLAKE2B 2a0d563b692a5fbf3dd3a3133380c693a85da0b8c1235521b0ed8fe8dbd6aeb45e57356f3d0f63cbccb9e92f4d942320ae6d9cbc32f7081f42ad51c22444b123 SHA512 ef9f9bf8995d7f6183d97a7f639c4a5abab9c299223f31d6f82ef3f745df51934fcdab352e6b97fbf43b7000e630a3c6f2b30a533d893e84924f8e5fc680020c
+DIST firefox-94.0.2-nl.xpi 528560 BLAKE2B bdd594201a354d73f1caf73198ec4baddb8c9567478c04fbadf1426af2b4744cdef394cef98a43a8bc61d7a203998d753afe4b907f580802081db0227000f14f SHA512 301d4ce7a5ccda8ef5479266782b5948b5c0ab1b37a5f037eb09d6eda4065ab60523cc1f504446c0d5b37ea7c28ba6efa8be3439da8090bccc40a500f1642a31
+DIST firefox-94.0.2-nn-NO.xpi 522400 BLAKE2B ebc3667ab6391f81e93479b4911b06bf79f0ea8ab57ff28e17c7a3c4d549518dd7c292646cc3ed92e60faec34360328f3bc572af32e4d7f43c1288681b2c7240 SHA512 ddaf7a087d023a5e5bd2732f2d47ba022ea141dc48245762ea85374aee5f32234f54be2e95b7d8c9de860320fc4eef9df77bd2b17caf5a74e3e32af0250e6cb2
+DIST firefox-94.0.2-oc.xpi 544144 BLAKE2B bf087b4cacfd9e1baa757450232bf262f72a5834657e10f04dc7352f2d7aa8b43aaf437ce043239677f36242f8eec4ff1f1090f944aab5b5eef20b181aae4fd3 SHA512 5400ed47a38fd5796e36376426f4ffb8b06e9926a3f78b8d36bd2ab549aaea89b441b586453d366d3d403e38f2b408cfce2c35f50585104fc8c2878b1a90bee7
+DIST firefox-94.0.2-pa-IN.xpi 584317 BLAKE2B 5c159d54d4bd428a67970e4a9048f60fef1041e428b61ee44240d4598adb8dc13778839606c5fb650c771cf0df35c4a28e670b2d4d6dcd714cfef6c914ffe121 SHA512 a84a38b34d2a51c108290f422eb43b47d3939d7417070b92b907599e5c7d6dfe1427004c843857047df8cba1ef9cf47faec8e549daded7d0d9a3beefd0938aa8
+DIST firefox-94.0.2-pl.xpi 547911 BLAKE2B 8b9f80bdf28617bb0919e7fbcd2095f64d71f68348309cc55eb61d6a45edbe1c3d78c67591010fa8530928b940dcd7caae9e9c831b4eb6281726fe777ed005e0 SHA512 4d80368133d654733fda11b9f63a27df9a30b2b2e57b9cb67b21be18b6927b420e014913f56f16c64d4ea183f3db9da17ae5caa83ec5641fba65e163aa69a4ef
+DIST firefox-94.0.2-pt-BR.xpi 533801 BLAKE2B df1dd50dd2b55f4fd5cf8daaee03970b82665549aa9e104dc38a9cd74335daa04247ce47c52cd3af4be755a00d3a1a30f4ee85a617347d05d89dc8dff293e087 SHA512 f710bdb17ded7aee9e6da4f1f4a9b363f95c7666b9e79ebf1f405877582bc87f57032d4e0d92b1477d9cc0912f762244de797ebfef04c80d1a0b23c9a91b8819
+DIST firefox-94.0.2-pt-PT.xpi 537467 BLAKE2B 510c74c6f82d9ba2b277ba0b5b11ef783c61fda7fe76bee15e2fda49610f7af34526f3e8b67989e32807f3831d505b3fca7f6c2b93f8c728df4b3d2332c93b27 SHA512 84f59904beddbb13ad02b7520f6b61d4b36e8dec52c62ec905d12cb96b36ad5da3572b0160eb5d2ee3461f9ecd1fc9d924c80692c0d18b08b055c4ac5a80d0bd
+DIST firefox-94.0.2-rm.xpi 528343 BLAKE2B d9bbcdd68e4b8d8b6fd67bb0f2ea2c59bdb0cd4afd167da16cd17e91182067df3fa45e752854e60b7c58a580f0a242b2a87afa37528afc8449d24a7491cb4d9e SHA512 64fc17c5a788e4273a6eb0d09d20a1be71944857e4791dfef7bffee9b8a63d3ff0364ad6f6c23c3357e299db36947fba584f076adf15c387dfd3e612ea9a9c97
+DIST firefox-94.0.2-ro.xpi 523149 BLAKE2B b495a55c7d19016d075eaf867e0415f2d817fc382f9d4f8fa3d75c0fb70a1d6080455b75241a56939453257304396b86d0376d0458cc8c189f519bdb948bc459 SHA512 5662a7ba11cf1d6648550d7d6fa2ab30bff9b0262372356394c2e014cfb442968cbf679b9debdd45939a2a549b99be08bddd80011aa4db9ab914ea7b09824de4
+DIST firefox-94.0.2-ru.xpi 616898 BLAKE2B fe7d409353fc84436b4106c767c00323cbb26cdab9c931e44a5a0ee90605258e3b599aba863eb685e0bde852f46bf10e6dd18b4510817a9cab984a2df075ca96 SHA512 d886a5815b686a95e37a35408af6694dc9566c13731424517e9b78033f1ea8d818b31edb406872e467b09160f430c3c1c42f96a634ff23d05434d26c35adc053
+DIST firefox-94.0.2-si.xpi 480775 BLAKE2B b71e3d687fcdf17e66ebbb743023f68e91aa4d05a097eb20a9dc813c1ebd600886cd48bf125214df5879e988c0a2b004debc25396825b5d3ae3bdc3cbca1c8ac SHA512 adb1c1ea6c103fb130b8ea2bfa47fcc80a90ebb0c55ce024800dfa9c7cd52d12729293188598148590eddc26f4c993721482b0a8e1f80c421f649cfe77138323
+DIST firefox-94.0.2-sk.xpi 557124 BLAKE2B b30d60616a110183caffc134c9c023971cbe7880948af9b622a021f2ec1c6d0936ae0e5b8598420da564917797701fe3a3d853a930c970aa44cf29b1dff6309f SHA512 60b6dc0bfd9c84ca47918b5da5d4d01c3fc3934aea36202a3436efc0bfb432a7ad39b5da582bdb9db79c2db8c437a0213cce5075ce52ace135285d3b4a52036e
+DIST firefox-94.0.2-sl.xpi 526081 BLAKE2B 6b521955468b1ac1bc5eaafe5a82633160f817d742fd339fe5c4a9d57bfc283123b5b38ac6123c5e20e80ab70e07818a5cb3b788a21d1bd7fa46e4e05f7026d8 SHA512 a1906178bf30c1b95c684a9fc6f20fa698f46b71e9ce41b42d442f7a892051821a8782081de25771b33fc97a3003c2ee646e452beef15a30fee9e39819ac983a
+DIST firefox-94.0.2-son.xpi 417660 BLAKE2B a2097cc3c284ad1fd6ed76aa14a1503cfec2d8b788453ee2f749ab789fc5a02e3a0bab14048fc88738092a1a8146563c67d8b1919e49cbf99caf31fbefc5d95e SHA512 1576da7385def23b5bfa5f79ba577ed76075554eee35bac6e2803a63568bce79f5974b16ac5444927cde8fd94254d607255d6857de5eed218d51a170a78b6a5d
+DIST firefox-94.0.2-sq.xpi 541136 BLAKE2B 153c9ecb4e3766cfa8be1677d090f5d80a7158b42c93ace2a5b67b9d1c709f1dc9db21dc6d81d2871ffecaac3662d156d59a91e52786f808693bc4ddba11fb6b SHA512 2313bd6a14a6a97a64716f43c239419bf6d03359fc691dd64be2cbba3f8b93968ba48742657b06cbc792787df74821dde035620c0df5569ea86cd034c5cc2b88
+DIST firefox-94.0.2-sr.xpi 578413 BLAKE2B 0dde7c2c41b6a6d0ed34cfc628600e53df01c055694c313d792fc0faecfbd96e555a26ff2bcb063f60614416571c36124b761065cd131c268e8d03b75df053e4 SHA512 d179f74587705bdada49fcef9296b66df7f3f3cd7366aef77c314401765e65781412f7af006f815fcc0151ff87edb5262023035873e9c471fe4435cb0498af8b
+DIST firefox-94.0.2-sv-SE.xpi 531347 BLAKE2B 9994b72b10495e4fc1156a8855480144ba292c003a44694cdf03b74b9e9bda25ecf9b21dfe35ff204096df40e8d914a3d781f4c3c679e87314c71f057174f517 SHA512 f0123ec3a0504ae87a4ee312e599f98c24de686cbe2742e379b3cd4aba9303e8b7e84f07fa85d345431737e4a38bdc0db6637c15511908ea1d56885f3c858cf3
+DIST firefox-94.0.2-ta.xpi 504998 BLAKE2B a36fced51d868c0c6be302a108a07f6dfbdc6e1384a9465c65f05019fa324748d2ae97e5fbff09127fc3a8f0dbe37d18198fac3a67233a76af603bb036cc2321 SHA512 584784ee4da4407fa868e7348ebd073d70c6695e4c2ce61cf3a2bb15d6997e127ede25f7aed9db6b3134636ce67efbc4248103484a70846451511b0249097a8b
+DIST firefox-94.0.2-te.xpi 543391 BLAKE2B 39011734116e0a010c3e93a3930abacabec508c93571d0a987f8eff2d8449c8f441dfd72d5a47dcbff33fec742980b7808d6ee477e471f63905ad0fd3612bec5 SHA512 dc43b3adc63b5f00e55049de01bafd83a5b0bb653ea78fd243e4abc6177d2d9cef33db442e6e130205adab500578b78e6c21244adeecf3a8ac51643ebcc37eb8
+DIST firefox-94.0.2-th.xpi 593110 BLAKE2B 9c7ff0577261e5cce787bbf12a6bd19462044c0e3417283785adea30ead7c0ac15fb628a6f235e0d327ce51068365ba9a717059d2007b8dce3f3d04456f9574e SHA512 21bc17c9b3e400f60c441c1001a4426b4fa23dc1fa7bf7ccc6bf1c2517263853e29ade67bd74e91aff31d80236209a20013178ff3cf24a8635f588c674ca77d8
+DIST firefox-94.0.2-tl.xpi 509890 BLAKE2B cb035ec0c874830603d12cb7622e0a5cc5d2d400b5f53d68807880bd0f4eaee05417a5b3f9a75e3cfceec7b6185069caf2b8ae03b8fd35fc7e0d82c159e7a0df SHA512 200b5a1fc32677dc919ede7fd287fb0ed225303e77a997d05be28f0266f4fc2c4833537b389bf6d2441bb223d69a78395dfe43d0cf88619867f7cc7bcbfe59ca
+DIST firefox-94.0.2-tr.xpi 543539 BLAKE2B b3b6b6b13954b793917c845dcac0de3a5148c70b0738f46102e9628b7db1b45df2cc81000dcf76e851e1adef26185c8ee5bda9e3fc0d754a489f47c9bdf10276 SHA512 2aa55b25a5940a9950a6dea32204d18871e2d9564eca77c5bda1ad3455dcc79aba9425fa40bb00bf661e632d5ff06c43c5e0529109e8efe436c7f5183809b9a4
+DIST firefox-94.0.2-trs.xpi 484342 BLAKE2B f3e416dcaeffe33c1f711f6944ce535d18853a194e767dffd2861a381dfbd7b74b4142246b65d0c3e59b7fa41080b0e4b6dcae2da65a081e955f3aa77047bff9 SHA512 970138125e8dec4195e6841d75e0ff1d09e11bf45d1599c13986fc31723c40ce8cbf9f245412d2d344dd0fd236506169a1fc42648c8b7a02eba3a00d25230ee0
+DIST firefox-94.0.2-uk.xpi 610393 BLAKE2B a7c985ccc07fcfc1ae1ed2d3cd10a3aee5b7685b72deffcd3d3c4772028aa2bb3ed4497afaddce1c5cc8840cdc3ba51546f94ad5b16fc9d209a20945bb1bd9fd SHA512 e7c9a2d71d405a8eda6d42e5953dd1d3f8ee7eed18183a350ca7f69c1abcfd6c27753e4bb73f8daabab2db96b75c08466de0edf470d1c37c4e21c306b1c1c01f
+DIST firefox-94.0.2-ur.xpi 549894 BLAKE2B cb59be47ed60201051d0b0505b9d2d36a4debfe41b06f91c63a7f398074563074d92c2a036321a79b772861ef8a98e00fee5b9b073f92eb941f8d384cd5cc482 SHA512 47f839cc20daf86f21e279d29e937fcf0b374ee85ce4be7bc848453c32342bd1e089bc27bb9ea0f6abaace25f0e589681c4d657e92f99c45dd4aeaafc64108dc
+DIST firefox-94.0.2-uz.xpi 460712 BLAKE2B 84639e54b1950433806c9f76b09d06c5e40180093905639d43fdbacaa6bd93c9994564304392732bfe7b29b2f5497453b1dc80f9079532f6337430833c2de29b SHA512 9239047d441655b1e0884da8a16d5aea415ffe2600e7ece7661850c61328439f04f738431e52a7f853842b7808eaeabb63033cdaca2997e1d34c9bcd52b2ee2b
+DIST firefox-94.0.2-vi.xpi 564620 BLAKE2B 19dd083641d232cb399e4f8024fe1e5a01a0bbbaed6ce10a87c71d3d9af553effde221235fbf9d4fc6ddfdbb2e3fe7547d24d651f1a736ad4339558604610284 SHA512 df2511ca3e0a562f5d9a7ad29df08e47372aaf63f7bf11d850e8c5eff18f9534fc112007b1da71e0493262404c3865ed1bf40d004ed78d9e001bd5cb5a4cc210
+DIST firefox-94.0.2-xh.xpi 421170 BLAKE2B 76ad46bddd3283e395aa06b740d65a8b8c2ab70d424e9ea39a4ada42006f2a3234d92fa6092a720261ea391a5a595d01d3e0122fc209d8431d434706eae90658 SHA512 e286288b09c60f6d0f2ec166cd64149441891ae8332e15f22d571b78d2b92f7d01aeb06de93f5072f8198151378298636216114ae23948bb0fb9d560d4eba73a
+DIST firefox-94.0.2-zh-CN.xpi 566220 BLAKE2B c011e86a071303e3f8957ff62a0ea9f6bfaa93b8b328f2e506af83bf0008e990e92cb275488b6767af5dbbec40986c7f7c8c63d1f50c25cd13710d900ef58e1a SHA512 5d67af7ebfb197a112e40985eb9fc49f98885137314c40eed8e7fc136b5d7e97b5a3afc81bc33a5a8eaf1d27cc9a31a32a1eade2d8672abd3765bcc86fce2c23
+DIST firefox-94.0.2-zh-TW.xpi 566884 BLAKE2B 315ff12d2acb993161bca86c3bb3fe69e0f9f90e37d67c0f3c79bcc463b4d1c7da10b70fde8067f85717d2d0435c23f46f5170625c63f06798fb7058f503f001 SHA512 ddfb47be87c55d1707c890004c066f57dd4adedb5b0ca8675854f9c18491d3f765cf1a5264253639c256ec1306329b7e63e15de07aa4559ecf9c680e297ba8cf
 DIST firefox-bin_i686-78.15.0.tar.bz2 73406738 BLAKE2B b08ae14ca3cbe9d2a7071d77df30cd29c67b1ce8b5898d7c315e399bd42aa2bc8438fa1eaff73df5b348f6221687036266af531493238cb27473c069081c0070 SHA512 069b0faa92408adc319527eb3d6cb462f122156a507b3c646bf9a467fb49e5f2b48cc4a2d1dd7f55d8b7f2c6e279d3768100a668e95153ac6467fcc7ff8f94b4
 DIST firefox-bin_i686-91.3.0.tar.bz2 78790051 BLAKE2B b787a845f07ad9b656efe7a94447ee457717a822edbf737100ceff0257f9879527d228879c37a86128f9e0722f0729e4705dacf5f55d7a93635dd03589b1897d SHA512 40328cab4a808f43ce5caf9d2f987492f1c4ab21b0a9aa4b17af334fbef081a0a8dd9cc491b0e0aa972a042d96b41ac6b8d2f195e5c42f71d7dd8ff56e415a38
 DIST firefox-bin_i686-93.0.tar.bz2 77199708 BLAKE2B a265ead5bb91406c8db4688709cb7bdeffaa48e0d0e20daa93841677c2e239148c0e1da284ce56bf3a479f5e5a878bca7cc702804865073506e27361d94b4642 SHA512 1efa973447933eb1e233f96201b64b02aa3207336e5ad2581ee00408a0fbd8b6461d16065676cf784fff2d199083d563f280362d6b0c00bec76a97e0e5cb9b32
 DIST firefox-bin_i686-94.0.1.tar.bz2 77792411 BLAKE2B 09cf5b66e5710a89d0f268dba476445c392c7e17d9ee6ed682033f6abc5adeff959f182b04f20cde598f8d9fb2cb84f5e84d7b7a5f183e7be366f9c79a754697 SHA512 baafd45ffb88a1919b89137e4f56f3e17fd7df56ad7407ee35f340c852d747ab22a93d2b80fb2152aaebd7241586710f2f1b9e7b056c42c856a3ae8fe4245a56
+DIST firefox-bin_i686-94.0.2.tar.bz2 77954283 BLAKE2B 375e9b407a60ad7939849b385d44064e09e865b2354e03288c5328a8532cb7298a1b96200dc516de24ed3866066d5d3b213a4b6963ea2bd09b63aadd62e8ffc2 SHA512 eedf17c71caf8d44eb891333619dc93634c9ae93f05bbdada3fd25994c0947cca9d8067f7fd4dbce6503ae7e793b216c683bcdc520060f99bb970a3024e42953
 DIST firefox-bin_x86_64-78.15.0.tar.bz2 71155495 BLAKE2B 7ab6b6e892d78778136ae83434269a77238a274dd369a5cd659a6cd6068a30be93eb9f023cf2c9fd5c4bc31de57c256a86d48b9c4043f740f72847fe032574e2 SHA512 5c7bb23a9003f4e246a40e54613873051a640ae2a69da60a241e48f8fe413095c46182a8626344caaa3efd4620f9100c2656967106056aa5db9a646fed1bb57e
 DIST firefox-bin_x86_64-91.3.0.tar.bz2 75998026 BLAKE2B 2c87cefaeaa9a2ec69168cafe6d7cb125933c7cdbc1a491bc1d829d5c1d258596e938bb1a154948c2a74995c6b7f4250e37000355d179bb32cdd91686827de33 SHA512 7388472feea9d5c45df7d324f1485aa125e318a442768909ae24c3001abdb2567abcf3ccab9df2d2b5f90d769c649e05c15ba428a529c929829b8fb254c24a6a
 DIST firefox-bin_x86_64-93.0.tar.bz2 74008444 BLAKE2B 6cca65f02207dfc638ee37ac122b1af4e821c05b0ecc2c5861eab6f38fc6b68a7d23ae7aeff44fcb433a79f46d3e306e5c1f228db06eaa33e30a52d597d9caec SHA512 33d5a98ccd2fb33f9315b9d89797b42ffb67610cfdabdf383c0240ba1eae203715e543021e8a59908e14e5a68a884b455e94672e222b2534d92eba62adc30eb1
 DIST firefox-bin_x86_64-94.0.1.tar.bz2 74670989 BLAKE2B cb5871eb3b946b67e9c0c13bb2c26669d2be60e684bf62124258525bd646c15cd5d4c3ad86bebdfc9791830db2215faae21a35f1c1b3929cfbca02fa48a87840 SHA512 f5b00121cc465d76ec2a399aee1342baf42ad6e366963cc88fce65337368d995859d76d4ab2d42d0f92d78256059c899761c022714e0423eee25426e0d0dbaaa
+DIST firefox-bin_x86_64-94.0.2.tar.bz2 74771512 BLAKE2B 567797212063f68aed40471b125baa91fbb364f85410b2f81cdc5a03bc383d548284d9f479e7d26211c560ec0a66df2a3a86a5f3c761614436676e41368603dd SHA512 49c556fa337916349db21b6a01f67ce036be19eddfa7842f01af4c2c296e27c36217df5f398846651e83f612c5680acd8a7dba2cbc50d5cf189e073fbb82d854
 EBUILD firefox-bin-78.15.0.ebuild 11540 BLAKE2B 1c49df21f84cdb50ac72e1f246e9d8ace457609f39e9e8b958bd6f488df8a2f27af21449588bece5a6e3552f2e1b4e7adc7813e88a23407eb9c42c99c6662382 SHA512 c42081fe1315e4d8795bd4272c383d0e3c2037fa9adc5316153a124076f3b9e5eb1077751287fa0ff5cfc74d869953fa6226bba3b71c038513381e7bc44a4e55
 EBUILD firefox-bin-91.3.0.ebuild 10926 BLAKE2B cc1983720571287eef98579c66da90f0bed427c3e8e4842a14cac0d0e00a87a1069049f6c83782ba170c49cd19a8088021900527af655184009af3bb1d56b412 SHA512 0d3c3fcd1b3238cd754f6ec0698e391758f418bc6c8ae7381cf700fc0350ba0226b5fd9659ec82243d3967ba7e602f1b87b18011e0ac3e42573929580e5677e3
 EBUILD firefox-bin-93.0.ebuild 10850 BLAKE2B e64eeeaae24bd52bc0eef64ecc869f013fc5444260334ccff42874ab051be44ba90fc8bacc7607d62a22fc8704dd5d13b1352c0279ab8c7d00235cdbbd23156f SHA512 15eb32c11409553bfbfc0cc162594a84d97629c9c958f0d43c303d749109f2b5b7cdd95c18141fdadbb4fa7d45ebf165151483e91a53224c87521a999cf34eb6
 EBUILD firefox-bin-94.0.1.ebuild 10924 BLAKE2B 7455d49d667f167df2da57b9b718eef51540860a38358a5d83698aec848865a65e6a9d74d0faf84abfc0db2d995e4752b95b0539c35e4a4104f13c2dc588f93f SHA512 15bbe4646d35bf83ff04018ceecf291b7a389cff5a27c17876bae77719c3c3c432ca34e699e31edc8cd17679b5b33c866bdc74844da7db3425b924a153ae32b3
+EBUILD firefox-bin-94.0.2.ebuild 10924 BLAKE2B 7455d49d667f167df2da57b9b718eef51540860a38358a5d83698aec848865a65e6a9d74d0faf84abfc0db2d995e4752b95b0539c35e4a4104f13c2dc588f93f SHA512 15bbe4646d35bf83ff04018ceecf291b7a389cff5a27c17876bae77719c3c3c432ca34e699e31edc8cd17679b5b33c866bdc74844da7db3425b924a153ae32b3
 MISC metadata.xml 426 BLAKE2B ec2aee77c3aab786c96234274e5b3b38515561dfc66dc8b844f0c7eb8288e4ed083b968b43e37f8593877e729e7a9e22f9761dfd27d5f998de21f1f67600559e SHA512 75f5b6e4ec2ace6924078d31b3a836ba11de1f73bb406416d222149a7407d295c5dd0d64c3306b20bfa76b396a7b6a773aac5b91163716350003a65d619f5691
diff --git a/www-client/firefox-bin/firefox-bin-94.0.2.ebuild b/www-client/firefox-bin/firefox-bin-94.0.2.ebuild
new file mode 100644
index 000000000000..dd4f26774a97
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-94.0.2.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c35915cc116d..13f5c6440517 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -403,8 +403,107 @@ DIST firefox-94.0.1-xh.xpi 420859 BLAKE2B 68842d4622acbf1a23fed065eb73d9ee82922e
 DIST firefox-94.0.1-zh-CN.xpi 565916 BLAKE2B 319fc21bdccf3989caffc60018720afda13be5c42bc109a9513b69e2ad5ad7c693fc91f8cc71f946567172969a798fcce9ebadd98732f46f11bf870e32de9431 SHA512 9f1e6321a0add7866bfff43acd1d128976eb46666fe672ec3ad632a556b1e20bf771b9e297becb136bdcb209e3b8f9e0dfcacadabc6c8b2f91c52dae230696e6
 DIST firefox-94.0.1-zh-TW.xpi 566573 BLAKE2B de71dcc798dbb394b9400d5801bda945cd80ded6c68c6e6c4c02bb269d16edfa00c02f21c361ab497071b25a2abf7520a0bca89b370c1bcec9b032c12f08c72f SHA512 8ec5f1fbdfc8d7ce5669f652b2bd7392048559fe8ff9e9f9ab43bc3071ef4272ddeb5c607148ee426e1722fed38cccebe972ba0b7fa6539f09c84ea804610a9c
 DIST firefox-94.0.1.source.tar.xz 383929000 BLAKE2B 2683906fdddf1b11229affd5aae3df2a7d5bac00e79c10f0c3a8203a456fd4398908d4b5706a1dda6b22caa6435074e7fb629698fd68a223cfdef377ca3e3219 SHA512 634665ed64f2ef205fad03ba023bc915df110c0d4b0a5e36aa470627808fbb3bce5418ea607f909d4e1eaf7d90c5dcacf398b8a434e26906dcfa366292a18b66
+DIST firefox-94.0.2-ach.xpi 447241 BLAKE2B 45ab6c5afa8f211801b2e5fea93c0bf0c70cf7a3e5c6b8880472d82cba0fa74250676e71e5602702e4f3cea5958fa5cd571f1f9315dc912c72c4b1fa435d24e0 SHA512 ec020c6d306e1a948924ebf4981f408870a7ddb3c4f234a28b8dc02e0c62f354411817ba3cc482f2c2f11a3a6e4a980453de05b348fbb9ba36c0cd0e09929e33
+DIST firefox-94.0.2-af.xpi 418686 BLAKE2B 688ef4c0cf5ec982549c0983d765409eab54624fe7e9d056c216626dfb0f9614b8c87e3eef58ed2cfd25f18fb481993458611828252b26110e970e550902cf36 SHA512 f5f8e4d0767de05266e7bd708de617a5f0e62e395c4b3b8569504e59407613a47af0c83ff18f568fc70f8e533cc07163c1c9477cbec29b53dbdb98335ae573e3
+DIST firefox-94.0.2-an.xpi 494464 BLAKE2B 26ce20f2c8bf400a19f2fafa501420ce340c027176ed9898760df1d491677e57ce622f953c83256afddf565a858328fcc678240f2c4591b7b16696b66280bb5d SHA512 0e72c470664fb899b7149467dc09baf808ab598e5a196733dbf81015218130b5c6a4736ffb0629030a2f9cebfe6384de8ac370b3fc4da2ab8843bef63060675d
+DIST firefox-94.0.2-ar.xpi 553194 BLAKE2B 8e5399faecbd123455d68012dfcaecc327d0bf0d39fcdd79354fd9e8bd32adac35ad0bb251d12fb3ad47ebc68762e5a06fff4343c3868d5cb7992f4ef5fbd387 SHA512 60b4586507ec55a97b37699d1a8ac0cd83a2dbd902536fb515ac2af48249d2c88b45784a445f33d841778e8ac52c1d63e36c8ed8f9b1030ff8859597687126b0
+DIST firefox-94.0.2-ast.xpi 492807 BLAKE2B 33da379ea64ce2bea60dc90538f68ca744c0892fee90dafcca586a20ac54ce7ce29a2623661f556f2b261329fa05d2a74df5c8c92d3eb35383f26e8c101fb22c SHA512 d3b254251cc2116765344b444c0c8a30d91bae14241a4160bfd7b271ef17cb3413ff0eae5fa59327c800973e8e92b3d52458cc4a1666fc726f75f9b40f183b8e
+DIST firefox-94.0.2-az.xpi 482933 BLAKE2B 3554916b8eaa6286e04d6e9482c9fb6160c02776fd925d2463ad776d6d8906596e3bc8d70fe32464ed053ae7282a6ac992e37c6fcef3132ac130797b6a67c5b3 SHA512 c719aa86485138bdc440fefb2310af32ed8b5a829fb718e137ec3cc670857631f9efcf4ef647d16a9a29b4f11f04ef2c3d919e6d8ee567bfa327b0ce0d0e91e4
+DIST firefox-94.0.2-be.xpi 612140 BLAKE2B d70c5edaec128c881a5a3aec89df266f41ad38edd464726a5db6bcbcc4607d37ca37704cf85aaa4d865f28135b6ce924b0e23ff8a5159b2095d08304132abef3 SHA512 a7db1120e5c0c304df64af6d9b7986eccf200dbd5d6c31c9053c87550668eb6410353c765ffa0eeecac7beb93c578588fe435496b5a43c7a396bf94a690d3b0a
+DIST firefox-94.0.2-bg.xpi 561583 BLAKE2B 944ca406c6325efc03335027510fd33a41411705c3ed926f4ca3179cdaf4a84e71f110f2be7268b331536bdc3d92e15d30ea5024e43c3788d95b0c1e3d7c3c0f SHA512 8ddf87b6c45ee8c31be1df9dac94c5673507a6e2a040dd1dbd412edd4a269b030a49fe7e4768d75078154d30a097b2eac01ed981a4fa4675411a259afde09580
+DIST firefox-94.0.2-bn.xpi 549624 BLAKE2B d3c299b557cdd0afe464e27a6816257811e12f41f446255fd1f2c40631927ab9ef1d765ef9375b3266d27e106853a754298f65b2acc2a0b89dd766a9d66d6cdf SHA512 e6c19ee05eb5fbfa7fb5d755bb22997e1ff645a636424a03166e609ff0947276ca70166c48ac681aba9c7ee3e14aeebb406086f1969eaaa53cf074fa54caafcb
+DIST firefox-94.0.2-br.xpi 518905 BLAKE2B 4cc925352c984328035ee4af4b348edccec50623f4a910ed6d818fb84333b7a8ffc8e97972eb8e33f33e7cb92e4875c45080cad973c8880d857e7b1333a78fda SHA512 102092ecf445616c6331f21c760feff7f2f1fdaddd8881cee06bb4e8eba5d96b784f134fb44ccfd3ac3b19904aa6bf5962254ece0ce03dc9f4ebb24376052664
+DIST firefox-94.0.2-bs.xpi 457706 BLAKE2B e55946902028f0b78e9029e8bf1594502187c6b6193c53afa3e79668280d7a03d506090b108e2799e254a60c3d6732fbb2fa5dadd54c47ecc150bf95f24d055e SHA512 ca59825b983f9a5f9561cf150419240f967c1bafe184adadf12819da3c7e2a1941289ad5625ed222a308a11ba3dca818e9806a386dac7890b51f7cd917a894c3
+DIST firefox-94.0.2-ca-valencia.xpi 523066 BLAKE2B 2decde5c9fe01eb4f7a9d99b0d17569eb29934613b69a1b18e3cad6cb85be1e6b3d0ed1ebdc4bc5a84d9c66376b6af50afdaef84cfd7701ecb4e70e67df9084b SHA512 54c51aca43d74f7ee447dcd091895036ef81c22cbd54afbd22790085b53c8a7b0a238d3eb8849b4c5549d742cc7d3d7278ff40b0f480d2a93bfa85b7373ddd14
+DIST firefox-94.0.2-ca.xpi 523662 BLAKE2B e0ff8d1f14e6181402c63d0987053cf86f141919121b8d17c26eed0a6423cec6dbad57455ecd617ec7a6d8aedfdb0302a0b04fc5fd46d824c0f38d2c888c5f03 SHA512 8ba8850570206a89bccf8fe5a6d49ab6273547db2e62dc9841916fb8fa1c973def60031cf3bcb6890935b2e5fdc7d2bc489ea4d5ec05042a635fffc5325986fc
+DIST firefox-94.0.2-cak.xpi 547147 BLAKE2B 7dbabb3ed8e2b168de9ced2b25a434974eb6f6aabbefb09068d9592c2e951c5aaa17018c45978c3ace458e3943d7e539901dece19a0d4c64fc5a985570b2d1bd SHA512 9be5f51886a00ace70345ac69bb9ea6e58a58aa8c35de176bbd9b21d94c7b1f93702b7f38f92c78761463234b031515238d8820d04401319dbf91141d0c17629
+DIST firefox-94.0.2-cs.xpi 555218 BLAKE2B daf21053d5b2ebe535a9cb83e1a6848add513f66d0fb18ec4a80bce0425907a5f12b020b38ba0bfbd4f88d629de31d19cb6c31f5d5ff463c3100fd7cdd9599ab SHA512 4ca3434e3e4b9869d01070d23fa2a4abfe40c92bf0917c14e7e49a92d02884a7f768e3008d37bdca9c0df6ae9333717f661356415c3501b9456dd2d35a0cacfc
+DIST firefox-94.0.2-cy.xpi 533601 BLAKE2B d7fc74e0f52a114874d2f2cbc308f97773e907c44bcebe05881387cbf75098e0b3a77bbd381d9851e5673baf8d15f0fa0004d6f5b97071fd727f6a51a755454c SHA512 a777f48021b2f0b9ce36c88489999bfae5fc53fcec07d1e609678a84ecb9cc9259043d1c3837a92bcbc2cb27e25cec8b9da32af8e80ce920be7f9e0d455aa1d1
+DIST firefox-94.0.2-da.xpi 525484 BLAKE2B c56dd25b8becef8ca454f0782aae86e708fd8015594c6eff7c509fd8b45c29ef40c3534b9ad561fea53fa4925a63693669a5f200a27e25f72c4c6238f5819d76 SHA512 fed02b6865402a2ad4fddaa6916da5948ed2b0e69e06211ed29f615970c5940676d64c6d78e80ab465f3377aa2b75198197178e83f09ae743e155af22147a4a9
+DIST firefox-94.0.2-de.xpi 544439 BLAKE2B 37c346cff36d08de547073b1754b52fc76fbd9612ac472ea0be2912a9d4b441d448d91002b675ff9569a048fdc9fb5faaaf975f0fdf62157d7f818642a5fed76 SHA512 d51293f16402c73f2e233de57b38250cbbf7deae94ac6ae730586c0599d9c76a1257a3dfa8a54d1e18836647e66ef2a8a540b44b13de4814cbb1d6602655fef0
+DIST firefox-94.0.2-dsb.xpi 556987 BLAKE2B 1a0808ba177c13ac1489cb9ee61276c4d9d60eb41da5652cf061d2364d08b9ac5ff3ae94a0a04fea172d85978f45c0cf53ab996e626afcab32e6a18342fedd9a SHA512 fd9d171db4bc27bb38d7a6909b5fc6ea01ea106fb8ef6918a192fd24782bd97b1c77f81aff9e116cae4e6da8b4ff58cae419401933e97a90484a572c1b0bd339
+DIST firefox-94.0.2-el.xpi 628739 BLAKE2B 3b455a0660c18017cba3f56ad41fcf9ec1c5c9dfcf8458be523afbbe90ed96b40ac7db6160ddafdfe47de15372e7fbfabdb1cb30ab714ee7e03bf1a637d66124 SHA512 504fe04376d5782ca538b63945b4744f744b4929b2b81db8f0838d7f5ac8af811aa3d8c6ef18ae6f4929688472bc2d7e5bad3b71ba4e91d412ca59d4c99ac3ec
+DIST firefox-94.0.2-en-CA.xpi 502078 BLAKE2B 358f757912ba094351319bff00c958320a4423729113eee165f30cb73f16a45e01d79df3b7d70a2ea6f380eb30c144eb7d139958337a959356fc3bf903ed3fe1 SHA512 b509c317e8c890aec87586c1ce90ebed7e14410bcf3266a57ea0a400e95a6487d52d55ede0d03816489ea90df05d9c802a2679b62ab1fc71f212ed00486ee4ec
+DIST firefox-94.0.2-en-GB.xpi 502586 BLAKE2B d9f3f3d497902c8cfe31dcb62e893053ec66e046dcda3dfb97b5712a594329b09d281be5ce6c1377a48aeb9372dbf801da3a02db2eee1973b76ec0a54798d95e SHA512 d2aaa2faf36aa8f61fa9a9d02d7c41170205089c9070b5bf13ac3f930d3e521e4cb8f6eed7a1dca15c0cd722b8bb7e76683d1d772f1bae25ae2a30ba9831e6f5
+DIST firefox-94.0.2-eo.xpi 524537 BLAKE2B 9637e339a8a35f8e4f35e6321e45eeea2d84cb586aa26401a41b3bfa8618eff9be845c2dab6837e59af9a3cba7337f77c66e581cbd3135f6337dc83f90c15f31 SHA512 cb69432c7ca6df7d81e61fa32b8a69d5337d169c9218605be96eba6463145e51b2e4078cbcb37450d59f8630b6139c0812d05a6c4ae27cbd1918f40f42f83ee2
+DIST firefox-94.0.2-es-AR.xpi 538014 BLAKE2B 6b979232a3c21b1dfb04fe9f3bd29ff4ef3466e153357226cf8cf7d5ab82e1888cb3f178a0fa08a02d86a1654f958735c779422c69f4ed44440953205d382b7a SHA512 b1a3a27298396e05f6fe167ca769be5a3fda8253f81e0f395bbe6ba69649a2606d1851642fbe8aa45021912f7f3436630d39ebe21e41b263352001eeb5e99045
+DIST firefox-94.0.2-es-CL.xpi 537549 BLAKE2B 62332c3785d4431a720174a76ba369995e4d9cd72fa66a87669e8b9b57448445633bd54a1b4cea570d165cb1334ff7f50225c1767cb04be2200ffc44f832ef10 SHA512 13a1fb2f8d7f0c29009cca0f83ba474f2d0491a2fbc75c5f9608034493323d04b1910a4fccae7602aece17437c2aea51246df57cdbfa22114810e3a610fefcce
+DIST firefox-94.0.2-es-ES.xpi 528306 BLAKE2B 26f92ee9d9e8cd6a1962fa476cb3999c8bc37ff912ad7ad49a47ec4e758ef6df8f887a28099ae7feecbb1ed4482d5da55100703a23c6a1374e187cb2796c3d5d SHA512 8a968018cced56048dbbea3cb05823ea82e144701e71e537b7e923a2eec3690171fba8a2ecb76d75d4f4316d399205489fed6eb229dfbc0467417a455091e6ba
+DIST firefox-94.0.2-es-MX.xpi 537717 BLAKE2B 4fdd83f784e62451854300b14a24c5a5c48681c98fd158253bda6860bb427495c8256921301f955229e79e044129948ec0279a756b33b01dfe5ca6d708057a61 SHA512 04cfdc6b5b330926111b99ac191be07495dc2aa1d3825be6034e7069029a43b4bfbfc85fe037c3a2f68cd1fa743857adb7170e022050751f7fa7b2c19aea8a50
+DIST firefox-94.0.2-et.xpi 476279 BLAKE2B a7e0d032c7fe9e591ada8031798726b66f674434329604e28be24557ba67c51a9405ab6beb36bc6d7fdb077abb2a530cec0e742efaa4a4b78d7b169cdd2574d2 SHA512 c51912680984fa5f03fc4c1b7b097d3fcba6cca80ea5ae9663dfa19e79a16d5f881c30bd8a68758994e4a46e31835e6b061ebe7bac3d619163fe25e636ea091e
+DIST firefox-94.0.2-eu.xpi 527862 BLAKE2B 5bb985414ef6fbc11fc94410ea8b04232c6b3273da002fa4aecba2a361425e03aa1ce54bb035f1db54f11b1271c7746c5c5832730336199be933584c5744c69f SHA512 1cff76c9782bc3a0fe2bfd909f16bc460d9814b1ad9b1dfda75d7d2ab9054182816e050f24f0ed2eff81b76a0b85f7793da8ea0383728d94db12367b190ed852
+DIST firefox-94.0.2-fa.xpi 549491 BLAKE2B 49cc0d17fd86affe21c48add896075d59b1e89be7da79abe3b5c89b0916e878a22db42305653ae46edf67c462d0350eb4504905bdacc3c61703bd0cbe947c1bd SHA512 de8ca0076795f1f7a2157a40a8830a814c42b4582eec71576e55291faefcbe0cc8109663eb0f5718df29cce216a42875aa592e09b7817863659041bbdcd0cc58
+DIST firefox-94.0.2-ff.xpi 465162 BLAKE2B 48b906dbf341f839e2d85d0957e23ebab7cca06bf24bd59560371aed848e15b8aa4b962e401ed1a70f761a855e3454b61005661bfe7d8b619f3b6bb21db148e1 SHA512 6d461ad28576d2b68bf7e9cb6d07a36476aa8313a99f22ec2f0b2cbaa06a19711b633067d8e455a9a888baff2b3d81d92a5718c806dfaa1435f4cf0be78dba87
+DIST firefox-94.0.2-fi.xpi 521930 BLAKE2B fc7540d31ed78481dbcbe61ba6317bd476a72b4ba5284bddb3ca0258ecfbc3dcfe2d579478eed7487f17cc64b882e13965f607d7e0d2d773412eb76ed68ebc27 SHA512 227d347a11878045a8dc9769a5cc3a42e703f18ce55de5fe83affc1e42d140bf3653d46d8a58b66cc0cbb38d03d04d5ba7addc00baca52cb382bac682234a68c
+DIST firefox-94.0.2-fr.xpi 548695 BLAKE2B c9820a1d717471c79e6a75274549d3b61a11d2629aa9bbec62550ccaad70c03cdaec35ee8989da512f3300a948757deca712932a3407b9c84148a6403c1128ec SHA512 6b216502876f0c4a2249036657f9dd524630f800d6f56e222b9d9ce17dedd4c9fb3957bedc9c5ab9d72d75017fb568a906ba423d70ab828813bea29200d69db9
+DIST firefox-94.0.2-fy-NL.xpi 534445 BLAKE2B 64c91aa7877fa4edee358829601e7ca386704daf0bbac789d91c9c9d6b5e68e5679ed3e4fe43d05359f347545567647f40ab191cb58d8c2e5cfce5a90ac7b847 SHA512 3d74117bd5365c15f67f905846d1f4b497af2b4f00b8c933d81faba7496c08e23c0ebfd3f44e0dff961b3a24e55980f46da2448a9728939ec53a0943621ab745
+DIST firefox-94.0.2-ga-IE.xpi 453332 BLAKE2B efc2dc6616c87151845b3e07605997af96179b6c258b67f0995f5c9ef7a8cb45cb51bc0273b08401334877a5496afd3511f6c50e6fe4194e67494960dee7bd79 SHA512 63f900ebc7bb2e5d37da544807f94379e2b84b059a5570f2296cc08fb490c64ff4f024d1be1159213379f92e33699cb27f35df88834492755a2024afa42c20dd
+DIST firefox-94.0.2-gd.xpi 525506 BLAKE2B 81216eddb619142f928738e2ed078c45de9fb6a826db120f6dd3831dcb2de3412aeb1901d6544d4b1fcfc6e98c658f0c2a4e1e19f1d5817b4cd1b83b23c83f08 SHA512 0b69b62f04192e82b1a78ce36b3402cd20966c7c229fb5c5cc641cc616409374658bad0b64c2c67c738e8085b44c827d44b711f0ae13636167f299bd012c967f
+DIST firefox-94.0.2-gl.xpi 533070 BLAKE2B e70d280bcf7de7797e4d6840ec6e110303cc1b3f17885f29e89322bc8fdfbbe2432cfac5625f791ca31bef8e1f30e1815e0ceacadedabd38ad679bc9c67c3aee SHA512 150f442e6f698e162a4f66bef67246bc20b75f13e9c7876aaca324852f8a356054f4497531b5a4b363933f842d97c31026cc72864ab8f6b0eb94010ae31d3619
+DIST firefox-94.0.2-gn.xpi 549083 BLAKE2B 1206abf3ad515b66e1c7171d21b3aaa959aaa8e6af8b24409741000401bd6d86f9f7db4849bfe5acab25eb1f3e87b9515ccdd6009aebce19f551a558c5b53331 SHA512 67159f16c4c5f613f53403610b4ee9d9157677a48a866bb019b2830ee10376671793afff5da06551c786966f9a2cb16608cbcb66b9b91c209d8e1f2b4afc39de
+DIST firefox-94.0.2-gu-IN.xpi 522304 BLAKE2B 734b01f9316e5a4e404208ff8ae13b36650342c25097eddf17177c35f3c7bd11e50cc6a12ba265d737205d8b036507bdd6786ef0d7afe203ce78988819ce59d8 SHA512 32824093a11e4726c8ca0a80b61737275df096403a3756c12ec60776da73448624800f7725500a684f75af99b3c596dbf2a777261e3ee32c548d29ce6b03e17b
+DIST firefox-94.0.2-he.xpi 548396 BLAKE2B 4cfbc715ecd7a4fd0e2a0972160215e30c40ae46ed9fda258d56d7a99a9d1a83a1d6c8cad77bd258e6a29ed83a502f591e819b09faa558883171d7b012224eac SHA512 aa8df7d8f38add33ca814ad2a2df09837b7820e8eed1f03c5cb3a39f214551522da2f84d0397f61ac5a1454a63acbdc862d11c201c3bf9f23d576d7a7f887dbc
+DIST firefox-94.0.2-hi-IN.xpi 549945 BLAKE2B 857a41445ed57fa127d5d115752f3d88527383104ee49e488f4fa149ca8351da6d7ff81064d1178bb2f8edfab4de5c29990c9d5d1a92ecacd4343759b3eab8de SHA512 f400cf5f672e232775af0d07f324921f29b12a368cdaf80b6d68db7cda343cca69988a66835ee0c45bfe36cdc505d3714bf3ab901b2ce020f7eec7a4602ffccb
+DIST firefox-94.0.2-hr.xpi 524458 BLAKE2B b1b098b59a133b9df1bb66bc6b960aa843da60a621696ac433f01bd8cbca601ca2d8909a707652f5d00fb6695c833d15d04a43f89af7fc0903d2117b52d3de98 SHA512 35d566be8614be5e9264ee618d3128e3a26db7552f88784d08d9a7e9bade25cd16d2c7e0b7f1f37574bc105ff89d0ea4faf215c691906d5d6ede56800d29afea
+DIST firefox-94.0.2-hsb.xpi 553063 BLAKE2B 450366b43ee00152275fdf398703a8882aaaa3a3f5a4cd3c1e2b97e09db24da1daf0d677690d01ede0f339c069d2690cc6bbd8da75cb3489df0b9fe0ebcec969 SHA512 315ab12db114872919e1813d85d638b21e926f75deb7c5ab2ac76f5e77ada90b9ce68bfecb2d5963db52a1507398e9b8c8f3eb0bfc8e9ab85eadffc15719302a
+DIST firefox-94.0.2-hu.xpi 556846 BLAKE2B a4e07ee7cd71f876393d0818b61f74373b5172dd460c628012b1ade50035658ad3a89bc0a446f270f9b101d0c12db81be7b29a6f5b6e7795177878e6ef53c92f SHA512 2fe86f270a290df8adb1f70f8835739fb62f8e25327692d5e35d080db2f03ec94d9c097f9502a4615de84c33a82279085024bbdc70a1ea41c6cf2bb69e090f8d
+DIST firefox-94.0.2-hy-AM.xpi 571835 BLAKE2B 538218d30b5e1bccbac63d343e65753fabd6982f9c95e24d6d62ca8e9d98936b51c132c740be98f5812959ae673a47537ad61e4f728964d68f8d2579797ad1bf SHA512 aa23c25ecf7ba4e6fc490fe78af3a9ed383dcff0e2afeaf3ccaf093da00d2a4c6f04a1c55e62fd94bdeaa144ca804568dc82089b7512677f87a7847825cc6077
+DIST firefox-94.0.2-ia.xpi 523712 BLAKE2B c9d6880548ab5ad240f4b9cfba5f080d2522eb46c1acf55edd0f1123af80609c0d2a3364a89227c13de129eb47ff3302c2125f8d25845c609cc0a9a8b1259fd3 SHA512 192810aefd0a8527f9b6389de53d511b83ed01ca5bb674bbcfc3246a90c1a1d80dd826f528175b8253fdc47f090bdd5c4d5a7d16a28b648e822c1b3dcd068e8e
+DIST firefox-94.0.2-id.xpi 514576 BLAKE2B 4df208eaffd4d1d483b03727cff684cbbe896cbca27cd0b31e39232cd502b0a7c02063400a10133fd0fccd363b48573a5ec4cb763a70cb9e5995a043ac1d4a5d SHA512 8625c881487aba8ebf242f12a28cd127788c7f02bafd8a087c15cd5e30e9bb9c05bcd94fdc27436d7949d9b5fa006804e9588f037f18a47c28702da13a474b16
+DIST firefox-94.0.2-is.xpi 463841 BLAKE2B 7eef44a0d439b434fd6eced9e538d0a4c280fa9aed2bfb126c3479eb8d831469f3233ec2fa6aff5ddd1eeb44213ddedc57b5f53d2b040a6da527d2806da9d722 SHA512 96b67b975d0e67840ac1e4c2bb5465e36af0473819993f0abbb458d5d7261d4ac05cf902670326a70b541f353562259e6309a780765cfe138de6e27feae8e43f
+DIST firefox-94.0.2-it.xpi 452233 BLAKE2B 044962343d5debe74ac7bb5cbeb56090bc14044d0cc471a6e7eb34345adfd8499f4306f426635a96799c16a544dff605e270563464d3defdd25b19211e63cd50 SHA512 1ed85ab4692e1e125815c3af771c6172854bd2c56f2ed2ac85ac4173b18a0d0a884475d0546e8f0fa8bf639c5b8a6218dcd30829e90c9ecf8ebbaebb1ee57d40
+DIST firefox-94.0.2-ja.xpi 578700 BLAKE2B 36932449855551a578a1a9c4bf33170812df4d5663f3256544745493b602eca35ca95be878cdae1a43734c1bb68893602ecabd8c48a5562174b5b8c712776ee1 SHA512 4cbd33c2a53bfbb6517eea5c58bfe1599ebff52db4395398dbecb6bd369925d4bec6e9f1a5cc07199d6b5154df96b29514ee04d9e2da015395380cb13442ac32
+DIST firefox-94.0.2-ka.xpi 577468 BLAKE2B 21258bbb0a60cab7d8c7d330e1a229448138dc103de9828efb6ba47237cf8ada8f48f75df57769dfcb20d64e5d61c77c1651c43a7cfab9a42cd630cf207b007a SHA512 efa08fb14fc31ace656b7a7bf81e6c8cb8ed1900ff927f30655d28243f3c982e1333bfd39ed11171c680c32f14729323b52bb4fd3b0b4c139fa18ebd32fa7613
+DIST firefox-94.0.2-kab.xpi 538086 BLAKE2B 186f84bb7e6167b87c0e9db92830384536d25d9d27fcaa5636fb963a4b047bff7192f7344c6bce67f6efe7c0e93f49eb3b651fc45c3d058e673d5393683bc25e SHA512 b0862bb0521fdc6ae2f01fefcad830dc544fcabdb0ae8601c5ba6bcceff466babe69fa2e79b5e459fa21ca3bd5ecc2bcff5369dfb7f83f597c787f96be876d0c
+DIST firefox-94.0.2-kk.xpi 597580 BLAKE2B 00db302742d9ed714b072b5ef06fb665fd253e753fad7f0191af1ecb1fe42430ac5feba2f471c5dcd89e4d1e2c4cb45c4e4a18e9ac1c2355221faa338af45f84 SHA512 2ce2467e43e62f1a312bed7f09dc561a5f23b76171915f47d964e470f914f391b15fb93948e0450849fe83f3497fc0544dd80364249bbec71e99ce7865a8989c
+DIST firefox-94.0.2-km.xpi 525523 BLAKE2B 983f37f782593dad90246954c7c9bf705611b98091e7c200503aab575afb9cc819651d25ccc3355faed0f2baa3cdfe01387de6ba9a38dd0eab3e9b9c613a799f SHA512 3de801e2dae88e9c9d7a0feba5197333d2f8ef664100597744eddaef7d62ce975d975fecc27a763140643eef1ae5059eb4ae3d6b440a7e43d697ae220f85506c
+DIST firefox-94.0.2-kn.xpi 490615 BLAKE2B 8f7bb52298e9ceec108e90de61c9eb2e8fe1f55b78e16f8a6d26226651802d0d1baf203c371a2527732ebbea9336dab1f7b9494205fa82f9f7bb6ea08ab53bf4 SHA512 bca36cb7bcfc64b08e8e8230a948aef698a523eb3613bd38ca9e9f4917ead6ad15709994e5015015712208403e03b6469f89bbf02b9f382fd121d2a933596ad2
+DIST firefox-94.0.2-ko.xpi 569651 BLAKE2B 87c2b70d08cd9d92aa3ae4b2f3904193fd7812f79be219f6615b7bfef282dc8bfaee89adb2d5e21a99e5afcd2a7ae4ced3826d7c94758ff5e809be1b854efb9e SHA512 ac1a43e5af677e95506122105ecbc38fd5c583e576a764f37b1db91e5100298d377e997fcbd71c502cd49aa62c0563934f7d1b9d07601f99a6cfd98d8f7b0b11
+DIST firefox-94.0.2-lij.xpi 464138 BLAKE2B b1568ba6af9e5635251bea307c0b2f28e7fdf48f89996e2d3e21d796e7cacecb6dcc018e77293afa9d1966774278ae1529005daf99288f6ccd4536cfba311b7a SHA512 722a9f800d955a9f38dbf876d219b2f0b83c90511502be723ae28cc1a4884a49786c7b2c0c672ee6b271b76e796bae4d6b2c12b5d8e0334be2cabd037279200c
+DIST firefox-94.0.2-lt.xpi 551591 BLAKE2B d035ec450f3c04e3aa7c74eb66c014c6fd1474912526a1ec5f259e0967e84406accdf8a2282530bd1fbc26895be6fb692b9bd6f2149154b447f06a44e6557198 SHA512 c08f442ca54213669b641fdb5b9f2379afc5caf8020fc6f78550e2c27fd8ac9e3fc80673fe2f3ac93b175e8aab591ca08bbc9dc53612b59749807a890feaff0d
+DIST firefox-94.0.2-lv.xpi 455940 BLAKE2B e7ffc5012327d99db8db74c51aa63c04b3bfd712b420184a7d70fa4aa10908626e7877d4afd626380730bbf4e5a7fc2730b50cbccccd7bb7c2786cc74b3c83ef SHA512 2aa638651be14b78d2c65945708473cd34996465b6f1800d250f42b7e6f2d43ee13046902327f8620298f6bdfa9814def88faddb75deb3c0e45c93ebc697601d
+DIST firefox-94.0.2-mk.xpi 457960 BLAKE2B e1515eca79db422388ee19f86231761274ad36c42eb0bc89cca1d6746e16c3338dfda02d892d75641605a2b2336372bee7a26477ca6903d01c3999afc13d78d5 SHA512 210c16a4664638c7e381c795361413dfd91a19c36ec59cf07d4edf71d0ce0433d43b2c31e9348d45b220309a0b2d5a4067750cba669a7a8a58f4007b6a83f013
+DIST firefox-94.0.2-mr.xpi 525235 BLAKE2B 526b979165480922b34e8b82a3a760591e86238cd9130d49a51ff56c276994d51dd9e3d347e756eacd255aa85cff5961a76658aec59278e3ddc0764adcb2115b SHA512 b84e19de492c187b4b152f0498248cce68e7cfd63bc9a284659156a24927f7719b2e85ddf1fc3218d7030141093e73c1d082eff6a57385428cff4351e8b5aa2c
+DIST firefox-94.0.2-ms.xpi 441057 BLAKE2B 8ac9392bbc8c504cd04e2a7c138874052de3b2b9343ff5d07b222b5465c45da7a54127a56e092bcea707d10acc04b25b617b6302f43dcf35965bbd17b7ecb46d SHA512 93d0d0ab0cc7d0d26a7cf0b31d9f163ea43b534ecb649b92f5ce6de74c0bd12c157466b8f3246d4e1c09ba5d98f9218366128f58d279e3450a69f5e54639222a
+DIST firefox-94.0.2-my.xpi 509497 BLAKE2B 2d060045a1a9fa7e44989c9c829bdae661d5c9d176ba9d25baf4827ed9935a7887aca420fab12a9976f0a29f8f198b25de7cc248810e9e8f791afb82e1ab56cc SHA512 63883498a51f5678e6d347fae82bf00ee340bb2c1b45869d1dc7ab1f4b61ade479e63cdcbd3d09f9ef332ab253374c77743a3b4d2e5be2f8e9404f20ef260ad9
+DIST firefox-94.0.2-nb-NO.xpi 521046 BLAKE2B 340855390db573b72b196a379614a3cfeab4313b6e60615047714b261c6af3eca2a3403d472deb7a3d6df0081a89f1f1dec8fcad04206fee298874a16dfd7fc6 SHA512 7dfd8390165d2e509e1affbdd25566d20a8e944f6a54fb8a1f48423c33708b85925e48c885a9890ff1855f7aeb82c765e588089c5ffaefe9a9ed17766bdf0a83
+DIST firefox-94.0.2-ne-NP.xpi 468907 BLAKE2B 2a0d563b692a5fbf3dd3a3133380c693a85da0b8c1235521b0ed8fe8dbd6aeb45e57356f3d0f63cbccb9e92f4d942320ae6d9cbc32f7081f42ad51c22444b123 SHA512 ef9f9bf8995d7f6183d97a7f639c4a5abab9c299223f31d6f82ef3f745df51934fcdab352e6b97fbf43b7000e630a3c6f2b30a533d893e84924f8e5fc680020c
+DIST firefox-94.0.2-nl.xpi 528560 BLAKE2B bdd594201a354d73f1caf73198ec4baddb8c9567478c04fbadf1426af2b4744cdef394cef98a43a8bc61d7a203998d753afe4b907f580802081db0227000f14f SHA512 301d4ce7a5ccda8ef5479266782b5948b5c0ab1b37a5f037eb09d6eda4065ab60523cc1f504446c0d5b37ea7c28ba6efa8be3439da8090bccc40a500f1642a31
+DIST firefox-94.0.2-nn-NO.xpi 522400 BLAKE2B ebc3667ab6391f81e93479b4911b06bf79f0ea8ab57ff28e17c7a3c4d549518dd7c292646cc3ed92e60faec34360328f3bc572af32e4d7f43c1288681b2c7240 SHA512 ddaf7a087d023a5e5bd2732f2d47ba022ea141dc48245762ea85374aee5f32234f54be2e95b7d8c9de860320fc4eef9df77bd2b17caf5a74e3e32af0250e6cb2
+DIST firefox-94.0.2-oc.xpi 544144 BLAKE2B bf087b4cacfd9e1baa757450232bf262f72a5834657e10f04dc7352f2d7aa8b43aaf437ce043239677f36242f8eec4ff1f1090f944aab5b5eef20b181aae4fd3 SHA512 5400ed47a38fd5796e36376426f4ffb8b06e9926a3f78b8d36bd2ab549aaea89b441b586453d366d3d403e38f2b408cfce2c35f50585104fc8c2878b1a90bee7
+DIST firefox-94.0.2-pa-IN.xpi 584317 BLAKE2B 5c159d54d4bd428a67970e4a9048f60fef1041e428b61ee44240d4598adb8dc13778839606c5fb650c771cf0df35c4a28e670b2d4d6dcd714cfef6c914ffe121 SHA512 a84a38b34d2a51c108290f422eb43b47d3939d7417070b92b907599e5c7d6dfe1427004c843857047df8cba1ef9cf47faec8e549daded7d0d9a3beefd0938aa8
+DIST firefox-94.0.2-pl.xpi 547911 BLAKE2B 8b9f80bdf28617bb0919e7fbcd2095f64d71f68348309cc55eb61d6a45edbe1c3d78c67591010fa8530928b940dcd7caae9e9c831b4eb6281726fe777ed005e0 SHA512 4d80368133d654733fda11b9f63a27df9a30b2b2e57b9cb67b21be18b6927b420e014913f56f16c64d4ea183f3db9da17ae5caa83ec5641fba65e163aa69a4ef
+DIST firefox-94.0.2-pt-BR.xpi 533801 BLAKE2B df1dd50dd2b55f4fd5cf8daaee03970b82665549aa9e104dc38a9cd74335daa04247ce47c52cd3af4be755a00d3a1a30f4ee85a617347d05d89dc8dff293e087 SHA512 f710bdb17ded7aee9e6da4f1f4a9b363f95c7666b9e79ebf1f405877582bc87f57032d4e0d92b1477d9cc0912f762244de797ebfef04c80d1a0b23c9a91b8819
+DIST firefox-94.0.2-pt-PT.xpi 537467 BLAKE2B 510c74c6f82d9ba2b277ba0b5b11ef783c61fda7fe76bee15e2fda49610f7af34526f3e8b67989e32807f3831d505b3fca7f6c2b93f8c728df4b3d2332c93b27 SHA512 84f59904beddbb13ad02b7520f6b61d4b36e8dec52c62ec905d12cb96b36ad5da3572b0160eb5d2ee3461f9ecd1fc9d924c80692c0d18b08b055c4ac5a80d0bd
+DIST firefox-94.0.2-rm.xpi 528343 BLAKE2B d9bbcdd68e4b8d8b6fd67bb0f2ea2c59bdb0cd4afd167da16cd17e91182067df3fa45e752854e60b7c58a580f0a242b2a87afa37528afc8449d24a7491cb4d9e SHA512 64fc17c5a788e4273a6eb0d09d20a1be71944857e4791dfef7bffee9b8a63d3ff0364ad6f6c23c3357e299db36947fba584f076adf15c387dfd3e612ea9a9c97
+DIST firefox-94.0.2-ro.xpi 523149 BLAKE2B b495a55c7d19016d075eaf867e0415f2d817fc382f9d4f8fa3d75c0fb70a1d6080455b75241a56939453257304396b86d0376d0458cc8c189f519bdb948bc459 SHA512 5662a7ba11cf1d6648550d7d6fa2ab30bff9b0262372356394c2e014cfb442968cbf679b9debdd45939a2a549b99be08bddd80011aa4db9ab914ea7b09824de4
+DIST firefox-94.0.2-ru.xpi 616898 BLAKE2B fe7d409353fc84436b4106c767c00323cbb26cdab9c931e44a5a0ee90605258e3b599aba863eb685e0bde852f46bf10e6dd18b4510817a9cab984a2df075ca96 SHA512 d886a5815b686a95e37a35408af6694dc9566c13731424517e9b78033f1ea8d818b31edb406872e467b09160f430c3c1c42f96a634ff23d05434d26c35adc053
+DIST firefox-94.0.2-sco.xpi 499431 BLAKE2B d0e9373beb7951ea8a69da54d19b5386c651555db0d5922260334ee0459555fecf94e86440ad9fc81d7dc13250f288c16d8e9146c631813a6287df510ff9bdd1 SHA512 1cbea6de062b8307602a4ab1867ff4ecf4676da5487f069b7750548b3a3093d9da3b43c1b8e265f5e62f4ce87bcadaf39af7cc10a46b1319b48cfc4d97511a77
+DIST firefox-94.0.2-si.xpi 480775 BLAKE2B b71e3d687fcdf17e66ebbb743023f68e91aa4d05a097eb20a9dc813c1ebd600886cd48bf125214df5879e988c0a2b004debc25396825b5d3ae3bdc3cbca1c8ac SHA512 adb1c1ea6c103fb130b8ea2bfa47fcc80a90ebb0c55ce024800dfa9c7cd52d12729293188598148590eddc26f4c993721482b0a8e1f80c421f649cfe77138323
+DIST firefox-94.0.2-sk.xpi 557124 BLAKE2B b30d60616a110183caffc134c9c023971cbe7880948af9b622a021f2ec1c6d0936ae0e5b8598420da564917797701fe3a3d853a930c970aa44cf29b1dff6309f SHA512 60b6dc0bfd9c84ca47918b5da5d4d01c3fc3934aea36202a3436efc0bfb432a7ad39b5da582bdb9db79c2db8c437a0213cce5075ce52ace135285d3b4a52036e
+DIST firefox-94.0.2-sl.xpi 526081 BLAKE2B 6b521955468b1ac1bc5eaafe5a82633160f817d742fd339fe5c4a9d57bfc283123b5b38ac6123c5e20e80ab70e07818a5cb3b788a21d1bd7fa46e4e05f7026d8 SHA512 a1906178bf30c1b95c684a9fc6f20fa698f46b71e9ce41b42d442f7a892051821a8782081de25771b33fc97a3003c2ee646e452beef15a30fee9e39819ac983a
+DIST firefox-94.0.2-son.xpi 417660 BLAKE2B a2097cc3c284ad1fd6ed76aa14a1503cfec2d8b788453ee2f749ab789fc5a02e3a0bab14048fc88738092a1a8146563c67d8b1919e49cbf99caf31fbefc5d95e SHA512 1576da7385def23b5bfa5f79ba577ed76075554eee35bac6e2803a63568bce79f5974b16ac5444927cde8fd94254d607255d6857de5eed218d51a170a78b6a5d
+DIST firefox-94.0.2-sq.xpi 541136 BLAKE2B 153c9ecb4e3766cfa8be1677d090f5d80a7158b42c93ace2a5b67b9d1c709f1dc9db21dc6d81d2871ffecaac3662d156d59a91e52786f808693bc4ddba11fb6b SHA512 2313bd6a14a6a97a64716f43c239419bf6d03359fc691dd64be2cbba3f8b93968ba48742657b06cbc792787df74821dde035620c0df5569ea86cd034c5cc2b88
+DIST firefox-94.0.2-sr.xpi 578413 BLAKE2B 0dde7c2c41b6a6d0ed34cfc628600e53df01c055694c313d792fc0faecfbd96e555a26ff2bcb063f60614416571c36124b761065cd131c268e8d03b75df053e4 SHA512 d179f74587705bdada49fcef9296b66df7f3f3cd7366aef77c314401765e65781412f7af006f815fcc0151ff87edb5262023035873e9c471fe4435cb0498af8b
+DIST firefox-94.0.2-sv-SE.xpi 531347 BLAKE2B 9994b72b10495e4fc1156a8855480144ba292c003a44694cdf03b74b9e9bda25ecf9b21dfe35ff204096df40e8d914a3d781f4c3c679e87314c71f057174f517 SHA512 f0123ec3a0504ae87a4ee312e599f98c24de686cbe2742e379b3cd4aba9303e8b7e84f07fa85d345431737e4a38bdc0db6637c15511908ea1d56885f3c858cf3
+DIST firefox-94.0.2-szl.xpi 504098 BLAKE2B 03a9df24e076d4d7ef31aa07a7ee73b49051f25f0ab0158437d199c7c66f2eafdeeb32973f686e039660996e694b0f3a4acfe111f32ea6da2edfb21c5f219bf3 SHA512 dd0dbf93dd64f6eac19c4ba46bb71bec8e8ccbb4631c1efcf9f306c36326c04c88e3a63a687481394b6ddd62d9d7a08d764d7c250b3a39dfd71cd5f250c0902d
+DIST firefox-94.0.2-ta.xpi 504998 BLAKE2B a36fced51d868c0c6be302a108a07f6dfbdc6e1384a9465c65f05019fa324748d2ae97e5fbff09127fc3a8f0dbe37d18198fac3a67233a76af603bb036cc2321 SHA512 584784ee4da4407fa868e7348ebd073d70c6695e4c2ce61cf3a2bb15d6997e127ede25f7aed9db6b3134636ce67efbc4248103484a70846451511b0249097a8b
+DIST firefox-94.0.2-te.xpi 543391 BLAKE2B 39011734116e0a010c3e93a3930abacabec508c93571d0a987f8eff2d8449c8f441dfd72d5a47dcbff33fec742980b7808d6ee477e471f63905ad0fd3612bec5 SHA512 dc43b3adc63b5f00e55049de01bafd83a5b0bb653ea78fd243e4abc6177d2d9cef33db442e6e130205adab500578b78e6c21244adeecf3a8ac51643ebcc37eb8
+DIST firefox-94.0.2-th.xpi 593110 BLAKE2B 9c7ff0577261e5cce787bbf12a6bd19462044c0e3417283785adea30ead7c0ac15fb628a6f235e0d327ce51068365ba9a717059d2007b8dce3f3d04456f9574e SHA512 21bc17c9b3e400f60c441c1001a4426b4fa23dc1fa7bf7ccc6bf1c2517263853e29ade67bd74e91aff31d80236209a20013178ff3cf24a8635f588c674ca77d8
+DIST firefox-94.0.2-tl.xpi 509890 BLAKE2B cb035ec0c874830603d12cb7622e0a5cc5d2d400b5f53d68807880bd0f4eaee05417a5b3f9a75e3cfceec7b6185069caf2b8ae03b8fd35fc7e0d82c159e7a0df SHA512 200b5a1fc32677dc919ede7fd287fb0ed225303e77a997d05be28f0266f4fc2c4833537b389bf6d2441bb223d69a78395dfe43d0cf88619867f7cc7bcbfe59ca
+DIST firefox-94.0.2-tr.xpi 543539 BLAKE2B b3b6b6b13954b793917c845dcac0de3a5148c70b0738f46102e9628b7db1b45df2cc81000dcf76e851e1adef26185c8ee5bda9e3fc0d754a489f47c9bdf10276 SHA512 2aa55b25a5940a9950a6dea32204d18871e2d9564eca77c5bda1ad3455dcc79aba9425fa40bb00bf661e632d5ff06c43c5e0529109e8efe436c7f5183809b9a4
+DIST firefox-94.0.2-trs.xpi 484342 BLAKE2B f3e416dcaeffe33c1f711f6944ce535d18853a194e767dffd2861a381dfbd7b74b4142246b65d0c3e59b7fa41080b0e4b6dcae2da65a081e955f3aa77047bff9 SHA512 970138125e8dec4195e6841d75e0ff1d09e11bf45d1599c13986fc31723c40ce8cbf9f245412d2d344dd0fd236506169a1fc42648c8b7a02eba3a00d25230ee0
+DIST firefox-94.0.2-uk.xpi 610393 BLAKE2B a7c985ccc07fcfc1ae1ed2d3cd10a3aee5b7685b72deffcd3d3c4772028aa2bb3ed4497afaddce1c5cc8840cdc3ba51546f94ad5b16fc9d209a20945bb1bd9fd SHA512 e7c9a2d71d405a8eda6d42e5953dd1d3f8ee7eed18183a350ca7f69c1abcfd6c27753e4bb73f8daabab2db96b75c08466de0edf470d1c37c4e21c306b1c1c01f
+DIST firefox-94.0.2-ur.xpi 549894 BLAKE2B cb59be47ed60201051d0b0505b9d2d36a4debfe41b06f91c63a7f398074563074d92c2a036321a79b772861ef8a98e00fee5b9b073f92eb941f8d384cd5cc482 SHA512 47f839cc20daf86f21e279d29e937fcf0b374ee85ce4be7bc848453c32342bd1e089bc27bb9ea0f6abaace25f0e589681c4d657e92f99c45dd4aeaafc64108dc
+DIST firefox-94.0.2-uz.xpi 460712 BLAKE2B 84639e54b1950433806c9f76b09d06c5e40180093905639d43fdbacaa6bd93c9994564304392732bfe7b29b2f5497453b1dc80f9079532f6337430833c2de29b SHA512 9239047d441655b1e0884da8a16d5aea415ffe2600e7ece7661850c61328439f04f738431e52a7f853842b7808eaeabb63033cdaca2997e1d34c9bcd52b2ee2b
+DIST firefox-94.0.2-vi.xpi 564620 BLAKE2B 19dd083641d232cb399e4f8024fe1e5a01a0bbbaed6ce10a87c71d3d9af553effde221235fbf9d4fc6ddfdbb2e3fe7547d24d651f1a736ad4339558604610284 SHA512 df2511ca3e0a562f5d9a7ad29df08e47372aaf63f7bf11d850e8c5eff18f9534fc112007b1da71e0493262404c3865ed1bf40d004ed78d9e001bd5cb5a4cc210
+DIST firefox-94.0.2-xh.xpi 421170 BLAKE2B 76ad46bddd3283e395aa06b740d65a8b8c2ab70d424e9ea39a4ada42006f2a3234d92fa6092a720261ea391a5a595d01d3e0122fc209d8431d434706eae90658 SHA512 e286288b09c60f6d0f2ec166cd64149441891ae8332e15f22d571b78d2b92f7d01aeb06de93f5072f8198151378298636216114ae23948bb0fb9d560d4eba73a
+DIST firefox-94.0.2-zh-CN.xpi 566220 BLAKE2B c011e86a071303e3f8957ff62a0ea9f6bfaa93b8b328f2e506af83bf0008e990e92cb275488b6767af5dbbec40986c7f7c8c63d1f50c25cd13710d900ef58e1a SHA512 5d67af7ebfb197a112e40985eb9fc49f98885137314c40eed8e7fc136b5d7e97b5a3afc81bc33a5a8eaf1d27cc9a31a32a1eade2d8672abd3765bcc86fce2c23
+DIST firefox-94.0.2-zh-TW.xpi 566884 BLAKE2B 315ff12d2acb993161bca86c3bb3fe69e0f9f90e37d67c0f3c79bcc463b4d1c7da10b70fde8067f85717d2d0435c23f46f5170625c63f06798fb7058f503f001 SHA512 ddfb47be87c55d1707c890004c066f57dd4adedb5b0ca8675854f9c18491d3f765cf1a5264253639c256ec1306329b7e63e15de07aa4559ecf9c680e297ba8cf
+DIST firefox-94.0.2.source.tar.xz 382896780 BLAKE2B fb10a7506399b410eb6147b2b0e93f1933b4420cf70b1c9e56210484de5930ddbcdc17e34abbb61734fae7a723a4032d250f872a684096c98f9c432a80b21273 SHA512 00ce4f6be711e1f309828e030163e61bbd9fe3364a8e852e644177c93832078877dea1a516719b106a52c0d8462193ed52c1d3cc7ae34ea021eb1dd0f5b685e2
 EBUILD firefox-78.15.0.ebuild 34443 BLAKE2B 568b5626c717137be77371545016e0bfbe22e0b362eb3a6d8654f838c323b48e1f62581f7e90d6d40ae2bdbe13826acefd52c7d426587f8fb1f9b7070fb105bf SHA512 9e8cf9e5f4977dfe4cb0dfeb2a82e481b87a7a6bf3b1ef250966a3c07dee6e43dc44fade1b45e46af8e2eadf6758ed2170214529823654ac83030d14de7d63f9
 EBUILD firefox-91.3.0.ebuild 35240 BLAKE2B 65d11a9187dd728b473dc49a72161c387ff9679596b0877a93da4fcd740b624510d06f48d00b817ada0c35af42d6015f0999848d6509bb6de9c5b8f4e081222e SHA512 bd8a14b93933b49a114fe5ca94c793a704cce19daedcd2a2ffa30057d12fb180d491973c8d3a007d7e7b81a0348f041c5ac04d660af2f5dc2a33f2799dbe4f89
 EBUILD firefox-93.0.ebuild 33813 BLAKE2B ef1d5db89c7e39ff7313f922c5a77007553ee3dccc6f4585e3ac9d23f6ea5be7abec9da0464ff2b45ee9a076e3edbbd59a7c5428a0f9b6968f7eb9da1f4e1f79 SHA512 6d1177807e810d75fee3de1bdf3e6c9dcbfb0a66f5fbef1415644707946e6bba292eecb4201ec9d51f3de74e8fd8b30e129902bf7785ac0f3c567fe5946aca78
 EBUILD firefox-94.0.1-r1.ebuild 35237 BLAKE2B 532a23406e19dbaebb68a4ceb7a3f3997bdf798953f807c4c4d7eb94959fd77b29f698dc6e3e0fab34fcc5e9115096c3d51eb653fa3ac9cc577bfdadf392a6ae SHA512 5d7d1bb92df66be935c922ea5419c1385d3efe562661806d83bb87a90052c23455892c9c1fdf6acc44ca7cc030b52b7716513baa1eb62a2261a01a5cd8d3d316
+EBUILD firefox-94.0.2.ebuild 35237 BLAKE2B 532a23406e19dbaebb68a4ceb7a3f3997bdf798953f807c4c4d7eb94959fd77b29f698dc6e3e0fab34fcc5e9115096c3d51eb653fa3ac9cc577bfdadf392a6ae SHA512 5d7d1bb92df66be935c922ea5419c1385d3efe562661806d83bb87a90052c23455892c9c1fdf6acc44ca7cc030b52b7716513baa1eb62a2261a01a5cd8d3d316
 MISC metadata.xml 2151 BLAKE2B 0dd5df0e78dee99abb7d7fc5a384126ac9920f8f39e886932c894328ab4c235aabf0e7fe401c6859973bb8c55f29bb64ec8cc571b58aa427325cd4b98a89fbf4 SHA512 14e367bb16402e3c3efbed5ed6cf2acd776fd725f4f29f5cbf20f4351ddbb59c89103b9d051fb56912bea461f994fe47741afb6da3b072710eaead0004da2c58
diff --git a/www-client/firefox/firefox-94.0.2.ebuild b/www-client/firefox/firefox-94.0.2.ebuild
new file mode 100644
index 000000000000..eb7a24217862
--- /dev/null
+++ b/www-client/firefox/firefox-94.0.2.ebuild
@@ -0,0 +1,1237 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-94-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp"
+IUSE+=" wayland wifi"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver"
+IUSE+=" +gmp-autoupdate"
+IUSE+=" screencast"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	wifi? ( dbus )"
+
+# Firefox-only REQUIRED_USE flags
+REQUIRED_USE+=" screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.19.0
+	>=net-libs/nodejs-10.23.1
+	virtual/pkgconfig
+	>=virtual/rust-1.51.0
+	|| (
+		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=dev-libs/nss-3.71
+	>=dev-libs/nspr-4.32
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.8.1:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	x11-libs/libICE
+	x11-libs/libSM
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+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 clang ; then
+		if ! 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
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
+			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
+			# bug 792705
+			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
+			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_normandy_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index a01750804c38..4a343066d4c0 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_96.0.4664.35-1_amd64.deb 90046108 BLAKE2B 7ce05400574757ca69ee6f219c1aff7b08a285a12f32b7dbd9f94689e3e9f94993e7584c351bb1784280149d18ef5aa185de01f7b947b287fce859c86d7d9950 SHA512 16e863166dd6d9927091c10c0c226b5035e6339ee060b8066eff4e01f36b2087e48e86397e2c5d7abcab5a9b0eadc1b50512f34194725c4fe01422ac758dcf37
-EBUILD google-chrome-beta-96.0.4664.35.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-beta_97.0.4692.36-1_amd64.deb 89896480 BLAKE2B 11798528e68917e0dc6967e1833c8cf4f5d587a1df6410fee21a74517e829f732c948aaef6e59c82fd7a259608fecf046edb44234c2f9b133542d7aa5f6abb7f SHA512 8dc638ed40dfe017c2790b2875c8ecef8990e2e358c34a0042e23cdeedcbca38104f2854730aacd50735d2c93b9509b95f996ef0b120324fe2744cf792870b50
+EBUILD google-chrome-beta-97.0.4692.36.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-96.0.4664.35.ebuild b/www-client/google-chrome-beta/google-chrome-beta-97.0.4692.36.ebuild
index 56dba81cca90..56dba81cca90 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-96.0.4664.35.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-97.0.4692.36.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 95713b1074ce..efe3fe287b92 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_97.0.4692.8-1_amd64.deb 89896648 BLAKE2B 6c99bd93e4ade8757dfbebf7dc344977b20e829f984284b3a0ba1e0507f67678cefd32286e09e28b271b11a776254f66c6d11bc2fa296d6db6ae62b0f98450b0 SHA512 31839b22ddc3a327d8b3ae179bfca32aec198b2aaac3d4ecb3e1eae9c72f4f43ced64d5b42039806e7895fb427b876fc00132fe436a41a1663321003ca9c9c7d
-EBUILD google-chrome-unstable-97.0.4692.8.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-unstable_98.0.4736.0-1_amd64.deb 90041808 BLAKE2B 8e7c91c143afaa3fa09ae5ed5791bc094c4e8ff7353156b36edd1a6d82deac9955e912d035fa71da15dba9b058e8de5bfeada5a295abab58e9f8462160c51ee4 SHA512 3ddff494e846e5a258b51dc6c56e58f71d746adf7d546815319b3cd66edf9d890a7b51f2109b2c066a7cd80bd207920ce065a4df7a55652dd9990ea364b5d32a
+EBUILD google-chrome-unstable-98.0.4736.0.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-97.0.4692.8.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-98.0.4736.0.ebuild
index 56dba81cca90..56dba81cca90 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-97.0.4692.8.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-98.0.4736.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a7f6b600177e..92a6e790a71b 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_95.0.4638.69-1_amd64.deb 89732980 BLAKE2B 1925f2cf148c5f765a0d5cd07f47fc75cd8c0cab550ece89c1d8e4361ef53c4bdaefce130a35e515da958714e4180d2f2774c16dbdeddb47ec0e7c4c6065ac56 SHA512 f07d16ec0a41120c40064d030e9e5240ed740b9b24c50eaede7b9bfd9a9678821c0252b40bfcd57e933a708b08d761482c3be5b3006eee605c41f5dc9e21f456
-EBUILD google-chrome-95.0.4638.69.ebuild 2714 BLAKE2B 54985b86452ee0b69c945df00de9492cd2f43166a785cfca1af85c39310187fa9cda80e6b46567cfdd45a8ee07af7e7ca187580658f6562e5aba6dcb590d2d8d SHA512 078f1e13c7b5155fcb7e7bef73c28e4e6ffa3115fc342b2387da25179b25d461e8df453664cfd7096e12f629d902809ccb012d4d20a96664b4bd8d6823d66ca0
+DIST google-chrome-stable_96.0.4664.45-1_amd64.deb 90769636 BLAKE2B 4231d97c052f4280e8d86e65b6be4ea65b2a461131145aa4f890af5a09ab4cf338292af53b9873e8b6e281445ba068e8dd9500ea03899cf658e5d86b66b96e7e SHA512 98433b003d43627e221faad212cba3df42d7f3d6e31894b1e14a9058069cbcd2bd3c83b3c59ecc1733dab11e36b181fa1d89e33b841a21fd53a8e82bbddc39aa
+EBUILD google-chrome-96.0.4664.45.ebuild 2714 BLAKE2B 54985b86452ee0b69c945df00de9492cd2f43166a785cfca1af85c39310187fa9cda80e6b46567cfdd45a8ee07af7e7ca187580658f6562e5aba6dcb590d2d8d SHA512 078f1e13c7b5155fcb7e7bef73c28e4e6ffa3115fc342b2387da25179b25d461e8df453664cfd7096e12f629d902809ccb012d4d20a96664b4bd8d6823d66ca0
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-95.0.4638.69.ebuild b/www-client/google-chrome/google-chrome-96.0.4664.45.ebuild
index dbce15cdcf9c..dbce15cdcf9c 100644
--- a/www-client/google-chrome/google-chrome-95.0.4638.69.ebuild
+++ b/www-client/google-chrome/google-chrome-96.0.4664.45.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 3283bdae87e2..a0c3b333c664 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -2,4 +2,5 @@ DIST links-2.24.tar.bz2 6470666 BLAKE2B f6ae42f64283e250afc2041efbb1d8680ef860ea
 DIST links-2.25.tar.bz2 6505187 BLAKE2B 3efe9d43b9a8dad498101800ccdefd094a6371a2c74b264aaaaac2abf951db38729abcf00f74a45fdb7f0d24196413996aa02cd9d2ea3ee2cf008faf4062e365 SHA512 b094e3b2096b07da8385d6021e5a5794f5b602c90ec824c48b897e6b69def6d69cb879af3008a4af43effaa7d9359bf09e4feb8ed5371bb7ff22ffcb0794f690
 EBUILD links-2.24.ebuild 3396 BLAKE2B ff1a0b878fd0409224e7e22a4d1570ba5451cb47dde0083255ca9e44694d5a41d1617a1e90c2620b7bdfdb94f9cbd2d0e36d06cb8188350b1b30f98b42a36e46 SHA512 54573e64fd2ff9200ce650083ca2411b03525e0c7eed84034316cf4b050e536f4d92ef3e0905baeeabfb5b70ba4fc8f21fa6de9a5b5a01a2401a237fdc937227
 EBUILD links-2.25-r1.ebuild 3421 BLAKE2B a1de9e0b5a23f63a8537267f2ec93e5e6f3e4c8b39e5773e2252b8dd5070402cd08610deb2a6b9b4780d4443d6bc95df4fc19936cfa5ef297fc3c27b4d87f583 SHA512 f4f5c21a55d0624566a9110c2f6d88f0c9f29cb4bdcb36c730c5e8962120234eead192eb5ebc535d093064ffa318f173500e360e1ffdfa6bcbfec68d4b96440b
+EBUILD links-2.25-r3.ebuild 3460 BLAKE2B f49357d2fa5ee9b0f715032a2bea9590e8d17bad41dc7ee80b1f1efecd1f34b2647a590069ca5f69beb8685db0553054086c6fde46de5a14917f31d9064c6069 SHA512 41f056b627fc699583e8a3c454e6fac07c1c08a7583a5ee74c87f21f0d2595f7c03395aa0b37f207a48d38c758769907a213fa38714a2ff7c318f98f8cfd1b0a
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.25-r3.ebuild b/www-client/links/links-2.25-r3.ebuild
new file mode 100644
index 000000000000..fc77b3771d61
--- /dev/null
+++ b/www-client/links/links-2.25-r3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	dev-libs/libbsd
+	brotli? (
+		app-arch/brotli
+	)
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzip? (
+		app-arch/lzip
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)
+	zstd? (
+		app-arch/zstd
+	)"
+
+DEPEND="${RDEPEND}
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+BDEPEND="virtual/pkgconfig"
+
+IDEPEND="X? ( dev-util/desktop-file-utils )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	use X && xdg_environment_reset
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+
+	default
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	tc-export PKG_CONFIG
+
+	econf \
+		--without-directfb \
+		--without-librsvg \
+		$(use_with brotli) \
+		$(use_with bzip2) \
+		$(use_with fbcon fb) \
+		$(use_with freetype) \
+		$(use_with ipv6) \
+		$(use_with jpeg libjpeg) \
+		$(use_with libevent) \
+		$(use_with lzip) \
+		$(use_with lzma) \
+		$(use_with ssl) \
+		$(use_with svga svgalib) \
+		$(use_with tiff libtiff) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 88aa4b515fce..be622c28abeb 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_95.0.1020.40-1_amd64.deb 115566968 BLAKE2B 74bfc80ffaf513706cb425d23ce34e7c787a959323d31ef4dfd8b73252de73aeca6ac3459a0787577b4d0209267076eb2fa5707e99f08745c9aa6dbc5f918d2d SHA512 2e7a8350ac5d9b60c09b290e86e28fc363a4e412c7b2c25a230d1a9240476b43effc3599e12e736e93d1cb37bcf0e21676c5fb94b5dd654516a88985a1c8fbed
-DIST microsoft-edge-beta_96.0.1054.13-1_amd64.deb 117872544 BLAKE2B e1432ac04026adbc44022b44e25d50dfabcbeb4aa797f9c8e91a5bf563466dfc1cff2b911e310dae7e4d2ae27d691d3e2e2d9d3e42a138356a0d0f782515c022 SHA512 940290b7901160094e2a557d8f12d48b1c4645e132038d3aca99c34dcdc9ac450173f951e9b68b396436ce4aa7105c5bf0d5d6b9ed3da5512a9cda99ab06680e
-DIST microsoft-edge-beta_96.0.1054.8-1_amd64.deb 117817116 BLAKE2B 4804e1e42fd6cd4244f4139640c1f5fbf88d926a2b32c05fba5933cc09b8a61860c4e1a1dce2725f8766cab65ff39c74f65c9b633ced3f1583b202020547c7ba SHA512 e367aefad8f0828ac05000ad7e53f2edb1bb48a3b5bcd840fd870f78cc776b046e5f54f756b11f8aab82a9a4a4ddfe15c5a36011da4d5e33afb441368bac0b9b
-EBUILD microsoft-edge-beta-95.0.1020.40.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
-EBUILD microsoft-edge-beta-96.0.1054.13.ebuild 2362 BLAKE2B 5ce274a4e4cac50f237072a6cc3b54cc47a79e336ff70a7aa92697e24646c37affe68171f6d163766be415a41bb0c160ec8f6ff53441a024c0e99582d2f8cd0d SHA512 0fd3bfb22627908068e26c36226b2c8927999f7be968c5b069c4bab6a52bfb25a601ffd144b2f1c912af72760a9ac6b4258a9aa581511ae017ce86d1bf74d377
-EBUILD microsoft-edge-beta-96.0.1054.8.ebuild 2362 BLAKE2B 5ce274a4e4cac50f237072a6cc3b54cc47a79e336ff70a7aa92697e24646c37affe68171f6d163766be415a41bb0c160ec8f6ff53441a024c0e99582d2f8cd0d SHA512 0fd3bfb22627908068e26c36226b2c8927999f7be968c5b069c4bab6a52bfb25a601ffd144b2f1c912af72760a9ac6b4258a9aa581511ae017ce86d1bf74d377
+DIST microsoft-edge-beta_96.0.1054.26-1_amd64.deb 117601228 BLAKE2B 60ac6662f0e63eec7e86bb80adf82462133dd54cc1475b8c44731dd90da0e31d1dea432f394c1c9e0e551d81725c8775a616e763184167990693d8441b22cd35 SHA512 8e189e8d09e4931707af0532dd881858189e368928f505e967056780dc4424c69884af527ee3b0a1204eede4516409a8439993d2986b445c5a6c7264243fc550
+DIST microsoft-edge-beta_96.0.1054.34-1_amd64.deb 118492004 BLAKE2B 02532e92822faeceb019165f8e1ae646906ad90f83d977e18403a02364fd23b5c68b91dd52bac447200d3711ad5826bbfbf157ce9a9b0f8f54c3bdbd926b1fa5 SHA512 1948f9fbd612be631963884cbd4c1e4d9afd3e03567ffff643a735c626f497bfa0e84eb98b4eb07a7a26fd77e7163726eeb81750fae754fc2d3c067d834e62b3
+DIST microsoft-edge-beta_97.0.1072.21-1_amd64.deb 118885720 BLAKE2B aa177174198661b901523f2b37a771e46812ff272e88ce158c3097564ac9d397166fd9233f270f27d7860aa8fdc95d5a03fc0c9b38bff40ae44672dc2fd1246a SHA512 8a5e18216e3c77800e31e8c7df5efb2df25aa39fde04d5e71973f08f7cac2bc58b7996761ade580a64320aacd8fcafccf3cc277015c9b2090539bdd9fbe947dd
+EBUILD microsoft-edge-beta-96.0.1054.26.ebuild 2362 BLAKE2B 5ce274a4e4cac50f237072a6cc3b54cc47a79e336ff70a7aa92697e24646c37affe68171f6d163766be415a41bb0c160ec8f6ff53441a024c0e99582d2f8cd0d SHA512 0fd3bfb22627908068e26c36226b2c8927999f7be968c5b069c4bab6a52bfb25a601ffd144b2f1c912af72760a9ac6b4258a9aa581511ae017ce86d1bf74d377
+EBUILD microsoft-edge-beta-96.0.1054.34.ebuild 2362 BLAKE2B 5ce274a4e4cac50f237072a6cc3b54cc47a79e336ff70a7aa92697e24646c37affe68171f6d163766be415a41bb0c160ec8f6ff53441a024c0e99582d2f8cd0d SHA512 0fd3bfb22627908068e26c36226b2c8927999f7be968c5b069c4bab6a52bfb25a601ffd144b2f1c912af72760a9ac6b4258a9aa581511ae017ce86d1bf74d377
+EBUILD microsoft-edge-beta-97.0.1072.21.ebuild 2362 BLAKE2B 5ce274a4e4cac50f237072a6cc3b54cc47a79e336ff70a7aa92697e24646c37affe68171f6d163766be415a41bb0c160ec8f6ff53441a024c0e99582d2f8cd0d SHA512 0fd3bfb22627908068e26c36226b2c8927999f7be968c5b069c4bab6a52bfb25a601ffd144b2f1c912af72760a9ac6b4258a9aa581511ae017ce86d1bf74d377
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.13.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.26.ebuild
index 098697866ecf..098697866ecf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.13.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.26.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.8.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.34.ebuild
index 098697866ecf..098697866ecf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.8.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.34.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-97.0.1072.21.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-97.0.1072.21.ebuild
new file mode 100644
index 000000000000..098697866ecf
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-97.0.1072.21.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	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
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index e4dc03f9ae51..c819a1631d4c 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_96.0.1054.2-1_amd64.deb 117597140 BLAKE2B 2e65283a5716fad34cff7172d6bba67f6979580010a24a15bbf750f55b13265f23d871c82821166412578cea9c765a958e75b136204f60095c05948c09c02de9 SHA512 31f969b5a1ed6d373a2da09f7f72f26861eaef1925f13a7352f0b8027522913ea16ca62e410a19d9d1298a9bb2f23b3871befcc73602d71918de920f4d29cec0
-DIST microsoft-edge-dev_96.0.1054.5-1_amd64.deb 117928340 BLAKE2B d41051353e6f2592846c5599960072cb54fecf4f4de1ec3b45b0af83b9424207be331f8c90b4e7aa3d75ebcc69e2f4804b241995e571087eabf86b678b5de96b SHA512 a5a0b6ac64f743bc011b8d6ba076ff3460470ed2890e14d8904a7a0ce671ad299f6e1374b55bfee8d5baa85450362518094ac7c9c421d259a6d98394f9e92008
-DIST microsoft-edge-dev_97.0.1060.2-1_amd64.deb 119889424 BLAKE2B 398506f9dca0c2acfa1626901d01df2cff8f6e38fdddaaf0ed1fedb84982f89db6418fee7f22ed7ccfcfedf8d6cfdfe2269eba89877c8690e3ea22e7e42a8f8d SHA512 81f845d49cdd978b1c7dbe210c60291330972284ccee4c0740a20356c52ff25576d1d8215d56ab648c99c91be933ef7178d6f35021e98fbbfe521f8f61715bf6
-EBUILD microsoft-edge-dev-96.0.1054.2.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
-EBUILD microsoft-edge-dev-96.0.1054.5.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
-EBUILD microsoft-edge-dev-97.0.1060.2.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+DIST microsoft-edge-dev_97.0.1072.13-1_amd64.deb 118814040 BLAKE2B 2c98b330706f420825b585f8ebade1a001e34599770fbe4e96e0965807fb766834ef4d92385ba1ebe13a69a81b10119d6d2720c3082973aac592715a65006ef9 SHA512 a10d6905802654a29246020ddf2752aaecc05b9534a0afdc30811c09b935428b203fff933f8b89c378e00725a18749a7799045ae7d5db2755c819161aa6466c9
+DIST microsoft-edge-dev_97.0.1072.8-1_amd64.deb 119925324 BLAKE2B 318a2186138758545b406877c18d0f150fce29e7b4edc527635b1c3ee35f2e2948bbcd2014d5729ba2686b7e649b925a139a924a696abbe1bed5cc377676a004 SHA512 8ba8936ab0cba40335c0cbd19af524a8723fc5f8bec4d58e35c39780bbf765ef798d9b454291c25e02742d65f5ab17cb2d9354936aca3fd55d5d485de72b57d4
+DIST microsoft-edge-dev_98.0.1089.1-1_amd64.deb 117246128 BLAKE2B e2d7583b4a206dceb7430e4fa04235b59938b070f588a581d80db416df9c5ef521ccb0805204da652c7869aedd741b7b8b7b6277aaab87954958dc851fbc8a62 SHA512 605dcbffc88321be228fb8b15e3285bd2bb9168f111a5b7f136185043b8993764ae75bddb2d76863512b7ea8a98d1c3296182020239ee809c38575e9752e44a8
+EBUILD microsoft-edge-dev-97.0.1072.13.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-dev-97.0.1072.8.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-dev-98.0.1089.1.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1060.2.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1060.2.ebuild
deleted file mode 100644
index a14f69804a04..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1060.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	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
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.40.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1072.13.ebuild
index a14f69804a04..a14f69804a04 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.40.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1072.13.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1054.2.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1072.8.ebuild
index a14f69804a04..a14f69804a04 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1054.2.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-97.0.1072.8.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1054.5.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-98.0.1089.1.ebuild
index a14f69804a04..a14f69804a04 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1054.5.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-98.0.1089.1.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index ed9d55a220a8..b48fe61cedd5 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_95.0.1020.44-1_amd64.deb 115587992 BLAKE2B 94952d4f58bdbdbaa9dfcabb13bec0bea3d2cd6085836425d6b13bad38ffa71aa91c9b8b0b1f51b1de1393a59eb0dc871f554c398c4c5f2e58b3f081e582469b SHA512 1f0d5905b04ae28722b070a0fa565daef3c41fcda68b8c032da65e822c3fddbd52f617f3f99ab00b50ae37e383b95aac3595cf62e0b97ecb5c9a0b1b8f731fdd
-EBUILD microsoft-edge-95.0.1020.44.ebuild 2361 BLAKE2B b86db68d3a865a3d394816daabc2f0802516c652cf50d5dde4d977f9649cdabf31d49eb3b7c905461525984b20716ab6e435182efb517e1fd321aea08b6acc08 SHA512 8224d1e2dc96a970b265c0654e513f6fc79bb9c7d22a76f60d70fcfdb41116c6f0a2fd3633cfb3799657727202ab68c83c7c015c1eea7a7571b66d5304d47e23
+DIST microsoft-edge-stable_96.0.1054.41-1_amd64.deb 118508952 BLAKE2B 3b661b03676427b83d3bce59114a70f1bdd993bee617b31f667fedaaf668ac56fd3270c0c8e90af85b379bbe02028bcbd7c72f5297de122da43a15cb0b25ca65 SHA512 5ea58dc98561f6aa4cf1b0dfd45f35adfe4c4b3b9eea644b908e4889a18b0978177bf2ef054869435ed3f01b560dee7282c074d38209d1dca11d6a9985e52f4c
+EBUILD microsoft-edge-96.0.1054.41.ebuild 2361 BLAKE2B b86db68d3a865a3d394816daabc2f0802516c652cf50d5dde4d977f9649cdabf31d49eb3b7c905461525984b20716ab6e435182efb517e1fd321aea08b6acc08 SHA512 8224d1e2dc96a970b265c0654e513f6fc79bb9c7d22a76f60d70fcfdb41116c6f0a2fd3633cfb3799657727202ab68c83c7c015c1eea7a7571b66d5304d47e23
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge/microsoft-edge-95.0.1020.44.ebuild b/www-client/microsoft-edge/microsoft-edge-96.0.1054.41.ebuild
index e93899591b03..e93899591b03 100644
--- a/www-client/microsoft-edge/microsoft-edge-95.0.1020.44.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-96.0.1054.41.ebuild
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 5c57522f8ff5..3055dcc4d98a 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -2,5 +2,5 @@ AUX netsurf-3.10-disable-failing-tests.patch 1196 BLAKE2B 055f4663bfed7ebe291e92
 AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
-EBUILD netsurf-3.10-r4.ebuild 4579 BLAKE2B 606461fb35181d816e3fb48d063d34c8106b97fc0f83dc812c51b7320bf4b611e979ade7b08f6ddfaedde23cf07fd718d1cd81088cb808b2aff75af047dfccd6 SHA512 af90562d3a40256ff24a9fce465fb362b3d78a658d81a8bcd5c9078c9a76ef1091ee9ff9070b99f8c311468b4c53d41cbe53a152320667ab32de284fb91beb4c
+EBUILD netsurf-3.10-r4.ebuild 4584 BLAKE2B f6221c7f97bb83f5b6629895b90f3f494a44078734b491c30a76f638e5a21660f0f9676e302611eaad001468f0d2cb53564e5cab1cdfe56ba2c316ddade16816 SHA512 f0f4c3d72fbe5b19fefcf9682707f544a83dcc193f4c4b45fa5b5e87ef12170099437534f6b79ccd35f74d1b8af4b80886b5c33bc355c451e2fc180a6f4e737d
 MISC metadata.xml 1595 BLAKE2B 8cdb8d65b7cd691aed4dbfb6643b6a7b2ea94efbf1ab971eced0d5b1609173cd9737022fb393ad9864bd2fbeb9eca7236c621252699f406cabc04be51ad8e932 SHA512 9867340fc2118fb49061a19bb438e9c16e81f4e1b40ba88f0d5580b479a92977c7a8acd79c06f363753f4a710bcbdefe149055e55f2a46c89ffd45d83745616c
diff --git a/www-client/netsurf/netsurf-3.10-r4.ebuild b/www-client/netsurf/netsurf-3.10-r4.ebuild
index fe3c18375bc0..8fd37259da3c 100644
--- a/www-client/netsurf/netsurf-3.10-r4.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
 	+png +psl rosprite +svg +svgtiny +webp"
 
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 4b4782109331..b670be29c3aa 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,9 @@
-DIST opera-beta_81.0.4196.11_amd64.deb 79198584 BLAKE2B 8776d508c58e85a73ac8925c34a60b3f0c0f72a0de08bec311a946c1a112f7eb22f32351333f5b1eaeffc14f86705f9feebfa2814cad9bd3a74f847224d261dd SHA512 b9f70a2c4ae6789985e25506f344eabf36850c761777b7324deea3f54cc6d10ae198a5dbdeae9513e09352907f07308818337d840abe8219b0667dabc7192ff8
 DIST opera-beta_81.0.4196.14_amd64.deb 79296820 BLAKE2B 5cf8649a3ba84eef8bd76fb8b2cc41d4a66ab1dfb94a1a29a8ee40af3bb0fb891359c544d5d650f84afb7b509b0fa383651c30bdfb085a5c87f678755e4cb473 SHA512 ef087f23ac8e475dce4792100d856b7392b3eb70ddd53e7e88e6ede81003a76cc041c26d3d030d78e4bea1c7bf1e57734c8349a290ddce9357d00eb12b67d132
 DIST opera-beta_81.0.4196.27_amd64.deb 79303532 BLAKE2B a542d564c2ad13358b507d4f0ae15e2301750fff0f2ab1246f0152602aad10110c47bf963b674cf5367702fc3af4bf4309d74644fa787a04f5acb89245d271b6 SHA512 91067dea167d08f2730c802652dbbb7d4e4e600190ee2d464c2dced5db226a08ec0620516626f0495d3c1893fec4e89919aee7e1f26777d82e08100be0c5ca98
+DIST opera-beta_82.0.4227.7_amd64.deb 80081488 BLAKE2B dae523753048e7542b720debe687ae3a632a26d9117d936d821f2c3426a92a3ece00d0e763d0a1e94da097d41030fd51b0f4ebed487b7c4d9a38a0b6e6eb52ba SHA512 2a9cc3b626b77bd139fe40fabe226b6c0b76500d3325262fa77ace39f06444fe35762415ab8be64766876296dbaa55b54312d218be74d6555f28065ea7a35bde
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-beta-81.0.4196.11.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
+DIST opera-ffmpeg-codecs-96.0.4655.7.tar.xz 1394152 BLAKE2B a48c1f22b5e92e40d8d5f97f02505021824823796767c1725c821b171b3ff6bf281d0123bf0b7e336f4d81b84bbf9362c6489f30b7de7c2037238c53003d6e00 SHA512 7c6815936e9a027d278a893e90e30f28a3d011ec83723c6500bee7ba0dddc5c96ae3cd75d7e16f7bbd2f9ee635fb64bdba6c2ba1df32761a6215be6eb3d5ec5c
 EBUILD opera-beta-81.0.4196.14.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
 EBUILD opera-beta-81.0.4196.27.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
+EBUILD opera-beta-82.0.4227.7.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-82.0.4210.0.ebuild b/www-client/opera-beta/opera-beta-82.0.4227.7.ebuild
index d23934604a09..d23934604a09 100644
--- a/www-client/opera-developer/opera-developer-82.0.4210.0.ebuild
+++ b/www-client/opera-beta/opera-beta-82.0.4227.7.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index d8e9d32c692f..ff84e874cd37 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,8 @@
-DIST opera-developer_82.0.4210.0_amd64.deb 79202112 BLAKE2B a6d3c22dc46501eb0a92877cc511e73e0643e65d27dbda792939eabff44e63e375ee042ac56b77c046dd2dc846b8a053883e67b03de396ab3dee18b7db4dea72 SHA512 4487a3a38c1ba0a619c78f451555b7e288c74c37d7875fc84e9bd60342e851787798ce939b14d4b09dc60ad4e5e3e07a83d707d72d07bacba5b4324fa4d1b470
-DIST opera-developer_82.0.4218.0_amd64.deb 79737072 BLAKE2B acadac3319a03fbf951afe6fcd2d8b1d7de6f7f2ee85de8e32d4a2385b3229cdbe9e52c60cb559f4b91cf163869066aca77008965fb1378ac394b94a5df5d329 SHA512 29b9e3a19e92aaef465b7d7cd32c60bf93f38a3847de09399ad4df29d63db675168eadd4a6a95d30100995083ddc84deb1e8b149fe53d80e0fdf6f1a5ea47183
 DIST opera-developer_82.0.4226.0_amd64.deb 79669312 BLAKE2B 54459c0ba257c17b2be5bb39d506604c89e2dc4b6bd02d897d1db6f6d80d2a3b6920fb494e07de9631f404fda4133c61a1d4cd8cc3ee56940c2e9ea5e6882755 SHA512 d7d15429a3d3647a68d88c295e187cc928c07590d60afd99f95b9fda952832089145d33ac389846ac16e423069c20b8b4b22c5caee569a147d8fc73d70aaf018
+DIST opera-developer_83.0.4232.0_amd64.deb 79524816 BLAKE2B f65a0f75620ea8a8fee239b46f164f4421d39852ebfdad7483fcad2db1a255af225753501d0d25617ead75d88fdf438d10c7eb1b29219a515e985ac3f36d82d9 SHA512 8605c77d9ff0621dd5a9f98990c1047672572ed439a19166d44320073b41cc89243a4b76e4dc2c0fdb1a6d7350eb2b71a1bf10e10b0184c790e3838930814689
+DIST opera-developer_83.0.4246.0_amd64.deb 79606504 BLAKE2B 8e88643755b355f8f6b1c9981e0133c0e071ad3a40222b5507a06d67bac2b7325abd4341d593f2b3d226767067e186362d21cbe5052c989a3b6ed6d739907eff SHA512 0dd8a22a62148ce81737cbf0f5b862d2e9160d11deabc6fe67f56ec4a8c0bea10ef997e9c87ee92871941408e758bf06a35db21fdd87d7e71a62b5045c88d1b6
 DIST opera-ffmpeg-codecs-96.0.4655.7.tar.xz 1394152 BLAKE2B a48c1f22b5e92e40d8d5f97f02505021824823796767c1725c821b171b3ff6bf281d0123bf0b7e336f4d81b84bbf9362c6489f30b7de7c2037238c53003d6e00 SHA512 7c6815936e9a027d278a893e90e30f28a3d011ec83723c6500bee7ba0dddc5c96ae3cd75d7e16f7bbd2f9ee635fb64bdba6c2ba1df32761a6215be6eb3d5ec5c
-EBUILD opera-developer-82.0.4210.0.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
-EBUILD opera-developer-82.0.4218.0.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
 EBUILD opera-developer-82.0.4226.0.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
+EBUILD opera-developer-83.0.4232.0.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
+EBUILD opera-developer-83.0.4246.0.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-82.0.4218.0.ebuild b/www-client/opera-developer/opera-developer-83.0.4232.0.ebuild
index d23934604a09..d23934604a09 100644
--- a/www-client/opera-developer/opera-developer-82.0.4218.0.ebuild
+++ b/www-client/opera-developer/opera-developer-83.0.4232.0.ebuild
diff --git a/www-client/opera-beta/opera-beta-81.0.4196.11.ebuild b/www-client/opera-developer/opera-developer-83.0.4246.0.ebuild
index 0ca298be282f..d23934604a09 100644
--- a/www-client/opera-beta/opera-beta-81.0.4196.11.ebuild
+++ b/www-client/opera-developer/opera-developer-83.0.4246.0.ebuild
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="94.0.4603.0"
+FFMPEG_VERSION="96.0.4655.7"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index efa3985a33a7..6793af1cb963 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
-DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-DIST opera-stable_81.0.4196.31_amd64.deb 78772940 BLAKE2B 5fe97aff17f1f7944a44b60e724c041493aafc5d7e116f9b99bdb6c4210b780c2d0ce396da92189a4247a5fcd5d6906693a62f6eb5c9835e2917ca1e388a19a6 SHA512 27d12aa9bda3fec429a9baf4dd47d3fadaf4d4449c890bdffaa12d0a8a5ea1c64d0ffc3bdefcd069fc2701e79262706ecf1a9661fd319489d314926c5648ae61
-EBUILD opera-81.0.4196.31.ebuild 3574 BLAKE2B cfb936de9de46171a6393cbd95e83768741689b4238dd4fb512195a58261068236109bd97d68fe8c5d68dcae3db3306f138b8057252f8629b21fffaa58d0ecfd SHA512 b3502e92003ccc76e3c87741a40bae5cfdc4eb1db9e6a1a2c41b09acd3b8d31ca7f4123ed2944db2ee43adad874fca80343e9403bfb3a8a4b8b46e2bdfdb9ec3
+DIST opera-ffmpeg-codecs-96.0.4655.7.tar.xz 1394152 BLAKE2B a48c1f22b5e92e40d8d5f97f02505021824823796767c1725c821b171b3ff6bf281d0123bf0b7e336f4d81b84bbf9362c6489f30b7de7c2037238c53003d6e00 SHA512 7c6815936e9a027d278a893e90e30f28a3d011ec83723c6500bee7ba0dddc5c96ae3cd75d7e16f7bbd2f9ee635fb64bdba6c2ba1df32761a6215be6eb3d5ec5c
+DIST opera-stable_82.0.4227.23_amd64.deb 79661088 BLAKE2B fec8ecc340f0993db66166e85e9018c3556a77d1b811d26c63ed7cbe53c50d407d59552fa9ceedeaa0d9c077c99aa0cb0812435e78d74aa373e6f90c51d77224 SHA512 0ba81b10922e7ad9f78166b2641191b3544dd800f3f50fba51d37827e1cf65a2227892baa9e3226da0f1ef4608721cf3da131c11fc7b1ed1eda479df471d77c4
+EBUILD opera-82.0.4227.23.ebuild 3574 BLAKE2B 29fc66cdc461bc0d867677980aa35419c2059d6efde643ee23becc796ff9c65ae46fc17e0f52ae732b44465a33264886a35b8d5a4fcf8c017783c0274307fef0 SHA512 f7e59fb54d7a8d7e9cbcdc183c745063ec2a842ce76e5aef25c02b8dec7de2ed9db32a4b9c13cb787cb49b015d6570c25b5f667c5a270b9a42a7ef671a473673
 MISC metadata.xml 590 BLAKE2B ecac1c1d44dff5d3f266f7e0a4135c035c2cd0b08055d30b9103308a53eb046328a9917fccdaff3e9f7ab56e7eec906fe6cfa59efa0f223a237db7ca1a9a2eb9 SHA512 9764641862a12bb0f3c396826265595a900a1801f3fdda45337f4b89088f868a4a036290962d6be64f0509c7c6e69e072de2bfdd490fdb04401c99d64188c7eb
diff --git a/www-client/opera/opera-81.0.4196.31.ebuild b/www-client/opera/opera-82.0.4227.23.ebuild
index df7d5f99d4b7..a87a9324eaf8 100644
--- a/www-client/opera/opera-81.0.4196.31.ebuild
+++ b/www-client/opera/opera-82.0.4227.23.ebuild
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* amd64"
 
-FFMPEG_VERSION="94.0.4603.0"
+FFMPEG_VERSION="96.0.4655.7"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index b67b73f27cd4..d9067b0868d7 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,7 +1,4 @@
-AUX qutebrowser-2.3.1-pyyaml60.patch 682 BLAKE2B 572d1ffcb23fd1168b8e999300c4f2d7f8c59b1c8e47c3c91bfdbcfc37c1e2c909b608513070f2efde979db7f90e1548dab2f6156cd8f74d8a0c9e1cb32c3a3c SHA512 608103b77779855b636ca0dbc77b726650d6e571d0c44c7ef89d16228e19931ed0b8c6152487e30e59f36996883d7efe0957de5b28c9f8b5d7e4c5bc21ba2031
-DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
 DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B 9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84 SHA512 e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
-EBUILD qutebrowser-2.3.1-r2.ebuild 4400 BLAKE2B 22b8b11723af9a80a4c74361d083ad4f89b13cc641760fc3add41853af3d4f10d0015e1eac02a039f6f0f61be3beb2c235f72098205bd480960e16e4d0c67e09 SHA512 e67daa83137fdfcf59124077fe56426d5e48243025964a1770d2976a377aef00ff9d5be6736d01af1a9a04965d2527282692c34b22915cfd330bab6f85d9044d
-EBUILD qutebrowser-2.4.0.ebuild 4367 BLAKE2B 18786ec3e9af725a998ef19da97f25c4857f7d44c5e29c7ec2f261a71792f7c56a8abd9e3d97186b4af6a5edd28371001634b3dc2453196dc5017bfb234117db SHA512 2348a26f7cabf13715b6a55068aa6e543290857ae8d1370de6b69ebf3b7e60b67f78ddd9581aecf273b325fab9f24f2f262f0f8e6bfed77f42f9011b7fe614c2
-EBUILD qutebrowser-9999.ebuild 4367 BLAKE2B 18786ec3e9af725a998ef19da97f25c4857f7d44c5e29c7ec2f261a71792f7c56a8abd9e3d97186b4af6a5edd28371001634b3dc2453196dc5017bfb234117db SHA512 2348a26f7cabf13715b6a55068aa6e543290857ae8d1370de6b69ebf3b7e60b67f78ddd9581aecf273b325fab9f24f2f262f0f8e6bfed77f42f9011b7fe614c2
+EBUILD qutebrowser-2.4.0.ebuild 4370 BLAKE2B 9554c0148141525d54f4a2ca3a262f93a53fe6162174903b07f03d29e1e91788eddfe8c638f97c9855a0719291267b4fae9c3531f67873329e83907f8f1f0e68 SHA512 9bd7e90cd9869a3385e47d0b0bc594578300f9bffc7683bba318a07382dacf0103420aee5bcc72d504b3bfa3cb7c16f65ecc43901b4efe5dafaada153071e2d0
+EBUILD qutebrowser-9999.ebuild 4371 BLAKE2B b4176f1da5b6a7f83a58fd8acb46804c46057d87673473b25a55c74c32d61ec132d78bea4ccea9fa365205f2c09c251983dc2e7c6f79440d1071cfcfe24b9d2c SHA512 364b114d8b648f721ad33a34105d0d4d63782d347bfe4aaa5d0af4deb87e5441b05a0d074a94feba44b41194e48e5dae92b67ad0caaf8dd19ed2000f9723544e
 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
deleted file mode 100644
index d585109b9f2c..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/1547a48
-From: Florian Bruhin <me@the-compiler.org>
-Date: Thu, 14 Oct 2021 09:05:07 +0200
-Subject: [PATCH] tests: Adjust for PyYAML 6.0
---- a/tests/unit/utils/test_utils.py
-+++ b/tests/unit/utils/test_utils.py
-@@ -809,8 +809,11 @@ def test_load(self):
-         assert utils.yaml_load("[1, 2]") == [1, 2]
- 
-     def test_load_float_bug(self):
--        with pytest.raises(yaml.YAMLError):
-+        try:
-             utils.yaml_load("._")
-+        except yaml.YAMLError:
-+            # Either no exception or YAMLError, not ValueError
-+            pass
- 
-     def test_load_file(self, tmp_path):
-         tmpfile = tmp_path / 'foo.yml'
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
deleted file mode 100644
index 0b940abb3a02..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
-else
-	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock widevine"
-
-RDEPEND="
-	dev-qt/qtcore:5[icu]
-	dev-qt/qtgui:5[png]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
-	$(python_gen_cond_dep '
-		>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-		>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/zipp[${PYTHON_USEDEP}]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
-	')
-	widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
-	app-text/asciidoc
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-			dev-python/cheroot[${PYTHON_USEDEP}]
-			dev-python/flask[${PYTHON_USEDEP}]
-			dev-python/hypothesis[${PYTHON_USEDEP}]
-			dev-python/pytest-bdd[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/pytest-qt[${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-			dev-python/tldextract[${PYTHON_USEDEP}]
-		)
-	')"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pyyaml60.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use widevine; then
-		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
-			-i ${PN}/config/qtargs.py || die
-	fi
-
-	sed -i '/setup.py/d' misc/Makefile || die
-
-	[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
-
-	# these plugins/tests are unnecessary here and have extra dependencies
-	sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
-		-e '/pytest-instafail/d;s/--instafail//' \
-		-i pytest.ini || die
-	[[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die
-	[[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# end2end and other IPC tests are broken with "Name error" if
-		# socket path is over 104 characters (=124 in /var/tmp/portage)
-		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
-		tests/end2end
-		tests/unit/misc/test_ipc.py
-		# tests that don't know about our newer qtwebengine
-		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
-		tests/unit/utils/test_version.py::TestChromiumVersion
-		# needs qtwebkit and isn't skipped by default
-		tests/unit/config/test_websettings.py::test_config_init
-		# may misbehave depending on installed old python versions
-		tests/unit/misc/test_checkpyver.py::test_old_python
-		# bug 819393
-		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
-	)
-	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
-
-	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
-	epytest -k 'not _bench and not _matches_tree and not _warning'
-}
-
-python_install_all() {
-	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
-	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "PDF display support" www-plugins/pdfjs
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
-		elog "have additional dependencies not covered by this ebuild, for example"
-		elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or youtube-dl."
-	fi
-}
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
index 82cb9d908b85..d18f294eab0a 100644
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
 else
 	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
@@ -33,7 +33,7 @@ RDEPEND="
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
 		>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
 		>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
 		adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
@@ -119,6 +119,6 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
 		elog "have additional dependencies not covered by this ebuild, for example"
-		elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or youtube-dl."
+		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
 	fi
 }
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 82cb9d908b85..f3fcf16be9a4 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
 		>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
 		>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
 		adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
@@ -119,6 +119,6 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
 		elog "have additional dependencies not covered by this ebuild, for example"
-		elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or youtube-dl."
+		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
 	fi
 }
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index e9f32b9255b4..ab0d031817a1 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -14,4 +14,4 @@ DIST seamonkey-2.53.9_beta1-patches-01.tar.xz 43328 BLAKE2B 66869b0ebb3259da1914
 EBUILD seamonkey-2.53.8.1.ebuild 16934 BLAKE2B a2135f9da2d222e348069e7ac8430dc0e7addd7abe3bc004b930258b28c606d2de1842a2cc8401c5f45904d5fb9b0efa8baf88db4ac14869a1334626e5c02c20 SHA512 121b6c5b8abd1db2d1b0f51832982d93f6ad2ac9812d6287edddb39314f17dd874396ae6a377cc9dc3b9612543daa5b1bccb37a88b094d5ea0d770763c78a211
 EBUILD seamonkey-2.53.9.1.ebuild 16865 BLAKE2B 322e2a5fd063719b1c42d0d1fc07f2e5a6b83b577b3d6f1274dab319c8a32c529521d0912ddb05b01544b96c2abb6ee985e6f8ef6061e3cb2f66a7bbf690dca6 SHA512 5878b32b4291ca8f25791522a882f59a40be7f5432a8885c9503e2d2947db814346e933a0812a0b4b267b85ca1f6281e42cad89242fe3d456dc5bf11bfb776fb
 EBUILD seamonkey-2.53.9.ebuild 16868 BLAKE2B a40c7c0736d27291b0275ff7e1eadaa1893faed988bca249f3530dca12add8f1ca2343772baab01f6e7c2fd1395206887a6b417c5989f449f8b8ea3313f74a6a SHA512 8448ad5926db3c0e53754c5b88e3f5ea75e1ceeb5012e2a42e5e9cb90b5b19ad610c8122ce89b03fde8dca465b6acbd5b29dbebabe36898674ce3146fc172acb
-MISC metadata.xml 1932 BLAKE2B d016ed891d8859b8f616522fee67799b548f0eb1646d40de8a13e8efac1653be57eb98a417e4f1c531abf4b0dc9dea1c95720c4874dc8be0d83d07eca306f2d3 SHA512 ac6daaa37e093abfa282bc5df8c15410776d021161b3cfe219708c1657f33b129655de6f2efbfb861c9dfa2f5a7f420a02bf0ee6ef05921cbcfb93afef875a6e
+MISC metadata.xml 1820 BLAKE2B a53636a295ab335bd7220c0b53ffac93e3a09bad64e95b22c1c44a6ed1a77dfb445a5de17a5242c10b7b2f8775f962c34c620acfe35495492ad749431396f0e4 SHA512 0bd8a363e762626cebe9c7a5da198ef2d754d38c35209a4fa519f930b4071f19ca4090d483eb0342faa74013d67587168a650ef0bd63ed532be01b9f9157728b
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 4fa6d71ecae0..44ca1be0e3a4 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>mozilla@gentoo.org</email>
 		<name>Gentoo Mozilla Team</name>
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 472d7e34f446..6cd99e3cab8c 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,8 +1,5 @@
-AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2
 AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3cda8c4a386f8f4a4e5a40ce40c82736b33619f14c770031366aecfb0df4404982b834df8013845ff3f392de SHA512 2dbcdbbc869780a5b265dd909164e9764771e9a6c20664927f7df358daaadc83f65a915aabe65559756f6fedfcebad5496433ecb555ed0de55ced988102681ef
-DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
-EBUILD surf-2.0-r1.ebuild 1220 BLAKE2B f0d509f11751b7e714f2ee38a3506b715ec7e41207de8f18a6c9fd6473895dac63bda8589a8839212babf5ba1b7a9ad0cdf654759e0e015bf2f7b18c23217caf SHA512 ac693af61ce07b3f112f68604074f708419e7c98d8e289a0f37bbe908506935ee4fe46a682f6ce484dac29e99a9441c424040655971f6453ef87b01f5c65cc4a
 EBUILD surf-2.1.ebuild 1408 BLAKE2B 8b82b3166d3263e0b6c10e5d54e93851fffbab83b32c3e8b00004378a9d2b0207edc05e6e405e09ab19e95e9eb32994dae5d93744b7e83bfba4a7cfb5d05da9c SHA512 1e9ca8126275d7a16e52bcb3007a752d4c4955bf3feec9edd58b28475f98082c8a1fd7f593b1f586b3f1c98b6fec0f540e43e07bb2a1eb098d916b062f640c97
 EBUILD surf-9999.ebuild 1862 BLAKE2B 32d174dce4c799a5555602454dfc25264cc2d0d84f85895996fa555869c22f9c60b8a0696cb98156d8d0faea3de2d2fabdf84fc8a20313cfe038b543053e4a13 SHA512 81676813aa151ac0f755d1da5870201ed121c060dded59d9fd04d3ccc8a3007b6dc7ddd483b3d8e26bc789ba06cf0ff6513c57a840e90732394a9ee9fc6b57bd
 MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
deleted file mode 100644
index b0a7b5c8ef0f..000000000000
--- a/www-client/surf/files/surf-2.0-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -4,28 +4,28 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
- LIBPREFIX = ${PREFIX}/lib/surf
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(shell $(PKG_CONFIG) --cflags x11)
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
- 
--GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0`
--GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gthread-2.0 webkit2gtk-4.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gthread-2.0 webkit2gtk-4.0)
- 
- # includes and libs
--INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
-+INCS = -I. -I/usr/include ${X11INC} ${GTKINC}
-+LIBS = ${X11LIB} ${GTKLIB}
- 
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS = -s ${LIBS}
-+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS += ${LIBS}
- 
- # Solaris
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC ?= cc
---- a/Makefile
-+++ b/Makefile
-@@ -15,18 +15,16 @@
- 	@echo "CC       = ${CC}"
- 
- .c.o:
--	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	${CC} -c ${CFLAGS} $<
- 
- ${OBJ}: config.h config.mk
- 
- config.h:
- 	@echo creating $@ from config.def.h
--	@cp config.def.h $@
-+	cp config.def.h $@
- 
- surf: ${OBJ}
--	@echo CC -o $@
--	@${CC} -o $@ surf.o ${LDFLAGS}
-+	${CC} -o $@ surf.o ${LDFLAGS}
- 
- clean:
- 	@echo cleaning
-@@ -44,13 +42,13 @@
- 
- install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f surf ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/surf
-+	mkdir -p ${DESTDIR}${PREFIX}/bin
-+	cp -f surf ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/surf
- 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
--	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
-+	mkdir -p ${DESTDIR}${MANPREFIX}/man1
-+	sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
-+	chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/www-client/surf/surf-2.0-r1.ebuild b/www-client/surf/surf-2.0-r1.ebuild
deleted file mode 100644
index a9ddb0ae30b3..000000000000
--- a/www-client/surf/surf-2.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="a simple web browser based on WebKit/GTK+"
-HOMEPAGE="https://surf.suckless.org/"
-SRC_URI="
-	https://dl.suckless.org/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	x11-libs/libX11
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	!sci-chemistry/surf
-	${COMMON_DEPEND}
-	!savedconfig? (
-		net-misc/curl
-		x11-apps/xprop
-		x11-misc/dmenu
-		x11-terms/st
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-gentoo.patch
-)
-
-pkg_setup() {
-	if ! use savedconfig; then
-		elog "The default config.h assumes you have"
-		elog " net-misc/curl"
-		elog " x11-terms/st"
-		elog "installed to support the download function."
-		elog "Without those, downloads will fail (gracefully)."
-		elog "You can fix this by:"
-		elog "1) Installing these packages, or"
-		elog "2) Setting USE=savedconfig and changing config.h accordingly."
-	fi
-}
-
-src_prepare() {
-	default
-
-	restore_config config.h
-
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	default
-
-	save_config config.h
-}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 45c06e8c592d..3a235cbd8d47 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_4.4.2473.3-1_amd64.deb 88549184 BLAKE2B 0901e7e2769870a3fc9ee1ca8dc67f57f26164d69199a86aa50cea8bf3572fb5df803e63da1fdb444ab59b1a59c25d25c096ad9e7faf5a2d2bfd7b215eebbfe2 SHA512 b7a6a4f9efc0157ecc4f2af418a9cb813dc9fcdc25c1868a3bbf5bcaa991a2f7b29f2c12c30735e05fa5bc32cfdeaa1676338917e71864017ffa2390df1acfc2
-DIST vivaldi-snapshot_4.4.2473.3-1_arm64.deb 83134444 BLAKE2B e40044ec6d52aa599edb4b39fd924ca60bce56aacc2c92ad3032799965bc2fd8efc3b96c474d76657dbdd43901a2e0d135ae3f516e31587a288fe89704a143e8 SHA512 9fbf0e7cd55136997cbf0ff8385aeb174823665795ff8c8d72d5f91b86e21e708414519a84a62c1b2afd860c772836e95822cf672896bc527a65618d5220d399
-DIST vivaldi-snapshot_4.4.2473.3-1_armhf.deb 79523228 BLAKE2B a7f2d13033aa9deac0cb98eb1bbb0a8f0590d14411ce4128a02600a39bd627b63956719562cf6f0e28511834f754cd3cc58344cdb54713930d35a6fbad74c70f SHA512 7b401ef44cd51adf91d51f5620bc32e56bed58f56999c7804a61b10a46041e72fc8d43f8fc11f719584c79176e8164bdc874859adb778dac99d564fdaedd5b15
-DIST vivaldi-snapshot_4.4.2482.13-1_amd64.deb 86828116 BLAKE2B 577ee927a0e795aa96e4a374895014fcfede8a3434ce0a1369cd57e42c9d0048e69be03800be7cbc56613d2f1f281dec70a9369f102c5dcfc4f0a1820d8e806f SHA512 a9c354972219efb9a0dbeb6fc7e39f8dd251b468837a10687f794e6d7f3da453e2561a746af2301ef5626bca0f1fb84eb9053ed28454c745205fd9430b2b46da
-DIST vivaldi-snapshot_4.4.2482.13-1_arm64.deb 81455268 BLAKE2B 06f942b72123f7e2ae876712be6592f748d0781a9416aa3386ec5b35358cb17a911110e23c5088a9a20e4090a759fa7307ac03d8624108d6b70135c165b50112 SHA512 0ee8fea0e3add850addb3265d4b6afa3530ebf1af1a15ac363ddbd7abb4021521cd89150801ff312bc0c665400095cd1bc546dee4401a25e73b45b3a6334c770
-DIST vivaldi-snapshot_4.4.2482.13-1_armhf.deb 77789976 BLAKE2B 91b743ba22dc73cd54758117ade440565c6a45f4d68a976ecaa2c956147cc17160989f720b6b2e229a9a237902fad88b07635f47ce260934458b7ac10a7fb472 SHA512 c3c2e936a09b0279ad57e3d04fbfa8e7463b41a48579b9cffd142142c00e173a29184b64d3589139b95296d1dfa2cc50571d04b0c1b1afbab9182fba5b09d5cf
-EBUILD vivaldi-snapshot-4.4.2473.3.ebuild 3544 BLAKE2B d5feae6fea89d97986343bbe9b0b93bb48825c6245a9bdc0b4c441ff97b0da5c2cf1467dfa23745f02599af535dddadac9ec643a813926ab159a9f18d45ef34b SHA512 b44d33464a072cc71bda27edf0733ce22a4e4164da522e96fa60c23f01d875e0fe5d1d5e3059c45d79577e1f4b7a1e406044084f5a3ca98e9f10b6d6cc2fb433
-EBUILD vivaldi-snapshot-4.4.2482.13.ebuild 3544 BLAKE2B d5feae6fea89d97986343bbe9b0b93bb48825c6245a9bdc0b4c441ff97b0da5c2cf1467dfa23745f02599af535dddadac9ec643a813926ab159a9f18d45ef34b SHA512 b44d33464a072cc71bda27edf0733ce22a4e4164da522e96fa60c23f01d875e0fe5d1d5e3059c45d79577e1f4b7a1e406044084f5a3ca98e9f10b6d6cc2fb433
+DIST vivaldi-snapshot_4.4.2493.3-1_amd64.deb 86896244 BLAKE2B 4e882c8fc01eac54bb1f0d90cee9c18c6f59b9f1b80b9794e1b85d808176f33b8aa9f73ffba0d88d8b9a8666b8393b802b268fbacb267395a95e66b2f1741e0e SHA512 8017e897ec3f299bb8417cc4dbd089350c88b829f5690bc282020b5dbd5b5025a5216513bbe3b107aa50c80be98ef73b33498afd8a5d119180b4709b04008212
+DIST vivaldi-snapshot_4.4.2493.3-1_arm64.deb 81519516 BLAKE2B 8dc719ada42181f2ad9429ce3a570aff68c7a40131fa748b68037718754181eed62de30919d5f87e9fed51d3c250d9127d4fb9c843f1b9f4a271e3a70e3142ec SHA512 857991cdf6146a375469efe68e1d31b94660591ce65475411c60e1a60c44e7223e96a6cbe1698c7b2f32d02ff9220ae20c617409a587f05cfc1462baceef572d
+DIST vivaldi-snapshot_4.4.2493.3-1_armhf.deb 77836120 BLAKE2B 7e506db4748f0bc7d0ae9a473a3714b2f4e6905810de9e97a063588b515a56cb31a818339a709b480ddb39e82989ec0e8a22f1cbf977d89b7cd698293fd25e50 SHA512 a6087a44c7c85d0125aab3443da8e7fa2a3a0f3afdab6005b36371990de6a7d8f7b175d7d9b4e569926b2b396939286997bc6ac5c589bae87065b8dd9893f0fd
+DIST vivaldi-snapshot_5.0.2497.10-1_amd64.deb 86953080 BLAKE2B 2dd30f111e3cb079c3d4547d80f289aec8bdbc679280c40c1aca444fb3eaa1bdb60f64cd212868c7970ae4fee86a016967164f1ff892b21918efe96feeb24ae2 SHA512 7bd100af91fcfc6c57e07150d7881aa0572da8f4abe7a0a3a8c5a36ec38fa780c07531382897ae1c399dd2e8359fbb7a68dd79700b9da18f621de05d685f2a71
+DIST vivaldi-snapshot_5.0.2497.10-1_arm64.deb 81524572 BLAKE2B e24343ccc67dd834c88bd1bd666ffc97dc6a12fb2c201c7cfc48cf54bf4b53648e6e9c04520e795ddec6c3b80b4a574f6d4319eb7ee08a543300f02820600d26 SHA512 28f0e2e53a0acf40714022aa03aeff75257dcd253433ce32784a1f486e0c13d47916c9cad33a7f38c72898200e68a8b94561da1b684a82055989d61a5f0730b5
+DIST vivaldi-snapshot_5.0.2497.10-1_armhf.deb 77922892 BLAKE2B cf00ec524cab4f0bd6b9acb8f64962a19a335cf536d38a38c96ac1031033bce1e887ef6f7168292a8b5e990f95a01bd880d2cac6c6de0d8e0b891c3c5ea9a667 SHA512 03c040c01401f965ab046d19f5db5de2b27ec1eefe8f781eeffc8c941248c811c7d555af160c90996ee3fb2fa135410cbb42a7e84fc00746de624c6b7f7af537
+EBUILD vivaldi-snapshot-4.4.2493.3.ebuild 3616 BLAKE2B 581db1803e604ed0b7327f4c1afbfdb968c9bf8799fd4686430ac494e109f4405607de01804f1921621236681dcde22f9193c20651013e781b632c8803ae1e3f SHA512 7468722e22949695b19e0282903e54c67bc64b79450b856fac7139b7c752bdf3997ead603ec45bf53d7cfbd63cb644c72d7410214e18169bd3524f38b21b55f5
+EBUILD vivaldi-snapshot-5.0.2497.10.ebuild 3616 BLAKE2B 581db1803e604ed0b7327f4c1afbfdb968c9bf8799fd4686430ac494e109f4405607de01804f1921621236681dcde22f9193c20651013e781b632c8803ae1e3f SHA512 7468722e22949695b19e0282903e54c67bc64b79450b856fac7139b7c752bdf3997ead603ec45bf53d7cfbd63cb644c72d7410214e18169bd3524f38b21b55f5
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2493.3.ebuild
index 8653cc65e373..0d11b47c0083 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2473.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2493.3.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
@@ -175,7 +175,7 @@ src_prepare() {
 
 src_install() {
 	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
 	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
 
 	local logo size
@@ -197,6 +197,8 @@ src_install() {
 		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
 	fi
 
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
 }
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.0.2497.10.ebuild
index 8653cc65e373..0d11b47c0083 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2482.13.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.0.2497.10.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
@@ -175,7 +175,7 @@ src_prepare() {
 
 src_install() {
 	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
 	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
 
 	local logo size
@@ -197,6 +197,8 @@ src_install() {
 		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
 	fi
 
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
 }
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 3a95cfef38fd..0e9f21acfce4 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,5 @@
-DIST vivaldi-stable_4.3.2439.63-1_amd64.deb 88054948 BLAKE2B 0a5278cc5f0157336cb9963f70c98285637424248608de082c95f62b0aa23fc1260a8d13fb2cd5d49a7144198a308f65f4a4adc8e8a087b7c23fe8824a6f6008 SHA512 4315f40a1ebc4fda12499e43115c62c5e902f4620c870fc922d628bb1b536a394246f08ae4fa92db979b82fa2bf67d79ccf7dcc2a8d3bab0b7e05c4f77ebbe9d
-DIST vivaldi-stable_4.3.2439.63-1_arm64.deb 82839452 BLAKE2B d139dabf0c6cccd397fa94f1854793f147120962ec7bbefb7e91ef7aabe904cc2e052ab634ecbffe87da6e576f8dbd1c52c7d49b0d36d69af8f3e1286e23b9d1 SHA512 7b178d7ab7550a3d7bf504ba69894982f499d13626e3e16d6b7348171f4dfe2bf81982054c4b91ae0f31ec4f1d32df25eae3cc2454a42c0b9948dfc668c47a3e
-DIST vivaldi-stable_4.3.2439.63-1_armhf.deb 78978500 BLAKE2B 9a4f9699e5206db086a3195b673171b228e46f1657823b1f84af0ff3c1a74f66a237972d35fc8f11c588073395ea42bdbe7953ea43a658ce72404ccd39b23da5 SHA512 f02c4fefd556c254daa6cbcd7caaa7526ee19f10b2d5a5a439ed9ee3e16ef609bfa9544e344a65dd5afd80e55e75f7d5bb4d6c032bf00a27ef0f61d3582fa631
-DIST vivaldi-stable_4.3.2439.65-1_amd64.deb 88032984 BLAKE2B 91432b3968b5aae23cbcc3012f402d3d601a7a7a63aa8cc43984c23233ac648811c97f03b32b9476930bdf3f20016e6690c2f5df6e09fedfbe1180b50e32f703 SHA512 630eaddf0f53c1b19dd7c4ed1479ee2bf05da6b9013c3d2d39440d96502190175891056fa9d16dd5676c8c2650cb78e48e0667f20a64e8586dcd0a6250804e2c
-DIST vivaldi-stable_4.3.2439.65-1_arm64.deb 82817244 BLAKE2B 7aa494df213e8a3f7e861a4101af8a932ad23cf582208289bc304dbf36d785c5cc9b3d3135955c271f2000031fec1f4d3ec2d1537035c2a7cb94cbb49f59f6d2 SHA512 8e42ac9ff9c38e4423b2024d3d60e09e9c6d0ed9fb4c672321795161990077e358ba01dc9f390d854b07ce4d9beea4d366044fe24b87cf3c0e59b2a954be0aed
-DIST vivaldi-stable_4.3.2439.65-1_armhf.deb 78973180 BLAKE2B b322624caae468c1ee563b1c77f6a11a4b609f283f053ece1ee5359267f127a940b43d01940c66395796906994d59bcd098af6c464cfed9f1a3bc575a819c8c5 SHA512 d02a0b52ac8e542d1ddd83171078d782e94670dbdfb9274ecd70ed51f6d71699ad0b321593a54577f8fe44605a540e89f351d949be362e2ce7d1a0112ea12aca
-EBUILD vivaldi-4.3.2439.63.ebuild 3566 BLAKE2B 1db19bbdac66e13986c9466df4aded90cb32547208bd1e1c9d9790d0be4e2459a8f53f3d3cbdffd4e49be4579a294000fce5f651a5d5ac0d4f9bbbccca1f8ef6 SHA512 6bbef93e64aa0168577835dc74c959416368cf76485a053a6df25bc13b573f064fce4fe6c84e6db71a72f6ef21c5c115976aa0cbda581d6a6c88c8877cc31196
-EBUILD vivaldi-4.3.2439.65.ebuild 3567 BLAKE2B 1726cb45337ca872d96731c2e120903aded46ea393cc8f4c7698a80904711b60619279ec008f829f6051d9a85d76358739fe2d38ab92ce8b8bd9236e5dde7eb2 SHA512 eb0407d93ed592458c239244a1cb71ea096a74e06ec3b51ee789db72eec50a89067a75dc2bea913fecd7b03dc90746c22c7423df77bee08d49da559c0b1c5bfb
+DIST vivaldi-stable_4.3.2439.71-1_amd64.deb 88023372 BLAKE2B d64c8816a4a85cbe866f109511a317e6e1ead6069c83615eaaa9744962858d2f5a08d74b1d620676af5d600d68b190ab3cac4912b08a9bb0f9205a17a5910cad SHA512 ae46de75cb6290dcbfe145fe7c9f99db39ab0b39690a0041e6f8d0bf49b0242aef20e5d3da5c9100132afd992fe2ddc3ab29cd1fa1ae9e0c28f431a6b5536ba3
+DIST vivaldi-stable_4.3.2439.71-1_arm64.deb 82802804 BLAKE2B d9b0715a305ef010c9e9df15ecf7ec47fc45921eaaacbb1f2841c6efe8fa4194cb28e73e935448d48eb4aa0b8b5a90649b8e34e63c97ae077390e12947f1b97b SHA512 2e0a2f29cfa4ec38050283b3fbaaf4e60fdeab65de21244c13c4f309c41394f65e4ba44dd5bee195d49acaf7ed22c60f5519f35aeb758521d8a6c06ad08c4233
+DIST vivaldi-stable_4.3.2439.71-1_armhf.deb 78982608 BLAKE2B daa48324f4c596b55a8579819dd9f6f341bf8ea68dc0c77ffea3f0fa623740050aca0394ef7a98b7cb772fb954bf8f848e55b25cef90a579903f1f117d87e140 SHA512 6d87de2a1ba1c0089e3071aaeb99e28b9be089cf40fd9215aba5754c43b4cd3cdeafc52ab20275b75e110785447294bdaa603a185105b4a58b21e696cd31271a
+EBUILD vivaldi-4.3.2439.71-r1.ebuild 3569 BLAKE2B 9aef56f827ed1e772663f13b4c64f48a2939e19c4379e9c2d494a07529c6ddc69151110332a198a84b53462f184da54de1527bf98dc24ba8b2176e539d1bcd57 SHA512 51dd8d6006cbb2c63e5ea1d421ca2a875e8320efc8d0375bb354bcc6b6e2515bfb6e8a63cec07518525a188763657ab4f9086a4bc061ffe8dc3533344c6c3c43
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.65.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.65.ebuild
deleted file mode 100644
index 010e329fcdfa..000000000000
--- a/www-client/vivaldi/vivaldi-4.3.2439.65.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="94"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.63.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.71-r1.ebuild
index 3a5626e6a8b1..2fa0d8cb9dcf 100644
--- a/www-client/vivaldi/vivaldi-4.3.2439.63.ebuild
+++ b/www-client/vivaldi/vivaldi-4.3.2439.71-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/mesa[gbm]
+	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
 	x11-libs/cairo
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 2c6099d4694a..ed8cca52a1b4 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,11 +1,6 @@
 AUX w3m-0.5.3_p20210102-fix-configure-gettext.patch 635 BLAKE2B c7bb5fca7188a35517fd2006a27cf20dea2fdeef729dd4cde2dd4fd330f546fbaf7891ab7212324016d5cc428576d1f4ba4e5e1200b8fbecbe03aeace1f65b27 SHA512 d2a41844951c25f96fb7f50a7b74badf3f8a6c112a80ca3bb9c3ae57d64cea2dc17278b1d21f53c18ffe228e5293fe68824c8f213b02da36a7a25da52480cce8
 AUX w3m-0.5.3_p20210102-restore-gettext-macro.patch 1076 BLAKE2B 8ba58bee28e506e20306a98e26af624fecfead21976cb0f0fc06ed443aab339c8c2f4c376b2bdbbe5d3232c7f3f88d1793e5059ec9fb22af8e2f34992ea1e15a SHA512 3c58ad896c711a41ecb915fa32318c69f9326a795d0f071120f5cecb8dfc2e7cc7a9174143b34ae7cd8b854037a5b6506bde4c063213bc9cc4a78a5090e3e83c
-AUX w3m-img-fb.patch 292 BLAKE2B 3e292f5607b97d49143be54bb2ef31aaf43e9ab599a4b63069b3aca8567abb6bed6f08f88d43b77710932031303a8fabae07296f6cf176a7f4898653816ff7db SHA512 3b2bdc1c72548ab75f98743c7855bf1a7a40d2bda2252ca1f1475b1eb982b5494a42478f7b544365195d2bf2e3214d697aabe0b7a5d208bd06f26ae379163f18
 AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da870fde8a5fc0eb8314d9b818399ae502209a2fa4fbdf4bfb07e56e29a275cb2133656da52dfc SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2
-DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228 SHA512 61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
-DIST w3m-0.5.3+git20190105.tar.gz 2183651 BLAKE2B 624fe3b8c1daa2a6d4ce21e051ee363a29114bdb64e0e0d9864b8098f2a12bcb27e293fa3dfa4dc1dff691fa40046f4878b7d39c321f591d3689d00e3ed42bad SHA512 b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4
 DIST w3m-0.5.3+git20210102.tar.gz 2189272 BLAKE2B f82c13c26b1c83cda90655abdcf30422e257a5c2e48c32d5636a70f895078d11a95fc6ce623fa94624bb2a1125b71e7654d872dfb91fd86c4290278de3cf88f8 SHA512 357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
-EBUILD w3m-0.5.3_p20180125.ebuild 3174 BLAKE2B 82af9dec3ebf3ad6b17312088d25a478862ddbd934c757cece1c71cd3fc280b5346982242a067a0c54af6c8a99da4503c8cc4129afe663b2248503e7845dd5ee SHA512 3b8147f5fa12b9c8e53ed5c71e17725278c0f2c58d9599e87888680b5adba05628505564a801bbaffe31ce29f64a4e41a3471caf2141335cfc48addc5e24b18b
-EBUILD w3m-0.5.3_p20190105.ebuild 3133 BLAKE2B 810108dd19184d7680ed672a3d591e8b284bbb1a4521fc9ec947f83ef889571e660e64d9a5ef834faa13dbbf2d2bef57e8e2f9c8731664cb06869d746f079267 SHA512 77eaf6c86f64f9dd4f39ca83987d1217531dc996584e9312208996b2277c784e51d0eae54aa99b5dbc9e104fe08e3f65bfea1d2c464085280bbd62eee82d1dfe
 EBUILD w3m-0.5.3_p20210102.ebuild 3273 BLAKE2B 3a1224bc9807f749d8cc8136a73bd7cca2d654b48116786a1017269ccbede2c347ddeeac7f1d40a4ff93a501458454d83c8367d0efaee7f5a70b0196d88ae297 SHA512 1bd9d4ebf1f3f473010ca715abffa6b8dbb946366ca7e75cbb4c88c2da33b8488b11e26419c8d5810285e153ddf5a710077bc0015a66ad688549c91301670fa1
 MISC metadata.xml 523 BLAKE2B b38836a568ff6d8dc713a3b4e7c41d73301dce1e73bd507ac9b6b527ab5550c39982a4b9996856f3e2fdc6aa8bf46fb7775877ba0a9b22b268d9bb5435af57f6 SHA512 e0bc230ecea256da426acf9bf8fdc34f69d79dcc57e9e717e9061790bd8bba69b087d99051b491184d3a7f11f6e1100fa75ecade445afb219414d8b70bb379f2
diff --git a/www-client/w3m/files/w3m-img-fb.patch b/www-client/w3m/files/w3m-img-fb.patch
deleted file mode 100644
index 677d89d3bcd1..000000000000
--- a/www-client/w3m/files/w3m-img-fb.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/w3mimg/fb/fb_imlib2.c
-+++ b/w3mimg/fb/fb_imlib2.c
-@@ -3,7 +3,6 @@
-                 fb_imlib2.c 0.3 Copyright (C) 2002, hito
-  **************************************************************************/
- 
--#include <X11/Xlib.h>
- #include <Imlib2.h>
- #include "fb.h"
- #include "fb_img.h"
diff --git a/www-client/w3m/w3m-0.5.3_p20180125.ebuild b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
deleted file mode 100644
index 8803120d72f6..000000000000
--- a/www-client/w3m/w3m-0.5.3_p20180125.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools prefix toolchain-funcs vcs-snapshot
-
-MY_P="${P/_p/+git}"
-MY_PV="${PV/_p/+git}"
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-HOMEPAGE="https://github.com/tats/w3m"
-SRC_URI="https://github.com/tats/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode xface"
-REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
-	fbcon? ( ?? ( gdk-pixbuf imlib ) )"
-
-RDEPEND="dev-libs/boehm-gc:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	X? (
-		x11-libs/libXdmcp
-		x11-libs/libXext
-	)
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf
-		X? ( x11-libs/gdk-pixbuf-xlib )
-	)
-	!gdk-pixbuf? (
-		imlib? ( media-libs/imlib2[X?] )
-	)
-	gpm? ( sys-libs/gpm )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	xface? ( media-libs/compface )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-img-fb.patch" )
-
-src_prepare() {
-	default
-	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
-	hprefixify acinclude.m4
-	eautoconf
-}
-
-src_configure() {
-	local myconf=()
-	local image imagelib
-
-	if use gdk-pixbuf; then
-		imagelib="gtk2"
-	elif use imlib; then
-		imagelib="imlib2"
-	fi
-	if [[ -n "${imagelib}" ]]; then
-		use X     && image="${image}${image:+,}x11"
-		use fbcon && image="${image}${image:+,}fb"
-	fi
-	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
-	# so we better enable or disable both. Default to enable
-	# m17n and unicode, see bug #47046.
-	if use l10n_ja; then
-		myconf+=( --enable-japanese=$(usex unicode U E) )
-	else
-		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
-	fi
-	# lynxkeymap IUSE flag. bug #49397
-	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
-
-	econf \
-		$(use_enable gpm mouse) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable ssl digest-auth) \
-		$(use_enable xface) \
-		$(use_with ssl) \
-		--enable-image=${image:-no} \
-		--enable-m17n \
-		--enable-unicode \
-		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
-		--with-editor="${EPREFIX}/usr/bin/vi" \
-		--with-imagelib="${imagelib:-no}" \
-		--with-mailer="${EPREFIX}/bin/mail" \
-		--without-migemo \
-		--with-termlib=yes \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}.mailcap mailcap
-
-	insinto /usr/share/${PN}/Bonus
-	doins Bonus/{*.{cgi,rb},html*,makeref}
-
-	docinto en
-	dodoc doc/{HISTORY,README,keymap,menu}*
-	newdoc Bonus/README.eng README.Bonus
-	docinto html/en
-	dodoc doc/*.html
-	if use l10n_de; then
-		docinto de
-		dodoc doc-de/README*
-		docinto html/de
-		dodoc doc-de/*.html
-	else
-		rm -rf "${ED}"/usr/share/man/de
-	fi
-	if use l10n_ja; then
-		docinto ja
-		dodoc doc-jp/{HISTORY,README,keymap,menu}*
-		newdoc Bonus/README README.Bonus
-		docinto html/ja
-		dodoc doc-jp/*.html
-	else
-		rm -rf "${ED}"/usr/share/man/ja
-	fi
-}
diff --git a/www-client/w3m/w3m-0.5.3_p20190105.ebuild b/www-client/w3m/w3m-0.5.3_p20190105.ebuild
deleted file mode 100644
index a77ac32f05e8..000000000000
--- a/www-client/w3m/w3m-0.5.3_p20190105.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools prefix toolchain-funcs vcs-snapshot
-
-MY_P="${P/_p/+git}"
-MY_PV="${PV/_p/+git}"
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-HOMEPAGE="https://github.com/tats/w3m"
-SRC_URI="https://github.com/tats/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode xface"
-REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
-	fbcon? ( ?? ( gdk-pixbuf imlib ) )"
-
-RDEPEND="dev-libs/boehm-gc:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	X? (
-		x11-libs/libXdmcp
-		x11-libs/libXext
-	)
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf
-		X? ( x11-libs/gdk-pixbuf-xlib )
-	)
-	!gdk-pixbuf? (
-		imlib? ( media-libs/imlib2[X?] )
-	)
-	gpm? ( sys-libs/gpm )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	xface? ( media-libs/compface )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
-	hprefixify acinclude.m4
-	eautoconf
-}
-
-src_configure() {
-	local myconf=()
-	local image imagelib
-
-	if use gdk-pixbuf; then
-		imagelib="gtk2"
-	elif use imlib; then
-		imagelib="imlib2"
-	fi
-	if [[ -n "${imagelib}" ]]; then
-		use X     && image="${image}${image:+,}x11"
-		use fbcon && image="${image}${image:+,}fb"
-	fi
-	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
-	# so we better enable or disable both. Default to enable
-	# m17n and unicode, see bug #47046.
-	if use l10n_ja; then
-		myconf+=( --enable-japanese=$(usex unicode U E) )
-	else
-		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
-	fi
-	# lynxkeymap IUSE flag. bug #49397
-	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
-
-	econf \
-		$(use_enable gpm mouse) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable ssl digest-auth) \
-		$(use_enable xface) \
-		$(use_with ssl) \
-		--enable-image=${image:-no} \
-		--enable-m17n \
-		--enable-unicode \
-		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
-		--with-editor="${EPREFIX}/usr/bin/vi" \
-		--with-imagelib="${imagelib:-no}" \
-		--with-mailer="${EPREFIX}/bin/mail" \
-		--without-migemo \
-		--with-termlib=yes \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}.mailcap mailcap
-
-	insinto /usr/share/${PN}/Bonus
-	doins Bonus/{*.{cgi,rb},html*,makeref}
-
-	docinto en
-	dodoc doc/{HISTORY,README,keymap,menu}*
-	newdoc Bonus/README.eng README.Bonus
-	docinto html/en
-	dodoc doc/*.html
-	if use l10n_de; then
-		docinto de
-		dodoc doc-de/README*
-		docinto html/de
-		dodoc doc-de/*.html
-	else
-		rm -rf "${ED}"/usr/share/man/de
-	fi
-	if use l10n_ja; then
-		docinto ja
-		dodoc doc-jp/{HISTORY,README,keymap,menu}*
-		newdoc Bonus/README README.Bonus
-		docinto html/ja
-		dodoc doc-jp/*.html
-	else
-		rm -rf "${ED}"/usr/share/man/ja
-	fi
-}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /www-client
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)