Stable channel bump.

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

3 files changed, 572 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index eda3a5d48b91..64e9da20bc92 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.920 2013/07/30 04:22:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.921 2013/07/31 00:04:05 floppym Exp $
+
+*chromium-28.0.1500.95 (31 Jul 2013)
+
+  31 Jul 2013; Mike Gilbert <floppym@gentoo.org> +chromium-28.0.1500.95.ebuild:
+  Stable channel bump.
 
   30 Jul 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-28.0.1500.89.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 087e60d1988d..e3fbeda2cbb0 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -24,6 +24,8 @@ DIST chromium-28.0.1500.71-lite.tar.xz 147525416 SHA256 eaf8d15c87ac3c8c88b19a3e
 DIST chromium-28.0.1500.71-testdata.tar.xz 141221792 SHA256 3d50da021403b898b939a0dc91653ea2e5148a13d4ebe147052bf7e0f5a477fb SHA512 e87d8caf68f0c2eb15201f673f4b36e8bdbd8599a057d3fecee2857d83507cc9179f097fbe05fd4a8b1e8e30fcf4e5e134dece60fbbe072887a0327e2b1a3ed9 WHIRLPOOL d1923288c4559f9273c4d3926e6345b88d85d0bec3aa26800768dab1af1ecb8805ca84e45ad73c13e0cd9dd0796a6f875d83e1bc322ff94ee6a25a164d806af6
 DIST chromium-28.0.1500.89-lite.tar.xz 148380244 SHA256 de0ba8e3ee33d1053217852b2922f9aaaa4b12055700b954d8e9adfad0ac7f9a SHA512 11d27f06bd73e1fc57c44978943106a9b567da192bb054b396cbf30a0ff85bff6938155adfe493300571b208e371fe4ef31972c814714c48f80a68080f728230 WHIRLPOOL 2ee3c1328fe4b98d9bd039a26f410f869bafc1b8bf6b6d5bb7fe66965c796e6d0006cc2e0b73b7cdbf9acd99604f95b9c403434f2b063466e246803cfe9bdc05
 DIST chromium-28.0.1500.89-testdata.tar.xz 141151156 SHA256 f9f73f70f84ac9da7a26cb5beb11b67ba3633b3cb5a2e8edb8a681e822633271 SHA512 a17e77f2878999eac2dc0eabe57def815b17721a13e888abbcfaacd1f083a382d7194027e049340c46063705cded82e5d257f5ac4e11816c98da470955358c75 WHIRLPOOL 051d6da17490b73ce6c752b99e9e7e9103890b222d96ac3cc549f0026cbe484be6226087afff0f2a4aedbf6aca1182e2ad0626954c79590c6b8de5cb36aad631
+DIST chromium-28.0.1500.95-lite.tar.xz 113765940 SHA256 68127ad5bcefd7870cf8a3a078638b7bea5e69d4f3501b6c5b1af6d81c3501ab SHA512 94497691c2f8d3defa030956a0bb72213f3c5d9307295ad33d3952ccfbe83011a4be2bbf4d58846f7b52641b0f104f86d9c2e709118af9020c42a2f4deb19d60 WHIRLPOOL 36f10c03f049c0dd46560dbdd19977a1b159ad733db50f200bc2856ee37c4aaa2b3f2c9cd1659092942939b82dac07f8b18028802397994e723dc4d9d976f49d
+DIST chromium-28.0.1500.95-testdata.tar.xz 140983384 SHA256 93dc15df08bb7f62717a2e4855e087f9e5f5f6e7810c1e63763c968f110cd35a SHA512 be7889dc60a34e9a81d49215439445eeda8c355ed71da0e5296ab582e85e5bd72d53433b56fa114a2ff25759f1b02b59efe4a13cb13d0d35715cc69438aa54f9 WHIRLPOOL 0a32be3a2e2d3414824b84b7500ca2297e3bb57b9916773e1dafbc8dbc6b59f0fc7efdc3e65ea8f590c8ed88d53053c877d4448cd80699ef3f988e2f6a5e13f4
 DIST chromium-29.0.1547.22-lite.tar.xz 158881768 SHA256 6c2eb16cea6072c128cf703be02698a2de15ed6efb9d5082521d714821d8b408 SHA512 68027f0edfe8fdfd0a6e42600923857c0245c2d82b8aee55f4a71a8a17a538a1b2a10b5fc3a2d42f9ff024ca936bffa352d6b37c1a51e8e66097283bb1114075 WHIRLPOOL 4b28099cf9c13a8c529cb8e99f336b59ceea9c3ab4266a40b2d06bb8087f1962a976275ab1b71d2e6b315fd30f5f5a168518bc7f8bd452854116b8392ecd4b51
 DIST chromium-29.0.1547.22-testdata.tar.xz 109014636 SHA256 7cb7594b711567a08a12ff757cd8b82141ac4d47ce761140ac7618a24fc722dd SHA512 5e8024cfb329e0278d9d5af389196a96196f59c3d0e6a344c517998f0b0850d4833f9f278836dd2f64957acece1ca73ca73f304a2cbdb3174b670a082e61712c WHIRLPOOL 7efe92f1c0d3df79104160228418057f94f3aca70a720fbcd8c25089ddb1d75a0e5e8b481c5c7a3c6ba7eae33fc5f75c5f8c9e30013b61d77397395c8b2d83ab
 DIST chromium-29.0.1547.32-lite.tar.xz 124405536 SHA256 7efa72b9f75aed65a7400740e0838c87cedd9df8a192b3e7f095d944174ae240 SHA512 ee47182451882d0cab3e73f67e8d4329d48e47036efa80a5eedec85a88b5f97964c76cfe466fe2a9f45e6d77fdbf8f4f79499bfec27e1855f3599dfd70cdbf98 WHIRLPOOL c091a65bc56b35d057db04129ed0c1debe7f65515aa59b42069294959ceb701b284b6df14c19f244750cff9b01c071ad1a47c44a5130f8e5aed93e30bda3e94e
