gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /www-client
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
21 files changed, 296 insertions, 646 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 14907f7f2101..9a989c39d81d 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 59b5f670b8f5..e0a2ffb45226 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 AUX chromium-87-webcodecs-deps.patch 1011 BLAKE2B 45caba9cb8c65c0f72844f441ee0f0333bc7172ed26e40b1af43190a9aefdc4d7e1d8ad807cd3e45f890edeb4be88555d0ef61cb6d6f359956eb02765861e1e3 SHA512 26831bbf4b6d9b7227fcd179641faa9e14a23995bd1d99cf1ae7eb1170d42eae883ef27a88bd23e8dddfb1b043704e0acc3b2de421d4ef9b9c986495cec75d8f
 AUX chromium-88-ozone-deps.patch 1548 BLAKE2B 6a9b2b19b1563503d749394921a43c53c33be7e9b88572c7e2e95affccc5e79737c28b9c1c6ae7c4a139e05a802052b4375d51264492f78dde5717f760368d8a SHA512 e2e8304efa772c2cdc2a891335f9d2e914885d563967fef71d7e2f443eadbfc502480cbd1fdbc1b32a59cd17684d3044d2ee0c4ad5dac5a4402c1667e13d66e5
+AUX chromium-89-EnumTable-crash.patch 2712 BLAKE2B 6715f98a5cd2c9886050f9d360938e261308a3def252e25642a473e86626594fa6c06cb3231dd57dc5428db8ee118848a0a085abf741c9555778f3ae3d9d374f SHA512 07ecb68d5ca2d732c9ca58b4dc007eb2f4b842bdf6ba46cca9050bf1c582439ebb23db1149c76d5a27f4d8de548de946e80eff0c5b1759e4b6714e0c6a7b26c9
 AUX chromium-89-webcodecs-deps.patch 976 BLAKE2B 5a5a397c4cbc5c6e16cd95364ceadfea342ea2d1acabd7640c0bb6e65218dc4e5783a743912c352b3f9422b2f9e067db9109c64e117f82673659c2c5338b1353 SHA512 1585d2d9258bcfd5d78956ff3b7c8d61997a65133e86a2878c9e7bdf68ad9c3a6c24f20f02f10388b7dae02f7ad82c7533687ff13918f75e5ceeb112926fc4e0
 AUX chromium-90-unbundle-zlib.patch 1055 BLAKE2B 4b1be3246801cbca244649c42d512148d4023990e53d8b3504d155a4088a9ae8738d0010fd2dda0c6d40c9fc8cfc696a013aa6b88fc34518a5cfa89dc11ece5b SHA512 893b8e37bec131713d93500263f175714532caa2572e18faafec142058fa417b0824e6acfd6de13f645f6c3dd29d8d4758f9b1b39e355eb04aac55e5d92d1bb9
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
@@ -9,11 +10,11 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a
 DIST chromium-88.0.4324.150.tar.xz 857377456 BLAKE2B 65f3d4a0f930743d04786a21c10561a93a2eb27c2c06d260495ead6ebf9344b2938f28c083a4077c9d2413f47cb083a83633b571ab1f54b25823fc8db18f504b SHA512 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b
 DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041
