gentoo resync : 03.07.2021

28 files changed, 333 insertions, 57 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index de3dcc74d3e9..46b4b42a7b5a 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 16decd220584..e66f24bf172f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,7 +3,6 @@ AUX chromium-91-ThemeService-crash.patch 1306 BLAKE2B 327fa2365ba15efa754d959afa
 AUX chromium-91-system-icu.patch 946 BLAKE2B 68cac9880e88c2d7048895b3ddcfb6c3615df6d0d7b59c81b1a25e223114cf792956408dbe8038a2db2076d9985170b3beca4de3bf0589016a24e7b23c2608d2 SHA512 89943ea95cdf5b1c92d494e9019935f683a03d8379ef208bb5b2ca746eb3eb0ccee6d91e24d831eb0092960b376a7cdda7c3e2043765b0577cf2154b00a43ac9
 AUX chromium-92-EnumTable-crash.patch 2712 BLAKE2B adf5bd0ca388395245ebe4b17d31fa75b636f036860888fa7036e3a57fe4064669f11da2623b15bba90879146f583668b3ca0af56f88c99d2f7f0b98601b012f SHA512 8cfc83fd02f505acc531dece5b06c4f32bee5c6d5a3fa467d7607adbf8705f78dfb7550c69ac10e788f3aa9acc5bb361b894ec36ddd043222f9ca6e07d8a23a4
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
-AUX chromium-93-system-ffmpeg.patch 731 BLAKE2B e15febf04792ea57df9bd7ee8de9aa419e68a67018fbe0c066df9d672d178704b74d06e9b5294716708abc1f86d177f9afb5eec47d3aeafebc96f2aad2cb3a71 SHA512 6868126d8e83cac983ef065bcb8ae1212655d4b1a7ca042d66312a935b46af72f44dfbd00aa7f08401e116d91d207d1fcecb985285813b777ec46820925dbbbb
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-glibc-2.33.patch 5771 BLAKE2B 792306c8b171ab4347bacbbfc7f0fb38c5c6e9d97f3d4cf17320e7091a9d9c2765e2204262daf8ed71b1d346b255fcb3d5c2c0161e7a854dab4db9749ef7dd32 SHA512 b8bc3cb40d187500e22455a08d5c9cd5638665f717f3cfcf81d913ffe1af8c9c37bcd81c0066024721dafd74f0df178e7fb4c1028c614902cd32a1da4db0ede1
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
@@ -14,13 +13,13 @@ DIST chromium-91-ppc64le-6.tar.xz 28968 BLAKE2B 5153be672aec91899d9eabe3ddf4c3d0
 DIST chromium-91.0.4472.106.tar.xz 950214296 BLAKE2B 1c68c3d6ccb593b4516482ba8f18f3bf769fe90ca423692f8e8d9fabd36fa8cda7a66f870fc30478ea4e1f9bd147bb6cadb77df4d9e0ef846c30e653b15dcc98 SHA512 142507bbf5fcc47d7eeb5f890ed70eae403271a7f537903545ad09ac26501aae914f327c3287d5588ed4ab601012584f6204cca6896ed2705326b090df2fe00c
 DIST chromium-91.0.4472.114.tar.xz 950268264 BLAKE2B e811ec3550434a5f5dcff3f5a0c07d2a951b0479ae8ef7de0dc82c60d63bb19a04ed065b2f8f12b0ba4786244fd0fdba9a38e1f0ae076a9be2fc50bc293453b5 SHA512 7a04d966e8c8b75b5fe063730cbc4734cc9a5a38a50a573193243301930719cef26e2b741f2f893350bb717261302e5d00b0b3264a3fdb8f80a5460223eac5de
 DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f29efefdbec46acf5cb8b0cc40b816b96ba7694c4ab1abe997572a6dbecf94ea27f368a7337263adfff44f2b4b042d862 SHA512 65c8267ab0921719c71d4b03a4315bbb1ceec35ce4794de9dcc6099b2c349baf4782b67316ebb8c9db233630b7fc89fa0baf719f9f0f41eb39972cdeb437e612
