gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /www-client
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
56 files changed, 271 insertions, 1250 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 12809c72e284..26f5cbb7a677 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bc2b2e3ad03d..e55cd87f6016 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,11 +6,11 @@ AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-89-patchset-7.tar.xz 4640 BLAKE2B 6150f92a4cb83025b7521c573e9a14bfcb26f7a5ff4ebe79cfc819b214ae05d0e986b9db561a99b4f9c7b4a8e4adf1c8ee966011bb0791ef11fc2be89b03b216 SHA512 6ef5be9e56b82c70d3d1a0596e74af3bab97ea82a8247b6d0ba736411779be10b17c7cd9ccd9eae5fac27af3907fd3b56e301e73011f58b2c4052bbc03390b1c
 DIST chromium-89.0.4389.72.tar.xz 890838884 BLAKE2B c84286128ad3563f0570815efb2fe190153e5ea4c2ea74a48a9d9b31614b3f88850ddfb74819a8b27d594f97071ef5c1f356d0419d4dd3bbc2003c636c3aa60b SHA512 b5e3693bc104ff857a2ef4de9b0a9265d44c26e5b94c44e5054bfa810c24dbb1933f1f4a626dda4d74ba6cb13fe5045c4ea9d7ea43e1b0e4057e01428d645fb7
-DIST chromium-89.0.4389.82.tar.xz 890793532 BLAKE2B 9d1861f548f5af67611b398b5e87812ff92cbb2069bb9480b3264febf5b916564a45cb0e4d9f2793dd4f0e0c355a24cc08ab138f4e2c786a8d933f4cdf707bc8 SHA512 41c85743ef92e04cb73d374934cf3efcf6e7ab1c12f11abaeb7687ca2dc365f7107d316aabb439cd9bc26cfdaca92e0a1a4a9d751a73c47218633f2a3253563f
+DIST chromium-89.0.4389.90.tar.xz 890844888 BLAKE2B 7e599e17f6ffae422d0eb268f2847d5611424971508656abe50d5a89475382ec10bb348441648fbdb939b8acc01fb64a70467595d6649b9e2f3309e59e27a875 SHA512 d95ea0cc42a792b68cb5ba9bd455c6e964ce06c15ac849a2d317cc1cb07940578ff5f7b73be775915fff2decf7dc8e230935e6b545743959ba1cdfc9ab904b4b
 DIST chromium-90-patchset-6.tar.xz 3828 BLAKE2B bbd1378868cf4d699ff097ea41226ff694d58468f8f93860f2d6cc60924f35fb1f0b17fcf5a916f04545171d1219b699072222f138240fd483c704874cfce178 SHA512 70321eb4e9fe27818d5e6ae3109d3871a870a7fb6886328dcc9fc8291ac72fc003d678aec7f9925afe0c5667c70ce9bca8f61434b11a331fc1a29d61ad7b59e3
 DIST chromium-90.0.4430.11.tar.xz 917713136 BLAKE2B 828a141a1a36904542b7a274db17b8c8917b37cad3ab7070568c83bd6084f42838ce673e24c3f4b2753068548983e490cdeacbb5501215176f7f32b18d686535 SHA512 3d08fc57a22014eb324b99e5b97c2a8c8c5ff4de038753f8fa1c3ab4b44a19c2ffb6dcbc554f78cb493cb0a9cbbc04ac148ef4bd8a0141e5dff04813913c08a4
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-89.0.4389.72.ebuild 28582 BLAKE2B 3b5cebf03795f305dcd9fcaa257d588a862a7cffa8e2e52edc8b36ac04f166df0973364f07c4a35a01bb34e0e0a522381f2881ce6dbcaf422e810ed7b58b42b8 SHA512 681ba54775487aefb3e24374bc3edf4e8059d9f53ede080e24682f064da9e2ae9cc63bacede98e7fdcf01f8e24c3aa566111262a453ad52be4ad55400097fe70
-EBUILD chromium-89.0.4389.82.ebuild 28642 BLAKE2B 8bbf37b9cbfb6b19e881b5505e5afda437c8ef21f65011370578482720f613af7d92914f94b7b5b92f611510b3d0c0f6c643137ed967463f42571f0c17e91300 SHA512 10950326c1ebe81ce1bf582265752ce54165c44674ec79266db57e6f9dc4236991a4b1ef5fc20a167af10adbaff35f4dfe3e3cb04d69db828fa1b619ce8851f4
+EBUILD chromium-89.0.4389.90.ebuild 28641 BLAKE2B 5e2a51a36d9652cfa16a536bd1bcef2425428f269a423e1b646c22e0c4f45014981a1af63a3c8a5dce9cbc524c42c4eaa7fa3fc385f595764f7414941201c67b SHA512 5fef231a5d3da753ba5fb2a3498ab9e2f27fe54c3c8975f52b962cb66c58ce4a948f3b36923f5bd20f0287c4a11051f97efe447a99fc272e06c19a1e1c37439a
 EBUILD chromium-90.0.4430.11.ebuild 29000 BLAKE2B 2bbb69a56283d97503cdc26f76c9a54fb242da7475a3cbc4bba3f5a6b328de8e09a398e1a473b4e344e63c62d9426ca5de908ce1791369332e8aed8b9f50dffe SHA512 812423b3c631d6d729ad85c4dad425ea7ae337850568ac3633541f9464318057ac0ca8e0a693007abeeb20d63c9b2ca248e0d323087725f4d6fac8f5dd457546
 MISC metadata.xml 1596 BLAKE2B e15a05a13e8200be6a946ba0b2631a014b83a66267a9ce956245d28312403b3229ef6a961830bd69535bc4286912fdf8d5f3a6cb0d0f8aff29936ceaf7113e8f SHA512 204d0b04307b2fc2188c64f290c0e3a0a0b14f3ac0f35deaffdaac1b30addd4df1f2eef2eae19a674f07123dc44a6ba4a0b5e2419a898bfaac61579603ceb0ee
diff --git a/www-client/chromium/chromium-89.0.4389.82.ebuild b/www-client/chromium/chromium-89.0.4389.90.ebuild
index b0fc7ed7d1d9..ce181c3daa71 100644
--- a/www-client/chromium/chromium-89.0.4389.82.ebuild
+++ b/www-client/chromium/chromium-89.0.4389.90.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index e12d64a9ab7c..69ddd75ac2ed 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -7,4 +7,4 @@ DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7e
 EBUILD dillo-3.0.5-r3.ebuild 1293 BLAKE2B 019a0535baead78934decc1e7840031d9147c95663804db672565825fdf02d8a26e6685eb3c36ad781defbd28ecf8537649ce96a0660ebbc4f5be26f43154703 SHA512 b670000f0b732c520a177c8dc047c6737edff432be389268094df54ab3cd3b7914272845d9a3d39ec49b8443adac54ca036eb047ad5d3665bdb7131e0749b68b
 EBUILD dillo-3.1_pre20181005.ebuild 1206 BLAKE2B 6ee03439127d10f70e4dfece3858ebd688d4a58af83b2e935a54f031c254c5e2716c2044cc1325cc38b431d6df56e7851d1ed8cc00c8d79868d8b04b20b24e0e SHA512 59b926338f5335d13bc72322216fd5169a7dd9a912470c70159188aabff5fb42cde86fa23047b69c1b1596a529fda3a480309f2b33b658663e47bec6df2d5c08
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
-MISC metadata.xml 233 BLAKE2B d3baff5d4b0f702f92f34d76482c438e2b95d5869adf3eea74503c0e550eab626b446337bf0eaa1af2bdffa5e4e27e23c91c44b682ddf980f67dc9cee8b9faba SHA512 00ec86e83fde2eaa63e5d2dc1fd97bb584f52226c64e2b0b0b312943f40524b8f20d16099e1431deec99faa6fd9aefc8f0cde37943813ab447943fac9d71b063
+MISC metadata.xml 233 BLAKE2B 3de3c3de175ca28e084160db38aa341bf4645b81b566c8fd2a4a7c7fe590f42b1621cabd3022e8ee05be6e7d05eb0d9c76557bc437aa06095480302cd9619e18 SHA512 fa4712f2016e6d008a8a4c7e47cae45d66a28e7c64ba7e67515c548e6048233aa0c55d2ff591a8dae5d3f861c0a758844b0c35e6a905db1c5d3a6b525cfc1271
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
index 2f8e87ae94ef..1c6c2d75044e 100644
--- a/www-client/dillo/metadata.xml
+++ b/www-client/dillo/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 <use>
-<flag name='xembed'>Enable X11 XEmbed support</flag>
+<flag name="xembed">Enable X11 XEmbed support</flag>
 </use>
 </pkgmetadata>
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 0588b5fe5783..e0485ea93e23 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,9 +1,6 @@
 AUX elinks-0.13.4-ruby-gcc10.patch 337 BLAKE2B 4b01f5cd0c311dca3dbc939157e9cb14b95da4a90782ce12ee4b524502852dade5a092c621c9bdc02f315721868237192028c85faceb13afb3d8633d6f1ccf29 SHA512 b40a69a53b48b957175dbab49566ecc73f1a9a77e7e4e1b824b4a5afcd08319842d6f530feeb2afa63e4854b7dd2e980933a481165c9d64289acf16d72f1bec9
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
-DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-EBUILD elinks-0.13.4-r1.ebuild 3769 BLAKE2B 35a57fd94719c9b0614a514679d4ad13b29ffee019b4da38cfd97af464587b2ae62e4f51f6ed32cfb8370bebde41685f0d8d1452110e4fe57998b74747112fe2 SHA512 4853f70c5c9bf7d4ba992df2fdb731804402b10aa632ec72765fa2cf130dad15e02ae6793871d73a57cec6bf4fee85a6caf2eb8414accc5a18f66d8fda5e7903
 EBUILD elinks-0.13.5-r100.ebuild 3851 BLAKE2B b0d0832e8095ccc0bd63ff01f4b81b3b326bd6e03ede9c59f413db562cdcdd8dd333920edfd971625dcc8142fb0d8e246c6bb58808caecbefea4171156aa7571 SHA512 163f78d5835b7e0334930843e13c4e3e4f5ffa29e50db261759347780d38f4a867579af6dbda3ca22b64d0e3f0b17dc4c13ba06c73a98034608f089d77953f34
