dev-util/electron: Drop old versions.

Old Electron versions have no in-tree users, and have build and security
issues.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

35 files changed, 0 insertions, 5004 deletions

diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index dd3dfca18bd7..c0d9527ce573 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -1,16 +1,6 @@
-DIST asar-0.12.1.tar.gz 1016626 BLAKE2B f3e2bee6e844fffcc19150f96cf4b20b5f6bf398d9c4c89f0527ded20478ad100e9fd1eadb3685ad05853b07b0e084c8cdcf99bb0d646e7f7acdcd9e3e9ec3cf SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7
 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
-DIST brightray-8dbaeed37b9c4fb8ae985670b142f659bb265fb4.tar.gz 76965 BLAKE2B 1705aecfbfa19f20136133f4ed35d0d2a4c6e8157591440954274202110ae73fac67047c9e432f81ec9572b1cc8fc9bacfa4c3251385e46d743ed326156a77fd SHA512 eb0ad05107ebfb4151fb0f26f7dbea58c353cde0407c13ea00c7b98487fb29582d5f3e334900749dc43c8aeca828d8885c4d77dff6739de97ec19b33017a6e93
-DIST brightray-9bc1d21b69ac99bed546d42035dc1205ea6b04af.tar.gz 74416 BLAKE2B 2c72c8fc77f607f6b0ae2c34ac273d9209cfbed9dc6d71bd0ab87291f843518024eb89cec2a54e0c1f53da5eb41c02a1c4a4ead6d471c946660ac0691be7e785 SHA512 c7a16f3634111a43d45959e0406488dc7417848403a6261204b58f67d62688f888f733ca23f3eac3a2dc76955c185ce845d63a6dc1e5a0fba54fb115202414d0
-DIST brightray-ee26c5218eeec199c54c92a7517a72d2dbd0adbf.tar.gz 82375 BLAKE2B 5677ea1c8f3be4bd656bfe0ec4995c903df1fab1a0bc9d5b8a80e83e82713dd2b528adcf7bd1b33ca76104bc340fe48a2ae01a36bd8e204fd12240b8d7116b3e SHA512 7595f5a168d40c42687b8013b588e9c74d6f0047e71549a32d892fa3ca9de9d467303e635364bd779e94094aa9772b705ac027aad481b40d42c0c039ce8f3709
 DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
-DIST chromium-47.0.2526.110.tar.xz 394673276 BLAKE2B 62a4ef2d74be9b566c59c13aede42d92afe443b155c9a7b793c78e9618a82868d7bdcaad8edbd6662792c6c73292167cc5dfda4825b0fc3ff6b282ad20e53340 SHA512 d1655e822776567101632696c7817067e9a85c0f74df22ea40b8fcb45b9571471d8bb1291bae4dd879d746ddb57206276db8df92ccb546bb00129bc26bb33bb8
-DIST chromium-49.0.2623.75.tar.xz 452264916 BLAKE2B 723dd3bc09184690724a7380f2f6e98f9e64b9d77bace85dca49d80734cc63952c3fe80446bd6bc4daf743e9f16f4390884b2d556aaaf355f17637bbedc5d73a SHA512 694f0ccd0a4ff10d8b19e52defb48f6d47daeaa47013f01c2924251f3c6ebaccb20813379c3b7dd6fd939138f25122ed7d1a56e1a6b80309aca65b6c854768fa
-DIST chromium-52.0.2743.82.tar.xz 458110272 BLAKE2B bd255c6f4924cdcd2c17ea5d3c8fc14be95d6f49555c98164a5bfe6f76a9cca2dc49e32ef64f1b8c503092fcfd1c1bf231aabab946eb5a5149c57ca33e5e3be8 SHA512 9bba841cb726bfa06888deefacfcee628e36d25de47dd0303d3fd1ce2f07922148d60befe934f44c33fcdfed6ce3dadfb9e3ee0828b66994807178a488051806
 DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
-DIST electron-0.36.12.tar.gz 3068567 BLAKE2B 8bec70aeb2fbf551bd2dfcc45b7ce18c19c1b7474b2c4d9d39fae765736e1e3a55371c7b9f2b1a31316f302b926c5c88cc0d9293ba62d3ddbfdb615dd2c15e27 SHA512 37d016768e57f81b01338cea6d0d5eaa6ea72d83a2122b54c9c73e37b0afc7fb8351b0cb846afda29206379d5625657b815b002c2eb3c31babcd0cffa47ae3de
-DIST electron-0.37.8.tar.gz 3154625 BLAKE2B 3f1359560d555951b0f0f4d481449ec2676d53db2d135017bb6d57a6595a6b41eab3307fbca91106dc53bec463153205aa4495f092a10b16f27105beb2f1b512 SHA512 1469129cc6e07da2540ab67d2bb9e2dec4055da77b35bf0abf86a70e82e3ccf443e75edb25feac6c8855c5e841592738319e1a81a52d504e90a5ce9197153754
-DIST electron-1.3.13.tar.gz 4560040 BLAKE2B 1ef5a52547828427eba6ed8b85e50ba2405658ccfce6bb27af32f380c8122e12c7f69115321f961948cf9f4ba8af6a4f04945a2c45d4dd82169f876d06a9d3e9 SHA512 c15b8303e1a18674fd828991a118bf670ccd052b35cac7d476b06e7903055fa905a93a79dced4186c70d30c7d220a3b7daa2a4f490b70c87134fbc393d54d94d
 DIST electron-1.6.15.tar.gz 4943663 BLAKE2B 867964e23bea77b0892febcc47198bf783f0021df842c40c94c2159abca75ca45cac345323bb2735a9ddc935bedba62126d5afe9ad9e0fc031abefbaf444d441 SHA512 e6e7519db6d272d151e5618976a69feb11c35f1845561d152c64b474696f3835644b232b020df00166f80913b2c492e6e8cefce1a96494a2bb92096936e18958
 DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
 DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
@@ -18,14 +8,5 @@ DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz
 DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86
 DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
 DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
-DIST electron-node-6bcd8af891a991f8aa196e49e6bf908ebbe24cae.tar.gz 36600837 BLAKE2B afe210292b84c71b0859c790cadc60e894e8a2531d0fcea8ba60a70c7a2a937d09056647a0e6862eb710a7196f2eb9fd8d7a9be01b4b6eba4c5388aad687afe2 SHA512 7fcafa01027bd68794a7cd2f049a7bdf45e1dd56622583bd5d53d662328e64619dd5dbeec295ff559b1b268e90bf6abf3d76cd6d00f055602bbaa7443e3a3450
 DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
-DIST electron-node-a507a3c3816d6ac085ed46250c489a3d76ab8b3c.tar.gz 36578658 BLAKE2B 26d803a0e3e392a626d871af0cd2928b1ddc2a20e963c872e6b83c13222512ee455a91a0c2e1541aa21235681bb53ec874c5e05f5577cb07b7e15092ff5d72b3 SHA512 a5b62c05ec7300a26b3feab3c1e796a87691d41fa7c039541574878491df51e9075685abc5d630fc62bca95bf821eeede041d4ab36caedaf76156844f1095ea6
-DIST electron-node-c47e9bf9011de682d07c82f7f610a467f30cca60.tar.gz 44172045 BLAKE2B 4c9bb3df3366e01347e527df9aba1fe57bfcda1fb0542e5c0a84c924094965a05d7cfa1be336a29ac6562e9a1eaafce3df015ee27a3df7f032bb2c2a20a6aa78 SHA512 830cb5e4aa1956d0f67b0c5ad44241254596791b3bbc533a170b1b7bcb7a45137ff62b885a65a78a64323ad94f660c6b75142109d79256420b8d20a7d26acff7
 DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
