gentoo resync : 29.06.2021

23 files changed, 88 insertions, 273 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 56a21a75a6c4..de3dcc74d3e9 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7d40894d76f2..16decd220584 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,6 +3,7 @@ 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
@@ -12,14 +13,14 @@ DIST chromium-91-patchset-6.tar.xz 4280 BLAKE2B 18887953453133589cfc5df58d247250
 DIST chromium-91-ppc64le-6.tar.xz 28968 BLAKE2B 5153be672aec91899d9eabe3ddf4c3d0b4b2d307e396afa2a83bf3102bc540fa62d69df365057128227428bd3abfc8cab9203fae41e5150191025d8ecea935ab SHA512 78071d204bf04a13a132a63a3d268a0d6d05a895c1ee55a41176fb5cca975c502e69a83ca0388ecea92c041f24235c452abdfbf0ee557e93db6685589fb9428b
 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-6.tar.xz 3764 BLAKE2B a7149940b1371e4bd295e6038b87cc13f4edf8d8ed286d9d8d0e63144c2546de39564fc203a4b2e185267e46398efd0414c1f695ee31c78d33a6cd8d7b434016 SHA512 2f104901271d42762ea27f7c8a017307bde7348ec6b84d0c85875a07bf3783ba43bdb886fb3c6376753b6a14102b495a28bdc7adc611992440d2c1345aea035b
-DIST chromium-92.0.4515.59.tar.xz 957613080 BLAKE2B b6d4009e9c0cb90d3c16bac95d383a243c0e0660a521110bb188c1091aa97d84de85f5766e2a1ed908f78637ea786778030a0ae430ddfa8a4505feb5e9385fd4 SHA512 d7dbc569751cb4b3b3fd97429cfda5577d8468ba201914775b27562911010719c84ea2380b11f07c7b5965cd8444676200ae190f06a19e35586a0980d085968b
-DIST chromium-93-patchset-3.tar.xz 4848 BLAKE2B eb46541d283f8c17967ad45ac36838f9f46f20883eb13260c5804aaf805736283a7890e5f76ab7c1dccfd218bbf55cfbb04378c116c4e390a575c91511308aa7 SHA512 be61f3c907899121e08394647c276f638201e6c1a2d682fac0e559117866e3c1c40fd6283159725504d699b6ad6ef773e980e0e98487aafb80f1c458a3b55959
-DIST chromium-93.0.4542.2.tar.xz 988397092 BLAKE2B 9491aff480ca5200b0ebfa0ddb2082cffe7f86475241d99c320a4c415e36df81696d14323219e8d2a62ae0cc18bdbc03a8f5dff57b95acf25316b842b9c1c648 SHA512 28e00b6e343e74a6abb0d9c60017e37c6ec5e577ac292232cf7d6f13176edc1663f2c4fd5a18a5436b76055d9ac7ec2b4c477dbe59a9a963bd62d447aaf8c56c
+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 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.59.ebuild 30444 BLAKE2B bc0ab51c428747f0c2b020b52a91f67eaf39bd102ea6cc9754937f2e925d644cf6eaae49ba8782c523f05b80f3e69ef3950f9b467ec4a27fea0668110afcd7b6 SHA512 4590741bc98efb9d734876a01947683e2ee982029f1119ce6774095fcb168d818807727e0916feb2fda3bdbac750b8d3743dd38c8450b13b9eecc3182e37be74
-EBUILD chromium-93.0.4542.2.ebuild 30083 BLAKE2B 3b74444429aa48953176cb12753e533baf7c0257373e7c4f1463da3527dec61ca08b1e0e60804dc43f1167cee262db5be9e1e27c652fb1f127927d30e32b59a3 SHA512 95d9d50f1534afdb11bc397eb1207ff8783f27016b00803681c13605a9e06b551ccfe682e71d3e43437d4aa2b6891c4f385788cd4b8cc33a4904717c0811ab72
+EBUILD chromium-92.0.4515.70.ebuild 30444 BLAKE2B a314df934fe51f40e3704b53a8a80dff887c1d30d7e061a0ab07d84d3ef2abde18729319f5f5f7d620f66ff5bb910fb76efb1f10c61ee5b36df8cb7a5b84afa8 SHA512 6850e0abf148208e97204fa2e2969f3fe4e59e3dbb1c7769cf1b35d26e74625fd5bff32d6fed30467eaf1b749327352d2badc9abcde97f04da0fa4b38f6a86be
+EBUILD chromium-93.0.4549.3.ebuild 30057 BLAKE2B 78cd23aabc7ce6487291fac65db3294d8071336b93ef98d07d8da8d6439744141f77db2ebd4ef84e54c5f6409024671e5779237cfc86f8e348d177c7cc516049 SHA512 d715663b8c3277cadea8a14e5d31b87b7ecec790183bb935dd5b9a5aba384fe46fcc7e5d525e7f1eca83aab12f4e3ace9da25fc28b6eae3d886d11f195dc896d
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-92.0.4515.59.ebuild b/www-client/chromium/chromium-92.0.4515.70.ebuild
index 4d57fb73b33d..ed824b3cebff 100644
--- a/www-client/chromium/chromium-92.0.4515.59.ebuild
+++ b/www-client/chromium/chromium-92.0.4515.70.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="6"
+PATCHSET="7"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 PPC64LE_PATCHSET="91-ppc64le-6"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
diff --git a/www-client/chromium/chromium-93.0.4542.2.ebuild b/www-client/chromium/chromium-93.0.4549.3.ebuild
index c99ac3f994ef..2895f1aa216e 100644
--- a/www-client/chromium/chromium-93.0.4542.2.ebuild
+++ b/www-client/chromium/chromium-93.0.4549.3.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="3"
+PATCHSET="4"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
@@ -234,6 +234,7 @@ 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"
 	)
 