-EBUILD elinks-0.13.5.ebuild 3778 BLAKE2B 128575eae55b2816a575763f662523f1e59a10c4fecad0d24aaa419d1ddb96201beabba15ae18162ca0b72dfe1aaab741e1de6c23a1472484549991ec40ff614 SHA512 f7db2d47da381ef20fc5ae8ab6dabed2675119c139fb0a303c86d35f9c21b3d9f5320f5035453a6732785433cd9fb7d5b5349f1d1eb89a95eb52e9beb253a64e
 EBUILD elinks-9999.ebuild 3691 BLAKE2B c6d5802932156b87ecc8437dedeb19ac8009f206c9d703d308b3be6a2fb0e730d16fb8576503eae27e65d039b956a7c935c91455d0ca332c91186ffa59e93725 SHA512 fe92141b88b2fbc82b43614b966e4ffddf5cca5665d5523a94117abbe7bb4dfd456ace2521c69036e8c057330bea285202b2e7752881fb85f107fa42d7faf50d
-MISC metadata.xml 897 BLAKE2B 1a2d64f8a35ee418538530d129957ec313e8085281f0fa1b8711b3b1b4f378e4b8c18eecb999256b542644cd0b93968f4fc0e8ea48a6daf85afdd073d4c12aec SHA512 74993b896b204fe46cb62c718426bc0421ad49e3591620806f49023ed3c6d24d49b243a2d4cbe18c9aa7ceb5f955caff1480fe8e8e5b1619fd39ca9f21d1a3cb
+MISC metadata.xml 927 BLAKE2B ea7f56a26c59b270a274dbd2475e16769f6d5650a7fb8427acc5b2f359f01e37c276b90946e365afa9e7c84278343fca93e55cb576dcca6848d0a9a8088c41f3 SHA512 345cb6385e1f03a494b0b2c77379032c0e28af1277091e17e0f823211d27d87c81b62063e382a8f19e9e635cb01b02cafab63f1154863031e7679dbbbf60921f
diff --git a/www-client/elinks/elinks-0.13.4-r1.ebuild b/www-client/elinks/elinks-0.13.4-r1.ebuild
deleted file mode 100644
index d837e86b910a..000000000000
--- a/www-client/elinks/elinks-0.13.4-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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 autotools python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
-	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
-	lua? ( >=dev-lang/lua-5:0= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		gnutls? ( net-libs/gnutls:= )
-	)
-	tre? ( dev-libs/tre )
-	X? ( x11-libs/libX11 x11-libs/libXt )
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
-	"${FILESDIR}"/${P}-ruby-gcc10.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}"/etc/elinks
-		--enable-leds
-		--enable-88-colors
-		--enable-256-colors
-		--enable-true-color
-		--enable-html-highlight
-		--without-spidermonkey
-		$(use_with gpm)
-		$(use_with brotli)
-		$(use_with bzip2 bzlib)
-		$(use_with guile)
-		$(use_with idn)
-		--with-luapkg=$(usev lua)
-		$(use_with perl)
-		$(use_with ruby)
-		$(use_with tre)
-		$(use_with X x)
-		$(use_with zlib)
-		$(use_enable bittorrent)
-		$(use_enable finger)
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable ipv6)
-		$(use_enable mouse)
-		$(use_enable nls)
-		$(use_enable nntp)
-		$(use_enable samba smb)
-		$(use_enable xml xbel)
-	)
-
-	if use debug ; then
-		myconf+=( --enable-debug )
-	else
-		myconf+=( --enable-fastmem )
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf+=( --with-gnutls )
-		else
-			myconf+=( --with-openssl="${EPREFIX}"/usr )
-		fi
-	else
-		myconf+=( --without-openssl --without-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# collide with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/elinks-0.13.5.ebuild b/www-client/elinks/elinks-0.13.5.ebuild
deleted file mode 100644
index a54ad8c4302e..000000000000
--- a/www-client/elinks/elinks-0.13.5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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 autotools python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
-	libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
-	lua? ( >=dev-lang/lua-5:0= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		gnutls? ( net-libs/gnutls:= )
-	)
-	tre? ( dev-libs/tre )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}"/etc/elinks
-		--enable-leds
-		--enable-88-colors
-		--enable-256-colors
-		--enable-true-color
-		--enable-html-highlight
-		--without-spidermonkey
-		$(use_with gpm)
-		$(use_with brotli)
-		$(use_with bzip2 bzlib)
-		$(use_with guile)
-		$(use_with idn)
-		$(use_with lua luapkg lua)
-		$(use_with perl)
-		$(use_with ruby)
-		$(use_with tre)
-		$(use_with X x)
-		$(use_with zlib)
-		$(use_with zstd)
-		$(use_enable bittorrent)
-		$(use_enable finger)
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable ipv6)
-		$(use_enable mouse)
-		$(use_enable nls)
-		$(use_enable nntp)
-		$(use_enable samba smb)
-		$(use_enable xml xbel)
-	)
-
-	if use debug ; then
-		myconf+=( --enable-debug )
-	else
-		myconf+=( --enable-fastmem )
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf+=( --with-gnutls )
-		else
-			myconf+=( --with-openssl="${EPREFIX}"/usr )
-		fi
-	else
-		myconf+=( --without-openssl --without-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# collide with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index f3fc1b6822c0..4c8db43a8ecb 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>felix.janda@posteo.de</email>
 		<name>Felix Janda</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 2eb4a2ebcbbe..84ed868e7c12 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_89.0.4389.72-1_amd64.deb 81415588 BLAKE2B 95df0883bd61ef70f1596ce95a56d84c8b9c91b1736a7e5ffdc8be5c41effe0244004dd316a07b0230dc6e4375de25796d45915df02464391e387857ca7985b4 SHA512 7a65563efc3706f6684b304316bfdd8cd4a6f82d21f746e447757ae39b0c909879da5f6ed5752e0c0d8f526b59726f915a4486054af93d14bfc72c611b910879
-EBUILD google-chrome-beta-89.0.4389.72.ebuild 3004 BLAKE2B 618468448e7b4c15afa306e67f1dab580a72e5fb2448eee4fdb0c52a11276d68adbcad4a023f47b09eb9312fc11031a0de1df9df2b870b9caa9680ec9194a935 SHA512 f0fdf2e4f943755844ba7ec512c9be2f29ce5bdca204575baef47114cb1fe3baffe88fce2584917879440550ff865a519f80c06c74c0865b35b42f1631ae038a
+DIST google-chrome-beta_90.0.4430.30-1_amd64.deb 77718380 BLAKE2B 97ebc6d01431583e610115b71585320043080897d97df86813cfe195f39b540e52641fd8a66608f2ebaa42e10a3ddae19d758d0c405525a2d8a766de68cdd8e3 SHA512 6830a81909b2dbaded8668470963bebfd9031fb88fde5abdaa0b62e15d1d2ccf5c89f8805a522bdd4952b5979d6b0b9f41ee3a1771eedec3929bc29aa69c2950
+EBUILD google-chrome-beta-90.0.4430.30.ebuild 2983 BLAKE2B 68b16e07ef56018d2200532a0df9584a1f7725f80f024c0047e03ae95eb8d6a548bb711dab8ec48aabbe933361451e9e61c9733840757e0e243fd0c62ac3c1a3 SHA512 6fb3bb43b49b23af87a32b0b1b815fd6195f11d4c013fbcf0cdf3af424bdd489bb60189f6f08763166a9d474956739f516fb7aaa936ac14addb09f6a2f2ecb1c
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-90.0.4430.11.ebuild b/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.30.ebuild
index 320b2ef94a53..0b6476f303a1 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-90.0.4430.11.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.30.ebuild
@@ -13,13 +13,13 @@ DESCRIPTION="The web browser from Google"
 HOMEPAGE="https://www.google.com/chrome"
 
 if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* ~amd64"
+
 MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 31a4243841a4..8a53c1c7b19e 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_90.0.4430.11-1_amd64.deb 78571060 BLAKE2B 92ebd4854d0be1212e12ef8bfeb79ea68b9eb952d8d941435c17e5fe07d41008d41d220c7153c7c5e4028d7d0c0e57cd45f262c68af8dceceaac99c56a5fc5c3 SHA512 19e57a6071c1c41ffd81a3ebcd9ffd26a470a661f024792cdd746a84662590d90e52edbd820a49b690436e5e2a2d4748578bbbeeb6907f58a381e620b3e03a32
-EBUILD google-chrome-unstable-90.0.4430.11.ebuild 3004 BLAKE2B 618468448e7b4c15afa306e67f1dab580a72e5fb2448eee4fdb0c52a11276d68adbcad4a023f47b09eb9312fc11031a0de1df9df2b870b9caa9680ec9194a935 SHA512 f0fdf2e4f943755844ba7ec512c9be2f29ce5bdca204575baef47114cb1fe3baffe88fce2584917879440550ff865a519f80c06c74c0865b35b42f1631ae038a
+DIST google-chrome-unstable_91.0.4449.6-1_amd64.deb 85346436 BLAKE2B 567abb574b5fea26925ed6bf028eccf14d8b3600cc4f5d6917b60b1e2ec53af10e43a2058a6c5a0a952442f59495a5c06439694ad8a3f96d7ee8391e76127b9a SHA512 c5c6ad70d099a582f9709d14e5985b5459b1e024c040dcf5e8d01e1ce9f9516252f813b64069c2f857f22885f7924999a7e7514959d3e804f9e99632c210d342
+EBUILD google-chrome-unstable-91.0.4449.6.ebuild 2983 BLAKE2B 68b16e07ef56018d2200532a0df9584a1f7725f80f024c0047e03ae95eb8d6a548bb711dab8ec48aabbe933361451e9e61c9733840757e0e243fd0c62ac3c1a3 SHA512 6fb3bb43b49b23af87a32b0b1b815fd6195f11d4c013fbcf0cdf3af424bdd489bb60189f6f08763166a9d474956739f516fb7aaa936ac14addb09f6a2f2ecb1c
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-89.0.4389.82.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-91.0.4449.6.ebuild
index 320b2ef94a53..0b6476f303a1 100644
--- a/www-client/google-chrome/google-chrome-89.0.4389.82.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-91.0.4449.6.ebuild
@@ -13,13 +13,13 @@ DESCRIPTION="The web browser from Google"
 HOMEPAGE="https://www.google.com/chrome"
 
 if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* ~amd64"
+
 MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index cded8050dc16..60cf61e5d60b 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_89.0.4389.82-1_amd64.deb 75879440 BLAKE2B 90698f31b819e376e013ccb88b30cbf06062e0697e7c5c70c63823d439703beed9c27d6981b6c251bc87b996e8d806490df8a157c5e61648548dbaa9ce73f286 SHA512 c81bb1722d136c439e3dee578c84d43898dcfc029d664ebf58458afef0957fdc8cdbbae0391f0d9d74359f72b43588fb5144e02701e1b54fb82aa0fc1cda585d
-EBUILD google-chrome-89.0.4389.82.ebuild 3004 BLAKE2B 618468448e7b4c15afa306e67f1dab580a72e5fb2448eee4fdb0c52a11276d68adbcad4a023f47b09eb9312fc11031a0de1df9df2b870b9caa9680ec9194a935 SHA512 f0fdf2e4f943755844ba7ec512c9be2f29ce5bdca204575baef47114cb1fe3baffe88fce2584917879440550ff865a519f80c06c74c0865b35b42f1631ae038a
+DIST google-chrome-stable_89.0.4389.90-1_amd64.deb 75841728 BLAKE2B 1de16e3916e1dfe646d37327ec7c69417d40bf751e43d76a85f8e8f81e654669a994223a0f5c9a8bcbbe4abf3db2f50cbe4e2072742da3ae9aae855915098641 SHA512 768557218228c0129d478dd3da8d1a21c62002f0e2f1e533567dd50a2757a9de0ad141366a6927d0a4877d5f38be6dc3c246e4ec64e3113411bf90733ce477d1
+EBUILD google-chrome-89.0.4389.90.ebuild 2982 BLAKE2B 7069b95e4ec9f849dd700a9fc7ad44b1c14adedfb06abde617d632afd04d60eb2efd73e4ac9d05e1821c0f52460f4824980785ffb8d4927faed43601d9e03c99 SHA512 bd7e657a46c56fd83bff84f5b61aee40bcba7dec96f0bb7198a3ffc18bb108ffb31d0315647ed832cebb43e9650e7ee24e892a0dbaede5c3ba85b263aef4ec95
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-89.0.4389.72.ebuild b/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild
index 320b2ef94a53..27569053bc68 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-89.0.4389.72.ebuild
+++ b/www-client/google-chrome/google-chrome-89.0.4389.90.ebuild
@@ -13,13 +13,13 @@ DESCRIPTION="The web browser from Google"
 HOMEPAGE="https://www.google.com/chrome"
 
 if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* amd64"
+
 MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index ba6cca159ac5..2e09f43831d0 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,4 +1,6 @@
 AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
 DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
+DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e
 EBUILD links-2.21.ebuild 3491 BLAKE2B f95d934992e1f5ccc13d50b83a19cc1af845d6bc0813c595e4cc3b62cca05a632f556771bf9eb98eba7858c875059585f8bc5f491821359718fea17acf8cc7f2 SHA512 03615b9eda63f9a70fd52233a6d6634049e2bf909bf7d5f844b278571926cb5176fd2ae4c01a736a5aff559ade0ce6adf371ee9cf41553e779ec716ec5a7d371
+EBUILD links-2.22.ebuild 3445 BLAKE2B 0d19c955880f7351a188da6035862735cc4fa7c455c9f224561bc17271bba46c2fe291eb4a3f39ddd0f1c6caa8d391a0ad88cac26fd38101ae25393941723ef6 SHA512 c9fd02977465f4865345fb001661b139e13575cfa21febf8500a1a72eec26842b737468a6917426ffb599c6705176aed94c5359618b99a549176464b75c78590
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.22.ebuild b/www-client/links/links-2.22.ebuild
new file mode 100644
index 000000000000..bee0327268dd
--- /dev/null
+++ b/www-client/links/links-2.22.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli
+	)
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzip? (
+		app-arch/lzip
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)
+	zstd? (
+		app-arch/zstd
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )
+	X? ( dev-util/desktop-file-utils )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	use X && xdg_environment_reset
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+
+	default
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		--without-librsvg \
+		$(use_with brotli) \
+		$(use_with bzip2) \
+		$(use_with fbcon fb) \
+		$(use_with freetype) \
+		$(use_with ipv6) \
+		$(use_with jpeg libjpeg) \
+		$(use_with libevent) \
+		$(use_with lzip) \
+		$(use_with lzma) \
+		$(use_with ssl) \
+		$(use_with svga svgalib) \
+		$(use_with tiff libtiff) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/www-client/metadata.xml b/www-client/metadata.xml
index 2a25c55a7ed9..340db3cfad34 100644
--- a/www-client/metadata.xml
+++ b/www-client/metadata.xml
@@ -32,4 +32,3 @@
 		Kategoria www-client zawiera przeglądarki internetowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index ef665ce70285..f511b1956f76 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_90.0.796.0-1_amd64.deb 93188494 BLAKE2B 3049db63838884f9919b25a1325012bddfa936bab4d090f8f9df2d6b79afd5b83d315673e8f9b656280a7c71a408ca1d2049c4c12db2fc24086f8638daf47889 SHA512 d2705b7b557ff4fdc49bc10b79ca1d0a40bd486e961a373da7302be3cb060a6f1d9ac5142a60fca10ab2e45e18e0b28589497d833e72b2d4bac138e9cf275a3b