@@ -32,18 +34,18 @@ DIST chromium-30.0.1568.0-lite.tar.xz 127945480 SHA256 3fed27373ebb0bd4a1c9c925e
 DIST chromium-30.0.1568.0-testdata.tar.xz 108803268 SHA256 fee205dead6cc71b83581564dc838ee047f7f7267388838be1e2a04db271f5ea SHA512 b0cc74348b95ad1df23f445f9902696d76a175562f9d9a88f7acb86e96f2c618e1fa5350708c41891b6741544075a34e1087ca038bf5f4f47890d17d6d600cfc WHIRLPOOL 6d1b7ed2497aa0a3ac016a61af1950046db990e3ce2342c6e4e38b2bb52326e74cac6816e782f51109a8dcce4cdc501f147cbd2b3f5aeff7d7c2df4abf22d336
 EBUILD chromium-28.0.1500.71.ebuild 17352 SHA256 ea638b9794c19fed82a38f24670eb614ffa503f8d8d25a94c8079154f61727ac SHA512 b86d2d2b2a1eb672f1788b74a440860b7f94c3a666dddb194520b447c6b519b3c5047b4cbd79c4d2d1aa99a69a7abfdcbe007ea012926ae6c0ed925bd4093a95 WHIRLPOOL 0d3c4c47d5267b595a3b6b65665807ffc1149a269e78a5f1eba1ea608e2bd3c34b35eb21c7e27b4b6a9ab98ff6320a67e29ee73b159ffa45aad3c314f8542815
 EBUILD chromium-28.0.1500.89.ebuild 17325 SHA256 13482aa71b430884c95661392b9c44dc58c1f74b515254bd3978b1cdca26cd9c SHA512 f1be511a188af090cd7ad27f6a0886d4cc813ee152a5f68a060a368a72c520d86b0fa202f376affb881b097604bb16ebb110f91b940032f121628822b55e6dc1 WHIRLPOOL 33929169eeadf2a3289c1ea65f5844a52f2be131ae7687a2579b0fa2c4646c88745fb5f9b8ac9f4e03556651b419c91bd9a08539b646897d835a8444e509bb88
+EBUILD chromium-28.0.1500.95.ebuild 17322 SHA256 0e072350a63acef02ebcca828dc6372fb3dc16735d5626ece84c9fae360224af SHA512 61465ef58b07b5f26e9a501663c533777f0728c97221746716df7b664860176532f708d8aded83cdb4f639a7c46bd0b6c773ed3ee164ecec9ff199bf6bd2e5f2 WHIRLPOOL c88d5244c1150a342b8542555196a2e61193f3aa427619b7811c88c39d95c7032e89f95d4d95948ddc02762f7f187efceebb49a4be1127cdb80ab9e53c9e7213
 EBUILD chromium-29.0.1547.22.ebuild 17255 SHA256 27993c7d204118dfeb249efee5417a38354c20b696998025bb0902f5b478a074 SHA512 8db46406025750b4aedd1d6c2c96f8d257da38728051dff244183b1923eefa64f98d016473a660a2c407bc7229d871ab50a95aae41e2f0bb2dada8a4ebf3b856 WHIRLPOOL 5c9a4cfdc8183bb17de997aa2785e26f62a632636e84f389d85d8b42f3d89dd2cad6c187a9e9b9a78728d3889a24d0eae0bd975182a09e724fbdb1547dd7ca48
 EBUILD chromium-29.0.1547.32.ebuild 17255 SHA256 720739c39641a9f839589918f5a4be8af5951de6374638896e00a2828a261941 SHA512 5a4fb28e1bdbb87f7193d88e4b7ad6048400af2665b8e067388275d4f155cfc260be0e3697aeae3b00c3c1cc5388a2813ec95d36d82079e33417e61026605488 WHIRLPOOL 7b6dbc429b999a31c089cbd6c4eb211f1d746809990773ad55028a3e13fbe69bd5adfbc618b688bfe116a2415ac5d0ad92615b2cefc7f3f6ab5c29b6a5de5b77
 EBUILD chromium-30.0.1568.0.ebuild 17509 SHA256 96c67411775894e51ba9d2353d3af13b21e7d8bffdc8b2c720978136d4159469 SHA512 d147d61aa2fa4cd0399b41e6a3961a698bae6e48fdc72c4e2742cb220ee9426499ab968ebf956d76fd70b92605dc7ca12a2db25991b2218089ea4f0f8d402f8c WHIRLPOOL 30b5bebc29c46ad970e02ef3cb8fc1811f52ccbc5b13f2ac8807f256422e679608207641df8de6e7ab7661adcc339a40095d9012a8125310522ae9e6bda30e78
 EBUILD chromium-9999-r1.ebuild 19393 SHA256 a1fc298e3f09aae3b66afd4fe804c6bca627aa8a0f519fd3a12899d9dcc7d077 SHA512 5dd976482476238e6698f6dd781da71d258a59ce3dba96790d64e33df4fdf57c795265724831b48b7be0538e7581a24662842bf71c1ce2fe2ce0e00827831686 WHIRLPOOL c8a83b1d87a3fa74e5e94e5b8589a89425a7151cc7cf3c5ddf0915b775f1e0a3387c7f4f18aaf00d694058f348d6da4c6fb5e3184ffb0783a7399642a453cfa7
