gentoo resync : 01.10.2021

31 files changed, 605 insertions, 45 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 34eec3cdef78..d90b6a1a2e7b 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 57b0ab45a02e..7b4d0642906a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,10 +10,10 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
 DIST chromium-94.0.4606.61.tar.xz 1039880428 BLAKE2B ed6993c9f1352c58bb6f534d1bae96ed379b2114d76f4383c79211589482d12e81df74f4ca057c26c54b47ee9b6ba94012bc9ec7391f510b2820ecac0df5b031 SHA512 e33e1dfdfc2839b2c7481c4cb4482a9456a76d5e2bee066d21dbe8a01c619104191978120a1b87606722d9b9d53333ab2046df80095805b252c41036a11e3c57
 DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
-DIST chromium-95.0.4638.17.tar.xz 1212354740 BLAKE2B 5f4d65a3c21814cebe10134e73ec6c546beef92a5c3dbfa4798dd42141c0705cabee9f3b11a22c01422cf7e41e197ff7d249d84422728eb5411f691f7029f1ff SHA512 1e730e2855343d86d30a21e2d2cd7687b72f247e9e443c26f91aca3326bb70bacf525f23eea4b047ed441a6134774c1b0d931c601ff8125df226a1caff5989b7
-DIST chromium-96-patchset-1.tar.xz 3812 BLAKE2B 166aaf657b0e390668669d669d8e3a5efc3ab0e8fa9ffe31a376616cfaed8a17bf2afe5b4e338a3e1dcc80d58cbc6810054df36300838f11057625ab2910aaf0 SHA512 26affaf999aa2ed1ab16d8ac09b31163fa91badc03f0542f6f0022925a792029b8799ade9e152ad855d55caa909c3172f3380ab53032d0877337bd26caf30610
-DIST chromium-96.0.4651.0.tar.xz 1217921832 BLAKE2B 5fb3c214bcab050cc6e134afc50deff00458cf74862a494d3eb6095893b96c97a7574543f9a2ce95d3e14eca42e188e9672aec322f11ff7033d26a4b960c3386 SHA512 b8905dc1fad0323b9979a360f92a1daa2f7dff3f8d131564fd86ab2d497e9141875d0fc5d4fad20628972f76979720887856181b9d0c2837ee782446b71c4149
+DIST chromium-95.0.4638.32.tar.xz 1213270600 BLAKE2B 302bf31e0c160b6ee4efdab8e0309ddac46f9e9d7fb164f0be42713803d657e6db766963cec288da210aabbe6326560bf672d6bf5a02ac2f53b511004a427415 SHA512 b00502da09acf4fce71887e7bef1e95d56f4c2b43f2caa39d51efa444741ac460460ff3ae55174acfacd78e3f2d152a6b690b17a784078ed97ed801793e08a91
+DIST chromium-96-patchset-2.tar.xz 4208 BLAKE2B a5b1c9eafb7a6807bc28ba9f6f1136adc73337c7964c22c4a245ab7c622fb9f6daa28eb46292cbc80d5fd8ac827d733f36929e620327d637f8bae60e3e41b27a SHA512 d8b5e94f95e3b57313fa5e132940056f73fb4f0ea922db0b40c6c41f0ee51e0c9043c816b378a9e5bf3a151d4cdf293c6a33c98ab2248b2b9e8109f8b4317bfd
+DIST chromium-96.0.4655.0.tar.xz 1218779336 BLAKE2B ee3bb0dfa7a417ed39d5f33fcac581856c9cd58579b9b24e037cc93998dfba39807a36e690b30a70afe47b2af772e9caa222825354dba3802bc4b2a88e9d79b3 SHA512 cc77db8f028968176cae647897812e765b477664a8f27d7df2b832f378891719244aace2b2a9a7ff3ca43e3898c39665d5f632e14b6c010a45056fc5f8a305e4
 EBUILD chromium-94.0.4606.61.ebuild 29944 BLAKE2B 0dc7ec42cb346c388bc8efe476a37109e8537ddc9fc96b5225066327d5416b9180c8d1c9762dfc848bb634e36633681668f42b589a0bbdb5fccd155b45a56f23 SHA512 0a39fed46c21f2d9d48a2e22765e2541b9a0108c65ead271774e674de70195063da6f64a6613d2a909793d933a6ecf976ac6b0253a09e7bf585e908325e66ff2
