gentoo resync : 03.09.2021

13 files changed, 55 insertions, 29 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f75856d41856..c7d544fbc3eb 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 45b85e2d1b80..7c815b4822b6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,15 +13,15 @@ DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f
 DIST chromium-92-ppc64le-1.tar.xz 30416 BLAKE2B e953e3ba1ac0ff4bae437328eb1c52fb3863007ff92db91c6858c8c5f7b4c5c39fb8bf6898c3385c7faa82666f1a18aae7fcb5379b9199e58c5c0526fbd9dbee SHA512 b5a20076a34705c53c56d7763189ebfd860a456ca544a7f0c9ce30c877be92270ea724f1bebb9b597b301def27dde0a672b0c30e16e6abbf958cecfd60b07ec5
 DIST chromium-92.0.4515.159.tar.xz 958060524 BLAKE2B df4f06bc18c4c92061db55d098bde0a811f94f72fdf70cf973754e41db507a70274f48ebdcdacd13a787a35559553fa36d861787d4bc94c2cf2320dd06862970 SHA512 d6d563631278e721f38b045c39c9e205fbedefb0666af2f027a2a14c0d04814a96909da17e5b299bf40a94fe54bdfda0a91186983c8f929e7fbc7cdaffab922a
 DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca79de6c7ee64299dff20f91cb774af676ec3d95d809b4fc5f7bd663c3b8c904a46ac9cd3ec70a5ce248456dcd48834932 SHA512 eaf0d2bc29c53c7021ccded9c14463bbde2887926c069154c0126ee1bf513bf41a38eeb3dc21023a2e9637ce3e1e541a3b2a79a990bb8becae0da0a04e57c76a
-DIST chromium-93.0.4577.58.tar.xz 1038747000 BLAKE2B b7a2ed6d5a06e6e5b0a2071c72dae020a36d0640a27329aac6eee9544337db131e9f3b8130b9deaf6629550b230003f5f2b1e8881f7fe6336e1c44ff77a4dc3e SHA512 eb27cc408c511f095e33d2c5369c95e4750fd8ca7bbda6a44080beb02b25fcacf200307c52e7354f0f85dcba2b1b64617e961a0e1fb97b1c5828da472dd5371c
+DIST chromium-93.0.4577.63.tar.xz 1038816588 BLAKE2B aa0eeea52345c7269e614ecc32710ea6c5b071d24a773040389df38159b1c60c99f5cf0e1c9e753e776aa23e9b58ef2f2e13d8ba448c3789f10fccd364babaad SHA512 b7d85dfe34d9a37e6b4f9b440ba6aaa2778d30f8bda583151dd6e5d2ab9d6136ee1ab321bfc5f59aa10b289c07f72298db11182d06ede8574ac280b2b6d8fa2f
 DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