-MISC ChangeLog 76618 SHA256 f9674a48fa6c0c86b2c6600fdb39667110c86eb24b402abc2107121c56f4e7c8 SHA512 673e3e7fecf4a7d33d1fe97f192b3843f84c4ad96da88d90b7c63523d2bb0aa05e31682cad8a1ec222223ede42d860b92e7713dd5c3e24b551408997a765649f WHIRLPOOL 739f16379e65d2e396f0d2b39635ad95b6a1bf516e33458bb32147fb33c047480e7e3cfb5b6280988adeec8d636518be2bfcc190d1a11b4843c77deacdf0550d
+MISC ChangeLog 76757 SHA256 55c25eb8d0b8aedb7dc5789efe60d1beed30acc9f66b16da607f8686ad38f63f SHA512 6464417cc7962a6fb9ce70c01c6c09c6e68b98c0289b5babb540d4025c919e55028b054e36a84a36924ae975079610243a42f180ff37eff4031b13d17c10bb6f WHIRLPOOL 67b0614238b63f9b0df41cdce2f46280053121562379f8baf4ff5fee5a165073dd682ba28a314932940ad4e88ed601307603267fe73d62ff29463e84035199a0
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC chromium-9999-r1.ebuild.orig 19336 SHA256 e13836d68ffc13792ca9c1e6aed26f80f0704cf1292a706a3495d92107375a1e SHA512 990a6306abe8b5004d973d703a3c0420a663d2717ab03cc53004c9abdd49a782f1f4764bd0e9afe46781afad315a1febe89fb7cd79a083ee221a39d50a2274de WHIRLPOOL 0ddcc3f31749662ea4e09c5be91dece54d2754e220c5207b47867fc4ae9cf5e133ceb5a025025fd45551598634a330a00fd26c4969c237cdf3c96a30e5d149f5
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH3RGgACgkQuUQtlDBCeQIMrwCdHsHbLCoI5ZtiEi6+Xom4mLRP
-H5QAmwRSuTVfU5rLUSBS/zQmHo4Zr6oa
-=Xj2Y
+iF4EAREIAAYFAlH4VHYACgkQC77qH+pIQ6RUNwEAwKniCY0dbcHC/Q+VPP7PBYCA
+km9U0p1fJnJScRVNXdUA/0rZJBEMwiLXUSfDUTxC+wNJpR9fJjXJien1LtyGoVpQ
+=U1+4
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-28.0.1500.95.ebuild b/www-client/chromium/chromium-28.0.1500.95.ebuild
new file mode 100644
index 000000000000..f94435842ae7
--- /dev/null
+++ b/www-client/chromium/chromium-28.0.1500.95.ebuild
@@ -0,0 +1,559 @@
+# 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-28.0.1500.95.ebuild,v 1.1 2013/07/31 00:04:05 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 ~arm ~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:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	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.18*
+	>=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:=[icu(+)]
+	>=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]
+		>=media-video/libav-9.5:=[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 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		<=dev-lang/nacl-toolchain-newlib-0_p10915
+		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
+
+	chromium_suid_sandbox_check_kernel_config
+
+	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-r5.patch"
+
+	# Fix build with harfbuzz-0.9.18, bug #472416 .
+	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-nss-3.15.patch"
+
+	epatch "${FILESDIR}/chromium-bug471198.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/*' \
+		\! -path 'third_party/zlib/google/*' \
+		-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_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=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)"
+
+	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"
+
+	if has_version '>=app-accessibility/speech-dispatcher-0.8'; then
+		myconf+=" -Dlibspeechd_h_prefix=speech-dispatcher/"
+	else
+		myconf+=" -Dlibspeechd_h_prefix="
+	fi
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Enable SUID sandbox.
+	myconf+="
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	# 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
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+	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.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	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 chrome_sandbox chromedriver"
+	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 || 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
+		"CertVerifyProcTest.EVVerification" #474642
+	)
+	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
+
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+
+	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
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# 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
+}