@@ -262,9 +263,6 @@ src_prepare() {
 		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
 	fi
 
-	# lastchange.py requires initialized git repository
-	git init -q || die
-
 	local keeplibs=(
 		base/third_party/cityhash
 		base/third_party/double_conversion
diff --git a/www-client/chromium/files/chromium-93-system-ffmpeg.patch b/www-client/chromium/files/chromium-93-system-ffmpeg.patch
new file mode 100644
index 000000000000..7ed5331c527f
--- /dev/null
+++ b/www-client/chromium/files/chromium-93-system-ffmpeg.patch
@@ -0,0 +1,25 @@
+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/links/Manifest b/www-client/links/Manifest
index 4a5b7757ecbd..d1e924971af6 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,5 +1,5 @@
 DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e
 DIST links-2.23.tar.bz2 6521143 BLAKE2B baefdadddc0d44511488ca1a085a45f3235b9c58ae6013c1efce495a33e86b96575eba6a15df4f14ea82b7d1ffb69ea312d5d5223ba9c605709bdb5d153ef6cb SHA512 3c233dab2e7e5ca72f582c5af9c5799b3d6c1a5a64d4e9e0209f78f347a245dc760c2340f71839fd42e1c9f358599b8baa12aa024938f2ab1b6424c8fb0b9a7d
 EBUILD links-2.22.ebuild 3377 BLAKE2B 3d20a0be3d96ff064abc2c47895032fd5674cc1123e89f13d69b40a7208e821f13aab9f5ad5c50e87cae272059472e1c57d0ae3e095cda73171bbc6e8d56b584 SHA512 1d67d4b8d420894d6dc0d95ad430ab316204055c3bd5b5413cb7c277d19da218bb98d78effe4c47ab6f3d4a9a987108835ea46e40d2e865240e3ba429899cfb6
-EBUILD links-2.23.ebuild 3384 BLAKE2B 15d8e51a1bb6429f4c8da921834866ca2a076fb08ddebb4e9a919bd1ce2539a274e7d5079d14f26cf74ea704602dd9ff8ac2ccf401f86b693d37a01fffb090c2 SHA512 43cdfca23b0ba275c147fef5878f93805dfba5f084eae72527e7ed74e2c957d0d9e5f196eca34752202c89bd00379338a3ab4822c82e03ae2eac0977d40ff5dc
+EBUILD links-2.23.ebuild 3379 BLAKE2B 55ca3a2debab6d9957f524f1183f3e4527bdcabfff8e72983e42653b07c0bcc2bc8654ffbc53cdbd0ac2605cea55823ec4ccc1251ef2b707f8b932af9b5a84b3 SHA512 1d8169a417fd045087e97368e28d4e20c1d2fef371bf113ee8d0013c4643c125451170bf9c1f825c2c4562f82859b4d2324708553170b897337af8a78d233fff
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.23.ebuild b/www-client/links/links-2.23.ebuild
index 0b91e96ea46a..78173bd1d1d7 100644
--- a/www-client/links/links-2.23.ebuild
+++ b/www-client/links/links-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 1c96b5243286..54e9b5bae385 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
 DIST microsoft-edge-beta_92.0.902.15-1_amd64.deb 101256948 BLAKE2B 6fea611d12041d3d575b1b86c70ee693330dd6e4f6b2b476228aabffe6fba62140d373b4c7d9654e75f3cb86343f712413d4374e88a2310b30270f87f78db2bc SHA512 64d36b08a68abee0126128ec7595f31c8ecbd5200a2fc86c83c3ecd2f1dc2bb870feda66018b512d5f7a7c2a3b8e29a1b22ea1f90d5ae591baae96d4f9923ca0
 DIST microsoft-edge-beta_92.0.902.22-1_amd64.deb 101892898 BLAKE2B 706b1dcc4b2f419f62fa578672bce71fb75809f06ff36938d33f1434697b8f72c9eb07d3b9dcf99a84a9739566a35ba8a921cef1dbee64e3a4509f4290dd1321 SHA512 fc4cbf6ec062acca48efef3cbbc1ceec4bfcc92bcc79d243e4ede658e394660b514687f5d73d1940fbc962c59e9d9bf271e6226bfd164978e54dc9974341d980
-DIST microsoft-edge-beta_92.0.902.9-1_amd64.deb 101093516 BLAKE2B 061de15a6357696de55b5f56ae5d0e5c4aa2b9825184d25d8f7ca994315ed02a5ecb6b7b34a1a470348724d45e8eabbf1efa3d67defed1dd869d81de16b82a8e SHA512 48bc0ba4cb87c6eba4b4923e4f26cc54fc74051252b0f682719e5af7eb124bcfed4c6e99b5a5df110523de29681f74aee2530dd3e19bc740b8669cc9a5d7d023
+DIST microsoft-edge-beta_92.0.902.30-1_amd64.deb 101794110 BLAKE2B a7b61913588b974d92bcc131f604824b548738f38fdd0f6e60ac643fdd1bb874386cf6dc875a7ed3352f250b223fbf1b12934d8e088e747210ceafdf1b8b5870 SHA512 6ce2e36a7d27123139bb3c19287981195be7efddab7a93c29ff59e2449e2b5310a51ec45a3fdae63e56e2ed7af348ab7388c086490f63bd7d662010c0daf6d85
 EBUILD microsoft-edge-beta-92.0.902.15.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 EBUILD microsoft-edge-beta-92.0.902.22.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
-EBUILD microsoft-edge-beta-92.0.902.9.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-beta-92.0.902.30.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.9.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.30.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.9.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.30.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 415af1e12d61..919a192eedd8 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_92.0.902.8-1_amd64.deb 101668540 BLAKE2B 1cb6a58c18ad495cf753854189a789056589d485a0f456d06ed18ec299f8c1a93e80a2520e75fd602287102dd36bd9531d0dcf86da20f35f69523beb7862f721 SHA512 8d535da4a58166571e8d50085beffffa5f2a9214a8dc91e6c3004c7cb2405965ad31601184ef930746a48b405992c2e76a3a9a6dde1db2a9aa2672aa041016d8
 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
-EBUILD microsoft-edge-dev-92.0.902.8.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+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
 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
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-92.0.902.8.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.926.1.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-92.0.902.8.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.926.1.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index c06fe6c60892..c3f3771b37d4 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,9 +1,9 @@
 DIST opera-developer_78.0.4079.0_amd64.deb 75593860 BLAKE2B 2e3ac010e6963411c662e9766a4d44490404521c2e211d959d96c78335628ad832e709e3358ec9374c0c9cd6e6bc11822644d0f374ba160df66b015c41c1d690 SHA512 5e9044c1755895a5c5a8acb8ced92eee2d6047714f7faa4b163cd23b9fba4414586f058d1e165945ee150106c30ec0a6662c4124e2f76dd910f2f67576894166
-DIST opera-developer_78.0.4086.0_amd64.deb 75539676 BLAKE2B 2686d000c351fced3fda6ca2024bc64e8087113646b683933d32bba60b36c6bfdcf2485161bb15f8221c7f25f9e7379060bb570f9e3917fd8c9347af8ea3b64d SHA512 8a16e68e31f10a7579722caa11228aa740b247a8f5db74057a97d16a9c2b10bbd0b1b0a6b3efcb06bf56da6117eb799f41b277ab2fc705c87c51634c00ab46a3
 DIST opera-developer_78.0.4093.0_amd64.deb 75190012 BLAKE2B 342eebc815364866eb93dbe231b7a24a09f130809de8266c0ec0d9808aa2e433200fa4cf51d823564020e56973d831c10fe54e72a8f34822be4eb917145b83ec SHA512 e470122a7490c9009a28469b21108cafba232ef040027e8faea190551a97b1dfe60a7e2caa092d6d4459cf67b3cb22aa5d0da73384fb4528c24a6d925f840691
+DIST opera-developer_79.0.4100.0_amd64.deb 76878004 BLAKE2B 285aa5b687280a0d76e06ce40d7ae3b20e172e3b8a1d8da7b66b4f029dc203581cca7e4b336373bb3d78a5cb66ca50ae38a535770225f75197cf4ebdf4248ea5 SHA512 346ad075121e114d3efd96e8b4dca5f5e502c71dc9bd25ed6c5699e5b8a2d100e74b6bfad3d2bc7ba482025856c155f88c85f5a0ec6ad50dcdecde6d6238d1f5
 DIST opera-ffmpeg-codecs-92.0.4484.7.tar.xz 1384356 BLAKE2B 6032d1f1641e5c5e83ea2315e3774b97a1aa2c5740095d5716b3d6b31ac31d4315a32195273ac5a944578b8c28128802d21e226393f60bdcf6c3a6e73e9b91de SHA512 b152d0a19151b51a1eb9c28946ca7cbb9e6b389fd440554853de0e7c8cf149e805214b051aca9c579988ec1000368208a42afe88cdd47b6290c5da3d5122d1f0
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
 EBUILD opera-developer-78.0.4079.0.ebuild 3041 BLAKE2B bff60a2ec2a1ca03249a3ce40e72a5b099dd9c804207770329ae56f8e007e481a376ea5d9c26264fe1007f74e3d6612f69fc036cfb0e35791f57c7612971182b SHA512 bef1e4d05df3c58ec1b52ee9bd25f5af0d8b021954766296a891c1fbec505689dab7887dec373f5dd9692c65dedc848aeb2780e7f43ca30ec5c213510e888e3b
-EBUILD opera-developer-78.0.4086.0.ebuild 3041 BLAKE2B bff60a2ec2a1ca03249a3ce40e72a5b099dd9c804207770329ae56f8e007e481a376ea5d9c26264fe1007f74e3d6612f69fc036cfb0e35791f57c7612971182b SHA512 bef1e4d05df3c58ec1b52ee9bd25f5af0d8b021954766296a891c1fbec505689dab7887dec373f5dd9692c65dedc848aeb2780e7f43ca30ec5c213510e888e3b
 EBUILD opera-developer-78.0.4093.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+EBUILD opera-developer-79.0.4100.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/opera-developer-78.0.4086.0.ebuild b/www-client/opera-developer/opera-developer-79.0.4100.0.ebuild
index 9d5d1cbbfdab..5f5790fcf46c 100644
--- a/www-client/opera-developer/opera-developer-78.0.4086.0.ebuild
+++ b/www-client/opera-developer/opera-developer-79.0.4100.0.ebuild
@@ -30,7 +30,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="92.0.4484.7"
+FFMPEG_VERSION="92.0.4515.20"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 49d6a4788a04..ccfc08c7e0a4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
-DIST opera-stable_77.0.4054.90_amd64.deb 74362012 BLAKE2B 27ccbbebdc16fea2cd8fff3af1b0df891815264bdbc0ff08bb3bd057356573ed130f4a745debac6ccea0e68f7e7898483c074ae1238a7f7cbbfd3b6bfcd574c9 SHA512 175a7a532ad41b9da5384831453738f242f3f7e340e001b834e132fe1a77329df6cc0c4c1ee210409bc71887c27c9c10a6df549aa3ed617938a083a1342e389e
-EBUILD opera-77.0.4054.90.ebuild 3018 BLAKE2B 99a2f074dc96f78bdee3dff67f7a90e0e810daa941f61f7453649e860de3c56a4cfe3d9deb85773cfd4f9ae954d6f33f9237c73656c677961f27c3752f7cf6ea SHA512 65d5d7c2cd5b2b3bc842dcdb2f971ac73ae155cc46e2de995846846d12f9beb3e907f66e6392cf03e5030574043d15eca94d3b8e85b182626da4398208966015
+DIST opera-stable_77.0.4054.146_amd64.deb 82485584 BLAKE2B cbc8240af50559b8ef0a8adab0750c6a0a787b3fc71c3759e9d100fd3cdf3af3a3469bd5eff03680f3d0ecd3566d41006750bd45c5ca45279b6593d270c9544b SHA512 7190f3e5425955b152e55e71c4feaa3e83dd5984680a55df3b05e9e80d283a33b27b0dbd63a04e12c4bc03f5e5530e69651631e151f458b4a24b9572e80f7365
+EBUILD opera-77.0.4054.146.ebuild 3018 BLAKE2B 99a2f074dc96f78bdee3dff67f7a90e0e810daa941f61f7453649e860de3c56a4cfe3d9deb85773cfd4f9ae954d6f33f9237c73656c677961f27c3752f7cf6ea SHA512 65d5d7c2cd5b2b3bc842dcdb2f971ac73ae155cc46e2de995846846d12f9beb3e907f66e6392cf03e5030574043d15eca94d3b8e85b182626da4398208966015
 MISC metadata.xml 589 BLAKE2B 6264d0b26100282d9399d5922ef7a49b99add9ebad066559201db4fddf7e33598eb5f8c1f8b4bf569ff9e636154be2d377df1326b653633a5bd7764302cf1a29 SHA512 2c3a8e587d5548372f0d27246aa439b532f9b61387a35dbf9752060ad9f013f7996c7524217e426498f3eb4b983a4fd674116f124a4b680ca78b328c02647f45
diff --git a/www-client/opera/opera-77.0.4054.90.ebuild b/www-client/opera/opera-77.0.4054.146.ebuild
index 644b37a1b9d8..644b37a1b9d8 100644
--- a/www-client/opera/opera-77.0.4054.90.ebuild
+++ b/www-client/opera/opera-77.0.4054.146.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index a5a504318201..bac3d3b9d331 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -3,6 +3,6 @@ DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B e4396332b16ea71bc7dfa2d54a275b6058
 DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B 7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c SHA512 608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
 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.ebuild 2874 BLAKE2B 87494c17d62f92873e8cf4c9807a6da4b35058cd4a824f21ad90ff41dac062b18e7360aec1a65cf47c8dae4ded7d5b02741745d5deb03ae35eaccc9128cfbdcc SHA512 d49e166f95df0fad010fafe3b4fcb710b9ee2ca1409f98e2ea012704c0c89a7841e87b7cbdd8cefc1a62d30014b096568413f41bd55054d42b9dd3a64f86fa9b
+EBUILD qutebrowser-2.2.3-r1.ebuild 2677 BLAKE2B aebb54126e50c2fae543e956e307999d76acbf06d5d085646c032e15251bc8c490a6d0a041464fe8612535c2efce6cfbc251e87befc7778bf3c7ee131483de16 SHA512 aa0048e53dfc4f7bb8ede59d23e32fb0b7e7061389e92e78a7f75d6ecfbd8ca4b093b6dd52ceffb7af67dd0fcf07f6ef3b9ab01ae89d7c319fd6978e64fcb87c
 EBUILD qutebrowser-9999.ebuild 3071 BLAKE2B 32ba24464d629b3c41b44fe154e6ba2329e58839e499afe0cb5266e0cb9369ba189587e993b4dec3597af7d64d95daffe5e0837a0d3d479ab3563cea087700d5 SHA512 5a655d6d23a18f5bc9c101861d426195513984e3a454c4031963d8dc1d59f0cd5139f7b4459a515a22b31ddd774a3a51be0a65481d8f6fe78602ed94469ec46e
-MISC metadata.xml 742 BLAKE2B 3410b02e22887bb80f47c72888bbbe12505686aef9a83e7fa8c66fa01dcd16f0b60511c9cb9953aa087c89e62eac5845ea7db155014b978fed66c35ecefe8780 SHA512 22873bfafc2654f695eb90182c922ebd9465b3f7b3bbfca4199ef6684b65c3a28a8164a2045c823017cd6beab1ed65d00fc56904f6686bc98acca6145e80abe0
+MISC metadata.xml 842 BLAKE2B 3604877b315113a40ca442d5c784146627bcbec414ec0d8874c855d53433dfba4b2dd11502086b6f569dbcb8d3efef2662de8dd45c98246fc67ba7d5db70ce0d SHA512 62afaec80991b9319114f49be626805a11d6d21fe10f75791ff1f4ccec73d57a8c5fcade1c09b6483f44ab4108a77d45795e4133f4075363aafedfbb8b16fdb9
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index c915949c2ca1..8eb60f40da24 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -17,6 +17,8 @@
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
 	<use>
+		<flag name="adblock">Enable Brave's ABP-style adblocker library
+			for improved adblocking</flag>
 		<flag name="scripts">Installs userscripts from the misc/userscripts
 			directory to /usr/share/qutebrowser/userscripts.</flag>
 	</use>
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
index ab48622e1e25..a546f877c3da 100644
--- a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
+IUSE="+adblock test"
 
 BDEPEND="app-text/asciidoc"
 RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
@@ -26,7 +26,8 @@ RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
 	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}]"
