gentoo resync : 05.02.2020

4 files changed, 26 insertions, 43 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f2d9a40d9d85..d0fd3219472b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,7 +15,6 @@ AUX chromium-80-gcc-quiche.patch 1351 BLAKE2B 7bd967a9f3cd544368c623d3612632cd2b
 AUX chromium-80-include.patch 1495 BLAKE2B a5ed4a0df55a24498b3e88c191ecf8f87873b6a8d826f5daa6df3234593d5996257d31c5ce116b078990010633e8e8bbac0e66027329afea3355959d8fae3fa8 SHA512 c73c7af2612b80b110e10fe887cab442aebc1e23bc87cc5819384be9aa0283475fb957e3fd637d6b890411adde38c8206b1f1d998127938808c307bee0636e94
 AUX chromium-80-unbundle-libxml.patch 2990 BLAKE2B 63068fef2333d9d111bfe66a78efd71088c76b08b4e5014b244012df682024ceb0db8441254481189fc449f16cbeab7f650c8cab30f9d37dedf89c2dbea1bae9 SHA512 87ef07a35a103c5b4293301705a09a60199d569fceeab1e3188c7b96067d39f237441209f4448a791dc5675321f609ee5c02fdda1081af38e50adcd15de4e0b6
 AUX chromium-81-clang.patch 692 BLAKE2B da65ab208f0afc82a6fb2e1061cffc700bfef25f0821b34b1d50e7be3f573f2bd629850e74e26a1b1f5ee7bb037d4b9caaef083b07d68bf0d3dd88770db577ed SHA512 ee006e4a8c98576ecfba0b2b76927d1b559d56da19539b3d4f0b630eba64a22a1d9c158724b5b4437cf4bd432f113de7308ab402a5c286a5899a2b1928a78fbe
-AUX chromium-81-gcc-dav1d.patch 326 BLAKE2B 960240ef22c8200ee4a69ed6619628a72702d03bade9af9f500e90893141b7fe003be1f8ca2db90a79f9b42e5ccecb4178c15444dce0497cd5a7f72287b95635 SHA512 d5eea8e139aeec887d78ec944b13f18ad83427e50e74e26dedbd7f1ed5e0efe7cc6a5a072ef39b439380a8b492e7d9f77b06346b36cd7c6248f4537cd742e540
 AUX chromium-81-gcc-noexcept.patch 804 BLAKE2B fde20835e046808b3066b53d57ba754752a1594aef3a153f28c2831721edd832295edb32daa41d27944e48e0bdc4b649b4de5bd6a97d6791be5b5d8a73b77476 SHA512 5708156098e80dd439514273315eeab39fc24938e92b5887a6bb69cd93613ec6814c66a2f24b88f85a83436c2f2a8fca445a368cbf2658cba7d74001ddc30e5b
 AUX chromium-81-gcc-template.patch 1126 BLAKE2B 41f04c54bd9eb7dbc9c995beeac3c485990ccff950867d19171cc2c79bf29f2e9b27aad41dbbd62592113ab446e74d6389995972b92feb8ab742a662dc55ed38 SHA512 2c2e4cb57fc2d3eb67cc864f2aaabaad5861c4433a5d99a9b41a8bc4e2790bf8736b251f18dba9844dbe83180a117a0861fc5c826457472a0956dc8e8746432b
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
@@ -26,9 +25,9 @@ AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d9
 AUX chromium-unbundle-zlib-r1.patch 515 BLAKE2B f3263f7450a940449d7edc0aef46a888248e0245a71797435a985fda8ef3c1abb8823a5a363cff1db0e2d09715942322e5d5ae9ab3554a5a3aeb2db748102a97 SHA512 89d62431e11cf8f3b48afdf9a133a8532916d445676de12acb48b0aaca3aa45106e25de399e7ee37a6220b0766c0ea65f10da219d4bb9a7a02275b4364e493ad
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-79.0.3945.130.tar.xz 778319112 BLAKE2B ac6d7c08c34afc4de8383964f76a5eabc9209de185535a27eff2d6934a77d01fd6b07d5c5afb16e9dd936b2650da76d460e8a485ab16f8300144c7de9b3be2bb SHA512 4b5d4769b068f20b8028085a148cbaf31311eeffad0a22c5c0909af273a8e57e077b33cc93331bbeff9165477262eed2e345b2224ac4f76d8bdb79f983596a81
-DIST chromium-80.0.3987.66.tar.xz 801288252 BLAKE2B da3db645a6d086aa4604a8ca208b982870d32571128a74fb484a7b18b435644987beefe9edb91d635f30ca1c0ebc68968d8bd2ea8b30baeeffeb684ac4feadf9 SHA512 6759433aa4fdad6630d30709960d4e97b88086a2ccac79fcffcf3d770a15fd5092d5f9a79225fc13f599430b36ddce51a244674b47a9aafae1f272b3d7e2fa25
-DIST chromium-81.0.4033.2.tar.xz 819332884 BLAKE2B 4d12fef8959a5de2cde1430b3b0c927e6ecff13276db4490d99491a989310a44fa2df114603e09f5d0f3c3c362b31c02e04be0926ede627ceb075f92f1be76d1 SHA512 3e11cf4cdfa49e80926cfadf217fb7f0cec26b0fac9788b0d020b02be55419cb10ba9e483e4d3851beb55ddd78a80e8d695ed46da971520856f66f32b11d7388
+DIST chromium-80.0.3987.87.tar.xz 801310184 BLAKE2B d051f77b0e6f167632e383e23983531ee1f44f1fce1629f482cf42882c294816bd98c51ad043b5258aa9652a8da14edf278f70fc63f6978c9dfececa547a1fca SHA512 69aebd760d9b8f2c5f4d15a3a144cd4292ffb11b1536af3596f907e730ac64e909d739bb6e9d322a8f56fac75e4f0b2b5c4c36c4fe4bb52147276b5b0dd03620
+DIST chromium-81.0.4040.5.tar.xz 828003840 BLAKE2B 81b3d4b15d5cdc99bcb19ab3745e49b402f00d68a557f58fa3ae0e6b584c28473dba5ca8622373721e54c64760adbf7cb9daae93c1b29336e7f9fc3a387b199f SHA512 47928d6fc022dc0d8b51562c8079baf25aad098f93c52dd4d07d70fa6d9c4b56b4920e163ff3b44d328e741184d5af327394fa56aa36c54509406f2d67e525ed
 EBUILD chromium-79.0.3945.130.ebuild 22703 BLAKE2B c69e08a9bfdd3ec572888a740198cf3a810fa772c024cc42532cfa21ee578d9e28d7bf60b6b092b658663e432cdf355564a57594f50b02f33b8c0398252edccc SHA512 a94ba1b8cff2712134d77f502b9ae33f6125a899e8a894b0bf4141c68f6d12b8ae9cefad38d5056b688079052f021d3a1b71bec6cf89f8eb97ef38ff13d74965
