Dev channel bump. Use system harfbuzz. Re-enable nacl (no pnacl yet). Remove old.

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

5 files changed, 119 insertions, 80 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 5d556cc3d868..6904e5cd27af 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.776 2012/12/13 17:06:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.777 2012/12/15 23:37:48 phajdan.jr Exp $
+
+*chromium-25.0.1359.3 (15 Dec 2012)
+
+  15 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-no-pnacl-r0.patch, -chromium-25.0.1349.2.ebuild,
+  +chromium-25.0.1359.3.ebuild, chromium-9999-r1.ebuild:
+  Dev channel bump. Use system harfbuzz. Re-enable nacl (no pnacl yet). Remove
+  old.
 
   13 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-24.0.1312.40.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 454e66f1e0e6..97bec7d2823b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,6 +12,7 @@ AUX chromium-gyp-settings-r0.patch 383 SHA256 709e4c8937d7f839f0dd16db905e1834a5
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
 AUX chromium-libyuv-system-libjpeg-r0.patch 808 SHA256 ee975e87a9cc1a139eb8f79d80f28a9a031c95371fe09e41631d4f3d2e806fad SHA512 244fad5b76c1101374098489868bce8dc55232c48fdf6c716c4b8f9aa71ad14af7f45549885b5ac047b88dbb964360700eea4298f1a7e2392b97ba124354b2ca WHIRLPOOL 940ed6bc73421858a984e2af550f233d992a0dbc1146b44cee3410cd117fdee69300ac3ba4c46e9924f648008685465db7c2da152d0dfc2a45c4645ad3ab3596
 AUX chromium-media-no-sse-r0.patch 519 SHA256 71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761 SHA512 61477be531137dd2a9b86cea8069bd7b7da14ab8d4bfab07ea73f83c114644a6c3c6e75a03b5240693a3aa1d7ad4d314dbcf3b0f4f9aa7e0e234afbe0de74e62 WHIRLPOOL c10d0e9b26fee210843a3d91aa82fa5db7ad2248fbbb540a495040c4ceba016b1ab6090190bc3d7eb8dc8c4e47b823f8904ccc3f8a3f47dac0397bee547fd540
+AUX chromium-no-pnacl-r0.patch 859 SHA256 44061e1648ac4674ad0b9990c265c96c33de435679f6854e4b54a421d81cbe6c SHA512 cc82f20ca13a7bbf40248bf7bb6dd52987246def4d982143ea796e90b75b80c397302f8df52a2fcb5d42dd19b71f664fdcccc28f2835c32eba8f85b62b854db3 WHIRLPOOL 3dbc0b223224d517cda4afa19012e7fc5a4b0b85c08c8b2235d8847413704b4f3bf0ff69cab42916b32ba50da5272001a853a71cf0a40644a0d0613cf7fb243e
 AUX chromium-ppapi-r0.patch 422 SHA256 1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd SHA512 c809500724543e6a32a995ad547f19a8768f4e59ee4f4c9d7ad0b11dfbdc2a4795db2d5f272356a879bb31f305401b898c942f11207bb281430bc7c0c218f4a9 WHIRLPOOL 1e648552d740da7e1bd36fdd28f30464f725283d08c5293317a546d69b75144c383f74614dae29405581fb17bc2a52e6dfeb0c139fb62117dbead20b4d4db6fa
 AUX chromium-revert-jpeg-swizzle-r2.patch 2233 SHA256 d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2 SHA512 587c892ef76bd3042fb12daf4a52aace556674207b2b3164d20d46037b26e7b06b56dc8b7f176f8640d08a980276182c346b2e2b24808c3dbf0526db2e4b1596 WHIRLPOOL dde8d31c1ebbc535b67f695efc1cf87e2df5db7c399b61bb0489d090577aea97588f8313933fbd8e05111ea24c4b3da07dc0888cba2c2cf6c82ecb13c2306f23
 AUX chromium-selinux-r0.patch 411 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545 SHA512 a0168ec144369b8d9c88a6c8205b47758e80f7077809972776b15ea4b61a692a2a6775638692d5a2a5ac5a7fdc3961de6d19a43b6d01f9057c3ede48d2a7da67 WHIRLPOOL de5fa4ba46ea3cbd3a51ae2c03c85dfc10fe5b421765018b7a568bc3f0882ca063dab1214923a60785214bc8c801cd3aa578c686f400d51f37c4484b3982f48f
