[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/

[Paweł Hajdan]

commit:     14bd9ad738d450eec6117f3dccd8c6465be0692f
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 20:19:28 2015 +0000
Commit:     Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 20:20:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bd9ad7

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

Package-Manager: portage-2.2.20.1

 www-client/chromium/Manifest                       |  2 +-
 ...0.2508.0.ebuild => chromium-47.0.2522.1.ebuild} | 24 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bed12d2..53fd1ca 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-45.0.2454.101-lite.tar.xz 242364644 SHA256 014720920ad049e354aa190
 DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665
 DIST chromium-46.0.2490.22-lite.tar.xz 261632508 SHA256 23a7448cfca032c240262a8d5760f23d9e89bf783ef54467353297856620edb6 SHA512 8d4f8c4cb2c7a4c3c9fb557b4fb2d34c5d7313a82c84fce340254ae59b5fcbc21b2d7b7723d8dd3f7b717175ac12e87373d0889397f01ce189c5718a7deb6de4 WHIRLPOOL dc1fee05d0acc46f9842281e475d1f9d006216c8d8e264ea3eecee63eb14054ff94ed6dd15e6d690305b08670516888a3361f5a3be8f0189c41472d77f0172bb
 DIST chromium-46.0.2490.42-lite.tar.xz 261753316 SHA256 8d24a64af63f88d2654141f2db843dbd6a58c3de5a44b31a34e64813080d9501 SHA512 58681cbc0a99b5c299ea1d17bd8a1681c1c14297fd8d30155b7d1234536791b89f0202de1787c79ff03d978ddc270dc3d9f26fc2fb9cf0aa2a60bd7bf1b9571e WHIRLPOOL 8331c494bdfe793f9a777b30c316321ff40a67d3212f56f12b90568b21dc7f1f9273b0a82e38cdf74387335724047103ec85280320c6965f778e8d18190c7313
-DIST chromium-47.0.2508.0-lite.tar.xz 267576432 SHA256 d98aa27e686ea8d6e855125e1f1b7f4f0f0afe8c75b904d4715143f87a8c8c8f SHA512 9431f67c1a929254d74552f4e4bcc41240f24e28d44779c241ace2f7306111e6319ac321bd84c8ffdd1562920153a395845f798b0a4ba5f8ca1494258906b716 WHIRLPOOL 476ee722ad547ddfffeca231af5d8a6788b47c706cd9c27e3b6d6d6b541c9547b174cc55fde466b56ad99a63a80b0c2db66b1a0d553b0520ad6b8855073121b5
 DIST chromium-47.0.2516.0-lite.tar.xz 269320024 SHA256 ce90b6e6c99e661853946c992fdc8d88a3676a5f8cad318f887bee1950fb6da8 SHA512 47a62cd7013921ab46f00416cf4442c4550b1b38090ecc502c194e1f2822e07586e35ccb252f04968f4e2e8359bd472c2e12c7af71f2ba41be97839c1bae6941 WHIRLPOOL 877085833ea36f5ddd560563c1a90f31233b3fc81c5ee5ece7c8d50d16fdb979c42a8a7f86595e260632b134164f79eb7d260ee2be4a7b57abfc3a8b06417a5b
+DIST chromium-47.0.2522.1-lite.tar.xz 303952732 SHA256 f20a0ffc2c9c1e0c6bbe546967fe281bf3367402154744838da624ec54d65d54 SHA512 afcf1379bff6cef3d71781fc83014496d191baa3f7eb0934da775ed2ac85cc9ff5ef18556abfe8204452ebccfd31ff1d37108df66b53f270e6863f82bb987097 WHIRLPOOL 6c6d10c5331dc3559887fd5e2e3adcab1261414fd6a94bfa740d671ca684f2d467ad804501d586d45c24fbf62b0d72a906dc11d4edab484a96bd65deb672990d

diff --git a/www-client/chromium/chromium-47.0.2508.0.ebuild b/www-client/chromium/chromium-47.0.2522.1.ebuild
similarity index 97%
rename from www-client/chromium/chromium-47.0.2508.0.ebuild
rename to www-client/chromium/chromium-47.0.2522.1.ebuild
index ab24415..e8acf4a 100644
--- a/www-client/chromium/chromium-47.0.2508.0.ebuild
+++ b/www-client/chromium/chromium-47.0.2522.1.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 widevine"
+IUSE="cups gnome gnome-keyring gtk3 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.
@@ -64,7 +64,8 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	virtual/udev
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
 	x11-libs/libdrm
 	x11-libs/libX11:=
 	x11-libs/libXcomposite:=
@@ -253,8 +254,8 @@ src_prepare() {
 		'third_party/libsrtp' \
 		'third_party/libudev' \
 		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libvpx_new' \
+		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
 		'third_party/libxml/chromium' \
 		'third_party/libwebm' \
 		'third_party/libyuv' \
@@ -368,6 +369,7 @@ src_configure() {
 		$(gyp_use gnome use_gconf)
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
 		$(gyp_use hidpi enable_hidpi)
 		$(gyp_use hotwording enable_hotwording)
 		$(gyp_use kerberos)
@@ -475,17 +477,19 @@ src_configure() {
 	fi
 
 	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
+	tc-export AR CC CXX NM
 
 	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
 
 	# Bug 491582.
 	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
+	mkdir -p -m 755 "${TMPDIR}" || die
 
 	local build_ffmpeg_args=""
 	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then