www-client/chromium: dev channel bump (54.0.2840.6)

Allow using tcmalloc with GN for bug #591938 by Nick.

Package-Manager: portage-2.2.28

2 files changed, 8 insertions, 8 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 43da9dc7e429..05d738bacce7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-52.0.2743.116.tar.xz 458156660 SHA256 a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 SHA512 c9a8b6d7a22d3b086f1761678f1fa047191a8e44bc6ebe8745e76ea92420b1330fc6e4134ca7bc22c0367e7a25df04900156d0ebb44eae3ef7f98d1deb5362e5 WHIRLPOOL 90cc620e9dab964690a24606ae456e20f1a9dc556301fef33f3599a395ec247cb03712c94522a681f20332b54163896e118463b1b402aff6153b513deb25c5cc
 DIST chromium-53.0.2785.34.tar.xz 460739532 SHA256 261ba008c96b335a55feff18785b01484af2d678f85b58206008b31c9e9c372f SHA512 99e0b7a30e34f70ec844ef50f02eadadead2b83f2a47ca7d5779cf0a90bf49e7d3efc1bbc98eb4d1294ed283edd04a993a639003a365e06ae8b2adf26cc1c865 WHIRLPOOL dec533670c1664f88ea32fe253644e479b81fb93bd93f1bc5dbfe41c56979a7642afdfcd041ddf05ca3f0da8e1bedc7ddf48779be3b965038026f65ab199f344
 DIST chromium-53.0.2785.70.tar.xz 460838212 SHA256 edd660ea30eeb1a3fccb1c18c725c96bf464b6ea34134c8210ef9dfa8cd35179 SHA512 7029915f983f854ceb2e43b1bc896b2954eb2ca4f704a81070a837e2435ffd0f5a4e4128456826fc70e439997febb1eb715ed33b3336734f137952632f61dd7e WHIRLPOOL d6e51313b37c6408e6f41900b984f1cc835fb247dfb0371eaca9554425df5df2ae1d56e4efd31093c2ffcd0359b457338558ee8e66cd1a67f69528f5461cd5b2
-DIST chromium-54.0.2832.2.tar.xz 479876132 SHA256 105145178e6995b57821966b77512918b873e180bfaf6a4991f55c769df04b12 SHA512 e4d4f813df9036d9769003cc115d89139365a898e0ad98faa503bcd066133fa27f653861df1e09d36156f05e30b27ade15e9be2e0c205748feb1ab7913ee2989 WHIRLPOOL 0772494f4956b9e75f09f5ba1ed955178102917c5a59f45f9f34f44d23d334647a6090406c8bc8f9f6dada54758118ed8d1dbdd961f9c3ec30e122a81acc1ad4
 DIST chromium-54.0.2837.0.tar.xz 479983852 SHA256 4813772a104aefc630bd80f81c663f702659fe8a7d592839bf04a1d252e20d75 SHA512 f052afd0b32a1de30df55792c91fbc595489eb347b775e05db7f272e5d88ffc2ff8d498d35c811f2c4e4c14b6cd57d18549dddbbf6b085f5bbe533723dfc2dde WHIRLPOOL d37ec6920ce4922ff2dfd3b4c59691d735301b6124d49f6a854b7eca6975e0588ff975d8337d293a242014d2a5a747695a0dad4216e3c53b552d4a43a6c3a3dc
+DIST chromium-54.0.2840.6.tar.xz 479511944 SHA256 2e1fb6c1095b1d03ccb8ce29c479e288bb53c196553ca7c71ac6c751f6628be5 SHA512 489fcba841db7f5a6af221e8d5113a24db1cf4235b4dcaaf88f0a4afdde0ce91863464d4fbedf3e433e39f71d9019599eedec7fc85b8e082a3db60bed7177821 WHIRLPOOL 38967a688b6c391b63e8129b3099b9fdd53bc3fe13ea21ddd162141a030a1ddd3d19142fda18153c16b4bfe8b51f58e98983cde7b82ac89b1d93e5d4bf202df3
diff --git a/www-client/chromium/chromium-54.0.2832.2.ebuild b/www-client/chromium/chromium-54.0.2840.6.ebuild
index e4e9bdeea587..049142922f0d 100644
--- a/www-client/chromium/chromium-54.0.2832.2.ebuild
+++ b/www-client/chromium/chromium-54.0.2840.6.ebuild
@@ -18,11 +18,10 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg tcmalloc widevine"
+IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
-# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
-REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc )"
+REQUIRED_USE="gn? ( gnome gnome-keyring )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -47,6 +46,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig:=
 	media-libs/freetype:=
 	media-libs/libexif:=
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libvpx:=[svc]
 	media-libs/speex:=
@@ -250,7 +250,6 @@ src_prepare() {
 		third_party/libXNVCtrl
 		third_party/libaddressinput
 		third_party/libjingle
-		third_party/libjpeg_turbo
 		third_party/libphonenumber
 		third_party/libsecret
 		third_party/libsrtp
@@ -339,7 +338,6 @@ src_configure() {
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_icu (bug #576370).
-	# TODO: use_system_libjpeg (bug #584518).
 	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_libusb (http://crbug.com/266149).
 	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
@@ -369,6 +367,7 @@ src_configure() {
 		flac
 		harfbuzz-ng
 		libevent
+		libjpeg
 		libpng
 		libvpx
 		libwebp
@@ -409,7 +408,6 @@ src_configure() {
 	# TODO: support USE=gnome-keyring for GN
 	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
 	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
 	myconf_gn+=" use_cups=$(usex cups true false)"
 	myconf_gn+=" use_gconf=$(usex gnome true false)"
 	myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
@@ -570,7 +568,9 @@ src_configure() {
 
 	einfo "Configuring Chromium..."
 	if use gn; then
-		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+		# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
+		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
+		myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
 		out/Release/gn gen --args="${myconf_gn}" out/Release || die
 	else
 		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die