-DIST chromium-92.0.4515.70.tar.xz 957673320 BLAKE2B ecd7076eb8b1c755d0d4a79ba397800fb62ed26e14283ad9f45707905b700d379b07d197ec319c02c048f9dcd07f23d3183edc2cf2741d5cdd3968598ab00122 SHA512 5a5d10673442808b49fecd8b0d9a124390c1e9d8ec3c27a828d93ccc20b9f27ef50c54043bebf806c9e15c7d18a7c300dcac96b1ec34aa713c7d7d061af50016
-DIST chromium-93-patchset-4.tar.xz 4452 BLAKE2B a697175dceb03ae19175860c29f93b7f58bb212ba4932822c5c85dd8230a50b0cfefd3968ebb872d0b62fb4371b065fc51192f657c7f0fd5667bb3531344abed SHA512 836cbb1580f3559fc55e110b61120282cd2384da028d244fab5b9bdba475f3162e952bc45b7a827019ca0ebf92127dc0a89ba32c5718bded349c8ba25eecd207
-DIST chromium-93.0.4549.3.tar.xz 989184368 BLAKE2B e0b690797ac99587b3a4385e09d4c9fed51fb75321269b239d931f39ca839ec82d474a5bba90f22e558562a5c395c9680c781fef4f35ead9de9e063a7c900357 SHA512 5e27d524163bddc168d6344d09bc02aed50cba487e8d8310f421cb9a4f2103f5cf1ed036dc9adf572eb950401e74755eb7561fc51f9ed28ac5f92fda3eb210aa
+DIST chromium-92.0.4515.80.tar.xz 957805500 BLAKE2B 9c622d45fd62b58ff1c8f3cb8745502747e3a6ee8f453a35927212f2ff71cfeb216cc7fc1e78010e4f5178b18062ddc36aa74c1dcb3daf32ba8ef08285fb196f SHA512 04ba2c24c987e9885674e7efd2a2b9415673424f1f3a18e1d79afb2683d984927b15067003040e8fb92ff8be31cda042aac052e9369a1a3709d6b11bf9d1df7a
+DIST chromium-93-patchset-5.tar.xz 4404 BLAKE2B f347a66c5767bb03dd6a0feda433f51f5110e0429c6f55494000bd1a61a4f3b6a218e7f12ce91a02adae94ee0a85d0aceb12aef5a0537e9362f23817edb662c0 SHA512 39d3bd5ad51e33d5d82a42d5289ab137bdb3280e4d2d647fce86eb59d14a01e9f31531cf82ba9055168c18d1fb96e3013e2d40dc89b30c725c89241d34b7b25d
+DIST chromium-93.0.4557.4.tar.xz 1034639148 BLAKE2B d515e5be84f63bd21e757750963188390bc1b888aeb50a1b7767805784e6efce1c89f058fe5bcdf73a8790677a2b76cd3f01cc6df1b245996924ae46e91911d6 SHA512 b5b214d639becdfdb4a6bd2ee04c9556ee4eca0e436ed6580c8e6d9e5a37476ae1fa208eef741aa8d8535f30f1e751041aaf02fff57dbd685341d7b5866a81cc
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-91.0.4472.106.ebuild 30004 BLAKE2B fabf65aec811906477c4b76c05dee55ae9c20a7573ebacf4cefa3b4a0ab89b690a1c1c5dcc009e5bb416b75c3fa509fbb76306ff23d6702a8981b7b5bd3cecdb SHA512 43b03f73cde551bc677c392e5134d2bb89629f5a3690e67b75d9f3a1c6c7b8e646794d8eb17d72468d8c80d1e6cd6c8f8513fc2678d4672c97d4b918490569f9
 EBUILD chromium-91.0.4472.114.ebuild 30005 BLAKE2B 3cde9119ff1363ec3c0378e7675ad21e3d4fb890756c8835226d0589dd3884c3489316990d55b18ace072eb34f0f10e374a4af1ae47616a9eb9670f07451b096 SHA512 4ed2d4d72d550641ddb469973f0444e11a151bad003f6e08f1c52b81582871157da6a2f0caf805dd0956fc81ad4dc60510bfc781fcc8682f23080ebe0e2805a7
-EBUILD chromium-92.0.4515.70.ebuild 30444 BLAKE2B a314df934fe51f40e3704b53a8a80dff887c1d30d7e061a0ab07d84d3ef2abde18729319f5f5f7d620f66ff5bb910fb76efb1f10c61ee5b36df8cb7a5b84afa8 SHA512 6850e0abf148208e97204fa2e2969f3fe4e59e3dbb1c7769cf1b35d26e74625fd5bff32d6fed30467eaf1b749327352d2badc9abcde97f04da0fa4b38f6a86be
-EBUILD chromium-93.0.4549.3.ebuild 30057 BLAKE2B 78cd23aabc7ce6487291fac65db3294d8071336b93ef98d07d8da8d6439744141f77db2ebd4ef84e54c5f6409024671e5779237cfc86f8e348d177c7cc516049 SHA512 d715663b8c3277cadea8a14e5d31b87b7ecec790183bb935dd5b9a5aba384fe46fcc7e5d525e7f1eca83aab12f4e3ace9da25fc28b6eae3d886d11f195dc896d
+EBUILD chromium-92.0.4515.80.ebuild 30444 BLAKE2B a314df934fe51f40e3704b53a8a80dff887c1d30d7e061a0ab07d84d3ef2abde18729319f5f5f7d620f66ff5bb910fb76efb1f10c61ee5b36df8cb7a5b84afa8 SHA512 6850e0abf148208e97204fa2e2969f3fe4e59e3dbb1c7769cf1b35d26e74625fd5bff32d6fed30467eaf1b749327352d2badc9abcde97f04da0fa4b38f6a86be
+EBUILD chromium-93.0.4557.4.ebuild 30009 BLAKE2B 92c05652ec1bea212aecfa5d20c1a010e0f1661f0e5aa6c38fc8314276eff6a24b5ed12f3356606f7a55ae1b93ab7ebddbf406791bb7a0a057509fe1e7408e06 SHA512 ae84f16552a0420515db6e89f1bc53d04272b78617769a911d869a0b6fe1e208059cd28dc6ca57d9504b1ac0580480aa889574ad8edafe3b59b61656d389c304
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-92.0.4515.70.ebuild b/www-client/chromium/chromium-92.0.4515.80.ebuild
index ed824b3cebff..ed824b3cebff 100644
--- a/www-client/chromium/chromium-92.0.4515.70.ebuild
+++ b/www-client/chromium/chromium-92.0.4515.80.ebuild
diff --git a/www-client/chromium/chromium-93.0.4549.3.ebuild b/www-client/chromium/chromium-93.0.4557.4.ebuild
index 2895f1aa216e..206632b872e6 100644
--- a/www-client/chromium/chromium-93.0.4549.3.ebuild
+++ b/www-client/chromium/chromium-93.0.4557.4.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
+PATCHSET="5"
 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