-DIST chromium-94.0.4606.20.tar.xz 1042465240 BLAKE2B c742ee30ee42e547773ca8cb69e6ff1e8a285cef4820129a47d22729016afde44a17e329f1ade562344a2a621c6fa581640a1ce3a9335cf5c1bb3d90e35ca463 SHA512 b820ad361804df18109ad5b42b9bb5b776c64495b0ede43a73264b6c7c3b6c81c94bce59ed49d5613746b6cc686905dd57ee642aff7dfc0633ea7568b47d632a
+DIST chromium-94.0.4606.31.tar.xz 1039757224 BLAKE2B 7c9b940dbea8708d2815a25b66908e94700c15d8eb31d90ead36f3b4c716f371d28ae23851d3ac6e2086c3ad92b3e3e551e608cf483cd7d53e21d9a8380c978c SHA512 bc411a3b2dc2eea388d13ea2089e68978b61912e77e909d80dd7ec1139aeba833b934ff4a498512bcf838477b42a2bcbc3053115cbaae7fc15926cf92d506d84
 DIST chromium-95-patchset-1.tar.xz 5592 BLAKE2B d4c4e97d4632f263228f79f0daf522c16ff23252ab6593288c93991b74a3c5275b94e591c8c77d368f56739783a4968e5d3b2a0e246bc0ca699d98f463278625 SHA512 e33767ae8b59fba942cafc440732372dc5e47f964ba2778ab1a841016125c7631a4d75e69944be79309cd6905fd345bb438852a391a0a9449adabd0d0cc092ad
 DIST chromium-95.0.4621.4.tar.xz 1214995188 BLAKE2B 405c73be39504638c38b928c875b50eabf222341005b5ceb5f8d8c467c220ece9b2ee133bbe71097eca2abc5df0ef03acb2303333684f4c08bb4ca9d0e072e12 SHA512 d32e26ff20a584a861e11f7a097e86bd597c7642c984224c7196e2114df5c09cfa7f0363d0b75c7c1bf1c81edc79e0aa34a3528359a1770e1622ead0f79968f8
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-92.0.4515.159.ebuild 30756 BLAKE2B f84cf368e172f17bec435db492144d8667139d742d3c35318770477c6f84d2979b1162cf0a6a63a844e75980f0d2cf04b5d4e8311f4eb001bb28cdd2537c946e SHA512 59397dfd00ae0e4cc8d14e058cb150948c9a4f9cff823cb461a9e48bf524cba6118f2aa644324a62e6b80994e20384534e7622a2b767c3b46b84bbf01e522b67
-EBUILD chromium-93.0.4577.58.ebuild 29917 BLAKE2B d0764d23c580aa8c6c1930e8b2b3fae318f28ed78fd592dc329c981b212208a5e681a17b20ec2a84465d31f6a0704cc8bae050ab0d77b3125cbb55e5264a17b9 SHA512 6a6745d21acd0da64a935e044978ce3c6e490c046c35c6b410d0c31da09159f25010e4b983cfbfd936822e27d353c1a8c623fb2155df6d630191682b4d9109d5
-EBUILD chromium-94.0.4606.20.ebuild 29524 BLAKE2B 29318a7285dcab00c9b7ff3d84108723a93940bf471f0eada8170bd3d2c708b7ba43e53cb223913b6fec8db70950c6a7c82daf874e2e305362862863ea97121b SHA512 d1418be927d22a379fa9c9869da67ea20d221052953e78202ccbbc4acbbef58397746d6c4ff056ca3ce739cd21ed2fd206cc647498a8ebed03977b91ae2fb29e
+EBUILD chromium-93.0.4577.63.ebuild 29917 BLAKE2B d0764d23c580aa8c6c1930e8b2b3fae318f28ed78fd592dc329c981b212208a5e681a17b20ec2a84465d31f6a0704cc8bae050ab0d77b3125cbb55e5264a17b9 SHA512 6a6745d21acd0da64a935e044978ce3c6e490c046c35c6b410d0c31da09159f25010e4b983cfbfd936822e27d353c1a8c623fb2155df6d630191682b4d9109d5
+EBUILD chromium-94.0.4606.31.ebuild 29694 BLAKE2B f992a9c5792b121484aa78dd08705dbaaf3616eb4b702bd626eaf0b13c2665bc6e90d6bb292d50f93e8adaf650ea5bfd5c9982c84627e2be626e2f5260e8dd16 SHA512 1d5794a98d8ba7dafc2502acf9f9fdf458e11573c6a79a8cd0a36505cf8dd5f8e0e4cba939093be9deeafa4cb14386daf6c9c3697b060024732e329494987f20
 EBUILD chromium-95.0.4621.4.ebuild 29504 BLAKE2B e630f3785bf2306b33c7ca86c50c50fb804278bfc4eb17f30d76af6c8f2ee339dd13f0fa367cb515e17b0dcea5076cd3a5b3e91c883d4892447be6da12b49cb1 SHA512 092f4f3c3087167b24e73b4a30cea0ab656dc02ba88bc0ea554838ec4302e983ceb445c59120c24a2d78af5a83bfc3d150b286dc8cbdb4c3e004ea696ae81a7f
-MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
+MISC metadata.xml 1688 BLAKE2B 598d5e46adbfb60002522f1299702a4bdacfb47628f1a877f1138b2f469e21737cf00745fef8ef6e99aae3253176555819e99f352921ff5950cfb1ba59ab738f SHA512 5c4d74046495e8178c9d2c5bb7e6ca7c7c073ab34876d5c01fc53d8e1b94bfea7e35ade2a569ed75c18fc712fa78d26745bf92ce374435821b3a4a53ae24a0b1
diff --git a/www-client/chromium/chromium-93.0.4577.58.ebuild b/www-client/chromium/chromium-93.0.4577.63.ebuild
index 770da01d6141..770da01d6141 100644
--- a/www-client/chromium/chromium-93.0.4577.58.ebuild
+++ b/www-client/chromium/chromium-93.0.4577.63.ebuild
diff --git a/www-client/chromium/chromium-94.0.4606.20.ebuild b/www-client/chromium/chromium-94.0.4606.31.ebuild
index 9302f058bfae..3fbd84fcf2db 100644
--- a/www-client/chromium/chromium-94.0.4606.20.ebuild
+++ b/www-client/chromium/chromium-94.0.4606.31.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 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 vaapi wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
 	screencast? ( wayland )
@@ -55,7 +55,7 @@ COMMON_DEPEND="
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
 	>=media-libs/freetype-2.11.0-r1:=