@@ -29,21 +30,21 @@ AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298
 DIST chromium-23.0.1271.97.tar.bz2 218486708 SHA256 37ba1289b7066c3206d9b8f51c0a6acde0f3f5550e716a61af32485d8d0dc2e1 SHA512 cc941938c5ba6d9634dd6fb010dfd87806ebc6e0fd4a26353699ae06d4e3fbcd77f0a6d2b332dac30f5133178079881a597366387951c427e7578ca293f897f7 WHIRLPOOL 0e74ccf80187e9248944ea480d3fcf601ff5e0f57ac1ab545dc50a40ef2d97db4d9bea8ab8f4fa96b8ccca4408e32c9f948d98afeb084be90b0a157bd63c4196
 DIST chromium-24.0.1312.35.tar.bz2 186219160 SHA256 918d10035c62351ed3ee9e1e35fcd640ecaef3f572a08c7f98f2db4ccbef6655 SHA512 7104a8749bf7b7a96ca554012b587f5877f942149b507e496156d26963dd122efcc125cba1c88ff3aa98d287c46f324dcb786578f2e1a420eaf8cf040750ecfc WHIRLPOOL 5fc3464e1369b4a092cb2d5e1ee47f809fd522a2eb59d2bb4239e0f6ad04a61af0b02cd5191f108f52715694d1cd1b82809a203e9e0f384a12d398210b0e4aa9
 DIST chromium-24.0.1312.40.tar.bz2 186308983 SHA256 f9f19a0e1ebdaac216153f6a7ca7b8559ea687d59982e78a1b63425d2ebface5 SHA512 9c6ac3cb1150ec3626eebbd35f5c16e7dc3e1b21e563500f26e63c8fd60ec0a2dc0ea39d1f4d4698f96293da5b19a03ac5569c5bf0d07f9b0f24a30bebce94b7 WHIRLPOOL 45ef789d004e1bc673f48155ac311112c5ad54d5bfa267ba91c2b00f6eb7b584359f97d102fb172d41334de89c21acb9e95c8be4dafb7222ad059a825321935a
-DIST chromium-25.0.1349.2.tar.bz2 188423260 SHA256 a00467809210be117ae9b90154e0b14dbfe9bf056f49743ff3247211fc531beb SHA512 46719525f85cc6f5016673522d707d59f9bfae698b43f3a31f37ea75e0a6636feef420787fed1458de94a6d0621d696d22ce5a1a84e1e6b828bf3868d393984f WHIRLPOOL 3e210854159d2b0d8e4fab0121fd8f45597a5162f240bedb0c9f257ed98387ec573b73578fb3a7e2b980afe3abd803f066a336594fbd6f20ace0eb8a66b948a3
 DIST chromium-25.0.1354.0.tar.bz2 188029639 SHA256 e3409a2ab745ceff0c206caff503086a3a3607b825cbd5645b35910c0dfcc04b SHA512 5d5ed39b089ccd207857aef0f1da66fba2e5fe7a92dcce2bbe6789cda85eb680a662f3e292cdea75f275f87e0ca40498f7c25c9e43cfdfca9d6407d0d60a0886 WHIRLPOOL 17bc02c7626816fa87b950757ce9bd9f7ad39a6e9d8f83f8c2dfd2a5333bec1c3af0dd672d3e7372be2d93465a5cfaa69cd2e1ce727ca43af2efcc3b269653ab