@@ -234,7 +234,6 @@ src_prepare() {
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-92-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-93-system-ffmpeg.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
diff --git a/www-client/chromium/files/chromium-93-system-ffmpeg.patch b/www-client/chromium/files/chromium-93-system-ffmpeg.patch
deleted file mode 100644
index 7ed5331c527f..000000000000
--- a/www-client/chromium/files/chromium-93-system-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 04d56bcb5a59c4a36b9bb9ac57a84090033761ce Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 19 Jun 2021 13:08:48 +0000
-Subject: [PATCH] unbundle: add libavcodec/format.h shim headers
-
-Header is included in ffmpeg_demuxer.
----
- build/linux/unbundle/ffmpeg.gn | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
-index 978298a..16e2074 100644
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -23,6 +23,7 @@ shim_headers("ffmpeg_shim") {
-   root_path = "."
-   headers = [
-     "libavcodec/avcodec.h",
-+    "libavcodec/packet.h",
-     "libavformat/avformat.h",
-     "libavutil/imgutils.h",
-   ]
--- 
-2.31.1
-
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index b77669629913..598f48be5037 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,5 +1,5 @@
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-EBUILD elinks-0.13.5-r100.ebuild 3789 BLAKE2B 996f20cf0aec71c858cd24442a8a193c69308e6ee533fcf2a8ed962b2475c023865480679cf3c8fa25e2fee691ad13442d01f5c73e7863b402d9f5d65048b458 SHA512 9d26f7ef237d2bd9d48b8ab2d8a63b9aef9925e327c48d439fbd717f1f8d35cccbe64ecf2b6dad523b0020644ca8913ae804b3b9ac6ad0ea518fa2a6420f529f
+EBUILD elinks-0.13.5-r100.ebuild 3796 BLAKE2B 72b6a3767ef40513e5603b77fabcfdf1325fc816cb594e90b9c8b0a20d0038fa776ece823e2760fc91cbe4343b422157c586562086ca21e9214534ad0662dbeb SHA512 534083fb048787421d67ec8acabeb916771f083b5aaf97489fbf052c54973a4aad6871e0ec58acf6d79dbf86668550c3fac839ac0b9a89c3c4f44bc3f72c2de4
 EBUILD elinks-9999.ebuild 3629 BLAKE2B fa87e6e3a6cb4b3f923946a74b6f340061c7fd27a4d67bbe8a5dd0f9009d28b4d7455dc915175328d38ddeece595ba561c2098d3cfb661d9c25627f2ad62bd30 SHA512 c582af6ef04296b515da6aeed539a96c9eacff28a8e46a99213080c51e44a2e357e59575bfced0e0db63d1c97cb9f7f83562941a8715d1e3cc4faf8526368be8
 MISC metadata.xml 927 BLAKE2B ea7f56a26c59b270a274dbd2475e16769f6d5650a7fb8427acc5b2f359f01e37c276b90946e365afa9e7c84278343fca93e55cb576dcca6848d0a9a8088c41f3 SHA512 345cb6385e1f03a494b0b2c77379032c0e28af1277091e17e0f823211d27d87c81b62063e382a8f19e9e635cb01b02cafab63f1154863031e7679dbbbf60921f
diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild
index 0adcb7efe218..5a3f8874262c 100644
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ b/www-client/elinks/elinks-0.13.5-r100.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/felinks-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
 	lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index cebd65bbb38a..da283313ed70 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_92.0.4515.70-1_amd64.deb 84052376 BLAKE2B 4c410db621fb46c0d2a78d4e20febea976d27db8640123a2d8a950d502e01bdbd234d8d42a28fc74b1a943f6d73ac97a9f263d56d9e83417585d6ce23317941d SHA512 2d353fd694452e6effde99d1a80984a252188a891549aafb5bdb3ae331dd0e6953b1eb4134c5d4bdf498b5d10469981e0d9d469c00d90579e329d4ee0acca09b
-EBUILD google-chrome-beta-92.0.4515.70.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-beta_92.0.4515.80-1_amd64.deb 83997848 BLAKE2B 232dc1fa14bce6419f609f42f5ffe257aa9fe64a5b01ff6e058026c0e89ed86043935881cc1d930b9b0ad58785b58b01568f25c3436e0e5f8901b0cf18d732ad SHA512 d71c9f6025fecb4b40436c8a8624376323f652388043987d2ce66281501043046952c0bde345ed0011ea8b4c79bef724d2bb9e887fd216ce656326048d40174b
+EBUILD google-chrome-beta-92.0.4515.80.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.70.ebuild b/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.80.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.70.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.80.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 97e37242bdfb..f6eb22e92d4f 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_93.0.4549.3-1_amd64.deb 81722864 BLAKE2B 04a6d233879e0bcb819ad9ff382d3864e7f7b8af22c7311d0578db596b11e844522cd8f69f04396670cbf72a7e21a103a84641bac1109c8dbbe637ecd6c74d8d SHA512 ad71f088c2dcd5b7bce0d75a8b733f99a1102b13898ef3fc453acdc1cc13affc8664dc3636d2ac16778e8494b5ae953e8ac10087db744a50dd531acc2f8d268c
-EBUILD google-chrome-unstable-93.0.4549.3.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-unstable_93.0.4557.4-1_amd64.deb 81938736 BLAKE2B da06bf54a1dec12dc65c5d12cc22e941d7b2f425fc26e833b836722446acb56f5c1248c65988654f2dbd410a9ae70266f8fb9674674a17c289cccd7eab5ce2fd SHA512 823073884a9947c93899a8aa0a61946205731549b15852f435c3b8c7733bd6457096459c445f5334db0d0ef81370971b7f3fd33d47eb2d18a592103c31852d2e
+EBUILD google-chrome-unstable-93.0.4557.4.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4549.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4557.4.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4549.3.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4557.4.ebuild
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 02df4658fa71..a285364c584c 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,5 +1,5 @@
 AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745aa2dd8b2455304ff3add46152e3844639fc033d686d0d473e8abc1ba148dbaeecbbd8965e6d941cc75564ca8 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674
 AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
 DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
-EBUILD lynx-2.9.0_pre6-r1.ebuild 2527 BLAKE2B a5fe03ffc79f0da8aab7e265c848f070bedecc03b50baa5c5c09934ba91cdd25b4949da8a18a89c9deb751340bdc8279b4eb63f28c23bdd3d793a74ff8d261ec SHA512 58505d67dfd42914dbb8ce85148d28c6b343c0d2922cbd23e12cb710d62298328b9b64a06762cfd0ac33a7f90437ce1e115661871e3fcecea5346ac05e664e8d
+EBUILD lynx-2.9.0_pre6-r1.ebuild 2534 BLAKE2B 66704dafefb5c8e6a87fbeca84068474bd688e424eabd63032194c8aafccd9feb0662482ac4ee191cd05fe4d61ba8f58152bafdcf714d93f7a76eb776e80ba75 SHA512 067a44bc79bfcd104f352d9952541072511aeedf7b5cb495c59d84f9d1785ca6985090933c12964f94c7bde079813fc420a7f2b75a7fd3238f3bccf6f1e906f7
 MISC metadata.xml 537 BLAKE2B bfecef317392ccba874d2291fd60140313675be5a4e503f2ac9bec1c20e817582d98800570188082de4ec23bc5a15b5b4785dddc79c907da2c553eec0022026e SHA512 068e36de4d5883757a52b05efc3180230521f58f7b3e9686a09f0841339c9f4c54104e558015aaddc0b9be74602b76fe667d995ff7b4bfef810124d21f6ae6dc
diff --git a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
index 84ad6a9d330f..1b0d91e551a7 100644
--- a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
 
 RDEPEND="
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 919a192eedd8..fc24b29eaa29 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_93.0.910.5-1_amd64.deb 102676294 BLAKE2B 3396908da6ca9697d377cbfa7ff75a1491f450826689270edbaa6fbe92cc4d8d7ceece8cfa0c5b85a4339232d3ea409ec27178cef114c6dff28e6b3c9155ff2d SHA512 0ab0aac72104890d0839584bc1b52bb4e97bcd90cf7e454f954b6fc1069dfa86acacd5b327d7939bbcd0c8a0023e9927e299d962e2c2fe9c054e0acb827949f0
 DIST microsoft-edge-dev_93.0.916.1-1_amd64.deb 103556490 BLAKE2B ee34a0f126184b7dffd87313f40357c0bb8c8aaecf4f404b352068c7e49cbeee035e6d61a1110e21b7e8ad5ff34dc6d80b039486882edc6891c9545895773bf9 SHA512 3405b3d36239d4a77134ca3ca923d9b0c44548ec8405523d75a138605074e42342cfef7848a760e4aa16dadf9b653055791c5664366a3605d9877bd50f69639b
 DIST microsoft-edge-dev_93.0.926.1-1_amd64.deb 104014232 BLAKE2B 67f8d21e0a88bde8190d7e1d284ddc775073fd8430594505916c7af82a532f7a5cd77194096bd3d4cb1dd9311010fbe635dd7dc5ee7a583aed97d4c0070b3099 SHA512 68ab0860df68c61dead78e633500b6d66517ed842b67919e725aeb92a03cd711900ad851a27a2ac2af93adab0013359d70ea0f880f7b47287f53a00b3dddaa1f
-EBUILD microsoft-edge-dev-93.0.910.5.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+DIST microsoft-edge-dev_93.0.933.1-1_amd64.deb 104478964 BLAKE2B 4170ce02f723ce3ca37de84e44cda1f85045c0bf8272e9f055fc5619cc6f33bf5dd1716224d5fcc4f24ce25d634e87d94c5c4fa19954d09c325af82a61b1bec0 SHA512 31672076b2535d473d05dcb3388423fd240d57794dc6bc8fa149f380f9f31abc32399907564e341d2c46d38a3fa99acb9f5c92becf6f4ddd3777e57ecd2c9e74
 EBUILD microsoft-edge-dev-93.0.916.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 EBUILD microsoft-edge-dev-93.0.926.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-dev-93.0.933.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.910.5.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.933.1.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.910.5.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.933.1.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 6042376711d0..d05a9850ace0 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,9 @@
-DIST opera-beta_77.0.4054.19_amd64.deb 74518136 BLAKE2B a4ebfff4eda040eaec1c885825d4e1ca12113daeb2a911ec8c761b0f21d4488a2e3a92617dbbe560952810bd16e427a69e0fe0e07e37e76eaf32541d31f4b7ef SHA512 a4d0541064e845d54e31c89d1bae54ff1ea6460104829c3052a61376718c0472e5318ae25e7f6341e27b15639bd25abef221c53e720f026192ff56798e4f26b2
 DIST opera-beta_77.0.4054.38_amd64.deb 74524540 BLAKE2B a62a16d139561fa29d56cece83768815e220e1da8e72b25e09d540c7180f53b4c5d7aed14fe947864b69622816476a89f717689e7fd45f046c4691929996b27f SHA512 110ddc0c6bb6d9cee9f56f363669bc847ea90c2c86257a6e146dc87fa04f8e89ee4316de83d4243699b31724a5214fef4715f11c5c56cba11534ad829533512e
 DIST opera-beta_77.0.4054.91_amd64.deb 80822784 BLAKE2B 4d13e5e6f978f7cc3094c45e097485c64b7137ce6bc8a58c7a41092ef40dd85c86547750b2aa8e9b90b896bb5c1a2d87f852ce3a7e54e2c6711d82f62adb6b63 SHA512 66ac1dafbc4c0ee45b5b1e07efc940e5b8865cab5f5842f386c06de0692ef4bb186c4d306e066d19d54a70b2fffe071f106b2a753a7cc0f28d46f311d01e4f3b
+DIST opera-beta_78.0.4093.34_amd64.deb 77036960 BLAKE2B d83d5075a8c8979d258c204725f28004fac3f81cdfb348de707aab0baa118c734b67a201f330be87ea86f4f5065c3d4172b301c2034eedbbfb8e1a6e6fabc54b SHA512 a239612c25aa98e78c8c7970dda4dc59e9b7a0e4d03207a0f279987c93e74edd7b05dedd6cdf82b308ac806b90ff936601a65dedcd5a2b95f4e74005e979d151
 DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
-EBUILD opera-beta-77.0.4054.19.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
+DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
 EBUILD opera-beta-77.0.4054.38.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
 EBUILD opera-beta-77.0.4054.91.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
+EBUILD opera-beta-78.0.4093.34.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-beta/opera-beta-77.0.4054.19.ebuild b/www-client/opera-beta/opera-beta-78.0.4093.34.ebuild
index ac62c3431ac4..5f5790fcf46c 100644
--- a/www-client/opera-beta/opera-beta-77.0.4054.19.ebuild
+++ b/www-client/opera-beta/opera-beta-78.0.4093.34.ebuild
@@ -30,7 +30,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="91.0.4472.19"
+FFMPEG_VERSION="92.0.4515.20"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
@@ -60,6 +60,7 @@ RDEPEND="
 	x11-libs/libdrm
 	x11-libs/libxcb
 	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index bac3d3b9d331..eb0157afb8a0 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,10 @@
 DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B 941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d SHA512 85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
 DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4 SHA512 ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
 DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B 7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c SHA512 608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
+DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B 6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39 SHA512 1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
 EBUILD qutebrowser-2.1.1.ebuild 2791 BLAKE2B 90a2a6018c6cd28e57dcd0b5fe650b49f370f7384bfb6b69a49cd92c61db14fb2fedcc59fdd7a8ff6a7d0599c37049e6e6fb1676f5dd899b50de1753c51244cf SHA512 7c28e82135f002a852f8960078531d8eecf4bbe02ec504e2a70d6fdc26f492436b76d59756a3061ce5c292e9a625f2be1b6974ee3ef7b7f824d0705f33f52f43
 EBUILD qutebrowser-2.2.2.ebuild 2879 BLAKE2B 37e7737aded4f27ec3964e9ccdf7d3bd037a4352c53b68b1fbe7e6744c0296f00c56f4f0b6513967d90f4b18a4a433966c4879582b74bd869a17ccec3e82b304 SHA512 38f1269b86a9bf2ca9f27f0be6e164c4952fda9117a716110bb0b1703d502fad8eb658427bef7104033f82444fe601c6f3ea0473001d4ff0d5e655d71252ca25
 EBUILD qutebrowser-2.2.3-r1.ebuild 2677 BLAKE2B aebb54126e50c2fae543e956e307999d76acbf06d5d085646c032e15251bc8c490a6d0a041464fe8612535c2efce6cfbc251e87befc7778bf3c7ee131483de16 SHA512 aa0048e53dfc4f7bb8ede59d23e32fb0b7e7061389e92e78a7f75d6ecfbd8ca4b093b6dd52ceffb7af67dd0fcf07f6ef3b9ab01ae89d7c319fd6978e64fcb87c
+EBUILD qutebrowser-2.3.0.ebuild 2652 BLAKE2B 484d6584fe5bc5f50d64bcd6bb95ce4bfd2aa1bd17f918b1b4a0896240ab7f6950a4e30ee916dc2bd3b9199206aaf1608a7fd515f6f8177529338524c218752e SHA512 e5462b578c441d5388b5e77c75bffb733bb061a46efef642f6a72d155187613a17e86f120dbecea5a6e4bceaa6036fafaf2f2dff8d792a0d905cdff646d44d2d
 EBUILD qutebrowser-9999.ebuild 3071 BLAKE2B 32ba24464d629b3c41b44fe154e6ba2329e58839e499afe0cb5266e0cb9369ba189587e993b4dec3597af7d64d95daffe5e0837a0d3d479ab3563cea087700d5 SHA512 5a655d6d23a18f5bc9c101861d426195513984e3a454c4031963d8dc1d59f0cd5139f7b4459a515a22b31ddd774a3a51be0a65481d8f6fe78602ed94469ec46e
 MISC metadata.xml 842 BLAKE2B 3604877b315113a40ca442d5c784146627bcbec414ec0d8874c855d53433dfba4b2dd11502086b6f569dbcb8d3efef2662de8dd45c98246fc67ba7d5db70ce0d SHA512 62afaec80991b9319114f49be626805a11d6d21fe10f75791ff1f4ccec73d57a8c5fcade1c09b6483f44ab4108a77d45795e4133f4075363aafedfbb8b16fdb9
diff --git a/www-client/qutebrowser/qutebrowser-2.3.0.ebuild b/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
new file mode 100644
index 000000000000..dd61b8b71581
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+adblock test"
+
+BDEPEND="app-text/asciidoc"
+RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+	>=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}] )"
+
+distutils_enable_tests setup.py
+
+# Tests depend (misc/requirements/requirements-tests.txt) on plugins
+# we don't have packages for.
+RESTRICT="test"
+
+python_compile_all() {
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+	insinto /usr/share/metainfo
+	doins misc/org.qutebrowser.qutebrowser.appdata.xml
+	doman doc/${PN}.1
+	domenu misc/org.${PN}.${PN}.desktop
+	for s in 16 24 32 48 64 128 256 512; do
+		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
+	done
+	doicon -s scalable icons/${PN}.svg
+
+	insinto /usr/share/qutebrowser/userscripts
+	doins misc/userscripts/README.md
+	exeinto /usr/share/qutebrowser/userscripts
+	for f in misc/userscripts/*; do
+		if [[ "${f}" == "__pycache__" ]]; then
+			continue
+		fi
+		doexe "${f}"
+	done
+
+	exeinto /usr/share/qutebrowser/scripts
+	for f in scripts/*; do
+		if [[ "${f}" == "scripts/__init__.py" || \
+		      "${f}" == "scripts/__pycache__" || \
+		      "${f}" == "scripts/dev" || \
+		      "${f}" == "scripts/testbrowser" || \
+		      "${f}" == "scripts/asciidoc2html.py" || \
+		      "${f}" == "scripts/setupcommon.py" || \
+		      "${f}" == "scripts/link_pyqt.py" ]]; then
+			continue
+		fi
+		doexe "${f}"
+	done
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "PDF display support" www-plugins/pdfjs
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 37e55f242a84..02cd80570ad7 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -5,6 +5,10 @@ DIST vivaldi-snapshot_3.9.2289.3-1_i386.deb 82584664 BLAKE2B f5447df81bf87b128cf
 DIST vivaldi-snapshot_4.1.2339.3-1_amd64.deb 85079208 BLAKE2B c3d32b5ef68cf8e8f5a260911c10d38180c7efba5005fbb57f5ac36cf2a5e521766d502e51c80230b23557fae1cf1a2e7cfc1c531008efc500a2aab3fdc6b87a SHA512 355b40e4c74488628e762770c2ccffc975f703c3b88ddc4f03b1c89f04e6afaa12e8ddf5b0588d7d56b511477580dec6b4489b41fd0167af190aea0707037577
 DIST vivaldi-snapshot_4.1.2339.3-1_arm64.deb 80603108 BLAKE2B 7f39d0d6ae13276f54779e2d7a1818c3f03dcdaa693eccfe1e0b63c99d5b42bff7724bb452e8481b2f190e47e749413022563c26f2ac3735b364d2ce13974f41 SHA512 0cc4885f6b87a744f8296444532baa11bafa30554fb167e1dd1d38c4f9043ce4cd1f3c3d672b4693eacf34469e264c2579ea10dec0330fab8e82dc65723f8809
 DIST vivaldi-snapshot_4.1.2339.3-1_armhf.deb 76480984 BLAKE2B 9e463d3f5858762d5311349e9a61b8b1a5f3657645939bd6702dfe6ab6e97f484dc11135a9205d94cd0d9073f3eb121a7ece94ba99dc378340cc9eb856508a2d SHA512 f70d5d0d74ce0aa3a4eddc98fbdd52d45d4d77c955f9f0f5e4753e464a96b63609b77381e1c820f94652bc355fde1a8dc58d33bd6e40144265cf3cc3a5243792
+DIST vivaldi-snapshot_4.1.2345.3-1_amd64.deb 84486756 BLAKE2B d5dccb6a46036962ea15a0cec8a86af76b1c3532d1c77eb1cfbddad5cbeafe4c14ba0b8bfcf1e400b4e3e62fe99f8a9058b358fca2b0295be78db9c0d1416b07 SHA512 2281bb9ae1236cc97292401170e36d92d586f17fec83d4a60f339d926fd55c6c7d1c68e8a5a92d6242c95be656e521fb9b3b06c9804beeb94694e0e33dad6b17
+DIST vivaldi-snapshot_4.1.2345.3-1_arm64.deb 80613128 BLAKE2B a4450a40bda954d548716e66ebfc8bffb72e8fb45dbeeef59fe2baea6482954c78c17ea76b8d43fcc389121e88676fa1bc82071caec34658dfaa92701632e9b7 SHA512 41464c87b886f68a654a42994daa688a83fd8589616b476a22971c8c0ac605831d94155dff1bd168914b63cf356f380dc268c037c2c36beca3e96adbb88a5213
+DIST vivaldi-snapshot_4.1.2345.3-1_armhf.deb 76498924 BLAKE2B 5eb1a39b69adf07ec8e6f670a778ccd1046b4c26a66c3475e532a1adf410b6be8a1c98df90b320dc90611007dd6b50af1c666c2bd3dde74d659c7eeca88fad97 SHA512 7c54ac4fc8aec5e3830bba7d66261065ee1c0df08b7802f71e73ea9006e8c1a86a3f91fac7963b0445f3a8d4157c98b35f741455743d944e1ee0f77cff271fe2
 EBUILD vivaldi-snapshot-3.9.2289.3.ebuild 3342 BLAKE2B 6cedcc20db6fef8468a74fa7b0102b7e0de08029e179dfac685f636184a7250f7494d2a5b52ea2e3ecb9f73321e9cb8f57e2aa8ff0a7c86901c7ca1f6639f301 SHA512 8a2ead0fe7aa024f0565e6ed4effba0dc47d51da8c79fea96f7ada0deb504115140b3ef4e97d8a97e65fdea479b27019ee34ac11f31c87e5233067ec6af0db0d
 EBUILD vivaldi-snapshot-4.1.2339.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-snapshot-4.1.2345.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.27.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2345.3.ebuild
index ba5f6dc05f73..c2409d01a97f 100644
--- a/www-client/vivaldi/vivaldi-4.0.2312.27.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2345.3.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+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 )"
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 85e496d15226..1a0b47a71496 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,13 +2,13 @@ DIST vivaldi-stable_3.7.2218.58-1_amd64.deb 78992560 BLAKE2B da8f3eacd8d0c826006
 DIST vivaldi-stable_3.7.2218.58-1_arm64.deb 71046428 BLAKE2B 8f0dd3e845f2e4587d238c8f48447e514ac7605acab8d67f30c30ce2df04fae600382218087aea68f75621887f5a71506389c81f9b31614e20d3d7611d7bfe0e SHA512 2126c24ae8a7e4370f4ced2b37580871394de1f38a02b88d24c974ee23c13a4264ca8c11e0c5b7ad542812531898d9ee425657d9c7eeba4e08c718c07c7337bd
 DIST vivaldi-stable_3.7.2218.58-1_armhf.deb 69900368 BLAKE2B a85b97405c80dd10907d9b0b9846b8c2b1101346cdce4b19ddeb1192de64c49056e086903829b30b9e6bb4928c3de500138cda460596dff7c2505fae0661d6ca SHA512 2d37b2080dbacbd6986e9d346be4e0aefd48a25f039668e2c1e697a025c294e4f945fdd3d86ae34688335e0d2b496355461756ae650e0b0fd212fbd983494ae0
 DIST vivaldi-stable_3.7.2218.58-1_i386.deb 76040556 BLAKE2B 4710993024a401a8b9e25dd5cae55d5e5077423a7f7bba7af55150675d7848427f6bdca1fa8666f338b7609cbb11254c75df901e3c33fc6b75c5824c17808b71 SHA512 d5a8658d80aa8a4b5ec38491f3a4f6fb16c5a0de7934d4f7f518efaee36afc1d9585695c121f5cd65d961ae134c7cae0cd6bf0b07858ef2f906d715ca424ead4
-DIST vivaldi-stable_4.0.2312.27-1_amd64.deb 84282184 BLAKE2B f3d4a75ce7cfac096e2e6fa5b76afd1ada7d35299aa128b7977affa85a1690b402efae586c465ebf5ff00f253643620538ca27b8532e6af42da7bc4eb20b0757 SHA512 24d338396c834d28ba5fa9d6a0b39a4c6d7b149abc5f5774760c3327c147718dfb72ee4709a2ea9b5516f8db20b9610ddbbbd6528fd7fd5b7f047017bd174495
-DIST vivaldi-stable_4.0.2312.27-1_arm64.deb 79750920 BLAKE2B 02c80f783548639f9514f8c0b3c2979b3e1752d6d4ff5363b148173ba4023ca83acf5492307b3ea55cea8dddf0f8a241ceb51f1474aa083824007edc6853439c SHA512 2bd374762ad03db2bab670bf58bc43d71d0148ada25a763a5fe5966b7f7eab0ed30c8a2b6798f12a5d84cff45963d046cab892631988263ff5f645b18a48d21f
-DIST vivaldi-stable_4.0.2312.27-1_armhf.deb 75851284 BLAKE2B 7d77d47ea4b25df635f85f7a0407ad106e605f5bfbc02605d80deccb0af3cb65f68ebd499e85be85bc4835ab788665b4a5791a6a4e457359b079d9a3706015e1 SHA512 50aec87f3ea4813859464006a5266c599bdda92a53dd870084efd7209f07cca313602d3770ae8a64af9296ce0e8feb06f809c838f1bc835da8c158fc29bdaabb
 DIST vivaldi-stable_4.0.2312.33-1_amd64.deb 84295960 BLAKE2B 5624a91b3e957056eebac9c3d2e11b8b15a351d67d4cb6d42256ba04ddb37c876838cc492986703206ca57d079f0d06f146e941ea29565fb11f62b11ff451e46 SHA512 5d237d4bc6652091cdbfc2595c9f33de11c16be5c2d8b0c498d4e1d43c03501bb49b865422f78519a1762ddd18f7c566fce7fafc8fd4126b0baee23a158fc687
 DIST vivaldi-stable_4.0.2312.33-1_arm64.deb 79737104 BLAKE2B 8161941f9ab7dd427f9b117f51d60b84b16c6114ae6fadcf016d4dd87f0002a5f33eafb613e5c31cf97fdbdc00b5665a8f8226fd6232a4396fce5fd53ff58a3d SHA512 fa3d6cb5eb9cf3227c55e0dcdb0c3d5c493069a3abdd00f29f8668ce794e521e86a52c40e299e43c642f54423fbfc07b83d0e0a0713a771312a9d5f6c67d1f65
 DIST vivaldi-stable_4.0.2312.33-1_armhf.deb 75854768 BLAKE2B 63a3420e89d75ca1491eae66c4a7927e64d631fa45b3b5016f161c7730d75886872c54e0d9c6bbdaaed1a3ac0d1632b32ee62785f3f45da1d20ce6740bf096f3 SHA512 921ba73aa67413bbac2ac6cbffbf337fb35319ffc2b0bf6bcc77c1830d06260d354326a8bbc454b6127065149d633895a19c3b97e4e67cc1e0c4cb8a1e07e952
+DIST vivaldi-stable_4.0.2312.36-1_amd64.deb 84302392 BLAKE2B 96c6cde74ed82d015c042c90e82d839de56cd9de39076a17f8e0e662334504169778441bd1151e0d58403a146f84f0d9c26ba195eac9bbd3b7e2926fb2c7a751 SHA512 9635c01218278ca348ae57d3fdf37ef37726bdb495b650c29d95431b9f47355ecc90cf3296ab287f195f56f8482ae31e76a2953327a5b3e48c09907fe1286845
+DIST vivaldi-stable_4.0.2312.36-1_arm64.deb 79722080 BLAKE2B cd34349f2a7b0d7e2bd453fd8201e3a15fde904fa73e64c31acc33c68302d8bb3443379239b9b10e517a3a2112695ee4e7ed0e8b31e3563908543804f619810b SHA512 9ff85712f870490b1efd261bde39174a2f24af9a07c322b2556121004a3646948d1813256a46090fa7e443e044672833cd4626ca2ec014f9dad71ca9bd5ab22d
+DIST vivaldi-stable_4.0.2312.36-1_armhf.deb 75847636 BLAKE2B 1c32ebbcabc34b76f00927bd3902c24ec6c21a9268c8591b685c96c23eb446bc773db38c9e78558e2259b0986e561122f75d1e32c2128135291807d2cf55e094 SHA512 83ea795dc117a7476f998fb4602d59f6b1f4f0e3c13b1b1aa52bb68de24cf9faeb57821a4b3f24f16b835062b8d9fe91bea56a167702b4a9cfe907112a3c7a68
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
-EBUILD vivaldi-4.0.2312.27.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
-EBUILD vivaldi-4.0.2312.33.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-4.0.2312.33.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
+EBUILD vivaldi-4.0.2312.36.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.33.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.33.ebuild
index c2409d01a97f..ba5f6dc05f73 100644
--- a/www-client/vivaldi/vivaldi-4.0.2312.33.ebuild
+++ b/www-client/vivaldi/vivaldi-4.0.2312.33.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+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 )"
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.36.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.36.ebuild
new file mode 100644
index 000000000000..c2409d01a97f
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-4.0.2312.36.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	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/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	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 ${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 \
+			  /${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/w3m/Manifest b/www-client/w3m/Manifest
index a586c42d1548..1efc72f8c3d2 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -7,5 +7,5 @@ DIST w3m-0.5.3+git20190105.tar.gz 2183651 BLAKE2B 624fe3b8c1daa2a6d4ce21e051ee36
 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 9af449b3c9ba507d7b145e02ab00830433d67157d8fa2a547d11ebff0b9255e9121e2d1fc7fdc9725d6a101cc8ef5825e6d50f64dd97c769db55fcec5521ac58 SHA512 e25d6df3bf88179925fd1b98e7fa3f6a861d709aa33525ede6c8abf649e8426c5f7b1b97976627f155b743bb0c324aee22a18ca1b090724fb5fb7d244cc8358a
+EBUILD w3m-0.5.3_p20210102.ebuild 3280 BLAKE2B 0f556af29b905b325cd9058c1fe0538fa6561e21a7670bc7dd052068c80ad4d8a5f1fd388452b132bdd6f9a4a0a68fbf72a51b5ddd3355a9be4ca0f571f1da81 SHA512 8c86881c4c14e248583751cbe6a9fa7a41c207e615e781537d8d6f25f9548e8de1df8eb7990149000313181ad19350ab8c1e3c1d9c6b3f9d4cd2807387d6c097
 MISC metadata.xml 522 BLAKE2B 4f89e2d965f7cc320983d501b67f2dda0134745d63e98b488fb3bdcfd6dfd2ce2e0fe12f8b6fea88818166298906c661db47405ab4de1f27cbbec37ca52fdedc SHA512 1fb6f6e6121f5673e809a626f840ff524b6e58260a9e2ac5b537e1f3d04cf2371b1ff03808da757848931275751a09fdc872f431b9162927fabc0b3e64305317
diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
index 011761a3ca84..685509be4802 100644
--- a/www-client/w3m/w3m-0.5.3_p20210102.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_p/-git}"
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode X xface"
 
 REQUIRED_USE="
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index c9866c1b645d..da616102e0d2 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -9,5 +9,5 @@ AUX w3mmee-time.patch 608 BLAKE2B 1c380c5af1cfba502e5749810456944aa2eb52a3e73ee1
 AUX w3mmee-tinfo.patch 357 BLAKE2B 33ef18109515e789debcfe3a0addc67be0a69853bfda0e732ecde65c4271990dd93582c9f6a1e124679bafd75176c1da318a0c4f8d8e6310a792aea66777fa04 SHA512 ec9bb5936d55d2c2edab7c1ae025f72ddf7734a2b8c2dc152c1cb9eeba42db42c2072232924aed92f40cfd7218eafd9d57bd4bf5b5f8380569b0703a6bc1eb25
 AUX w3mmee-w3mman.patch 631 BLAKE2B b155487da7120b5e106c7b747a7cfc0d3157bdd651da8d324dc262b66ac47c88380e4ab4ed546522199ab3c3b89177b3ec83c5dffba56708ca57de0ba19d7281 SHA512 a883127315a7a5d9354c17a05c1dc4127ab7a72bb46b02592953b83bde54ca4c12f756b1ef44127f9d74517ed1ec1640ef2e187f809b15c906769f1e9e699527
 DIST w3mmee-p24-23.tar.gz 697342 BLAKE2B cdfd5752a29ee486ccb4cb174ac68aa2b93c818a088e28a8938ef308030b4baac69645e5adcf86361297f79b2473de483917f523bdd0cda0f6d0d93cc0755534 SHA512 fa74b9124e0790461ea7936411f89265c8a367326bf1bba7a5ea5f4abf748197e0926847f9860ec8d35e97f0e53bcdc69821fdd9d741fc8b18b5e11211aa3271
-EBUILD w3mmee-0.3.2_p24-r12.ebuild 3624 BLAKE2B d63307f9f26ec63846767883de6779b820078be677b542c98f23ef9ba7224483a50397e11a80b813066321386629ac79e69072ea1a129d22fddc60d25bbc660e SHA512 0a8bed3302f857e3fb6b05eaa8cd8523ccf6734c41070e27989db72b972f30f9466093822ae536425f3e2ebcd6037de9adb97d9e84631cf7090dd471dee15312
+EBUILD w3mmee-0.3.2_p24-r12.ebuild 3631 BLAKE2B 47987a38c48399c54bfc8d603807c81bdd66ac678826b2490489c9772d22750d776d05468e82850e756606db1f2455ed4513529b494943ba1b6b564d6a3c438a SHA512 ca6f7a67e9c755e08f08e8c9658aaf80b9c1db0d9fa5cd2ce28f3d9d471e5504d19a5ebfe11a5e2e319a6503da351add00c8249f0156193d954436f7b375e0df
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
index 74d467546bc5..df4f61d15531 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="w3m"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="gpm nls ssl"
 
 DEPEND=">=dev-libs/boehm-gc-7.2