-DIST chromium-89.0.4389.40.tar.xz 890752920 BLAKE2B a4db55ac0621ad2e59c51b80c557c601c48bfd8b4d126195d61c650b8cf3204ed21b5fc65b11708b95d95cfabf48b29e2d5403316bc0523e3355f60e384b251f SHA512 9c31ea969d23197dd4a749648ca404293ee12d14e025c103db8df9e826b7661902ea8edb8a07a8d216026597b058b4efaf4b73afa032a41ad82b8c108dd44c11
+DIST chromium-89.0.4389.47.tar.xz 890733548 BLAKE2B 55482566fce0d30abed7fe88514314f14860ba2f876af532c7b566c9b32d1caf79ecccd8cc03af7b9cac4457038abf4e5006c8bfb75fd308200f7290f3431d39 SHA512 f6828d3d9a346e508511eee8cef63ad6ae4327adb90a6bcb392e862e8406b50798f0d73306794283aaab84550547b31c2b9e90e2068740b9123115796f9a082f
 DIST chromium-90-patchset-3.tar.xz 5344 BLAKE2B 19b9d69d5d4aecc18e1a3867fd0c53d01dd873fd533b83fbd8c25d435976dd2176975ccf5d4ebb04f84b6c1c0a009315ef4344fbf575b8ae6942ddfb12d1e1e1 SHA512 97d756b4b4270c7631ca42792e869815c22a786ebba36c2668b99298bcd60f24fd89b52d2491ade07341c20f2bdac933b46b299e52bfe9e45cb57bf056ee050c
 DIST chromium-90.0.4412.3.tar.xz 920864492 BLAKE2B a0d5e6ddc552611231c7ba8fd81da4d2e01e59695eccce33c040ffdd37fa360008cf8c8095f10622902a5e25297db4c10b5c463fdca5e5c46d390db4268f3d17 SHA512 bf168dd2a817823bd9ec7b7c925cddd783366460011782884f02ef15952546d6edef6bb2f08813bfd8be2e64c787e80c2cd449032b9eaf19d2ea7a6eb2294da8
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-88.0.4324.150.ebuild 28537 BLAKE2B 949c867f5c43e121c7f2b66496f6bc41a1c59278551f38194cc61ab4d6982df9813d062075a5bb1b4739bd1312ddd2642ef6c37cf1e01d49774ff437a88d38c7 SHA512 4c44e9f8fca5487550be400b13ac0cdbae6d6265a27ba9199be3d4a63f2adb84d01809feb5b04cd77fab29cc14ee04e96ebc5043a1812c569a2a5688e9b1fc3a
-EBUILD chromium-89.0.4389.40.ebuild 28534 BLAKE2B 8a65e3d5d2cd4d5853b6c7ef7e6dea4153ec5fa7e341032ad7341dadddea7902fd3cbfc9be013a83133b193e07c1bb3d501f2ae0bcd1de6e755a0a397acb4e3e SHA512 12ee9615772ae76957d1d122229fc70c1beb89072c3ba9cfed17ccf40aee589187eb1dcf806285dc1d16b59af6125696982cecbc4b82a39e6b1f07a209c8c698
+EBUILD chromium-89.0.4389.47.ebuild 28584 BLAKE2B bf2a5d113077e672d7ea440ebacba66703102f7a6ef1359d9abca93e4e2de6f6c8e9da77a313ee83c4e85d8554a94941d1339d180dbc298fb81afe35895756eb SHA512 39d15678479247adabf29b900ce4f10a11b4adc6366b2958d0aaf9076c527fa2103ba14624f1fc4e7e004fdadb6d5a6947e66fbd3610f426acabd8c0112f0f3d
 EBUILD chromium-90.0.4412.3.ebuild 28721 BLAKE2B 2f491c801c69c5d319c7f8c488201c00257651fb2e7a51bab59ab8f92dc0ae66323d7cd37428e286d16887a5aaa7013bdcc8fe2659b7dd14f296ee038fe93c28 SHA512 1733b169bef9e242db6a0bd0cb4e335120beee7faaf9dc2b6e34012aace1d3411a46ce9d5c021a5b5af9273d175fffc96549f713eeef0d14182bb291032de4ac
 MISC metadata.xml 1596 BLAKE2B e15a05a13e8200be6a946ba0b2631a014b83a66267a9ce956245d28312403b3229ef6a961830bd69535bc4286912fdf8d5f3a6cb0d0f8aff29936ceaf7113e8f SHA512 204d0b04307b2fc2188c64f290c0e3a0a0b14f3ac0f35deaffdaac1b30addd4df1f2eef2eae19a674f07123dc44a6ba4a0b5e2419a898bfaac61579603ceb0ee