-EBUILD chromium-80.0.3987.66.ebuild 22828 BLAKE2B 902ce746f3cc07107fef5443a7ea600b9f7c5e04415db743846e2dc4247c96340f19973de551e6fd5e5aad00a42c5c5b528b49f6e393d72837561ca704b36bc7 SHA512 36c4baa9b1b31b9d5f38bd8db425d59c018378ca277968f27fb0ab060caf067a05d7b03ba4582eeb039be42590f105e48a7d51352d9ef914ef26fe7adf2528a7
-EBUILD chromium-81.0.4033.2.ebuild 23090 BLAKE2B 3cc609d9794beb2c238e1349cf5af1eda4d4cac0282b814280f80d5276808de70c44214aa0663773b8059addfabc0912ee58eb9e7646ca07e7f2dd99f5db64ee SHA512 9f26fdf56c01d4b4a2c923464449cf394213f0d4becd9d11733f00fdac6642794d1d0e84176e69b2b1926ab60b6ced732c3b79d8473371e6ee1d6623f67b369f
+EBUILD chromium-80.0.3987.87.ebuild 22679 BLAKE2B 8116d9f192a02cb2bb5ed38f5426844144f2426402b3c7cab4a33533c4599815c2a932c20a74b908c674e8c502f7fa26d3d624dc22e92afc7bd4c6787b3604e1 SHA512 60581ba0b19c2ba8f6ea3ca54492cec1372b8f1f6d46ac142c2e9d3eff0ea0fc81db6c04a747eaa3c6427a7a3887db27e641cac6eb69884f65a6af0221ae78dc
+EBUILD chromium-81.0.4040.5.ebuild 22851 BLAKE2B a91a6e251ba432035095980064491632711015501a529d408dd2f2a8d4013c43c92b376858e5dbc5660acb6169ecebb084d67e2511c3b944371fcea3c899f66d SHA512 ed110cea36147c1ce49092b299833b88848d70cb945b76631868e7e5e5113cf726b23d9b077ade2727d1f73c07126489b2c2a494415018d48760f49c75ecc107
 MISC metadata.xml 1456 BLAKE2B cf9ade50335e564cd481d2a9da288ee97d9fe086a948f3226459acc918e9b25d1f61e8384cb4300f9ae253cdd1ea250cdd308784e7cf8fff4b443193e84906d5 SHA512 b0abba4bb13d33ca955db05411a135a66389099ee623c84dcc2ba6f4cd7fe222d5976adbf297767f4bd1e311b765c4500bf43713e5e6daaf0ef45d4fe8894ca7