-DIST libchromiumcontent-27add4cfef98f21d5910539bebb47ae175f024c2.tar.gz 403724 BLAKE2B 126cd5ae76be99268a8f4c765a2efae325a56e43c8d6ae171e8d1a4f1f872358bcbc3004e8abf77826cd6cc15dd3e3bf212b2300d9247fe6fc724f21de193db0 SHA512 7995fe40100b91f57ccc8fde445f136fda62d2c88a8a06d1b07aa588bcdb27905a542d62ec9cdf567b626439d8648fc749b73d7e9f52deaa94ead27e191a732f
-DIST libchromiumcontent-60c7ec9f9bf465a8c9c7ccc3fcd2aa1cdf644bac.tar.gz 402072 BLAKE2B 908a54450a4a39b37be08e5926b808f29111214a36bb8d91c8c24d31e53cac7ac38b19508e942586e9338267096ab7e1395de2773e46721029dc6ba004ac9875 SHA512 ddd52e58df1848edab6c514e0ef8e4155eccec6bec9d4e557dc0ee7d5c2cc4036f25d1786376b5b47a5122a266f00cd589ce665b8463549e9383d60292d180dc
-DIST libchromiumcontent-ad63d8ba890bcaad2f1b7e6de148b7992f4d3af7.tar.gz 400648 BLAKE2B a0a1d0335bb0155d1c531d5949d96776e954e52ff57086a79ed46e93912748e1d51fd806f7cb3115c65bccb15ed7602dac2b63d11e9daba762f08af47eea3c6e SHA512 5fcb5e3dd98d5875ff7aa9f9f4d02af45487534d0301ca7a0a7adde934f528fedc3dfaf886b9031027e41309eb8ba658b72a56af4ad8dc44cce458b9c04a0e47
-DIST native-mate-0df2d882ea2286e6335f206b7002037fce66c4a5.tar.gz 23738 BLAKE2B f0408715bf85dd087278cd04860ab3f377f5008ff28b05831c960c9cc3a345125639fa0593fd27a02fe3fde217ae3a4f5d0c22a02625f512ff9b62121c581aac SHA512 fdd928a4b170636320e6cfd65753aec47c38380ef6f1b6dde255fbdcf3756abe8568e689e1214d768056187b243f979f16d4289ce8429a5ddd17b07f806ef731
-DIST native-mate-b5e5de626c6a57e44c7e6448d8bbaaac475d493c.tar.gz 23465 BLAKE2B 2d4e5ab06c8fe49188db2b339a5a5a102043fe2a7f21930e2eca5504a159192fdf2ca90fdf5c895ed9a942e512684f20112d26ed7bbc4a7e16d694632482413b SHA512 d004f4ec3ca77d98b2b2bc271c830b769bb6396e70d8dbf25ede87c509ce95dea083d6e5b3d050647cdf3d0a6a21c6da91176eba90d7256ab80f5d23248a6bb1
-DIST native-mate-e719eab878c264bb03188d0cd6eb9ad6882bc13a.tar.gz 23818 BLAKE2B 325a37525d9eefe739a93c8fb051f369ff73e1f8aecf0996683ff5276508535e96b551a1a595f47bf71911068f9fe3baaed38aa48853ae52671d9af1e2f5be4b SHA512 4272648127fb0bf90b36d2c090bea718d560737c1c7443a5b3c0de12999ffe607429b2112ecee36ece5d26cde54e78964303250ffd350a19c132c9733b72c523
diff --git a/dev-util/electron/electron-0.36.12-r5.ebuild b/dev-util/electron/electron-0.36.12-r5.ebuild
deleted file mode 100644
index 8dfee5f2d5e4..000000000000
--- a/dev-util/electron/electron-0.36.12-r5.ebuild
+++ /dev/null
@@ -1,740 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="47.0.2526.110"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="9bc1d21b69ac99bed546d42035dc1205ea6b04af"
-# Keep this in sync with vendor/node
-NODE_COMMIT="a507a3c3816d6ac085ed46250c489a3d76ab8b3c"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="e719eab878c264bb03188d0cd6eb9ad6882bc13a"
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="ad63d8ba890bcaad2f1b7e6de148b7992f4d3af7"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.12.1"
-
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electron.atom.io/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> ${BRIGHTRAY_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> ${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> ${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-"
-
-S="${WORKDIR}/${CHROMIUM_P}"
-ELECTRON_S="${WORKDIR}/${P}"
-NODE_S="${S}/vendor/node"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE="custom-cflags cups gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND="!<dev-util/electron-0.36.12-r4
-	>=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	>=app-eselect/eselect-electron-1.0.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-0.9.41:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsmin[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/jsmin[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				   "limit to be no less than ${lto_n_rlimit_min}."
-		    eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="5G"
-	CHECKREQS_DISK_BUILD="10G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/" relpath out
-
-	for f in $(find "${_s}" -mindepth 2 -name *.patch -printf \"%P\"\\n); do
-		relpath="$(dirname ${f})"
-		out="${_s}/${relpath////_}_$(basename ${f})"
-		sed -r -e "s|^([-+]{3}) (.*)$|\1 ${relpath}/\2 ${f}|g" > "${out}"
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-src_prepare() {
-	# Merge Electron code and its submodules into the Chromium source tree
-	# so that everything can be configured and built in a single pass.
-	#
-	rsync -a --ignore-existing "${ELECTRON_S}/" "${S}/" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BRIGHTRAY_S}" &&
-		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rm -r "${S}/vendor/breakpad" &&
-		ln -s "../breakpad" "${S}/vendor/breakpad" || die
-	ln -s "${WORKDIR}/${ASAR_P}/node_modules" "${S}/node_modules" || die
-
-	# electron patches
-	epatch "${FILESDIR}/${P}.patch"
-
-	# node patches
-	cd "${NODE_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-node.patch"
-	epatch "${FILESDIR}/electron-vendor-node-external-snapshots-r0.patch"
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s ../../../v8 deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# brightray patches
-	cd "${BRIGHTRAY_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-brightray.patch"
-
-	# libcc patches
-	cd "${LIBCC_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-libchromiumcontent.patch"
-
-	# chromium patches
-	cd "${S}" || die
-	epatch "${FILESDIR}/chromium-system-ffmpeg-r0.patch"
-	epatch "${FILESDIR}/chromium-system-jinja-r7.patch"
-	epatch "${FILESDIR}/chromium-disable-widevine.patch"
-	epatch "${FILESDIR}/chromium-remove-gardiner-mod-font.patch"
-	epatch "${FILESDIR}/chromium-shared-v8.patch"
-	epatch "${FILESDIR}/chromium-lto-fixes.patch"
-	epatch "${FILESDIR}/chromium-cups-fix.patch"
-
-	# libcc chromium patches
-	_unnest_patches "${LIBCC_S}/patches"
-
-	EPATCH_SOURCE="${LIBCC_S}/patches" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="third_party_icu*" \
-	EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \
-		epatch
-
-	# build scripts
-	mkdir -p "${S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${S}/tools/" || die
-
-	local conditional_bundled_libraries=""
-	if ! use system-ffmpeg; then
-		conditional_bundled_libraries+=" third_party/ffmpeg"
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		${conditional_bundled_libraries} \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx_new' \
-		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	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"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use kerberos)
-		$(gyp_use lto)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gyp.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd vendor/node > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --shared-libuv cannot be used as electron's node fork
-	# patches uv_loop structure.
-	./configure --shared-openssl --shared-http-parser \
-				--shared-zlib --without-npm --with-intl=system-icu \
-				--without-dtrace --dest-cpu=${target_arch} \
-				--prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf+=" -Dcomponent=static_library"
-	myconf+=" -Dmac_mas_build=0"
-	myconf+=' -Dicu_small="false"'
-	myconf+=" -Dlibchromiumcontent_component=0"
-	myconf+=" -Dlibrary=static_library"
-	myconf+=" -Dmas_build=0"
-
-	einfo "Configuring electron..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-
-	myconf+=" -Ivendor/node/config.gypi
-			  -Icommon.gypi
-			  atom.gyp"
-
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="electron" compile_target="out/R"
-
-	eninja -C ${compile_target} mksnapshot || die
-	pax-mark -m ${compile_target}/mksnapshot
-
-	eninja -C ${compile_target} nodebin || die
-	pax-mark -m ${compile_target}/nodebin
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C ${compile_target} ${ninja_targets} || die
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doins out/R/libv8.so
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libv8.so" "${install_dir}/libnode.so"
-	doins out/R/content_shell.pak
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	rm -r out/R/resources/inspector || die
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	eselect electron update
-}
-
-pkg_prerm() {
-	eselect electron update
-}
diff --git a/dev-util/electron/electron-0.37.8-r2.ebuild b/dev-util/electron/electron-0.37.8-r2.ebuild
deleted file mode 100644
index d4bf4ae0d2f4..000000000000
--- a/dev-util/electron/electron-0.37.8-r2.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils flag-o-matic multilib multiprocessing \
-	pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs \
-	versionator virtualx
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="49.0.2623.75"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="8dbaeed37b9c4fb8ae985670b142f659bb265fb4"
-# Keep this in sync with vendor/node
-NODE_COMMIT="6bcd8af891a991f8aa196e49e6bf908ebbe24cae"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="0df2d882ea2286e6335f206b7002037fce66c4a5"
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="60c7ec9f9bf465a8c9c7ccc3fcd2aa1cdf644bac"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.12.1"
-
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electron.atom.io/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> ${BRIGHTRAY_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> ${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> ${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-"
-
-S="${WORKDIR}/${CHROMIUM_P}"
-ELECTRON_S="${WORKDIR}/${P}"
-NODE_S="${S}/vendor/node"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE="custom-cflags cups debug gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND="!<dev-util/electron-0.36.12-r4
-	>=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	>=app-eselect/eselect-electron-1.0.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-0.9.41:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsmin[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/jsmin[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				   "limit to be no less than ${lto_n_rlimit_min}."
-		    eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="5G"
-	CHECKREQS_DISK_BUILD="10G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/" relpath out
-
-	for f in $(find "${_s}" -mindepth 2 -name *.patch -printf \"%P\"\\n); do
-		relpath="$(dirname ${f})"
-		out="${_s}/${relpath////_}_$(basename ${f})"
-		sed -r -e "s|^([-+]{3}) (.*)$|\1 ${relpath}/\2 ${f}|g" > "${out}"
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-src_prepare() {
-	# Merge Electron code and its submodules into the Chromium source tree
-	# so that everything can be configured and built in a single pass.
-	#
-	rsync -a --ignore-existing "${ELECTRON_S}/" "${S}/" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BRIGHTRAY_S}" &&
-		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rm -r "${S}/vendor/breakpad" &&
-		ln -s "../breakpad" "${S}/vendor/breakpad" || die
-	ln -s "${WORKDIR}/${ASAR_P}/node_modules" "${S}/node_modules" || die
-
-	# electron patches
-	epatch "${FILESDIR}/${P}.patch"
-
-	# node patches
-	cd "${NODE_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-node.patch"
-	epatch "${FILESDIR}/electron-vendor-node-external-snapshots-r0.patch"
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s ../../../v8 deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# brightray patches
-	cd "${BRIGHTRAY_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-brightray.patch"
-
-	# libcc patches
-	cd "${LIBCC_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-libchromiumcontent.patch"
-
-	# chromium patches
-	cd "${S}" || die
-	epatch "${FILESDIR}/chromium-system-ffmpeg-r2.patch"
-	epatch "${FILESDIR}/chromium-system-jinja-r7.patch"
-	epatch "${FILESDIR}/chromium-disable-widevine.patch"
-	epatch "${FILESDIR}/chromium-last-commit-position-r0.patch"
-	epatch "${FILESDIR}/chromium-snapshot-toolchain-r1.patch"
-	epatch "${FILESDIR}/chromium-remove-gardiner-mod-font.patch"
-	epatch "${FILESDIR}/chromium-shared-v8.patch"
-	epatch "${FILESDIR}/chromium-lto-fixes.patch"
-	epatch "${FILESDIR}/chromium-icu-58-r0.patch"
-	epatch "${FILESDIR}/chromium-cups-fix.patch"
-
-	# libcc chromium patches
-	_unnest_patches "${LIBCC_S}/patches"
-
-	EPATCH_SOURCE="${LIBCC_S}/patches" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="third_party_icu*" \
-	EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \
-		epatch
-
-	# build scripts
-	mkdir -p "${S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${S}/tools/" || die
-
-	local conditional_bundled_libraries=""
-	if ! use system-ffmpeg; then
-		conditional_bundled_libraries+=" third_party/ffmpeg"
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		${conditional_bundled_libraries} \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/angle/src/third_party/murmurhash' \
-		'third_party/angle/src/third_party/trace_event' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/third_party/py_vulcanize' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx_new' \
-		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/re2' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/woff2' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	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"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use kerberos)
-		$(gyp_use lto)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gyp.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd vendor/node > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --shared-libuv cannot be used as electron's node fork
-	# patches uv_loop structure.
-	./configure --shared-openssl --shared-http-parser \
-				--shared-zlib --without-npm --with-intl=system-icu \
-				--without-dtrace --dest-cpu=${target_arch} \
-				--prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf+=" -Dcomponent=static_library"
-	myconf+=" -Dmac_mas_build=0"
-	myconf+=' -Dicu_small="false"'
-	myconf+=" -Dlibchromiumcontent_component=0"
-	myconf+=" -Dlibrary=static_library"
-	myconf+=" -Dmas_build=0"
-
-	einfo "Configuring electron..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-
-	myconf+=" -Ivendor/node/config.gypi
-			  -Icommon.gypi
-			  electron.gyp"
-
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="electron" compile_target="out/R"
-
-	eninja -C ${compile_target} mksnapshot || die
-	pax-mark -m ${compile_target}/mksnapshot
-
-	eninja -C ${compile_target} nodebin || die
-	pax-mark -m ${compile_target}/nodebin
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C ${compile_target} ${ninja_targets} || die
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doins out/R/libv8.so
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libv8.so" "${install_dir}/libnode.so"
-	doins out/R/content_shell.pak
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	rm -r out/R/resources/inspector || die
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	pax-mark -rm "${ED}/${install_dir}/electron"
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	eselect electron update
-}
-
-pkg_prerm() {
-	eselect electron update
-}
diff --git a/dev-util/electron/electron-1.3.13-r1.ebuild b/dev-util/electron/electron-1.3.13-r1.ebuild
deleted file mode 100644
index c00fd0f61608..000000000000
--- a/dev-util/electron/electron-1.3.13-r1.ebuild
+++ /dev/null
@@ -1,763 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib \
-	multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 \
-	toolchain-funcs versionator virtualx xdg-utils
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="52.0.2743.82"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="ee26c5218eeec199c54c92a7517a72d2dbd0adbf"
-# Keep this in sync with vendor/node
-NODE_COMMIT="c47e9bf9011de682d07c82f7f610a467f30cca60"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="b5e5de626c6a57e44c7e6448d8bbaaac475d493c"
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="27add4cfef98f21d5910539bebb47ae175f024c2"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.12.1"
-
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electron.atom.io/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> ${BRIGHTRAY_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> ${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> ${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-"
-
-S="${WORKDIR}/${CHROMIUM_P}"
-ELECTRON_S="${WORKDIR}/${P}"
-NODE_S="${S}/vendor/node"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE="custom-cflags cups gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND="!<dev-util/electron-0.36.12-r4
-	>=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	>=app-eselect/eselect-electron-1.0.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/icu-55.1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-0.9.41:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jsmin[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/jsmin[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				   "limit to be no less than ${lto_n_rlimit_min}."
-		    eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="5G"
-	CHECKREQS_DISK_BUILD="10G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/" relpath out
-
-	for f in $(find "${_s}" -mindepth 2 -name *.patch -printf \"%P\"\\n); do
-		relpath="$(dirname ${f})"
-		out="${_s}/${relpath////_}_$(basename ${f})"
-		sed -r -e "s|^([-+]{3}) (.*)$|\1 ${relpath}/\2 ${f}|g" > "${out}"
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-src_prepare() {
-	# Merge Electron code and its submodules into the Chromium source tree
-	# so that everything can be configured and built in a single pass.
-	#
-	rsync -a --ignore-existing "${ELECTRON_S}/" "${S}/" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BRIGHTRAY_S}" &&
-		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rm -r "${S}/vendor/breakpad" &&
-		ln -s "../breakpad" "${S}/vendor/breakpad" || die
-	ln -s "${WORKDIR}/${ASAR_P}/node_modules" "${S}/node_modules" || die
-
-	# electron patches
-	epatch "${FILESDIR}/${PN}-1.3.6.patch"
-
-	# node patches
-	cd "${NODE_S}" || die
-	epatch "${FILESDIR}/${P}-vendor-node.patch"
-	epatch "${FILESDIR}/electron-vendor-node-external-snapshots-r0.patch"
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s ../../../v8 deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# brightray patches
-	cd "${BRIGHTRAY_S}" || die
-	epatch "${FILESDIR}/${PN}-1.3.6-vendor-brightray.patch"
-
-	# libcc patches
-	cd "${LIBCC_S}" || die
-	epatch "${FILESDIR}/${PN}-1.3.6-vendor-libchromiumcontent.patch"
-
-	# chromium patches
-	cd "${S}" || die
-	epatch "${FILESDIR}/chromium-system-ffmpeg-r2.patch"
-	epatch "${FILESDIR}/chromium-disable-widevine.patch"
-	epatch "${FILESDIR}/chromium-last-commit-position-r0.patch"
-	epatch "${FILESDIR}/chromium-snapshot-toolchain-r1.patch"
-	epatch "${FILESDIR}/chromium-remove-gardiner-mod-font.patch"
-	epatch "${FILESDIR}/chromium-pdfium-r0.patch"
-	epatch "${FILESDIR}/chromium-system-zlib-r0.patch"
-	epatch "${FILESDIR}/chromium-linker-warnings-r0.patch"
-	epatch "${FILESDIR}/chromium-ffmpeg-license-r0.patch"
-	epatch "${FILESDIR}/chromium-shared-v8-r1.patch"
-	epatch "${FILESDIR}/chromium-lto-fixes-r1.patch"
-	epatch "${FILESDIR}/chromium-icu-58-r1.patch"
-	epatch "${FILESDIR}/chromium-cups-fix.patch"
-	# libcc chromium patches
-	_unnest_patches "${LIBCC_S}/patches"
-
-	EPATCH_SOURCE="${LIBCC_S}/patches" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="third_party_icu*" \
-	EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \
-		epatch
-
-	# build scripts
-	mkdir -p "${S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${S}/tools/" || die
-
-	local conditional_bundled_libraries=""
-	if ! use system-ffmpeg; then
-		conditional_bundled_libraries+=" third_party/ffmpeg"
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		${conditional_bundled_libraries} \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'breakpad/src/third_party/musl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/angle/src/third_party/libXNVCtrl' \
-		'third_party/angle/src/third_party/murmurhash' \
-		'third_party/angle/src/third_party/trace_event' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/third_party/py_vulcanize' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jinja2' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libjpeg_turbo' \
-		'third_party/libphonenumber' \
-		'third_party/libpng' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libwebm' \
-		'third_party/libxml/chromium' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/markupsafe' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mt19937ar' \
-		'third_party/openh264' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/libpng16' \
-		'third_party/pdfium/third_party/libtiff' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/ply' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/protobuf/third_party/six' \
-		'third_party/qcms' \
-		'third_party/re2' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/woff2' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	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"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-	myconf+=" -Dgenerate_character_data=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use kerberos)
-		$(gyp_use lto)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf+=" -Dgoogle_api_key=${google_api_key}
-		-Dgoogle_default_client_id=${google_default_client_id}
-		-Dgoogle_default_client_secret=${google_default_client_secret}"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf_gyp+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf_gyp+=" -Darmv7=1"
-		else
-			myconf_gyp+=" -Darmv7=0"
-		fi
-		myconf_gyp+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 \
-						 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gyp.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd vendor/node > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --shared-libuv cannot be used as electron's node fork
-	# patches uv_loop structure.
-	./configure --shared --without-bundled-v8 --shared-openssl \
-				--shared-http-parser --shared-zlib --without-npm \
-				--with-intl=system-icu --without-dtrace \
-				--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf+=" -Dcomponent=static_library"
-	myconf+=" -Dmac_mas_build=0"
-	myconf+=' -Dicu_small="false"'
-	myconf+=" -Dlibchromiumcontent_component=0"
-	myconf+=" -Dlibrary=static_library"
-	myconf+=" -Dmas_build=0"
-
-	einfo "Configuring electron..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-
-	myconf+=" -Ivendor/node/config.gypi
-			  -Icommon.gypi
-			  electron.gyp"
-
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="electron" compile_target="out/R"
-
-	eninja -C ${compile_target} mksnapshot || die
-	pax-mark -m ${compile_target}/mksnapshot
-
-	eninja -C ${compile_target} nodebin || die
-	pax-mark -m ${compile_target}/nodebin
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C ${compile_target} ${ninja_targets} || die
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doins out/R/libv8.so
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libv8.so" "${install_dir}/libnode.so"
-	doins out/R/content_shell.pak
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	rm -r out/R/resources/inspector || die
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	pax-mark -rm "${ED}/${install_dir}/electron"
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	eselect electron update
-}
-
-pkg_prerm() {
-	eselect electron update
-}
diff --git a/dev-util/electron/files/chromium-cups-fix.patch b/dev-util/electron/files/chromium-cups-fix.patch
deleted file mode 100644
index bbd462a8081e..000000000000
--- a/dev-util/electron/files/chromium-cups-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-index 8bacfd7..b469a1c 100644
---- a/printing/backend/print_backend_cups.cc
-+++ b/printing/backend/print_backend_cups.cc
-
-@@ -4,6 +4,7 @@
- 
- #include "printing/backend/print_backend_cups.h"
- 
-+#include <cups/ppd.h>
- #include <dlfcn.h>
- #include <errno.h>
- #include <pthread.h>
diff --git a/dev-util/electron/files/chromium-ffmpeg-license-r0.patch b/dev-util/electron/files/chromium-ffmpeg-license-r0.patch
deleted file mode 100644
index 8e44cbdbb0ac..000000000000
--- a/dev-util/electron/files/chromium-ffmpeg-license-r0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3c9d5afe45bf1c4656b8f630525433f29017cd08 Mon Sep 17 00:00:00 2001
-From: Chris Cunningham <chcunningham@chromium.org>
-Date: Tue, 21 Jun 2016 10:52:45 -0700
-Subject: [PATCH] Avoid ffmpeg licences/credits checking generated autorename_ files.
-
-We generated these renames as a fix for http://crbug.com/495833. The
-generated rename contains no license or credits info and should be
-skipped to avoid confusing license/credits scripts. Care must be
-taken to not also skip the underlying include file from upstream ffmpeg.
-
-Found by: Zoltan Kuscsik
-
-BUG=495833
-
-Change-Id: I3359f4de0281b5f057d4b109ab2a4f31895b5cb1
----
-
-diff --git a/chromium/scripts/generate_gyp.py b/chromium/scripts/generate_gyp.py
-index c3fd3c0..94c2aad 100755
---- a/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-+++ b/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-@@ -790,6 +790,9 @@
- # Prefix added to renamed files as part of
- RENAME_PREFIX = 'autorename'
- 
-+# Match an absolute path to a generated auotorename_ file.
-+RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+');
-+
- # Content for the rename file. #includes the original file to ensure the two
- # files stay in sync.
- RENAME_CONTENT = """// File automatically generated. See crbug.com/495833.
-@@ -1020,6 +1023,12 @@
-     for source in source_set.sources:
-       GetIncludedSources(source, source_dir, sources_to_check)
- 
-+  # Remove autorename_ files now that we've grabbed their underlying includes.
-+  # We generated autorename_ files above and should not consider them for
-+  # licensing or credits.
-+  sources_to_check = filter(lambda s: not RENAME_REGEX.search(s),
-+                            sources_to_check)
-+
-   if not CheckLicensesForStaticLinking(sources_to_check, source_dir,
-                                        options.print_licenses):
-     exit('GENERATE FAILED: invalid licenses detected.')
diff --git a/dev-util/electron/files/chromium-icu-58-r0.patch b/dev-util/electron/files/chromium-icu-58-r0.patch
deleted file mode 100644
index ca402f6e4a89..000000000000
--- a/dev-util/electron/files/chromium-icu-58-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig	2016-11-11 13:21:19.747054059 -0500
-+++ b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp	2016-11-11 13:24:34.474939062 -0500
-@@ -26,6 +26,9 @@
- #include "wtf/StdLibExtras.h"
- #include "wtf/text/CharacterNames.h"
- 
-+#include <unicode/uchar.h>
-+#include <unicode/uvernum.h>
-+
- namespace blink {
- 
- unsigned numGraphemeClusters(const String& string)
-@@ -122,13 +125,19 @@
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
- };
- 
-+#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#define BA_LB_COUNT (U_LB_COUNT - 3)
-+#else
-+#define BA_LB_COUNT U_LB_COUNT
-+#endif
-+
- // Line breaking table for CSS word-break: break-all. This table differs from
- // asciiLineBreakTable in:
- // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
- //   Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
- // - 1 indicates additional break opportunities. 0 indicates to fallback to
- //   normal line break, not "prohibit break."
--static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
-+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
-     // XX AI AL B2 BA BB BK CB    CL CM CR EX GL HY ID IN    IS LF NS NU OP PO PR QU    SA SG SP SY ZW NL WJ H2    H3 JL JT JV CP CJ HL RI
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
-     { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
-@@ -178,7 +187,7 @@
- #undef AL
- 
- static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
--static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
-+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
- 
- static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
- {
-@@ -209,7 +218,7 @@
- 
- static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
- {
--    if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
-+    if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
-         const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
-         return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
-     }
diff --git a/dev-util/electron/files/chromium-icu-58-r1.patch b/dev-util/electron/files/chromium-icu-58-r1.patch
deleted file mode 100644
index 9e6e5fd72d70..000000000000
--- a/dev-util/electron/files/chromium-icu-58-r1.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001
-From: jshin <jshin@chromium.org>
-Date: Fri, 21 Oct 2016 01:15:50 -0700
-Subject: [PATCH] Update aspirational_scripts per Unicode 9
-
-This is a preparation to update ICU to 58.1.
-Without this change, ICU update CL cannot be tested on
-trybots because a compile will fail due to '#error' checking
-if ICU version is less than 58.
-
-BUG=637001
-TEST=None
-TBR=pkasting@chromium.org
-
-Review-Url: https://chromiumcodereview.appspot.com/2436113003
-Cr-Commit-Position: refs/heads/master@{#426749}
----
- components/url_formatter/url_formatter.cc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
-index 4455db3..2b82c0c 100644
---- a/components/url_formatter/url_formatter.cc
-+++ b/components/url_formatter/url_formatter.cc
-@@ -431,7 +431,7 @@
-   // are added to the allowed set. The list has to be updated when a new
-   // version of Unicode is released. The current version is 8.0.0 and ICU 58
-   // will have Unicode 9.0 data.
--#if U_ICU_VERSION_MAJOR_NUM < 58
-+#if U_ICU_VERSION_MAJOR_NUM < 60
-   const icu::UnicodeSet aspirational_scripts(
-       icu::UnicodeString(
-           // Unified Canadian Syllabics
-@@ -445,13 +445,13 @@
-           // Yi
-           "\\uA000-\\uA48C"
-           // Miao
--          "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F"
-+          "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E"
-           "\\U00016F8F-\\U00016F9F]",
-           -1, US_INV),
-       *status);
-   allowed_set.addAll(aspirational_scripts);
- #else
--#error "Update aspirational_scripts per Unicode 9.0"
-+#error "Update aspirational_scripts per Unicode 10.0"
- #endif
- 
-   // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in
--- 
-2.10.2
-
-From e60b571faa3f14dd9119a6792dccf12f8bf80192 Mon Sep 17 00:00:00 2001
-From: jshin <jshin@chromium.org>
-Date: Fri, 21 Oct 2016 12:20:05 -0700
-Subject: [PATCH] Prepare to upgrade ICU to 58 part 2
-
-U_LB_COUNT is assumed to be 40 in Blink line breaking code, but it's
-43 in ICU 58/Unicode 9.
-
-Three new classes (Emoji Base, Emoji Modifier, and ZWJ) should behave
-identically whether or not 'word-break: break-all' is in effect.
-
-BUG=637001
-TEST=TextBreakIterator.cpp is compiled without an error with ICU 58.
-R=kojii@chromium.org
-CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
-
-Review-Url: https://chromiumcodereview.appspot.com/2440923002
-Cr-Commit-Position: refs/heads/master@{#426860}
----
- .../WebKit/Source/platform/text/TextBreakIterator.cpp    | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
-index 568dc0a..36121eb 100644
---- a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
-+++ b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
-@@ -27,6 +27,9 @@
- #include "wtf/StdLibExtras.h"
- #include "wtf/text/CharacterNames.h"
- 
-+#include <unicode/uchar.h>
-+#include <unicode/uvernum.h>
-+
- namespace blink {
- 
- unsigned numGraphemeClusters(const String& string)
-@@ -123,13 +126,18 @@
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
- };
- 
-+#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#define BA_LB_COUNT (U_LB_COUNT - 3)
-+#else
-+#define BA_LB_COUNT U_LB_COUNT
-+#endif
- // Line breaking table for CSS word-break: break-all. This table differs from
- // asciiLineBreakTable in:
- // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
- //   Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
- // - 1 indicates additional break opportunities. 0 indicates to fallback to
- //   normal line break, not "prohibit break."
--static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
-+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
-     // XX AI AL B2 BA BB BK CB    CL CM CR EX GL HY ID IN    IS LF NS NU OP PO PR QU    SA SG SP SY ZW NL WJ H2    H3 JL JT JV CP CJ HL RI
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
-     { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
-@@ -179,7 +187,7 @@
- #undef AL
- 
- static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
--static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
-+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
- 
- static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
- {
-@@ -210,7 +218,7 @@
- 
- static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
- {
--    if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
-+    if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
-         const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
-         return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
-     }
--- 
-2.10.2
diff --git a/dev-util/electron/files/chromium-last-commit-position-r0.patch b/dev-util/electron/files/chromium-last-commit-position-r0.patch
deleted file mode 100644
index 344ed4c7deb7..000000000000
--- a/dev-util/electron/files/chromium-last-commit-position-r0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tools/gn/gn_main.cc.orig	2015-11-12 11:49:56.260549036 +0000
-+++ tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
- 
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
- 
- namespace {
- 
---- tools/gn/BUILD.gn.orig	2015-11-12 11:50:43.513524769 +0000
-+++ tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
- 
-   deps = [
-     ":gn_lib",
--    ":last_commit_position",
-     "//base",
-     "//build/config/sanitizers:deps",
-   ]
diff --git a/dev-util/electron/files/chromium-linker-warnings-r0.patch b/dev-util/electron/files/chromium-linker-warnings-r0.patch
deleted file mode 100644
index 97d5e1670bdb..000000000000
--- a/dev-util/electron/files/chromium-linker-warnings-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- build/config/compiler/BUILD.gn.orig	2016-05-30 13:50:15.341749039 +0000
-+++ build/config/compiler/BUILD.gn	2016-05-30 13:50:30.502061407 +0000
-@@ -203,15 +203,6 @@
-         cflags += [ "-fstack-protector" ]
-       }
-     }
--
--    # Linker warnings.
--    if (!(is_chromeos && current_cpu == "arm") &&
--        !(is_android && use_order_profiling) && !is_mac && !is_ios) {
--      # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
--      # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
--      # crbug.com/485542
--      ldflags += [ "-Wl,--fatal-warnings" ]
--    }
-   }
- 
-   if (is_clang && is_debug) {
diff --git a/dev-util/electron/files/chromium-lto-fixes-r1.patch b/dev-util/electron/files/chromium-lto-fixes-r1.patch
deleted file mode 100644
index b8bd8558b520..000000000000
--- a/dev-util/electron/files/chromium-lto-fixes-r1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/build/common.gypi.orig b/build/common.gypi
-index cce7b3c..3b905c0 100644
---- a/build/common.gypi.orig
-+++ b/build/common.gypi
-@@ -6096,7 +6096,7 @@
-         'target_conditions': [
-           ['_toolset=="target"', {
-             'ldflags': [
--              '-flto=32',
-+              '-flto=4'
-             ],
-           }],
-         ],
-@@ -6248,7 +6248,7 @@
-       },
-     }],
-     # TODO(pcc): Make these flags work correctly with CFI.
--    ['use_lto!=0 and cfi_vptr==0', {
-+    ['use_lto!=0 and cfi_vptr==0 and clang==1', {
-       'target_defaults': {
-         'target_conditions': [
-           ['_toolset=="target"', {
-
-diff --git a/build/android/disable_gcc_lto.gypi.orig b/build/android/disable_gcc_lto.gypi
-index a733c7a..57570f8 100644
---- a/build/android/disable_gcc_lto.gypi.orig
-+++ b/build/android/disable_gcc_lto.gypi
-@@ -8,7 +8,7 @@
-   'target_conditions': [
-     ['_toolset=="target"', {
-       'conditions': [
--        ['OS=="android" and clang==0 and (use_lto==1 or use_lto_o2==1)', {
-+        ['(OS=="android" or OS=="linux") and clang==0 and (use_lto==1 or use_lto_o2==1)', {
-           'cflags!': [
-             '-flto',
-             '-ffat-lto-objects',
diff --git a/dev-util/electron/files/chromium-lto-fixes.patch b/dev-util/electron/files/chromium-lto-fixes.patch
deleted file mode 100644
index 7de3df1b26f6..000000000000
--- a/dev-util/electron/files/chromium-lto-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/build/common.gypi.orig b/build/common.gypi
-index cce7b3c..3b905c0 100644
---- a/build/common.gypi.orig
-+++ b/build/common.gypi
-@@ -6096,7 +6096,7 @@
-         'target_conditions': [
-           ['_toolset=="target"', {
-             'ldflags': [
--              '-flto=32',
-+              '-flto=4'
-             ],
-           }],
-         ],
-diff --git a/build/android/disable_gcc_lto.gypi.orig b/build/android/disable_gcc_lto.gypi
-index a733c7a..57570f8 100644
---- a/build/android/disable_gcc_lto.gypi.orig
-+++ b/build/android/disable_gcc_lto.gypi
-@@ -8,7 +8,7 @@
-   'target_conditions': [
-     ['_toolset=="target"', {
-       'conditions': [
--        ['OS=="android" and clang==0 and (use_lto==1 or use_lto_o2==1)', {
-+        ['(OS=="android" or OS=="linux") and clang==0 and (use_lto==1 or use_lto_o2==1)', {
-           'cflags!': [
-             '-flto',
-             '-ffat-lto-objects',
diff --git a/dev-util/electron/files/chromium-pdfium-r0.patch b/dev-util/electron/files/chromium-pdfium-r0.patch
deleted file mode 100644
index 2ba268467ef8..000000000000
--- a/dev-util/electron/files/chromium-pdfium-r0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- third_party/pdfium/xfa/fxbarcode/utils.h.orig	2016-05-30 10:24:54.071773744 +0000
-+++ third_party/pdfium/xfa/fxbarcode/utils.h	2016-05-30 10:25:15.808219373 +0000
-@@ -26,12 +26,10 @@
- #endif
- #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
- #define FXSYS_isnan(x) _isnan(x)
--#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_)
-+#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \
-+      _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
- #include <cmath>
- #define FXSYS_isnan(x) std::isnan(x)
--#elif(_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
--#include <math.h>
--#define FXSYS_isnan(x) isnan(x)
- #endif
- #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
- #define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN())
diff --git a/dev-util/electron/files/chromium-remove-gardiner-mod-font.patch b/dev-util/electron/files/chromium-remove-gardiner-mod-font.patch
deleted file mode 100644
index cf1955ffbfd2..000000000000
--- a/dev-util/electron/files/chromium-remove-gardiner-mod-font.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test_runner.gyp b/test_runner.gyp
-index 30ffa75..8838bdf 100644
---- a/components/test_runner/test_runner.gyp
-+++ b/components/test_runner/test_runner.gyp
-@@ -162,8 +162,6 @@
-             'files': [
-               'resources/fonts/AHEM____.TTF',
-               'resources/fonts/fonts.conf',
--              '../../third_party/gardiner_mod/GardinerModBug.ttf',
--              '../../third_party/gardiner_mod/GardinerModCat.ttf',
-             ]
-           }],
-         }],
diff --git a/dev-util/electron/files/chromium-shared-v8-r1.patch b/dev-util/electron/files/chromium-shared-v8-r1.patch
deleted file mode 100644
index eb4d998d9b03..000000000000
--- a/dev-util/electron/files/chromium-shared-v8-r1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/v8/src/v8.gyp.orig b/v8/src/v8.gyp
-index bcb5801..3162456 100644
---- a/v8/src/v8.gyp.orig
-+++ b/v8/src/v8.gyp
-@@ -48,8 +48,8 @@
-         }, {
-           'toolsets': ['target'],
-         }],
--        ['component=="shared_library"', {
--          'type': '<(component)',
-+        ['v8_target_type=="shared_library"', {
-+          'type': 'shared_library',
-           'sources': [
-             # Note: on non-Windows we still build this file so that gyp
-             # has some sources to link into the component.
diff --git a/dev-util/electron/files/chromium-shared-v8.patch b/dev-util/electron/files/chromium-shared-v8.patch
deleted file mode 100644
index 67d97c8b3974..000000000000
--- a/dev-util/electron/files/chromium-shared-v8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/v8/tools/gyp/v8.gyp.orig b/v8/tools/gyp/v8.gyp
-index bcb5801..3162456 100644
---- a/v8/tools/gyp/v8.gyp.orig
-+++ b/v8/tools/gyp/v8.gyp
-@@ -48,8 +48,8 @@
-         }, {
-           'toolsets': ['target'],
-         }],
--        ['component=="shared_library"', {
--          'type': '<(component)',
-+        ['v8_target_type=="shared_library"', {
-+          'type': 'shared_library',
-           'sources': [
-             # Note: on non-Windows we still build this file so that gyp
-             # has some sources to link into the component.
diff --git a/dev-util/electron/files/chromium-snapshot-toolchain-r1.patch b/dev-util/electron/files/chromium-snapshot-toolchain-r1.patch
deleted file mode 100644
index 56f35b303077..000000000000
--- a/dev-util/electron/files/chromium-snapshot-toolchain-r1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- v8/snapshot_toolchain.gni.orig	2016-01-07 15:47:46.772435180 +0000
-+++ v8/snapshot_toolchain.gni	2016-01-07 15:48:06.144841801 +0000
-@@ -28,19 +28,4 @@
- # The snapshot needs to be compiled for the host, but compiled with
- # a toolchain that matches the bit-width of the target.
- 
--# TODO(GYP): For now we only support 32-bit little-endian target builds from an
--# x64 Linux host. Eventually we need to support all of the host/target
--# configurations v8 runs on.
--if (host_cpu == "x64" && host_os == "linux") {
--  if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
--    snapshot_toolchain = "//build/toolchain/linux:clang_x86"
--  } else if (target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "mips64el") {
--    snapshot_toolchain = "//build/toolchain/linux:clang_x64"
--  } else {
--    assert(false, "Need environment for this arch: $target_cpu")
--  }
--} else {
--  snapshot_toolchain = default_toolchain
--}
--
--
-+snapshot_toolchain = default_toolchain
diff --git a/dev-util/electron/files/chromium-system-ffmpeg-r0.patch b/dev-util/electron/files/chromium-system-ffmpeg-r0.patch
deleted file mode 100644
index 667e0ecb2a72..000000000000
--- a/dev-util/electron/files/chromium-system-ffmpeg-r0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index 677bd76..23a21f8 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -19,20 +19,12 @@
- 
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
--// file or the headers below will generate different structures.
--#define FF_API_PIX_FMT_DESC 0
--#define FF_API_OLD_DECODE_AUDIO 0
--#define FF_API_DESTRUCT_PACKET 0
--#define FF_API_GET_BUFFER 0
- 
- // Temporarily disable possible loss of data warning.
- // TODO(scherkus): fix and upstream the compiler warnings.
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
-   // If no estimate is found, the stream entry will be kInfiniteDuration().
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration());
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        if (packet_pts < start_time_estimates[stream->index])
--          start_time_estimates[stream->index] = packet_pts;
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   AVStream* audio_stream = NULL;
-   AudioDecoderConfig audio_config;
diff --git a/dev-util/electron/files/chromium-system-ffmpeg-r2.patch b/dev-util/electron/files/chromium-system-ffmpeg-r2.patch
deleted file mode 100644
index 8d67ef3898df..000000000000
--- a/dev-util/electron/files/chromium-system-ffmpeg-r2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
- 
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1034,24 +1034,6 @@
-   // If no estimate is found, the stream entry will be kInfiniteDuration().
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration());
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        if (packet_pts < start_time_estimates[stream->index])
--          start_time_estimates[stream->index] = packet_pts;
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   AVStream* audio_stream = NULL;
-   AudioDecoderConfig audio_config;
diff --git a/dev-util/electron/files/chromium-system-jinja-r7.patch b/dev-util/electron/files/chromium-system-jinja-r7.patch
deleted file mode 100644
index fe28e12c333c..000000000000
--- a/dev-util/electron/files/chromium-system-jinja-r7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/dev-util/electron/files/chromium-system-zlib-r0.patch b/dev-util/electron/files/chromium-system-zlib-r0.patch
deleted file mode 100644
index 3bf38e5904fa..000000000000
--- a/dev-util/electron/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build/linux/unbundle/zlib.gn.orig	2016-05-30 13:09:56.987716771 +0000
-+++ build/linux/unbundle/zlib.gn	2016-05-30 13:12:36.879014187 +0000
-@@ -9,11 +9,16 @@
-   headers = [ "zlib.h" ]
- }
- 
-+config("system_zlib") {
-+  defines = [ "USE_SYSTEM_ZLIB=1" ]
-+}
-+
- source_set("zlib") {
-   deps = [
-     ":zlib_shim",
-   ]
-   libs = [ "z" ]
-+  public_configs = [ ":system_zlib" ]
- }
- 
- shim_headers("minizip_shim") {
diff --git a/dev-util/electron/files/electron-0.36.12-vendor-brightray.patch b/dev-util/electron/files/electron-0.36.12-vendor-brightray.patch
deleted file mode 100644
index 7acbe04ff9d7..000000000000
--- a/dev-util/electron/files/electron-0.36.12-vendor-brightray.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 4ec57d1c20b841c6121a77f1539b0c759a031904 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:14:58 -0500
-Subject: [PATCH] brightray build fixes
-
----
- brightray.gyp  | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
- brightray.gypi | 21 ++++++++-------------
- 2 files changed, 56 insertions(+), 17 deletions(-)
-
-diff --git a/brightray.gyp b/brightray.gyp
-index d7120ea..d0fd603 100644
---- a/brightray.gyp
-+++ b/brightray.gyp
-@@ -1,7 +1,7 @@
- {
-   'variables': {
-     # The libraries brightray will be compiled to.
--    'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gconf-2.0 gmodule-2.0 nss'
-+    'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gmodule-2.0 nss'
-   },
-   'includes': [
-     'filenames.gypi',
-@@ -9,6 +9,11 @@
-   'targets': [
-     {
-       'target_name': 'brightray',
-+      'dependencies': [
-+        'cups',
-+        'gconf',
-+        '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all'
-+      ],
-       'type': 'static_library',
-       'include_dirs': [
-         '.',
-@@ -100,12 +105,9 @@
-             }, {
-               'link_settings': {
-                 'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/libffmpeg.so',
-                   # Following libraries are required by libchromiumcontent:
-                   '-lasound',
-                   '-lcap',
--                  '-lcups',
-                   '-lrt',
-                   '-ldl',
-                   '-lresolv',
-@@ -274,5 +276,47 @@
-         }],  # OS=="win"
-       ],
-     },
-+    {
-+      'target_name': 'gconf',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_gconf==1 and _toolset=="target"', {
-+          'direct_dependent_settings': {
-+            'cflags': [
-+              '<!@(<(pkg-config) --cflags gconf-2.0)',
-+            ],
-+            'defines': [
-+              'USE_GCONF',
-+            ],
-+          },
-+          'link_settings': {
-+            'ldflags': [
-+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
-+            ],
-+            'libraries': [
-+              '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
-+            ],
-+          },
-+        }],
-+      ],
-+    },
-+    {
-+      'target_name': 'cups',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_cups==1', {
-+          'direct_dependent_settings': {
-+            'defines': [
-+              'USE_CUPS',
-+            ],
-+            'link_settings': {
-+              'libraries': [
-+                '-lcups',
-+              ],
-+            },
-+          },
-+        }],
-+      ],
-+    },
-   ],
- }
-diff --git a/brightray.gypi b/brightray.gypi
-index 4513fa9..95bdfa1 100644
---- a/brightray.gypi
-+++ b/brightray.gypi
-@@ -1,9 +1,14 @@
- {
--  'includes': [
--    'vendor/download/libchromiumcontent/filenames.gypi',
--  ],
-   'variables': {
-     'libchromiumcontent_component%': 1,
-+    'libchromiumcontent_src_dir': '<(DEPTH)',
-+    'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
-+    'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
-+    'libchromiumcontent_shared_libraries': [],
-+    'libchromiumcontent_static_libraries': [],
-+    'libchromiumcontent_shared_v8_libraries': [],
-+    'libchromiumcontent_static_v8_libraries': [],
-+    'pkg-config%': 'pkg-config',
-     'conditions': [
-       # The "libchromiumcontent_component" is defined when calling "gyp".
-       ['libchromiumcontent_component', {
-@@ -258,22 +263,12 @@
-         'conditions': [
-           ['OS=="linux"', {
-             'cflags': [
--              '-O2',
--              # Generate symbols, will be stripped later.
--              '-g',
--              # Don't emit the GCC version ident directives, they just end up
--              # in the .comment section taking up binary size.
--              '-fno-ident',
-               # Put data and code in their own sections, so that unused symbols
-               # can be removed at link time with --gc-sections.
-               '-fdata-sections',
-               '-ffunction-sections',
-             ],
-             'ldflags': [
--              # Specifically tell the linker to perform optimizations.
--              # See http://lwn.net/Articles/192624/ .
--              '-Wl,-O1',
--              '-Wl,--as-needed',
-               '-Wl,--gc-sections',
-             ],
-           }],  # OS=="linux"
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch
deleted file mode 100644
index 168d8db477a9..000000000000
--- a/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From b7022129450eaf2136746f5332956e76848796ef Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:12:12 -0500
-Subject: [PATCH] libchromiumcontent build fixes
-
----
- chromiumcontent/chromiumcontent.gyp  |  6 +++---
- chromiumcontent/chromiumcontent.gypi | 26 --------------------------
- 2 files changed, 3 insertions(+), 29 deletions(-)
-
-diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp
-index 52a1d36..db74a52 100644
---- a/chromiumcontent/chromiumcontent.gyp
-+++ b/chromiumcontent/chromiumcontent.gyp
-@@ -24,11 +24,11 @@
-     },
-     {
-       'target_name': 'chromiumcontent',
--      # Build chromiumcontent as shared_library otherwise some static libraries
--      # will not build.
--      'type': 'shared_library',
-+      'type': 'static_library',
-       'dependencies': [
-         '<(DEPTH)/base/base.gyp:base_prefs',
-+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
-+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-         '<(DEPTH)/components/components.gyp:cdm_renderer',
-         '<(DEPTH)/components/components.gyp:devtools_discovery',
-         '<(DEPTH)/components/components.gyp:devtools_http_handler',
-diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi
-index 37c572b..3f4dcea 100644
---- a/chromiumcontent/chromiumcontent.gypi
-+++ b/chromiumcontent/chromiumcontent.gypi
-@@ -1,17 +1,5 @@
- {
-   'variables': {
--    # Enalbe using proprietary codecs.
--    'proprietary_codecs': 1,
--    'ffmpeg_branding': 'Chrome',
--    # Enable support for Widevine CDM.
--    'enable_widevine': 1,
--    # Using libc++ requires building for >= 10.7.
--    'mac_deployment_target': '10.8',
--    # The 10.8 SDK does not work well with C++11.
--    'mac_sdk_min': '10.9',
--    # Use the standard way of linking with msvc runtime.
--    'win_use_allocator_shim': 0,
--    'win_release_RuntimeLibrary': '2',
-     # The V8 libraries.
-     'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
-     # The icu libraries.
-@@ -22,20 +10,6 @@
-         'v8_use_external_startup_data': 1,
-       }],
-       ['OS=="linux"', {
--        # Enable high DPI support on Linux.
--        'enable_hidpi': 1,
--        # Use Dbus.
--        'use_dbus': 1,
--        # Make Linux build contain debug symbols, this flag will add '-g' to
--        # cflags.
--        'linux_dump_symbols': 1,
--        # The Linux build of libchromiumcontent.so depends on, but doesn't
--        # provide, tcmalloc by default.  Disabling tcmalloc here also prevents
--        # any conflicts when linking to binaries or libraries that don't use
--        # tcmalloc.
--        'linux_use_tcmalloc': 0,
--        # Force using gold linker.
--        'linux_use_bundled_gold': 1,
-         'conditions': [
-           ['target_arch=="arm"', {
-             'arm_version': 7,
--- 
-2.4.10
-
diff --git a/dev-util/electron/files/electron-0.36.12-vendor-node.patch b/dev-util/electron/files/electron-0.36.12-vendor-node.patch
deleted file mode 100644
index 85f34b6178fe..000000000000
--- a/dev-util/electron/files/electron-0.36.12-vendor-node.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 56b57ea7f0c111bfd9c719060cf17346e638fdd1 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Wed, 10 Feb 2016 14:45:13 -0500
-Subject: [PATCH] Build fixes
-
----
- node.gyp         | 5 +++--
- src/node.cc      | 8 --------
- src/node.js      | 2 ++
- src/node_main.cc | 2 ++
- 4 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/node.gyp b/node.gyp
-index d431210..fea5e07 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -1,6 +1,7 @@
- {
-   'variables': {
-     'v8_use_snapshot%': 'false',
-+    'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp',
-     'node_use_dtrace%': 'false',
-     'node_use_lttng%': 'false',
-     'node_use_etw%': 'false',
-@@ -89,8 +90,8 @@
-       'dependencies': [
-         'node_js2c#host',
-         'deps/cares/cares.gyp:cares',
--        # 'deps/v8/tools/gyp/v8.gyp:v8',
--        # 'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
-+        '<(v8_gyp_path):v8',
-+        '<(v8_gyp_path):v8_libplatform'
-       ],
- 
-       'include_dirs': [
-diff --git a/src/node.cc b/src/node.cc
-index 7df6053..cbe1538 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -4085,15 +4085,11 @@ static void StartNodeInstance(void* arg) {
-       SealHandleScope seal(isolate);
-       bool more;
-       do {
--#if 0
-         v8::platform::PumpMessageLoop(default_platform, isolate);
--#endif
-         more = uv_run(env->event_loop(), UV_RUN_ONCE);
- 
-         if (more == false) {
--#if 0
-           v8::platform::PumpMessageLoop(default_platform, isolate);
--#endif
-           EmitBeforeExit(env);
- 
-           // Emit `beforeExit` if the loop became alive either after emitting
-@@ -4153,10 +4149,8 @@ int Start(int argc, char** argv) {
- #endif
- 
-   const int thread_pool_size = 4;
--#if 0
-   default_platform = v8::platform::CreateDefaultPlatform(thread_pool_size);
-   V8::InitializePlatform(default_platform);
--#endif
-   V8::Initialize();
- 
-   int exit_code = 1;
-@@ -4173,10 +4167,8 @@ int Start(int argc, char** argv) {
-   }
-   V8::Dispose();
- 
--#if 0
-   delete default_platform;
-   default_platform = nullptr;
--#endif
- 
-   delete[] exec_argv;
-   exec_argv = nullptr;
-diff --git a/src/node.js b/src/node.js
-index 37aa371..a835d0a 100644
---- a/src/node.js
-+++ b/src/node.js
-@@ -40,7 +40,9 @@
-     startup.globalConsole();
-     }  // not isRenderer
- 
-+    if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) {
-     startup.initAsarSupport();
-+    }
- 
-     startup.processAssert();
-     startup.processConfig();
-diff --git a/src/node_main.cc b/src/node_main.cc
-index 58e747e..24949f3 100644
---- a/src/node_main.cc
-+++ b/src/node_main.cc
-@@ -40,8 +40,10 @@ int wmain(int argc, wchar_t *wargv[]) {
- }
- #else
- // UNIX
-+#include <stdlib.h>
- int main(int argc, char *argv[]) {
-   setvbuf(stderr, NULL, _IOLBF, 1024);
-+  putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1");
-   return node::Start(argc, argv);
- }
- #endif
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-0.36.12.patch b/dev-util/electron/files/electron-0.36.12.patch
deleted file mode 100644
index ec21b25af508..000000000000
--- a/dev-util/electron/files/electron-0.36.12.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From 293b40208c981a3a18a1ccd5c5ea0a50611e2356 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:16:40 -0500
-Subject: [PATCH] electron build fixes
-
----
- atom.gyp         | 55 +++++++++++++++++++++++++++++++++++++++++++------------
- common.gypi      | 29 +++++++++++++++++++++++------
- filenames.gypi   |  1 -
- tools/js2asar.py | 11 ++++++-----
- 4 files changed, 72 insertions(+), 24 deletions(-)
-
-diff --git a/atom.gyp b/atom.gyp
-index 5554adb..61ec47c 100644
---- a/atom.gyp
-+++ b/atom.gyp
-@@ -29,6 +29,7 @@
-       'type': 'executable',
-       'dependencies': [
-         'js2asar',
-+        'nodebin',
-         '<(project_name)_lib',
-       ],
-       'sources': [
-@@ -177,7 +178,7 @@
-           ],
-         }, {
-           'dependencies': [
--            'vendor/breakpad/breakpad.gyp:dump_syms#host',
-+            'breakpad/breakpad.gyp:dump_syms#host',
-           ],
-         }],  # OS=="win"
-         ['OS=="linux"', {
-@@ -194,7 +195,7 @@
-                   }, {
-                     'copied_libraries': [
-                       '<(PRODUCT_DIR)/lib/libnode.so',
--                      '<(libchromiumcontent_dir)/libffmpeg.so',
-+                      '<(PRODUCT_DIR)/lib/libv8.so',
-                     ],
-                   }],
-                 ],
-@@ -202,9 +203,6 @@
-               'destination': '<(PRODUCT_DIR)',
-               'files': [
-                 '<@(copied_libraries)',
--                '<(libchromiumcontent_dir)/locales',
--                '<(libchromiumcontent_dir)/icudtl.dat',
--                '<(libchromiumcontent_dir)/content_shell.pak',
-                 '<(libchromiumcontent_dir)/natives_blob.bin',
-                 '<(libchromiumcontent_dir)/snapshot_blob.bin',
-               ],
-@@ -242,15 +240,14 @@
-         '<@(lib_sources)',
-       ],
-       'include_dirs': [
--        '.',
-         'chromium_src',
-+        '.',
-         'vendor/brightray',
-         'vendor/native_mate',
-         # Include atom_natives.h.
-         '<(SHARED_INTERMEDIATE_DIR)',
-         # Include directories for uv and node.
-         'vendor/node/src',
--        'vendor/node/deps/http_parser',
-         'vendor/node/deps/uv/include',
-         # The `node.h` is using `#include"v8.h"`.
-         '<(libchromiumcontent_src_dir)/v8/include',
-@@ -301,8 +298,8 @@
-             'vendor/node/deps/uv/uv.gyp:libuv',
-             'vendor/node/deps/zlib/zlib.gyp:zlib',
-             # Build with breakpad support.
--            'vendor/breakpad/breakpad.gyp:breakpad_handler',
--            'vendor/breakpad/breakpad.gyp:breakpad_sender',
-+            'breakpad/breakpad.gyp:breakpad_handler',
-+            'breakpad/breakpad.gyp:breakpad_sender',
-           ],
-         }],  # OS=="win"
-         ['OS=="mac" and mas_build==0', {
-@@ -333,7 +330,7 @@
-               # Make binary search for libraries under current directory, so we
-               # don't have to manually set $LD_LIBRARY_PATH:
-               # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
--              '-rpath \$$ORIGIN',
-+              '-Wl,-rpath=\$$ORIGIN/',
-               # Make native module dynamic loading work.
-               '-rdynamic',
-             ],
-@@ -344,10 +341,10 @@
-             '-Wno-reserved-user-defined-literal',
-           ],
-           'include_dirs': [
--            'vendor/breakpad/src',
-+            'breakpad/src',
-           ],
-           'dependencies': [
--            'vendor/breakpad/breakpad.gyp:breakpad_client',
-+            'breakpad/breakpad.gyp:breakpad_client',
-           ],
-         }],  # OS=="linux"
-       ],
-@@ -355,6 +352,9 @@
-     {
-       'target_name': 'js2asar',
-       'type': 'none',
-+      'dependencies': [
-+        'nodebin'
-+      ],
-       'actions': [
-         {
-           'action_name': 'js2asar',
-@@ -376,6 +376,7 @@
-           'action': [
-             'python',
-             'tools/js2asar.py',
-+            '<(PRODUCT_DIR)/nodebin',
-             '<@(_outputs)',
-             '<@(_inputs)',
-           ],
-@@ -403,6 +404,36 @@
-         }
-       ],
-     },  # target atom_js2c
-+    {
-+      'target_name': 'nodebin',
-+      'type': 'executable',
-+      'sources': [
-+        'vendor/node/src/node_main.cc',
-+      ],
-+      'dependencies': [
-+        'vendor/node/node.gyp:node',
-+      ],
-+      'include_dirs': [
-+        '.',
-+        'vendor/native_mate',
-+        # Include atom_natives.h.
-+        '<(SHARED_INTERMEDIATE_DIR)',
-+        # Include directories for uv and node.
-+        'vendor/node/src',
-+        'vendor/node/deps/uv/include',
-+        # The `node.h` is using `#include"v8.h"`.
-+        '<(libchromiumcontent_src_dir)/v8/include',
-+        # The `node.h` is using `#include"ares.h"`.
-+        'vendor/node/deps/cares/include',
-+      ],
-+      'link_settings': {
-+        'ldflags': [
-+          '-Wl,-rpath=\$$ORIGIN/',
-+          # Make native module dynamic loading work.
-+          '-rdynamic',
-+        ],
-+      },
-+    },  # target nodebin
-   ],
-   'conditions': [
-     ['OS=="mac"', {
-diff --git a/common.gypi b/common.gypi
-index 7c41c36..2da2fea 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -17,12 +17,6 @@
-     'node_target_type': 'shared_library',
-     'node_install_npm': 'false',
-     'node_prefix': '',
--    'node_shared_cares': 'false',
--    'node_shared_http_parser': 'false',
--    'node_shared_libuv': 'false',
--    'node_shared_openssl': 'false',
--    'node_shared_v8': 'true',
--    'node_shared_zlib': 'false',
-     'node_tag': '',
-     'node_use_dtrace': 'false',
-     'node_use_etw': 'false',
-@@ -35,10 +29,33 @@
-     'V8_BASE': '',
-     'v8_postmortem_support': 'false',
-     'v8_enable_i18n_support': 'false',
-+    'v8_gyp_path': '<(DEPTH)/v8/tools/gyp/v8.gyp',
-+    'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
-+    'v8_target_type': 'shared_library',
-+    'v8_use_snapshot': 'true',
-+    'v8_use_external_startup_data': 1,
-   },
-   # Settings to compile node under Windows.
-   'target_defaults': {
-     'target_conditions': [
-+      ['_target_name in <(v8_libraries) + ["node"]', {
-+        'cflags!': [
-+          '-fvisibility=hidden',
-+          '-fdata-sections',
-+          '-ffunction-sections',
-+        ],
-+        'cflags_cc!': [
-+          '-fvisibility-inlines-hidden'
-+        ],
-+      }],
-+
-+      ['_target_name in <(v8_libraries) + ["mksnapshot"]', {
-+        'defines': [
-+          'V8_SHARED',
-+          'BUILDING_V8_SHARED',
-+        ],
-+      }],
-+
-       ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', {
-         'msvs_disabled_warnings': [
-           4013,  # 'free' undefined; assuming extern returning int
-diff --git a/filenames.gypi b/filenames.gypi
-index f9e1955..84999a3 100644
---- a/filenames.gypi
-+++ b/filenames.gypi
-@@ -498,7 +498,6 @@
-       'chromium_src/extensions/browser/app_window/size_constraints.h',
-       'chromium_src/extensions/common/url_pattern.cc',
-       'chromium_src/extensions/common/url_pattern.h',
--      'chromium_src/library_loaders/libspeechd_loader.cc',
-       'chromium_src/library_loaders/libspeechd.h',
-       'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc',
-       'chromium_src/net/test/embedded_test_server/stream_listen_socket.h',
-diff --git a/tools/js2asar.py b/tools/js2asar.py
-index cb02e33..3d80a11 100755
---- a/tools/js2asar.py
-+++ b/tools/js2asar.py
-@@ -11,12 +11,13 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
- 
- 
- def main():
--  archive = sys.argv[1]
--  js_source_files = sys.argv[2:]
-+  node = sys.argv[1]
-+  archive = sys.argv[2]
-+  js_source_files = sys.argv[3:]
- 
-   output_dir = tempfile.mkdtemp()
-   copy_js(js_source_files, output_dir)
--  call_asar(archive, output_dir)
-+  call_asar(node, archive, output_dir)
-   shutil.rmtree(output_dir)
- 
- 
-@@ -28,10 +29,10 @@ def copy_js(js_source_files, output_dir):
-     shutil.copy2(source_file, output_path)
- 
- 
--def call_asar(archive, output_dir):
-+def call_asar(node, archive, output_dir):
-   js_dir = os.path.join(output_dir, 'lib')
-   asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar')
--  subprocess.check_call([find_node(), asar, 'pack', js_dir, archive])
-+  subprocess.check_call([node, asar, 'pack', js_dir, archive])
- 
- 
- def find_node():
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-0.37.8-vendor-brightray.patch b/dev-util/electron/files/electron-0.37.8-vendor-brightray.patch
deleted file mode 100644
index 4c68e4199e91..000000000000
--- a/dev-util/electron/files/electron-0.37.8-vendor-brightray.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From e28b41fcc6d59d1774995c5a7b6aa4c634616481 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:14:58 -0500
-Subject: [PATCH] brightray build fixes
-
----
- brightray.gyp  | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
- brightray.gypi | 20 +++++++-------------
- 2 files changed, 55 insertions(+), 17 deletions(-)
-
-diff --git a/brightray.gyp b/brightray.gyp
-index 4a821d1..0897f9d 100644
---- a/brightray.gyp
-+++ b/brightray.gyp
-@@ -1,7 +1,7 @@
- {
-   'variables': {
-     # The libraries brightray will be compiled to.
--    'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gconf-2.0 gmodule-2.0 nss'
-+    'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gmodule-2.0 nss'
-   },
-   'includes': [
-     'filenames.gypi',
-@@ -9,6 +9,11 @@
-   'targets': [
-     {
-       'target_name': 'brightray',
-+      'dependencies': [
-+        'cups',
-+        'gconf',
-+        '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all'
-+      ],
-       'type': 'static_library',
-       'include_dirs': [
-         '.',
-@@ -101,12 +106,9 @@
-             }, {
-               'link_settings': {
-                 'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/libffmpeg.so',
-                   # Following libraries are required by libchromiumcontent:
-                   '-lasound',
-                   '-lcap',
--                  '-lcups',
-                   '-lrt',
-                   '-ldl',
-                   '-lresolv',
-@@ -302,5 +304,47 @@
-         }],  # OS=="win"
-       ],
-     },
-+    {
-+      'target_name': 'gconf',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_gconf==1 and _toolset=="target"', {
-+          'direct_dependent_settings': {
-+            'cflags': [
-+              '<!@(<(pkg-config) --cflags gconf-2.0)',
-+            ],
-+            'defines': [
-+              'USE_GCONF',
-+            ],
-+          },
-+          'link_settings': {
-+            'ldflags': [
-+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
-+            ],
-+            'libraries': [
-+              '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
-+            ],
-+          },
-+        }],
-+      ],
-+    },
-+    {
-+      'target_name': 'cups',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_cups==1', {
-+          'direct_dependent_settings': {
-+            'defines': [
-+              'USE_CUPS',
-+            ],
-+            'link_settings': {
-+              'libraries': [
-+                '-lcups',
-+              ],
-+            },
-+          },
-+        }],
-+      ],
-+    },
-   ],
- }
-diff --git a/brightray.gypi b/brightray.gypi
-index 8bae073..95bdfa1 100644
---- a/brightray.gypi
-+++ b/brightray.gypi
-@@ -1,9 +1,13 @@
- {
--  'includes': [
--    'vendor/download/libchromiumcontent/filenames.gypi',
--  ],
-   'variables': {
-     'libchromiumcontent_component%': 1,
-+    'libchromiumcontent_src_dir': '<(DEPTH)',
-+    'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
-+    'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
-+    'libchromiumcontent_shared_libraries': [],
-+    'libchromiumcontent_static_libraries': [],
-+    'libchromiumcontent_shared_v8_libraries': [],
-+    'libchromiumcontent_static_v8_libraries': [],
-     'pkg-config%': 'pkg-config',
-     'conditions': [
-       # The "libchromiumcontent_component" is defined when calling "gyp".
-@@ -259,22 +263,12 @@
-         'conditions': [
-           ['OS=="linux"', {
-             'cflags': [
--              '-O2',
--              # Generate symbols, will be stripped later.
--              '-g',
--              # Don't emit the GCC version ident directives, they just end up
--              # in the .comment section taking up binary size.
--              '-fno-ident',
-               # Put data and code in their own sections, so that unused symbols
-               # can be removed at link time with --gc-sections.
-               '-fdata-sections',
-               '-ffunction-sections',
-             ],
-             'ldflags': [
--              # Specifically tell the linker to perform optimizations.
--              # See http://lwn.net/Articles/192624/ .
--              '-Wl,-O1',
--              '-Wl,--as-needed',
-               '-Wl,--gc-sections',
-             ],
-           }],  # OS=="linux"
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-0.37.8-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-0.37.8-vendor-libchromiumcontent.patch
deleted file mode 100644
index 8115345b077d..000000000000
--- a/dev-util/electron/files/electron-0.37.8-vendor-libchromiumcontent.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From bfa42ae7f5251a65fd90a68d0914384b7e63b8ad Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:12:12 -0500
-Subject: [PATCH] libchromiumcontent build fixes
-
----
- chromiumcontent/chromiumcontent.gyp  |  6 +++---
- chromiumcontent/chromiumcontent.gypi | 22 ----------------------
- 2 files changed, 3 insertions(+), 25 deletions(-)
-
-diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp
-index ddaa0b9..cc8c7c6 100644
---- a/chromiumcontent/chromiumcontent.gyp
-+++ b/chromiumcontent/chromiumcontent.gyp
-@@ -24,11 +24,11 @@
-     },
-     {
-       'target_name': 'chromiumcontent',
--      # Build chromiumcontent as shared_library otherwise some static libraries
--      # will not build.
--      'type': 'shared_library',
-+      'type': 'static_library',
-       'dependencies': [
-         '<(DEPTH)/base/base.gyp:base_prefs',
-+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
-+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-         '<(DEPTH)/components/components.gyp:cdm_renderer',
-         '<(DEPTH)/components/components.gyp:devtools_discovery',
-         '<(DEPTH)/components/components.gyp:devtools_http_handler',
-diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi
-index 73bc78a..53694e7 100644
---- a/chromiumcontent/chromiumcontent.gypi
-+++ b/chromiumcontent/chromiumcontent.gypi
-@@ -1,18 +1,5 @@
- {
-   'variables': {
--    # Don't use nacl.
--    'disable_nacl': 1,
--    # Enalbe using proprietary codecs.
--    'proprietary_codecs': 1,
--    # Build ffmpeg as shared library.
--    'ffmpeg_component': 'shared_library',
--    # Enable support for Widevine CDM.
--    'enable_widevine': 1,
--    # Using libc++ requires building for >= 10.7.
--    'mac_deployment_target': '10.8',
--    # Use the standard way of linking with msvc runtime.
--    'win_use_allocator_shim': 0,
--    'win_release_RuntimeLibrary': '2',
-     # The V8 libraries.
-     'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
-     # The icu libraries.
-@@ -23,15 +10,6 @@
-         'v8_use_external_startup_data': 1,
-       }],
-       ['OS=="linux"', {
--        # Enable high DPI support on Linux.
--        'enable_hidpi': 1,
--        # Use Dbus.
--        'use_dbus': 1,
--        # Make Linux build contain debug symbols, this flag will add '-g' to
--        # cflags.
--        'linux_dump_symbols': 1,
--        # Force using gold linker.
--        'linux_use_bundled_gold': 1,
-         'conditions': [
-           ['target_arch=="arm"', {
-             'arm_version': 7,
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-0.37.8-vendor-node.patch b/dev-util/electron/files/electron-0.37.8-vendor-node.patch
deleted file mode 100644
index 6e706c3ab49b..000000000000
--- a/dev-util/electron/files/electron-0.37.8-vendor-node.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From ee5dd0d41e8426d6915c4b2b9095674ab4175fee Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Wed, 10 Feb 2016 14:45:13 -0500
-Subject: [PATCH] Build fixes
-
----
- lib/internal/bootstrap_node.js | 2 ++
- node.gyp                       | 5 +++--
- src/node.cc                    | 8 ++++----
- src/node_main.cc               | 2 ++
- 4 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
-index f2edf80..dd2fdb4 100644
---- a/lib/internal/bootstrap_node.js
-+++ b/lib/internal/bootstrap_node.js
-@@ -53,7 +53,9 @@
-     setupGlobalConsole();
-     }  // not isRenderer
- 
-+    if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) {
-     setupAsarSupport();
-+    }
- 
-     const _process = NativeModule.require('internal/process');
- 
-diff --git a/node.gyp b/node.gyp
-index df3bb6a..fbe21d8 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -1,6 +1,7 @@
- {
-   'variables': {
-     'v8_use_snapshot%': 'false',
-+    'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp',
-     'node_use_dtrace%': 'false',
-     'node_use_lttng%': 'false',
-     'node_use_etw%': 'false',
-@@ -107,8 +108,8 @@
-       'dependencies': [
-         'node_js2c#host',
-         'deps/cares/cares.gyp:cares',
--        # 'deps/v8/tools/gyp/v8.gyp:v8',
--        # 'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
-+        '<(v8_gyp_path):v8',
-+        '<(v8_gyp_path):v8_libplatform'
-       ],
- 
-       'include_dirs': [
-diff --git a/src/node.cc b/src/node.cc
-index 66f31d0..961abc2 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -4240,13 +4240,13 @@ static void StartNodeInstance(void* arg) {
-       SealHandleScope seal(isolate);
-       bool more;
-       do {
--#if 0
-+#if 1
-         v8::platform::PumpMessageLoop(default_platform, isolate);
- #endif
-         more = uv_run(env->event_loop(), UV_RUN_ONCE);
- 
-         if (more == false) {
--#if 0
-+#if 1
-           v8::platform::PumpMessageLoop(default_platform, isolate);
- #endif
-           EmitBeforeExit(env);
-@@ -4312,7 +4312,7 @@ int Start(int argc, char** argv) {
-   V8::SetEntropySource(crypto::EntropySource);
- #endif
- 
--#if 0
-+#if 1
-   default_platform = v8::platform::CreateDefaultPlatform(v8_thread_pool_size);
-   V8::InitializePlatform(default_platform);
-   V8::Initialize();
-@@ -4332,7 +4332,7 @@ int Start(int argc, char** argv) {
-   }
-   V8::Dispose();
- 
--#if 0
-+#if 1
-   delete default_platform;
-   default_platform = nullptr;
- #endif
-diff --git a/src/node_main.cc b/src/node_main.cc
-index dce72af..e567cc4 100644
---- a/src/node_main.cc
-+++ b/src/node_main.cc
-@@ -48,8 +48,10 @@ int wmain(int argc, wchar_t *wargv[]) {
- }
- #else
- // UNIX
-+#include <stdlib.h>
- int main(int argc, char *argv[]) {
-   setvbuf(stderr, NULL, _IOLBF, 1024);
-+  putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1");
-   return node::Start(argc, argv);
- }
- #endif
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-0.37.8.patch b/dev-util/electron/files/electron-0.37.8.patch
deleted file mode 100644
index 943281cae834..000000000000
--- a/dev-util/electron/files/electron-0.37.8.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-From 79e5320a6544a24e45d275cf64bff27fbf6289f2 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:16:40 -0500
-Subject: [PATCH] electron build fixes
-
----
- common.gypi               | 32 ++++++++++++++++++------
- electron.gyp              | 62 ++++++++++++++++++++++++++++++++++++++---------
- filenames.gypi            |  1 -
- toolchain.gypi            | 47 +----------------------------------
- tools/atom_source_root.py |  5 ++++
- tools/get-endianness.py   |  4 +++
- tools/js2asar.py          | 13 +++++-----
- 7 files changed, 92 insertions(+), 72 deletions(-)
- create mode 100644 tools/atom_source_root.py
- create mode 100644 tools/get-endianness.py
-
-diff --git a/common.gypi b/common.gypi
-index 1088beb..2364ebe 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -15,16 +15,11 @@
-     'openssl_fips': '',
-     'openssl_no_asm': 1,
-     'node_release_urlbase': 'https://atom.io/download/atom-shell',
--    'node_byteorder': '<!(node <(DEPTH)/tools/get-endianness.js)',
-+    'node_byteorder': '<!(python <(DEPTH)/tools/get-endianness.py)',
-     'node_target_type': 'shared_library',
-     'node_install_npm': 'false',
-     'node_prefix': '',
--    'node_shared_cares': 'false',
--    'node_shared_http_parser': 'false',
--    'node_shared_libuv': 'false',
--    'node_shared_openssl': 'false',
-     'node_shared_v8': 'true',
--    'node_shared_zlib': 'false',
-     'node_tag': '',
-     'node_use_dtrace': 'false',
-     'node_use_etw': 'false',
-@@ -36,11 +31,34 @@
-     'uv_use_dtrace': 'false',
-     'V8_BASE': '',
-     'v8_postmortem_support': 'false',
--    'v8_enable_i18n_support': 'false',
-+    'v8_enable_i18n_support': 'true',
-+    'v8_gyp_path': '<(DEPTH)/v8/tools/gyp/v8.gyp',
-+    'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
-+    'v8_target_type': 'shared_library',
-+    'v8_use_snapshot': 'true',
-+    'v8_use_external_startup_data': 1,
-   },
-   # Settings to compile node under Windows.
-   'target_defaults': {
-     'target_conditions': [
-+      ['_target_name in <(v8_libraries) + ["node", "electron_lib"]', {
-+        'cflags!': [
-+          '-fvisibility=hidden',
-+          '-fdata-sections',
-+          '-ffunction-sections',
-+        ],
-+        'cflags_cc!': [
-+          '-fvisibility-inlines-hidden'
-+        ],
-+      }],
-+
-+      ['_target_name in <(v8_libraries) + ["mksnapshot"]', {
-+        'defines': [
-+          'V8_SHARED',
-+          'BUILDING_V8_SHARED',
-+        ],
-+      }],
-+
-       ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', {
-         'msvs_disabled_warnings': [
-           4003,  # not enough actual parameters for macro 'V'
-diff --git a/electron.gyp b/electron.gyp
-index 66ff2fd..e0e782c 100644
---- a/electron.gyp
-+++ b/electron.gyp
-@@ -30,6 +30,7 @@
-       'dependencies': [
-         'js2asar',
-         'app2asar',
-+        'nodebin',
-         '<(project_name)_lib',
-       ],
-       'sources': [
-@@ -165,7 +166,7 @@
-           ],
-         }, {
-           'dependencies': [
--            'vendor/breakpad/breakpad.gyp:dump_syms#host',
-+            'breakpad/breakpad.gyp:dump_syms#host',
-           ],
-         }],  # OS=="win"
-         ['OS=="linux"', {
-@@ -182,7 +183,7 @@
-                   }, {
-                     'copied_libraries': [
-                       '<(PRODUCT_DIR)/lib/libnode.so',
--                      '<(libchromiumcontent_dir)/libffmpeg.so',
-+                      '<(PRODUCT_DIR)/lib/libv8.so',
-                     ],
-                   }],
-                 ],
-@@ -190,9 +191,6 @@
-               'destination': '<(PRODUCT_DIR)',
-               'files': [
-                 '<@(copied_libraries)',
--                '<(libchromiumcontent_dir)/locales',
--                '<(libchromiumcontent_dir)/icudtl.dat',
--                '<(libchromiumcontent_dir)/content_shell.pak',
-                 '<(libchromiumcontent_dir)/natives_blob.bin',
-                 '<(libchromiumcontent_dir)/snapshot_blob.bin',
-               ],
-@@ -216,6 +214,8 @@
-         'GLIB_DISABLE_DEPRECATION_WARNINGS',
-         # Defined in Chromium but not exposed in its gyp file.
-         'V8_USE_EXTERNAL_STARTUP_DATA',
-+        'V8_SHARED',
-+        'USING_V8_SHARED',
-         'ENABLE_PLUGINS',
-         'ENABLE_PEPPER_CDMS',
-         'USE_PROPRIETARY_CODECS',
-@@ -224,15 +224,14 @@
-         '<@(lib_sources)',
-       ],
-       'include_dirs': [
--        '.',
-         'chromium_src',
-+        '.',
-         'vendor/brightray',
-         'vendor/native_mate',
-         # Include atom_natives.h.
-         '<(SHARED_INTERMEDIATE_DIR)',
-         # Include directories for uv and node.
-         'vendor/node/src',
--        'vendor/node/deps/http_parser',
-         'vendor/node/deps/uv/include',
-         # The `node.h` is using `#include"v8.h"`.
-         '<(libchromiumcontent_src_dir)/v8/include',
-@@ -283,8 +282,8 @@
-             'vendor/node/deps/uv/uv.gyp:libuv',
-             'vendor/node/deps/zlib/zlib.gyp:zlib',
-             # Build with breakpad support.
--            'vendor/breakpad/breakpad.gyp:breakpad_handler',
--            'vendor/breakpad/breakpad.gyp:breakpad_sender',
-+            'breakpad/breakpad.gyp:breakpad_handler',
-+            'breakpad/breakpad.gyp:breakpad_sender',
-           ],
-         }],  # OS=="win"
-         ['OS=="mac" and mas_build==0', {
-@@ -318,7 +317,7 @@
-               # Make binary search for libraries under current directory, so we
-               # don't have to manually set $LD_LIBRARY_PATH:
-               # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
--              '-rpath \$$ORIGIN',
-+              '-Wl,-rpath=\$$ORIGIN/',
-               # Make native module dynamic loading work.
-               '-rdynamic',
-             ],
-@@ -329,10 +328,10 @@
-             '-Wno-reserved-user-defined-literal',
-           ],
-           'include_dirs': [
--            'vendor/breakpad/src',
-+            'breakpad/src',
-           ],
-           'dependencies': [
--            'vendor/breakpad/breakpad.gyp:breakpad_client',
-+            'breakpad/breakpad.gyp:breakpad_client',
-           ],
-         }],  # OS=="linux"
-       ],
-@@ -340,6 +339,9 @@
-     {
-       'target_name': 'js2asar',
-       'type': 'none',
-+      'dependencies': [
-+        'nodebin'
-+      ],
-       'actions': [
-         {
-           'action_name': 'js2asar',
-@@ -361,6 +363,7 @@
-           'action': [
-             'python',
-             'tools/js2asar.py',
-+            '<(PRODUCT_DIR)/nodebin',
-             '<@(_outputs)',
-             'lib',
-             '<@(_inputs)',
-@@ -371,6 +374,9 @@
-     {
-       'target_name': 'app2asar',
-       'type': 'none',
-+      'dependencies': [
-+        'nodebin'
-+      ],
-       'actions': [
-         {
-           'action_name': 'app2asar',
-@@ -392,6 +398,7 @@
-           'action': [
-             'python',
-             'tools/js2asar.py',
-+            '<(PRODUCT_DIR)/nodebin',
-             '<@(_outputs)',
-             'default_app',
-             '<@(_inputs)',
-@@ -420,6 +427,37 @@
-         }
-       ],
-     },  # target atom_js2c
-+    {
-+      'target_name': 'nodebin',
-+      'type': 'executable',
-+      'sources': [
-+        'vendor/node/src/node_main.cc',
-+      ],
-+      'dependencies': [
-+        'vendor/node/node.gyp:node',
-+      ],
-+      'include_dirs': [
-+        '.',
-+        'vendor/native_mate',
-+        # Include atom_natives.h.
-+        '<(SHARED_INTERMEDIATE_DIR)',
-+        # Include directories for uv and node.
-+        'vendor/node/src',
-+        'vendor/node/deps/http_parser',
-+        'vendor/node/deps/uv/include',
-+        # The `node.h` is using `#include"v8.h"`.
-+        '<(libchromiumcontent_src_dir)/v8/include',
-+        # The `node.h` is using `#include"ares.h"`.
-+        'vendor/node/deps/cares/include',
-+      ],
-+      'link_settings': {
-+        'ldflags': [
-+          '-Wl,-rpath=\$$ORIGIN/',
-+          # Make native module dynamic loading work.
-+          '-rdynamic',
-+        ],
-+      },
-+    },  # target nodebin
-   ],
-   'conditions': [
-     ['OS=="mac"', {
-diff --git a/filenames.gypi b/filenames.gypi
-index 1c21394..3e07096 100644
---- a/filenames.gypi
-+++ b/filenames.gypi
-@@ -516,7 +516,6 @@
-       'chromium_src/extensions/browser/app_window/size_constraints.h',
-       'chromium_src/extensions/common/url_pattern.cc',
-       'chromium_src/extensions/common/url_pattern.h',
--      'chromium_src/library_loaders/libspeechd_loader.cc',
-       'chromium_src/library_loaders/libspeechd.h',
-       'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc',
-       'chromium_src/net/test/embedded_test_server/stream_listen_socket.h',
-diff --git a/toolchain.gypi b/toolchain.gypi
-index 11da28f..52c0316 100644
---- a/toolchain.gypi
-+++ b/toolchain.gypi
-@@ -16,7 +16,7 @@
-       'arm_neon%': 1,
- 
-       # Abosulte path to source root.
--      'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)',
-+      'source_root%': '<!(python <(DEPTH)/tools/atom_source_root.py)',
-     },
- 
-     # Copy conditionally-set variables out one scope.
-@@ -40,34 +40,6 @@
-         'mac_sdk%': '<!(python <(DEPTH)/tools/mac/find_sdk.py <(mac_sdk_min))',
-       }],
- 
--      ['OS=="linux"', {
--        'variables': {
--          # The system libdir used for this ABI.
--          'system_libdir%': 'lib',
--
--          # Setting the path to sysroot.
--          'conditions': [
--            ['target_arch=="arm"', {
--              # sysroot needs to be an absolute path otherwise it generates
--              # incorrect results when passed to pkg-config
--              'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot',
--            }],
--            ['target_arch=="ia32"', {
--              'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
--            }],
--            ['target_arch=="x64"', {
--              'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
--            }],
--          ],
--        },
--        # Copy conditionally-set variables out one scope.
--        'sysroot%': '<(sysroot)',
--        'system_libdir%': '<(system_libdir)',
--
--        # Redirect pkg-config to search from sysroot.
--        'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
--      }],
--
-       # Set default compiler flags depending on ARM version.
-       ['arm_version==6', {
-         'arm_arch%': 'armv6',
-@@ -136,23 +108,6 @@
-       },
-     }],
- 
--    # Setup sysroot environment.
--    ['OS=="linux" and target_arch in ["arm", "ia32", "x64"]', {
--      'target_defaults': {
--        'target_conditions': [
--          ['_toolset=="target"', {
--            'cflags': [
--              '--sysroot=<(sysroot)',
--            ],
--            'ldflags': [
--              '--sysroot=<(sysroot)',
--              '<!(<(source_root)/tools/linux/sysroot_ld_path.sh <(sysroot))',
--            ],
--          }]
--        ],
--      },
--    }],  # sysroot
--
-     # Setup cross-compilation on Linux.
-     ['OS=="linux"', {
-       'target_defaults': {
-diff --git a/tools/atom_source_root.py b/tools/atom_source_root.py
-new file mode 100644
-index 0000000..316e997
---- /dev/null
-+++ b/tools/atom_source_root.py
-@@ -0,0 +1,5 @@
-+#!/usr/bin/env python
-+
-+import os.path
-+
-+print(os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
-diff --git a/tools/get-endianness.py b/tools/get-endianness.py
-new file mode 100644
-index 0000000..3150793
---- /dev/null
-+++ b/tools/get-endianness.py
-@@ -0,0 +1,4 @@
-+#!/usr/bin/env python
-+
-+import sys
-+print(sys.byteorder)
-diff --git a/tools/js2asar.py b/tools/js2asar.py
-index 7860176..b08a38d 100755
---- a/tools/js2asar.py
-+++ b/tools/js2asar.py
-@@ -11,13 +11,14 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
- 
- 
- def main():
--  archive = sys.argv[1]
--  folder_name = sys.argv[2]
--  source_files = sys.argv[3:]
-+  node = sys.argv[1]
-+  archive = sys.argv[2]
-+  folder_name = sys.argv[3]
-+  source_files = sys.argv[4:]
- 
-   output_dir = tempfile.mkdtemp()
-   copy_files(source_files, output_dir)
--  call_asar(archive, os.path.join(output_dir, folder_name))
-+  call_asar(node, archive, os.path.join(output_dir, folder_name))
-   shutil.rmtree(output_dir)
- 
- 
-@@ -28,9 +29,9 @@ def copy_files(source_files, output_dir):
-     shutil.copy2(source_file, output_path)
- 
- 
--def call_asar(archive, output_dir):
-+def call_asar(node, archive, output_dir):
-   asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar')
--  subprocess.check_call([find_node(), asar, 'pack', output_dir, archive])
-+  subprocess.check_call([node, asar, 'pack', output_dir, archive])
- 
- 
- def find_node():
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-1.3.13-vendor-node.patch b/dev-util/electron/files/electron-1.3.13-vendor-node.patch
deleted file mode 100644
index 8db4a0527df2..000000000000
--- a/dev-util/electron/files/electron-1.3.13-vendor-node.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From fe90355a9b8db14ad94cae189ccb90cab0800d5b Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Wed, 10 Feb 2016 14:45:13 -0500
-Subject: [PATCH] Build fixes
-
----
- lib/internal/bootstrap_node.js |  2 ++
- node.gyp                       | 13 ++++++++-----
- src/node_main.cc               |  2 ++
- 3 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
-index 9505c7b8a..27d7b9da9 100644
---- a/lib/internal/bootstrap_node.js
-+++ b/lib/internal/bootstrap_node.js
-@@ -50,7 +50,9 @@
-       setupGlobalConsole();
-     }
- 
-+    if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) {
-     setupAsarSupport();
-+    }
- 
-     const _process = NativeModule.require('internal/process');
- 
-diff --git a/node.gyp b/node.gyp
-index a6f7e6e5b..5b95c5778 100644
---- a/node.gyp
-+++ b/node.gyp
-@@ -1,6 +1,7 @@
- {
-   'variables': {
-     'v8_use_snapshot%': 'false',
-+    'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp',
-     'node_use_dtrace%': 'false',
-     'node_use_lttng%': 'false',
-     'node_use_etw%': 'false',
-@@ -127,6 +128,8 @@
- 
-       'dependencies': [
-         'node_js2c#host',
-+        '<(v8_gyp_path):v8',
-+        '<(v8_gyp_path):v8_libplatform'
-       ],
- 
-       'include_dirs': [
-@@ -258,8 +261,8 @@
-         }],
-         [ 'node_use_bundled_v8=="true"', {
-           'dependencies': [
--            'deps/v8/tools/gyp/v8.gyp:v8',
--            'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
-+            '<(v8_gyp_path):v8',
-+            '<(v8_gyp_path):v8_libplatform'
-           ],
-         }],
-         [ 'node_use_v8_platform=="true"', {
-@@ -869,13 +872,13 @@
-         }],
-         [ 'node_use_v8_platform=="true"', {
-           'dependencies': [
--            'deps/v8/tools/gyp/v8.gyp:v8_libplatform',
-+            '<(v8_gyp_path):v8_libplatform',
-           ],
-         }],
-         [ 'node_use_bundled_v8=="true"', {
-           'dependencies': [
--            'deps/v8/tools/gyp/v8.gyp:v8',
--            'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
-+            '<(v8_gyp_path):v8',
-+            '<(v8_gyp_path):v8_libplatform'
-           ],
-         }],
-       ]
-diff --git a/src/node_main.cc b/src/node_main.cc
-index bde397562..5b5a6dd99 100644
---- a/src/node_main.cc
-+++ b/src/node_main.cc
-@@ -49,11 +49,13 @@ int wmain(int argc, wchar_t *wargv[]) {
- }
- #else
- // UNIX
-+#include <stdlib.h>
- int main(int argc, char *argv[]) {
-   // Disable stdio buffering, it interacts poorly with printf()
-   // calls elsewhere in the program (e.g., any logging from V8.)
-   setvbuf(stdout, nullptr, _IONBF, 0);
-   setvbuf(stderr, nullptr, _IONBF, 0);
-+  putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1");
-   return node::Start(argc, argv);
- }
- #endif
--- 
-2.11.0
-
diff --git a/dev-util/electron/files/electron-1.3.6-vendor-brightray.patch b/dev-util/electron/files/electron-1.3.6-vendor-brightray.patch
deleted file mode 100644
index 5f789e784479..000000000000
--- a/dev-util/electron/files/electron-1.3.6-vendor-brightray.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 08a13bec9d06a0ea3d86b8a3126cf83a200a8320 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:14:58 -0500
-Subject: [PATCH] brightray build fixes
-
----
- brightray.gyp  | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
- brightray.gypi | 20 +++++++-------------
- 2 files changed, 55 insertions(+), 17 deletions(-)
-
-diff --git a/brightray.gyp b/brightray.gyp
-index d089dba..a34b090 100644
---- a/brightray.gyp
-+++ b/brightray.gyp
-@@ -1,7 +1,7 @@
- {
-   'variables': {
-     # The libraries brightray will be compiled to.
--    'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss'
-+    'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gmodule-2.0 nss'
-   },
-   'includes': [
-     'filenames.gypi',
-@@ -9,6 +9,11 @@
-   'targets': [
-     {
-       'target_name': 'brightray',
-+      'dependencies': [
-+        'cups',
-+        'gconf',
-+        '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all'
-+      ],
-       'type': 'static_library',
-       'include_dirs': [
-         '.',
-@@ -104,12 +109,9 @@
-             }, {
-               'link_settings': {
-                 'libraries': [
--                  # Link with ffmpeg.
--                  '<(libchromiumcontent_dir)/libffmpeg.so',
-                   # Following libraries are required by libchromiumcontent:
-                   '-lasound',
-                   '-lcap',
--                  '-lcups',
-                   '-lrt',
-                   '-ldl',
-                   '-lresolv',
-@@ -333,5 +335,47 @@
-         }],  # OS=="win"
-       ],
-     },
-+    {
-+      'target_name': 'gconf',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_gconf==1 and _toolset=="target"', {
-+          'direct_dependent_settings': {
-+            'cflags': [
-+              '<!@(<(pkg-config) --cflags gconf-2.0)',
-+            ],
-+            'defines': [
-+              'USE_GCONF',
-+            ],
-+          },
-+          'link_settings': {
-+            'ldflags': [
-+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
-+            ],
-+            'libraries': [
-+              '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
-+            ],
-+          },
-+        }],
-+      ],
-+    },
-+    {
-+      'target_name': 'cups',
-+      'type': 'none',
-+      'conditions': [
-+        ['use_cups==1', {
-+          'direct_dependent_settings': {
-+            'defines': [
-+              'USE_CUPS',
-+            ],
-+            'link_settings': {
-+              'libraries': [
-+                '-lcups',
-+              ],
-+            },
-+          },
-+        }],
-+      ],
-+    },
-   ],
- }
-diff --git a/brightray.gypi b/brightray.gypi
-index 634aec0..8d86999 100644
---- a/brightray.gypi
-+++ b/brightray.gypi
-@@ -1,9 +1,13 @@
- {
--  'includes': [
--    'vendor/download/libchromiumcontent/filenames.gypi',
--  ],
-   'variables': {
-     'libchromiumcontent_component%': 1,
-+    'libchromiumcontent_src_dir': '<(DEPTH)',
-+    'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
-+    'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)',
-+    'libchromiumcontent_shared_libraries': [],
-+    'libchromiumcontent_static_libraries': [],
-+    'libchromiumcontent_shared_v8_libraries': [],
-+    'libchromiumcontent_static_v8_libraries': [],
-     'pkg-config%': 'pkg-config',
-     'conditions': [
-       # The "libchromiumcontent_component" is defined when calling "gyp".
-@@ -234,22 +238,12 @@
-         'conditions': [
-           ['OS=="linux"', {
-             'cflags': [
--              '-O2',
--              # Generate symbols, will be stripped later.
--              '-g',
--              # Don't emit the GCC version ident directives, they just end up
--              # in the .comment section taking up binary size.
--              '-fno-ident',
-               # Put data and code in their own sections, so that unused symbols
-               # can be removed at link time with --gc-sections.
-               '-fdata-sections',
-               '-ffunction-sections',
-             ],
-             'ldflags': [
--              # Specifically tell the linker to perform optimizations.
--              # See http://lwn.net/Articles/192624/ .
--              '-Wl,-O1',
--              '-Wl,--as-needed',
-               '-Wl,--gc-sections',
-             ],
-           }],  # OS=="linux"
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-1.3.6-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-1.3.6-vendor-libchromiumcontent.patch
deleted file mode 100644
index ed3815006164..000000000000
--- a/dev-util/electron/files/electron-1.3.6-vendor-libchromiumcontent.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 0448735817b941e5039616144aa836c2f08c9c54 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:12:12 -0500
-Subject: [PATCH] libchromiumcontent build fixes
-
----
- chromiumcontent/chromiumcontent.gyp  |  7 ++++---
- chromiumcontent/chromiumcontent.gypi | 21 ---------------------
- 2 files changed, 4 insertions(+), 24 deletions(-)
-
-diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp
-index 5278324..41e7de3 100644
---- a/chromiumcontent/chromiumcontent.gyp
-+++ b/chromiumcontent/chromiumcontent.gyp
-@@ -24,11 +24,11 @@
-     },
-     {
-       'target_name': 'chromiumcontent',
--      # Build chromiumcontent as shared_library otherwise some static libraries
--      # will not build.
--      'type': 'shared_library',
-+      'type': 'static_library',
-       'dependencies': [
-         '<(DEPTH)/components/prefs/prefs.gyp:prefs',
-+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
-+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-         '<(DEPTH)/components/components.gyp:cdm_renderer',
-         '<(DEPTH)/components/components.gyp:devtools_discovery',
-         '<(DEPTH)/components/components.gyp:devtools_http_handler',
-@@ -41,6 +41,7 @@
-         '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_proxy',
-         '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_ipc',
-         '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
-+        '<(DEPTH)/third_party/WebKit/Source/config.gyp:config',
-         '<(DEPTH)/third_party/webrtc/modules/modules.gyp:desktop_capture',
-         '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
-         '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
-diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi
-index 6d605a2..bd28a21 100644
---- a/chromiumcontent/chromiumcontent.gypi
-+++ b/chromiumcontent/chromiumcontent.gypi
-@@ -1,17 +1,5 @@
- {
-   'variables': {
--    # Don't use nacl.
--    'disable_nacl': 1,
--    # Enable using proprietary codecs.
--    'proprietary_codecs': 1,
--    # Build ffmpeg as shared library.
--    'ffmpeg_component': 'shared_library',
--    # Enable support for Widevine CDM.
--    'enable_widevine': 1,
--    # Using libc++ requires building for >= 10.7.
--    'mac_deployment_target': '10.8',
--    # Use the standard way of linking with msvc runtime.
--    'win_use_allocator_shim': 0,
-     # The V8 libraries.
-     'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
-     # The icu libraries.
-@@ -22,15 +10,6 @@
-         'v8_use_external_startup_data': 1,
-       }],
-       ['OS=="linux"', {
--        # Enable high DPI support on Linux.
--        'enable_hidpi': 1,
--        # Use Dbus.
--        'use_dbus': 1,
--        # Make Linux build contain debug symbols, this flag will add '-g' to
--        # cflags.
--        'linux_dump_symbols': 1,
--        # Force using gold linker.
--        'linux_use_bundled_gold': 1,
-         'conditions': [
-           ['target_arch=="arm"', {
-             'arm_version': 7,
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-1.3.6.patch b/dev-util/electron/files/electron-1.3.6.patch
deleted file mode 100644
index 57ebe31a27b9..000000000000
--- a/dev-util/electron/files/electron-1.3.6.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-From d6b2c31fe1b21d171ecedcd2a198bd5b8347bd98 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Mon, 8 Feb 2016 15:16:40 -0500
-Subject: [PATCH] electron build fixes
-
----
- common.gypi               | 52 ++++++++++++++++++++++++++++++++------
- electron.gyp              | 63 ++++++++++++++++++++++++++++++++++++-----------
- filenames.gypi            |  1 -
- toolchain.gypi            | 47 +----------------------------------
- tools/atom_source_root.py |  5 ++++
- tools/get-endianness.py   |  4 +++
- tools/js2asar.py          | 13 +++++-----
- 7 files changed, 110 insertions(+), 75 deletions(-)
- create mode 100644 tools/atom_source_root.py
- create mode 100644 tools/get-endianness.py
-
-diff --git a/common.gypi b/common.gypi
-index 52eba31..55f061a 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -17,24 +17,20 @@
-     'use_openssl_def': 0,
-     'OPENSSL_PRODUCT': 'libopenssl.a',
-     'node_release_urlbase': 'https://atom.io/download/atom-shell',
--    'node_byteorder': '<!(node <(DEPTH)/tools/get-endianness.js)',
-+    'node_byteorder': '<!(python <(DEPTH)/tools/get-endianness.py)',
-     'node_target_type': 'shared_library',
-     'node_install_npm': 'false',
-     'node_prefix': '',
-     'node_shared': 'true',
--    'node_shared_cares': 'false',
--    'node_shared_http_parser': 'false',
--    'node_shared_libuv': 'false',
--    'node_shared_openssl': 'false',
-     'node_shared_v8': 'true',
--    'node_shared_zlib': 'false',
-     'node_tag': '',
-+    'node_module_version': '',
-     'node_use_dtrace': 'false',
-     'node_use_etw': 'false',
-     'node_use_mdb': 'false',
-     'node_use_openssl': 'true',
-     'node_use_perfctr': 'false',
--    'node_use_v8_platform': 'false',
-+    'node_use_v8_platform': 'true',
-     'node_use_bundled_v8': 'false',
-     'uv_library': 'static_library',
-     'uv_parent_path': 'vendor/node/deps/uv',
-@@ -43,10 +39,37 @@
-     'v8_postmortem_support': 'false',
-     'v8_enable_i18n_support': 'false',
-     'v8_inspector': 'false',
-+    'v8_gyp_path': '<(DEPTH)/v8/src/v8.gyp',
-+    'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]',
-+    'v8_target_type': 'shared_library',
-+    'v8_use_snapshot': 'true',
-+    'v8_use_external_startup_data': 1,
-   },
-   # Settings to compile node under Windows.
-   'target_defaults': {
-     'target_conditions': [
-+      ['_target_name in <(v8_libraries) + ["node"]', {
-+        'cflags!': [
-+          '-fvisibility=hidden',
-+          '-fdata-sections',
-+          '-ffunction-sections',
-+        ],
-+        'cflags_cc!': [
-+          '-fvisibility-inlines-hidden'
-+        ],
-+      }],
-+
-+      ['_target_name in <(v8_libraries) + ["mksnapshot"]', {
-+        'defines': [
-+          'V8_SHARED',
-+          'BUILDING_V8_SHARED',
-+        ],
-+      }],
-+
-+      ['_target_name in ["icuuc", "icui18n"]', {
-+        'cflags_cc!': ['-fno-rtti']
-+      }],
-+
-       ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node", "zlib"]', {
-         'msvs_disabled_warnings': [
-           4003,  # not enough actual parameters for macro 'V'
-@@ -253,6 +276,21 @@
-           }],  # OS=="win"
-         ],
-       }],
-+      ['_target_name=="shell_runner_host_lib"', {
-+        'conditions': [
-+          ['icu_use_data_file_flag==1', {
-+            'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
-+          }, { # else icu_use_data_file_flag !=1
-+            'conditions': [
-+              ['OS=="win"', {
-+                'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
-+              }, {
-+                'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
-+              }],
-+            ],
-+          }],
-+        ],
-+      }],
-     ],
-     'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
-     'msvs_disabled_warnings': [
-diff --git a/electron.gyp b/electron.gyp
-index eb671fd..7253b37 100644
---- a/electron.gyp
-+++ b/electron.gyp
-@@ -30,6 +30,7 @@
-       'dependencies': [
-         'js2asar',
-         'app2asar',
-+        'nodebin',
-         '<(project_name)_lib',
-       ],
-       'sources': [
-@@ -164,7 +165,7 @@
-           ],
-         }, {
-           'dependencies': [
--            'vendor/breakpad/breakpad.gyp:dump_syms#host',
-+            'breakpad/breakpad.gyp:dump_syms#host',
-           ],
-         }],  # OS=="win"
-         ['OS=="linux"', {
-@@ -181,7 +182,7 @@
-                   }, {
-                     'copied_libraries': [
-                       '<(PRODUCT_DIR)/lib/libnode.so',
--                      '<(libchromiumcontent_dir)/libffmpeg.so',
-+                      '<(PRODUCT_DIR)/lib/libv8.so',
-                     ],
-                   }],
-                 ],
-@@ -189,13 +190,8 @@
-               'destination': '<(PRODUCT_DIR)',
-               'files': [
-                 '<@(copied_libraries)',
--                '<(libchromiumcontent_dir)/locales',
--                '<(libchromiumcontent_dir)/icudtl.dat',
--                '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
-+                '<(libchromiumcontent_dir)/repack/chrome_200_percent.pak',
-                 '<(libchromiumcontent_dir)/content_shell.pak',
--                '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
--                '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
-                 '<(libchromiumcontent_dir)/natives_blob.bin',
-                 '<(libchromiumcontent_dir)/snapshot_blob.bin',
-               ],
-@@ -230,15 +226,14 @@
-         '<@(lib_sources)',
-       ],
-       'include_dirs': [
--        '.',
-         'chromium_src',
-+        '.',
-         'vendor/brightray',
-         'vendor/native_mate',
-         # Include atom_natives.h.
-         '<(SHARED_INTERMEDIATE_DIR)',
-         # Include directories for uv and node.
-         'vendor/node/src',
--        'vendor/node/deps/http_parser',
-         'vendor/node/deps/uv/include',
-         # The `node.h` is using `#include"v8.h"`.
-         '<(libchromiumcontent_src_dir)/v8/include',
-@@ -289,8 +284,8 @@
-             'vendor/node/deps/uv/uv.gyp:libuv',
-             'vendor/node/deps/zlib/zlib.gyp:zlib',
-             # Build with breakpad support.
--            'vendor/breakpad/breakpad.gyp:breakpad_handler',
--            'vendor/breakpad/breakpad.gyp:breakpad_sender',
-+            'breakpad/breakpad.gyp:breakpad_handler',
-+            'breakpad/breakpad.gyp:breakpad_sender',
-           ],
-         }],  # OS=="win"
-         ['OS=="mac" and mas_build==0', {
-@@ -328,7 +323,7 @@
-               # Make binary search for libraries under current directory, so we
-               # don't have to manually set $LD_LIBRARY_PATH:
-               # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable
--              '-rpath \$$ORIGIN',
-+              '-Wl,-rpath=\$$ORIGIN/',
-               # Make native module dynamic loading work.
-               '-rdynamic',
-             ],
-@@ -339,10 +334,10 @@
-             '-Wno-reserved-user-defined-literal',
-           ],
-           'include_dirs': [
--            'vendor/breakpad/src',
-+            'breakpad/src',
-           ],
-           'dependencies': [
--            'vendor/breakpad/breakpad.gyp:breakpad_client',
-+            'breakpad/breakpad.gyp:breakpad_client',
-           ],
-         }],  # OS=="linux"
-       ],
-@@ -350,6 +345,9 @@
-     {
-       'target_name': 'js2asar',
-       'type': 'none',
-+      'dependencies': [
-+        'nodebin'
-+      ],
-       'actions': [
-         {
-           'action_name': 'js2asar',
-@@ -371,6 +369,7 @@
-           'action': [
-             'python',
-             'tools/js2asar.py',
-+            '<(PRODUCT_DIR)/nodebin',
-             '<@(_outputs)',
-             'lib',
-             '<@(_inputs)',
-@@ -381,6 +380,9 @@
-     {
-       'target_name': 'app2asar',
-       'type': 'none',
-+      'dependencies': [
-+        'nodebin'
-+      ],
-       'actions': [
-         {
-           'action_name': 'app2asar',
-@@ -402,6 +404,7 @@
-           'action': [
-             'python',
-             'tools/js2asar.py',
-+            '<(PRODUCT_DIR)/nodebin',
-             '<@(_outputs)',
-             'default_app',
-             '<@(_inputs)',
-@@ -430,6 +433,36 @@
-         }
-       ],
-     },  # target atom_js2c
-+    {
-+      'target_name': 'nodebin',
-+      'type': 'executable',
-+      'sources': [
-+        'vendor/node/src/node_main.cc',
-+      ],
-+      'dependencies': [
-+        'vendor/node/node.gyp:node',
-+      ],
-+      'include_dirs': [
-+        '.',
-+        'vendor/native_mate',
-+        # Include atom_natives.h.
-+        '<(SHARED_INTERMEDIATE_DIR)',
-+        # Include directories for uv and node.
-+        'vendor/node/src',
-+        'vendor/node/deps/uv/include',
-+        # The `node.h` is using `#include"v8.h"`.
-+        '<(libchromiumcontent_src_dir)/v8/include',
-+        # The `node.h` is using `#include"ares.h"`.
-+        'vendor/node/deps/cares/include',
-+      ],
-+      'link_settings': {
-+        'ldflags': [
-+          '-Wl,-rpath=\$$ORIGIN/',
-+          # Make native module dynamic loading work.
-+          '-rdynamic',
-+        ],
-+      },
-+    },  # target nodebin
-   ],
-   'conditions': [
-     ['OS=="mac"', {
-diff --git a/filenames.gypi b/filenames.gypi
-index 9e20582..c7960a9 100644
---- a/filenames.gypi
-+++ b/filenames.gypi
-@@ -558,7 +558,6 @@
-       'chromium_src/extensions/browser/app_window/size_constraints.h',
-       'chromium_src/extensions/common/url_pattern.cc',
-       'chromium_src/extensions/common/url_pattern.h',
--      'chromium_src/library_loaders/libspeechd_loader.cc',
-       'chromium_src/library_loaders/libspeechd.h',
-       'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc',
-       'chromium_src/net/test/embedded_test_server/stream_listen_socket.h',
-diff --git a/toolchain.gypi b/toolchain.gypi
-index 1c5f8a7..2af11f5 100644
---- a/toolchain.gypi
-+++ b/toolchain.gypi
-@@ -16,7 +16,7 @@
-       'arm_neon%': 1,
- 
-       # Abosulte path to source root.
--      'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)',
-+      'source_root%': '<!(python <(DEPTH)/tools/atom_source_root.py)',
-     },
- 
-     # Copy conditionally-set variables out one scope.
-@@ -40,34 +40,6 @@
-         'mac_sdk%': '<!(python <(DEPTH)/tools/mac/find_sdk.py <(mac_sdk_min))',
-       }],
- 
--      ['OS=="linux"', {
--        'variables': {
--          # The system libdir used for this ABI.
--          'system_libdir%': 'lib',
--
--          # Setting the path to sysroot.
--          'conditions': [
--            ['target_arch=="arm"', {
--              # sysroot needs to be an absolute path otherwise it generates
--              # incorrect results when passed to pkg-config
--              'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot',
--            }],
--            ['target_arch=="ia32"', {
--              'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
--            }],
--            ['target_arch=="x64"', {
--              'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
--            }],
--          ],
--        },
--        # Copy conditionally-set variables out one scope.
--        'sysroot%': '<(sysroot)',
--        'system_libdir%': '<(system_libdir)',
--
--        # Redirect pkg-config to search from sysroot.
--        'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
--      }],
--
-       # Set default compiler flags depending on ARM version.
-       ['arm_version==6', {
-         'arm_arch%': 'armv6',
-@@ -136,23 +108,6 @@
-       },
-     }],
- 
--    # Setup sysroot environment.
--    ['OS=="linux" and target_arch in ["arm", "ia32", "x64"]', {
--      'target_defaults': {
--        'target_conditions': [
--          ['_toolset=="target"', {
--            'cflags': [
--              '--sysroot=<(sysroot)',
--            ],
--            'ldflags': [
--              '--sysroot=<(sysroot)',
--              '<!(<(source_root)/tools/linux/sysroot_ld_path.sh <(sysroot))',
--            ],
--          }]
--        ],
--      },
--    }],  # sysroot
--
-     # Setup cross-compilation on Linux.
-     ['OS=="linux"', {
-       'target_defaults': {
-diff --git a/tools/atom_source_root.py b/tools/atom_source_root.py
-new file mode 100644
-index 0000000..316e997
---- /dev/null
-+++ b/tools/atom_source_root.py
-@@ -0,0 +1,5 @@
-+#!/usr/bin/env python
-+
-+import os.path
-+
-+print(os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
-diff --git a/tools/get-endianness.py b/tools/get-endianness.py
-new file mode 100644
-index 0000000..3150793
---- /dev/null
-+++ b/tools/get-endianness.py
-@@ -0,0 +1,4 @@
-+#!/usr/bin/env python
-+
-+import sys
-+print(sys.byteorder)
-diff --git a/tools/js2asar.py b/tools/js2asar.py
-index adad175..ca76868 100755
---- a/tools/js2asar.py
-+++ b/tools/js2asar.py
-@@ -11,13 +11,14 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
- 
- 
- def main():
--  archive = sys.argv[1]
--  folder_name = sys.argv[2]
--  source_files = sys.argv[3:]
-+  node = sys.argv[1]
-+  archive = sys.argv[2]
-+  folder_name = sys.argv[3]
-+  source_files = sys.argv[4:]
- 
-   output_dir = tempfile.mkdtemp()
-   copy_files(source_files, output_dir)
--  call_asar(archive, os.path.join(output_dir, folder_name))
-+  call_asar(node, archive, os.path.join(output_dir, folder_name))
-   shutil.rmtree(output_dir)
- 
- 
-@@ -28,11 +29,11 @@ def copy_files(source_files, output_dir):
-     shutil.copy2(source_file, output_path)
- 
- 
--def call_asar(archive, output_dir):
-+def call_asar(node, archive, output_dir):
-   asar = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'asar')
-   if sys.platform in ['win32', 'cygwin']:
-     asar += '.cmd'
--  subprocess.check_call([asar, 'pack', output_dir, archive])
-+  subprocess.check_call([node, asar, 'pack', output_dir, archive])
- 
- 
- def safe_mkdir(path):
--- 
-2.7.3
-
diff --git a/dev-util/electron/files/electron-vendor-node-external-snapshots-r0.patch b/dev-util/electron/files/electron-vendor-node-external-snapshots-r0.patch
deleted file mode 100644
index d3fce0868cd4..000000000000
--- a/dev-util/electron/files/electron-vendor-node-external-snapshots-r0.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 820cb5ce8e1aa08e68fe0f2e3cbbe74972e7af84 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Sat, 11 Jun 2016 18:27:19 -0400
-Subject: [PATCH] Add support for external V8 snapshots
-
----
- src/node.cc | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 86 insertions(+)
-
-diff --git a/src/node.cc b/src/node.cc
-index 961abc2..4dac94b 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -4188,6 +4188,90 @@ Environment* CreateEnvironment(Isolate* isolate,
-   return env;
- }
- 
-+#include <sys/mman.h>
-+
-+const char kProcSelfExe[] = "/proc/self/exe";
-+const char kNativesFileName[] = "natives_blob.bin";
-+const char kSnapshotFileName[] = "snapshot_blob.bin";
-+const char *g_mapped_natives = nullptr;
-+const char *g_mapped_snapshot = nullptr;
-+
-+static char* SnapshotPath(const char* filename) {
-+  char *path;
-+  char *dir;
-+  ssize_t r;
-+
-+  path = reinterpret_cast<char*>(malloc(4096 + strlen(filename) + 2));
-+  if (path == nullptr) {
-+    fprintf(stderr, "out of memory\n");
-+    ABORT();
-+  }
-+
-+  r = readlink(kProcSelfExe, path, 4096 + 1);
-+  if (r == -1) {
-+    perror("could not determine node executable directory");
-+    ABORT();
-+  }
-+
-+  path[r] = '\0';
-+
-+  dir = strrchr(path, '/');
-+
-+  strcpy(dir + 1, filename);
-+
-+  return path;
-+}
-+
-+static void LoadV8Snapshot(const char* name, const char** addr, size_t *size) {
-+  char *path = SnapshotPath(name);
-+  int fd;
-+  struct stat sb;
-+
-+  fd = open(path, O_RDONLY);
-+
-+  if (fd == -1) {
-+    fprintf(stderr, "could not open snapshot file '%s': %s\n",
-+            path, sys_errlist[errno]);
-+    ABORT();
-+  }
-+
-+  if (fstat(fd, &sb) == -1) {
-+    fprintf(stderr, "could not stat snapshot file '%s': %s\n",
-+            path, sys_errlist[errno]);
-+    ABORT();
-+  }
-+
-+  *size = sb.st_size;
-+
-+  *addr = reinterpret_cast<const char*>(
-+            mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0));
-+  if (*addr == MAP_FAILED) {
-+    fprintf(stderr, "could not read snapshot file '%s': %s\n",
-+            path, sys_errlist[errno]);
-+    ABORT();
-+  }
-+
-+  close(fd);
-+  free(path);
-+}
-+
-+static void LoadV8Snapshots() {
-+  size_t natives_size;
-+  size_t snapshot_size;
-+
-+  LoadV8Snapshot(kNativesFileName, &g_mapped_natives, &natives_size);
-+  LoadV8Snapshot(kSnapshotFileName, &g_mapped_snapshot, &snapshot_size);
-+
-+  v8::StartupData natives;
-+  natives.data = g_mapped_natives;
-+  natives.raw_size = natives_size;
-+  V8::SetNativesDataBlob(&natives);
-+
-+  v8::StartupData snapshot;
-+  snapshot.data = g_mapped_snapshot;
-+  snapshot.raw_size = snapshot_size;
-+  V8::SetSnapshotDataBlob(&snapshot);
-+}
- 
- // Entry point for new node instances, also called directly for the main
- // node instance.
-@@ -4301,6 +4385,8 @@ int Start(int argc, char** argv) {
-   const char** exec_argv;
-   Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
- 
-+  LoadV8Snapshots();
-+
- #if HAVE_OPENSSL
- #ifdef NODE_FIPS_MODE
-   // In the case of FIPS builds we should make sure
--- 
-2.7.3
-
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index bb2475cf47a7..cb71c9771bb9 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
 	<use>
-		<flag name="hidpi">Enable support for high-resolution screens (high dots per inch)</flag>
 		<flag name="lto">Build with link time optimization enabled</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>