+	dev-python/zipp[${PYTHON_USEDEP}]
+	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests setup.py
 
@@ -39,39 +40,38 @@ python_compile_all() {
 }
 
 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
 
-	if use scripts; then
-		insinto /usr/share/qutebrowser/userscripts/
-		doins misc/userscripts/README.md
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/add-nextcloud-bookmarks \
-		      misc/userscripts/add-nextcloud-cookbook \
-		      misc/userscripts/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/kodi \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qr \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      misc/userscripts/qute-keepassxc \
-		      misc/userscripts/qute-lastpass \
-		      misc/userscripts/qute-pass \
-		      misc/userscripts/readability \
-		      misc/userscripts/readability-js \
-		      misc/userscripts/ripbang \
-		      misc/userscripts/rss \
-		      misc/userscripts/taskadd \
-		      misc/userscripts/tor_identity \
-		      misc/userscripts/view_in_mpv
-	fi
+	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
 }
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 66c63118cd64..356bf91f6822 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -8,9 +8,9 @@ DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a
 DIST seamonkey-2.53.6_beta1-patches-01.tar.xz 44160 BLAKE2B f6a959a983e726cd919ab5004b27cd496a78cd58759168d6dd64e155059c7b52f269bc42143ddb69a1e8880c72779257216d942a1abc58800491fde9eaaea061 SHA512 710e668209f76f2ca4112923c61219e435123791dfcfcb202af1f7975436d17f13ab025722e9725f219e9de9d024091514d23c71a851d68f750c11ea8d56c2b9
 DIST seamonkey-2.53.7.1.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5
 DIST seamonkey-2.53.7.1.source.tar.xz 283452108 BLAKE2B 4f0a73c5d57c708e4b5d5af6ddee1c9515b6bf401b0181da17c03cdeee1afb9d120c0157cdf2a07e8fa6495462e8bbb4b85e3e6646dbbead123934c565732926 SHA512 21f52b2668b8cb31670a80f3fbcd04d714527545ddd36fa5782999be398428cfeac989da4e3e7e049202249d43c71228ebc8640dd0b594150c8cff0b587caf7e
