gentoo resync : 27.10.2018

5 files changed, 965 insertions, 28 deletions

diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index a39d5d39f6b7..151953218b1d 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -1,26 +1,34 @@
 AUX electron-1.7.15-v8-crankshaft-rce-fix.patch 1581 BLAKE2B a78c4bccca8ca37957d714e6cb29c893fabdd1960a4b20145e6d86f701ff6be69b2495d90563fa5314c350c60d7d81c382a417347f924ae1c24ff13a0e90fa82 SHA512 3a9423434ce03744b5eb7c8850c6908e8c94e23fed3bc5d87bde09e6c47eb429eb0852b8453b3311a2f640b8d9d136343155743d633206ff85c9ac5a4f75106f
-AUX toolchain/BUILD.gn 400 BLAKE2B 5237bf9cdb5be027aa8dff5b854297f51fa5f8a09f5b24a1b5c6c4494126e16573f2bafe503389566507d60818880286efca8ccc9ce8f5cc560faf76f2df6c42 SHA512 cc36ab3406dcaedfd9472e94c53d3f25c4f5e25e2d1275e2bc99b8e18ffdf6de1583f7e0ceadfb8a8d10ab3e5d7018b84ec506e3b31a0a55cfb9453fb19ad3d0
+AUX toolchain/BUILD.gn 799 BLAKE2B c1a088f005100fe77846bde9405ff8e68b65ce8798c4f746609575afdcbefe402e8d10ca55ecc195080752db9c48489ec66aaa658045e32337b9fb599b4d9b36 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d
 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
 DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
 DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
 DIST chromium-58.0.3029.110.tar.xz 518167664 BLAKE2B dc9b4eee10236b892c82c6c12f649aed30454124496794485430e6119ee83e420564b2f2fbd21a3d1525cfb3de3524210c50770cbf74b2dbfdb18b35445a740a SHA512 412dc94e23d6699b959f23956f5f82f4c600050649a8a2e694bb2c6e166245e3670f4549ee1c08a0df05b4e361f040d1739515180b8631adbfac9c907af8d93f
-DIST electron-1.6.16.tar.gz 4957555 BLAKE2B c72433ed076bc6b68b81b136db4dcf1a0fe17f16c7859e5176c215d86164f0c3d531310d8edbee9f52038722aa6dbc7934d9d9a5511bcb978bb9c255122f1794 SHA512 f657aae526defa8526948c89b8667475d1fb27f1884a1a4655773052cf3b3578483d3d51e35e6aa077579c3023056eec5d2a06f24a2c4013ca078fb82f850182
-DIST electron-1.7.15.tar.gz 5172906 BLAKE2B 9b3785eed455cf2864572582a37cb7b107e96b207879c8975870383714bc1103073840409246392433af7c4edf2404d519d16ea4185cb1e6925b2ef6cf93a9aa SHA512 ade60d6810a85f9d92ff8213d2c38059f49dd8304220feb0759622390176d9a145b14b2df1b2541cb153ffff4c83d00001297c3d85de0530a1a75e0544e22fe2
+DIST chromium-61.0.3163.100.tar.xz 556305252 BLAKE2B 88b9dc05d626ec33c2044cd8bb5a5bd2e36c4ba5c231230b5b6529d62cc100874099d17633ca320a0c668b130797d6b222107d2efcd6f80b5b0b460d378f4454 SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78
+DIST electron-1.6.18.tar.gz 4965032 BLAKE2B ecb085a75717fb472740583dbd31634bd8b4be8365fdaf3334e558a8076577d3a973ba78c87136bdf42be14a8fcbe0b7816f49a1eccc162c62941485a2bb09fb SHA512 bd10d34e9a91350671a8c1af807fd01d7379bd7c9eca7c3f096349a5dbefaa78e063ee6a27fa5029a19daec0ca70fbe45f9964e27945a5f47ac83416540aacda
+DIST electron-1.7.16.tar.gz 5174554 BLAKE2B 421fde393533c4af26a046a3a1a6ef067306ac6990fe9b7f74436b00e939b85d07f39bb7b9f02547288105adfd069f2640238e83cf444a3a99723441da0556f9 SHA512 84815598f14330916dc65f1326a841e73a8c1551c4b9ba21667562f6c67eb770529b3049d53951e91b07356e4d7cfc3ed3a5e3722305d7282adfc871c3195a35
+DIST electron-2.0.10.tar.gz 3012289 BLAKE2B 3d4f2560e754917c7e72e6450ccf9d6d5f8a7741fb5c426d6db9cad01780be5531671bea55eb9033f5de288617d8cc366a17b1a77eac5bd32440ff8e9ee53a5e SHA512 5663e9b018a51bf7f7c87a8c5b51cf631a91980bf01fdcb207f2054da2bfaffdebfe027bd8c27dfa0af523fd09ec1c52076a7f6de9c5bf9a0ffbb898d1797b59
+DIST electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz 5168487 BLAKE2B 41583e3297c2e8a612720f2087720cb7bc4ebf0aaaf5481029bd65458b26e5e824da283f474cf70d8933f80538e9f6c4b8a5843f27a6448b727ec9f12578b526 SHA512 303d1545dbe8e5fdece0fcd90c2ad09fab24483b176df1491580b9b382a607c0a814681cd58bcb7166b9cfc5af882a2b0d2fcc175d23f747b37c921040b68310
 DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
 DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
