[patch] chromium 53.0.2785.143 ebuild patch for enabling NaCL

chromium-53.0.2785.143-nacl.patch (text/plain), 18.53 KB, created by Garry Filakhtov on 2016-10-13 12:29:10 UTC

diff --git a/chromium-53.0.2785.143.ebuild b/chromium-53.0.2785.143.ebuild
index 9290132..d9a07d2 100644
--- a/chromium-53.0.2785.143.ebuild
+++ b/chromium-53.0.2785.143.ebuild
@@ -13,13 +13,134 @@ inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multipro
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+SRC_URI="
+https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+nacl? (
+	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib.json -> nacl_x86_newlib_11953a35fcd4f999b097a343bc49d89f94af21a8.json
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib.json -> pnacl_newlib_2eeb54c6995817a39e5c5cc0b40e26518396335f.json
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/shared/pnacl_translator.json -> pnacl_translator_2eeb54c6995817a39e5c5cc0b40e26518396335f.json
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib/core_sdk.tgz.json -> core_sdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz.json
+	https://storage.googleapis.com/nativeclient-archive2/toolchain/11953a35fcd4f999b097a343bc49d89f94af21a8/core_sdk_linux_x86.tgz -> core_sdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib/gdb_i686_linux.tgz.json -> gdb_i686_linux_a9a003c04d06a2ee9f3fbb6223ee31510543bb72.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/gdb_i686_linux_a9a003c04d06a2ee9f3fbb6223ee31510543bb72.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib/naclsdk.tgz.json -> naclsdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz.json
+	https://storage.googleapis.com/nativeclient-archive2/toolchain/11953a35fcd4f999b097a343bc49d89f94af21a8/naclsdk_linux_x86.tgz -> naclsdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/shared/pnacl_translator/sandboxed_translators.tgz.json -> sandboxed_translators_327a0565c0f57d35ec9c61a6aca5204f51c74b51.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/sandboxed_translators_327a0565c0f57d35ec9c61a6aca5204f51c74b51.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/binutils_x86_64_linux.tgz.json -> binutils_x86_64_linux_3190740bb8e6daee6c29dfbc6ab43f0cc8ddd9eb.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/binutils_x86_64_linux_3190740bb8e6daee6c29dfbc6ab43f0cc8ddd9eb.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/binutils_x86_x86_64_linux.tgz.json -> binutils_x86_x86_64_linux_30c4db0a7bc45e907cd34b4975ecfd45503bc60c.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/binutils_x86_x86_64_linux_30c4db0a7bc45e907cd34b4975ecfd45503bc60c.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/compiler_rt_bc_i686_bc.tgz.json -> compiler_rt_bc_i686_bc_71090b27cd8b1715e837612db7bb6ae9884eb9b2.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/compiler_rt_bc_i686_bc_71090b27cd8b1715e837612db7bb6ae9884eb9b2.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/compiler_rt_bc_le32.tgz.json -> compiler_rt_bc_le32_8ffbdf3186f342d7bfbac5d6d213d30d906ce0c8.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/compiler_rt_bc_le32_8ffbdf3186f342d7bfbac5d6d213d30d906ce0c8.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/compiler_rt_bc_x86_64_bc.tgz.json -> compiler_rt_bc_x86_64_bc_835c0d337b0862daabf5f1c90c90acb70250d078.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/compiler_rt_bc_x86_64_bc_835c0d337b0862daabf5f1c90c90acb70250d078.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/core_sdk_libs_i686.tgz.json -> core_sdk_libs_i686_41b8768c99edfa543232f56e455e1d4c81b355b3.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/core_sdk_libs_i686_41b8768c99edfa543232f56e455e1d4c81b355b3.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/core_sdk_libs_le32.tgz.json -> core_sdk_libs_le32_2f086c51e5769760c86b4e852438221afc863018.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/core_sdk_libs_le32_2f086c51e5769760c86b4e852438221afc863018.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/core_sdk_libs_x86_64.tgz.json -> core_sdk_libs_x86_64_bf724780db5b879fe4a41b8fc2c60b0f7e774ecf.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/core_sdk_libs_x86_64_bf724780db5b879fe4a41b8fc2c60b0f7e774ecf.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/driver_x86_64_linux.tgz.json -> driver_x86_64_linux_aebe5000b2daaa6ca9fff580835fa5d5948fdebc.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/driver_x86_64_linux_aebe5000b2daaa6ca9fff580835fa5d5948fdebc.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libcxx_i686.tgz.json -> libcxx_i686_ba67ebc8ed4865c85d28ac3189e36a492fd5906a.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libcxx_i686_ba67ebc8ed4865c85d28ac3189e36a492fd5906a.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libcxx_i686_bc.tgz.json -> libcxx_i686_bc_2ec9472750ffb4ff9714cfa5c17c933f08f63e9a.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libcxx_i686_bc_2ec9472750ffb4ff9714cfa5c17c933f08f63e9a.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libcxx_le32.tgz.json -> libcxx_le32_cd7894ffc6dd897b9549ed5930c4e46cec037de3.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libcxx_le32_cd7894ffc6dd897b9549ed5930c4e46cec037de3.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libcxx_x86_64.tgz.json -> libcxx_x86_64_54d64049fb92ed08573101943a02a52d0d3fda90.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libcxx_x86_64_54d64049fb92ed08573101943a02a52d0d3fda90.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libcxx_x86_64_bc.tgz.json -> libcxx_x86_64_bc_cf9a7da4e44786685120a521f6fbbcece2ea177f.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libcxx_x86_64_bc_cf9a7da4e44786685120a521f6fbbcece2ea177f.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libcxx_x86_64_linux.tgz.json -> libcxx_x86_64_linux_19e47435d179c7bc820f59b3162f6bf721335dd8.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libcxx_x86_64_linux_19e47435d179c7bc820f59b3162f6bf721335dd8.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libgcc_eh_x86_32.tgz.json -> libgcc_eh_x86_32_6dc8bbe08474537602c66fd6db3024b812d91448.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libgcc_eh_x86_32_6dc8bbe08474537602c66fd6db3024b812d91448.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libgcc_eh_x86_64.tgz.json -> libgcc_eh_x86_64_729cfb07fe284ff8deb43d30467ab31a3ae17edd.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libgcc_eh_x86_64_729cfb07fe284ff8deb43d30467ab31a3ae17edd.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_i686.tgz.json -> libs_support_i686_97b91213450f99f7562375aa934779ba98b5d598.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_i686_97b91213450f99f7562375aa934779ba98b5d598.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_i686_bc.tgz.json -> libs_support_i686_bc_a270af9146913a4c0d922f0380a21e61e09e5ea8.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_i686_bc_a270af9146913a4c0d922f0380a21e61e09e5ea8.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_le32.tgz.json -> libs_support_le32_ebaf6761a9ba9d5c3f2693b78efd5988763a712c.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_le32_ebaf6761a9ba9d5c3f2693b78efd5988763a712c.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_translator_x86_32.tgz.json -> libs_support_translator_x86_32_270be6a605f07e051e645d1af63fe2dd7b32543a.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_translator_x86_32_270be6a605f07e051e645d1af63fe2dd7b32543a.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_translator_x86_32_nonsfi.tgz.json -> libs_support_translator_x86_32_nonsfi_e45cd81a7b6432d9c68d222308e8c43f65e86f8d.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_translator_x86_32_nonsfi_e45cd81a7b6432d9c68d222308e8c43f65e86f8d.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_translator_x86_64.tgz.json -> libs_support_translator_x86_64_ae6ca014ebc54ae04f398324eff54f2492330c3f.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_translator_x86_64_ae6ca014ebc54ae04f398324eff54f2492330c3f.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_x86_64.tgz.json -> libs_support_x86_64_2c339a4b13ae5a3bc6dce14f78a9ed405960fce7.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_x86_64_2c339a4b13ae5a3bc6dce14f78a9ed405960fce7.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/libs_support_x86_64_bc.tgz.json -> libs_support_x86_64_bc_96a311b617562f6035ddebddcfa8ef57955f4d63.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/libs_support_x86_64_bc_96a311b617562f6035ddebddcfa8ef57955f4d63.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/llvm_x86_64_linux.tgz.json -> llvm_x86_64_linux_d97c85063737d4200bd6d6a4b6d95a3e360a1351.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/llvm_x86_64_linux_d97c85063737d4200bd6d6a4b6d95a3e360a1351.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/metadata.tgz.json -> metadata_a652799f4f3de9d359878ef52c6624424b411557.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/metadata_a652799f4f3de9d359878ef52c6624424b411557.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/newlib_i686.tgz.json -> newlib_i686_bc57b675ba76cde66ad58810c2fb64fbbc888b50.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/newlib_i686_bc57b675ba76cde66ad58810c2fb64fbbc888b50.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/newlib_i686_bc.tgz.json -> newlib_i686_bc_665d891237ad05188343e99663ae22d6af07378b.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/newlib_i686_bc_665d891237ad05188343e99663ae22d6af07378b.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/newlib_le32.tgz.json -> newlib_le32_c6642a55a464c9ee71b8c38117dccb83781a8db6.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/newlib_le32_c6642a55a464c9ee71b8c38117dccb83781a8db6.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/newlib_x86_64.tgz.json -> newlib_x86_64_4d77590618780ad27f9d02be457cf5d402fea69a.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/newlib_x86_64_4d77590618780ad27f9d02be457cf5d402fea69a.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/newlib_x86_64_bc.tgz.json -> newlib_x86_64_bc_a90b5589e73df4fac7557f083e82c3f9a0d4da2e.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/newlib_x86_64_bc_a90b5589e73df4fac7557f083e82c3f9a0d4da2e.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/unsandboxed_runtime_x86_32_linux.tgz.json -> unsandboxed_runtime_x86_32_linux_7e9469b5ebd96e40ea3f7b0de93c2361ad06ece3.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/unsandboxed_runtime_x86_32_linux_7e9469b5ebd96e40ea3f7b0de93c2361ad06ece3.tgz
+
+	https://storage.googleapis.com/nativeclient-archive2/builds/2eeb54c6995817a39e5c5cc0b40e26518396335f/linux_x86/pnacl_newlib/unsandboxed_runtime_x86_64_linux.tgz.json -> unsandboxed_runtime_x86_64_linux_39cd59ce6be14ee949c9f430947bd393fb6182e8.tgz.json
+	https://storage.googleapis.com/nativeclient-once/object/unsandboxed_runtime_x86_64_linux_39cd59ce6be14ee949c9f430947bd393fb6182e8.tgz
+)
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos nacl neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) arm? ( !nacl ) arm64? ( !nacl )"
 
 # TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
 REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc )"