-EBUILD chromium-95.0.4638.17.ebuild 30127 BLAKE2B e94711146d28ce2c69a2705f98ef4d9dcccf85a3de733b9bc03acb56fe2721237883975c8bca78aa56e9adbed92fadf3cb1f68dab5963ad7abc3f644ce88b446 SHA512 deeab5582fe4be3c7a209c0ea13841b97f921745a5959fa90d46c8a496f6178f7757a1adb5d39d6f21ddf7722badb0c5a6c69ccd849d69da6cd7de2d6c40d131
-EBUILD chromium-96.0.4651.0.ebuild 30051 BLAKE2B c6f48f035e0db3c8ace8b05c1183b0b7dccf436d64f0f56edca39a9dd18716eac5c4edb270d89a5570e095731d3417024359eb12a8943bf4ad300127bb008546 SHA512 d4b8f08083aad7956f022503bcb645c94758bee2c6a24f736f7aa8a4f377adf429a2e66eb8cb19cf0c129b7c1cc838fd530f8da5d3e08eb7f584fd3cfae72336
+EBUILD chromium-95.0.4638.32.ebuild 30106 BLAKE2B 2ed4ad5cf19ecbe3ce22ea5d2bb3eb31c36830e2b39a3374f84b5eb1493a9406d76d53abb56e9cfe394f49bd308e2c3f10755ee3479fe428f062818ec926439e SHA512 fb908c37a958fe9dbd334048a193e3f05289d5f1924dafd40d351d36e04a26192874b4a5b9281186fe56f9bf5ee24be6a81454318018336342a4576ac3f1b50e
+EBUILD chromium-96.0.4655.0.ebuild 30030 BLAKE2B f11f68bd23001b22730d8d09d774a1c42fc0c59c34e7e8e7a298822cdfbe9ac5f95ae5754a91fb2d2934ed5b6b5e5afbf1bc6ab853707b0b7db6e461809e9029 SHA512 2d1f57162f0a91be132f80620c8317c25300ec1baa8693cb4149715309a3233951df5ec892ea9fbe8e78111d0d55158ec013e999c1afd0ea02ea5a08b6bfee99
 MISC metadata.xml 1775 BLAKE2B 2fa038c0f6ebe1d86427cdf0806400dd690e31a9ee2667ea9f4f744478a675b9da89f0f541869bfea4ae5e28af1210d67b2766474d16752322407aad401d2c37 SHA512 0f4430b96a7d4dea4f2f1707cc81b184445c0f9da1d5c35a84c7958a037c13068b1a1073edc4576d7131564fc14c2f3b41a97cb8665f45e5a18eddc428c9ed23
diff --git a/www-client/chromium/chromium-95.0.4638.17.ebuild b/www-client/chromium/chromium-95.0.4638.32.ebuild
index ec95c0b0bedc..15e8a2665309 100644
--- a/www-client/chromium/chromium-95.0.4638.17.ebuild
+++ b/www-client/chromium/chromium-95.0.4638.32.ebuild
@@ -9,7 +9,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
diff --git a/www-client/chromium/chromium-96.0.4651.0.ebuild b/www-client/chromium/chromium-96.0.4655.0.ebuild
index 909981765699..15e18722e200 100644
--- a/www-client/chromium/chromium-96.0.4651.0.ebuild
+++ b/www-client/chromium/chromium-96.0.4655.0.ebuild
@@ -9,11 +9,11 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="1"
+PATCHSET="2"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 88fb9c13e56b..41bcdee8ced7 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -2,5 +2,5 @@ AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23
 DIST epiphany-40.2.tar.xz 5372180 BLAKE2B cd75f645980c37b0cdd92133505cf7961168bf5d67ad0bdf3140f155c737a070f7ffafa63bb8a0e5de175826b79b2ca380a2851e7f1f0454d4f372d48f48c9c7 SHA512 29a5b7e65f7e5decb3c370fc9ae654727cce30f397ffd3289a9f77f3527f0471c821e3bea0f1a5ab9c1ab44e670898b46e66e41de5cb8c76fabd23b135a4a1a9
 DIST epiphany-40.3.tar.xz 5379072 BLAKE2B d0b2ecd5db6953261efe6658fe60798b93b6589e1c79032f659a3d69dcf1e2ed77156bf46768c2891916a48f9a28474f8690e451c8631a0455f06d525f9349b5 SHA512 86d896142171f50d0375c4efec370986741d89f341b613c137fb4719ba5359a9e5523e52635c4bcc9ac7acf96f2276486d878d5ed44a57bc1c8124a01af2d30d
 EBUILD epiphany-40.2.ebuild 1945 BLAKE2B 5fa7e097a85e8d4d0a1be45e48a98fa1c43d52a1c9e49dbbdf6de4712bf6442a3c9d8f8c50fce9f1573f276fa73c020bd66ce4d8546072249c28faace04fddc4 SHA512 6745e1cd14815143d0a35592df92d7c51c908f4d24e988e0b5b19cc495bc038996584969cb74a3d2d9fc375ed72d4ebce9115634482ce7eec4137d278462ee0c