-DIST microsoft-edge-dev_90.0.803.0-1_amd64.deb 93498816 BLAKE2B 7388fba087c409411ff318cc7f893107a4bb196913a7aca73812b1792f76fae691e081766f076beca347baf49df2aadc7f3a09933ab0ab6e3972e82e9011ce80 SHA512 d3d873656e1f33abec8f555464dc7ada57ce7283fad855253beb763d20799d7d57249f99cd833e2826df2596aa717a94845721305f30475d63d2124e4329e6d8
-DIST microsoft-edge-dev_90.0.810.1-1_amd64.deb 94144640 BLAKE2B a60153f582a7fdd9692ac6ec53b0b435529e3bb72a618cccdcee10dd0f2220f5606466d5223e8d5a573cde68c4939be339d1e0d570df755274b78f5ead11a99e SHA512 71d0234fe9c7c8f82faa5ed401f491377ba154e33ffffa9818edd98d8b65fa57319fbb90a2fdefec630bc2ed1feacc2dce89d37b94f7f152ca1da5c7d47924ff
-EBUILD microsoft-edge-dev-90.0.796.0.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
-EBUILD microsoft-edge-dev-90.0.803.0.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
-EBUILD microsoft-edge-dev-90.0.810.1.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
+DIST microsoft-edge-dev_90.0.818.0-1_amd64.deb 94011664 BLAKE2B 66d2a4566b4897a4dbc71f15e50ba3b52af41034d0fce48b185901b1a892d9a7b974bacec35369a9be6b74b40d0ed05a0b4f24224ec349e29014f1b42e1ee9ee SHA512 d1a154e028805c0143bb32496a785eeefce5e27d99d435a56a0d44ad4c8064590feaf688d5f708ef8db9453f51837ff997b8419eca05a2f8519e91a93fbd4a39
+DIST microsoft-edge-dev_90.0.818.6-1_amd64.deb 93113886 BLAKE2B d311ec9ca8126c35b1ce0ee5cd0ee858d6eaf2e8374c6da9b680e8172ca3746351b53831f4b7c1b18e17288ba3b2dda9badc51dbdca560223862704c0bd5f72a SHA512 22020ebf3f7bddf43a886dc880b678a3e3047d926127041db2b3744b0a9bdaecdf6f90a5d295ec73f07088c9f21c8ca952c9f0f2f9604d62d7cc06cd66ddf695
+DIST microsoft-edge-dev_91.0.825.0-1_amd64.deb 94610646 BLAKE2B 645c6f0ea3c9cb3415ccb4c1c31750cc55dc0299314e424a521299c3b28795cad32bc394919e0fa4acb2abf39f40b26a8424b9eed7a1de95f8b9de64ab684791 SHA512 083494b1716bd4b76973941e0f02d3c2e63051e3911dbcc8b98e94d798f141b49fb86065ba8b3091f03b8120fa2d3e8daf596209ea39e50ad84be711b0232c98
+EBUILD microsoft-edge-dev-90.0.818.0.ebuild 2338 BLAKE2B 5c32393b981662726bacf005ca8c072c329a948d04dcf6ac15437415f1390141aeba2a4f1e1cffcfa27f6c3d311908248ff6f10321c9c5897f5499390d8b10d5 SHA512 17674f30551768d3a81ec564f2f6ba97637d8eaec3126957f945ba0f6600f41950468963da7bec8c0a388ee42e48aaccead8e750959f601d0d8bfed2f7c99466
+EBUILD microsoft-edge-dev-90.0.818.6.ebuild 2338 BLAKE2B 5c32393b981662726bacf005ca8c072c329a948d04dcf6ac15437415f1390141aeba2a4f1e1cffcfa27f6c3d311908248ff6f10321c9c5897f5499390d8b10d5 SHA512 17674f30551768d3a81ec564f2f6ba97637d8eaec3126957f945ba0f6600f41950468963da7bec8c0a388ee42e48aaccead8e750959f601d0d8bfed2f7c99466
+EBUILD microsoft-edge-dev-91.0.825.0.ebuild 2338 BLAKE2B 5c32393b981662726bacf005ca8c072c329a948d04dcf6ac15437415f1390141aeba2a4f1e1cffcfa27f6c3d311908248ff6f10321c9c5897f5499390d8b10d5 SHA512 17674f30551768d3a81ec564f2f6ba97637d8eaec3126957f945ba0f6600f41950468963da7bec8c0a388ee42e48aaccead8e750959f601d0d8bfed2f7c99466
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.803.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.0.ebuild
index 8b9535ac7993..07e3b73f875d 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.803.0.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.0.ebuild
@@ -9,13 +9,13 @@ DESCRIPTION="The web browser from Microsoft"
 HOMEPAGE="https://www.microsoft.com/en-us/edge"
 
 if [[ ${PN} == microsoft-edge ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* ~amd64"
+
 MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.796.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.6.ebuild
index 8b9535ac7993..07e3b73f875d 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.796.0.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.818.6.ebuild
@@ -9,13 +9,13 @@ DESCRIPTION="The web browser from Microsoft"
 HOMEPAGE="https://www.microsoft.com/en-us/edge"
 
 if [[ ${PN} == microsoft-edge ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* ~amd64"
+
 MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.810.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-91.0.825.0.ebuild
index 8b9535ac7993..07e3b73f875d 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.810.1.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-91.0.825.0.ebuild
@@ -9,13 +9,13 @@ DESCRIPTION="The web browser from Microsoft"
 HOMEPAGE="https://www.microsoft.com/en-us/edge"
 
 if [[ ${PN} == microsoft-edge ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* ~amd64"
+
 MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index ee7049226917..965d55950807 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -3,4 +3,4 @@ AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
 EBUILD netsurf-3.10-r4.ebuild 4547 BLAKE2B b1ee718e53e416e96e3793fc4dc5f04481a16788d4b20c64108b5be38a871d9c53934bcd40b4ef949303ff49a6568b7c4bebf038cc214169c22f193319d8e231 SHA512 f1c3dc0705437be92b1a309be9b7c6a1b29bab3fceff97c6057527964d53d2ea1e43b9626d50064ceb5e79438d73e0504f2aec4fcd759c98fa388a627dce0419
-MISC metadata.xml 1564 BLAKE2B 613fed039b6dac6329dacce954d28087855dfb2db7445496e9394882c0d9bf59c9db936bb47188a582eaf7987961acb5d4045baf1917fd1a46b72dad1c24ed7e SHA512 634e81db8221b34e71fab51ff66efd15d95307a88dc08812837b290301a8b8e1644dab4972f9e1941434b04f0c5877343033099d624fa68bd449796f0866ab48
+MISC metadata.xml 1594 BLAKE2B 01a6ef77d9eb455529b4efa701164d93c10f4af5a1d79feca9892b9625c3988a480cb1503367fecd825fd821fd1a499f1c16fb86a3c992946515d78d5892c9f2 SHA512 dbd7833587afd3954214bc30fd3d550966c38303371b7be5aa94e8c1ec90effd05e5e118c488452d716202bddccc0993f11ec97d4109bdcf6f9cbeff89ac2737
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 4abc84a70da8..f4c5639651d3 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>philipp.ammann@posteo.de</email>
     <name>Philipp Ammann</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 966c2c4fffb5..c11bab560278 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,6 +1,4 @@
-DIST opera-beta_75.0.3969.14_amd64.deb 74649684 BLAKE2B 626b264c738c9cc44edad13ac4ef395cbdec89c6278fd9e7c9997c54bf0658d806cb068868dfa96fa65c52f04ba31f9a8ac0a241c5f55cf56f9248dbb9a25de4 SHA512 2322e0b78df9824aacd7a445b9633fefa58df49f94c59447f1b2279c512cbcbbfb3c005c7c8ca7bdc6eaa3a1ea968839887119ba66d80af6da4a6d9580571e6b
-DIST opera-beta_75.0.3969.35_amd64.deb 74668108 BLAKE2B b44cc245a0ed74ced5bf93de039abb6f5c3d9267308280bde6566c429bda4b5144b8efda05db2fdc5b62f46ad7e4a0cfb710613a935a74cb11ad152563b35a42 SHA512 8cd07ebb87bb58841c56ba8635e491aba3e97d8c2c271eff2af59fa8c0cc9a587ec2b9aabb962d6768e2e03f117c308b7caff2062b349cebc4edd7b788a521b5
+DIST opera-beta_75.0.3969.60_amd64.deb 74645452 BLAKE2B d6346b512e8a274248fe5c94cd964048455ef65da3a4f2b1bbd16d2d11ba0dbd14d1eb49e32b7588f445ce59d3b9843775ad78b736e7fcd73bb0e9847f74b280 SHA512 ca5c689d0978cd2177e14b35b445d70cd0d5ca81d3fb9b7ed468f762c7826924ea4216fc39df7af915268d75675c593c5099186f2c48e3d7bb807f890452c0ed
 DIST opera-ffmpeg-codecs-89.0.4381.8.tar.xz 1427048 BLAKE2B 6f92f8582663b46875f4a3d9b0b80b14eb8b361b23699bd5e10319c9b16b26a436cd710cec684a818189eae4892fc41daf2b3387282926e964d4d395a1c7778e SHA512 7947eeaa361e78d1a69d244727ad601719fd4e6d6c284b1655e9fd9c74cf718f42ba3e0d0277f96a7b9cab984d743ea190404e2f74b5e1a6b9bd244e45b71e77
-EBUILD opera-beta-75.0.3969.14.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
-EBUILD opera-beta-75.0.3969.35.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
+EBUILD opera-beta-75.0.3969.60.ebuild 3316 BLAKE2B b611c07f8321bd374b7df805b66f3075fa1211ee26d15a879cfcb651b828469db09a91499cf221e4c4a6e0e9a6ee262eb4ad75242513b2c526bfd4a651967d8c SHA512 125bc292210a23c56cca89d5567817f85eda4b07bcf809c38fbc5913569068175f123b6d2d023794bdc25e54694ec7e71f8cbc799d1117b860308c09e8952b90
 MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
diff --git a/www-client/opera-beta/opera-beta-75.0.3969.35.ebuild b/www-client/opera-beta/opera-beta-75.0.3969.60.ebuild
index e4d998d6b855..ae39d503ab91 100644
--- a/www-client/opera-beta/opera-beta-75.0.3969.35.ebuild
+++ b/www-client/opera-beta/opera-beta-75.0.3969.60.ebuild
@@ -22,14 +22,14 @@ SRC_URI_BASE=(
 )
 
 if [[ ${PN} == opera ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* ~amd64"
+
 FFMPEG_VERSION="89.0.4381.8"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
@@ -48,6 +48,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
 	media-libs/alsa-lib
 	media-libs/mesa[gbm]
 	net-misc/curl
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 3454333d7ff7..f44b893fc6e5 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,6 @@
-DIST opera-developer_75.0.3967.0_amd64.deb 74349124 BLAKE2B c61aa27ae9bf5174e8747c146d85b3ac32887a67106307dc2f195da2e693738359947a2c962ddaba23044ee55fa8c5fbbf8cac33e06b5d25272e87070d3d3202 SHA512 19bab0848e707181cd2d5e853f347f79afad1e10fbef83b09225e37a77069d246a292797f6018a550df7be59c350dacd06709e4807deb43211fb4bcbd50fd4a5
-DIST opera-developer_76.0.3974.0_amd64.deb 76398292 BLAKE2B cfb3a7d27cc84d43d8b3d7f867a787029dd462283e257201f467c86761e8da93a81ec46a1a98091800269bc1c99c9436e5a910a05a760de26ba08b9dd29dd029 SHA512 3a022e078409c64a4cae7a28b60bfc318c5c0036fae0f5ac712a62e096516fca62ef3c562d63a5d49f367462489b809472c9672be94d7eca9fa29a426c40efc3
-DIST opera-developer_76.0.3981.0_amd64.deb 76364604 BLAKE2B 00046ef7687c72809f4e7ee6098021a87562a7805a6afabdf571b5d03449a1843a3fa20185488272e78a58b40f65a8e6845506293c5e18cd0dfcf1e90160570b SHA512 9ece065f454d6af496590002853daf360d3b4251a43dcc7e58f96b0b9781579a545b31e6e2f1f5fd4c3978071619c767bca49ffd038959a77c66316b87d47285
-DIST opera-ffmpeg-codecs-89.0.4381.8.tar.xz 1427048 BLAKE2B 6f92f8582663b46875f4a3d9b0b80b14eb8b361b23699bd5e10319c9b16b26a436cd710cec684a818189eae4892fc41daf2b3387282926e964d4d395a1c7778e SHA512 7947eeaa361e78d1a69d244727ad601719fd4e6d6c284b1655e9fd9c74cf718f42ba3e0d0277f96a7b9cab984d743ea190404e2f74b5e1a6b9bd244e45b71e77
-EBUILD opera-developer-75.0.3967.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
-EBUILD opera-developer-76.0.3974.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
-EBUILD opera-developer-76.0.3981.0.ebuild 3001 BLAKE2B ccd10e63388089ab731976a900aa4e1bf6c9b7eb84c04793fac57659d9c3161eb0e29b605496f990219a9396518cf5e89f90804996996900dbd955b9656054bc SHA512 324b1546cb7535e6c5a594b286b62beb5a6fcc40c3e402d233122eecee4932ba3dff03b7d0cb81654e3955e643f3e2424aa3ef9806fac653c4c4e6dfb471c3ff
-MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
+DIST opera-developer_76.0.3989.0_amd64.deb 76801908 BLAKE2B 7b901f44cf3b3d749666e3d358f636e02af1c9309119878407f4529f9444ba36cdd6d863475736b091773377e0243eae39523ccc5b4703cbc897adec3e5a3c24 SHA512 04390bb2fe3e7981943aaeb22311e615113902948c3d1346f5867eec8798e350369fc4edd47dd4c06dc5c8fe701de0118272be8de5dc93cb25c6b3133d3fef86
+DIST opera-developer_76.0.3995.0_amd64.deb 76750104 BLAKE2B b647d5b8d5b840f6ce6ca7b922d8ca187ffa971508c06566b173ec289859b2d14d7eb796bebdba820cf3b9674a5ddd09abe7a37e3bf654a96cdc3918ce377108 SHA512 27c1a34882ab10313d1560376b0abaf8ae5d8afed772da64230adf97d265aff93a2d373a7cee2bc1e6e8e1796a48cb2828a1864a49af21a8fa4fe42f28831a88
+DIST opera-ffmpeg-codecs-90.0.4412.3.tar.xz 1392160 BLAKE2B 61f32ac1ac3ec12f39324e1e91aef59f9693e36d19abeb92b223e7b95411d5b2a7c2e7ecac87c5a59d374a61bc2ea0f6b2738d01860a1df013d1111876acb888 SHA512 4f56c70bb6e57c978c4997f30473454ccf51308818bf9debadfa0fe4d68ce10c7e333fb49ae4152b355f442b06cfcfb4c0fa130db4de9937374dc5c589c56a70
+EBUILD opera-developer-76.0.3989.0.ebuild 3018 BLAKE2B 129d4792889815c112a42645f3dfd0e07287129ec9de674e6cf9236e9ff3a751089401768839ff0573a364862aee8054a7d9e97dcaf9a5588f7175f2d4571b9c SHA512 73a8e5051ed654cd8ef4a669eff91043d5ad463f3c409880bc158e028d136e9d91ef67bdc9da7d33f30fffd2206a7fa8246448cf14f0e641e077fc00bc8074e6
+EBUILD opera-developer-76.0.3995.0.ebuild 3018 BLAKE2B 129d4792889815c112a42645f3dfd0e07287129ec9de674e6cf9236e9ff3a751089401768839ff0573a364862aee8054a7d9e97dcaf9a5588f7175f2d4571b9c SHA512 73a8e5051ed654cd8ef4a669eff91043d5ad463f3c409880bc158e028d136e9d91ef67bdc9da7d33f30fffd2206a7fa8246448cf14f0e641e077fc00bc8074e6
+MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/metadata.xml b/www-client/opera-developer/metadata.xml
index 9862847b22e0..a7f6e93cbfdc 100644
--- a/www-client/opera-developer/metadata.xml
+++ b/www-client/opera-developer/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
-		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild
deleted file mode 100644
index e4d998d6b855..000000000000
--- a/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib pax-utils unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2018"
-SLOT="0"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
-	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-
-IUSE="+proprietary-codecs suid widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	rm -r "usr/share/lintian" || die
-
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-76.0.3974.0.ebuild b/www-client/opera-developer/opera-developer-76.0.3974.0.ebuild
deleted file mode 100644
index e4d998d6b855..000000000000
--- a/www-client/opera-developer/opera-developer-76.0.3974.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib pax-utils unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2018"
-SLOT="0"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-FFMPEG_VERSION="89.0.4381.8"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
-	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-
-IUSE="+proprietary-codecs suid widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	rm -r "usr/share/lintian" || die
-
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-76.0.3981.0.ebuild b/www-client/opera-developer/opera-developer-76.0.3989.0.ebuild
index af25075d5a39..9f85c468ae05 100644
--- a/www-client/opera-developer/opera-developer-76.0.3981.0.ebuild
+++ b/www-client/opera-developer/opera-developer-76.0.3989.0.ebuild
@@ -22,15 +22,15 @@ SRC_URI_BASE=(
 )
 
 if [[ ${PN} == opera ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="89.0.4381.8"
+KEYWORDS="-* ~amd64"
+
+FFMPEG_VERSION="90.0.4412.3"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
@@ -48,6 +48,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
 	media-libs/alsa-lib
 	media-libs/mesa[gbm]
 	net-misc/curl
diff --git a/www-client/opera-beta/opera-beta-75.0.3969.14.ebuild b/www-client/opera-developer/opera-developer-76.0.3995.0.ebuild
index e4d998d6b855..9f85c468ae05 100644
--- a/www-client/opera-beta/opera-beta-75.0.3969.14.ebuild
+++ b/www-client/opera-developer/opera-developer-76.0.3995.0.ebuild
@@ -22,22 +22,22 @@ SRC_URI_BASE=(
 )
 
 if [[ ${PN} == opera ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="89.0.4381.8"
+KEYWORDS="-* ~amd64"
+
+FFMPEG_VERSION="90.0.4412.3"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
 		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
 	)"
 
-IUSE="+proprietary-codecs suid widevine"
+IUSE="+proprietary-codecs suid"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -48,6 +48,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
 	media-libs/alsa-lib
 	media-libs/mesa[gbm]
 	net-misc/curl
@@ -66,7 +67,6 @@ RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/pango
-	widevine? ( www-plugins/chrome-binary-plugins )
 "
 
 QA_PREBUILT="*"
@@ -125,13 +125,6 @@ src_install() {
 		mv lib_extra "${OPERA_HOME}"
 	fi
 
-	# symlink widevine
-	rm "${OPERA_HOME}/resources/widevine_config.json" || die
-	if use widevine; then
-		echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \
-			"${OPERA_HOME}/resources/widevine_config.json" || die
-	fi
-
 	# pax mark opera, bug #562038
 	pax-mark m "${OPERA_HOME}/opera"
 	# enable suid sandbox if requested
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ee35a834d948..4a66c8a4da44 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-88.0.4324.27.tar.xz 1362668 BLAKE2B 0815049dbf95996a04a072ad1b82664ef594e0ea99aaea5ea9d54448457bb5aa5c6d9cb95d6c84a14ca64a29e0a2e9c6f5315a1988eb577ad02cc7422fe0f886 SHA512 cd1857d302c413a52433839103a3a268a12ab255ad8d6e651e872f7f28b61e1426e3c2854fc9a6acf4430be9fa8fea939de288c800cc3c60696394f77d86146d
-DIST opera-stable_74.0.3911.203_amd64.deb 72976108 BLAKE2B 02342ef4d291bdd512a78ac0d2ae5da63d11b2cc999f0acc6ffe1ba9c9fe30a292b644d5239dc7481c4dff6c995985c1e1ee6f760240ef402f2740ce0928473e SHA512 ecffd6bc62a9d1e411358990add1e63e5d2a85614e47fc41b6f24eef9689291906516e779e5b9510e213ebf988841d21a88d57112ad510d97e6f8bf6b9ef4d3a
-EBUILD opera-74.0.3911.203.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
+DIST opera-stable_74.0.3911.232_amd64.deb 72911904 BLAKE2B 8e803ba1d0aed25f0b99e0b4fd4c8695381e54c8af607fa16ba08079e8ebdedd0c8d01381985553318bf9856ac399a95ec2ca91c67a0cc2d6b5e2e1c087837e5 SHA512 91a8e7219efcc076ca822a0e4fc313812dad8381ed40fed2260a88c3365fa3ecf3d36a301b507721131c436fe97a1da56a59380fef26b34dbc4254f3b4284c22
+EBUILD opera-74.0.3911.232.ebuild 3316 BLAKE2B fca6be0f2575481673260bf3bcdc66eae746182c412cfb5d6c4842b465fe01057d1959de5ffaa9a70f38f7996057b6d94ac16d35681d81c03b22f234e803a6f7 SHA512 744aa83e96795474f5fb766fafb70e72a482a7e9eb244d98f998991fc7a0beef5b2906a87cfa0887c3012757d2f5822a3094c209334d3448dbb190e5e2b84760
 MISC metadata.xml 687 BLAKE2B ebfff0bde22208ffea6584bccc5dcbf3b8682cdb10e95b43150d872bef72c6e4325697adbcc659ea3376977a21aba1a90d9f9d71b30bdc1a5d850996116cda55 SHA512 43bd26c1b891583955107a111bf7e8d81619d03dc4cd0c67210909c8f26b3bac9112fc59e31d5c422c7464c8ac699107977c34b57a0f27585786ca1636d704cb
diff --git a/www-client/opera/opera-74.0.3911.203.ebuild b/www-client/opera/opera-74.0.3911.232.ebuild
index 2f9be6861f91..bc6b35c83815 100644
--- a/www-client/opera/opera-74.0.3911.203.ebuild
+++ b/www-client/opera/opera-74.0.3911.232.ebuild
@@ -22,14 +22,14 @@ SRC_URI_BASE=(
 )
 
 if [[ ${PN} == opera ]]; then
-	KEYWORDS="-* amd64"
 	MY_PN=${PN}-stable
 	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
 else
-	KEYWORDS="-* ~amd64"
 	MY_PN=${PN}
 fi
 
+KEYWORDS="-* amd64"
+
 FFMPEG_VERSION="88.0.4324.27"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
@@ -48,6 +48,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
 	media-libs/alsa-lib
 	media-libs/mesa[gbm]
 	net-misc/curl
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index e442e1997286..45b955ff7e6b 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,8 +1,5 @@
-AUX otter-1.0.01-qtgui-5.15.0.patch 342 BLAKE2B f28197b1ccc6ed970594638228e1345cebdc50bb3db809fa0dfe8038b74f2e7ae89b3d7c2291e66089afc709bcc51d6cd6dc2f93dd902a893a2d0883358dd7a3 SHA512 6462158bd09f86867644a25a78579db7c7d6669b9c917f6c02fba817e3b69cf9e62038e8f0e6fab232af13b4f1a3649249ee6ba60601f9fcd28b004fa46c0f77
 AUX otter-1.0.01-webengine.patch 1062 BLAKE2B f3387e091afacf07c305e965c1d571658a49c924c484312cc89212d636fa3cfd8fde74477feab974def25ad93d2f01437d5c82896cac33ccddc879fdbaf41543 SHA512 cab5895aa92fa09415d4c60f75501a8e319dd24810319cc8ac50b872d153525b710ad32a9a5398a62fb9305653c21710b5dd181470938de339a547248bbb8bfb
-DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
 DIST otter-1.0.02.tar.gz 4940331 BLAKE2B 686547b4302e79e882c5c4967680992faf54b5330896207ae98b1633fa6eb2df70793bfd0c8da5c7b5b8be39c5b9528f32303f69026dcd43f12fd528923b9011 SHA512 5b142486298f2ef1f0613363c7a4de3340544ecd82406efc64225e78eb958337ea4045c0c44553fe3b29a0836bd5f6cdab37d615ebf98756108f9aa5473360a1
-EBUILD otter-1.0.01-r1.ebuild 1743 BLAKE2B febc145b4cd0a7839ceb21375750fb4ba6b7faf58101528ac02dc7e9a09bedb1762e5fce62093dcbbe6bf4b1c7139d8512a863d11995b3aee8d4d86f7d20f07b SHA512 30e09797cc1194a89bf165af51d2606b731477ee16d3b4fb37c421aa8b015801893853133453708d226d12c748789cd5390a29aaab9090451f681c948135ff31
 EBUILD otter-1.0.02.ebuild 1656 BLAKE2B e036c70a7a92c7963ed218d33ce1f66b8cd131036e3b757981af0e577ea401fcb510d89e4becb7f0a51c0232e1d44d52c7e48d9839efc38d5c56c10a18a12580 SHA512 fc6ff2e8da8324807c306c7ce31665bd8af208886edd8f2dd23afef6cf1db72f96e82d85660d902b2bc7cdd01cfd2fa1c7baaa249b91dd31144db21c21f836a8
 EBUILD otter-9999.ebuild 1656 BLAKE2B e036c70a7a92c7963ed218d33ce1f66b8cd131036e3b757981af0e577ea401fcb510d89e4becb7f0a51c0232e1d44d52c7e48d9839efc38d5c56c10a18a12580 SHA512 fc6ff2e8da8324807c306c7ce31665bd8af208886edd8f2dd23afef6cf1db72f96e82d85660d902b2bc7cdd01cfd2fa1c7baaa249b91dd31144db21c21f836a8
 MISC metadata.xml 258 BLAKE2B 08a65741cdd1898d88a1dafdac3ea04ed28d3ce096c31dc03b02668d5ea145f87f0b59c73afd556d07e68600ce0e843ee7a37309d447c08bdfc32ad773a0b559 SHA512 a85a366fc538dcadd861ef021552c19bac761bbe1e31f2177ec468278bb320ef2bd2850491e011e76ede92e89e5677672956d08de92e11a99f821799d969fc2e
diff --git a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch b/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
deleted file mode 100644
index ec60a4b2c42b..000000000000
--- a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/modules/windows/web/StartPageWidget.cpp
-+++ b/src/modules/windows/web/StartPageWidget.cpp
-@@ -41,6 +41,7 @@
- #include <QtGui/QGuiApplication>
- #include <QtGui/QMouseEvent>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QDesktopWidget>
- #include <QtWidgets/QGridLayout>
diff --git a/www-client/otter/otter-1.0.01-r1.ebuild b/www-client/otter/otter-1.0.01-r1.ebuild
deleted file mode 100644
index 2efa58e6f140..000000000000
--- a/www-client/otter/otter-1.0.01-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="https://otter-browser.org/"
-SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	spell? ( kde-frameworks/sonnet )
-	>=dev-qt/qtwebengine-5.9:5[widgets]
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.01-qtgui-5.15.0.patch
-	"${FILESDIR}"/${PN}-1.0.01-webengine.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_QTWEBENGINE=true
-		-DENABLE_QTWEBKIT=false
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 09eadcb2254f..068f77c49978 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,10 +1,4 @@
-DIST qutebrowser-1.14.0.tar.gz 4144761 BLAKE2B cc220990c119904c18932b7f240e428fd36baaf42a592f8fe15e9a1b1e5506cf82291ac0365fd43c75ffa78b403cbe35616f8bd5b362a686db389f5ab7a02345 SHA512 7330b685b5852c7700738bf1063121c6cb19b190143e4b98680563ae1a6ce7affaf9691db8c3a4e3686172be7da26ce841709dbc5d31a941326d7432c857cb25
-DIST qutebrowser-1.14.1.tar.gz 4161759 BLAKE2B 5ea4d032cb8137af1ac9add9fe85b7dc0b8d9c78c838bd91b09444035f3e433d7cfd75672fbaafc1eceb2a0e1bac8f54b8419a7ff0d7c3b272d588818194a260 SHA512 2902b1f320c80601195f0a87b4cd1ce6dac7e79df82df692b08d00f1f0be449fcc7d7a855f4fc2cc5773f3b2142f508b0dfc6612778c416401f1117acc081de8
-DIST qutebrowser-2.0.2.tar.gz 6190348 BLAKE2B 0646f7879c049f3c754c98d6929f2851507804cc95fe117cafbac8477203799afd9af5c8e6b97fd48a09dffcc17f41982b035a0459737e289f02ab34eef63f7e SHA512 523eb6a46e88fc3bea724867d92042e86f75948a660159e4bf7c21b98737dd67e05fd62840d3de06c5562c8e8833a2178cfd9fd620b95b7521d695044e08f5bd
 DIST qutebrowser-2.1.0.tar.gz 6246732 BLAKE2B 8765112265a3b0852ef4f55aae2e69e0d6d623d218ed40c54e0a5d7a76ac9ed83885fa83a3112419f1b01316c3ae06934e89f316d280c2ecfabf70966bde0ddb SHA512 eec5ebc8cd4ba530cccd8296320768a3824c4f0828c806523acd95762a3dc9a40019b22b9e9219b27d1078648b78f861c6f3792ccfe991c0bdd4b3b95a009c2e
-EBUILD qutebrowser-1.14.0.ebuild 2652 BLAKE2B d6eb715962a5b950bf3792283ed2b73ebbd445226b7d8c20cc503fe53d8790e49c76cab59326bca6c88caccfa70fb0ce987dd812a886666ae8d4b25f663f99cf SHA512 fe94792cb5e3ae5d7aab87e0fe6880460bdb34bd47036759ea0706d16c7354f2cdff915bc40ccfbbca5f051a61afb2918c876a89c66e0a9185d95ff7ee80e0df
-EBUILD qutebrowser-1.14.1.ebuild 2652 BLAKE2B 47d9f2630c392a4424fe2ef0138adc18df4e787d6be521bce773619f6374fd5020eae9f4544318e0d9afb3d5500988264af48849c1ced2878048051325afcf78 SHA512 c84c3664aa8ec6c2feba3f3a5331179e29afdfcde5b7c56f7b377ca8cfcee49390b644592d5e8be6adb48483293fd74ef32cb1ed398ae9ddfa5424d1fd883d0f
-EBUILD qutebrowser-2.0.2.ebuild 2749 BLAKE2B 4b8edf2b84f94236c092a1636ef92c7107222cecab1df4b56ebe521280263bdd78cef52db1c47a523a3c88c90804400780877ac1c548a074c0e2d4af7826bb94 SHA512 f1be68c4ceca42c51f24c2c9a6b9b712ba72c822b063e010d3385d83305f2bd5da11361ce5d35af8bc1416239b0f3e23a6a40c33fc64edb5aa7c36d1b4dbcc0a
 EBUILD qutebrowser-2.1.0.ebuild 2749 BLAKE2B 4b8edf2b84f94236c092a1636ef92c7107222cecab1df4b56ebe521280263bdd78cef52db1c47a523a3c88c90804400780877ac1c548a074c0e2d4af7826bb94 SHA512 f1be68c4ceca42c51f24c2c9a6b9b712ba72c822b063e010d3385d83305f2bd5da11361ce5d35af8bc1416239b0f3e23a6a40c33fc64edb5aa7c36d1b4dbcc0a
 EBUILD qutebrowser-9999.ebuild 2941 BLAKE2B dee8c19bf858809a1e5cde8afa8d4398c5c37bae0b55874b479d6724f08a931e952e98240e4d46db883029dd3f8cfb4a70f934f14aa38413ad0b6d436f1c0578 SHA512 63804c31cb48ce5d857d7833d15277fad73fe95b294a2de7379294380980707a56ddcbe92c1841383cb97b6d94451406c7955a87459d52d1d3dad8c056ed04d4
-MISC metadata.xml 712 BLAKE2B 1ecb84f337927d3b9fa2f827a2296457322823c647ee033d803ae044f6d7bc6045d8e811e3c28024c45130ef3273f223605b8d604fe3da4e47751d9e0a9b2bcc SHA512 4e0ce844dd53b7beb6da2baab54adedaddf2bd075eac4904da20d9aeef0f75007a4e53cf3fe2954462c5f7e717cf7008fc6b878402fa787549766e9175e2d056
+MISC metadata.xml 742 BLAKE2B 3410b02e22887bb80f47c72888bbbe12505686aef9a83e7fa8c66fa01dcd16f0b60511c9cb9953aa087c89e62eac5845ea7db155014b978fed66c35ecefe8780 SHA512 22873bfafc2654f695eb90182c922ebd9465b3f7b3bbfca4199ef6684b65c3a28a8164a2045c823017cd6beab1ed65d00fc56904f6686bc98acca6145e80abe0
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 0e64656b39a6..c915949c2ca1 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/qutebrowser/qutebrowser-1.14.0.ebuild b/www-client/qutebrowser/qutebrowser-1.14.0.ebuild
deleted file mode 100644
index f4cae8f3e6cc..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.14.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-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="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.7.1[${PYTHON_USEDEP}]
-	dev-python/pypeg2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	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/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      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
-
-	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/qutebrowser/qutebrowser-1.14.1.ebuild b/www-client/qutebrowser/qutebrowser-1.14.1.ebuild
deleted file mode 100644
index 6fdb0a12878f..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.14.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-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="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-	dev-python/pypeg2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	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/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      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
-
-	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/qutebrowser/qutebrowser-2.0.2.ebuild b/www-client/qutebrowser/qutebrowser-2.0.2.ebuild
deleted file mode 100644
index defe2baa7c46..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.0.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	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-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
-
-	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/surf/Manifest b/www-client/surf/Manifest
index d7b6df402d33..bd2f0709d574 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,6 +1,6 @@
-AUX surf-2.0-gentoo.patch 2393 BLAKE2B ba68e17f77bb631f42e477837e392008526e5786a2657370e0e9698f7e6e0862fab4780d292e5bab1a336dbffcbcde730db7474f1e11b08e98b0c54ae19ea15a SHA512 7c431dca5805eda29f68d52798f1b6bfc9df89ee342fb183241f6cf06a760ae7bb61dd6a976c2b21404edf25afae25b9696971d8a1ba0904045af2914d64a8db
+AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2
 AUX surf-9999-gentoo.patch 1147 BLAKE2B 4766afd176d300bcf26fc7730e60344b6461133cab976fc96b9afa1a99df6189085ecc802b308df653871866971ce078b586bda5f9c124c74d9b555377174b0e SHA512 d0a50f8b396b3989827e9c2fe20d0de58ba626a2f551aafc7a776ca545f1b76c548580a1f813bcef3fc2ec2d0fe60af76036a4d9d182955a7abcd44dc7185709
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
-EBUILD surf-9999.ebuild 1241 BLAKE2B 438aad0c8a8529f4042235f8490a7b980e922b3500afbc83e2d95d144bef9a46a786abe98d09c65a6a3f056458e78f96593933a25b10c5d3bff97b9587bba9f7 SHA512 c06d268dd882efd15ea7128a4e4966f0b1ffbd9c8da3ce180f1976a469d89566bc3a7dbcdb39dcb5769b4b9feefde46358cd79a99b58f79ccef4fdaeaf28ccc5
-MISC metadata.xml 347 BLAKE2B 8787a8c0af8355eee5eaa3538dd76b5a4c6deb6de8ef90c468e343fa5ee26eb0978394e3943c841566fc600ca62f4d7324cece0f486c7f912b60da48af790db6 SHA512 e4f1adf1f17bfd24d065e8869983ec556f3438b0fcaa806125dbc0d9848102edfdd2a7d5ceb5c73987f400bfa019024cf69d9fa7a57a047c95dd60044764efdb
+EBUILD surf-9999.ebuild 1331 BLAKE2B 0181a924a03247c3a60aece43b5029702162df785c208082df610f38b8d499ba33d4824b2b5f99985f7de45dcca68028fe7dd4d1b4037fcd9cfa978acd679af0 SHA512 ffefee4fe16bd708b8c09ffe590a39553a53266797a92509df108faf495a83f6da5e509bf8a8d743dd2a29bd5f4f836f87a93256a5e1a958c12ea3b807c3ba6c
+MISC metadata.xml 463 BLAKE2B 1c11d2d7ca09b28800b060f289acb8250669d30792765d89f5afe8372150efea49317db94bd0b8ba7a40fb46c38778cfe519d4081270dc77976650b9d99417db SHA512 22d63cb756b13ed0f054a91c9c202ea71aed493f9eb41344eb80ae8fd9d6c9effd1df5d636d50021be10afec6d2f67a4982cfdfd1acc43cdcc9a276ef4d420e6
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
index 07aa6568f55c..b0a7b5c8ef0f 100644
--- a/www-client/surf/files/surf-2.0-gentoo.patch
+++ b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -29,8 +29,8 @@
  CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
 -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS = -s ${LIBS}
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS = ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
  
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 5e4c14c17c06..52593948c041 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
+    <flag name="tabbed">Install surf-open.sh script for running surf in <pkg>x11-misc/tabbed</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 8670c83e868f..d6b737a623dc 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ EGIT_BRANCH="surf-webkit2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
+IUSE="tabbed"
 
 COMMON_DEPEND="
 	app-crypt/gcr[gtk]
@@ -33,6 +34,7 @@ RDEPEND="
 		x11-apps/xprop
 		x11-terms/st
 	)
+	tabbed? ( x11-misc/tabbed )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-gentoo.patch
@@ -62,5 +64,9 @@ src_prepare() {
 src_install() {
 	default
 
+	if use tabbed; then
+		dobin surf-open.sh
+	fi
+
 	save_config config.h
 }
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index a080f8854d1a..0a0cd1ce6e81 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -2,4 +2,4 @@ AUX uget-2.2.1-fno-common.patch 144 BLAKE2B 107c0876bd4c4813836c7d6a4a87ac1f14eb
 DIST uget-2.2.1.tar.gz 1006697 BLAKE2B 2580cbcbe12d3001ada252a46358c4bc357fbe2ca4e3433e13ad95efb8e99d567a194db024eaf2ba58246a35937a5262be62aac4ee24272421f531dc72eeab20 SHA512 b76e5240e42cd0aa5bc47eb1a9cff0a0d8cdea87995455d72cf925923321f492200896ad904960e7f7462eb9655284f5b295b8a779b42223fe73a098a143576f
 EBUILD uget-2.2.1.ebuild 1200 BLAKE2B 1977978ee1b39ca54e5e16bab66953f4cd341cc05fbec7cc37f833e659ea8ce6d04aca772328cef30eb8c89e2852363ca85de481b39ac558dbb55a0c6005f3a1 SHA512 ffea9fdc9b3b84bed13f16221f901841d8f108233abdb670c665b67b6421b0ae8387810b7c7c17a747000e849a8d4a7fd226c14db19b245875b1b5445c2707c4
 EBUILD uget-9999.ebuild 1128 BLAKE2B 690445c625407e1b8de293f8f405e9887825cd8072e0429bd6cbe2582660a90ce841450869576627bfebc5f0975fe19c211f3baf38c1d7f3571db23c2aa7e5df SHA512 9cfb2b8c9cd4361f2609aa02106748cc84bc24a7a5e4bdc8f9e52eb068c88451d6550fd5fdd17f6174742761383c606b69dd13631d1e7cb17f7e5942854823b1
-MISC metadata.xml 1122 BLAKE2B 09b2ce4fb6a0b65557c7e2564eb499f7da42fdfe2e48e046df182dd9b3418424391bf3011e69cee68534b568750f73e59a5886f46cfb0ac129d96426ce4d359e SHA512 7c4a793bfb36dedc7b07096f6ec3d82ee3196c350245c6d30bfab81b1ab56bc0934d62a3b1dd23972ede9eb4970bc9d9d605532d5305ba21c3d2f26fec526095
+MISC metadata.xml 1152 BLAKE2B c7052fde63644b09a7042e0da2add226f452c50564f9d37b1dd3c39f1be30e9a535e463b6efe15f15071e1f7bac4b7e168484bd033a5392ce252bbbbd12d7124 SHA512 a6d48e7b4fc805a7297635d0bd829b826e4fe382c51fb9ea7eee5cc85cf2ffaa2e7c1d4298ce2edd2ae5f5769857cab2ee699d5f0b260cb52e7d59e996a13777
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
index 956185cc59a3..89f76e1f3559 100644
--- a/www-client/uget/metadata.xml
+++ b/www-client/uget/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chn2guevara@gmail.com</email>
 		<name>Christian Segundo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index cdc2e0979fdc..7aaa60a94483 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,15 +2,15 @@ DIST vivaldi-snapshot_3.6.2165.32-1_amd64.deb 77537504 BLAKE2B 5104b2ca7878512af
 DIST vivaldi-snapshot_3.6.2165.32-1_arm64.deb 69777460 BLAKE2B 3bd957ecd1547d79183b955ecbc8aa6d53e9966c8f03810b5f40ac91b5752022f6c91111ab3680f220ba1f8ac1a7748f366a5b0a26ce528fa00cb1be87ec4b3a SHA512 98f2061f5f32be702e55927e58ef8af03bbb5f16c2d6fbd9f4959b9b9732313c3663f4b720243505fbff3f58677a06e49957754efb03fa28b02065edbe338682
 DIST vivaldi-snapshot_3.6.2165.32-1_armhf.deb 68597612 BLAKE2B de4c564394972fb9a85b02541adc67c0841b0b21c00367883527e383af80988969ab6a9c0abc64bb55a7ecad83a1b626f8a62ae383d7818e464f9aac1a3b78af SHA512 efa2a53144791e1bf42515932cc08b3308755feb797c00d64a283880b4c0e9d2aefaa0d7fd0d44eb3354e3bf289b0a087381af62202430dcf0fbae9e58c5a2d8
 DIST vivaldi-snapshot_3.6.2165.32-1_i386.deb 73641588 BLAKE2B 49c95c3d8cd90d1eb69b46df7e99cc5a267a6e0f1ea051e011f9e032fb130b4db63b542015192ebac72840aed11abb650d0b221b84b387cbf72ca4e1432d0bfd SHA512 5dda40708f005862ae214a87d14f5f88f3673615402f07fb1c3317d40cdfb922ace38d897ec3bf88a0975b3f95045cf4d7022a3a3e06fc8edf49c85e9990b68f
-DIST vivaldi-snapshot_3.7.2218.25-1_amd64.deb 78709784 BLAKE2B 9b014340c5cac95b0fe3e05b7aa070ea0ee642d9d7604d83c1cec1c95cde3f8c03d6f4c961d035c6674f118cc29fe380e6939d3b80619c404cab115985f655ca SHA512 e41a098169af40b0d75f9bbfdd405f86e3cb842e49cc5cfa3ba9579573633bf1a7e451b58492f82e162f55850148edaa5287f6d60645140f506fa9e074806fa6
-DIST vivaldi-snapshot_3.7.2218.25-1_arm64.deb 70823924 BLAKE2B 1b14ae98af1efef91b3b2df574d8195bbba1882c72930780b8b499af22eed6a6e08d21b6a294eeefea2c60c081e5f6285a7b90a3d5974d2e0bdfd8c5e07a131e SHA512 069a987094f4a58e679dffb183bfad0088d57ee1875feca6c7235cdebadd35bbd790e1189dce3163fa5380826adb230d5270f778429bd2f216a6ed81a24e9084
-DIST vivaldi-snapshot_3.7.2218.25-1_armhf.deb 69655016 BLAKE2B 104d1646799c24da61add66492c575b47f848df8c686cc95f5074523c668880c8c8ec2fb18407da843a33f0db68e81d69129e0a3820b297c96441b58a2ef835d SHA512 3f64fb39e650a11f9850b6e0a7ef66536e57b9c5a2f62ad8acfd11d4280d128d42aaf3991446e4a1dff20de84b81d45e417c6ce45e993f98462643d73a7a2207
-DIST vivaldi-snapshot_3.7.2218.25-1_i386.deb 75771152 BLAKE2B ff7d64d892409c29de8bd2bf79561dbb2091bfa436ac4a1d1bfbc479a61c107a5c6eaec85ffbc490389528f2211129159a993e90f342911f38a6f6d0e21c7ab8 SHA512 1f50ad5b3b8123e233c8f05dfec2aaac636c7d902411a241307bea3ce75f99027a2ce2b311ebcdc799cc2cd8cfc4287ac9e7b6fdc85896f7b3ea4d6b5351e913
-DIST vivaldi-snapshot_3.7.2218.3-1_amd64.deb 78724140 BLAKE2B 8f939c2723a7ae2e580cf9285c13d7434b62805fef26c494aceb4307aed1f51f4b6bc77203423ca464baf6b10029fb486afe805cfacb5bef35199db33106ee12 SHA512 6c4e6d16877441d3b5dc2945592cdd48f45217ca52fefb88d681296658ded86b670ae3e14b4d1b929e89e13e3b408df8aa12d2ceea8f3689d2383af21c87bd13
-DIST vivaldi-snapshot_3.7.2218.3-1_arm64.deb 70800716 BLAKE2B 579d53a12c6eefa8c69fda681876f9216a78cc960db6a9043065a698b0e26d0a2a7cf9ee52fc2cdfa0b19599f17aa9cfcab3ac94921899f771389a276f501713 SHA512 f0b59a3a96d463c78185aef41597b013b5c2c95583c51f0023d1af994bb643811318a606fdc2600df7e001740487dc942aceae4e8613103210277c2f38e0a7c7
-DIST vivaldi-snapshot_3.7.2218.3-1_armhf.deb 69635832 BLAKE2B 4b8ed5c5b7a454dc4def3c4c6ac7971b125c85bc6a6f8d0cbc2ac5b10df36623adf099f0fb54fb0cbe29859d582f62dc47eb247971b82ebc89ce229439332b35 SHA512 cb59e237239e70f3c317e27f76da7d087291d825b472041548dc0303f384fa4fbd2ccae7138377090207ad8ccce82706f123cb95d718a79b4a8c55a02a9d4566
-DIST vivaldi-snapshot_3.7.2218.3-1_i386.deb 75736164 BLAKE2B 02bec228bb256a910edf8567448603b6d5645146324fb48b75fa10995ac679393454cd2d17dda75e6d730e060e502fa45d1498468896e5dab650f6b4d89421de SHA512 e8aaf7fd1d2cff38fe3de69d27521f12519373d17323e75ed747c5313e3819ac8d2d1facd863c8590db8910870dc7477b42c9d5e1c95c78199c98b2c2fc535b4
+DIST vivaldi-snapshot_3.7.2218.29-1_amd64.deb 78735348 BLAKE2B eb3b21856be0dcfc1ad01de269f600f93e8095cb2da996bfa37d35823a72aae9ba46b3e5033f45886388c48afd1e1b3537afebf52a2e5d2ebb232df2fd8a5566 SHA512 7a17aa722d53322faedf350069663de1c986b999f898adf4cbad97fe8aab01eacd23f24886e1b834b222d142dd1aa90bc8ec5f673a30e954a9346807de9e77c4
+DIST vivaldi-snapshot_3.7.2218.29-1_arm64.deb 70812268 BLAKE2B f44684fa5f5b3a9119b65be6c8699802d0b7f89029aa6ea03303ea792778122fe7990f47a5d88c8ffdd451524ef64b80088177c1e0b4efba038d51a476e7ba81 SHA512 09d219d3af8e1b88363e3aa62cea43f0486af7d72033e84ee684f0f85bb43710d6815fa870cf8148923781a3d51b6fc8c99f395eafdf0ac9654043f73a02f26a
+DIST vivaldi-snapshot_3.7.2218.29-1_armhf.deb 69650632 BLAKE2B 1ceb86bb5cabd2e3d34edb6cc81c5c60806fbc68fbf9d29320475b725ec0311907b6e0666887436c0a0588c8db5c61f9ef3cd7c484a982215a0eed7aa30b4040 SHA512 19b6908611cdaa0455d758284f8804d764f5ecc48b5332001e9a80253fca21465764f3742937a857b6aea559e755a5090b9d466135f8ee0994afd0f39c2d4199
+DIST vivaldi-snapshot_3.7.2218.29-1_i386.deb 75769804 BLAKE2B fe57189c01492f707f484bf835cbb64f25fd7f4242b3143f3516c38a0f09223935e8dd12d63f8b10f7cc78a191da5181e3da67e002b12e2ea8cb89188e6601ca SHA512 ee0b55e187b0464e03af3cbef3e1fce4749a87726abcb89786ef000d6fc093cbfe8983f328cfed09d562ae235cf6439bf8c8a1482f97c61f966d7c1f368302c1
+DIST vivaldi-snapshot_3.7.2218.32-1_amd64.deb 78971276 BLAKE2B c49fb14c35154a098d01308d6457c3eaff83b2379127dc91f37e638408f4ca029e7cc7e8cbf8a0d27e776170aee81a3d7e140f2838763be401c7e73c285bb183 SHA512 fe03f436293d9c12bcc40f505228d5ff36972b86a40f4f7e179c9e63ceb554973a20be61b197d05c0dc37f9575461c005f3ebf75af6e79b9c0e5e5db4d713c21
+DIST vivaldi-snapshot_3.7.2218.32-1_arm64.deb 71047788 BLAKE2B e5e2ad9ce07d7b3a4f5a282ce7dfbb77c5d1f0190864505ebc1ecf0f9cee5e2f8591f5dcb6e1b569f10dc7b48caf3a6eeacc9d55305725821be3da38e03c1571 SHA512 2ac48ea9005754cc909380e1c75a0d5ac983d2789b99b8e4c9ba8e46361f55654fbfeed32810fea0dff15772b5ed5582af866a0401ee20215cb2cde8f144a91f
+DIST vivaldi-snapshot_3.7.2218.32-1_armhf.deb 69858324 BLAKE2B b79bfe59a1e1b1abea7a73ecf061a0857bb06097c965b36fa7853a09415ce3a766d4f454653479163b4e9c935650319200e49c5f10f733ed1177edcaac4b2dd9 SHA512 83b4eba29d8e62353bc913f543399856224f6085ec93279380d26391ae7e886a908353563d029904c861380c9286c5c97794fa3e8e903089b861dd47c034063c
+DIST vivaldi-snapshot_3.7.2218.32-1_i386.deb 76021972 BLAKE2B d554e1ddeff1f744f1d8ee7b2901332dde61e73be5b1e4565cf12aaf4f16b8ab549063d8606655a4b04d5e36b79b90367e5c3db4461c8480a8df3a629b00dd7a SHA512 4bb3d4191954493e9bee3b54b010d96d655938afed82933f242a27f2509347649d54a606fa68e310ccf9d48da2b8e348213f09dc6d158e1f0cd393ff88fd904e
 EBUILD vivaldi-snapshot-3.6.2165.32.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-EBUILD vivaldi-snapshot-3.7.2218.25.ebuild 3325 BLAKE2B a16904e33b1446840f651d6e5a9a86ab142da616ab94ea12382ea2e67e3f26624cb573330238429347bdee3426c2a99a5363c48e3834f595b08ce35d2292d5ec SHA512 8fe07a91d2036575cbf130e3c2f1b393f3652a4020f38bc3462a906875d5ff7570d0ff6c6e920e5844e01364277a13c64c172c0bc82948c330e8234113d9f32c
-EBUILD vivaldi-snapshot-3.7.2218.3.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
+EBUILD vivaldi-snapshot-3.7.2218.29.ebuild 3325 BLAKE2B a16904e33b1446840f651d6e5a9a86ab142da616ab94ea12382ea2e67e3f26624cb573330238429347bdee3426c2a99a5363c48e3834f595b08ce35d2292d5ec SHA512 8fe07a91d2036575cbf130e3c2f1b393f3652a4020f38bc3462a906875d5ff7570d0ff6c6e920e5844e01364277a13c64c172c0bc82948c330e8234113d9f32c
+EBUILD vivaldi-snapshot-3.7.2218.32.ebuild 3325 BLAKE2B a16904e33b1446840f651d6e5a9a86ab142da616ab94ea12382ea2e67e3f26624cb573330238429347bdee3426c2a99a5363c48e3834f595b08ce35d2292d5ec SHA512 8fe07a91d2036575cbf130e3c2f1b393f3652a4020f38bc3462a906875d5ff7570d0ff6c6e920e5844e01364277a13c64c172c0bc82948c330e8234113d9f32c
+MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/metadata.xml b/www-client/vivaldi-snapshot/metadata.xml
index 91c75704fe9c..d177249115d3 100644
--- a/www-client/vivaldi-snapshot/metadata.xml
+++ b/www-client/vivaldi-snapshot/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.25.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.29.ebuild
index beede0dd59ab..beede0dd59ab 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.25.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.29.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.32.ebuild
index e3d12da4e30f..beede0dd59ab 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.7.2218.32.ebuild
@@ -44,6 +44,7 @@ CHROMIUM_LANGS="
 	ja
 	jbo
 	ka
+	kab
 	kn
 	ko
 	ku
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index f61183a6b564..4347ce9b081e 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-stable_3.6.2165.36-1_amd64.deb 77546152 BLAKE2B 92e7026902ce28666076499926261db6eaa6828c9fae077d1558192b6f66f60bef6d95c89310dbec874683c6d172484884c29e7fed020ee8ac2048634ad0eb2b SHA512 6e1698d78dadc383626133bc4a28add034bc4660906e5f26347396a57e03f68eb4d97c8e5db9e89393c044515f8f55bb3b6177117b7b2f3cc79586305d07a2e5
-DIST vivaldi-stable_3.6.2165.36-1_arm64.deb 69809548 BLAKE2B b95b4bc62639c46add743a2f8d66edbd2e6981bff3de7d7f3828ea82efe3295350a3eabb96a4a2cf41b45156c9b64f64b067208f73ca30c70dd716f5aebce12c SHA512 4131ae1567c863a0d30aba9f333cae0c81e01d29c034543a2092f74ee08df038351eadddfc95bb967319897d8b613e64240c10f9f588c0a73c3d57e88ed19ac3
-DIST vivaldi-stable_3.6.2165.36-1_armhf.deb 68623288 BLAKE2B e814f57cd530024a4a179764814c6bb73c6a876c5b98f9f117fa74d49f3157c95e980dd82529059c8e455cb47da3c56c8d311af820391b30891992807993a534 SHA512 d61851cc3897e974f4edeb81f401e6daf3b90fba7a4b10bf2a98eecac2068f0d3f469371dc2825cbd45afa5cf9931c26fa78fa6e658048cca8cdb93bca2df35c
-DIST vivaldi-stable_3.6.2165.36-1_i386.deb 74279848 BLAKE2B 4e3a6b4fe3ec3ffb904457794e86f8f7c22814be29a0d193cf2b8bef2b9f21aa2b8e52733f92c7491accd04ec472daf10d53b61ea2fe7692d22de5a6a58a8f38 SHA512 685802a1f6cfbec92b7bf7d0ca777b153c3192c0e1bd9f9b23fc4d32f2529b649353edf8c7b298f44be078c3f61f79203703d639458954ac4ee2e2a3d00a5ff7
 DIST vivaldi-stable_3.6.2165.40-1_amd64.deb 77600092 BLAKE2B 9a2f2ae41c16a2bd1b2cba006c80eb8357b6eb88a2dd2cae001752741fca7bf7e8956cc3d277e39f09b904af3fb81eb6ae55adb15af2808ad824898b7cfa80c5 SHA512 e17a14dbfebd283de980cc2b6ddaca8fe7fe76711087c2cde3dc7cacd0c58521f6edf7546891b81bed428965b86e9341d20f134c2fdd792b2d061ad2c3f7f575
 DIST vivaldi-stable_3.6.2165.40-1_arm64.deb 69850704 BLAKE2B c88641c0ea45771eecf2369f89f18b2991931ea67f545c93ae3426b5561613835132f5a285d5f267b2e0981c9ffb65402a0016ec29fdabf381e6a16abe06c9b6 SHA512 026c58ee3c34497f6c5f31cf96b9a202efdeb2713301d5699267ff8b8fb32618c6c70e685479862a9c223dcdc32a0ea024f7334c8a52e18c5ae8b66bb7fed97b
 DIST vivaldi-stable_3.6.2165.40-1_armhf.deb 68650992 BLAKE2B 932c8df157717d99d2cd7963217fc0ecfce87a2118448624eae410311b706af468c1d6f8c0baaa3f8b8d2513eaad92e26417ca10f5511f5f76cb6f5cc7835b7c SHA512 e319733feef35c6b506deb21a21e4f6ee46acfcc83788bfa91d10b723146c870ec5108e433c57bfba37a3ba84da2d4f876a066a17a8f180e61933968585aca17
 DIST vivaldi-stable_3.6.2165.40-1_i386.deb 74317284 BLAKE2B b3b7a2a675128fea0b576dc7ff2b08218ee6c9796bdfaca91e8302f6d0de63173e8ab7f2f39232ffdc020779061724cebf599fd6e29f7eb1bf9277a271d52d3a SHA512 5628ea1ebaaa8b8a647b3e07c27aade8f45d448e21b38f19d9fc3749dc919a20f09df111098b99f5e6ec11146557f8742d5b40d3fe23e5bc02c4204fee7392c5
-EBUILD vivaldi-3.6.2165.36.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
-EBUILD vivaldi-3.6.2165.40.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
-MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
+EBUILD vivaldi-3.6.2165.40.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
+MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index 91c75704fe9c..d177249115d3 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
deleted file mode 100644
index 8809e8c798d8..000000000000
--- a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
+++ /dev/null
@@ -1,202 +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
-	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
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	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 )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
-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/vivaldi-3.6.2165.40.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
index e3d12da4e30f..8809e8c798d8 100644
--- a/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
+++ b/www-client/vivaldi/vivaldi-3.6.2165.40.ebuild
@@ -101,7 +101,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 IUSE="proprietary-codecs widevine"
 RESTRICT="bindist mirror"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /www-client
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)