diff --git a/www-client/chromium/chromium-89.0.4389.40.ebuild b/www-client/chromium/chromium-89.0.4389.47.ebuild
index 32462fb8427c..dca398dbb76d 100644
--- a/www-client/chromium/chromium-89.0.4389.40.ebuild
+++ b/www-client/chromium/chromium-89.0.4389.47.ebuild
@@ -232,6 +232,7 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-89-webcodecs-deps.patch"
+		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
diff --git a/www-client/chromium/files/chromium-89-EnumTable-crash.patch b/www-client/chromium/files/chromium-89-EnumTable-crash.patch
new file mode 100644
index 000000000000..89a50702dfae
--- /dev/null
+++ b/www-client/chromium/files/chromium-89-EnumTable-crash.patch
@@ -0,0 +1,71 @@
+diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
+index e3130c7..2ad16ea 100644
+--- a/components/cast_channel/enum_table.h
++++ b/components/cast_channel/enum_table.h
+@@ -212,7 +212,7 @@ class
+ 
+   template <typename E>
+   friend class EnumTable;
+-  DISALLOW_COPY_AND_ASSIGN(GenericEnumTableEntry);
++  DISALLOW_ASSIGN(GenericEnumTableEntry);
+ };
+ 
+ // Yes, these constructors really needs to be inlined.  Even though they look
+@@ -250,8 +250,7 @@ class EnumTable {
+     // Constructor for regular entries.
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+-
+-    DISALLOW_COPY_AND_ASSIGN(Entry);
++    DISALLOW_ASSIGN(Entry);
+   };
+ 
+   static_assert(sizeof(E) <= sizeof(int32_t),
+@@ -306,15 +305,14 @@ class EnumTable {
+     if (is_sorted_) {
+       const std::size_t index = static_cast<std::size_t>(value);
+       if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
+-        const auto& entry = data_.begin()[index];
++        const auto& entry = data_[index];
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return base::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_[0], data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -342,8 +340,7 @@ class EnumTable {
+   // enum value directly.
+   base::Optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_[0], data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : base::Optional<E>();
+   }
+ 
+@@ -358,7 +355,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -370,8 +367,8 @@ class EnumTable {
+ 
+     for (std::size_t i = 0; i < data.size(); i++) {
+       for (std::size_t j = i + 1; j < data.size(); j++) {
+-        const Entry& ei = data.begin()[i];
+-        const Entry& ej = data.begin()[j];
++        const Entry& ei = data[i];
++        const Entry& ej = data[j];
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 6afc166eb1bf..f1facd9fabbc 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -200,8 +200,8 @@ DIST firefox-78.7.1esr-zh-CN.xpi 564761 BLAKE2B 3c625be70306d3cbfbd441cb314b1dd4
 DIST firefox-78.7.1esr-zh-TW.xpi 564731 BLAKE2B 83ee6403dd8bf06a956258884b2b4abda71e9ee70cca092ce7805fa47ad05606e6d1b06ad403f068dc790ff49f26534fae0365da2de33519254ff40bfdfdc465 SHA512 2b1c5d6aecf11003de7a76c8dd101d354f64d3c82ab5e99a275b42b8023d0dc587422d1ff09b05e7539638470c086b99215622d7fab0638f20cd63448d5c77fc
 DIST firefox-78.7.1esr.source.tar.xz 334417504 BLAKE2B c0c90488ef9727363f03707c3d1e83ab5965a32775db9e6832883b94f265a3d95bb468648360fa3f016c34044f4c706db84125f7c5b545aaa1dedcf03196cb0c SHA512 d5828667ab07f5971049092102b7017472a835a3ab8581ba485a528e9b269aafdeeebecb4c882043459c2b901290c5525d795b04c1d4f30f7b74ee6cd7b18646
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST firefox-78esr-patches-08.tar.xz 67108 BLAKE2B e9bcfeeda936832e1107d5dd1641f8833dcb1c99bee113b7591607294328b3739521a6811e0dfa64f36b44ab9a484ca69e15ad88b99ae810d767a2de2e4ffc4c SHA512 47a676d18bdc005db3f2d3c9b491df8f6347f50c1410d9f00cf19da86f3163a8ca45060b728f47f3cad02fcdaf6150f037ae26c95f4a5c8be6e7077a97890203
-DIST firefox-85-patches-04.tar.xz 26600 BLAKE2B c525b4dced475890fb512e2071a53d64db88b49f7190e1c2f7a6db8b88875091a6faec148c312d2dffa8ec43be34bbf3cc0dcda3ce4132f2e7b2acec064314c6 SHA512 a0ee55aeb6ce1d31e0a5c96d009f23d0e3993174213bb927e65877c791c4ff77f444ded0bc94a5bf5651c7bd0dca9d6c85b45e1b9270bd2996dcfdd446973cd3
+DIST firefox-78esr-patches-09.tar.xz 67480 BLAKE2B dde764add31a755765df996aeb50bc647881f9956c9b18c87ccc1c79325ec6f4c3a7ae3a8be1a64c5d80a9aece90d05697a8920912a7a37fd62d62bf2e03a536 SHA512 aa0eb6183ead7efe231ecb2922f22d5028a9edb656e65bfebfbb175af868f8c8ae05668e4bc2a982befcd04698cca43d3abb5b261aa2931bc7d8c7808a8495f4
+DIST firefox-85-patches-05.tar.xz 27440 BLAKE2B a89cd57477c37b87adc2be4f26f8d572285edc872d085eed20fad4a3f1755be09ac642d211088659068dfc2231f8058f420ff434874227b5e1d004fdc5610240 SHA512 3688757af40ea2d0406e5ab28e09a05bf4108da613b7946c1aa91c4a50cee8d1205f4ac2386cb183e9c3c309eaaea10b345cedf6d97a5bb62542789b914e554d
 DIST firefox-85.0.2-ach.xpi 461930 BLAKE2B ab1bf0e3353aeb22f6c301f962116d1d1bd36f19037fed1d8ab1283eba120168b44d26bbd2b81d08942a2430a15d3992f28c0ece8126f7f590125ec6ee1b5091 SHA512 3459b611d7e6224790ac9f54f203db6008160adc5ab09ad42e719bdf2bb8674bda0fb7b09ae7ec9f26bd7d1baa392cb128e80d5189e355a4453d152b8e5c0557
 DIST firefox-85.0.2-af.xpi 427613 BLAKE2B 024f908d4bd2983662a418c548438255e640d26e6e340b34a8dfc6c9a1f687d7219694dc48ce21e7ca35a0e4c1648c45908fbbe9f23a167f9aa5b0f9a7b033a4 SHA512 1780a79d4adc27a90e4e1ab69757ae50c994632f4fc6bc2df18c5fce01dcde03d596338b37b36aaa6ce201536770f4481abd0d414f5dd32f024559183a2e936a
 DIST firefox-85.0.2-an.xpi 509109 BLAKE2B 3e14b2bf6d38b84574b3fdee0c904f4789c162c8b4364e4a831663c24f8dcd8e67b8f1acb92214b46d771d72e0f88cbc56c38564aaa02859abe256018964e71b SHA512 513f658eeb1b583db58c87c14533d3e323e60708ccfe23171e34544dfef8bc34b51cd2eccc2a7fe888c7be0f8ada0d23cbbc9fe8cbea77cee2472725a53cbc44
@@ -299,6 +299,6 @@ DIST firefox-85.0.2-zh-CN.xpi 563306 BLAKE2B 8c04f7661c3cfc8b78c0c66606d80d7279e
 DIST firefox-85.0.2-zh-TW.xpi 563121 BLAKE2B 7ebd9e9fb0b27cbf08274171324b8b095f9ac223861729a51fd28db5d3210ab1f056a7a7ab4058049edca653997efeaff108fdd78e68b11eaa23e753c5015642 SHA512 f5f361f8f2044390f7dfadfe51aa57b5cf4382f2552c89f0de356802e00fd56de4a31d84a70900123fd168b30b6e266930321a1dd81f8f6091841693344a9729
 DIST firefox-85.0.2.source.tar.xz 372234168 BLAKE2B 559d8b1c3408a774bee2a5f72a46ff08ed8bfefeb6abffbeacd5ae76f3f8a80bce4e0e93cca4cdfbd171f38e6aef58d7783d5d577a7494e4d6ddf091804fe7cf SHA512 ae1dd0fd5729458ccb2f2526f9a6822db90a67ad9dd726aece724e758012dd381f02143007cdf7abfd57187912c2e32a368450d89c121464775243b4255243aa
 EBUILD firefox-78.7.0.ebuild 32330 BLAKE2B 8411321628e413abfff6707249597ab860941a0f10caa083477aa4190f2785234c13cf0d44d58091e9d1109073e4d25777c317769ba608b1026a39baea906ea1 SHA512 41ee494d36051964b53787ef886fe75b3de820aabc5b9eba38fdb970dca34377f71b0b2c851fa1965aeb234f1f01c193895c0e9a37737d134271ac843b6e6742
-EBUILD firefox-78.7.1-r1.ebuild 34067 BLAKE2B 89696d85a71093127aa0e45a53e3c07e64f51fd53fd12588f54bad78dd8f38aed69349ff1ee5f91b0c085d9b2127c6cb3153657ead702619e2ea7dc2bffa64f6 SHA512 6e6652cac6e457558281cfe0290b153774aae17a344ac08980520ea884f62dcff1ab988b676a905a5bf533ad8772b681b805d5a0614393c758cc59c819e0c8b5
-EBUILD firefox-85.0.2-r1.ebuild 33799 BLAKE2B d20549ec4cbf5a6a93b2a59af4cbb255ceaa46fd404f6c93edb38dbe0af71add36d14b7ca4fcf1d016c4c14a8ddbf8f47d3156e795dcfc3d0f59749d42664ca2 SHA512 a251014a8a37ecdfb65502265747327ac6eff752464b0ceab5f524c67fe8398cbcc2509315b3df030871cf4f1ff1395581d98e11d8c51286632f49b609dfc507
+EBUILD firefox-78.7.1-r1.ebuild 34067 BLAKE2B bb75f3e5842fd9ca773cb7b32720913fe208c6fad6ffc2c9b8b7ca877a6a58b6109539d2ee41f6f5f6b298efefb0ef9843d84a8270d2d5533f2e044928ec02b7 SHA512 aaa2868664f7e675100357279576506e78a33ce04b3f9cf43b70474512ca970bdc104391e97c3c7d18b5eaccba79b70f1207edf12c7148301b9b228f5e2d5cea
+EBUILD firefox-85.0.2-r1.ebuild 33799 BLAKE2B 34c9992c267edcbef2add67a1a088b4e5acd1612fd856c5739ee8c1a1401f6d777c85d114d99a12e7e31b85b96b782bf8f6fa4d0f33be413556271937b8b3934 SHA512 b8ef2c7f23bb4707db23ec5dfc5f29a35c44ba82c693a86f751f157ef273ec4211a98f2f21b75b95aeab7afcb815dc683288f6b2643a4b8473d9fe067826c4ae
 MISC metadata.xml 2063 BLAKE2B 4c632fd591403d8045cbf3448fd459d82b0433351305fb12322b6a1157c279311ad1a9fcba9af4576f336035f841a95b82ee7a5602d62f1b741748df7443a861 SHA512 75bb3db236d0941e6632def252cb0b90cb374fc4f1dd66e499522e446c5fe8186f57a9898cdade933da205c12b0e70d4e1bdec0d8bfd9689d37d03667eb92f5f
diff --git a/www-client/firefox/firefox-78.7.1-r1.ebuild b/www-client/firefox/firefox-78.7.1-r1.ebuild
index 02232917d9a9..ced041ef8cc6 100644
--- a/www-client/firefox/firefox-78.7.1-r1.ebuild
+++ b/www-client/firefox/firefox-78.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-78esr-patches-08.tar.xz"
+FIREFOX_PATCHSET="firefox-78esr-patches-09.tar.xz"
 
 LLVM_MAX_SLOT=11
 
diff --git a/www-client/firefox/firefox-85.0.2-r1.ebuild b/www-client/firefox/firefox-85.0.2-r1.ebuild
index a4fbb463b600..692694a0afc9 100644
--- a/www-client/firefox/firefox-85.0.2-r1.ebuild
+++ b/www-client/firefox/firefox-85.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-85-patches-04.tar.xz"
+FIREFOX_PATCHSET="firefox-85-patches-05.tar.xz"
 
 LLVM_MAX_SLOT=11
 
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index fcc858f06102..cb907df5ebc2 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_88.0.4324.150-1_amd64.deb 72796932 BLAKE2B 933cddd15ae8a8d1b6ef725e7a01221815e8d8a0a2758890c71e7fe4f5a90017f7b24272452cbd693755fc37428c21290f42e43eb53048b9041626225962a7e9 SHA512 1a86aa11004cb6487c0bfc2a43591c8829fb487241761a5e053e03e0bd5449e511a51932f41f07be40058a536d33684f3f2fbb145701fa31d9ca464ef4611cff
-EBUILD google-chrome-88.0.4324.150.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-stable_88.0.4324.182-1_amd64.deb 72787408 BLAKE2B a888e7bd5479bf29389bcc15fcbda2a35cefe9a8e380b08999876be6d8366b26486820dbea94bd744e69bede6e471cf6305ba7662d4bdc9b9af3146a4efac506 SHA512 d9406faad31e42156d946262ef1f98430074d687ac956c548845789ddf81b08fc58b77499f3b80ea91725b44130caefc34cef84f73d48f6bfd1fc54c53c0d195
+EBUILD google-chrome-88.0.4324.182.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-88.0.4324.150.ebuild b/www-client/google-chrome/google-chrome-88.0.4324.182.ebuild
index 5a9c327ca88b..5a9c327ca88b 100644
--- a/www-client/google-chrome/google-chrome-88.0.4324.150.ebuild
+++ b/www-client/google-chrome/google-chrome-88.0.4324.182.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 0c9d2af4c8ff..cf0775b66bb0 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,5 +1,7 @@
 DIST microsoft-edge-dev_90.0.782.0-1_amd64.deb 92059528 BLAKE2B 0aeeb727aeb085798ac71d05c3adb26984cb2c967386828fe65f73cdd7a53016383b4215e70829cbc38a6a3ddcdd962234dc94ccd34cb48e1a5736e0001ad9e1 SHA512 606e7a6464b6ed8d1d77125636717614bba33aed7a38f9f5933ef3f4597c763e9a373db452feae8a34de1efbce9afa59264d34992473bc620a095f91a6187bb6
 DIST microsoft-edge-dev_90.0.789.1-1_amd64.deb 93474640 BLAKE2B af605f76f2d1234f866b0f222f56bb616bb7699120201b445b153ad32ea4c2ab3f988cc444776f95b505589a65a805467816116c99d746f281f47a5698ca95c8 SHA512 f6d8860e9171749fe4dbe84003d03297fb98ed3a034446a5085268b73eed3eb02e96c0c33deed02ae54d14e1c4d86921579d8ccf29320e740aa8e71c93680342
+DIST microsoft-edge-dev_90.0.796.0-1_amd64.deb 93188494 BLAKE2B 3049db63838884f9919b25a1325012bddfa936bab4d090f8f9df2d6b79afd5b83d315673e8f9b656280a7c71a408ca1d2049c4c12db2fc24086f8638daf47889 SHA512 d2705b7b557ff4fdc49bc10b79ca1d0a40bd486e961a373da7302be3cb060a6f1d9ac5142a60fca10ab2e45e18e0b28589497d833e72b2d4bac138e9cf275a3b
 EBUILD microsoft-edge-dev-90.0.782.0.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
 EBUILD microsoft-edge-dev-90.0.789.1.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
+EBUILD microsoft-edge-dev-90.0.796.0.ebuild 2359 BLAKE2B 40d12fcbc0cb082e4decc2927457eea9ed540028214c4ac8d9d41a9b4b5ca8846763a9823151840f3857fcec05af616bcaf1afa58e30f32273bc57da17eaaafc SHA512 bd607e9e5510c762d8c46e5762d396db7eb3318af7621a4b483587fe0dd89a96d87e26d8caa28556e6872a8748fcb2a8a2643b88fdffca8d9f78afa054beffb0
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
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.796.0.ebuild
new file mode 100644
index 000000000000..8b9535ac7993
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-90.0.796.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+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
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index a21272744f9d..bdaea333af43 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,15 +1,8 @@
-DIST opera-developer_75.0.3925.0_amd64.deb 73581348 BLAKE2B 06eb0592c92c07cd6eaf0dd06683f355f77b96bf34a3cabd64176cf7bafe0a760b41f27fbe4969b93d5d9ee67a91bdff0bb93c4fdab33de7e38f690fbc8b8d99 SHA512 f86785066ec6508a633c8612a271443a2f463c2e124a205477e06195c8c802e742e5a58565674dec07221115289f2ed79b0ab38bd8e2d94970e70679986fb2d3
-DIST opera-developer_75.0.3932.0_amd64.deb 73580520 BLAKE2B 0ede121d06b8f3b8c90d190c66b2610986f3b011e46837541565a12c2067f61aa20f021059c04be82b53826ddc130dc4c1abf218d275e0ac7632d61b20b958a5 SHA512 acfdd983ef01e02884576457c4e45236dd059938b95d88021889b0bb141aabae6ddd1157126b4eaa9407c80610a4a4a75097bbabe8bdc3b68f563e41b03f70b5
-DIST opera-developer_75.0.3939.0_amd64.deb 73827828 BLAKE2B 008a956c33a885457b3790596d97339a5e8c70371157fb3a1f3b83e7791e7a59f9cee265f24a472a2373a8c4abed23bf109abb34903d1e041377a16ad3355e00 SHA512 f9b05bfe46960aed7f3325cfe149f607e98df9c8b4b780c13835fecc32180a8ecf6177128834442c3aa6fee392f61a0febf4a59503290e31d643f43bb0c5eedb
-DIST opera-developer_75.0.3946.0_amd64.deb 73814064 BLAKE2B 29ae148f5f254d7d1c5807a309e24f0339a6ab27471df61f855fea9871a18cd04087733f731277c3fd5b1a129a06a7de7b83350b5ecb9c1f870bd5e5a96dcbbb SHA512 658fbc410f095465e77f09b9350ea3bb55fabefebe0461616af9a95d1fa85b795a34b4f079151b794307f347b44e4770153da09169d90a97966873361133a09a
 DIST opera-developer_75.0.3953.0_amd64.deb 74965200 BLAKE2B bb542fc2819b057befdd3278d791bda15bc4e22415ceeddaa21a8b155396708f745897f6ac4e9f3d8cf627940f8b5bcf619c49a5a36de38075768b929b0e1e1a SHA512 b8c54399aa5fe668242b11a07ae047920ca5c170511f6b8721ab6d5dbb9872d61ab5be73fab78c9e9c543d9986f995399b415060c2f6fff554afaabf22fee1f7
 DIST opera-developer_75.0.3960.0_amd64.deb 74306780 BLAKE2B dc83361be50dba7b29c25b345b03d40878c6ae83a3590ad8a98a80554fe2a81b2461bbf57c303dac190bca8a8d8d91315b553392e6033c611601d2b4773796b1 SHA512 7cc4c6ddd57dbe5cd8888b3da53cd168f81d35c6f1b0961c3c69bdef7f4488b41b99cf56ec952c56cc4c4155a5091d246b9c7e7a7d5167f53070142be53194ab
-DIST opera-ffmpeg-codecs-88.0.4324.27.tar.xz 1362668 BLAKE2B 0815049dbf95996a04a072ad1b82664ef594e0ea99aaea5ea9d54448457bb5aa5c6d9cb95d6c84a14ca64a29e0a2e9c6f5315a1988eb577ad02cc7422fe0f886 SHA512 cd1857d302c413a52433839103a3a268a12ab255ad8d6e651e872f7f28b61e1426e3c2854fc9a6acf4430be9fa8fea939de288c800cc3c60696394f77d86146d
+DIST opera-developer_75.0.3967.0_amd64.deb 74349124 BLAKE2B c61aa27ae9bf5174e8747c146d85b3ac32887a67106307dc2f195da2e693738359947a2c962ddaba23044ee55fa8c5fbbf8cac33e06b5d25272e87070d3d3202 SHA512 19bab0848e707181cd2d5e853f347f79afad1e10fbef83b09225e37a77069d246a292797f6018a550df7be59c350dacd06709e4807deb43211fb4bcbd50fd4a5
 DIST opera-ffmpeg-codecs-89.0.4381.8.tar.xz 1427048 BLAKE2B 6f92f8582663b46875f4a3d9b0b80b14eb8b361b23699bd5e10319c9b16b26a436cd710cec684a818189eae4892fc41daf2b3387282926e964d4d395a1c7778e SHA512 7947eeaa361e78d1a69d244727ad601719fd4e6d6c284b1655e9fd9c74cf718f42ba3e0d0277f96a7b9cab984d743ea190404e2f74b5e1a6b9bd244e45b71e77
-EBUILD opera-developer-75.0.3925.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
-EBUILD opera-developer-75.0.3932.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
-EBUILD opera-developer-75.0.3939.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
-EBUILD opera-developer-75.0.3946.0.ebuild 3300 BLAKE2B f89b7cad4fb5ef0cc4d242082c1a1b6bc234a2340eed7fe7b9d2973051e1e4d865b4ad3649ec9ea1811284652786b1082c4e3ab1ad8a8c8f0a6d8bb72ac8cdf4 SHA512 f0a83ed9726062bc257a2fbec0e3df2099b03de555df4d702b224e3af5a44723901a0f04f9d74dd8303885e2a34cc41c0474a42495527a016188f0d2b9382173
 EBUILD opera-developer-75.0.3953.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
 EBUILD opera-developer-75.0.3960.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
+EBUILD opera-developer-75.0.3967.0.ebuild 3299 BLAKE2B 98c3a228079d3272aa52e1f84a99f66e008488c8886b096b57acb8bb0684173847029785a720881aabaf8fc7699de6c75ddb52e32859e42a9e0d7ed4030cafb4 SHA512 c0c0397c2e7f814da0120c065cf310a2b5aa4a160e5626e4c7ed0f679d9be6c9f36a41a28e8d35b684deb0caa57218fb7d1f72970c0585b815bd6ad2ab431036
 MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
diff --git a/www-client/opera-developer/opera-developer-75.0.3925.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3925.0.ebuild
deleted file mode 100644
index 2f9be6861f91..000000000000
--- a/www-client/opera-developer/opera-developer-75.0.3925.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="88.0.4324.27"
-
-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-75.0.3932.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3932.0.ebuild
deleted file mode 100644
index 2f9be6861f91..000000000000
--- a/www-client/opera-developer/opera-developer-75.0.3932.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="88.0.4324.27"
-
-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-75.0.3946.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3946.0.ebuild
deleted file mode 100644
index 2f9be6861f91..000000000000
--- a/www-client/opera-developer/opera-developer-75.0.3946.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="88.0.4324.27"
-
-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-75.0.3939.0.ebuild b/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild
index 2f9be6861f91..e4d998d6b855 100644
--- a/www-client/opera-developer/opera-developer-75.0.3939.0.ebuild
+++ b/www-client/opera-developer/opera-developer-75.0.3967.0.ebuild
@@ -30,7 +30,7 @@ else
 	MY_PN=${PN}
 fi
 
-FFMPEG_VERSION="88.0.4324.27"
+FFMPEG_VERSION="89.0.4381.8"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index b10de971cfea..74fdf5f56c59 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,8 @@
 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
 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-9999.ebuild 2941 BLAKE2B dee8c19bf858809a1e5cde8afa8d4398c5c37bae0b55874b479d6724f08a931e952e98240e4d46db883029dd3f8cfb4a70f934f14aa38413ad0b6d436f1c0578 SHA512 63804c31cb48ce5d857d7833d15277fad73fe95b294a2de7379294380980707a56ddcbe92c1841383cb97b6d94451406c7955a87459d52d1d3dad8c056ed04d4
 MISC metadata.xml 712 BLAKE2B 1ecb84f337927d3b9fa2f827a2296457322823c647ee033d803ae044f6d7bc6045d8e811e3c28024c45130ef3273f223605b8d604fe3da4e47751d9e0a9b2bcc SHA512 4e0ce844dd53b7beb6da2baab54adedaddf2bd075eac4904da20d9aeef0f75007a4e53cf3fe2954462c5f7e717cf7008fc6b878402fa787549766e9175e2d056
diff --git a/www-client/qutebrowser/qutebrowser-2.0.2.ebuild b/www-client/qutebrowser/qutebrowser-2.0.2.ebuild
new file mode 100644
index 000000000000..defe2baa7c46
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.0.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="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/vivaldi/Manifest b/www-client/vivaldi/Manifest
index e8289605ec65..0c236704d609 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-stable_3.6.2165.34-1_amd64.deb 77533024 BLAKE2B 01fe76bbdb6b75328a75ab8aee5d76936802b6beb20fa5cd6feba552b04b5a3c1ffd350147cc55a97a8e259db7063f2ea9b247a5df7e4d27cd791339187c5457 SHA512 65e3caf0a12804b5777349d68e498636e0bbe7018856f14f262c0a8cf43f39cd91cbcf6b55a305b4bbd85b06d91c60fdb3d8d033750ecd512fc489b78210bcd0
-DIST vivaldi-stable_3.6.2165.34-1_arm64.deb 69789900 BLAKE2B 9180187ebd5ad0a228d591f6558c57bf4bbfa1517c5a3478db7be8d9916dbe57928bd2606811e351e7f2c0bfa5aa3afca63e81832d4fcf9b6faff3f0d1111e61 SHA512 8cfba43563dc15514f0e9ff9d12126e508a7a6bb77f66efd61c635de7a26a97b0037c33d31b6316db9087b656d5b05c491f10ce86a39263a652d2e59856ff47a
-DIST vivaldi-stable_3.6.2165.34-1_armhf.deb 68614424 BLAKE2B d21c9f9766eef38337121372f4307c12f2f4924ae14f33910c7faf85137ea7f7760fbe1543b31a66dfde129a648158cd50816bb45a9cef5a305904068948018c SHA512 0a4e04b0f5764950bc73b8b33d692e2e017df7439a0f6fccb5735e312b5c150c0a23c6a6ce0dc712716fff40e7f76cc92a62e0fd7b70009987840f9efd3a98b9
-DIST vivaldi-stable_3.6.2165.34-1_i386.deb 74272560 BLAKE2B d5764401a1ea590e0e897713799776ce7b8615a19ea3e27b02b7f04cbd14d4f45b1182cc5e4cca830716d8a03e3bfbc4fdc66d4b424ce32a7240074e72e6f95c SHA512 f6a98e3472c484d2d5dd25b164ea2538b1fb451cfc0f42bf23dd140f032e7616c89f257700752a5b21b47d80af03aa23731872f75b1a6e19a22de6dab1a6ab0a
 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
-EBUILD vivaldi-3.6.2165.34.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
-EBUILD vivaldi-3.6.2165.36.ebuild 3320 BLAKE2B 66c809094b492e9261c7dad09b0a6fc8b42c4a0a6d49324ae89ec4d3201025755ac56fd14f80e0436901c9390a95d91c8d30fc3b029f540ead0941adcacdfb09 SHA512 274807213ca2c626d0d68c95bcd8f017a7d68147d1ff8d5d7b00887499934b9b3bd5e4bc394dc86f6c061425a8a42a805f500de43712731e0273f9a4e96eb5f2
+EBUILD vivaldi-3.6.2165.36.ebuild 3318 BLAKE2B f064150ffe7675c7971fadb7978ede19bef943d21f8b73cb983042c6ed3b08c4d9126db8ddd3c7c0b827ef71b08fa960cd5261571e4f7454fa49e37d318073f3 SHA512 efcf526c93f5b1b23de82f6b246b2e0cdb5680e182773cb1305dabe110e481f0c3a6b185d19b2e7192bad05065c18a9cb457dbe0a52043360ea742eee3269809
 MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
diff --git a/www-client/vivaldi/vivaldi-3.6.2165.34.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.34.ebuild
deleted file mode 100644
index 8809e8c798d8..000000000000
--- a/www-client/vivaldi/vivaldi-3.6.2165.34.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.36.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
index e3d12da4e30f..8809e8c798d8 100644
--- a/www-client/vivaldi/vivaldi-3.6.2165.36.ebuild
+++ b/www-client/vivaldi/vivaldi-3.6.2165.36.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-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /www-client
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)