Index: metadata.xml
===================================================================
--- metadata.xml	(revision 331)
+++ metadata.xml	(working copy)
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>chromium</herd>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
+	<use>
+		<flag name="nacl">Enable Google Native Client support</flag>
+	</use>
 </pkgmetadata>
Index: chromium-17.0.963.56.ebuild
===================================================================
--- chromium-17.0.963.56.ebuild	(revision 331)
+++ chromium-17.0.963.56.ebuild	(working copy)
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -54,7 +54,9 @@
 	x11-libs/libXtst
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+	nacl? (
 	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	)
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/simplejson
@@ -69,6 +71,10 @@
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+REQUIRED_USE="
+	arm? ( !nacl )
+"
+
 gyp_use() {
 	if [[ $# -lt 2 ]]; then
 		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
@@ -177,8 +183,10 @@
 }
 
 src_prepare() {
+	if use nacl; then
 	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
 		native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -296,6 +304,7 @@
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos use_kerberos)
+		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -328,7 +337,7 @@
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -404,6 +413,7 @@
 
 	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
+	if use nacl; then
 	case "$(tc-arch)" in
 		amd64)
 			doexe out/Release/nacl_helper{,_bootstrap} || die
@@ -416,6 +426,7 @@
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 	esac
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
Index: chromium-19.0.1055.1.ebuild
===================================================================
--- chromium-19.0.1055.1.ebuild	(revision 331)
+++ chromium-19.0.1055.1.ebuild	(working copy)
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -55,7 +55,9 @@
 	x11-libs/libXtst
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+	nacl? (
 	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	)
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/simplejson
@@ -73,6 +75,10 @@
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+REQUIRED_USE="
+	arm? ( !nacl )
+"
+
 gyp_use() {
 	if [[ $# -lt 2 ]]; then
 		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
@@ -181,8 +187,10 @@
 }
 
 src_prepare() {
+	if use nacl; then
 	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
 		native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -293,6 +301,7 @@
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos use_kerberos)
+		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -330,7 +339,7 @@
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -404,6 +413,7 @@
 
 	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
+	if use nacl; then
 	case "$(tc-arch)" in
 		amd64)
 			doexe out/Release/nacl_helper{,_bootstrap} || die
@@ -416,6 +426,7 @@
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 	esac
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
Index: chromium-9999-r1.ebuild
===================================================================
--- chromium-9999-r1.ebuild	(revision 331)
+++ chromium-9999-r1.ebuild	(working copy)
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -55,7 +55,9 @@
 	x11-libs/libXtst
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+	nacl? (
 	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	)
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/simplejson
@@ -129,6 +131,10 @@
 	elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${ESVN_WC_REVISION})"
 }
 
+REQUIRED_USE="
+	arm? ( !nacl )
+"
+
 gyp_use() {
 	if [[ $# -lt 2 ]]; then
 		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
@@ -237,8 +243,10 @@
 }
 
 src_prepare() {
+	if use nacl; then
 	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
 		native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -349,6 +357,7 @@
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos use_kerberos)
+		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -386,7 +395,7 @@
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -460,6 +469,7 @@
 
 	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
+	if use nacl; then
 	case "$(tc-arch)" in
 		amd64)
 			doexe out/Release/nacl_helper{,_bootstrap} || die
@@ -472,6 +482,7 @@
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 	esac
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
Index: chromium-18.0.1025.45.ebuild
===================================================================
--- chromium-18.0.1025.45.ebuild	(revision 331)
+++ chromium-18.0.1025.45.ebuild	(working copy)
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -55,7 +55,9 @@
 	x11-libs/libXtst
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+	nacl? (
 	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	)
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/simplejson
@@ -70,6 +72,10 @@
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+REQUIRED_USE="
+	arm? ( !nacl )
+"
+
 gyp_use() {
 	if [[ $# -lt 2 ]]; then
 		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
@@ -178,8 +184,10 @@
 }
 
 src_prepare() {
+	if use nacl; then
 	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
 		native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -306,6 +314,7 @@
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos use_kerberos)
+		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -338,7 +347,7 @@
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -412,6 +421,7 @@
 
 	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
+	if use nacl; then
 	case "$(tc-arch)" in
 		amd64)
 			doexe out/Release/nacl_helper{,_bootstrap} || die
@@ -424,6 +434,7 @@
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 	esac
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
Index: chromium-19.0.1049.3.ebuild
===================================================================
--- chromium-19.0.1049.3.ebuild	(revision 331)
+++ chromium-19.0.1049.3.ebuild	(working copy)
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -55,7 +55,9 @@
 	x11-libs/libXtst
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+	nacl? (
 	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	)
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/simplejson
@@ -70,6 +72,10 @@
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+REQUIRED_USE="
+	arm? ( !nacl )
+"
+
 gyp_use() {
 	if [[ $# -lt 2 ]]; then
 		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
@@ -178,8 +184,10 @@
 }
 
 src_prepare() {
+	if use nacl; then
 	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
 		native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -291,6 +299,7 @@
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos use_kerberos)
+		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -328,7 +337,7 @@
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -402,6 +411,7 @@
 
 	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
+	if use nacl; then
 	case "$(tc-arch)" in
 		amd64)
 			doexe out/Release/nacl_helper{,_bootstrap} || die
@@ -414,6 +424,7 @@
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 	esac
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
Index: chromium-18.0.1025.39.ebuild
===================================================================
--- chromium-18.0.1025.39.ebuild	(revision 331)
+++ chromium-18.0.1025.39.ebuild	(working copy)
@@ -15,7 +15,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -55,7 +55,9 @@
 	x11-libs/libXtst
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+	nacl? (
 	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	)
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/simplejson
@@ -70,6 +72,10 @@
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+REQUIRED_USE="
+	arm? ( !nacl )
+"
+
 gyp_use() {
 	if [[ $# -lt 2 ]]; then
 		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
@@ -178,8 +184,10 @@
 }
 
 src_prepare() {
+	if use nacl; then
 	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
 		native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -303,6 +311,7 @@
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos use_kerberos)
+		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -335,7 +344,7 @@
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -408,6 +417,7 @@
 
 	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
+	if use nacl; then
 	case "$(tc-arch)" in
 		amd64)
 			doexe out/Release/nacl_helper{,_bootstrap} || die
@@ -420,6 +430,7 @@
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 	esac
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then