+DIST seamonkey-2.53.8.source-l10n.tar.xz 13542220 BLAKE2B 8b043136595e481077e60cf202ae66d04ad30f089e842f6d4660807cdaf086b99c9252afccf8a6302558f4a1ce38e8e59f72ade6f72929335b0bf7bce72b4569 SHA512 047defbfac18f360ad089d90de3c0e139d3707dcfa74570fcfa1f2f1e789ca2930d08ee0c94f7d88cc79f4e162eda2d0073493656528e0f9b579f452fe13ad8f
+DIST seamonkey-2.53.8.source.tar.xz 282833240 BLAKE2B a44f38a635353f2962dd93d102f2cb1f191279b71004f6d62efa375aeb820daf9b8ad307e7facd544bb3be01f14678d3d453e6bb87a200d6bbd6f886412af547 SHA512 7f5668f70710527618e44148180f80b7b2be8807b76843419a98567362a05b4db7341ab29774f59ca97188989830e2ff2ae9b20d6aaea88752f4396a33f0eca1
 DIST seamonkey-2.53.8_beta1-patches-01.tar.xz 43208 BLAKE2B 947b8131810f3f9855e1e8ff45d841e05dde9dc8c1d1204b1a3d55a743c2c7f9b23b251460d6743ca760edc4609eb08c1df3b165acc56af95e5ecb3c871fec3a SHA512 8196be87112926de0becf272bf44c1ce5522579d4b66f93f455cc0e503c4c3bb96fba5ec48a73e0d53ad9683820cb167e677bbf2497fe266e93d154c8d4a7837
