gentoo resync : 20.12.2017

4 files changed, 18 insertions, 36 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4bd9954131b9..55705468288b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,9 +17,9 @@ DIST chromium-63.0.3239.84.tar.xz 534280828 BLAKE2B 08437f625a97ea49f274140a0444
 DIST chromium-64.0.3282.14.tar.xz 482211216 BLAKE2B 0ffc69478719903e39998fd6f908883dadcb32580a64b1e8a93b270dfb221cb89b674c7e288649de24e468a56da78cdbf35af9693cd24f5cba158789db609d30 SHA512 75b851be4bf4814e91a4e7a036b7aa78d0c76e138605a42ebe9ce8d2017a1f95eb2dc67bd73f4fa911ce2a28cec769a699f52c98c2b1b3a037321af517692c28
 DIST chromium-64.0.3282.24.tar.xz 482195676 BLAKE2B fdbe03cd5ee936913300beba18faf2a14b07a28a3904642bb4aef076c69914e1d058bde076e8f093836c4b5c548b7aa33c292b283f2807104ee5f5ebf87d6c91 SHA512 84bf757cf7a5ce08f81c4d2ef7b628b4bc393f457b81df8d86a4420a5cf68b61e01d5add6c6b221cbaf19f85b411228770d2c821e81cd8b0c16e27a455a96dff
 DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a
-EBUILD chromium-63.0.3239.108.ebuild 19923 BLAKE2B 89152f731324efd4f726ea65d5b81e1edaa2e4ec10d2f211541e3b7c07ccbdb1d7711790083ffc17af2805b7199aed7371d01fdced6a6a541e53480838377b48 SHA512 5b1a459631ae23b3238d0cf3fa2b2734672f9500a3a3cf558d959dacd4938a63cf6ad717410a1117698f400f2a9aefbaf91ca7a7fff27eb82ae37937ab0cd884
+EBUILD chromium-63.0.3239.108.ebuild 19794 BLAKE2B 9f53872a2d9a55447dc1ecc0d84f24108b3b02b047319296147780808c35cbd59e61ab53e7dfe69ce62c634b5cb2d054ab2520aded579efa2566553d6925f72f SHA512 484011ee1466804c6a95094e49a7c8d1023f40efd8e2c1d79a0f6ed588ca276ab5292238f30ee6b556a3962ed4bb0c3a1202239a31b9f54eef358c2122995342
 EBUILD chromium-63.0.3239.84.ebuild 19793 BLAKE2B c308aaa23701593e8f628698eff765716d51127e70d0b35692189b6f1fc4ae9bd6969e6865287637141a94685bce2c0038e4721177f36044003e68056f2290d4 SHA512 e983e0dd6e5d2281c271c620cd42d51c81c268458db17f3bf26fe96fb97b3e541473255dba870541761df05c5ef95d367a34a621591351a5b5f78a87fcce922c
 EBUILD chromium-64.0.3282.14.ebuild 19911 BLAKE2B a72ebcdb2614b0d2597b10cae01d69964df9525fa8417b7a48f0b6e5200eb8d58f25292a88c5fbd4efb3913bc5a21351f1aa3852c71784edb5a3de37935c028e SHA512 25e6f8f937724d751229d7986dd5ee7b82e479ffa95aa1d429f1519ab4db4857277266c97721fea1fe752d3ae5606bc631cefaf43688d7c2f0c9ed5e6e8bcee5