+DIST electron-chromium-breakpad-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz 1141359 BLAKE2B 7145fc178dcb62e9f14123da03e98f5e37c29f3a58799e675b3638eb0694771d1320de8bc70d97daa5c8c21db548efa3aa3c86d2018d6cea95f288b39cae4020 SHA512 4c8353a34061f4e061bb9e23945c0fb7a56f1b9f249b323cd3315cafcecdaca5c1f63940e2334ded03413cf26f5aa4a5bd8f1720fb2ba422a97d70f121d7d3d4
 DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10
 DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86
-DIST electron-libchromiumcontent-2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz 70588 BLAKE2B 1f4d76577547c3dc24ca615f16563260ef44e6d6944ae0486cd7965bbdfa4149f26fe827c13cdbc8372eec95c1698763a56a645ac9845f9685ef752e33ab5ddb SHA512 2d065b024eb9928ba8abfa03d729b3ab1da96f436b76999371641dd468b38167b0812ff8538db1b7e1dc6a4f102cfbcce9cb8580837d593b0369d37c9f63c2c7
+DIST electron-libchromiumcontent-4a4acde5522c21fe2f0a21f5ca29f99e90b03adc.tar.gz 73046 BLAKE2B 051b69473c5a97746aa2f18fc94d4909ad52e0a0edc638ba3950d70b46fb798523da0d62f4a7f427187f80406f8efc3c9e04039f90567521c4f29adb0ab82fbf SHA512 960f8b27adcf0df459bae024092971e8c10f1dfa933e3374303d7fd0ecaf2cf201674c474dfce6500609d229f1b4441968dfbc46a2d6220723b7ceebec277dba
 DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
+DIST electron-libchromiumcontent-cbd04c0dccc7655cd42f02baee3a622d5170ac08.tar.gz 161487 BLAKE2B de2f7f708aafc2f9033fb0dbee50880f9441196c81ba355bae966a1ffbb0c2f30c86cbb30021af599ac3abf071431f99c07a7a51b45db41901624148e1988369 SHA512 f207fdddecda879ff3c83e1503af0e919c1f6fe2e3666ac9d40c9fc21dfb3a679e1f0ab3ce7b89057a412934c5a9c96ed846761c669875ee0c3a1955308be184
+DIST electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz 24130 BLAKE2B b807a13d01ccd07a3310d8551cafee69a111bb342ee9e15bc0a20243c6f98638e3f18ddd716389fcabace064d4b98acbe50ff6eed862d8d46d152c8bd6f562b2 SHA512 c9ca33f7f96f52aae132f0e4cbd141fe28cea96b9e2c9fadcac40e3bd09d417469fac2851ad1c49790a4533174df0bec9d5ad45203a1358b3d4a2c0df49903fa
 DIST electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz 24066 BLAKE2B 622d0ee16fd35a98c154bad7cd271350b6d0c2da0d1df1b0effde6ddb52eea3530921a746c96eed2130ae403c3ef00dac8a86a8a896afcc9b4e74d03a17fb727 SHA512 99a6e67469852a84a7a4b1585a1ff9d32491f9bab511a3853c630ac30bf1c703d0b1c0f8830a546f2665dfe87f1f582860dfabb332909f6973e64dff2ed4b5f4
 DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
+DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAKE2B 36f91e8ae7d1ae4e99c44128398589e015224c664c86d3869327a4c433fdf8efdb758d4462ec3d8997399bf6d62cfe63f91ae8ee4886aab7817b1654c94592a2 SHA512 8f31577a4ef836b5535ec69d8a020c06e92c01667a0d4b857fcb6789025a6903d42ba3f9b51fd0828d39e88dd7ba44a07cfb3a59023b04c4f5cb89e1a27874bc
 DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
 DIST electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz 46772284 BLAKE2B 453ade1d1540f099d7225f3c758fc1455dcae3a6b8ada00c20b85519bfd61beb3fc3beb083f063de2ce52c5b2e83eb67acea23f2605e201031b42552747e522b SHA512 532bc27e026fd032e8747150bac885277ae2e6cede3053e61690b846e380d664daa0b49e843c44d937a5f84f902f149323b8dc873dcfcf8ddc27b6feb1df750d
-DIST electron-patches-1.6.16.tar.gz 28592 BLAKE2B bd64ff7ad03a8ecb9422702cc33746d57464228a3ee7ae7fa9ecc30ad5507a8cb2db71caf5f6700cfe1d963e9957d50c1e5c784e148aaabc11aef9d90d2508f0 SHA512 b53b5f88532a0898878abac71b36c410c3734da871266703932238f707e54a4f6af92cc4792dc645ba02069ec5e9e548317e0e121556210f69dfbb63d5a1fa03
-DIST electron-patches-1.7.15.tar.gz 58386 BLAKE2B d11ae9fd93cecb71a1ae625ab2377be0040c19ab2c858e4afba72835b4dab3d2f8c19d4192ff9ce4452ddefe54c07800d7530fee443e08b8140ea428752ac4b0 SHA512 deb639de2fcb2f1451e3fdc5dd8beb7fb24d86406430f2202fbda8e719dc7c4f14e9edcded00b8a452e22eac926fb21ab19b16fbc22778a8315d68da3441ae8d
+DIST electron-patches-f0fb7725cfe73704dce84ec51bdccc024dc7ceff.tar.gz 88340 BLAKE2B 759f8da023fae94ac0639387ace26694b2ff9dfd978f783cae2f1ccaaf749200ec2cdcfb771fbd3dc8a605521886c8e3383b7ed565eb250f753d238fd30ad6ef SHA512 c542d8fcf95123dc4ebced608ae0d1d9bc04db67f89c50f219bdf4ed8e916059333d1e3571387bf2992b46c3b0a02692f7ec2531920f693db30c7ed401bb73d4
 DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
+DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
 DIST electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz 38752 BLAKE2B 0fa9e928d64d31fec04c542cb4a4277497d42c621a500cbcb77783bdd20f6251ac075f779229a1f43645f8181734b8a213fa77dc2b906b7846f725978996b488 SHA512 76f996b4a14290f1c3d061c9c2bb3d5869c53c1ef0e395b8faa6dd3470787dd2c6f492d5dcba18d805c0ccc1c6e2a3a602bf873876075d160f69a899a79d953d
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD electron-1.6.16.ebuild 28088 BLAKE2B afaa3c13bff2adb837230c5b44a07a7725b50ea3f4b7e263538c53b5d9f22e837499b089b405b4708bdafb5bfee852c34229c988a5f6c4336f6cc12802868dd1 SHA512 55a4c3c9663294a77d89b8a85a176aad32a4ba9c579be9e5513ecc8742edbf4f2b4e7e94f82a13a44f9d21490735f4a71727938de88864c1d2fc23dd4d7aec0f
-EBUILD electron-1.7.15.ebuild 27961 BLAKE2B adf311387891f08a03493bc4750ec33381a26a3a5877e5bc34946ab0ab97667d79580d24c26674ce314ebccea7cfdb581e536415529dcdc2dd4753fe31c8b00d SHA512 420a2c29b85d773cdf72db90dd1d0e4de03ce9f658d12578a2ad7da5ec825c51685a8934a22bd2161ac2f16af8056a37f1e1a61b1e85ba35e1323cb1513b9b99
+EBUILD electron-1.6.18.ebuild 28186 BLAKE2B 746db1980065510845990dc5c426982f6de9ddd9c74f42503c91b84a04835550243eaa21804408068b143d0295a5bddf23457d811f836ad072d74e792018201e SHA512 0ea10454ec86607f2413d77af97ee9f8152b7f66792a7766723a4453f2c5b629e4d19ee3c57fb900dec888560b458493c3904d25c8cab9c7c32fa65add7e159c
+EBUILD electron-1.7.16.ebuild 28059 BLAKE2B 027bd8197783c279780f947483a95188609f5a8f138406e64eda10e033ede8b58939fad212a2a2bc24e2bdd4444645ab76c63cd89f513ff66fce6d5f2d6f98e1 SHA512 e9856a634e9cdf320e64296830db12968cafd2f22186b1f2d5d0d18f05998ff5ce2c0dd0775d83ee1af76c2586dec2c79989b41e5c8028f5090581df3db99adb
+EBUILD electron-2.0.10.ebuild 28636 BLAKE2B 9a1b85fe418e8088ba605bdd223d1c812cd9b77061f9b0ef0dd39a589f68fb65126f407256e6221763408b6eff0017410a27f04a4bd30bba3f8b69e060f65541 SHA512 a92a1178b6200236cf5d68a020ef3a6e54eb839b9077260163e5459237e5f0b3d9aa465fb6e6ce027667d740c7a855d4ea7708d05b38f6575058d0910fe2d584
 MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760
diff --git a/dev-util/electron/electron-1.6.16.ebuild b/dev-util/electron/electron-1.6.18.ebuild
index 58491cdd5640..fc39f787b71a 100644
--- a/dev-util/electron/electron-1.6.16.ebuild
+++ b/dev-util/electron/electron-1.6.18.ebuild
@@ -8,9 +8,9 @@ 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 gnome2-utils flag-o-matic multilib \
+inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
 	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
+	virtualx xdg-utils
 
 # Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
 CHROMIUM_VERSION="56.0.2924.87"
@@ -34,8 +34,9 @@ LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
 # Keep this in sync with package.json#devDependencies
 ASAR_VERSION="0.13.0"
 BROWSERIFY_VERSION="14.0.0"
+GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
 
-PATCHES_P="gentoo-electron-patches-${P}"
+PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
 CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
 BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
 BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
@@ -63,7 +64,7 @@ SRC_URI="
 	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
 	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
 	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
+	https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
 "
 
 S="${WORKDIR}/${P}"
@@ -78,7 +79,7 @@ GRIT_S="${PDF_VIEWER_S}/vendor/grit"
 LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
 
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
@@ -195,11 +196,11 @@ fi
 pre_build_checks() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
 			# bugs: #601654
 			die "At least clang 3.9.1 is required"
 		fi
-		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
 			# bugs: #535730, #525374, #518668, #600288
 			die "At least gcc 4.9 is required"
 		fi