-DIST seamonkey-2.53.8_beta1.source-l10n.tar.xz 13542744 BLAKE2B f5c7a09606fd51c688507a3eed1d661c63b6e3690c7630953a9e96fd53e147dd9823b39532b96a4b2376742cf0c8ad968a20e9f337e0b55cfeb39f62ac012b22 SHA512 13f17259c4cf0e4759fd6f1a6424804c07af9c9205cba560773737a49cc3257add6f833edf527443673e4ea9552ec6091ec3c50700cdf4bd617f0f28a2be7535
-DIST seamonkey-2.53.8_beta1.source.tar.xz 283088336 BLAKE2B aa59357984c5b0f26dfcd1b0e9d4f0e2a607b7212fdd270a72cc512c6a2abc735f14ad3b67639df677c2706492a1b6f6efb8db9eefa3ea08a276446ba022aa20 SHA512 68e160eaebc22b8a9bfddab74d6f59bed4a220105d6362da3636e5619837cd9bc26bab29a20ad6ac2cea73173b8bd241ee54e0476ec8bd9dd4d232aff7ac3bf5
 EBUILD seamonkey-2.53.7.1-r1.ebuild 17026 BLAKE2B 1b9485e7f91c76c03604a985f5b60ff24d3ea45abf3e516abecf6473526e460764a256a3419f754c2dc96258617c72ea93599c85147bba287d0d5684d0698e1c SHA512 bdeec5cae22f0b60344c3f6871804e5b2e824609150e5e30146f4da6115e2de9114d3aca1bcb2345b592aba0e394a7b268a420e1fb1359fd1db29fb37e673ae7