@@ -186,6 +307,62 @@ pkg_setup() {
 	chromium_suid_sandbox_check_kernel_config
 }
 
+src_unpack() {
+	unpack ${P}.tar.xz
+
+	if use nacl; then
+		local toolchains
+		# for NaCL we have to place toolchain JSON metadata files into appropriate place
+		# so download_nacl_toolchains.py can find and use them for archives extraction
+		for jsonfile in $DISTDIR/*.json; do
+			case $jsonfile in
+				*.tgz.json) ;; # Skip per-package metadata
+
+				*.json) # create symlinks and directories for toolchain metadata JSON files
+					jsonfile=${jsonfile##*/}
+					local toolchain=${jsonfile%_*}
+					toolchains="${toolchains} ${toolchain}"
+
+					mkdir -p ${S}/native_client/toolchain/.tars/linux_x86/${toolchain} &&
+					ln -s ${DISTDIR}/${jsonfile} ${S}/native_client/toolchain/.tars/linux_x86/${toolchain}.json ||
+					die
+				;;
+			esac
+		done
+
+		for jsonfile in ${DISTDIR}/*.tgz.json; do
+			# getting package hash from JSON file to use it as a destination tar name
+			local tgzhash
+			tgzhash=$( grep '"hash"' $jsonfile ) || die
+			tgzhash=${tgzhash%\"*}
+			tgzhash=${tgzhash##*\"}
+			# stripping path components from JSON file
+			jsonfile=${jsonfile##*/}
+			# original tar archive name
+			local distfile=${jsonfile%.json}
+			# tar archive name without revision hash
+			local tgzname=${distfile%_*.tgz}.tgz
+			# checking toolchain name this package belongs to
+			local jsondest
+			jsondest=$( grep -l "$tgzname" ${S}/native_client/toolchain/.tars/linux_x86/*.json ) || die
+			jsondest=${jsondest%.json}
+			jsondest=${jsondest##*/}
+			# placing everything into appropriate places
+			mkdir -p ${S}/native_client/toolchain/.tars/package_archives/${tgzname} &&
+			ln -s ${DISTDIR}/${distfile} ${S}/native_client/toolchain/.tars/package_archives/${tgzname}/${tgzhash}.tgz &&
+			ln -s ${DISTDIR}/${jsonfile} ${S}/native_client/toolchain/.tars/linux_x86/${jsondest}/${tgzname}.json ||
+			die
+		done
+
+		# Use download_nacl_toolchains.py to extract archives
+		cd $S || die
+		for toolchain in $toolchains; do
+			python build/download_nacl_toolchains.py --packages $toolchain extract --skip-missing || die
+		done
+		cd $WORKDIR || die
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
 	epatch "${FILESDIR}/${PN}-system-jinja-r11.patch"
@@ -320,6 +497,8 @@ src_prepare() {
 		'url/third_party/mozilla' \
 		'v8/src/third_party/fdlibm' \
 		'v8/src/third_party/valgrind' \
+		'base/third_party/libevent' \
+		'native_client/src/third_party/dlmalloc' \
 		--do-remove || die
 }
 
@@ -334,9 +513,13 @@ src_configure() {
 	# additions, bug #336871.
 	myconf_gyp+=" -Ddisable_sse2=1"
 
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gyp+=" -Ddisable_nacl=1"
-	myconf_gn+=" enable_nacl=false"
+	if use nacl ; then
+		myconf_gyp+=" -Ddisable_glibc=1"
+		myconf_gn+=" enable_glibc=false"
+	else
+		myconf_gyp+=" -Ddisable_nacl=1"
+		myconf_gn+=" enable_nacl=false"
+	fi
 
 	# Make it possible to remove third_party/adobe.
 	echo > "${T}/flapper_version.h" || die
@@ -622,12 +805,12 @@ src_install() {
 	doexe out/Release/chromedriver || die
 	use widevine && doexe out/Release/libwidevinecdmadapter.so
 
-	# 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
 
 	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
 	if [[ -n ${CHROMIUM_SUFFIX} ]]; then