www-client/chromium: dev channel bump (47.0.2508.0); back to system icu

Package-Manager: portage-2.2.20.1

2 files changed, 13 insertions, 6 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 452caaadb6b3..3759b32c4d60 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665
 DIST chromium-46.0.2490.13-lite.tar.xz 261760812 SHA256 8b582b05a61b207ebec6a65577e413c00e5f7d330ec1adb24d9681d14640fc88 SHA512 d73f10a8521183ec8253dad8e82c8b6357c080cb76b91b8a8eb69cce05225dd843edf01c04a7478e04a7da22330332832f9c7a63f59346333eda83b9133c4213 WHIRLPOOL 098ec84c56ac43800bd3f5d5f60dcdc167b045b1cf3736bca72b21e1ffbf33937541f810cc2e976f6a86dca0035c4b59000a5532f4974ec2cee9156acd7c488d
 DIST chromium-46.0.2490.22-lite.tar.xz 261632508 SHA256 23a7448cfca032c240262a8d5760f23d9e89bf783ef54467353297856620edb6 SHA512 8d4f8c4cb2c7a4c3c9fb557b4fb2d34c5d7313a82c84fce340254ae59b5fcbc21b2d7b7723d8dd3f7b717175ac12e87373d0889397f01ce189c5718a7deb6de4 WHIRLPOOL dc1fee05d0acc46f9842281e475d1f9d006216c8d8e264ea3eecee63eb14054ff94ed6dd15e6d690305b08670516888a3361f5a3be8f0189c41472d77f0172bb
-DIST chromium-47.0.2498.0-lite.tar.xz 267586356 SHA256 b83da0a7d8c15dd00623443f6d62f1930b1a4db4020cedb7cffbf7e036b7935d SHA512 f65af999a751d360a66bd721365002110ad6a20b99aaa0304524a2c68093b65236b7a3eef5865cc17aac3d6a576f84170db785da9423b79de5a2646b8c3076fc WHIRLPOOL ca6a23109fbbae3d0ced4b04ae5d92ad5487cc078942482212317840979ceacdc0550c4e25349ff487b4305495ec7a939f9ad46b26bcfb51cafa05a3e745e6a4
 DIST chromium-47.0.2503.0.tar.xz 348185172 SHA256 af42ffc4e5c81685fdbdf8d626b28b9b1cbdb8fc2643bf03cb067e982de31ab9 SHA512 6ea58854c1ec83e35e12f247fce5c517f3770d06e42baf8192c5bc2ce731e3155c9a0de4679aa86f28f0a551d30dae75fab185905bacb825de8d0272809719f0 WHIRLPOOL cf2f93d3a0afde8325ac4a0726171ad4f2eae49e7a21c1ed857ff4ec1e89f59a1bcaaaeed070671b8fea9724cb8da2de56a0d84bcfc118912f2e1f562ef61ce4
+DIST chromium-47.0.2508.0-lite.tar.xz 267576432 SHA256 d98aa27e686ea8d6e855125e1f1b7f4f0f0afe8c75b904d4715143f87a8c8c8f SHA512 9431f67c1a929254d74552f4e4bcc41240f24e28d44779c241ace2f7306111e6319ac321bd84c8ffdd1562920153a395845f798b0a4ba5f8ca1494258906b716 WHIRLPOOL 476ee722ad547ddfffeca231af5d8a6788b47c706cd9c27e3b6d6d6b541c9547b174cc55fde466b56ad99a63a80b0c2db66b1a0d553b0520ad6b8855073121b5
diff --git a/www-client/chromium/chromium-47.0.2498.0.ebuild b/www-client/chromium/chromium-47.0.2508.0.ebuild
index e96b221c6945..ab244151d780 100644
--- a/www-client/chromium/chromium-47.0.2498.0.ebuild
+++ b/www-client/chromium/chromium-47.0.2508.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD hotwording? ( no-source-code )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
 RESTRICT="proprietary-codecs? ( bindist )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
@@ -101,18 +101,23 @@ RDEPEND+="
 	virtual/opengl
 	virtual/ttf-fonts
 	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
 
 # Python dependencies. The DEPEND part needs to be kept in sync
 # with python_check_deps.
 DEPEND+=" $(python_gen_any_dep '
 	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 ')"
 python_check_deps() {
 	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
 		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
 		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
 		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
@@ -187,6 +192,7 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/chromium-widevine-r1.patch"
 
 	epatch_user
 
@@ -220,7 +226,6 @@ src_prepare() {
 		'third_party/catapult/tracing/third_party/gl-matrix' \
 		'third_party/catapult/tracing/third_party/jszip' \
 		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
 		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
 		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
 		'third_party/cld_2' \
@@ -367,7 +372,8 @@ src_configure() {
 		$(gyp_use hotwording enable_hotwording)
 		$(gyp_use kerberos)
 		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
 
 	# Use explicit library dependencies instead of dlopen.
 	# This makes breakages easier to detect by revdep-rebuild.
@@ -464,7 +470,7 @@ src_configure() {
 
 		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
 		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
 		fi
 	fi
 
@@ -543,6 +549,7 @@ src_install() {
 	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
 
 	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
 
 	# if ! use arm; then
 	#	doexe out/Release/nacl_helper{,_bootstrap} || die