-EBUILD seamonkey-2.53.8_beta1.ebuild 16870 BLAKE2B 04a1458b037b2f0f39bd74c147ef0038cde0dd86c52525f7e635d1d306ffbfffc99c648a1352ab3f218b5cb3423a2c264c128f7e0d806a4961ed3591f8a72330 SHA512 a1e004cb67f978c45f081096f7d194ad38d1aef59f0ceb2f71560b03600436c4a2f14e15a4e08bfa782020308c79887f785a208467b41d502fb6cdca8f7cfe80
+EBUILD seamonkey-2.53.8.ebuild 16799 BLAKE2B fda78b24a14ab6c5feb470d3c4db6b97f743e88d1fb49884cecadc44562c8094249b81e546fc001f47579acbfc64d2e2e45f8b784605706b78e0fa4c9f0c7875 SHA512 abd455618841d250701f7acc600bf84ac40a185005b82cca322f58b9d6d5d61ea1e2581d24ccc53e688a9f585c5dbafca70f91744984d68e0b92771b67251b14
 MISC metadata.xml 1931 BLAKE2B 3cb5bb9f57b5b669b2c9c0d90616bd04928483f51bf0c0909e63836e069f6a87cfd0a2f37b8753abe8976a11219c7daa577ac0d9ee6f2335eec7c375614333ee SHA512 9ee6b67335f7a66a8ad1d211f257042fe9b741432691502be8b39d71888a1f783310fb1049757cb5059c530aa3b6e0c1d6b94f86feaf74fd096168c21611f524