-	>=media-libs/harfbuzz-2.9.0:=
+	>=media-libs/harfbuzz-2.9.0:0=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	pulseaudio? ( media-sound/pulseaudio:= )
@@ -560,8 +560,10 @@ src_configure() {
 	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
 	myconf_gn+=" is_debug=false"
 
-	# make DCHECK configurable at runtime for non-official builds.
-	myconf_gn+=" dcheck_is_configurable=$(usex official false true)"
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
 
 	# Component build isn't generally intended for use by end users. It's mostly useful
 	# for development and debugging.
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index ba8e49021da8..cfc67c7e8ffa 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="js-type-check">Enable JavaScript type-checking for Chrome's web technology-based UI. Requires Java.</flag>
 		<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
+		<flag name="debug">Enable DCHECK feature with severity configurable at runtime. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
 		<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
 		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
 		<flag name="official">Enable Official build instead of Developer build.</flag>
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index b02348e492ee..7a2f5eb8b595 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_92.0.4515.159-1_amd64.deb 80228636 BLAKE2B e7b00822716be2b2f39a80d4db2c1e484c961d95ad6cc7d63aff796a6e597afdd0e14042bd9a6a5634418742ef364a1d8fe63323271e0c50132dcabcd6b061dc SHA512 1b2857dc82999583fd5baf539227be8c3a6961678f35019640555633ba6fdcadb924c3525e9042283f8ae8a743990fe7abe41cf07a70fd37f870fc3a76d2a9ac
-EBUILD google-chrome-92.0.4515.159.ebuild 2714 BLAKE2B a3c37c76fecee2863e95ddebdfdd53ce34a915b86c1a4d3a618b10a09ee6f42986b0841ffaa69477a5763d83b1e287f1517bcdd98c2d67fcbe63b54b46b14274 SHA512 0aa9b731fe43bac9130de79e2c1e94111986ca7ce63878a94b2265cded219146c3f2be13bb458a148f7cb4773ae89aa502f2bb5e9165b49fc89ca9bdd1b7a468
+DIST google-chrome-stable_93.0.4577.63-1_amd64.deb 82931984 BLAKE2B 9eb24d99567fb850aca94eba18258dbb23380d957d195890227dd79cee11e0705d05f7768c701cf7ab44a25b09fa0b43440b9d1f6e817b22fda57e472b559b2f SHA512 4102ba417b41820da68b7e8e12018ed2268f30e0210f8f227aeeabf6bd9265dd95ad206993d5626ac1c70a07185fd3ed4eef8a71ee2f5b0770015302c0d26f58
+EBUILD google-chrome-93.0.4577.63.ebuild 2714 BLAKE2B a3c37c76fecee2863e95ddebdfdd53ce34a915b86c1a4d3a618b10a09ee6f42986b0841ffaa69477a5763d83b1e287f1517bcdd98c2d67fcbe63b54b46b14274 SHA512 0aa9b731fe43bac9130de79e2c1e94111986ca7ce63878a94b2265cded219146c3f2be13bb458a148f7cb4773ae89aa502f2bb5e9165b49fc89ca9bdd1b7a468
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-92.0.4515.159.ebuild b/www-client/google-chrome/google-chrome-93.0.4577.63.ebuild
index f2955d88a367..f2955d88a367 100644
--- a/www-client/google-chrome/google-chrome-92.0.4515.159.ebuild
+++ b/www-client/google-chrome/google-chrome-93.0.4577.63.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 8ea3ec450cd9..3031dcf0b13d 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_93.0.961.24-1_amd64.deb 104460716 BLAKE2B 66cbc91a7576cd47131e1774b791758879e862502c7e66e8171eaffa64a15fbb2211cf4f3b716e65471aee89f559e3ac802d01d213ab30468ba9051d3099bf9a SHA512 d6aa0d8a828337e1fb8768f756b836b7c0197b565acd0195f8a4dd226fa5e7b40a10520742507284987b7fe804ae306a90ab5a8af0ec5faeda224100c94bfc7b
 DIST microsoft-edge-beta_93.0.961.27-1_amd64.deb 104495696 BLAKE2B a1ff618dc7f5cbcc8daf14493403e45c59afd5b1c0d409993ed44d8197ccb49bbc3b843cd44330e3ca3ba9e83a739435b4ef2cb17633c33c70b7baf56e9be369 SHA512 72334c0aec2d55b262f3994699631df218aa3de9a207f23ebda0d78118cca8ee980fb3fdcfd3130a233c6cab5dbbbd9c7cc53ecc09ce07583c316efb0c5c1851
 DIST microsoft-edge-beta_93.0.961.33-1_amd64.deb 104508496 BLAKE2B 9962a7c921fcb5d821c38a1d37d1567bf03745d9b9a880332656641e465ebc81834d405775bb89a80322f76f9ab199af145952f6a7e1efe035f7b1c11f348110 SHA512 c0b20732b964155d33916fe5ea0f274aa7edb5c302051cd2c801e5ef28c0281a0c24365aa803b2562f9269324ae365177bcb1c6c59a7dd8222eb40d0fbf64932
-EBUILD microsoft-edge-beta-93.0.961.24.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-beta_93.0.961.37-1_amd64.deb 104487364 BLAKE2B a833a77f0bdf9ab078eb7b1b128358c8b79e5dbe57621d0e672e2f73984eb6ae4b6e5c134801fc4020ad6f15c59165829a097ec94df72fbf85ada229dd3b8997 SHA512 866d7848ece1588c2be196a6b0145c7734dcb4232be075889440548ebde1b98b29a4111eb7d1f291778e3b21a8fe1cb3d3db6fbc75b3cf1d7a7ca5105ad3a472
 EBUILD microsoft-edge-beta-93.0.961.27.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-beta-93.0.961.33.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+EBUILD microsoft-edge-beta-93.0.961.37.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-93.0.961.24.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-93.0.961.37.ebuild
index 3b1abf5f25da..3b1abf5f25da 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-93.0.961.24.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-93.0.961.37.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index d3488553aa19..29554793f26b 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_94.0.972.2-1_amd64.deb 105652232 BLAKE2B 35853c109e23a5dc160fce2da402772a947f153ed81c3f5bdc4f6bd76d61b48688f59390a90c8b874f5cc8ca9c67b1232fd78d2c349f8d0350b4eda9fecd75da SHA512 f4ccbc3c8ea11b7d969e779c119bfa31f0203fc3c8d834bb649184ee1d27d0cb110c455e9904f08150096104f44d992997f4df92d9079390e34ada6a414f0b35
 DIST microsoft-edge-dev_94.0.975.1-1_amd64.deb 106464104 BLAKE2B 5da4ebb4d435f835b5b5d1f9f288c1e3b9376a141ac0b4ffe8149256229199fc0285b365f5c7754799b1c9a6866beec6e29454cba01d4994057fd2e552fcaef3 SHA512 f4ce1ec97a94419b528ad20b6d868ed42382d5ffe500ebdbc193aeabcea0897ee208beab4799074748f9cbe9869f736ffecf507b52ea64e01bc79196f72c5e24
 DIST microsoft-edge-dev_94.0.982.2-1_amd64.deb 106399176 BLAKE2B edf7c929c1bf88dbeb2bf56c29f104fc0cc037c163a6f2f98eb2ea12d0b4787ad597070852a39ad9430516b74d6576a623a71587772a3835401d7d7e3b4e2fad SHA512 0c2dfa9d38337a19668497adb91b1957fe89cf095fa708728ca686373933a81f357deb032b635df6cee3494378314ddf89232212374f6c767f9cdd9f925398a7
-EBUILD microsoft-edge-dev-94.0.972.2.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-dev_95.0.997.1-1_amd64.deb 115250492 BLAKE2B 445d4047defafecb44a885912f873d9ae4e30f510502e1fc8ec5b0f0984b69da77ceff3182cf1971cdba00f64a7fcc7c26772341403937da3eaa0e929c843ea0 SHA512 95e7844498f1631892247bf93b8eacd17a8800c2f0432704c2c91d8bcb4c3bad8b92823939e99385270cb1ff346065192890eabf51acf30960f1744c5618d747
 EBUILD microsoft-edge-dev-94.0.975.1.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-dev-94.0.982.2.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+EBUILD microsoft-edge-dev-95.0.997.1.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-94.0.972.2.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.997.1.ebuild
index 3b1abf5f25da..3b1abf5f25da 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-94.0.972.2.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.997.1.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 5a1166c41cea..740805d81a3e 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,10 +1,9 @@
-DIST opera-developer_79.0.4142.0_amd64.deb 77573852 BLAKE2B 1195809dc53f593350636168828fd43b45648059dbc752d203704b78a33629ec326005a696328c3a433f06cb8b74f42fc7a67d15d2ee87b9e3cba70936b37ecc SHA512 3a91e85fc045ad8d4e4a4c98d045a4cda85aaf9c5e238d1b99546cd26166712d4652c263dcc0af314913974fc139495ff0c45f741ee2048aa5d947413b573dab
 DIST opera-developer_80.0.4150.0_amd64.rpm 76215956 BLAKE2B 443b86a84615c9b7412baf929138703d9c0a8b52e9b82a23c36c927cd2594e19e1713a4062c945054def4e9b3702b2b6a40c1fa23e9b38722dd8e93cf5db1174 SHA512 2021cc6d1b6cec5801baf1973fabbe6643bfcae437792c38f98c4753e9c16787f49c07079ed68f3820e277013c179f3690bd5c7a0be8ab8d03aae7c2c7243e6c
 DIST opera-developer_80.0.4157.0_amd64.deb 79823544 BLAKE2B e39570f48b85efe5dfed9eee765964b876ab6d7b824b012132ac344cd863fe3396dda705b188123822fde0ba37784df65b3f05d1cebdfa6433bc640c942ad88d SHA512 441de56f3863044091e87849a36b31dda7385971322e31b99e66664a26ba744d38b83fe986c23d10d9cfc3997f8951d7f61dcc901b30bf742f30cb3650e3b2c2
-DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
+DIST opera-developer_80.0.4162.0_amd64.deb 79608536 BLAKE2B 23900af1f692c650b71cfe3f4f1b94c5e9ef9c8f161657596763e5bb75b1a1ad0c1fa98cd95002e73831661800f512527ca7bef6452fba83fea82f27c6b82552 SHA512 79a365ca877826ae795e7bd05b3fcc8478fd45048cb0831d7a03de1545632eaf8c9210f0fd908670ec4306c173cfc91e2cb299afa5aa159f3632aeac06f8213a
 DIST opera-ffmpeg-codecs-94.0.4590.0.tar.xz 1388672 BLAKE2B 736debcdbdfa63f0e5afa3bca70783aadaad5db5751666099ff290b8bde1ba1ef8ab12612a5dc2f4db3ba3b79ed7bdd7b6091480639578c9610058d2dc3584fd SHA512 c6fabd319b048b068f6763cf99406f4431c22311cb14159af673ee4b8f39a3f4376cb299746de9e797ee1965dde1f597ef5a733c5fcf8e527ce59964c85921dd
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-developer-79.0.4142.0.ebuild 3044 BLAKE2B 7f5c0830b51eb9e787efe446b9c387dc1689f291b0caa4d1b9dacf2a04825401327cd3e87be8fcc4711e6c50d176592afe828e31ded3cb2ddc8825c6af8680f3 SHA512 5cf7a1f43a47c42c8f32b91c2664aab10157c513732ed5e23d824dc6a6b9fa9b3ec9ceb113f704de35859fb652b74c5e1353b3301ec3015da60f63fb1065e64f
 EBUILD opera-developer-80.0.4150.0.ebuild 3214 BLAKE2B 2b2923ad1a4f1ffb4d440a061d8b91289a410567ea3b3789c6adc5d77ddafbe5387d6fb9f2ff3514b799b327236b0f5d3944529f3ca6af3c4933f40bfdc2f5ab SHA512 a1d1fdb2b0eedf1aad8372bd04bf04118176f2ac85854bb66979eecc556e7643e3fece4faa0f8175b358266081838db392c5090efa822bc6092109a926bd7249
 EBUILD opera-developer-80.0.4157.0.ebuild 3613 BLAKE2B f4b01de34aa2ec09d69828f7c6ec5a6e7981f5215515a439880bb1e8667ffb2e7faced40030a675ae597dcc9a910b43210168e251852dae558057f62bef3b988 SHA512 11a9124916cebcf441111fde3dceaed2b3159fb1fce3cb68d440a01ece085260c93e36473a82b579565fde4b311e5d42bc6fc708bb7c48dad17f37d19693aeba
+EBUILD opera-developer-80.0.4162.0.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/opera-developer-79.0.4142.0.ebuild b/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild
index 39e98cc41871..bf0853a5f751 100644
--- a/www-client/opera-developer/opera-developer-79.0.4142.0.ebuild
+++ b/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild
@@ -1,13 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 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
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	OPERA_UNPACKER="rpm"
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	OPERA_UNPACKER="unpacker"
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+inherit chromium-2 multilib pax-utils ${OPERA_UNPACKER} xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -30,11 +42,11 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="93.0.4573.0"
+FFMPEG_VERSION="94.0.4603.0"
 
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+		mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
 	)"
 
 IUSE="+proprietary-codecs suid"
@@ -90,21 +102,33 @@ src_unpack() {
 src_install() {
 	dodir /
 	cd "${ED}" || die
-	unpacker
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
 
 	# move to /opt, bug #573052
 	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
 	rm -r "usr/lib" || die
 
 	# disable auto update
 	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
 
-	rm -r "usr/share/lintian" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		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 docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
 
 	# fix desktop file
 	sed -i \