commit:     44c6d933b15c5b677a4cc3c01cd6aaa6b14d4a18
Author:     Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Thu Sep 15 13:31:15 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 06:12:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c6d933

app-editors/atom: Migrate to slotted electron, add atom-1.10.2, fixes

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=589900
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=593502
Closes: https://github.com/gentoo/gentoo/pull/2336

Package-Manager: portage-2.2.28

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-editors/atom/Manifest                          |   7 +-
 .../{atom-1.7.4-r3.ebuild => atom-1.10.2.ebuild}   | 146 +++++++++------------
 .../{atom-1.8.0.ebuild => atom-1.7.4-r4.ebuild}    |  60 +++++++--
 .../{atom-1.7.4-r3.ebuild => atom-1.8.0-r1.ebuild} |  60 +++++++--
 .../atom/files/atom-unbundle-electron.patch        |   6 +-
 5 files changed, 169 insertions(+), 110 deletions(-)

diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index e2a29dc..b940055 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -1,15 +1,19 @@
-DIST asar-0.10.0.tar.gz 975433 SHA256 
49e743a952957aa22668b472ba926427f9e051ececeaadb922f8aff2bc8fd1ee SHA512 
702fa0e496a1db55a61d7e00d55456f8703f7af00e458f26413771dc71cd03e9418e0334bb1a500aaabe14ab598e19c64612ebf6411c77e30004833c8d5d151e
 WHIRLPOOL 
a2e4f8563f779aea19357962f0ac0895005ff93a601d409a7b2c685348cba845106729e1f2a39f95001c186c0c0ba914d73ff1364d488e0853dbbabda0e80bb3
+DIST asar-0.12.1.tar.gz 1016626 SHA256 
731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 
fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7
 WHIRLPOOL 
d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
+DIST atom-1.10.2.rpm 67753816 SHA256 
18ad153c932ef41e9c6b8394eeb114005c4d9c317a30dac238ecb51b78920c16 SHA512 
1cc4ca2adec2fee66c30c4ef3b0c8f5613a83a54608a7c3bc677680db7657c8c6128a3e1c424251a7b2e9a13b6bc84ee280ec0ee7ea70815784a0432558ec17c
 WHIRLPOOL 
288748edb89f466dc471ed22f008c84ba3a377fd50defa70a45059ae78a9e805026c97d4438b587472fbb37c15b63afb80c1910c5da87adf5a288fe198ec34a3
 DIST atom-1.7.4.rpm 64439092 SHA256 
601ffa5d683b02cbd95bc65c76e28ecc091b7f12092b69c6e65eb93e941450e6 SHA512 
4033c8bc36ba43332a1c7e08cf0fa5deaefb53152b7a56c8ca5f9c68bd88761fb54c57aa031c6702d46ce531cf1e9a8a24d2b7271fe0017a022bc4671d85d68d
 WHIRLPOOL 
4adf85334482c49104bc6b1e96753f5c3d5243b799a6d745bd7770968d57b0ddaebee1fea382542a4219849f360f04d6ffc9d0eede5f6eb0d5e3ead3989fea03
 DIST atom-1.8.0.rpm 64364944 SHA256 
7e9d64fd894ac8c307c377714cfb8d6ace44f80f09fec9222cd2e7858459a2d7 SHA512 
1766cbb5a3cf544962a4adc2df4bc8de79d0ae8b90273e5798920f264dba100adf8f1bdfc2b7011c9d666f59bbc328dbf024ccab369ac76ebe6961c050f6e748
 WHIRLPOOL 
652a815a500cca79431a79dd43b8c0f73c3b7c7a387dc0bf5e89ef828df23670ab6a87df0737e66bd80b87ef474772ef31c27e17d014092ae33515ce1da10afc
 DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 
5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 
dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d
 WHIRLPOOL 
573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4
 DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 
fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 
d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a
 WHIRLPOOL 
4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937
 DIST atom-keyboard-layout-1.0.0.tar.gz 6430 SHA256 
d3f20f0765b7a243c3cfa3e49360851404977c2ed6e84dc84e9aaf28d8547d03 SHA512 
a96b77c29eb1f5367f1d60ddc501fdd6e507fc92f980974bb2c1bec923b264e73104650180722819946e075284a928b4aaa01f8594365186bd8530a0179c7ff5
 WHIRLPOOL 
693f4a1546e0ca772ea2b2f860e6c2cf55f645031eb516021107296a3a05fca9086de62080255abae55c0ea42cc0f5aeeba26e6dd0b7eb274a8b69135bbf79c9
+DIST atom-keyboard-layout-1.0.1.tar.gz 6512 SHA256 
aed0c2745acaadf4c5fdcb74df4f0c0ad6fd6cb53742567c80a8220dc041aace SHA512 
4d369a0a5cf9053929f20f21f3955703f5df6d44629a0208afd88d1d11af52fd30af6930de89480ab796f83202c21d42afbb56765cef0efb3b2ea381a9804081
 WHIRLPOOL 