@@ -519,7 +520,7 @@ src_configure() {
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 
 	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries="
+	local gn_system_libraries=(
 		flac
 		harfbuzz-ng
 		icu
@@ -532,11 +533,12 @@ src_configure() {
 		re2
 		snappy
 		yasm
-		zlib"
+		zlib)
 	if use system-ffmpeg; then
-		gn_system_libraries+=" ffmpeg"
+		gn_system_libraries+=( ffmpeg )
 	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
+	build/linux/unbundle/replace_gn_files.py \
+		--system-libraries ${gn_system_libraries[@]} || die
 
 	# Optional dependencies.
 	myconf_gn+=" use_cups=$(usex cups true false)"
diff --git a/dev-util/electron/electron-1.7.15.ebuild b/dev-util/electron/electron-1.7.16.ebuild
index ee39885c1cfa..3f5ca3af95df 100644
--- a/dev-util/electron/electron-1.7.15.ebuild
+++ b/dev-util/electron/electron-1.7.16.ebuild
@@ -8,9 +8,9 @@ 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 gnome2-utils flag-o-matic multilib \
+inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
 	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
+	virtualx xdg-utils
 
 # Keep this in sync with vendor/libchromiumcontent/VERSION
 CHROMIUM_VERSION="58.0.3029.110"
@@ -28,13 +28,14 @@ PDF_VIEWER_COMMIT="beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf"
 # Keep this in sync with vendor/pdf_viewer/vendor/grit
 GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
 # Keep this in sync with vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="2f7b83669315f9492380334d1a8b1cd9bc758efd"
+LIBCHROMIUMCONTENT_COMMIT="4a4acde5522c21fe2f0a21f5ca29f99e90b03adc"
 # Keep this in sync with package.json#devDependencies
 ASAR_VERSION="0.13.0"
 BROWSERIFY_VERSION="14.0.0"
 NINJA_VERSION="1.8.2"
+GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
 
-PATCHES_P="gentoo-electron-patches-${P}"
+PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
 CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
 BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
 BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
@@ -60,7 +61,7 @@ SRC_URI="
 	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
 	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
 	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
+	https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
 	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
 "
 
@@ -75,7 +76,7 @@ GRIT_S="${PDF_VIEWER_S}/vendor/grit"
 LIBCC_S="${S}/vendor/libchromiumcontent"
 
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 IUSE="cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic
 	  +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
@@ -194,11 +195,11 @@ fi
 pre_build_checks() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
 			# bugs: #601654
 			die "At least clang 3.9.1 is required"
 		fi
-		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
 			# bugs: #535730, #525374, #518668, #600288
 			die "At least gcc 4.9 is required"
 		fi
@@ -349,7 +350,7 @@ src_prepare() {
 
 	# Fix broken patch
 	cd "${LIBCC_S}" || die
-	eapply "${FILESDIR}/${P}-v8-crankshaft-rce-fix.patch"
+	eapply "${FILESDIR}/${PN}-1.7.15-v8-crankshaft-rce-fix.patch"
 
 	# Apply libcc Chromium patches.
 	cd "${CHROMIUM_S}" || die
diff --git a/dev-util/electron/electron-2.0.10.ebuild b/dev-util/electron/electron-2.0.10.ebuild
new file mode 100644
index 000000000000..0742d0910c41
--- /dev/null
+++ b/dev-util/electron/electron-2.0.10.ebuild
@@ -0,0 +1,908 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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 eapi7-ver gnome2-utils flag-o-matic multilib \
+	multiprocessing ninja-utils pax-utils portability python-any-r1 \
+	toolchain-funcs virtualx xdg-utils
+
+# Keep this in sync with vendor/libchromiumcontent/VERSION
+CHROMIUM_VERSION="61.0.3163.100"
+# Keep this in sync with vendor/breakpad
+BREAKPAD_COMMIT="82f0452e6b687b3c1e14e08d172b2f3fb79ae91a"
+# Keep this in sync with vendor/breakpad/src (and find the corresponding
+# commit in https://github.com/google/breakpad/)
+BREAKPAD_SRC_COMMIT="67f738b7adb47dc1e3b272fb99062f4192fa6651"
+# Keep this in sync with vendor/node
+NODE_COMMIT="51abeb37cad3f2098c0f0fffdff739f4ac2393e8"
+# Keep this in sync with vendor/native_mate
+NATIVE_MATE_COMMIT="6a3d238b7e1e3742f2bb495336a84021d927a24f"
+# Keep this in sync with vendor/pdf_viewer
+PDF_VIEWER_COMMIT="a5251e497fb52e699b28f627e3cbb6d8cefb62df"
+# Keep this in sync with vendor/pdf_viewer/vendor/grit
+GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
+# Keep this in sync with vendor/libchromiumcontent
+LIBCHROMIUMCONTENT_COMMIT="cbd04c0dccc7655cd42f02baee3a622d5170ac08"
+# Keep this in sync with package.json#devDependencies
+ASAR_VERSION="0.13.0"
+BROWSERIFY_VERSION="14.0.0"
+NINJA_VERSION="1.8.2"
+GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
+
+PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
+CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
+BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
+BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
+NODE_P="node-${NODE_COMMIT}"
+NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
+PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
+GRIT_P="grit-${GRIT_COMMIT}"
+LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
+ASAR_P="asar-${ASAR_VERSION}"
+BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
+
+DESCRIPTION="Cross platform application development framework based on web technologies"
+HOMEPAGE="https://electronjs.org/"
+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/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
+	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_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 -> electron-${NATIVE_MATE_P}.tar.gz
+	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
+	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
+	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
+	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
+	https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
+	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
+"
+
+S="${WORKDIR}/${P}"
+CHROMIUM_S="${S}/chromium"
+NODE_S="${S}/vendor/node"
+BREAKPAD_S="${S}/vendor/breakpad"
+BREAKPAD_SRC_S="${BREAKPAD_S}/src"
+NATIVE_MATE_S="${S}/vendor/native_mate"
+PDF_VIEWER_S="${S}/vendor/pdf_viewer"
+GRIT_S="${PDF_VIEWER_S}/vendor/grit"
+LIBCC_S="${S}/vendor/libchromiumcontent"
+
+LICENSE="BSD"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="cups custom-cflags gconf gnome-keyring 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"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	>=app-eselect/eselect-electron-2.0
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/icu-58:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gconf? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	media-libs/libexif:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	>=media-libs/libvpx-1.7.0:=[postproc,svc]
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	>=net-dns/c-ares-1.13.0:=
+	>=net-libs/nghttp2-1.32.0:=
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	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/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<dev-util/electron-0.36.12-r4
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-4.6.1
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+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/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
+			# bugs: #535730, #525374, #518668, #600288
+			die "At least gcc 4.9 is required"
+		fi
+	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="7G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		CHECKREQS_MEMORY="16G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	# 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%/}/"
+	local path
+	local relpath
+	local out
+
+	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
+	| while read -r path; do
+		relpath="$(dirname ${path})"
+		out="${_s}/__${relpath////_}_$(basename ${path})"
+		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
+			"${_s}/${path}" > "${out}" || die
+	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)"
+}
+
+_get_target_arch() {
+	local myarch="$(tc-arch)"
+	local target_arch
+
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	echo -n "${target_arch}"
+}
+
+src_prepare() {
+	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
+	rm -r "${NODE_S}" &&
+		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
+	rm -r "${BREAKPAD_S}" &&
+		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
+	rm -r "${BREAKPAD_SRC_S}" &&
+		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
+	rm -r "${NATIVE_MATE_S}" &&
+		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
+	rm -r "${PDF_VIEWER_S}" &&
+		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
+	rm -r "${GRIT_S}" &&
+		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
+	rm -r "${LIBCC_S}" &&
+		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
+	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
+		"${S}/node_modules/" || die
+	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
+        "${S}/node_modules/" || die
+
+	# node patches
+	cd "${NODE_S}" || die
+	# make sure node uses the correct version of v8
+	rm -r deps/v8 || die
+	ln -s "${CHROMIUM_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
+
+	python_fix_shebang "${CHROMIUM_S}/chrome/browser"
+	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
+	python_fix_shebang "${S}/tools/"
+
+	# 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
+
+	# Apply Gentoo patches for Electron itself.
+	cd "${S}" || die
+	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
+	eapply "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
+
+	# Apply Chromium patches from libchromiumcontent.
+	cd "${CHROMIUM_S}" || die
+	_unnest_patches "${LIBCC_S}/patches"
+	eapply "${LIBCC_S}/patches"
+
+	# Finally, apply Gentoo patches for Chromium.
+	eapply "${WORKDIR}/${PATCHES_P}/${PV}/chromium/"
+
+	# Merge chromiumcontent component into chromium source tree.
+	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
+	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
+	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
+
+	local keeplibs=(
+		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
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/murmurhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		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/polymer
+		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/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/ced
+		third_party/cld_2
+		third_party/cld_3
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		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/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		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/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/node
+		third_party/node/node_modules/vulcanize/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		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/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	cd "${CHROMIUM_S}" || die
+
+	# Remove most bundled libraries. Some are still needed.
+	ebegin "Unbundling libraries"
+	build/linux/unbundle/remove_bundled_libraries.py \
+		"${keeplibs[@]}" --do-remove || die
+	eend
+
+	cd "${S}" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf_gn=""
+	local myconf_gyp=""
+
+	cd "${CHROMIUM_S}" || die
+
+	# GN needs explicit config for Debug/Release as opposed to
+	# inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: xml (bug #616818).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		harfbuzz-ng
+		icu
+		libdrm
+		libjpeg
+		libpng
+		libvpx
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( libvpx ffmpeg opus )
+	fi
+	build/linux/unbundle/replace_gn_files.py \
+		--system-libraries ${gn_system_libraries[@]} || die
+
+	# Optional dependencies.
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=$(usex gconf true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false"
+	myconf_gn+=" linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_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_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local target_arch=$(_get_target_arch)
+	local ffmpeg_target_arch="${target_arch}"
+
+	if [[ ${ffmpeg_target_arch} = arm ]]; then
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	fi
+
+	# 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_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		filter-flags "-Wl,--as-needed"
+
+		# 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
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\""
+	else
+		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	myconf_gn+=" icu_use_data_file=false"
+
+	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
+
+	# 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_gn.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 "${S}/vendor/node" > /dev/null || 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 \
+		--shared-nghttp2 --shared-cares \
+		--without-npm --with-intl=system-icu --without-dtrace \
+		--dest-cpu=${target_arch} --prefix="" || die
+	popd > /dev/null || die
+
+	# libchromiumcontent configuration
+	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
+	myconf_gn+=" is_electron_build = true"
+	myconf_gn+=" is_component_build = false"
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	einfo "Configuring chromiumcontent..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+
+	cd "${S}" || 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 "$@"
+	"$@" || die
+}
+
+src_compile() {
+	local compile_target="${S}/out/R"
+	local myconf_gyp=""
+	local chromium_target="${CHROMIUM_S}/out/Release"
+	local libcc_path="${S}/vendor/libchromiumcontent"
+	local libcc_dist_path="${libcc_path}/dist/main"
+	local libcc_dist_static_path="${libcc_dist_path}/static_library"
+	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
+	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
+	local libcc_output_shared="${libcc_output}-shared"
+	local target_arch=$(_get_target_arch)
+	local l=""
+	local create_dist_args=""
+
+	tc-export AR CC CXX NM
+
+	mkdir -p "${compile_target}" || die
+
+	cd "${CHROMIUM_S}" || die
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C "${chromium_target}" mksnapshot || die
+	pax-mark m "${chromium_target}/mksnapshot"
+	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
+
+	# Build chromedriver.
+	eninja -C "${chromium_target}" chromedriver
+	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
+
+	# Build libchromiumcontent components.
+	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
+	CHROMIUMCONTENT_2ND_PASS=1 \
+		eninja -C "${chromium_target}" chromiumcontent:libs
+
+	cd "${S}" || die
+
+	# Gather and prepare built components of libchromiumcontent.
+	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
+	create_dist_args+=" --no_zip"
+	create_dist_args+=" --system-icu"
+	CHROMIUM_BUILD_DIR="${chromium_target}" \
+	PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
+	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
+
+	# v8 is built as a shared library, so copy it manually
+	# for generate_filenames_gypi to find.
+	mkdir -p "${libcc_dist_shared_path}" || die
+	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
+
+	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
+		"${libcc_dist_path}/filenames.gypi" \
+		"${CHROMIUM_S}" \
+		"${libcc_dist_shared_path}" \
+		"${libcc_dist_static_path}"
+
+	# Configure electron.
+	myconf_gyp+="
+		$(gyp_use cups)
+		$(gyp_use gconf use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use lto)"
+
+	myconf_gyp+=" -Duse_system_icu=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+	else
+		myconf_gyp+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0
+		-Dsysroot="
+
+	myconf_gyp+=" -Dtarget_arch=${target_arch}"
+	myconf_gyp+=" -Dpython=${EPYTHON}"
+
+	# 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_gyp+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+	myconf_gyp+=" -Dgenerate_character_data=0"
+
+	myconf_gyp+=" -Dmas_build=0"
+	myconf_gyp+=" -Dlibchromiumcontent_component=0"
+	myconf_gyp+=" -Dcomponent=static_library"
+	myconf_gyp+=" -Dlibrary=static_library"
+	myconf_gyp+=" -Icommon.gypi electron.gyp"
+
+	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
+		egyp_chromium ${myconf_gyp} || die
+
+	mkdir -p "${compile_target}/lib/" || die
+	# Copy libv8 and snapshot files so the node binary can find them.
+	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
+	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
+	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
+
+	# Copy generated shim headers.
+	mkdir -p "${compile_target}/gen" || die
+	cp -r "${chromium_target}/gen/shim_headers" \
+		"${compile_target}/gen" || die
+
+	# Build the Node binary and pax-mark it.
+	eninja -C ${compile_target} nodebin
+	pax-mark m ${compile_target}/nodebin
+
+	# Finally, build Electron.
+	eninja -C ${compile_target} electron
+	pax-mark m ${compile_target}/electron
+
+	echo "v${PV}" > ${compile_target}/version
+}
+
+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
+	doexe out/R/chromedriver
+	doexe out/R/mksnapshot
+	doins out/R/libv8.so
+	fperms +x "${install_dir}/libv8.so"
+	doins out/R/libnode.so
+	fperms +x "${install_dir}/libnode.so"
+	doins out/R/natives_blob.bin
+	doins out/R/snapshot_blob.bin
+	doins out/R/blink_image_resources_200_percent.pak
+	doins out/R/content_resources_200_percent.pak
+	doins out/R/content_shell.pak
+	doins out/R/pdf_viewer_resources.pak
+	doins out/R/ui_resources_200_percent.pak
+	doins out/R/views_resources_200_percent.pak
+	doins -r out/R/resources
+	doins -r out/R/locales
+	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
+
+	doins out/R/version
+
+	# 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() {
+	electron-config update
+}
+
+pkg_postrm() {
+	electron-config update
+}
diff --git a/dev-util/electron/files/toolchain/BUILD.gn b/dev-util/electron/files/toolchain/BUILD.gn
index 78f7b57e3be5..f88d3afdcfda 100644
--- a/dev-util/electron/files/toolchain/BUILD.gn
+++ b/dev-util/electron/files/toolchain/BUILD.gn
@@ -17,3 +17,21 @@ gcc_toolchain("default") {
     current_os = current_os
   }
 }
+
+gcc_toolchain("host") {
+  cc = getenv("BUILD_CC")
+  cxx = getenv("BUILD_CXX")
+  ar = getenv("BUILD_AR")
+  nm = getenv("BUILD_NM")
+  ld = cxx
+
+  extra_cflags = getenv("BUILD_CFLAGS")
+  extra_cppflags = getenv("BUILD_CPPFLAGS")
+  extra_cxxflags = getenv("BUILD_CXXFLAGS")
+  extra_ldflags = getenv("BUILD_LDFLAGS")
+
+  toolchain_args = {
+    current_cpu = current_cpu
+    current_os = current_os
+  }
+}