-EBUILD epiphany-40.3.ebuild 1917 BLAKE2B c565e3daf3c8c7d0abd0f82c9d603b563b72736264b8296660afcd056a95f4505ecc087c64551b49cab1ace761bd45445d7e3830edc7e572c6d0fe5d4e98a968 SHA512 ebaf5ffc34b976e0dfc160e41b5e1bab84eb6546d6a1bd512f55187e5d3e4dcc92fe29be1ff26c1015c65b994916527966e8b820cb26499a250789daa5bc834e
+EBUILD epiphany-40.3.ebuild 1924 BLAKE2B 1bd138803b301a577c6e85f6cc894bbdf7e82ed5745c7356f13910b497e1c1ff609bd52a7bac144aa657db72105a130a16e7a8200a7728e02c00f1135e3f4662 SHA512 6c3dba420833b3594dc67dca82bc308fa9642d6c5647bb9ee6b09946d81a2d10e18e103e972796a99cbceedb77766710c0e856667ace34353a9b6e71635dfc5f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-40.3.ebuild b/www-client/epiphany/epiphany-40.3.ebuild
index 71d0a74577ca..8b06f903df9e 100644
--- a/www-client/epiphany/epiphany-40.3.ebuild
+++ b/www-client/epiphany/epiphany-40.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64.0:2
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 6a5e7dfa0ddb..061e408a405b 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_95.0.4638.17-1_amd64.deb 89846788 BLAKE2B 22be2ba9f2e7e307f4a6f1076faf2c138481c1b26619f3704a03adb960c4e5b861ae197d6ac100cf09e84ab671be3aece42fe910e4763ee3291dbf915acdb78f SHA512 c1a131ba53e170b3603cc5160489e527393928a9b6fc4d5c20001fbcb10c0d97e3b64365169c2d9b507fdc24a06993105e65e696a8bf6525b5abda5f93033d53
-EBUILD google-chrome-beta-95.0.4638.17.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
+DIST google-chrome-beta_95.0.4638.32-1_amd64.deb 89580228 BLAKE2B 8d6f1eeeae1f109a59bf859e7b3ef7099997973abc12c9eb16be88006eca97c69db0cf525bb614f2ef35ecbdeceb7cac5f3ca9f7234f359bf6825eb6a4fa4363 SHA512 0c659b1e97c7cd1cd79547c5697a12decaefa22a9fa8f5c994d71e07af2d812e578f38d2f9e09b572a8643988ebbb92e6504dbdf5eb275db460e84fe59a28d1b
+EBUILD google-chrome-beta-95.0.4638.32.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-95.0.4638.17.ebuild b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.32.ebuild
index c92f2d8d73a3..56dba81cca90 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.17.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.32.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 329c4acbe4dc..7b46e969e3e0 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_96.0.4651.0-1_amd64.deb 88841160 BLAKE2B 4ee01a3187d4092009e24cb2d7f585eb4bf87eddfde7bf32c9b9bfb4e05a5120fc2f29db749ea3b9758f903b1c1c407187bb39a4cc650ee421f30ca3c6418613 SHA512 c3b5aa6d27d38f67bb509724814cef389418c808edf831465095c3e4b2de36c669db894251c3769e4da1b0430ce78152bb1c504a36ff90dc4c78b7df05944e2a
-EBUILD google-chrome-unstable-96.0.4651.0.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
+DIST google-chrome-unstable_96.0.4655.0-1_amd64.deb 89354896 BLAKE2B 69b2e65712351b3b7835005eb975dc5ededb09a5172efd8f0de75ec7f0c781513d6af6014f90fa03ae8c7ae3ea4ab1299b8a9ee4ef61feeba7d26b9f64c1f379 SHA512 fae22eb0cb6b1e52cbc12f9d18fb2733da9efa53c7b8fbd3a71132766c0be9c341522aacb4853b9317f01e11e216dc8c4b970ae70a606149122a0eba95f5d165
+EBUILD google-chrome-unstable-96.0.4655.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-96.0.4651.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4655.0.ebuild
index c92f2d8d73a3..56dba81cca90 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4651.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4655.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 3527fa7c663d..c04b8da9cdde 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_94.0.4606.61-1_amd64.deb 90287596 BLAKE2B 0ac80477a3248ce2aaff59855e10542364e50e8baf80a52cb4e3ffa900bb369a22eae73d659d1f87f93b9f19deb6630fc2b9eb1185b851cb0ec1193d8b77246f SHA512 1a596bf6941688b13d1e74d1ee7c8676fad1f79f8224526dd7372c5bc3cb7c96cff3267b4b812f81ca114eb3acac6dd6e5576b536e0bd8cfee8263aa7a91e3a8
-EBUILD google-chrome-94.0.4606.61.ebuild 2714 BLAKE2B a3c37c76fecee2863e95ddebdfdd53ce34a915b86c1a4d3a618b10a09ee6f42986b0841ffaa69477a5763d83b1e287f1517bcdd98c2d67fcbe63b54b46b14274 SHA512 0aa9b731fe43bac9130de79e2c1e94111986ca7ce63878a94b2265cded219146c3f2be13bb458a148f7cb4773ae89aa502f2bb5e9165b49fc89ca9bdd1b7a468
+DIST google-chrome-stable_94.0.4606.71-1_amd64.deb 90273096 BLAKE2B aea33d4b2ead51d71b85139ba6581eb75e31cb1723e7047a96390246c91e346e12142476f227379f182cf03a8e1154fc00678a494e3578e46063d9cb7ea1a43e SHA512 d86e208730f1ff4b7ad4c831d79021930209454ba1fcb1a1142c4c9ea469be2bc91d2517e80b3547ebb737d9ed48a4cd23431864b0587508b0d2df0e87a25773
+EBUILD google-chrome-94.0.4606.71.ebuild 2714 BLAKE2B 54985b86452ee0b69c945df00de9492cd2f43166a785cfca1af85c39310187fa9cda80e6b46567cfdd45a8ee07af7e7ca187580658f6562e5aba6dcb590d2d8d SHA512 078f1e13c7b5155fcb7e7bef73c28e4e6ffa3115fc342b2387da25179b25d461e8df453664cfd7096e12f629d902809ccb012d4d20a96664b4bd8d6823d66ca0
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-94.0.4606.61.ebuild b/www-client/google-chrome/google-chrome-94.0.4606.71.ebuild
index f2955d88a367..dbce15cdcf9c 100644
--- a/www-client/google-chrome/google-chrome-94.0.4606.61.ebuild
+++ b/www-client/google-chrome/google-chrome-94.0.4606.71.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 2292180038f7..b20845ae42ce 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_94.0.992.23-1_amd64.deb 115135864 BLAKE2B 18328b01f282cd78f4997c7ec893c3e2e1d40a808f0d17e81285be916813207b7d1a31918603f9e04ef2c3aae90eecd5be09f92e0f81d08378dd61009228918f SHA512 7971de51d214a0ff769c31490ef287be3a4865f2edb7c542a1194fdc50220d44c017b3a4215bd69e1301e9c2d217686e05ad698f9841ea6963d8f1b4dd23536b
 DIST microsoft-edge-beta_94.0.992.30-1_amd64.deb 115094820 BLAKE2B dbddc2268b77e0ad8dae82f036fef6db41412a7cbd61b6415c6340a68d074c6e7da5d4a29145a292bfe92a0f4d71cde2031fe72b800f3ee428293b75ff7ddf7c SHA512 cb32641a07aa96ef5c6839b865dd10eb70c8f707b59ef7a9badb86330a84047d4afd93e55d8aa3bc50b31f8462609bccaf9a6590b04695dba1fe16ae8b9c9391
 DIST microsoft-edge-beta_94.0.992.31-1_amd64.deb 115045128 BLAKE2B c8e8475cf6608c548070af7e94920165c885c791671136884ceaf084043919a7f6d4b898cdedcd2b3fe1220f9aaa2a85e11110b4a0330712494fa875248ffce0 SHA512 ce68a505d220b4a5e1a5a6942d3501737747e8ee1c6b9a01b2a94de75406bc6ba2bfe361ebfb728ab6db16fb53b656a8ea0e089d9a141c29dc7ab43477cc9920