d600811081270a81c4ffb46883d24c5dca5c78023d83b6fce3375dd6ef140f39c7b83a4b8e4bcfcf304d8032b18c9461612316c71a8246ddb7465c1b3d781fd3
 DIST atom-marker-index-3.1.0.tar.gz 18065 SHA256 
264e5553edee7e10766083433f952a515601201b53d332ecfe0fd43870fb4a38 SHA512 
e50c2e03555d18e2eae0eb4ca5b16f486a53bf67803da6eb7eec90ef86048939f302baf15678a3af964b36ae809387d4665024e4d61bd9741738b12e84f4db64
 WHIRLPOOL 
179fafbd85d9b6e093ab646264716b0708d39aa3e1cd5771fbe173f2cd1ebb05f9a2525e5bb27d9605e2fd4ab5773a68d6552667c285ad3cbdbfbb6ae7d8b30e
+DIST atom-marker-index-4.0.0.tar.gz 18344 SHA256 
afb0da1f7006d044aeeb8adbfa94fdafde9902f26fbfeb012a3caa97aee11fb0 SHA512 
43e68e655f49d7a092af5cba7cbb7e902221e6076e1f7dfd163bf316ef06883db713af71ac79e63c1c81c22ed9bed168e36a2616b64c70ef4b654c71bbf76cd8
 WHIRLPOOL 
9fbc6346db0297bc3a097e9497b0ea4be07f7bd4da3eb0343734e0041535cc749c16510b71b4abde0e31fdde241e4f7b4605a5c0df7713d8b9683f2f786c07b5
 DIST atom-node-ctags-3.0.0.tar.gz 15062 SHA256 
40605012d06d4dcbfc369862b57900b6963613e2e4ee3b37fea21693b2b418a7 SHA512 
6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87
 WHIRLPOOL 
2cff81d2ca405a615e5c7d284785f129f8fcd968998c68a42af1ca2e6d76a6fcb404a92f3c0d20220567b28593448b91657db6df8bce19de1f2eedbfe2959140
 DIST atom-node-keytar-3.0.2.tar.gz 5718 SHA256 
16af03d2a7876e3008f82d35e913753384655bc181e93cb771639b6d5a2439bf SHA512 
f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a
 WHIRLPOOL 
69b10619531bedb839c61c1b29d18d1a0bf4e468ed05ebd58db349010b8de555673f45bdf98c4ad252aaa960b47faa00d952470e9b3545a0e1e189bbb3e49ded
 DIST atom-node-nslog-3.0.0.tar.gz 2774 SHA256 
6f2c7b79dd27688829d72dcbb94cc3da8b86fe74f355e1d407907cc56da29747 SHA512 
1891632486acfa014eec79f70b14d56d967670310e46dedccfc9dfa505581365765f6bd42ad538b29e74d7c7de83d045b4199dd634fc588734a1ee086dcddb0a
 WHIRLPOOL 
d29f2c68e6168ce020c2a73d73f107ffb4c777e006fba4f01a93045ad631fb2d8b83f989244caf4d5e2f66474e660f3479d79a03e82a6b8fa8a297586ee6e556
 DIST atom-node-oniguruma-5.1.2.tar.gz 662091 SHA256 
130ab56cd6c29c4acc1f14ba31ec3f04146f02fe89c865c0af092f9d639fbdfb SHA512 
e451f742ac1319b64e203848bce5d9c15251e15b083419b7a97588316eac3d86acfdbf6d7541cbd92eece48b41f90fd23f69b5e7e2d93e8bc18559c703944353
 WHIRLPOOL 
2cf44d2a4023655c96aed93c6c8faa45c569c75eaf2435b39f0a09ddcd53377c0ea05ac186b2e67f256c75c146bb50d971b7f9b7170d64031de79c4e76ef5252
 DIST atom-node-pathwatcher-6.2.4.tar.gz 23324 SHA256 
6b47f7f0e8009fe4dac0800ac11f2a2a0366fb4fd889e444d99787e093b8cf2e SHA512 
f891777a326a4f11f36a64f382fb0c9bd3fa5e6478144130b0c554aaaced079223489461050667293f1392e356f5a84838196dc39f8d54f7b3fd537f361c2c9a
 WHIRLPOOL 
67ea2fa8a98214f3ce64a3cc5ce1ff0a757c606c02599f1c1069e3e7aa2addd32a48da2273648632b92149027cf18b64131ee9070e46c6e0a2d227239a47eeaf
+DIST atom-node-pathwatcher-6.5.0.tar.gz 23926 SHA256 
a2f72f00cbe6a49152cdae85fb7585a77f0ee8b01be54fbc27a24f93935445c3 SHA512 
0b8471885acc44f38161b4758951cff762f4c9ca2d17aefdb286b99fdefa6843eaa86d463e4ac54563a79f6701fcaa40252a72d73baf2b6c4e47aa00692ee314
 WHIRLPOOL 
