22c22
< IUSE="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
---
> IUSE="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine nacl"
23a24
> REQUIRED_USE="arm? ( !nacl )"
191a193,198
> 	if use nacl; then
> 		python build/download_nacl_toolchains.py \
> 			--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
> 			sync --extract
> 	fi
> 
300a308,309
> 		'third_party/libevent' \
> 		'native_client/src/third_party/dlmalloc' \
311,312c320,322
< 	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
< 	myconf+=" -Ddisable_nacl=1"
---
> 	if ! use nacl ; then
> 		myconf+=" -Ddisable_nacl=1"
> 	fi
315c325,326
< 	# myconf+=" -Ddisable_glibc=1"
---
> 	# TODO: what does this mean?
> 	myconf+=" -Ddisable_glibc=1"
317,318c328,330
< 	# TODO: also build with pnacl
< 	# myconf+=" -Ddisable_pnacl=1"
---
> 	if ! use nacl ; then
> 		myconf+=" -Ddisable_pnacl=1"
> 	fi
551,556c563,567
< 	# 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 nacl; then
> 		doexe out/Release/nacl_helper{,_bootstrap} || die
> 		insinto "${CHROMIUM_HOME}"
> 		doins out/Release/nacl_irt_*.nexe || die
> 	fi