+DIST chromium-25.0.1359.3.tar.bz2 183987036 SHA256 561ee201844e078d150d8633a9ed67bd15a1b1da781ddd3c290a8a2b4db4c9d1 SHA512 c5c01dd9cae20bd726dad17e46473dcffee4c5cc349a6193483369eac097940314b288665ee1a18be0c13774901d998a806c1f7b5d30bc1b6f9c90158dc92553 WHIRLPOOL ddec9700c953ad725ed859c9ec76c8bca86cb94f1cd46ba2575ab2d3e29f40d06c01fddc5f1c1aba9aa871c5b1524f633b356195453bb7a60b2ef4dd856f1491
 EBUILD chromium-23.0.1271.97.ebuild 15471 SHA256 7b6e414cfc07a6aeed2fb7cdf2c82eeb424c6d5d5d5ddfb8c3843954e32b5fc3 SHA512 7b625933eda15e8ff16d22ed04547d202e4c83da9a4e092cfa31bb20e2ec2f5c8e6d5ccdef0c169ab7d3076a701487e913b880e1841dd3a2b04dd1d541bdeec7 WHIRLPOOL bb5d8707bc3f1a868f0dac1313e77e3f302dc287584fb4bbc7420b9c9a1efb4aa4fca2a69ea1b0a82639e301896ac03b14506b96426b8cb6fbb08aec0265f6e6
 EBUILD chromium-24.0.1312.35.ebuild 15447 SHA256 6eb30be7e86b19efa65913206865c7b05feec1dc60c2294ccf6437ae3645fb5a SHA512 eb3aa886acb891518c147e95ccd41ff09ec775c2001b67edc47974417f960472f9b6653f2c1a5a6c3209af8e4286414ae1cadf356c184d7e43b68223e2f91c0c WHIRLPOOL e067161498b2b97d5ab99b1c8b43897779baab16dfa02910dda3517f1292558b62dcf450a28838b776cad30a1a2b63dad73c36dee59c5325708b05428922b27e
 EBUILD chromium-24.0.1312.40.ebuild 15894 SHA256 612f9eeb9002a86ba4a42dc24d222b1b68ffa4a3a07785bf7bb9f4656fd8e558 SHA512 601b4aef5768b2690f3aaa073d6820cd4c8f4611e6cfd88965921a1df5542dc26911c43ea79130e2a323fdddf2ea57e1e2f78365b57025fb95709b24fc276a59 WHIRLPOOL a11b54f33072c857d1b8eea3524505c785f01c64bd430148379ea786e84921313d7d0e307cce817f243f4ce32b57d0b2feafb739b3bf93c84ab69fbc7eefd9da
-EBUILD chromium-25.0.1349.2.ebuild 16123 SHA256 71cb060603ecd8f41aa8acac5a8aba274b4d6cbd84f15324649d4c335810b117 SHA512 c2dfab33924959f04e54e21e58df98236593a080e65ec281568cf52a491ce64a767d5008127daa02124472eb8d684c6ce1a509ccde66bdcb40dc62017ff8ffd1 WHIRLPOOL 0163c36a07572aaf8e1a21a075b83c26a2fb008da953ebea3c053b8462f78e89bd26aaa109d94d81dd84fefd644a40a3da842bd056ba7c414b0d32183a8abb67
 EBUILD chromium-25.0.1354.0.ebuild 16270 SHA256 258578d461182dba5132eff7dca4cd0bfe9d63cc81ee7d08deb01edc170bce62 SHA512 a7cf5108c4410c3c7c0cd16897d88818cf11320d1778784e9d2b6cea6ca32d0082aa515c7c0aa0405bb1c60972ca26cfcf260b9926b8edc5986e55f7bdf87347 WHIRLPOOL 9372788b0f481d0a62ae51ce88ad48fc70a3f1cd1be5e22c1967366e107d78d36c86d90a71ad3a3eeed6b8b911c1317181a3490366178529f8c8d0b9bd2ef1ad
