Beta channel bump.

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 569 insertions, 7 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7b98fc75eb3a..b79e6af37c5a 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.866 2013/04/11 22:30:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.867 2013/04/13 01:24:51 floppym Exp $
+
+*chromium-27.0.1453.47 (13 Apr 2013)
+
+  13 Apr 2013; Mike Gilbert <floppym@gentoo.org> +chromium-27.0.1453.47.ebuild:
+  Beta channel bump.
 
   11 Apr 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-27.0.1453.12.ebuild, chromium-9999-r1.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4d6198e08174..36a16a6626b3 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -31,20 +31,21 @@ DIST chromium-27.0.1453.12-lite.tar.xz 108238324 SHA256 da80a21682f94d5801ea49f6
 DIST chromium-27.0.1453.12-testdata.tar.xz 138704584 SHA256 6e06c7d8d33ac23692e5a4ba300e4c5203b275ba007588da7d80569ecb93252a SHA512 77ca3aff9e362b27e7894e5cf0526389f9fa1730f8f8bdf054bf2d03337c8730b1edd52c67346c781d098fdd59f1a939c7425b1e94787691eb5422e32b6a0ab2 WHIRLPOOL 9a8f5bb5d21e378b2f2a1b4e9aaf1c5dd3cbb07c60ef1eb697235477b492719d11401df34fef2134f5dd0df6d31aee413c3ebf333328b0e88fc61627e85d2b2d
 DIST chromium-27.0.1453.3-lite.tar.xz 108216336 SHA256 df163337d5e095a21dcf8f0b499927f9633a3403af68a7b95e7bde69e2e18f96 SHA512 f1215ebdfa56350763ae65f2bf0574d9d9822433dd198c58364b58389d07aabdf4f9e23c0ea2cb3313f82c54d4709486cf72e683efc522178c59b6e0fb0d2e74 WHIRLPOOL 46b78eef99eea64360dae4f82bf7da1792c826d6ed372eb9e2efb66ce4c754c4fc8ed2ecc79838b3c4b2087e486dc4b3de8ce5f1967260f4a6455041caff7c99
 DIST chromium-27.0.1453.3-testdata.tar.xz 138714444 SHA256 b8bf5355a92167cfe1204325d85c8703e7899b09f8872d6f22945a12fc023d55 SHA512 feaad7ad810e6b0d297018ea36683dd3081052ff837b9f698d334f1ffe04bd6f5cb08be6121ea6b28143655bca407e62bf203ec07b7deaf765810b61483b828f WHIRLPOOL d8cd062dd4fdbab5e5b2551cdfd47d461d9955ca3a0a02a33c76b06ebbaf34a48b3f2220a5e32249c1ba7f3fca83036f89b73792ab9c2e508b9a838d13157e9d