-EBUILD chromium-64.0.3282.24.ebuild 20117 BLAKE2B fc44b9afc646024f3fc02791b376915e9dfbf157337b6e93e4ace43f6d8ca5a5400ccbfa75a783cf8861ced1d4705a89fd7aeca0ea6ab64e7090acb79e7ee0e2 SHA512 d9bd10e62eb5b2e3c538ddd48d5ba725bb7b0981e807e4fba181bbcf31b89e4557ab22f1019b5272d3cf8e71a58b8518df28c9df8f52943926d54e9831e9a24d
-EBUILD chromium-65.0.3294.5.ebuild 20391 BLAKE2B 4b12a96597d3f66114dbe4f71f4a5c02a33900e7df242f13d2b9c1ccba7dad44e39a67b83bcda8c83cf024d05332ce58937bc4c1073ae1259db16501d49ce92c SHA512 657bb209f41df93edce6e3aa1023346b29b3d3bf00694ad146d5f5b180a1e4de1a8bfe4e09d9e0168e3947aae4f13a894591644457dad9dfe320b6f32da0cbab
+EBUILD chromium-64.0.3282.24.ebuild 20052 BLAKE2B 6c8983cbba2db73f4cf0d445f39f12dd9e9b880990f701ac695421e9bad1296431747af2b1d3d1f90cd2d21eaf96b910cd274b47bf571af03e0abdb71a1b30b3 SHA512 fbe825d7ceee78a90943c539cfcdcacd33808a7be82180b2397d2ef5c09732e1d40acf1d534ba76fabdad2175bed04e47d23a381b140fc4fa922530a91c93529
+EBUILD chromium-65.0.3294.5.ebuild 20326 BLAKE2B 65c4f9ad6b24984996d3fa4576ee6d9ad1db03937c98788b008279b407b6f8fa9b35eebfc31fec3f8c1d879b2bbd514958506a6d80b27ec57e2f628ed61e2392 SHA512 e4ff626240a40b9ce8ef88e05330492cdcb5f5112c5687b509151ce12a81a00109e071b7f8e360ad39b2e0665245ba7390ceb30651e1ffdf8fdd3350e0a5ddbb
 MISC metadata.xml 1336 BLAKE2B 77878a208aff8c9744fca1874e9f692dc6dd55484303274012288c01def548cb96e0d428125613c84f49966adae9702c430ff1ca61c7df5654d1fda4ac9aa22d SHA512 028de2d2f3068ec95dc586b1d5b40cc4f69feba6ca685038427c606005ffc1ede58d056b0502822be83e28217182adc5305e81a7de8fd49f3162250a476cc1a0
diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild b/www-client/chromium/chromium-63.0.3239.108.ebuild
index 992afee3e792..c5e75dfa71e9 100644
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.108.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,24 +164,16 @@ pre_build_checks() {
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
-	local reqmem=3
+	CHECKREQS_MEMORY="3G"
 	CHECKREQS_DISK_BUILD="5G"
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
 		CHECKREQS_DISK_BUILD="25G"
 		if ! use component-build; then
-			reqmem=16
+			CHECKREQS_MEMORY="16G"
 		fi
 	fi
 	eshopts_pop
-
-	local jobs=$(makeopts_jobs)
-	if (( jobs > reqmem )); then
-		CHECKREQS_MEMORY="${jobs}G"
-	else
-		CHECKREQS_MEMORY="${reqmem}G"
-	fi
-
 	check-reqs_pkg_setup
 }
 
diff --git a/www-client/chromium/chromium-64.0.3282.24.ebuild b/www-client/chromium/chromium-64.0.3282.24.ebuild
index 766965c04765..299b79320806 100644
--- a/www-client/chromium/chromium-64.0.3282.24.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.24.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,24 +164,16 @@ pre_build_checks() {
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
-	local reqmem=3
+	CHECKREQS_MEMORY="3G"
 	CHECKREQS_DISK_BUILD="5G"
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
 		CHECKREQS_DISK_BUILD="25G"
 		if ! use component-build; then
-			reqmem=16
+			CHECKREQS_MEMORY="16G"
 		fi
 	fi
 	eshopts_pop
-
-	local jobs=$(makeopts_jobs)
-	if (( jobs > reqmem )); then
-		CHECKREQS_MEMORY="${jobs}G"
-	else
-		CHECKREQS_MEMORY="${reqmem}G"
-	fi
-
 	check-reqs_pkg_setup
 }
 
@@ -448,6 +440,9 @@ src_configure() {
 	# Trying to use gold results in linker crash.
 	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
 
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
 	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
 	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
 	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
diff --git a/www-client/chromium/chromium-65.0.3294.5.ebuild b/www-client/chromium/chromium-65.0.3294.5.ebuild
index 5bd06fad5513..fe5b46bb9456 100644
--- a/www-client/chromium/chromium-65.0.3294.5.ebuild
+++ b/www-client/chromium/chromium-65.0.3294.5.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,24 +164,16 @@ pre_build_checks() {
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
-	local reqmem=3
+	CHECKREQS_MEMORY="3G"
 	CHECKREQS_DISK_BUILD="5G"
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
 		CHECKREQS_DISK_BUILD="25G"
 		if ! use component-build; then
-			reqmem=16
+			CHECKREQS_MEMORY="16G"
 		fi
 	fi
 	eshopts_pop
-
-	local jobs=$(makeopts_jobs)
-	if (( jobs > reqmem )); then
-		CHECKREQS_MEMORY="${jobs}G"
-	else
-		CHECKREQS_MEMORY="${reqmem}G"
-	fi
-
 	check-reqs_pkg_setup
 }
 
@@ -454,6 +446,9 @@ src_configure() {
 	# Trying to use gold results in linker crash.
 	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
 
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
 	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
 	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
 	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""