-EBUILD microsoft-edge-beta-94.0.992.23.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-beta_95.0.1020.9-1_amd64.deb 115261788 BLAKE2B afa7ef4d5a40cf12d7f4c16e525cbdc56ac64a0298ecd64ddea8044dddf11b5ae61936e39dc04f2bd09012b04d50fb40fe2f212d714dc35e8ea590524be7078d SHA512 4dcf0963b174b38bdffc80e7aa8dcb02caf909369ba5803d206b9bfd55087f29d75716f669dd14bd9bd4021eb14673631a6e9e9e5b91abbb526f0b30c5c35f5c
 EBUILD microsoft-edge-beta-94.0.992.30.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-beta-94.0.992.31.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+EBUILD microsoft-edge-beta-95.0.1020.9.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-95.0.1011.1.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.9.ebuild
index 3b1abf5f25da..a14f69804a04 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1011.1.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit chromium-2 desktop pax-utils unpacker xdg
 
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 5ad14a77613e..109e7ec154d3 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_95.0.1011.1-1_amd64.deb 115948988 BLAKE2B fbae0ca4805bc18529c43fdab645fe4065c0af66be4afeb012d2282e7dc3103b5dafcc29e53a41804768425b189857722eea89bfb665c20d8df61d01f549e341 SHA512 ce27882236671a94ef4926595f7283a69281a06d236dfd4a9e5b4b4acbd6f4c21b4d808c96de595a12d64c5858bf42a85f40933a4640f0ae902b1840b859a3b7
 DIST microsoft-edge-dev_95.0.1020.0-1_amd64.deb 115147332 BLAKE2B 62d7990cf6a3aca5d955afd45b6c7bf2f0531c3f05aee2959f3498d6405444ad0e557453a38991ad98108fd09a54133e497686b077412a274dbe5759f7dbcd2a SHA512 fa58419cbfb9068321a586e26c6af5c8351734f737cbff58a97c5b2f072839b515208eb9388f85c752de043e09bfa960edfd069a46fff6d230119b015171d295
 DIST microsoft-edge-dev_95.0.1020.5-1_amd64.deb 115316476 BLAKE2B 5e99b0d43e5c7cbf7ce5ba1ee2d2a4c1dd7c60e0575d3c8c1c9d1506d339774ca832aaa2d69993c61c379654863230853fd414a96f1c1431af94a9d0ad11f785 SHA512 a565da7f78195410553145cfb6dff5ee32f62dfbe3f9522815dce64a6620aeb686c6acca43079fea3ac7febacbab82461df5c1b98fe4f9cf7df51936e2043df0
-EBUILD microsoft-edge-dev-95.0.1011.1.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-dev_96.0.1028.0-1_amd64.deb 115444532 BLAKE2B 13a1d6b04dc410fc54a9381daaeb173a4b4d3e3e923b0a7bd8ae06d240965757e5a3a7bb76fc6c4218ef11cc169bccdebe81ddb4fb840d12524614b307d52107 SHA512 18e3f34515ac5040097616e623386bf574a378d57d96e24e03759193e9fb03ef6fb57560138566834a5c99f494f08b7264836d466ce9d3552f78938791c97b00
 EBUILD microsoft-edge-dev-95.0.1020.0.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-dev-95.0.1020.5.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+EBUILD microsoft-edge-dev-96.0.1028.0.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.23.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1028.0.ebuild
index 3b1abf5f25da..a14f69804a04 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.23.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1028.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit chromium-2 desktop pax-utils unpacker xdg
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 272eac8f33d1..637b26b57027 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1,3 @@
 DIST midori-v9.0.tar.gz 1902467 BLAKE2B 0a6b46bddd0286c56d3f30b429dc46f90177931f8c596912183ed990124b831b5407807e2693e3b5e0d02074386b46e98823b33f6e785963b9507742bac58763 SHA512 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3
