--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -22,1 +22,1 @@ 
-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"
@@ -24,0 +24,1 @@ 
+REQUIRED_USE="arm? ( !nacl )"
@@ -192,0 +193,6 @@ 
+	if use nacl; then
+		python build/download_nacl_toolchains.py \
+			--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
+			sync --extract
+	fi
+
@@ -301,0 +308,2 @@ 
+		'third_party/libevent' \
+		'native_client/src/third_party/dlmalloc' \
@@ -311,2 +320,3 @@ 
-	# 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
@@ -315,1 +325,2 @@ 
-	# myconf+=" -Ddisable_glibc=1"
---
+	# TODO: what does this mean?
+	myconf+=" -Ddisable_glibc=1"
@@ -317,2 +328,3 @@ 
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
---
+	if ! use nacl ; then
+		myconf+=" -Ddisable_pnacl=1"
+	fi
@@ -551,6 +563,5 @@ 
-	# 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