diff --git a/www-client/seamonkey/seamonkey-2.53.8_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.8.ebuild
index db3e9bb9aa2f..56f6e7a4db09 100644
--- a/www-client/seamonkey/seamonkey-2.53.8_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.8.ebuild
@@ -190,8 +190,6 @@ src_prepare() {
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
 	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
 
-	eapply "${FILESDIR}/${PN}-2.53.7.1-CLEANUP-workaround.patch" #790794
-
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |
 	while read -r -d $'\0' file ; do
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 62aec42660c0..37e55f242a84 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,13 +2,9 @@ DIST vivaldi-snapshot_3.9.2289.3-1_amd64.deb 83539836 BLAKE2B d8a9dcc850dbd4d15f
 DIST vivaldi-snapshot_3.9.2289.3-1_arm64.deb 79023788 BLAKE2B 163adf52c555f47ea1ac6b9f6e6ef457cf901a4be0b04590da482b22c330381437de9c23016759d5eb6d8da82061b451067840ffe097de3e273b569067d5d939 SHA512 5c8596448bdffd22bf6837b0fa966b049af8efa22a4da009f953e17743bd9497dc825589ea92bb672ebe1ce8a0003ace6f9a91f3d5e2c8d9092f9049d59ccc80
 DIST vivaldi-snapshot_3.9.2289.3-1_armhf.deb 75093252 BLAKE2B 0deaff270b851a9febdbae29102d5e5e0e221ddee7e285db1fe13fbb3ba8b44d82cab61220a66d12ab31fb36300236b107848c401e2e1203bfd5330be254ac78 SHA512 1fc4a6f6b5abca3e45b7208c8416029c40641c5213fc472bf54ef6ea5284c7bfccfe1cdf66c623c88b7fe200fe8d7356c99a9baacd85944b0818006d9d54fe02
 DIST vivaldi-snapshot_3.9.2289.3-1_i386.deb 82584664 BLAKE2B f5447df81bf87b128cf9e65443913f61b29417e2ade09407c4131a0211006b7779816d28ae777aaf8792bd3745e9669dbce03bdda83616e5a669333f9e520a06 SHA512 dedfa2249ebeae7a5f55a26235f25a351988e9ae9d6d6a383d4e5c2a0680eafeb3e30603e6476b0d814a9f5b1958b7e0894a4b60b47e5bb72d2af2e577ae35aa
-DIST vivaldi-snapshot_4.0.2312.17-1_amd64.deb 84262456 BLAKE2B 0159b85977673c4b75519bb41afe63f1abb31012a5775177b96cfef795da5e21bf2bc476b74b95b124101fe0b899696b973a2c954f8ecc8cbba96128df4e45cf SHA512 871acf44e878c97558b668ff87184fcab0712d575a7a87073f844d92d94282bbbc9e88fcb90b02c0e64c9aa4399be4e9f8f1fbf8ffbb5b2ea19202297c811274
-DIST vivaldi-snapshot_4.0.2312.17-1_arm64.deb 79692328 BLAKE2B 959a28e2164a662ff6ef979b1358ddb4b2727434ccf1edf3a71dcc4a86c13420f35430cf64805b75e1bc6b1a842d951827dabb1869633d445a81c4511e2052c0 SHA512 7176aaa731137f8580121bb9e64c11e046cef88dc6629c9f915bfb21d3f2271ecb76dbbd48c5f52dd38dccd3d647c78664aec96ff8fb190bae13f2c6f8cfbe62
-DIST vivaldi-snapshot_4.0.2312.17-1_armhf.deb 75808604 BLAKE2B 022be117fd874b9bce06f531d5d992dc9ebc9727a7cfb94f403723021eed4fc043b04d0b9ad0381fc9bce15f6470f9ff2b1019c71d8054451d540216e81e5535 SHA512 3f2deda734a225e78af911603a5c2d892bd7c322b0d1c3c6c1af61a8debb22a85f595f42decedddc331ef0282b9a46c2408763c523362805ca0a3c9e73900f2c
-DIST vivaldi-snapshot_4.1.2328.3-1_amd64.deb 83660280 BLAKE2B 69ac05f694329ddaa0b850bbbc1a970aa3e0583a5859af5b7726ea59e941fea955d32663ed644c8196b4baf0e67eeb6026e69911ae5e19b513992971573a145e SHA512 689c85aa147afb8dcbc6d145817a50fa0500ba19ea205246da2f627c8bdf86874a71a38ff3ef1513998f9347e426004b2d81bc959bb86469bad11e783ab791a2
-DIST vivaldi-snapshot_4.1.2328.3-1_arm64.deb 79732764 BLAKE2B 577141274ba36b0698edf8db9eac093a4cf3d01d32bfef8f19d6a0a42e7e3d67f456e3e2c26a0450b274b4e5ec557ed7d466ab7c9d0eac4993d07f74b4331661 SHA512 288fbcc3cf2d33aeaa33aecec47c4cb8ee1a288a65643e6c5ed44d9597d7dcf75246d2aa69b1e1351f2812016a69f0184747de859ed7404a0f4629552632ed87
-DIST vivaldi-snapshot_4.1.2328.3-1_armhf.deb 75852072 BLAKE2B ab160ad2a8cac43edb128687cedf1c131df4ae6ed1cc9073a073bd7afdce54702b8b5e64e9d3ac4111286b2c0bcb73252af2da4a9204951004bd18742897c6d9 SHA512 946ba9f5b9ed799633abc23989e8659e1f64cfed70a189080487583ca09b1a23990acd2a280d4f9107a1fe705d37a5364020955b2dd3714e8050f8dd2f48ec08
+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
 EBUILD vivaldi-snapshot-3.9.2289.3.ebuild 3342 BLAKE2B 6cedcc20db6fef8468a74fa7b0102b7e0de08029e179dfac685f636184a7250f7494d2a5b52ea2e3ecb9f73321e9cb8f57e2aa8ff0a7c86901c7ca1f6639f301 SHA512 8a2ead0fe7aa024f0565e6ed4effba0dc47d51da8c79fea96f7ada0deb504115140b3ef4e97d8a97e65fdea479b27019ee34ac11f31c87e5233067ec6af0db0d
-EBUILD vivaldi-snapshot-4.0.2312.17.ebuild 3299 BLAKE2B 193954a5de47e83ec163773a2e32418e851aba1a53a85602d0b74809ec5d180412f7e9a5b8ab12ab18bcef56121ceb3c3ade8eb4fc5c0a2fd954f805c024024d SHA512 17a62c808e17ce142559cf9e99abed4d373b2d42e2b9a53bc9be51ce15f810e34a1a7c61f79ae4013cbd80c0f1d3773dcb64f15a338a184f7a63330a6a44bb98
-EBUILD vivaldi-snapshot-4.1.2328.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-snapshot-4.1.2339.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.17.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.17.ebuild
deleted file mode 100644
index 922779ca6f6f..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.17.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-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/vivaldi-snapshot/vivaldi-snapshot-4.1.2328.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2339.3.ebuild
index c2409d01a97f..c2409d01a97f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2328.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2339.3.ebuild