-EBUILD midori-9.0.ebuild 1285 BLAKE2B 0e9a3e09a5cb3ef98c69f9914353747c979badffdca774d49fd2f530d25941ca1643a2a985fb43949e64ba1e03e4ffe022f0684ee5de5c305371bafe325779fb SHA512 f87427d8a8369ce7468f2703b3a4808795d5892e512f1779ef75853668b21eb8d7be6572d8f331d1bbd843bc4cb03ed9cd8d98632cb6b94f602fe2ee14a03f6f
+EBUILD midori-9.0.ebuild 1292 BLAKE2B a43accdbee271948925c943b9e1fcbd9448702c28a77f478e3776e5dfd4d8c791b95e0ea11e2c98ff61f4717b764bc6210f53020533671962fa5ba2f6e6e83c1 SHA512 506bfc5b3f1075da3fbb138f563fee3c8a570a020f2416d811bf2621d60d451fdaea440f793a65aa07126421b02645988030855eb185a5e577374f18d27145c8
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/www-client/midori/midori-9.0.ebuild b/www-client/midori/midori-9.0.ebuild
index 75a58cf254d0..ffc74fa3d240 100644
--- a/www-client/midori/midori-9.0.ebuild
+++ b/www-client/midori/midori-9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v${PV}/${MY_P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
+KEYWORDS="amd64 ~arm ~mips ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 89b9050699e5..94e83ae10751 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,8 @@
-DIST opera-beta_79.0.4143.19_amd64.deb 77588480 BLAKE2B d55e0621fc26d4de8708da8084a43cd2d4893a5273d1420f09fa2e37e4a2bda5242aadcdc7a3f8b965b167d22852ededde3e60d69f906ebd6bbbba1fda6d0abb SHA512 9f75b8d66977eddeb50474115f8d11f61eee8235c98b1e28dcb95ad4c295fc340237d0ad1a3e64e73c84dbe7003618dd10a9c2ec39884a1d34199e3c9715d83a
+DIST opera-beta_80.0.4170.11_amd64.deb 80002328 BLAKE2B 735ec69af328e8c79b65a46dca486c34ac290256ecc17283b8bee41bb5acb3d8e32facf73ea57f11d342ce2914b07c863773028cbcdfbee80c1e23c1e8c4bb5a SHA512 dd4729e16aa3078b932ab96b3e568032e68e0e6be2988827f68b0ff59796eb3b931d2629cecb5262dc6287b5ba2259e13e31394c4deecbef52f71fb4fc36ada1
 DIST opera-beta_80.0.4170.4_amd64.deb 80037964 BLAKE2B 040be729ef754438a793abca7ee448ab6eefa5929c75f09f8881a5a646efd4a301d27db35d3c02a54d2064c86e1279050dcc02c30af70de5b64bfe937ac07767 SHA512 00461d53d59ea3d5f0a5dabe7c70fa0e6e38d04fcd7e28106c1d6463ef75e9f1f2a501245e5eb603e3638cf38ee2b8055155802ae6ed05f993bb75d5b13c1968
 DIST opera-beta_80.0.4170.7_amd64.deb 80013760 BLAKE2B 8490351b1eaf05dea8d058074ef28dba00927805da669d958351893b28a54f560b21446f840db60553f32d5f2cfa4180374543ea8e1359f66495107270ebc980 SHA512 fdeeb2ea94429bc8aae0cdf5c59993fdc8b024e56e8ec58ed04a9dcebe3d7c1028b7b9fe4f51898354bb797fa9594cfccf64b3dcdd548c78f3567c9d02ebfcc2
-DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-beta-79.0.4143.19.ebuild 3620 BLAKE2B d2e68ce6aa72a2c2b2f55f67d5d4594fc97e0982b8047900cc6a21f388c0a364975182f6e9f7fe1168d7205ac18924b0537f5017280a946028ba47353c20775c SHA512 06be214ec536e3b5d55d052eae1e83e1523bf249f885ba6f1f67207d7d925cb7fd68f28426c4c1a5942c30171131f00d338b084b9a4a9d12c4d50a51742582a0
+EBUILD opera-beta-80.0.4170.11.ebuild 3611 BLAKE2B 42a56e953f11106cd28e9b88ba0cec6e31e831523ced7ea1fde9dba991b11d89ff98e59f4c5c45171c83d7c6ac2f003bbb65267ebc4038edd47721226999c387 SHA512 5b85ad1843fcfa711979928aa750e6322912aee18cf9b57a4bf2184d16a59eaf7cf8918b0d5e2eb1d92102f99543f0c1dfc4b85c0a49f821859331e56ec2081a
 EBUILD opera-beta-80.0.4170.4.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 EBUILD opera-beta-80.0.4170.7.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-beta/opera-beta-79.0.4143.19.ebuild b/www-client/opera-beta/opera-beta-80.0.4170.11.ebuild
index d85e8c828656..c2107b1fd880 100644
--- a/www-client/opera-beta/opera-beta-79.0.4143.19.ebuild
+++ b/www-client/opera-beta/opera-beta-80.0.4170.11.ebuild
@@ -19,7 +19,7 @@ else
 	OPERA_ARCHIVE_EXT="deb"
 fi
 
-inherit chromium-2 multilib pax-utils ${OPERA_UNPACKER} xdg
+inherit chromium-2 pax-utils ${OPERA_UNPACKER} xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="93.0.4573.0"
+FFMPEG_VERSION="94.0.4603.0"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index d228d92ae61a..3993152dbcfa 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,8 @@
-DIST opera-developer_80.0.4162.0_amd64.deb 79608536 BLAKE2B 23900af1f692c650b71cfe3f4f1b94c5e9ef9c8f161657596763e5bb75b1a1ad0c1fa98cd95002e73831661800f512527ca7bef6452fba83fea82f27c6b82552 SHA512 79a365ca877826ae795e7bd05b3fcc8478fd45048cb0831d7a03de1545632eaf8c9210f0fd908670ec4306c173cfc91e2cb299afa5aa159f3632aeac06f8213a
 DIST opera-developer_80.0.4170.0_amd64.rpm 76951444 BLAKE2B d8ac71a974641f8c40af38c4c115cec90ad8e3aa65952fdd3e6a3af3588a8b85813337231c2c86e902a96f5ef23523f1d53a44296f32f6f011abdbc68bf46102 SHA512 5bd6e42e9e6fd84f77e2dd7d566d536385d989f68c5bc0b1470847414e4efe0b75e4207b0ad0c00a8c72fa1f4eceed84b1bc54ae3e889b83cc0aeded54edd5b2
 DIST opera-developer_81.0.4175.0_amd64.rpm 77215724 BLAKE2B 6f3b0331923438789c6f8c4b0cbefdfe7bbc4dc219dad040e23049102b8cc3089f2dadde6f63c175fd4f5086ce610d4700608a61bb93efbcf33f4a0067ee3ece SHA512 6af3846beeff70672287ae142b5b85a7d353607c48000ed9b052d9e7b17c9e28f1ba54d6f030addeb8166d40be2a1165fe96e40ef2641f5764adaacb9c9f8db6
+DIST opera-developer_81.0.4189.0_amd64.rpm 76325920 BLAKE2B 4f43c91e6e34065f637f2c93096ee484e4d9e366c15ce720877b82eaa3fe8860ace8d1497f6dbd9783621573d46517cde35b7ee17bee5da3ac70b9a1ced4ad05 SHA512 b23d957f5c314f59205b6d487fb2c2848d18542ed36ffd6bc8a76f148d3d223174b8a080f029caae547901e5b3eb4b4fc39495e2ca40d7eb37d3f3533f7d47cf
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-developer-80.0.4162.0.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 EBUILD opera-developer-80.0.4170.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
 EBUILD opera-developer-81.0.4175.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
+EBUILD opera-developer-81.0.4189.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild b/www-client/opera-developer/opera-developer-81.0.4189.0.ebuild
index bf0853a5f751..705285545fdc 100644
--- a/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild
+++ b/www-client/opera-developer/opera-developer-81.0.4189.0.ebuild
@@ -9,7 +9,7 @@ CHROMIUM_LANGS="
 "
 
 # These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
+: ${OPERA_FORCE_RPM=yes}
 
 if [[ ${OPERA_FORCE_RPM} == yes ]]; then
 	OPERA_UNPACKER="rpm"
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index b2499204d647..bf2454f94e35 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
-DIST opera-stable_79.0.4143.50_amd64.deb 77519244 BLAKE2B db1d241ba5c1a793428cc2af7229ada3e57bff96c27a186977c894260e4d9d2fc2da58c4b42528a7403d9ecacc25a22ccfeb015674b8272710f581e14d6eaed8 SHA512 8ab2d8ad7bc1dacc9d80208d255a8a44e24563fe1939316734c0fca0a58062b949614833bb63a29cc63febf23a717d50ff68929a83d77766ac2e43a89b170798
-EBUILD opera-79.0.4143.50.ebuild 3619 BLAKE2B f98165d607c674be96a0d2263fbd99deafa4af65e9c012c12140bc08ab508e0146b3ce4fd4a7d772f28280afe6928dfa14f1f24e71ee0614ef4b263eeb2f4ce0 SHA512 08a40d9c2907f9ae3b705dfb6d127b6d63838afde2f04bb0ba83d6539cc9d06793017317e5115aa38b8968c898c672b1a1996eaad9415c178dd5821e017093ca
+DIST opera-stable_79.0.4143.72_amd64.deb 77563024 BLAKE2B cdcfefd1e8ee3e23b8300d405a70f5f73bcb42e766369bad5ff91d82b5968602e9327e9ef03f18f171e15efa39b93e36061f80b23ddd045c61f3565f2f8a81b5 SHA512 37739396d3180973f1999001cbc3cf1e4d3caf9449961b6afc77b2366e9b6a63cc208423c3acbcb1ba1d0811ee2e9518752a3bd631e36a5f98edc7bb22ed7696
+EBUILD opera-79.0.4143.72.ebuild 3610 BLAKE2B f8058e2b7cf1b164325e2581c83da96050b9a4ae4aa1b82e2e54427837e68b662bce349d52a6cc86d0dddfcb56adad186447b2d7276ab851cd9d7b5c72ec744d SHA512 d73314c17cb2788dbb6c303e69638637d240725cfe9ed514959f7938749f68bd5324533e8d1a5412b3b64e4908abd42c751cf190ba86224c617acf247591766d
 MISC metadata.xml 590 BLAKE2B ecac1c1d44dff5d3f266f7e0a4135c035c2cd0b08055d30b9103308a53eb046328a9917fccdaff3e9f7ab56e7eec906fe6cfa59efa0f223a237db7ca1a9a2eb9 SHA512 9764641862a12bb0f3c396826265595a900a1801f3fdda45337f4b89088f868a4a036290962d6be64f0509c7c6e69e072de2bfdd490fdb04401c99d64188c7eb
diff --git a/www-client/opera/opera-79.0.4143.50.ebuild b/www-client/opera/opera-79.0.4143.72.ebuild
index 632893a0d6f2..28c4c0360979 100644
--- a/www-client/opera/opera-79.0.4143.50.ebuild
+++ b/www-client/opera/opera-79.0.4143.72.ebuild
@@ -19,7 +19,7 @@ else
 	OPERA_ARCHIVE_EXT="deb"
 fi
 
-inherit chromium-2 multilib pax-utils ${OPERA_UNPACKER} xdg
+inherit chromium-2 pax-utils ${OPERA_UNPACKER} xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index aaf607f536d4..f751742d754b 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,4 +1,4 @@
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
-EBUILD pybugz-0.13-r1.ebuild 988 BLAKE2B 784c24798d5d45a6f3a41e3556957b44b6a3a49b0c461fbfa2c49ea133acea7b5ff712098ee499853430610218f5cd0f4daf1dd460d92d9cfc1446bace94f2ca SHA512 b48eb371d1a6b64fa04e6bedecd3d4c3f4369400cd383ce168a9233e061b449179918af12dc363b90c065fab487ce95de41de8e034d93cdcf9fa533431669076
+EBUILD pybugz-0.13-r1.ebuild 995 BLAKE2B 8b971943dc334afe9c755981295e6e138a065a946e79a5e9d873865221114590f9bb7a9be35983af28e56281a16b6064bca915e65f310d5e3e86f8f6824fb6cc SHA512 978648b636100f80127222bfa2c124d3e0c58675d01ca0b430d8ce436b00e64f928fb8d8fd2baad1e15cc9394303ab9bbcabadec96696ebaf6ad09b81cb05eb7
 EBUILD pybugz-9999.ebuild 990 BLAKE2B 17d724beb858ade1a2909f51494ef18aff5b17884ccad430a246504831376c2f403e2ea362d631aa2c955701df25c05a5ebbb0c06e4b05cb0503e668d2f4b420 SHA512 d1e20b7f25c5bf60a16781f494103f569fe0fc9d2af9e11f322e7ee4ae942b6b2022443bb9d3b075edb0d0f91f3b951de1bdef6e29b4906eaeeb9cc7c7e9b781
 MISC metadata.xml 308 BLAKE2B bfc1cff927d620d35217d2339fc84192107c306a07f413078371f92e588679ae33d68f211601737cb50b177a1bdedc3cb5c2a92d08d4c83799aa4482ff797234 SHA512 30fbb7b65f76ff9ca76a593ac635e20d9115128ce9acf10b769bbf46f34e81ba857f068c729743e6565e3164d7e33de994003c15c34d5402a0ec47a254fa609e
diff --git a/www-client/pybugz/pybugz-0.13-r1.ebuild b/www-client/pybugz/pybugz-0.13-r1.ebuild
index bdd2da64a75c..9b656c02fba0 100644
--- a/www-client/pybugz/pybugz-0.13-r1.ebuild
+++ b/www-client/pybugz/pybugz-0.13-r1.ebuild
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 20f7af88c8bc..e9f32b9255b4 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -6,9 +6,12 @@ DIST seamonkey-2.53.8.1-rust-1.45.0.patch.xz 12256 BLAKE2B b311b69ee11a5875beca4
 DIST seamonkey-2.53.8.1.source-l10n.tar.xz 13542220 BLAKE2B 8b043136595e481077e60cf202ae66d04ad30f089e842f6d4660807cdaf086b99c9252afccf8a6302558f4a1ce38e8e59f72ade6f72929335b0bf7bce72b4569 SHA512 047defbfac18f360ad089d90de3c0e139d3707dcfa74570fcfa1f2f1e789ca2930d08ee0c94f7d88cc79f4e162eda2d0073493656528e0f9b579f452fe13ad8f
 DIST seamonkey-2.53.8.1.source.tar.xz 283254760 BLAKE2B b078e0333a992b5b6fc9b3966528cc8201ea2c3fddfff8584d3ae9fa5e4b3b7b8abd25dc85dc9fb5ce60b55efcc1692dc56490f520a3b486dca7e873689f0f26 SHA512 1e3eb8686b3b04bfc95f0229c71df7e6ffe085e3ba0bf043c6714789b08e701ede1e288c47df238fa3c5d5979efffe7a9b73b04a32a85f04259ce2c77937a366
 DIST seamonkey-2.53.8_beta1-patches-01.tar.xz 43208 BLAKE2B 947b8131810f3f9855e1e8ff45d841e05dde9dc8c1d1204b1a3d55a743c2c7f9b23b251460d6743ca760edc4609eb08c1df3b165acc56af95e5ecb3c871fec3a SHA512 8196be87112926de0becf272bf44c1ce5522579d4b66f93f455cc0e503c4c3bb96fba5ec48a73e0d53ad9683820cb167e677bbf2497fe266e93d154c8d4a7837
+DIST seamonkey-2.53.9.1.source-l10n.tar.xz 13615680 BLAKE2B ce5baea8c004219af74d25671272b2a4104018e35f54adee46bacd8eadbc9c44a53c7ab8f6382402a16dd4353068e0e6144158d3ec874105a5c03ac89a15af7a SHA512 c0dd469a12a4acc7e84793a56615fa109e00c638ed71fe0b51b3125750ed115bf921dbc6e8a4b391bb5cfccd679cdcbdfe9b23e619590c0f22c62489566d459f
+DIST seamonkey-2.53.9.1.source.tar.xz 285481656 BLAKE2B c96107de40c83515fff49d4bf409a13f3a712daf19b466044d6eff244159ebe6d37b7dfc16e6dc0676be344378e9838f7c1d055064bc63ba36a92844e54bfd33 SHA512 67c0645a2b8c4ddafc148da80166d6cff9ceafbeee0683fc4099e69720c4bb725a4165643db37abf0a0545e170e30e811eb0ad198f5c7cd4196294624b86775f
 DIST seamonkey-2.53.9.source-l10n.tar.xz 13615680 BLAKE2B ce5baea8c004219af74d25671272b2a4104018e35f54adee46bacd8eadbc9c44a53c7ab8f6382402a16dd4353068e0e6144158d3ec874105a5c03ac89a15af7a SHA512 c0dd469a12a4acc7e84793a56615fa109e00c638ed71fe0b51b3125750ed115bf921dbc6e8a4b391bb5cfccd679cdcbdfe9b23e619590c0f22c62489566d459f
 DIST seamonkey-2.53.9.source.tar.xz 285118824 BLAKE2B 524e51ca00e36658787aa734dd775ef009ef6d4dfd6917f00ebc8d4ec4ecb72c61a50dc33c89fabe2e65e4b95086645db9e26ef12776574f47d3928a42af100b SHA512 17f7009f2b5a1f337c24f98e2bfac2b63498f6e5b5080cbfc1c541ee60fa07f5116b76b7f20f2fc4e000b8c38c4558c7c9ef10abbdfec52dd597bc25d5a952f4
 DIST seamonkey-2.53.9_beta1-patches-01.tar.xz 43328 BLAKE2B 66869b0ebb3259da19148473311b00cb2b2ca762f6ae7003b5374c51f53e6d58fecdf00084d9c43c62023b14666b08efa6138fb28642cc11272851d799f8d0ad SHA512 38b8759da9230d745ab5c8cf1f3964762893e88174f20f3a0458a3196297845fb0876bdb330fac21a24a2661c2b319c8bfb0a7d6e8e47048ced1955500291638
 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
diff --git a/www-client/seamonkey/seamonkey-2.53.9.1.ebuild b/www-client/seamonkey/seamonkey-2.53.9.1.ebuild
new file mode 100644
index 000000000000..021b6d5a98ff
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.9.1.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+fi
+
+SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+S="${WORKDIR}/${MY_MOZ_P}"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs desktop edos2unix flag-o-matic mozcoreconf-v6 mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="https://www.seamonkey-project.org/"
+
+PATCH="${PN}-2.53.9_beta1-patches-01"
+SRC_URI+="
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
+
+"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
+lto pulseaudio +roaming selinux startup-notification test wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/nasm-2.13
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? ( ${ASM_DEPEND} )
+	lto? ( sys-devel/binutils[gold] )
+	x86? ( ${ASM_DEPEND} )
+"
+COMMON_DEPEND="
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/libpng-1.6.31:0=[apng]
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	>=x11-libs/pixman-0.19.2
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+spkg_setup() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/mozilla
+
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
+	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	use system-libvpx \
+		&& eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Don't error for format with gcc-9
+	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			build/unix/run-mozilla.sh || die
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# 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.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	######################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	######################################
+
+	mozconfig_init
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
+		fi
+	fi
+
+	if use lto ; then
+		# Linking only works when using ld.gold when LTO is enabled
+		mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		# ThinLTO is currently broken, see bmo#1644409
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		if tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	printf '%s' "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_use_enable chatzilla irc
+	mozconfig_annotate '' --enable-dominspector
+
+	# use startup-cache for faster startup time
+	mozconfig_annotate '' --enable-startupcache
+
+	# Broken on some arches
+	mozconfig_annotate '' --disable-elf-hack
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# 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
+
+	# workaround for funky/broken upstream configure...
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
+	#emake V=1 -f client.mk configure
+	./mach configure || die
+}
+
+src_compile() {
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	#emake V=1 -f client.mk
+	./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	pushd "${BUILD_OBJ_DIR}" &>/dev/null || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	popd &>/dev/null || die
+
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	#emake DESTDIR="${D}" install
+	DESTDIR="${D}" ./mach install || die
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
+
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use chatzilla ; then
+		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${ROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	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 "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index a1dca6be0805..0e50c8a0f709 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -3,6 +3,6 @@ AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3
 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 1403 BLAKE2B 927a745af173f49f4c33c2d47f087611f457eb5281423b6076b282fe1a99174d38457e98a234ccee933161c03994fe19a3f487e05e55a4ae68d4b52c1f20e515 SHA512 266442cc185292cd2751e95f252f56e86d743d5b3dcb0ceac6460b77c1c9c5908a8b667d6877062227b80296c9e8c2f50f21a4f0e4d9fe34e16a49fe84793999
-EBUILD surf-9999.ebuild 1855 BLAKE2B 2c8c238e27d72a3a3b61ff02b203177b213a6d2de9b243c750137b6a99b63f4257fde60f5ccd85cffbcb921b2d98327c0812b70c3c74a05828294a0d3777d051 SHA512 8d72209cdc9d1fd76ae8b09c7a132209635c97c52b58f0ac680726a8460958234f23f77f8f7612e43d1af54354a0a47f33d1846f81356dd9d852fec4cb52e446
+EBUILD surf-2.1.ebuild 1410 BLAKE2B e1247d1fd4ea4c7e93336a0423c89710fa7cb3f22fdc3cefaf80e2944bcc7e9fe535810d3000a852182b500a9c8364b9a0fc92701636032fe24771343680d416 SHA512 e31b0605491640ce60d7ea97f732217a65db17cbda3ca0ec09698ac00bac696182d66a5d656c4ab6d026593323193eb29fcba53469f75417fa02f273562dcfc5
+EBUILD surf-9999.ebuild 1862 BLAKE2B 32d174dce4c799a5555602454dfc25264cc2d0d84f85895996fa555869c22f9c60b8a0696cb98156d8d0faea3de2d2fabdf84fc8a20313cfe038b543053e4a13 SHA512 81676813aa151ac0f755d1da5870201ed121c060dded59d9fd04d3ccc8a3007b6dc7ddd483b3d8e26bc789ba06cf0ff6513c57a840e90732394a9ee9fc6b57bd
 MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08
diff --git a/www-client/surf/surf-2.1.ebuild b/www-client/surf/surf-2.1.ebuild
index 15922a19958a..c4af2cd640b4 100644
--- a/www-client/surf/surf-2.1.ebuild
+++ b/www-client/surf/surf-2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="surf-webkit2"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 9dce31f41287..49c122b93dac 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="surf-webkit2"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"