Re-enable NaCl. Build with system speex (bug #432748 by floppym). Remove old.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

5 files changed, 122 insertions, 61 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d2f67cd5660c..2b6cc14da5c7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.722 2012/09/28 18:18:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.723 2012/10/02 07:02:09 phajdan.jr Exp $
+
+*chromium-23.0.1271.10-r1 (02 Oct 2012)
+
+  02 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-speex-r0.patch, -chromium-23.0.1271.6.ebuild,
+  +chromium-23.0.1271.10-r1.ebuild, chromium-9999-r1.ebuild:
+  Re-enable NaCl. Build with system speex (bug #432748 by floppym). Remove old.
 
 *chromium-23.0.1271.10 (28 Sep 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 51f491dcb81d..72e174f905ac 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,6 +16,7 @@ AUX chromium-revert-jpeg-swizzle-r2.patch 2233 SHA256 d99162aa6bae562f116a423472
 AUX chromium-selinux-r0.patch 411 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545 SHA512 a0168ec144369b8d9c88a6c8205b47758e80f7077809972776b15ea4b61a692a2a6775638692d5a2a5ac5a7fdc3961de6d19a43b6d01f9057c3ede48d2a7da67 WHIRLPOOL de5fa4ba46ea3cbd3a51ae2c03c85dfc10fe5b421765018b7a568bc3f0882ca063dab1214923a60785214bc8c801cd3aa578c686f400d51f37c4484b3982f48f
 AUX chromium-svnversion-r0.patch 480 SHA256 f265a9ea756810f623289523d58b0c58b4ea1a001a693321b9cec4810fdc46de SHA512 1ed5770f717db1c2eb650c0a75bb52902fcc3956733afd8511e2bc9a57a6aae420824b4a4dba92ef59dc32eb156efb58826e6e77c29893db1080f04b803ec3fb WHIRLPOOL b4d8815cfc8fb8d8f82d57e19bc692e0f49d5349d27ae473ec2202c0ff0b8f7ce02e49c5c9baa46d823dadeae6ea07b3157a17d7717cf3554948013f84d42417
 AUX chromium-system-icu-r0.patch 337 SHA256 d634929ca192d867588a8eeaecb0c36de3f146e72cbc056896ce64ca1967f8a2 SHA512 179ac2e36606f300f9a381586713d8a32e27a9c4c5471cb81017f826bd4bdd4a4500d6fe0f0d4086c398ab4f21aa92a4d91a6388b97921940e0fb0e0ee0196d6 WHIRLPOOL afcd379f0c4d7e91a19201fd49793926ddc45d836ba139d6223558b224d919381606086534273aa39d2b5e0a9b73552eb946b006ad004fb6001aa376223bfbf2
+AUX chromium-system-speex-r0.patch 1376 SHA256 65efd8d2e10d0fd41b5dbbdca9e3e4cc8ac7ec4d17ed9da295e85f885f1cb5c6 SHA512 a3f9c821169e82c62eb28e071907ee0b7bed8bbc0527c726d5026697fef1974fd4f30211d42ea1e64d5b95035d91a7e3ffcdd08e3d3e96f4b8fe62a5ab6a8218 WHIRLPOOL d02d751843fde3c4bc2f407a4bd484d0d89853fd9bb5e7f5124c1adb4733a3bf303a0c805bb8b8e32893d5690141dc4dd312d05bfbf99f0e175954db3fda2c85
 AUX chromium-tcmalloc-r0.patch 916 SHA256 ae37da023f0b5cda27c3396b5a197d6aba9f3810a32238450f490a8e93f92b63 SHA512 947bd1176863ef7320c0007e0ba906d86a90f47f23932a581613bb1ca28965d8ecdbe285a118bc6d212a6ba59fa55760fe4a71be46d64a6322fffa29e9737ac3 WHIRLPOOL f1761ba96fd3bad70160ecc4d45cf06c9b3b30de0762228cadb5065377a2d3c48e7106400bbc50e6c591988d1d2f24bb7331fb3f6d36223c2351f9fd8dfd09c5
 AUX chromium-tcmalloc-r1.patch 2412 SHA256 df57cc238905c027b844ab680f6c66d879cc7bd9d03603f1ae2c4b10b7715f5b SHA512 b4b47b217c4511c5ff00358ad3d0ebc7e9272d41ef39c3e680fc618843fa5fa1a7ccb88681d2e9bf8b67abcc34f03042f924c977240e87005f621a507330dd9b WHIRLPOOL 1acd99c27ceaf2ab0837fc888d04bb3ef5b48946df96e0981b1698cab986126fe02b3157c5c10dff19c8444b41e1f6053541d6020dcc42bc2ee08eafdd2b477a
 AUX chromium-unistd-r0.patch 354 SHA256 45c11f845424a7e197e3ea826066a5987fff6b309f4091a9a775038543a0656d SHA512 949517b25aac38fcdd229b71f1a7eeefad57b7896aa066258ca6d35972c9a5d97b6432e6317b8d086575a0c7f94f317f068136902327ef747bb380e46d143e70 WHIRLPOOL 271362646f6c5af2e41081e77c6307e87330c43149573b162bee26c6b716a9dd43dd302539a63e7de9aeab04a7af4e4dff25b6e575dd4192d744a6a33ba2066b
@@ -26,19 +27,18 @@ AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298
 DIST chromium-22.0.1229.79.tar.bz2 210410507 SHA256 06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738 SHA512 149666d8e185e4080c1cd7ab153edca2f4833be5beceef51b20e8cbd238030330ec1230cd3a9640bea2d02134683437bba7c809b2f5e13178d4a4e169321c717 WHIRLPOOL acf93160f2b096090a90e2718474477b40b67e8486a8ab7edca777268d4cd2799081cef8a73592302bd07248bdf831486f95873c6ac9b8e031587f3b1e5f739f
 DIST chromium-22.0.1229.91.tar.bz2 210386491 SHA256 dc375b6120352247bccc754863fe7c1d57b87abdb26e49187762020ecbca87ac SHA512 85d1f6f945ca906c7379f8c5933d3e6195853dfabe7e53b26ded32d68cdb55325c019b010c6b0c90ed7f7eca56b7108505114551ab876963c4c21574b0749016 WHIRLPOOL a23cc10ca767255d56b41cdfd0106cd0e294d6ede78d30ce49eebc55b106f8efba0bee8c48aceda6fe390ee428aa81703063733c221b0488907f2cc5e03477e8
 DIST chromium-23.0.1271.10.tar.bz2 217667194 SHA256 c31b047cd02a3196cfa7ddbe676357c20c2be87137e61e8475149d842d74a9ca SHA512 66e5c145e4af21fa0c611ca6bc029ba608bb0c70cca112a3b1b4aa8d5d162f04415e85a6ff9f6d6f079897c6edf88fa9e20ef1f3703392d899a2ac7186e20fac WHIRLPOOL 69369be5278d26868f27e988e205d5b68dda5aed2e92ed91519979e8ce4e84a9ede00b50a83e1778fff9f81d6b613e217f23d040aba2a4890f40df562f0e2d12
-DIST chromium-23.0.1271.6.tar.bz2 217450125 SHA256 d8e4ac36745fecefe05b793a396129ad0c985ae4bb52ffa28362f1cd0b6160d3 SHA512 bbbd931da280d62fbc6076a5723b4b006fb7da033ba79f7284951841e06d21fe405b830e55066d739c53ff558135b3e7b354bfd55b2666b74734b807630725e3 WHIRLPOOL cff15211be1fd990eff55001cc4125ac5bce0aff155bee21bc0980c3688311bdd0158b406d6eef2238de3c562d83fc0ea43d775ae49f9796f4970e56332ca377
 EBUILD chromium-22.0.1229.79.ebuild 14060 SHA256 6a2110467e314b8188127323a39e8461e62e13d38097de3359cd071065221bc6 SHA512 932ae897862acaf510c1f530367b2f81678ef246cc077e614cb0a6b8cd47f81f54d7a03a0975bd20b5c370aa7955dd86adfd6018314dcef88237fcc2619bf22f WHIRLPOOL f561d4316d29fbf4ec3959d44eed4b3cfd15706c944e7105ae0e6d8990b8c99a47f5b441d9a6f142d748b252a7e5d696be47352a6957d0bb0d75ac3aedf28ee0
 EBUILD chromium-22.0.1229.91.ebuild 14059 SHA256 e84a71bef9cba30b9e65aa23264c7937adea47c500300925d1c7c5bb727e41ef SHA512 32a9cf899162cad4a341d02b5e0d5402e9277253e9de77e3ac7e41d56a4e93489bbe6bdf1626b07c753a6cd05aaad8d8bae1f97bf4f5c092eca67e38834064a9 WHIRLPOOL 84f4524175d4778f99c7adf6e31f1fa15f759be1c850fd5f174b398b414a9cc9fc8a7bc21eff3b2784ec5734726b74a2f92e6c37e23511801b8ae096f3913293
+EBUILD chromium-23.0.1271.10-r1.ebuild 15434 SHA256 beb6a070933ca0c51b7de13839b0dffbf1b1cbe0211e05f81ef84a9699784c46 SHA512 94e813ff44a89d60bd8c3c34c899872abdb99fe32b4f197cbaaa3bafc37fc76f37c241ea51063a22d11a3a2ac1bf05a2fa7f463d2f02e6188b6a233277251717 WHIRLPOOL eb3bbe86c13b036971488d8d222d1f891a69425182778afbbfa6e63090d38cc4c5b4033dd486ecbd605456aa05f827047386e40a4932f40eb6b53ca10832d30f
 EBUILD chromium-23.0.1271.10.ebuild 15168 SHA256 995931d6c8fb0776dbfb49543ac51332df34a9be25275deba3d3bc52eb17f379 SHA512 3258cbde3791f26d0bf2455a787835955c7a1d23ddb6fe173405fbe0791304d1ccebfe162d3c7b0a7e17d46bcbe985bf1b639c77fdbc5b00b7e9042ec1f58f01 WHIRLPOOL 551c32aed9483bebf201b5cf886c74e80700c700ca8184b18feb49a17b424ccd3c25cf0c48bc95a269394146aacc09a3cdd0d3e6945784f51b415586bbe047a4
-EBUILD chromium-23.0.1271.6.ebuild 15098 SHA256 1f74c94ae2ad043365a196198f60d21642276c688d8c4b15b88c2722a4e3ed3e SHA512 1c5de343570b5f52e22159ea2af8bed4d75419656dff732e9daa3951b07c02c575a6cf0ad2f60dbab144ac8f91f8ebb3092fa69fb324befa04071e4d893d6fd2 WHIRLPOOL ee8f6ca1197a30ed904a4b9b5c448ab2f57c985540d6cd8e02a61077287fce34bc4e0850d9e3a3406482934dd6099d00b9fa912a01804b7b3cf84bce94df0d8d
-EBUILD chromium-9999-r1.ebuild 16123 SHA256 d3daa9b45fce747966ebcda3279f56e6025bb30f9c7fbc58fc11670ec0e7261c SHA512 0355d65c55e2b07d568db82fe8c24f33d8043d0543a12d31c0466cac4b8733707c45784d996f1e16cdb40332a873dca9ed095e6b172f538857c50df420be8c84 WHIRLPOOL 3cc40ee328b84995b8fd570edb2a08187d282f6e07bcc926e68f05c15035bca0692829b8f50db01138c25a5745fafe1a8961fdb215bc264cc5fcb6227681e8cc
-MISC ChangeLog 38691 SHA256 5e639a5dea039bea07f06ecd67151c5ba50afa192b8221e9fd87a68569819cf2 SHA512 28161e00f9c5158958b7d9ac5da398abdbd1441ee189f8cefe27fe2a681a5f12e057c45416a7dcde301bd856d06833bfe6e51dbdf85818aa4fec00fe2c317bc5 WHIRLPOOL 2d32b07685401713d0bcb7a290b5788d259c9fa863e421e7996ace6ec0051b767c0059d0890bfc9c1f1a41184015360d32ca84c34c0c58bfe30c7685daaab57c
+EBUILD chromium-9999-r1.ebuild 16313 SHA256 d130ad492bf00f0d4bf62907418fef5e7e442e4521d94e3b876b8d0d5cfc45d6 SHA512 afefc14664f4365eb1f71c1d34eea6476a941130aa5938b89970d2db19ccf0584fc33fbcbe779aaa309c428df1ccb862e4712847d8dcfeca580da333d1b6a216 WHIRLPOOL 8ff94edb67b799cb930d1013441fb13caac3448a3df9d39e2f98c1c08bd1e09df635dcc8b2a9a3e696cdf2a6b40094b82588c2c2ad3532795b983ef870eed5eb
+MISC ChangeLog 39000 SHA256 da931b6a886085bd7e137836146193f38a462895fa54783ef05c62ff8cd366d6 SHA512 b373ae8367df47bb4a428fac836d02065a4612bdeef33353e5c9fa57363472aaec4444b382f075a6a03db288e5426cc68b3734adef8a4d8fc3596c21c5371ce3 WHIRLPOOL 03eb74f33df0628c9533578f6ce4b7007b7a0f7ffbd2551be32f9f415e97a85dc8c0ecd0e77da5f9e906b6f8e080af81362da452da14b57d8703b1965e4be96a
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 360 SHA256 4c2cd208e61300491a73f23e90a6d1b447a4e0d16ad8f54ae68408eb94357e60 SHA512 f70a2eaefadf05baa375064fcc452982cbf6a5e775ba5b8fc49780ddc3910f8d18f9e5713b8ef083567f2d0bde53f8f9626afa4b4bed7b9b1ad30f444e42c14c WHIRLPOOL 6d7df2df36e34a6111c869f90636876cf30883c623d594e3a4830b156e2f14e938a739e5cf4089cd2ff7b4fb79d0e323725b984cbee9d466d735971ad2555f06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBl6hQACgkQuUQtlDBCeQLbKgCggnPyuX/T0DbLvSWx0YdMNAYv
-nEkAnRiNk8yWKnusqX6EK3OHNLySH/TR
-=DJS2
+iEYEAREIAAYFAlBqkYAACgkQuUQtlDBCeQKh+QCeL3DEw9fzGywAv5LpQj5zFhI6
+dd4AmwZ9gEYgCo7klesz0/0poVYFB3IX
+=5mq8
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-23.0.1271.6.ebuild b/www-client/chromium/chromium-23.0.1271.10-r1.ebuild
index 6b4c3bb83dd5..82b210342bb2 100644
--- a/www-client/chromium/chromium-23.0.1271.6.ebuild
+++ b/www-client/chromium/chromium-23.0.1271.10-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-23.0.1271.6.ebuild,v 1.1 2012/09/27 11:24:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.10-r1.ebuild,v 1.1 2012/10/02 07:02:09 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -19,7 +19,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc"
 
 RDEPEND="app-arch/bzip2
 	cups? (
@@ -41,6 +41,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
+	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
 	virtual/libusb:1
@@ -51,6 +52,7 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p9093
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -97,17 +99,23 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# if ! use arm; then
-	#	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		native_client/toolchain/linux_x86_newlib || die
-	# 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 unnecessary dependency on dbus-glib, bug #434346.
 	epatch "${FILESDIR}/${PN}-dbus-glib-r0.patch"
@@ -115,23 +123,26 @@ src_prepare() {
 	# Fix build with system ICU.
 	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
 
+	# Fix build with system speex, bug #432748.
+	epatch "${FILESDIR}/${PN}-system-speex-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_user
 
@@ -177,8 +188,9 @@ src_prepare() {
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/*' \
+		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/trace-viewer/*' \
 		\! -path 'third_party/undoview/*' \
@@ -215,17 +227,16 @@ src_configure() {
 	# additions, bug #336871.
 	myconf+=" -Ddisable_sse2=1"
 
-	# Disable tcmalloc, it causes problems with e.g. NVIDIA
+	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
 	# drivers, bug #413637.
-	myconf+=" -Dlinux_use_tcmalloc=0"
-
-	# TODO: re-enable nacl after fixing build errors, see
-	# http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html
-	myconf+=" -Ddisable_nacl=1"
+	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"
+
 	# Make it possible to remove third_party/adobe.
 	echo > "${T}/flapper_version.h" || die
 	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
@@ -248,7 +259,7 @@ src_configure() {
 		-Duse_system_libusb=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
-		-Duse_system_speex=0
+		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
 		-Duse_system_yasm=1
@@ -408,12 +419,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 e46ab350f17e..88c933953c69 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.137 2012/09/28 18:18:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.138 2012/10/02 07:02:09 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -41,6 +41,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
+	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
 	virtual/libusb:1
@@ -51,6 +52,7 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p9093
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -155,10 +157,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# if ! use arm; then
-	#	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		native_client/toolchain/linux_x86_newlib || die
-	# 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' \
@@ -208,7 +216,7 @@ src_prepare() {
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/*' \
+		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
@@ -251,13 +259,12 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
 
-	# TODO: re-enable nacl after fixing build errors, see
-	# http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html
-	myconf+=" -Ddisable_nacl=1"
-
 	# 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"
+
 	# Make it possible to remove third_party/adobe.
 	echo > "${T}/flapper_version.h" || die
 	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
@@ -280,7 +287,7 @@ src_configure() {
 		-Duse_system_libusb=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
-		-Duse_system_speex=0
+		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
 		-Duse_system_yasm=1
@@ -440,12 +447,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-system-speex-r0.patch b/www-client/chromium/files/chromium-system-speex-r0.patch
new file mode 100644
index 000000000000..5172f8c6698b
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-speex-r0.patch
@@ -0,0 +1,36 @@
+--- third_party/speex/speex.h.orig	2012-10-01 17:40:03.000000000 +0200
++++ third_party/speex/speex.h	2012-10-01 17:41:30.000000000 +0200
+@@ -11,8 +11,12 @@
+ 
+ #if defined(USE_SYSTEM_SPEEX)
+ #include <speex/speex.h>
++#include <speex/speex_callbacks.h>
++#include <speex/speex_stereo.h>
+ #else
+ #include "third_party/speex/include/speex/speex.h"
++#include "third_party/speex/include/speex/speex_callbacks.h"
++#include "third_party/speex/include/speex/speex_stereo.h"
+ #endif
+ 
+ #endif  // THIRD_PARTY_SPEEX_SPEEX_H_
+--- remoting/codec/audio_decoder_speex.cc.orig	2012-10-01 17:40:21.000000000 +0200
++++ remoting/codec/audio_decoder_speex.cc	2012-10-01 17:40:44.000000000 +0200
+@@ -12,8 +12,6 @@
+ #include "base/stl_util.h"
+ #include "remoting/proto/audio.pb.h"
+ #include "third_party/speex/speex.h"
+-#include "third_party/speex/include/speex/speex_callbacks.h"
+-#include "third_party/speex/include/speex/speex_stereo.h"
+ 
+ namespace remoting {
+ 
+--- remoting/codec/audio_encoder_speex.cc.orig	2012-10-01 17:56:56.000000000 +0200
++++ remoting/codec/audio_encoder_speex.cc	2012-10-01 17:57:08.000000000 +0200
+@@ -12,7 +12,6 @@
+ #include "base/stl_util.h"
+ #include "remoting/proto/audio.pb.h"
+ #include "third_party/speex/speex.h"
+-#include "third_party/speex/include/speex/speex_stereo.h"
+ 
+ namespace {
+ // A quality of 8 in wide band mode corresponds to 27,800 bits per second.