diff --git a/www-client/chromium/chromium-80.0.3987.66.ebuild b/www-client/chromium/chromium-80.0.3987.87.ebuild
index 1df1ef1ffe20..1dfd272b3bdf 100644
--- a/www-client/chromium/chromium-80.0.3987.66.ebuild
+++ b/www-client/chromium/chromium-80.0.3987.87.ebuild
@@ -644,6 +644,14 @@ src_compile() {
 		s|@@MENUNAME@@|Chromium|g;' \
 		chrome/app/resources/manpage.1.in > \
 		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
 }
 
 src_install() {
@@ -695,7 +703,7 @@ src_install() {
 		doins out/Release/swiftshader/*.so
 	fi
 
-	# Install icons and desktop entry.
+	# Install icons
 	local branding size
 	for size in 16 24 32 48 64 128 256 ; do
 		case ${size} in
@@ -706,17 +714,8 @@ src_install() {
 			chromium-browser.png
 	done
 
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
 
 	# Install GNOME default application entry (bug #303100).
 	insinto /usr/share/gnome-control-center/default-apps
diff --git a/www-client/chromium/chromium-81.0.4033.2.ebuild b/www-client/chromium/chromium-81.0.4040.5.ebuild
index 2f1a68472d5a..bbe6a457c792 100644
--- a/www-client/chromium/chromium-81.0.4033.2.ebuild
+++ b/www-client/chromium/chromium-81.0.4040.5.ebuild
@@ -142,13 +142,11 @@ For native file dialogs in KDE, install kde-apps/kdialog.
 PATCHES=(
 	"${FILESDIR}/chromium-compiler-r11.patch"
 	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-unbundle-zlib-r1.patch"
 	"${FILESDIR}/chromium-78-protobuf-export.patch"
 	"${FILESDIR}/chromium-79-gcc-alignas.patch"
 	"${FILESDIR}/chromium-80-unbundle-libxml.patch"
 	"${FILESDIR}/chromium-80-gcc-quiche.patch"
 	"${FILESDIR}/chromium-80-gcc-blink.patch"
-	"${FILESDIR}/chromium-81-gcc-dav1d.patch"
 	"${FILESDIR}/chromium-81-gcc-template.patch"
 	"${FILESDIR}/chromium-81-gcc-noexcept.patch"
 	"${FILESDIR}/chromium-81-clang.patch"
@@ -649,6 +647,14 @@ src_compile() {
 		s|@@MENUNAME@@|Chromium|g;' \
 		chrome/app/resources/manpage.1.in > \
 		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
 }
 
 src_install() {
@@ -700,7 +706,7 @@ src_install() {
 		doins out/Release/swiftshader/*.so
 	fi
 
-	# Install icons and desktop entry.
+	# Install icons
 	local branding size
 	for size in 16 24 32 48 64 128 256 ; do
 		case ${size} in
@@ -711,17 +717,8 @@ src_install() {
 			chromium-browser.png
 	done
 
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
 
 	# Install GNOME default application entry (bug #303100).
 	insinto /usr/share/gnome-control-center/default-apps
diff --git a/www-client/chromium/files/chromium-81-gcc-dav1d.patch b/www-client/chromium/files/chromium-81-gcc-dav1d.patch
deleted file mode 100644
index 00586fd929ce..000000000000
--- a/www-client/chromium/files/chromium-81-gcc-dav1d.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 63f12f8..f8f0b40 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -99,6 +99,7 @@ config("dav1d_config") {
- dav1d_copts = [
-   "-D_FILE_OFFSET_BITS=64",
-   "-D_POSIX_C_SOURCE=200112L",
-+  "-D_GNU_SOURCE",
- ]
- 
- if (is_win) {