+DIST chromium-27.0.1453.47-lite.tar.xz 108254396 SHA256 f206f7f4f8dd81e655a8bf150fb23af07ac17d3d451f558706ec108915b7b29d SHA512 37e8677f95c5e521bd8b447169b9e48be0c1d84429ff98a2ac85b41705e022a2335fd5f43309d6e9bae5f85c8026ce9b30f950272f97729f8048aceabd99d6a3 WHIRLPOOL 3ddffd8323e6a3cc1d4b415695958b6f52999e607a00349ba2edadc3a682a82b9c0f11d724f91b105ebd7f268c0d6e21d37b2e92c44e3bd175df79eec160db4c
+DIST chromium-27.0.1453.47-testdata.tar.xz 138717808 SHA256 c7302fb8ed9abbc661ff8c6629eed374d557a9cae2fd3c7bf042aaba7dac8e44 SHA512 c7e2ea245231ef6991d8e3352ed6231a4464f5bf6ccf87b79e645734dd93caf04881d3905077bd901620affc79bcff7f7e351ec02789587ff64eed4575dba409 WHIRLPOOL 008f80f70703b85b02d9c9be1d333552a138e4c611053c5c1818187b9c2c8fe0712efb1e1bd53e6019b4de3f17740b91207e6a772b97a02939455e55ded6074b
 EBUILD chromium-26.0.1410.43.ebuild 16049 SHA256 f49f9ed4a82964f84e51f5ce9832e2cdb492a56db24203b466f0303a6df1cbc7 SHA512 e4dbfa9a35657136a9128c9895d37278d801430ee7f2548e2b95792c5485b76a25a229fe2351e01f35378bad1b13bdcb037da18d2349f10bfd2b249fc2b545e4 WHIRLPOOL 7fc8f4fc871c60d02e1b7dba8ca4344a07c5c661e029217c0c2dae9ef4764588e5aa98ff22946d94eeef9fbb53cbf6fac0363b8b268e6e84df151ee8e8ab94ce
 EBUILD chromium-26.0.1410.63.ebuild 16166 SHA256 a01a9e49f044e3dd7194eee0127b267b72581771271bf86f19d8236523069b67 SHA512 415c50c72c5270dc4e80486b4dd328995269e3e48dbb5e74603aed5f2a9cddcf341b52d5fa2a8825c20691146617395c0900c886731f9927683a5dd6763d0a85 WHIRLPOOL 3fa509516c609ea34da827491fa6dfbcd10f7dbdca68fc58331403bf2bc9f80f36db8ec13f6e74a5e7ddc32ee5c795c9a0b31a1760922de08404a95410155dcc
 EBUILD chromium-27.0.1453.12.ebuild 17264 SHA256 0306b207f39c4ef85925dad9bc72abb462f84f8990c5c0227ab4f722aab55fad SHA512 c006b1b2e4ed76a086a354b085a1b3309c649725d6da2c8f394dee4762d051fac10968e7867dec430deaab9348a6f5b2190aec0fbef5ae613ddb2deec3ce206c WHIRLPOOL eab8a448c72490c7a010b4ea6611213a766765963211d5d98bb8abda2e145b6b2053c8a4c06307a2c1eb87b689fbdf6145a6554de7ecedd08ca93a01d6dc986d
 EBUILD chromium-27.0.1453.3.ebuild 16592 SHA256 35b679df242fb6b83c6d0855c9a2922a7b069e865267f4c5fa51c72b38ef2d2a SHA512 fa12e384f7c2894b1d1ae388d608b28aa41f319373280a71db79fc5779ecf3fdf6ede406fde9ce323b39500111d12101e2f156e18ab1426956320520697302d3 WHIRLPOOL b0840b7939569607200cce68ac26df035021a1d95ae132faa9a4eb955e600f75b6ff30bce31e0e0f9f57874bcee1e8d3567a57c31a048e48ae8177047372d025
+EBUILD chromium-27.0.1453.47.ebuild 17304 SHA256 c7eb25d29eb1304fd4259d62dac3968bb00b5d7be9342bc3305e93267169c8bf SHA512 ece89346a2336069963241db1d1b97d954fae42085637565f74bf42a081c584c2c4cc89c301af291029a1258af17f940cd5b031941faf55ba269bf0ba595260a WHIRLPOOL 3941617d9a5a4793ef1157dcacdab54e9ed01c301b3a5ca4f352e46083cf292ef1364eb8dbd806056b510186660a0e708ea5bccac89f82d74584e3589fb67730
 EBUILD chromium-9999-r1.ebuild 18552 SHA256 359fcd6a25aee2c28d10319e80c082a9b3283186eb7e61533f4659b5f7d8ce51 SHA512 981c62aae1f2582ff38347422d9a47bc695b07dcf98a6fd7ebbdc6ec075e6771a7a8be798e834a1c46d11f529900c6e7755d2e36b54e17cdcbff247b50e579ab WHIRLPOOL 207ba7f804e22b5c6e30d13532e9fb9520b39508bd0c9308697d654a497457cd87a3c0bf13c899293495ec3043fdcc5ab7953cff92e77bba142322d75fb758b9