f3a82776b05416eda4e763c0f1db1e422b299f78cf516576b0d13b0447024962538603ce47c12a4889f7d9c984b98ca75013230ba3f1cea1575453e5c2e445dc
 DIST atom-node-runas-3.1.1.tar.gz 6628 SHA256 
9d7d5a157b16fdd7263f50adb2831706d6fcf0902a1af528fc2602db6f9dc1cf SHA512 
bada6e99ceb833c8c6e74f4b3116c49f21b54b922c1a27668312552779b9e5ccebf380b41c781d49c1c0dd0fdff6de8b71a0dcaf1f992892593e85f4572238df
 WHIRLPOOL 
d286d76f38ee8a23b4b76a9070913abe901f4db273073d9c0dcef13004abe7e10e9b4cad451cfe8d0cd4cc1e0ac2ab28ed50f327c1b9d317689153658f7b8944
 DIST atom-node-spellchecker-3.2.3.tar.gz 481966 SHA256 
bf4a07b4c671cd38b176ff8ef375f3cdf277decb941a0a279f8ffb36151fad55 SHA512 
b0209fdfcbee53d289443e1c203a720888a82fa59648b4038c036c6afe68a6b04624e23267e69c36f23c185160d6ab84b1e4020047fbe6d94354e99d717a60b9
 WHIRLPOOL 
d883cd3d3962e38ebe4c55e997ce461fa0b0da98e8b982793b77342eac1413e16090d562a9a50cb8200a18eda751a873528fdfde3b1f1928629bd56c5568f887
 DIST atom-scrollbar-style-3.2.0.tar.gz 4609 SHA256 
ea0f8f00cac609537af0d10d228054371c58b5a74785bd52fbbd276af02911ef SHA512 
fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc
 WHIRLPOOL 
f6e75aafa8946ccc16949bdffa33b2bf050f06434a3fedcf8e1abac8b6b2d31dd37fcc137a43274d4c55d5926349486fda157d3fb6948d97063aac33b99e6578
@@ -27,3 +31,4 @@ DIST nodegit-0.12.2.tar.gz 12429864 SHA256 
d8bb337fb541dd8fefa1dd845e1f01996a559
 DIST nodegit-promise-4.0.0.tgz 9486 SHA256 
7b1c4f2a0e2475ffb333a5d360dc2c006e74a14e78e44d0661329a9b6ae0a7e7 SHA512 
ebaf81f14d7ac7cc42e43b1a58a2b8c09743108d6ba8c6f577dd582047b8207848505f7a9cef327e2b8af15a790e3f82f0171f80528ad6c49672b6aef3eb986e
 WHIRLPOOL 
e6383d55696dabc121471cccfdd32743e9880bc1d2f054217e816e6c8c1be3a4f167bb9cda3ceddb778e7b609291aeefddc1fe2a21b3e8c1080a7ee29c5f3c46
 DIST nodegit-promisify-node-0.4.0.tar.gz 6190 SHA256 
9bf342475d7c82d2f95d29eb1ce97f6f61387170d37c3690d107aaa0109dd435 SHA512 
e9771bbd857084f115df7cee884182fd5c5e9e8f600350bd1a38c72427f34edcf1125280ebbc3154dc93db86fa614b75ab9df7d1b8b22f90ea3e80cc1cb70830
 WHIRLPOOL 
224c24cc0e5f8b0858eef565cfb40327f2369f8f60869b84e263d967e3c9d780773af9b06f31b9e895a4fd66aa78ca4369bf1d6b6f9f2c607af6722e29fe70ad
 DIST nodejs-nan-2.0.9.tar.gz 147832 SHA256 
4c29221f2beacd79a53f3399f3e6c34a33a0febf5249d92947391e615bfb4899 SHA512 
7a680759f2391901c34c2fdd6be20565869c666bde786767a016beade561137b12038afbcf089496f9febdff3a9e6638e310f0ce8f60efb8beca5204ad8e1442
 WHIRLPOOL 
c88038876b294f44da6f6f0a697f91f60d5c2beee018b95115dbd284ce23db80f76593737f507c02a4515265a06f59df4573b657062e6b1252c0ed4d834fe28a
+DIST nodejs-nan-2.4.0.tar.gz 157071 SHA256 
290b4cd678bb0770fcc0dfa8415f908db09173acfdde31135a4e31716c311883 SHA512 
e6f3ab3f67c72b3cc9e6e6b9b5de0f73134ef504dedae5e68376198858a6796f00c35869438e0480f28006dd8f6be13dca3bcc436a1a6b28b1dea5cbc72f9e45
 WHIRLPOOL 
8628452c69c1774e02b8069ee8db12b7b97bc45166dd4dbec3e8d3f532c97f15a24920f2f59ecb3b8d4addcbada33eb04c1f71222531a7377bcbfaf7d4f3d86b