-EBUILD chromium-9999-r1.ebuild 17404 SHA256 d96d9bf137cf749f8aa9d90f75aa651c4b0037e32dea5354bcc14b930176c3c0 SHA512 9141148cb95577c6d4641d5dd0e7055a0c9293daa6ffdff06ce62ec5a5ec2d68b01d29232563eb30388232d9a5f6c0ae326dc6ea149f6b4a3aba790ee9e5a0ed WHIRLPOOL f2e3975a3d88ac90607444944f56a7b072cb7b700307ec0940c12695e7315419026df1e4b56b14d67c934f1851a51519d7b8a55a482df104c131a40936a3eae7
-MISC ChangeLog 48090 SHA256 015cde6d403c40129d92d04990db14583fc7f88db6e8d8bf08c29f46d624c264 SHA512 77aeb836dbe27ce046b559a577b9ea6fc80105a6b77270dd18bab566bba3f191eee1361b82309810acf38a76e08401142592fe14980a955ec64b2f882ec4265c WHIRLPOOL 5a7f1263f5290c90d9662178d62fe976772ebcf132508ea572838f866cca12a90a0fee1b5179e5d011cb9fbe7f088c076ebacf351e43634ccff343e4e6d7c816
+EBUILD chromium-25.0.1359.3.ebuild 16199 SHA256 dbbb9706b50ef363d94698bd7deeec4f18bcbb52d1fdc0be2c747092b057980e SHA512 31cf5d0fccbef4e57b7096b91badd3bf5a3e4dc9f0bdd40809b773344b313b0fa780d916406a68586a4943b28811047cc317c15a374d1d5399c5e419c620626a WHIRLPOOL 7e171ee0420d0cc094da832be1725d9a91d3ca84f115ab22b591375dcce3e27374d56216c4a642030111ce54b714a1073a7d1cc1a4752b6c3605f48378a6169b
+EBUILD chromium-9999-r1.ebuild 17449 SHA256 8a25f4910d8a026cfa549220aae15c6ed677828243540d0e00241ebe945b34d4 SHA512 1283c6776832e171f70570f709f4a7d12efab31487a13d8fcaf7cdcabcdacc924cd95fb18886b844dd55c9345006ae4151df175fd4ee17fa64503c4bfe81edd9 WHIRLPOOL e1f193dd0f7604df47d2b36be553881f1d55571bcc1562be4a534792c551797664a2976916cfe4f1711ca8385fd9fb6b4c0f958ff37b816f46a4db841d3d2e03
+MISC ChangeLog 48393 SHA256 545fb14f411b15c146601f20c6b375fc780196f3191485c15ac7b0e6f63dde54 SHA512 c942705dd712ba38c031b273038bc3ee4ec86e0bd8a247dc4860982f2eeddb117c335396bfbe1944322a34ee859e88659ad85f4b1c2f535faf32f7c92c269609 WHIRLPOOL 22c6e76c57d3008c59f62249d5eff58a8ebcdbff5221ee574e172166345ead7979082f717c969389029038a303eeebcb6266331137c067aecfbd9482e5acca2b
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 441 SHA256 2e4485b8a0451abf35bc19812cb993e998ee037ed97bc2cd53bf25c7c6c2f4a9 SHA512 4acbea177dc61613b6550987f26f8f4766ba534e0e87605657617f60569800e1a6960f9e7f0084863ad88aaa4ede94f593d1bd15d418594652e25288f6d79c9e WHIRLPOOL 2abe87ee8c80aff177de74bf5174fdd144f053759fb2d14ac7105f67f5e96082b7912d0283b5c78912750277ee6423b02a1b1bc2842bc851e8db9568d3b2ae59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDKCzkACgkQuUQtlDBCeQIFlwCePnGye+FlQtpcVEhwVT5IqQTb
-WNQAnREObjQlbZX08Il996UZmtuODhU6
-=7KAV
+iEYEAREIAAYFAlDNCdkACgkQuUQtlDBCeQI1LgCfaJ0wgdjd/XnA2QnsfkJ1uF05
+n1oAn28mz+ViRMlPfqIqtxdNZrHUlQE6
+=SXb9
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-25.0.1349.2.ebuild b/www-client/chromium/chromium-25.0.1359.3.ebuild
index e20df1cedd4b..0ea5217c35f6 100644
--- a/www-client/chromium/chromium-25.0.1349.2.ebuild
+++ b/www-client/chromium/chromium-25.0.1359.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1349.2.ebuild,v 1.4 2012/12/10 04:26:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1359.3.ebuild,v 1.1 2012/12/15 23:37:48 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ RDEPEND="app-arch/bzip2
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
 	)
