gentoo (valentine's day) resync : 14.02.2021

5 files changed, 40 insertions, 9 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d03b248931c4..59b5f670b8f5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,18 +1,19 @@
 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-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
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a
-DIST chromium-88.0.4324.96.tar.xz 857138392 BLAKE2B 6c3136ff7bd0fe3cde3cfd9340804b5ddd9dd10f892870eac677a2364b8ddd8a6ab09770b167287e890b525d0ef572a5c03a1e8e28d1d16740043ae17ad56746 SHA512 f51e6dbbd4ea2b6528a601c1bd7e76820a4b614f05366d2999b4a30d8e13581279f69a1a76d3f417ae1cea38f9f834d011f754d078784a70388e2cde0ccba6b6
+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.23.tar.xz 891010136 BLAKE2B 071f2d3b2962341b6bf9ead31dae04b1f71841593c22d5f7e2a407bcbf3a05f012f43f3baa9f167303789be4ea64cc3c80fd3e4b8049bd3faff8ff43569bfe5c SHA512 a7a58ffdf035bc8a7b3ebf40bf46a83be2689d7cfdbfd8476b356eaf7fe1f6e1fb61a14eb1c4d8474992c066a1eeef574644aa14d2fd34c2d53f84089427fc72
-DIST chromium-90-patchset-1.tar.xz 5888 BLAKE2B 5c6ccfc330d9733b17ebf715aa8a43bde0657dba952e18d2c09a565bfce9f9ee27cc359b5ad79c7631f17ed271da654b43ca15fe6b9c6764abecca66166e3c97 SHA512 b55cafb5e98c4a2133f5adda294ae85c0c3ff23a5459dcd9ffdf2ec509b36f333287a49619601a41deae09d1becb114b32a0d5016fb268a524f256f30ad780ce
-DIST chromium-90.0.4400.8.tar.xz 910716260 BLAKE2B af5c6c9f3b356357c75928017c9e95b79d0efd01e22770d69538c308d3965aecf58840acc52eb093f4e0483273d424980e3bced02e7c3add02d772913b76c687 SHA512 956d9cdae3153ff4d08e2370f100b5f3d24599e83b553db84751d51d2a64f273405f4c787d884be61a7788da6de9eb030fe2ac2614a18731360848a4c93eb9d0
+DIST chromium-89.0.4389.40.tar.xz 890752920 BLAKE2B a4db55ac0621ad2e59c51b80c557c601c48bfd8b4d126195d61c650b8cf3204ed21b5fc65b11708b95d95cfabf48b29e2d5403316bc0523e3355f60e384b251f SHA512 9c31ea969d23197dd4a749648ca404293ee12d14e025c103db8df9e826b7661902ea8edb8a07a8d216026597b058b4efaf4b73afa032a41ad82b8c108dd44c11
+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.96.ebuild 28537 BLAKE2B 949c867f5c43e121c7f2b66496f6bc41a1c59278551f38194cc61ab4d6982df9813d062075a5bb1b4739bd1312ddd2642ef6c37cf1e01d49774ff437a88d38c7 SHA512 4c44e9f8fca5487550be400b13ac0cdbae6d6265a27ba9199be3d4a63f2adb84d01809feb5b04cd77fab29cc14ee04e96ebc5043a1812c569a2a5688e9b1fc3a
-EBUILD chromium-89.0.4389.23.ebuild 28512 BLAKE2B 26857e9346465861f5e8ff219dd46590b0c5d77c1da08146b4fc6c448830b5a0fe756f3f154124e7480ae0fa4d34bca5ae1ba09c8c337ff9da0f77b3df6c9d71 SHA512 7eec638972449105c47742d454c488c39b2c0ca944b89f33d79be64e0ad79c42133a6b008c31082178fe9798640e5f396fb9fe846043b76b135fb5dbe175b957
-EBUILD chromium-90.0.4400.8.ebuild 28679 BLAKE2B 8f1a819072b43eabf448fc3f4d7985c11cceea12c38a18d8aa2b07c7a08f79b6805f869bd2b1aef1fdf9425dd143bcdfaa7c8ef01553da28bd3fbf573b84a55b SHA512 823c1055c58a8d303dcd3780510e7d81252a6b4fbf2eb3dd80453a43ffb91adbf7e1faa3b6257a7ddaf07ee548a93dbecbde6393f36f1cdd66e33b6dfe8b8469
+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-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-88.0.4324.96.ebuild b/www-client/chromium/chromium-88.0.4324.150.ebuild
index f14450e00326..f14450e00326 100644
--- a/www-client/chromium/chromium-88.0.4324.96.ebuild
+++ b/www-client/chromium/chromium-88.0.4324.150.ebuild
diff --git a/www-client/chromium/chromium-89.0.4389.23.ebuild b/www-client/chromium/chromium-89.0.4389.40.ebuild
index e3b9317305c5..32462fb8427c 100644
--- a/www-client/chromium/chromium-89.0.4389.23.ebuild
+++ b/www-client/chromium/chromium-89.0.4389.40.ebuild
@@ -366,6 +366,7 @@ src_prepare() {
 		third_party/markupsafe
 		third_party/mesa
 		third_party/metrics_proto
+		third_party/minigbm
 		third_party/modp_b64
 		third_party/nasm
 		third_party/nearby
diff --git a/www-client/chromium/chromium-90.0.4400.8.ebuild b/www-client/chromium/chromium-90.0.4412.3.ebuild
index 1848c494f155..613e64db8a5c 100644
--- a/www-client/chromium/chromium-90.0.4400.8.ebuild
+++ b/www-client/chromium/chromium-90.0.4412.3.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="1"
+PATCHSET="3"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
@@ -231,7 +231,7 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-89-webcodecs-deps.patch"
+		"${FILESDIR}/chromium-90-unbundle-zlib.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
@@ -320,6 +320,7 @@ src_prepare() {
 		third_party/devtools-frontend/src/third_party
 		third_party/dom_distiller_js
 		third_party/emoji-segmenter
+		third_party/fdlibm
 		third_party/flatbuffers
 		third_party/freetype
 		third_party/fusejs
@@ -367,6 +368,7 @@ src_prepare() {
 		third_party/markupsafe
 		third_party/mesa
 		third_party/metrics_proto
+		third_party/minigbm
 		third_party/modp_b64
 		third_party/nasm
 		third_party/nearby
diff --git a/www-client/chromium/files/chromium-90-unbundle-zlib.patch b/www-client/chromium/files/chromium-90-unbundle-zlib.patch
new file mode 100644
index 000000000000..ad3847515adb
--- /dev/null
+++ b/www-client/chromium/files/chromium-90-unbundle-zlib.patch
@@ -0,0 +1,27 @@
+From 9b04353f502d3fa371231742817b07cb0c41f80c Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 8 Feb 2021 11:15:39 +0000
+Subject: [PATCH] profiling_host: depend on zlib instead of headers only
+
+There is no zlib_common_headers target for unbundled zlib
+and in the end code links against zlib static library anyways.
+---
+ chrome/browser/profiling_host/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/profiling_host/BUILD.gn b/chrome/browser/profiling_host/BUILD.gn
+index a68ac82..1ec9d66 100644
+--- a/chrome/browser/profiling_host/BUILD.gn
++++ b/chrome/browser/profiling_host/BUILD.gn
+@@ -24,7 +24,7 @@ static_library("profiling_host") {
+     "//components/version_info",
+     "//content/public/browser",
+     "//content/public/common",
+-    "//third_party/zlib:zlib_common_headers",
++    "//third_party/zlib:zlib",
+ 
+     # Added to support the dependency on //chrome/browser/metrics
+     # TODO(darin): We should instead have a way to express that dependency here.
+-- 
+2.26.2
+