-MISC ChangeLog 65552 SHA256 5ceaf0e9813f44a93a764f250d413fd53539dc904e4c4c128df4d17f851cb744 SHA512 1ad493f3c0b5d4047fb0fc12f86ef80143ff96c5477bf80736554cfe8ea59c5b639cc7f5edbe5a5dbc20a7bd32c05d1f499189884a2caba7ad7aae93a219e8f7 WHIRLPOOL 5e6f6fb74e0a4cddf242ca0d160cfc71e55ce6b73399f7604f7fb57ea5b6ad7a25b7360ba6294bd20c28c978a8badc8807becfca5e99af32f0bade76bfa93e27
+MISC ChangeLog 65689 SHA256 05d77ac5b674b89acbbe7b49b4589014ed9f5f55d39984dd714c5e83c4f83bb7 SHA512 d1797b1ddc350aa122f079f78541524429ce9cb8421eb0706bf6e4b7f46c3f38b6470f1dd762ffd667ccd8569fd0b0cb381b67026712a1eaec4fdcbac189499f WHIRLPOOL 2a01dba42359439f812e5c768821fc7d5a1721ec7f0345b57787cd2b235658e197adcc751dfc4f2dc7afae064ddf8cc2da8d4382e7af64925ecbe79f234802dd
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC chromium-9999-r1.ebuild.orig 18510 SHA256 8d6fcf00e1ebd28b82d0edde6ec2042681147fa10d495838712bb51949e8a44d SHA512 50d4eeba079ca921d23a5c2bd32a93547f6e53a149e065f487d4ad488decc43d5a473f0494b001ca4f416f8f41e3ca64a59c24cfd1b54139eeea4adc8437f1e9 WHIRLPOOL 40a3a2356e805411aba9d9ef74a96767e1f1c92a3d1979309c3735f89606be21654bd95bef8b6523c5a84a2f0cad1fb487efe8cd4440c28d0d5d106910edfbd8
-MISC chromium-9999-r1.ebuild.rej 538 SHA256 d33910598e47be58ec781ec6c6fdcbb1ba4af0f1ccc20c29d9a68d792f58e37d SHA512 1351ef3e1de1d1c7c0369e9c21a9af8f7d688bba7b2e24dd115c3a477a9c0070bc35da5dc68575471aad39eecc3bde41ef497994ca16e83b844b9d249d37bb28 WHIRLPOOL 18d6b8257b5fb46db3e79c94e8f79b0a74cc4bd660ce8eca752e771d12df4f26da4770d3e87f6ccdbb7bc72ce02dbfdd5acd179b3a017e3cabbb96f6f1fb29e5
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFnOYcACgkQuUQtlDBCeQIligCdHG+siNHvG7LGNmz0HmTEieAM
-m9gAnR6+qP7/LLX2NyDeQHRADNpgmvVV
-=qBu4
+iF4EAREIAAYFAlFos+YACgkQC77qH+pIQ6T71QD7BEVQy1Un4jure3stmgAOUtP7
+9sZ0ec0lnb3XXARInIkA/j2CwWqecbVm5byVe5zmFAy058sl9720sV2G3P+CEm7Y
+=HXpq
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-27.0.1453.47.ebuild b/www-client/chromium/chromium-27.0.1453.47.ebuild
new file mode 100644
index 000000000000..951205987d92
--- /dev/null
+++ b/www-client/chromium/chromium-27.0.1453.47.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1453.47.ebuild,v 1.1 2013/04/13 01:24:51 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA 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 chromium eutils flag-o-matic multilib \
+	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	system-sqlite? ( dev-db/sqlite:3 )
+	cups? (
+		dev-libs/libgcrypt:=
+		>=net-print/cups-1.3.11:=
+	)
+	>=dev-lang/v8-3.17.6:=
+	=dev-lang/v8-3.17*
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	>=dev-libs/icu-49.1.1-r1:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.12.3:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
+	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/harfbuzz:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	media-libs/libvpx:=
+	>=media-libs/libwebp-0.2.0_rc1:=
+	!arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) )
+	media-libs/opus:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	virtual/libusb:1=
+	x11-libs/gtk+:2=
+	x11-libs/libXinerama:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	kerberos? ( virtual/krb5 )
+	selinux? (
+		sec-policy/selinux-chromium
+		sys-libs/libselinux:=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	sys-apps/hwids
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	virtual/pkgconfig
+	test? ( dev-python/pyftpdlib )"
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	if ! use selinux; then
+		chromium_suid_sandbox_check_kernel_config
+	fi
+
+	if use bindist && ! use system-ffmpeg; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	fi
+	if ! use bindist; then
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	if ! use arm; then
+		mkdir -p out/Release/obj/gen/sdk/toolchain || die
+		# Do not preserve SELinux context, bug #460892 .
+		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+			out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	fi
+
+	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+
+	# Fix build issue with smhasher, bug #459126 .
+	epatch "${FILESDIR}/${PN}-smhasher-r0.patch"
+
+	# Fix build without pnacl, to be upstreamed.
+	epatch "${FILESDIR}/${PN}-pnacl-r0.patch"
+
+	# Fix build with speech-dispatcher-0.8, bug #463550 .
+	epatch "${FILESDIR}/${PN}-speech-dispatcher-0.8-r0.patch"
+
+	# Fix build with system v8.
+	epatch "${FILESDIR}/${PN}-system-v8-r0.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/cros_system_api/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flot/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/hyphen/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jstemplate/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/mt19937ar/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/pywebsocket/*' \
+		\! -path 'third_party/qcms/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/trace-viewer/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		\! -path 'third_party/x86inc/*' \
+		-delete || die
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_icu=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libusb=1
+		-Duse_system_libvpx=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1
+		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+
+	# TODO: Use system mesa on x86, bug #457130 .
+	if ! use x86 && ! use arm; then
+		myconf+="
+			-Duse_system_mesa=1"
+	fi
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
+	myconf+="
+		-Dmedia_use_libvpx=0"
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gps linux_use_libgps)
+		$(gyp_use gps linux_link_libgps)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use selinux selinux)"
+
+	if use system-sqlite; then
+		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
+		elog "will not work. Please report sites broken by this"
+		elog "to https://bugs.gentoo.org"
+		myconf+="
+			-Duse_system_sqlite=1
+			-Denable_sql_database=0"
+	fi
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	if ! use selinux; then
+		# Enable SUID sandbox.
+		myconf+="
+			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	myconf+="
+		-Dlinux_use_gold_binary=0
+		-Dlinux_use_gold_flags=0"
+
+	# Always support proprietary codecs.
+	myconf+=" -Dproprietary_codecs=1"
+
+	if ! use bindist && ! use system-ffmpeg; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dffmpeg_branding=Chrome"
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# TODO: re-enable NaCl (NativeClient).
+		myconf+=" -Dtarget_arch=arm
+			-Dsysroot=
+			-Darmv7=0
+			-Darm_neon=0
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
+
+	egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	local test_targets=""
+	for x in base cacheinvalidation content crypto \
+		googleurl gpu net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chromedriver"
+	if ! use selinux; then
+		make_targets+=" chrome_sandbox"
+	fi
+	if use test; then
+		make_targets+=" $test_targets"
+	fi
+
+	# See bug #410883 for more info about the .host mess.
+	emake ${make_targets} BUILDTYPE=Release V=1 \
+		CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \
+		CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \
+		LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \
+		AR.host="${BUILD_AR}" || die
+
+	pax-mark m out/Release/chrome
+	if use test; then
+		for x in $test_targets; do
+			pax-mark m out/Release/${x}
+		done
+	fi
+}
+
+src_test() {
+	# For more info see bug #350349.
+	local mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	runtest() {
+		local cmd=$1
+		shift
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
+	}
+
+	local excluded_base_unittests=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+		"TimeTest.JsTime" # bug #459614
+		"SecurityTest.NewOverflow" # bug #465724
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+
+	local excluded_content_unittests=(
+		"RendererDateTimePickerTest.*" # bug #465452
+	)
+	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
+
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: add media_unittests after fixing compile (bug #462546).
+	# runtest out/Release/media_unittests
+
+	local excluded_net_unittests=(
+		"NetUtilTest.IDNToUnicode*" # bug 361885
+		"NetUtilTest.FormatUrl*" # see above
+		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
+		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
+		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
+		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
+		"*SpdyFramerTest.BasicCompression*" # bug #465444
+	)
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+
+	local excluded_sql_unittests=(
+		"SQLiteFeaturesTest.FTS2" # bug #461286
+	)
+	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if ! use selinux; then
+		doexe out/Release/chrome_sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	fi
+
+	doexe out/Release/chromedriver || die
+
+	if ! use arm; then
+		doexe out/Release/nacl_helper{,_bootstrap} || die
+		insinto "${CHROMIUM_HOME}"
+		doins out/Release/nacl_irt_*.nexe || die
+		doins out/Release/libppGoogleNaClPluginChrome.so || die
+	fi
+
+	newexe "${FILESDIR}"/chromium-launcher-r3.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	if ! use system-ffmpeg; then
+		doexe out/Release/libffmpegsumo.so || die
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.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_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+}