-	>=dev-lang/v8-3.15.7.2:=
+	>=dev-lang/v8-3.15.11.1:=
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
@@ -39,6 +39,7 @@ RDEPEND="app-arch/bzip2
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
+	media-libs/harfbuzz
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	media-libs/libvpx
@@ -62,12 +63,15 @@ RDEPEND="app-arch/bzip2
 		sys-libs/libselinux
 	)"
 DEPEND="${RDEPEND}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
 	dev-lang/perl
-	dev-lang/yasm
 	dev-python/ply
 	dev-python/simplejson
 	>=dev-util/gperf-3.0.3
-	net-libs/webkit-gtk:2
+	sys-apps/hwids
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
@@ -110,41 +114,44 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# if ! use arm; then
-	#	ebegin "Preparing NaCl newlib toolchain"
-	#	pushd "${T}" >/dev/null || die
-	#	mkdir sdk || die
-	#	cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
-	#	mkdir -p "${S}"/native_client/toolchain/.tars || die
-	#	tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
-	#	popd >/dev/null || die
-	#	eend $?
-	# fi
+	if ! use arm; then
+		ebegin "Preparing NaCl newlib toolchain"
+		pushd "${T}" >/dev/null || die
+		mkdir sdk || die
+		cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
+		mkdir -p "${S}"/native_client/toolchain/.tars || die
+		tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
+		popd >/dev/null || die
+		eend $?
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	# sed -i '1i#define OF(x) x' \
 	#	third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
 	# Fix build without NaCl glibc toolchain.
-	# epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	# Fix build without NaCl pnacl toolchain.
+	epatch "${FILESDIR}/${PN}-no-pnacl-r0.patch"
 
 	# Missing gyp files in tarball.
 	# https://code.google.com/p/chromium/issues/detail?id=144823
-	# if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
-	#	die "tarball fixed, please remove workaround"
-	# fi
-
-	# mkdir -p chrome/test/data/nacl
-	# cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
-	# {
-	#   'targets': [
-	#     {
-	#       'target_name': 'nacl_tests',
-	#       'type': 'none',
-	#     },
-	#   ],
-	# }
-	# EOF
+	if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
+		die "tarball fixed, please remove workaround"
+	fi
+
+	mkdir -p chrome/test/data/nacl
+	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
+	{
+	  'targets': [
+	    {
+	      'target_name': 'nacl_tests',
+	      'type': 'none',
+	    },
+	  ],
+	}
+	EOF
 
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
 