diff --git a/app-editors/atom/atom-1.7.4-r3.ebuild 
b/app-editors/atom/atom-1.10.2.ebuild
similarity index 68%
copy from app-editors/atom/atom-1.7.4-r3.ebuild
copy to app-editors/atom/atom-1.10.2.ebuild
index 0e0adcf..9f12366 100644
--- a/app-editors/atom/atom-1.7.4-r3.ebuild
+++ b/app-editors/atom/atom-1.10.2.ebuild
@@ -11,28 +11,29 @@ DESCRIPTION="A hackable text editor for the 21st Century"
 HOMEPAGE="https://atom.io";
 MY_PV="${PV//_/-}"
 
+ELECTRON_SLOT=0.37
+
 # All binary packages depend on this
-NAN_V=2.0.9
+NAN_V=2.4.0
 
 # Keep dep versions in sync with atom/package.json
 CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
 GIT_UTILS_V=4.1.2
-NODEGIT_V=0.12.2
 NODE_NSLOG_V=3.0.0
 NODE_ONIGURUMA_V=5.1.2
-NODE_PATHWATCHER_V=6.2.4
+NODE_PATHWATCHER_V=6.5.0
 NODE_RUNAS_V=3.1.1
 SCROLLBAR_STYLE_V=3.2.0
-SPELL_CHECK_V=0.67.0
+SPELL_CHECK_V=0.67.1
 
 # textbuffer dependency
-MARKER_INDEX_V=3.1.0
+MARKER_INDEX_V=4.0.0
 
 # apm dependency
 NODE_KEYTAR_V=3.0.2
 
 # atom-keymap dependency
-KEYBOARD_LAYOUT_V=1.0.0
+KEYBOARD_LAYOUT_V=1.0.1
 
 # symbols-view dependency
 NODE_CTAGS_V=3.0.0
@@ -40,21 +41,7 @@ NODE_CTAGS_V=3.0.0
 # spell-check dependency
 NODE_SPELLCHECKER_V=3.2.3
 
-# nodegit dependencies
-PROMISIFY_NODE_V=0.4.0
-NODE_FS_EXTRA_V=0.26.2
-NODE_GRACEFUL_FS_V=4.1.2
-NODE_JSONFILE_V=2.1.0
-NODE_KLAW_V=1.0.0
-RIMRAF_V=2.2.8
-NODE_LODASH_V=3.10.1
-COMBYNE_V=0.8.1
-JS_BEAUTIFY_V=1.5.10
-NODEGIT_PROMISE_V=4.0.0
-ASAP_V=2.0.3
-OBJECT_ASSIGN_V=4.0.1
-
-ASAR_V=0.10.0
+ASAR_V=0.12.1
 
 # The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
 SRC_URI="
@@ -64,7 +51,6 @@ SRC_URI="
        
https://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
 -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
        https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> 
atom-node-ctags-${NODE_CTAGS_V}.tar.gz
        https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> 
atom-git-utils-${GIT_UTILS_V}.tar.gz
-       https://github.com/nodegit/nodegit/archive/v${NODEGIT_V}.tar.gz -> 
nodegit-${NODEGIT_V}.tar.gz
        
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> 
atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
        https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz 
-> atom-marker-index-${MARKER_INDEX_V}.tar.gz
        https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> 
atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
@@ -74,26 +60,12 @@ SRC_URI="
        https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> 
atom-node-runas-${NODE_RUNAS_V}.tar.gz
        
https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> 
atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
        
https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz
 -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
-
-       
https://github.com/nodegit/promisify-node/archive/${PROMISIFY_NODE_V}.tar.gz -> 
nodegit-promisify-node-${PROMISIFY_NODE_V}.tar.gz
-       
https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-${NODEGIT_PROMISE_V}.tgz
-       https://registry.npmjs.org/lodash/-/lodash-${NODE_LODASH_V}.tgz -> 
node-lodash-${NODE_LODASH_V}.tgz
-       https://github.com/kriskowal/asap/archive/v${ASAP_V}.tar.gz -> 
node-asap-${ASAP_V}.tar.gz
-       
https://github.com/sindresorhus/object-assign/archive/v${OBJECT_ASSIGN_V}.tar.gz
 -> node-object-assign-${OBJECT_ASSIGN_V}.tar.gz
-       
https://github.com/jprichardson/node-fs-extra/archive/${NODE_FS_EXTRA_V}.tar.gz 
-> node-fs-extra-${NODE_FS_EXTRA_V}.tar.gz
-       
https://github.com/jprichardson/node-jsonfile/archive/${NODE_JSONFILE_V}.tar.gz 
-> node-jsonfile-${NODE_JSONFILE_V}.tar.gz
-       https://github.com/jprichardson/node-klaw/archive/${NODE_KLAW_V}.tar.gz 
-> node-klaw-${NODE_KLAW_V}.tar.gz
-       
https://github.com/isaacs/node-graceful-fs/archive/v${NODE_GRACEFUL_FS_V}.tar.gz
 -> node-graceful-fs-${NODE_GRACEFUL_FS_V}.tar.gz
-       https://github.com/isaacs/rimraf/archive/v${RIMRAF_V}.tar.gz -> 
node-rimraf-${RIMRAF_V}.tar.gz
-       https://github.com/tbranyen/combyne/archive/${COMBYNE_V}.tar.gz -> 
node-combyne-${COMBYNE_V}.tar.gz
-       
https://github.com/beautify-web/js-beautify/archive/v${JS_BEAUTIFY_V}.tar.gz -> 
node-js-beautify-${JS_BEAUTIFY_V}.tar.gz
 "
 
 BINMODS="
                cached-run-in-this-context
                node-ctags
                git-utils
-               nodegit
                keyboard-layout
                node-nslog
                node-oniguruma
@@ -119,7 +91,7 @@ DEPEND="
        >=gnome-base/libgnome-keyring-3.12:=
        >=dev-libs/oniguruma-5.9.5:=
        >=dev-util/ctags-5.8
-       >=dev-util/electron-0.36.12-r3:0/36
+       >=dev-util/electron-0.37.8:${ELECTRON_SLOT}
 "
 RDEPEND="${DEPEND}"
 
@@ -148,7 +120,11 @@ get_install_dir() {
 }
 
 get_electron_dir() {
-       echo -n "/usr/$(get_libdir)/electron"
+       echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+get_electron_nodedir() {
+       echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
 }
 
 enode_electron() {
@@ -157,11 +133,11 @@ enode_electron() {
 
 enodegyp_atom() {
        local apmpath="/usr/share/atom/resources/app/apm"
-       local 
nodegyp="${S}/${apmpath}/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
+       local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
 
        PATH="$(get_electron_dir):${PATH}" \
                enode_electron "${nodegyp}" \
-                       --nodedir=/usr/include/electron/node/ $@ || die
+                       --nodedir="$(get_electron_nodedir)" $@ || die
 }
 
 easar() {
@@ -201,7 +177,6 @@ src_unpack() {
        for a in ${A} ; do
                case ${a} in
                *.rpm) srcrpm_unpack "${a}" ;;
-               nodegit-promise*|node-lodash*) _unpack_npm_package "${a}" ;;
                *) unpack "${a}" ;;
                esac
        done
@@ -219,6 +194,10 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-python.patch"
        epatch "${FILESDIR}/${PN}-unbundle-electron.patch"
 
+       sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+               ./atom.sh \
+               || die
+
        sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
                ./atom.sh \
                || die
@@ -227,11 +206,15 @@ src_prepare() {
                ./atom.sh \
                || die
 
-       local env="export NPM_CONFIG_NODEDIR=/usr/include/electron/node/"
+       local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
        sed -i -e \
-               "s|\"\$binDir/\$nodeBin\" --harmony_collections|${env}\nexec 
$(get_electron_dir)/node|g" \
+               "s|\"\$binDir/\$nodeBin\"|${env}\nexec 
$(get_electron_dir)/node|g" \
                        apm/bin/apm || die
 
+       sed -i -e \
+               
"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+                       apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
        rm apm/bin/node || die
 
        sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
@@ -253,15 +236,18 @@ src_prepare() {
 
        _s="${WORKDIR}/$(package_dir git-utils)"
        ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-               --inplace --unbundle "git;libgit2;git2" "${_s}/binding.gyp" || 
die
+               --inplace --unbundle "git;libgit2;git2" \
+               "${_s}/binding.gyp" || die
 
        _s="${WORKDIR}/$(package_dir node-oniguruma)"
        ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-               --inplace --unbundle "onig_scanner;oniguruma;onig" 
"${_s}/binding.gyp" || die
+               --inplace --unbundle "onig_scanner;oniguruma;onig" \
+               "${_s}/binding.gyp" || die
 
        _s="${WORKDIR}/$(package_dir node-spellchecker)"
        ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-               --inplace --unbundle "spellchecker;hunspell;hunspell" 
"${_s}/binding.gyp" || die
+               --inplace --unbundle "spellchecker;hunspell;hunspell" \
+               "${_s}/binding.gyp" || die
 
        for binmod in ${BINMODS}; do
                _s="${WORKDIR}/$(package_dir ${binmod})"
@@ -269,36 +255,12 @@ src_prepare() {
                ln -s "${nan_s}" "${_s}/node_modules/nan" || die
        done
 
-       _s="${WORKDIR}/$(package_dir nodegit)"
-       ln -s "${WORKDIR}/$(package_dir node-fs-extra)" 
"${_s}/node_modules/fs-extra" || die
-       ln -s "${WORKDIR}/$(package_dir promisify-node)" 
"${_s}/node_modules/promisify-node" || die
-       ln -s "${WORKDIR}/$(package_dir combyne)" "${_s}/node_modules/combyne" 
|| die
-       ln -s "${WORKDIR}/$(package_dir js-beautify)" 
"${_s}/node_modules/js-beautify" || die
-       ln -s "${WORKDIR}/$(package_dir node-lodash)" 
"${_s}/node_modules/lodash" || die
-
-       _s="${WORKDIR}/$(package_dir promisify-node)"
-       mkdir "${_s}/node_modules" || die
-       ln -s "${WORKDIR}/$(package_dir nodegit-promise)" 
"${_s}/node_modules/nodegit-promise" || die
-       ln -s "${WORKDIR}/$(package_dir object-assign)" 
"${_s}/node_modules/object-assign" || die
-
-       _s="${WORKDIR}/$(package_dir nodegit-promise)"
-       mkdir "${_s}/node_modules" || die
-       ln -s "${WORKDIR}/$(package_dir asap)" "${_s}/node_modules/asap" || die
-
-       _s="${WORKDIR}/$(package_dir node-fs-extra)"
-       mkdir "${_s}/node_modules" || die
-       ln -s "${WORKDIR}/$(package_dir node-graceful-fs)" 
"${_s}/node_modules/graceful-fs" || die
-       ln -s "${WORKDIR}/$(package_dir node-jsonfile)" 
"${_s}/node_modules/jsonfile" || die
-       ln -s "${WORKDIR}/$(package_dir node-klaw)" "${_s}/node_modules/klaw" 
|| die
-       ln -s "${WORKDIR}/$(package_dir rimraf)" "${_s}/node_modules/rimraf" || 
die
-
        # Unpack app.asar
        easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
 
        cd "${S}" || die
 
        epatch "${FILESDIR}/atom-apm-path.patch"
-       epatch "${FILESDIR}/asar-require.patch"
 
        sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
                "${S}/build/app/src/config-schema.js" || die
@@ -309,14 +271,6 @@ src_prepare() {
 src_configure() {
        local binmod _s
 
-       _s="${WORKDIR}/$(package_dir nodegit)"
-       cd "${_s}" || die
-       enode_electron generate/scripts/generateJson.js || die
-       enode_electron generate/scripts/generateNativeCode.js || die
-
-       ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
-               --inplace --unbundle 
"nodegit;vendor/libgit2.gyp:libgit2;git2;ssh2" "${_s}/binding.gyp" || die
-
        for binmod in ${BINMODS}; do
                einfo "Configuring ${binmod}..."
                _s="${WORKDIR}/$(package_dir ${binmod})"
@@ -362,11 +316,6 @@ src_compile() {
        
x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
        easar pack "${x}" "app" "app.asar"
        cd "${S}" || die
-
-       # Replace vendored ctags with a symlink to system ctags
-       rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-       ln -s "/usr/bin/ctags" \
-               "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
 }
 
 _fix_binmods() {
@@ -392,12 +341,36 @@ _fix_binmods() {
        done
 }
 
+_fix_executables() {
+       local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
+
+       (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) 
\
+       | while IFS= read -r f; do
+               IFS= read -r shebang < "${f}"
+
+               if [[ ${shebang} == '#!'* ]]; then
+                       fperms +x "${f#${ED}}"
+                       if [[ "${shebang}" == "#!/usr/bin/env node" || 
"${shebang}" == "#!/usr/bin/node" ]]; then
+                               einfo "Fixing node shebang in ${f#${ED}}"
+                               sed --follow-symlinks -i \
+                                       -e "1s:${shebang}$:${_node_sb}:" "${f}" 
|| die
+                       fi
+               fi
+       done || die
+}
+
 src_install() {
        local install_dir="$(get_install_dir)"
        local suffix="$(get_install_suffix)"
+       local ctags_d="node_modules/symbols-view/vendor"
 
        cd "${S}" || die
 
+       # Replace vendored ctags with a symlink to system ctags
+       rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+       ln -s "/usr/bin/ctags" \
+               "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+
        insinto "${install_dir}"
 
        doins build/app.asar
@@ -415,6 +388,11 @@ src_install() {
        insinto /usr/share/licenses/"${PN}${suffix}"
        doins usr/share/atom/resources/LICENSE.md
        dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-       fperms +x "${install_dir}/app/apm/bin/apm"
        dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+       _fix_executables "${install_dir}/app/apm/bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/.bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+       _fix_executables 
"${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
 }

diff --git a/app-editors/atom/atom-1.8.0.ebuild 
b/app-editors/atom/atom-1.7.4-r4.ebuild
similarity index 89%
rename from app-editors/atom/atom-1.8.0.ebuild
rename to app-editors/atom/atom-1.7.4-r4.ebuild
index 0e0adcf..4b3c7b7 100644
--- a/app-editors/atom/atom-1.8.0.ebuild
+++ b/app-editors/atom/atom-1.7.4-r4.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="A hackable text editor for the 21st Century"
 HOMEPAGE="https://atom.io";
 MY_PV="${PV//_/-}"
 
+ELECTRON_SLOT=0.36
+
 # All binary packages depend on this
 NAN_V=2.0.9
 
@@ -54,7 +56,7 @@ NODEGIT_PROMISE_V=4.0.0
 ASAP_V=2.0.3
 OBJECT_ASSIGN_V=4.0.1
 
-ASAR_V=0.10.0
+ASAR_V=0.12.1
 
 # The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
 SRC_URI="
@@ -119,7 +121,7 @@ DEPEND="
        >=gnome-base/libgnome-keyring-3.12:=
        >=dev-libs/oniguruma-5.9.5:=
        >=dev-util/ctags-5.8
-       >=dev-util/electron-0.36.12-r3:0/36
+       >=dev-util/electron-0.36.12-r4:${ELECTRON_SLOT}
 "
 RDEPEND="${DEPEND}"
 
@@ -148,7 +150,11 @@ get_install_dir() {
 }
 
 get_electron_dir() {
-       echo -n "/usr/$(get_libdir)/electron"
+       echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+get_electron_nodedir() {
+       echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
 }
 
 enode_electron() {
@@ -161,7 +167,7 @@ enodegyp_atom() {
 
        PATH="$(get_electron_dir):${PATH}" \
                enode_electron "${nodegyp}" \
-                       --nodedir=/usr/include/electron/node/ $@ || die
+                       --nodedir="$(get_electron_nodedir)" $@ || die
 }
 
 easar() {
@@ -219,6 +225,10 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-python.patch"
        epatch "${FILESDIR}/${PN}-unbundle-electron.patch"
 
+       sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+               ./atom.sh \
+               || die
+
        sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
                ./atom.sh \
                || die
@@ -227,11 +237,15 @@ src_prepare() {
                ./atom.sh \
                || die
 
-       local env="export NPM_CONFIG_NODEDIR=/usr/include/electron/node/"
+       local env="export NPM_CONFIG_NODEDIR=$(get_electron_node_dir)"
        sed -i -e \
                "s|\"\$binDir/\$nodeBin\" --harmony_collections|${env}\nexec 
$(get_electron_dir)/node|g" \
                        apm/bin/apm || die
 
+       sed -i -e \
+               
"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+                       apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
        rm apm/bin/node || die
 
        sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
@@ -362,11 +376,6 @@ src_compile() {
        
x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
        easar pack "${x}" "app" "app.asar"
        cd "${S}" || die
-
-       # Replace vendored ctags with a symlink to system ctags
-       rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-       ln -s "/usr/bin/ctags" \
-               "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
 }
 
 _fix_binmods() {
@@ -392,12 +401,36 @@ _fix_binmods() {
        done
 }
 
+_fix_executables() {
+       local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
+
+       (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) 
\
+       | while IFS= read -r f; do
+               IFS= read -r shebang < "${f}"
+
+               if [[ ${shebang} == '#!'* ]]; then
+                       fperms +x "${f#${ED}}"
+                       if [[ "${shebang}" == "#!/usr/bin/env node" || 
"${shebang}" == "#!/usr/bin/node" ]]; then
+                               einfo "Fixing node shebang in ${f#${ED}}"
+                               sed --follow-symlinks -i \
+                                       -e "1s:${shebang}$:${_node_sb}:" "${f}" 
|| die
+                       fi
+               fi
+       done || die
+}
+
 src_install() {
        local install_dir="$(get_install_dir)"
        local suffix="$(get_install_suffix)"
+       local ctags_d="node_modules/symbols-view/vendor"
 
        cd "${S}" || die
 
+       # Replace vendored ctags with a symlink to system ctags
+       rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+       ln -s "/usr/bin/ctags" \
+               "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+
        insinto "${install_dir}"
 
        doins build/app.asar
@@ -415,6 +448,11 @@ src_install() {
        insinto /usr/share/licenses/"${PN}${suffix}"
        doins usr/share/atom/resources/LICENSE.md
        dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-       fperms +x "${install_dir}/app/apm/bin/apm"
        dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+       _fix_executables "${install_dir}/app/apm/bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/.bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+       _fix_executables 
"${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
 }

diff --git a/app-editors/atom/atom-1.7.4-r3.ebuild 
b/app-editors/atom/atom-1.8.0-r1.ebuild
similarity index 89%
rename from app-editors/atom/atom-1.7.4-r3.ebuild
rename to app-editors/atom/atom-1.8.0-r1.ebuild
index 0e0adcf..8fe84e7 100644
--- a/app-editors/atom/atom-1.7.4-r3.ebuild
+++ b/app-editors/atom/atom-1.8.0-r1.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="A hackable text editor for the 21st Century"
 HOMEPAGE="https://atom.io";
 MY_PV="${PV//_/-}"
 
+ELECTRON_SLOT=0.36
+
 # All binary packages depend on this
 NAN_V=2.0.9
 
@@ -54,7 +56,7 @@ NODEGIT_PROMISE_V=4.0.0
 ASAP_V=2.0.3
 OBJECT_ASSIGN_V=4.0.1
 
-ASAR_V=0.10.0
+ASAR_V=0.12.1
 
 # The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
 SRC_URI="
@@ -119,7 +121,7 @@ DEPEND="
        >=gnome-base/libgnome-keyring-3.12:=
        >=dev-libs/oniguruma-5.9.5:=
        >=dev-util/ctags-5.8
-       >=dev-util/electron-0.36.12-r3:0/36
+       >=dev-util/electron-0.36.12-r3:${ELECTRON_SLOT}
 "
 RDEPEND="${DEPEND}"
 
@@ -148,7 +150,11 @@ get_install_dir() {
 }
 
 get_electron_dir() {
-       echo -n "/usr/$(get_libdir)/electron"
+       echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+get_electron_nodedir() {
+       echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
 }
 
 enode_electron() {
@@ -161,7 +167,7 @@ enodegyp_atom() {
 
        PATH="$(get_electron_dir):${PATH}" \
                enode_electron "${nodegyp}" \
-                       --nodedir=/usr/include/electron/node/ $@ || die
+                       --nodedir="$(get_electron_nodedir)" $@ || die
 }
 
 easar() {
@@ -219,6 +225,10 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-python.patch"
        epatch "${FILESDIR}/${PN}-unbundle-electron.patch"
 
+       sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+               ./atom.sh \
+               || die
+
        sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
                ./atom.sh \
                || die
@@ -227,11 +237,15 @@ src_prepare() {
                ./atom.sh \
                || die
 
-       local env="export NPM_CONFIG_NODEDIR=/usr/include/electron/node/"
+       local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
        sed -i -e \
                "s|\"\$binDir/\$nodeBin\" --harmony_collections|${env}\nexec 
$(get_electron_dir)/node|g" \
                        apm/bin/apm || die
 
+       sed -i -e \
+               
"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+                       apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
        rm apm/bin/node || die
 
        sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
@@ -362,11 +376,6 @@ src_compile() {
        
x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
        easar pack "${x}" "app" "app.asar"
        cd "${S}" || die
-
-       # Replace vendored ctags with a symlink to system ctags
-       rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-       ln -s "/usr/bin/ctags" \
-               "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
 }
 
 _fix_binmods() {
@@ -392,12 +401,36 @@ _fix_binmods() {
        done
 }
 
+_fix_executables() {
+       local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
+
+       (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) 
\
+       | while IFS= read -r f; do
+               IFS= read -r shebang < "${f}"
+
+               if [[ ${shebang} == '#!'* ]]; then
+                       fperms +x "${f#${ED}}"
+                       if [[ "${shebang}" == "#!/usr/bin/env node" || 
"${shebang}" == "#!/usr/bin/node" ]]; then
+                               einfo "Fixing node shebang in ${f#${ED}}"
+                               sed --follow-symlinks -i \
+                                       -e "1s:${shebang}$:${_node_sb}:" "${f}" 
|| die
+                       fi
+               fi
+       done || die
+}
+
 src_install() {
        local install_dir="$(get_install_dir)"
        local suffix="$(get_install_suffix)"
+       local ctags_d="node_modules/symbols-view/vendor"
 
        cd "${S}" || die
 
+       # Replace vendored ctags with a symlink to system ctags
+       rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+       ln -s "/usr/bin/ctags" \
+               "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+
        insinto "${install_dir}"
 
        doins build/app.asar
@@ -415,6 +448,11 @@ src_install() {
        insinto /usr/share/licenses/"${PN}${suffix}"
        doins usr/share/atom/resources/LICENSE.md
        dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
-       fperms +x "${install_dir}/app/apm/bin/apm"
        dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+       _fix_executables "${install_dir}/app/apm/bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/.bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+       _fix_executables 
"${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+       _fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
 }

diff --git a/app-editors/atom/files/atom-unbundle-electron.patch 
b/app-editors/atom/files/atom-unbundle-electron.patch
index ba58330..f9c7351 100644
--- a/app-editors/atom/files/atom-unbundle-electron.patch
+++ b/app-editors/atom/files/atom-unbundle-electron.patch
@@ -1,4 +1,4 @@
-From d8e2b7e0fabdb4604063071f7f3a4a24e49daca7 Mon Sep 17 00:00:00 2001
+From 19f9a5c6f8be7b4df069f728d9ea037a36bc03d2 Mon Sep 17 00:00:00 2001
 From: Elvis Pranskevichus <el...@magic.io>
 Date: Thu, 5 May 2016 17:23:35 -0400
 Subject: [PATCH] Unbundle electron
@@ -8,7 +8,7 @@ Subject: [PATCH] Unbundle electron
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/atom.sh b/atom.sh
-index b68716b..d89587f 100755
+index b68716b..e119cbd 100755
 --- a/atom.sh
 +++ b/atom.sh
 @@ -87,11 +87,9 @@ elif [ $OS == 'Linux' ]; then
@@ -20,7 +20,7 @@ index b68716b..d89587f 100755
 -  else
 -    ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
 -  fi
-+  export NPM_CONFIG_NODEDIR="/usr/include/electron/node/"
++  export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
 +  export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
 +  ATOM_PATH="{{ATOM_PATH}}"
  

Reply via email to