@@ -161,8 +168,6 @@ src_prepare() {
 		\! -path 'third_party/flac/flac.h' \
 		\! -path 'third_party/flot/*' \
 		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/harfbuzz-ng/*' \
 		\! -path 'third_party/hunspell/*' \
 		\! -path 'third_party/hyphen/*' \
 		\! -path 'third_party/iccjpeg/*' \
@@ -231,15 +236,11 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
 
-	# TODO: build with NaCl (pnacl is sort of required).
-	myconf+=" -Ddisable_nacl=1"
-
 	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
+	myconf+=" -Ddisable_glibc=1"
 
 	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1
-	#	-Dbuild_pnacl_newlib=0"
+	myconf+=" -Ddisable_pnacl=1"
 
 	# Make it possible to remove third_party/adobe.
 	echo > "${T}/flapper_version.h" || die
@@ -254,6 +255,7 @@ src_configure() {
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
@@ -289,6 +291,10 @@ src_configure() {
 		-Dlinux_link_gsettings=1
 		-Dlinux_link_libpci=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+="
@@ -438,12 +444,12 @@ src_install() {
 
 	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
+	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-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 68e8e69f438a..ee6498939b48 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.154 2012/12/12 04:32:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.155 2012/12/15 23:37:48 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ RDEPEND="app-arch/bzip2
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
 	)
-	>=dev-lang/v8-3.15.7.2:=
+	>=dev-lang/v8-3.15.11.1:=
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
@@ -39,6 +39,7 @@ RDEPEND="app-arch/bzip2
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
+	media-libs/harfbuzz
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	media-libs/libvpx
@@ -62,12 +63,14 @@ RDEPEND="app-arch/bzip2
 		sys-libs/libselinux
 	)"
 DEPEND="${RDEPEND}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
 	dev-lang/perl
-	dev-lang/yasm
 	dev-python/ply
 	dev-python/simplejson
 	>=dev-util/gperf-3.0.3
-	net-libs/webkit-gtk:2
 	sys-apps/hwids
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
@@ -169,21 +172,27 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# if ! use arm; then
-	#	ebegin "Preparing NaCl newlib toolchain"
-	#	pushd "${T}" >/dev/null || die
-	#	mkdir sdk || die
-	#	cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
-	#	mkdir -p "${S}"/native_client/toolchain/.tars || die
-	#	tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
-	#	popd >/dev/null || die
-	#	eend $?
-	# fi
+	if ! use arm; then
+		ebegin "Preparing NaCl newlib toolchain"
+		pushd "${T}" >/dev/null || die
+		mkdir sdk || die
+		cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
+		mkdir -p "${S}"/native_client/toolchain/.tars || die
+		tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
+		popd >/dev/null || die
+		eend $?
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	# sed -i '1i#define OF(x) x' \
 	#	third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	# Fix build without NaCl pnacl toolchain.
+	epatch "${FILESDIR}/${PN}-no-pnacl-r0.patch"
+
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
 
 	epatch_user
@@ -199,8 +208,6 @@ src_prepare() {
 		\! -path 'third_party/flac/flac.h' \
 		\! -path 'third_party/flot/*' \
 		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/harfbuzz-ng/*' \
 		\! -path 'third_party/hunspell/*' \
 		\! -path 'third_party/hyphen/*' \
 		\! -path 'third_party/iccjpeg/*' \
@@ -269,15 +276,11 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
 
-	# TODO: build with NaCl (pnacl is sort of required).
-	myconf+=" -Ddisable_nacl=1"
-
 	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
+	myconf+=" -Ddisable_glibc=1"
 
 	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1
-	#	-Dbuild_pnacl_newlib=0"
+	myconf+=" -Ddisable_pnacl=1"
 
 	# Make it possible to remove third_party/adobe.
 	echo > "${T}/flapper_version.h" || die
@@ -292,6 +295,7 @@ src_configure() {
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
@@ -480,12 +484,12 @@ src_install() {
 
 	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
+	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-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
diff --git a/www-client/chromium/files/chromium-no-pnacl-r0.patch b/www-client/chromium/files/chromium-no-pnacl-r0.patch
new file mode 100644
index 000000000000..d90fbb226a6d
--- /dev/null
+++ b/www-client/chromium/files/chromium-no-pnacl-r0.patch
@@ -0,0 +1,20 @@
+--- native_client/build/untrusted.gypi	(revision 10450)
++++ native_client/build/untrusted.gypi	(working copy)
+@@ -771,7 +771,7 @@
+       ],
+     },
+     'target_conditions': [
+-      ['nexe_target!="" and build_pnacl_newlib!=0', {
++      ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
+         'variables': {
+             'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
+             'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
+@@ -889,7 +889,7 @@
+             }],
+           ],
+       }],
+-      ['nlib_target!="" and build_pnacl_newlib!=0', {
++      ['nlib_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
+         'variables': {
+           'tool_name': 'pnacl_newlib',
+           'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',