* [gentoo-commits] repo/gentoo:master commit in: profiles/, app-editors/atom/files/, app-editors/atom/
@ 2017-10-02 21:59 Patrice Clement
0 siblings, 0 replies; only message in thread
From: Patrice Clement @ 2017-10-02 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 563cdd96855d2333f9628222431fe88d1bbbc1b1
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Mon Oct 2 17:16:17 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 2 21:57:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=563cdd96
app-editors/atom: version bump to 1.20.1.
Also, add 1.21.0-beta2 (masked)
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5838
app-editors/atom/Manifest | 21 +
app-editors/atom/atom-1.20.1.ebuild | 514 +++++++++++++++++++++
app-editors/atom/atom-1.21.0_beta2.ebuild | 511 ++++++++++++++++++++
app-editors/atom/files/apm-python.patch | 16 +
app-editors/atom/files/atom-apm-path-r1.patch | 16 +
.../atom/files/atom-fix-app-restart-r1.patch | 12 +
app-editors/atom/files/atom-license-path-r1.patch | 11 +
app-editors/atom/files/atom-marker-layer-r1.patch | 11 +
.../atom/files/atom-unbundle-electron.patch | 18 +-
app-editors/atom/files/gyp-unbundle.py | 32 +-
app-editors/atom/files/transpile-coffee-script.js | 23 +
profiles/package.mask | 4 +
12 files changed, 1173 insertions(+), 16 deletions(-)
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index 2c97f608c5f..748a6857975 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -1,7 +1,12 @@
DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
+DIST asar-0.13.0.tar.gz 1622264 SHA256 f22b508d724c420e6aac3fa863cb03a6f668e841fd36486e6098fcce566415de SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee WHIRLPOOL 9d8fdb1f9c92eeb7d185583d2dcf9b2bf1b52a4feb158b4a676a16836c2402f80a80d133a24306ae4bf87216a345672e6a71a272bb30c0635fc46bf2bae1a7ad
DIST atom-1.15.0.rpm 86561729 SHA256 935b444d9122f46d3ab490611476498c963de1232f9c732d9ad33f0e380a37be SHA512 e8f5ceaae020f9fbf8cb1ffbef0f64b7b5d23a0be20d063591e3ba3b9fd33c771a028aca9aa0ecad254e250342d40106dac85bf6bdeff4de64da0b57fe6de3ea WHIRLPOOL 4d4311654b8afaa4aa2d07611960d24775aeb825e97ea65e6f69d72790d4c160e8a371432346f1873a71b2e1bf4158f3eb5d35fc1fd882906765f3ea4328e526
DIST atom-1.16.0.rpm 90249819 SHA256 6305f149f7b85e498e56d92fe0927ca81fd4cce62153f266fcd8f39958a59e69 SHA512 e3e9096caf6d5ca802ad47e434a6e8a51c0ab25b967747621e2ea4eb440d5401df3b7cd3d101d6d5a1f2f12fa77525e7e54e252438ff24ec9b651601bb7f4d97 WHIRLPOOL b294fa728388a2b10000a85c02d7548e077e34c5db83ddea1d2b5d6bdebd4c72db906ccc856fd766e3f2f3900ad5f02de3c4bd22e273683c92e4f0dd027fa6f3
DIST atom-1.18.0.rpm 128551353 SHA256 08609b26776ee12effd47ff87a2eb44f7ba9000a0e28b8022ca0bace0216e8d8 SHA512 c30df4b3c10e2e886c349a8c255ea6e9e308b38811f02b2517ba464959a873d159b5fa4fe89d68ed50500038b92219cb061d9dee0917b0b807e086cceec2803b WHIRLPOOL 3a1607be3155ac614b403df94f8974a675a646e777e4cc7ce351b975e17a9e6708676f8c6772d35f90f9240757a0fbeb1e1fa1a304c3f08728041440e59b7192
+DIST atom-1.20.1.tar.gz 9358859 SHA256 0577ff9df069f8c290fb73b387ea88f8af1fae8b4a40c5ad7cf97af824584b11 SHA512 a7f9edcfc84b81d768a92af5967a6889f85155c46a623b33e51999706e22f411ce570f42777fb3015174611ef19a956d8ed336ab1172612b27d75de8ef9c96fa WHIRLPOOL 467169cd0e26d9738f25e974ac188b00e80d1bc5c525d17b1b0c221bf5826c2258267fd1723ff26fb827f6f9f268a34b6d25f6278adbd2bd628dd5dad03296a1
+DIST atom-1.21.0-beta2.tar.gz 9378306 SHA256 9ff06ad890b85b68d85ae9b699d2b05ac3defc3130ff590fe0441efa9e3ac55f SHA512 9e5e75bca7dbbded19e7dac3444b4c3d86d24874d0d3b83692eaf66906e6c78ecf212c63718fcb92aa9c6ef28477042564e3dec1eb0e23398fb04272b79c0b5f WHIRLPOOL 6dc0411e46832ed21b7c42b9eda0e73c6424805b0bc2966716d7f42d218b549ab8ec5b6198747f0058c892bbb661512ee3cdd4f6fe185e27288b3f4a6531dd62
+DIST atom-bin-1.20.1.rpm 134506625 SHA256 20a0a1e398a1eace09f298231b7169bdb73c345c6ccb784a2929bc9df5996b17 SHA512 7bf8c4b092e0b45d56c5414d088633ae016b5564a7a97e1d706ad46743b6aad43a7268b7ade881680fa5f005eed0f46ba1523909a09cf3ec0aa51ce2335b8d92 WHIRLPOOL 263c888e9ba4c103a0fb859c210d1c49cc8a956dc50ae6dd6da0322c8e908b6741f6ff931f68f60800fce90fb5133494d7ffdb7455b74ea6cae6e32af022f0e9
+DIST atom-bin-1.21.0-beta2.rpm 131042161 SHA256 a70ef4e0198e424358029c265f776928b098e6a9005078cab8def44ddf5f0697 SHA512 af648caaada35475e57f151b9c658eaaeb14d9705d732f5b4a58357e21d6e1cd5efff5b34207403d46f257b693ded5894115d1e4948b9b2aad0cf2f4430ce3a4 WHIRLPOOL 6b6b9597f5da79c3249577ce4baea748a4c7c2b63bb0917d61329a5d94143918452fd8c0b2f3ba90363cabf69d7d9098a113e07662255bc73af8cb1e36c42242
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-git-utils-5.0.0.tar.gz 36545 SHA256 a79e4951de6ac0a81f2ea359f82c575f826a4409f91b90a11f75a85c7886bec9 SHA512 42fd7589ca56049b1ad5cf7f2df7e295fc8575f4eee8a562fa103541157bd487c1748e3d6c536237b260dcbb4b530619dfcc121ba84b6d2fbf6d684dc959f819 WHIRLPOOL 03ae2290fc1ef0863c643a1fd4f9d4c98bc9b2939fddf6fd366eea9122b9d5612f53ad7ea6eb57c020eb376fa623253082da4c26f67d8de1bb59189b64f9d60b
@@ -21,4 +26,20 @@ DIST atom-nsfw-1.0.15.tar.gz 45222 SHA256 6dc20bcf6eafcd0d1c2293841d2f2da7216c45
DIST atom-scrollbar-style-3.2.0.tar.gz 4609 SHA256 ea0f8f00cac609537af0d10d228054371c58b5a74785bd52fbbd276af02911ef SHA512 fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc WHIRLPOOL f6e75aafa8946ccc16949bdffa33b2bf050f06434a3fedcf8e1abac8b6b2d31dd37fcc137a43274d4c55d5926349486fda157d3fb6948d97063aac33b99e6578
DIST atom-superstring-1.1.0.tar.gz 259961 SHA256 fcfc7f94bc3631fda8b08b2b91778f8a62e863b346a2f90b66f9af9f4f3f8cbb SHA512 880c97d696036065aeb4320dc71c88b49b22b04e6582c75310131e61d8067fdf3d26c901d7b22a2bfd2a2a2056f350ba9485b7e55410cdee9ef29f5a75a8af59 WHIRLPOOL 6f857ea91c8df678c592232816ec3c251355cb7af4f1f6dbf0f16c44aa1a978c66c0ce8225d176e7b253addb1e38795a3902a8dd302dd72db1f35e4c18cd3236
DIST atom-superstring-1.2.1.tar.gz 264386 SHA256 9d899c2dd497f25f9d629d4d8c4df9e1f7af21e8958a0e1458fc505b1c6ea8ca SHA512 8641f44defb9248c4fd91c4c7d5117322f83613386693ab51c3e77c9ad95ae383f69e662b6a870196504d7d99cd23527a822e989babdd95f42b6ddf517df7afc WHIRLPOOL 6a363569c737c2960140182cf7d5b77d551a2b463d096de4d32c64ee217dab733b30cb111521035bbb68bc510afa9532bc91af6037e4c9f11ae67672ed424deb
+DIST atomdep-cached-run-in-this-context-0.4.1.tar.gz 2388 SHA256 2bff3d01e95c3458ab0d1f2b22a61c0f8c675a0ef05f4936f51545dbd9095345 SHA512 942db40139b0beda616a25628772e515ce92ceca3e9a5288b10920e68c35149c52677a975e6e30f278ec64f06ae341fa1fa00702b339b2fb8f7af1cf9685efe5 WHIRLPOOL e7f7c4fe6cb642afcee2c71926cd813304071b0feff71c06e227bfb143f18438a49062a39068b7551938d8ebd8977bcf93ef98d187ea12cbe4afcde503aa9b14
+DIST atomdep-ctags-3.0.0.tar.gz 12864 SHA256 873139ccaf0b58567e1e6a8d99e934f637cb7ac6287fcc873678bb170bfdaf0b SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc WHIRLPOOL f00065a1ae36a73ea92f3175780e672ebfba2d69d17b00605ea0140fb16d7c451dddc2df757504231a0fd3d59f2524a8f06a3f121d2a29190e11b01dd4c9cd28
+DIST atomdep-fs-admin-0.1.6.tar.gz 5539 SHA256 976e7ea028d2a1166596119d434302c046869a722edd6e9808421ad11a6b4916 SHA512 2474523d5441ad882000633a929bcdbc5771b859a80f16a69c15504ff240a59b558e2edb1ca6e12ce91ad58da935243f3950a16e664529c59da70b9912903ae7 WHIRLPOOL 429a5b8bd5b8ae36ab4431e21c165b097931e6fad2ef3c13192bde67725b38e28f017e847b6e1f1931a8a101c76c6e2885bd9f07d19e9145a3b0c1cfe5eab280
+DIST atomdep-git-utils-5.0.0.tar.gz 4147470 SHA256 66934cbc288859028a1ab19bbb88cdba01c74c8bfb4d06bfb14b967762db091a SHA512 ffb2ecf8eb89f7e4cbf51e5953d4e547c4ccf21985a6177cffd5f958433ac7c98d36070ffea82dae65b02bed53c49ba94fc12fb4823e1ef985a350726fe46424 WHIRLPOOL 3b5a4767288a39e20ed419639da555fcd429585cf6a987c9709c8859b158cba5d629ad0bd3839003a13f4c7b9f561c2b6d08926de35f5aa8c7a3767a46854267
+DIST atomdep-keyboard-layout-2.0.13.tar.gz 17881 SHA256 9ef323cb2c333861e7ce834448ed00519eecf06035c03b66208e85727fdffa92 SHA512 5b155cddb0484edb47a334b21183eccabe6b376290b97b4469732541f4231337b526b90bc37d321ff6dc367d481b1e3c6feb5d39dc9ba67abef8914b53615a66 WHIRLPOOL cb5db27b2bac5250a07b73039dd4ace956d53709c206b8a9510def9779b87aa131cc4f414d3eb8279fbcc97850e6da393e4e8618541c608f7f57b3e71ccd6c84
+DIST atomdep-keytar-4.0.4.tar.gz 6550 SHA256 65221a8a44c542befd718374e7fd3fce61dab5cfe13fc57cac0c770ce6ebefc1 SHA512 78544e3646ce0f772a9adae055e137034d4b0e83bb8b95647a4efe239bf4bdf863f05317f4b37b0d2ac89e6a6e0107abd0022ccd7abb4310a39fa1c07982b4d4 WHIRLPOOL 249020aef10bc5be6630efa440449350207ca9893102a37173e82c98ab6110d61063abaa92c046a3dfdf2c57cd2d389cfd473092fae036e21bb16426abdbe5a2
+DIST atomdep-nsfw-1.0.16.tar.gz 43214 SHA256 ec205c8796dfac3d884ee50f6c0a0d1c9f8a365fe08e2abc5e73191e4d938eed SHA512 0060d7fb5016454aaaf7df438d973b9a389a6e5f7a166c5d402cf8ef8bcda724501c3bfbd44e37e9e6c38d5f1decaeb48c571aad9145dec38ba0c94073b9702a WHIRLPOOL ff797a7371c79a6cf67b90d9cd0d91bfa0540058354d305d6f3a8c9d1aeb9cbbcaad36892ab63bc77d5b835e1da608f7652da8169f69382dd8490022006eb2ca
+DIST atomdep-nslog-3.0.0.tar.gz 2270 SHA256 a972eaacf92c14e31ae7bfd24c9be5be9c71e693425305e0aa20121cd00d4e73 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1 WHIRLPOOL 0b3d1d40c0cfe892fd4b99f39fc8e308c92ef36eee16db8988782ff2b56b839c90910ada28997cadf5b9797305b408abed46b852eb4ddc6a26a1d38b15a0ff80
+DIST atomdep-oniguruma-6.2.1.tar.gz 586350 SHA256 ace3257ba94772982c8326156f2bda9e0def43185e150274b5b209e5e89f78ac SHA512 faa46dc4c1b8d7e75ab54512de9a823c5b958a7ccb43333375b33e16de47a464ea2a9ba9996596a8359d423a3e8c9d63cc92a5162b3f9d44b4485304073b41f1 WHIRLPOOL e0fdd3e1a9de2565b3bb5c8907e5c804907d0fcf7cdde67f13164178baaacf9e7a375eb8afe3c4113b91eecae3b88bab14f9ee68265acac9463a65678006c175
+DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 SHA256 7da47cef336345ec37c9d22a8cf3cd516938e5bf512b95b25304e9c6edd184ac SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999 WHIRLPOOL 4fe65035e0d594f3d0d2fae3cc7440a32382450ef09b294cbc5ed0421b1dfedef8101a2df0401553074457d24859404e6893fa5b160eb28051bb87229ce36db6
+DIST atomdep-runas-3.1.1.tar.gz 6197 SHA256 4322d505a2542c04b66da17d8342b08ae6d49173b5c221c8267ce8bb4b4453d2 SHA512 29b01d8a1bd05f7f0ad7cf4472f13d12ff27524d44fc0c2ffcf87c187633ccdd5a2d9ae6af2a771eb8e2432b6a957451ea6a6c68d15aa861c4a29affac711d79 WHIRLPOOL 01b83dd5f769d84e4ecacc0eb62acb9831f9b8fc396ad1e59a650faea1725a439e15c3c7bc73896097a9b0723654aa124bf99a121c50c6b5b2d5a012daa06636
+DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 SHA256 480ed4ff284fb3a1773d58975a18ac13ef4aa5c71a918acbae6542d078da0e90 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18 WHIRLPOOL b39d66672bd5e038638c89ffbd8ee85cd663ebcdd2fc9ca55176ed7289fb7895e5adb384a435e716c5a9f54d5328b62532b14b0455adebff7f3f24f858d991bd
+DIST atomdep-spellchecker-3.4.2.tar.gz 476093 SHA256 e35619e9e8efcaa63ed126e43467e0c127e65b24a822f3d4e1c4ff17f25d0eff SHA512 8ed6fa4251cd79de6e77004ea91a438080df7109ebbe2c92934366c34433388bc30c8b1ebc97a47aa2a9f3eb28ac5ba2ccf3a0de9d6f59b2d3125ff7ff2c06a4 WHIRLPOOL 967b1f542e76d73b72e01656cc71c90c76f32542642de7f3bb5c5e3f06422b32e17fc6aaa4b6c3b3d88abe722937d75e8a48c1503125770aa6bae6478c86ec05
+DIST atomdep-spellchecker-3.4.3.tar.gz 480739 SHA256 ad74c118c1cd5f209946801554e5ede1ffa5332c020e7e50eb4ab5245a403b4f SHA512 cef2aa6adf95772f0d38760adb9a805ad540bfb422647486ccd63db7afcca508eb821b6099d9913912dd1b0881f3b5ccc62d203f2ce6bc47859f36a76c781376 WHIRLPOOL 0f3441f6ef01900d14fd949a2b33f91ef19f0731dd08cbab1969c1adfc24594840698b0606e555a27dcf72fa3565a30aa65342f312c09d532be19bd4665476f4
+DIST atomdep-superstring-2.2.3.tar.gz 785373 SHA256 a2a78064a0272094b312fa74dc04521b2badf776eb7b114f691b05c484fc70f6 SHA512 edb71f4cc54436f563b6491f71e8c6c78aa711d1da821619031062e5e85fd60d66f0bcb6a70184b1fd55f31724d63ed9ba9c872d6d80387710262e404541a355 WHIRLPOOL 86b4cbcf1b4e169f7ee3c3999912ef34224ce52ae909a291ea86e73891b04904dcb7bdf5aa0e3889b3abb30bd40dfcf215ae8f86c05e09eb500aff6de56d9c5e
DIST nodejs-nan-2.4.0.tar.gz 157071 SHA256 290b4cd678bb0770fcc0dfa8415f908db09173acfdde31135a4e31716c311883 SHA512 e6f3ab3f67c72b3cc9e6e6b9b5de0f73134ef504dedae5e68376198858a6796f00c35869438e0480f28006dd8f6be13dca3bcc436a1a6b28b1dea5cbc72f9e45 WHIRLPOOL 8628452c69c1774e02b8069ee8db12b7b97bc45166dd4dbec3e8d3f532c97f15a24920f2f59ecb3b8d4addcbada33eb04c1f71222531a7377bcbfaf7d4f3d86b
+DIST nodejs-nan-2.6.2.tar.gz 161949 SHA256 c6b046499f6b2e2c09d6650849e429e226ad884c74dbb5ca8eacb1518d453e7f SHA512 d1b5ed12e90accfa117cb73b9432897631ed2dd6045f93fa8b53237a13cec0ec467b14c035e9e4d4a5c6588949c1c80b0eef48a46d5c9c0a1f81ef400da031c3 WHIRLPOOL 77d0dcf7b2f50007f76024235f2670d9154e8dc02be0dc71e99fb6da86b3e4d56b30271d3e3eb81b1a6715a1eb09d73ef8c2dedb4ac9adb51b8672de4c9cb5e2
diff --git a/app-editors/atom/atom-1.20.1.ebuild b/app-editors/atom/atom-1.20.1.ebuild
new file mode 100644
index 00000000000..e3b34cfffb4
--- /dev/null
+++ b/app-editors/atom/atom-1.20.1.ebuild
@@ -0,0 +1,514 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
+# atom overlay.
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 multiprocessing rpm virtualx
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.6.9
+ELECTRON_SLOT=1.6
+
+ASAR_V=0.13.0
+# All binary packages depend on this
+NAN_V=2.6.2
+
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+CTAGS_V=3.0.0
+FS_ADMIN_V=0.1.6
+GIT_UTILS_V=5.0.0
+KEYBOARD_LAYOUT_V=2.0.13
+KEYTAR_V=4.0.4
+NSFW_V=1.0.16
+NSLOG_V=3.0.0
+ONIGURUMA_V=6.2.1
+PATHWATCHER_V=8.0.1
+RUNAS_V=3.1.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELLCHECKER_V=3.4.2
+SUPERSTRING_V=2.2.3
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+ https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
+ https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
+ https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+ https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+ https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
+ https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
+ https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
+ https://registry.npmjs.org/git-utils/-/git-utils-5.0.0.tgz -> atomdep-git-utils-5.0.0.tar.gz
+ https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
+ https://registry.npmjs.org/keytar/-/keytar-4.0.4.tgz -> atomdep-keytar-4.0.4.tar.gz
+ https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
+ https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
+ https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
+ https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
+ https://registry.npmjs.org/runas/-/runas-3.1.1.tgz -> atomdep-runas-3.1.1.tar.gz
+ https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
+ https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.2.tgz -> atomdep-spellchecker-3.4.2.tar.gz
+ https://registry.npmjs.org/superstring/-/superstring-2.2.3.tgz -> atomdep-superstring-2.2.3.tar.gz
+"
+
+BINMODS=(
+ cached-run-in-this-context
+ ctags
+ fs-admin
+ git-utils
+ keyboard-layout
+ keytar
+ nsfw
+ nslog
+ oniguruma
+ pathwatcher
+ runas
+ scrollbar-style
+ spellchecker
+ superstring
+)
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ >=app-text/hunspell-1.3.3:=
+ >=dev-libs/libgit2-0.23:=[ssh]
+ >=dev-libs/libpcre2-10.22:=[jit,pcre16]
+ >=gnome-base/libgnome-keyring-3.12:=
+ >=dev-libs/oniguruma-5.9.5:=
+ >=dev-util/ctags-5.8
+ >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
+ x11-libs/libxkbfile"
+RDEPEND="
+ ${DEPEND}
+ !sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
+BUILD_DIR="${S}/out"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local a
+
+ for a in ${A} ; do
+ case ${a} in
+ *.rpm) srcrpm_unpack "${a}" ;;
+ *) _unpack "${a}" ;;
+ esac
+ done
+
+ mkdir "${BIN_S}" || die
+ mv "${WORKDIR}/usr" "${BIN_S}" || die
+}
+
+src_prepare() {
+ local install_dir="$(get_install_dir)"
+ local suffix="$(get_install_suffix)"
+ local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
+ local patch
+ local binmod
+ local _s
+
+ mkdir "${BUILD_DIR}" || die
+ cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
+ "${BUILD_DIR}/app" || die
+
+ # Add source files omitted from the upstream binary distribution,
+ # and which we want to include in ours.
+ cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
+
+ # Unpack app.asar
+ if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
+ easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
+ "${BUILD_DIR}/app"
+ fi
+
+ cd "${BUILD_DIR}/app" || die
+
+ eapply "${FILESDIR}/atom-python.patch"
+ eapply "${FILESDIR}/apm-python.patch"
+ eapply "${FILESDIR}/atom-unbundle-electron.patch"
+ eapply "${FILESDIR}/atom-apm-path-r1.patch"
+ eapply "${FILESDIR}/atom-license-path-r1.patch"
+ eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
+ eapply "${FILESDIR}/atom-marker-layer-r1.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
+
+ sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
+ ./atom.sh \
+ || die
+
+ local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
+ export ELECTRON_NO_ASAR=1"
+ sed -i -e \
+ "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
+
+ sed -i -e \
+ "s|atomCommand = 'atom';|atomCommand = '/usr/bin/atom${suffix}'|g" \
+ apm/lib/test.js || die
+
+ rm apm/bin/node || die
+
+ sed -i -e "s|/$(get_atom_rpmdir)/atom|/usr/bin/atom${suffix}|g" \
+ "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
+
+ for binmod in ${BINMODS[@]}; do
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ cd "${_s}" || die
+ if _have_patches_for "${binmod}"; then
+ for patch in "${FILESDIR}"/${binmod}-*.patch; do
+ eapply "${patch}"
+ done
+ fi
+ done
+
+ cd "${BUILD_DIR}/app" || die
+
+ # Unbundle bundled libs from modules
+
+ _s="${WORKDIR}/$(package_dir git-utils)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "git;libgit2;git2" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir oniguruma)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "onig_scanner;oniguruma;onig" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir spellchecker)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "spellchecker;hunspell;hunspell" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir superstring)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle \
+ "superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
+ -DPCRE2_CODE_UNIT_WIDTH=16" \
+ "${_s}/binding.gyp" || die
+
+ for binmod in ${BINMODS[@]}; do
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ mkdir -p "${_s}/node_modules" || die
+ ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+ done
+
+ sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+ "${BUILD_DIR}/app/src/config-schema.js" || die
+
+ eapply_user
+}
+
+src_configure() {
+ local binmod
+
+ for binmod in ${BINMODS[@]}; do
+ einfo "Configuring ${binmod}..."
+ cd "${WORKDIR}/$(package_dir ${binmod})" || die
+ enodegyp_atom configure
+ done
+}
+
+src_compile() {
+ local binmod
+ local x
+ local ctags_d="node_modules/symbols-view/vendor"
+ local jobs=$(makeopts_jobs)
+ local gypopts
+
+ # Transpile any yet untranspiled files.
+ ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
+
+ gypopts="--verbose"
+
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+ gypopts+=" --jobs ${jobs}"
+ fi
+
+ mkdir -p "${BUILD_DIR}/modules/" || die
+
+ for binmod in ${BINMODS[@]}; do
+ einfo "Building ${binmod}..."
+ cd "${WORKDIR}/$(package_dir ${binmod})" || die
+ enodegyp_atom ${gypopts} build
+ x=${binmod##node-}
+ mkdir -p "${BUILD_DIR}/modules/${x}" || die
+ cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
+ done
+
+ # Put compiled binary modules in place
+ _fix_binmods "${BUILD_DIR}/app" "apm"
+ _fix_binmods "${BUILD_DIR}/app" "node_modules"
+
+ # Remove non-Linux vendored ctags binaries
+ rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
+ "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
+
+ # Re-pack app.asar
+ # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+ cd "${BUILD_DIR}" || die
+ x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
+ xd="--unpack-dir=apm"
+ easar pack "${x}" "${xd}" "app" "app.asar"
+
+ rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
+
+ # Replace vendored ctags with a symlink to system ctags
+ rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+ ln -s "/usr/bin/ctags" \
+ "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+src_test() {
+ local electron="$(get_electron_dir)/electron"
+ local app="${BUILD_DIR}/app.asar"
+
+ virtx "${electron}" --app="${app}" --test "${app}/spec"
+}
+
+src_install() {
+ local install_dir="$(get_install_dir)"
+ local suffix="$(get_install_suffix)"
+
+ insinto "${install_dir}"
+
+ doins "${BUILD_DIR}/app.asar"
+ doins -r "${BUILD_DIR}/app.asar.unpacked"
+
+ insinto "${install_dir}/app"
+ doins -r "${BUILD_DIR}/app/apm"
+
+ insinto "/usr/share/applications/"
+ newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
+ "atom${suffix}.desktop"
+
+ insinto "/usr/share/icons/"
+ doins -r "${BIN_S}/usr/share/icons/hicolor"
+
+ exeinto "${install_dir}"
+ newexe "${BUILD_DIR}/app/atom.sh" atom
+ insinto "/usr/share/licenses/${PN}${suffix}"
+ doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
+ dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+ 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"
+}
+
+# Helpers
+# -------
+
+# Return the installation suffix appropriate for the slot.
+get_install_suffix() {
+ local c=(${SLOT//\// })
+ local slot=${c[0]}
+ local suffix
+
+ if [[ "${slot}" == "0" ]]; then
+ suffix=""
+ else
+ suffix="-${slot}"
+ fi
+
+ echo -n "${suffix}"
+}
+
+# Return the upstream app name appropriate for $PV.
+get_atom_appname() {
+ if [[ "${PV}" == *beta* ]]; then
+ echo -n "atom-beta"
+ else
+ echo -n "atom"
+ fi
+}
+
+# Return the app installation path inside the upstream archive.
+get_atom_rpmdir() {
+ echo -n "usr/share/$(get_atom_appname)"
+}
+
+# Return the installation target directory.
+get_install_dir() {
+ echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+# Return the Electron installation directory.
+get_electron_dir() {
+ echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+# Return the directory containing appropriate Node headers
+# for the required version of Electron.
+get_electron_nodedir() {
+ echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+# Run JavaScript using Electron's version of Node.
+enode_electron() {
+ "$(get_electron_dir)"/node $@
+}
+
+# Run node-gyp using Electron's version of Node.
+enodegyp_atom() {
+ local apmpath="$(get_atom_rpmdir)/resources/app/apm"
+ local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+ PATH="$(get_electron_dir):${PATH}" \
+ enode_electron "${nodegyp}" \
+ --nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+# Coffee Script wrapper.
+ecoffeescript() {
+ local cscript="${FILESDIR}/transpile-coffee-script.js"
+
+ # Disable shell glob expansion, as we want the coffee script
+ # transpiler to do that instead.
+ set -f
+ echo "ecoffeescript" $@
+ ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
+ NODE_PATH="${BUILD_DIR}/app/node_modules" \
+ enode_electron "${cscript}" $@ || die
+ set +f
+}
+
+# asar wrapper.
+easar() {
+ local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+ echo "asar" $@
+ enode_electron "${asar}" $@ || die
+}
+
+# Return a $WORKDIR directory for a given package name.
+package_dir() {
+ local binmod="${1//-/_}"
+ local binmod_v="${binmod^^}_V"
+ echo -n ${1}-${!binmod_v}
+}
+
+# Check if there are patches for a given package.
+_have_patches_for() {
+ local _patches="${1}-*.patch" _find
+ _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+ test -n "$_find"
+}
+
+# Tarballs on registry.npmjs.org are wildly inconsistent,
+# and violate the convention of having ${P} as the top directory name.
+# This helper detects and fixes that.
+_unpack() {
+ local a="${1}"
+ local b="${a%.tar.gz}"
+ local p="${b#atomdep-}"
+ local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
+
+ unpack "${a}"
+
+ if [[ "${dir}" != "${p}" ]]; then
+ # Set the correct name for the unpacked directory.
+ mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
+ fi
+}
+
+# Check if the binary node module is actually a valid dependency.
+# Sometimes the upstream removes a dependency from package.json but
+# forgets to remove the module from node_modules.
+_is_valid_binmod() {
+ local mod
+
+ for mod in "${BINMODS[@]}"; do
+ if [[ "${mod}" == "${1}" ]]; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+# Replace binary node modules with the newly compiled versions thereof.
+_fix_binmods() {
+ local _dir="${2}"
+ local _prefix="${1}"
+ local path
+ local relpath
+ local modpath
+ local mod
+ local f
+ local d
+ local cruft
+
+ (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+ | while IFS= read -r path; do
+ f=$(basename "${path}")
+ d=$(dirname "${path}")
+ relpath=${path#${_prefix}}
+ relpath=${relpath##/}
+ relpath=${relpath#W${_dir}}
+ modpath=$(dirname ${relpath})
+ modpath=${modpath%build/Release}
+ mod=$(basename ${modpath})
+
+ _is_valid_binmod "${mod}" || continue
+
+ # must copy here as symlinks will cause the module loading to fail
+ cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
+ cruft=$(find "${d}" -name '*.a' -print)
+ if [[ -n "${cruft}" ]]; then
+ rm ${cruft} || die
+ fi
+ done
+}
+
+# Fix script permissions and shebangs to point to the correct version
+# of Node.
+_fix_executables() {
+ local _dir="${1}"
+ local _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
+}
diff --git a/app-editors/atom/atom-1.21.0_beta2.ebuild b/app-editors/atom/atom-1.21.0_beta2.ebuild
new file mode 100644
index 00000000000..09fa0e8edcb
--- /dev/null
+++ b/app-editors/atom/atom-1.21.0_beta2.ebuild
@@ -0,0 +1,511 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
+# atom overlay.
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 multiprocessing rpm virtualx
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.6.9
+ELECTRON_SLOT=1.6
+
+ASAR_V=0.13.0
+# All binary packages depend on this
+NAN_V=2.6.2
+
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+CTAGS_V=3.0.0
+FS_ADMIN_V=0.1.6
+GIT_UTILS_V=5.0.0
+KEYBOARD_LAYOUT_V=2.0.13
+KEYTAR_V=4.0.4
+NSFW_V=1.0.16
+NSLOG_V=3.0.0
+ONIGURUMA_V=6.2.1
+PATHWATCHER_V=8.0.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELLCHECKER_V=3.4.3
+SUPERSTRING_V=2.2.3
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+ https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
+ https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
+ https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+ https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+ https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
+ https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
+ https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
+ https://registry.npmjs.org/git-utils/-/git-utils-5.0.0.tgz -> atomdep-git-utils-5.0.0.tar.gz
+ https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
+ https://registry.npmjs.org/keytar/-/keytar-4.0.4.tgz -> atomdep-keytar-4.0.4.tar.gz
+ https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
+ https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
+ https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
+ https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
+ https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
+ https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.3.tgz -> atomdep-spellchecker-3.4.3.tar.gz
+ https://registry.npmjs.org/superstring/-/superstring-2.2.3.tgz -> atomdep-superstring-2.2.3.tar.gz
+"
+
+BINMODS=(
+ cached-run-in-this-context
+ ctags
+ fs-admin
+ git-utils
+ keyboard-layout
+ keytar
+ nsfw
+ nslog
+ oniguruma
+ pathwatcher
+ scrollbar-style
+ spellchecker
+ superstring
+)
+
+LICENSE="MIT"
+SLOT="beta"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ >=app-text/hunspell-1.3.3:=
+ >=dev-libs/libgit2-0.23:=[ssh]
+ >=dev-libs/libpcre2-10.22:=[jit,pcre16]
+ >=gnome-base/libgnome-keyring-3.12:=
+ >=dev-libs/oniguruma-5.9.5:=
+ >=dev-util/ctags-5.8
+ >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
+ x11-libs/libxkbfile"
+RDEPEND="
+ ${DEPEND}
+ !sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
+BUILD_DIR="${S}/out"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ local a
+
+ for a in ${A} ; do
+ case ${a} in
+ *.rpm) srcrpm_unpack "${a}" ;;
+ *) _unpack "${a}" ;;
+ esac
+ done
+
+ mkdir "${BIN_S}" || die
+ mv "${WORKDIR}/usr" "${BIN_S}" || die
+}
+
+src_prepare() {
+ local install_dir="$(get_install_dir)"
+ local suffix="$(get_install_suffix)"
+ local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
+ local patch
+ local binmod
+ local _s
+
+ mkdir "${BUILD_DIR}" || die
+ cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
+ "${BUILD_DIR}/app" || die
+
+ # Add source files omitted from the upstream binary distribution,
+ # and which we want to include in ours.
+ cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
+
+ # Unpack app.asar
+ if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
+ easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
+ "${BUILD_DIR}/app"
+ fi
+
+ cd "${BUILD_DIR}/app" || die
+
+ eapply "${FILESDIR}/atom-python.patch"
+ eapply "${FILESDIR}/apm-python.patch"
+ eapply "${FILESDIR}/atom-unbundle-electron.patch"
+ eapply "${FILESDIR}/atom-apm-path-r1.patch"
+ eapply "${FILESDIR}/atom-license-path-r1.patch"
+ eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
+ eapply "${FILESDIR}/atom-marker-layer-r1.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
+
+ sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
+ ./atom.sh \
+ || die
+
+ local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
+ export ELECTRON_NO_ASAR=1"
+ sed -i -e \
+ "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
+
+ sed -i -e \
+ "s|atomCommand = 'atom';|atomCommand = '/usr/bin/atom${suffix}'|g" \
+ apm/lib/test.js || die
+
+ rm apm/bin/node || die
+
+ sed -i -e "s|/$(get_atom_rpmdir)/atom|/usr/bin/atom${suffix}|g" \
+ "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
+
+ for binmod in ${BINMODS[@]}; do
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ cd "${_s}" || die
+ if _have_patches_for "${binmod}"; then
+ for patch in "${FILESDIR}"/${binmod}-*.patch; do
+ eapply "${patch}"
+ done
+ fi
+ done
+
+ cd "${BUILD_DIR}/app" || die
+
+ # Unbundle bundled libs from modules
+
+ _s="${WORKDIR}/$(package_dir git-utils)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "git;libgit2;git2" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir oniguruma)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "onig_scanner;oniguruma;onig" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir spellchecker)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "spellchecker;hunspell;hunspell" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir superstring)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle \
+ "superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
+ -DPCRE2_CODE_UNIT_WIDTH=16" \
+ "${_s}/binding.gyp" || die
+
+ for binmod in ${BINMODS[@]}; do
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ mkdir -p "${_s}/node_modules" || die
+ ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+ done
+
+ sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+ "${BUILD_DIR}/app/src/config-schema.js" || die
+
+ eapply_user
+}
+
+src_configure() {
+ local binmod
+
+ for binmod in ${BINMODS[@]}; do
+ einfo "Configuring ${binmod}..."
+ cd "${WORKDIR}/$(package_dir ${binmod})" || die
+ enodegyp_atom configure
+ done
+}
+
+src_compile() {
+ local binmod
+ local x
+ local ctags_d="node_modules/symbols-view/vendor"
+ local jobs=$(makeopts_jobs)
+ local gypopts
+
+ # Transpile any yet untranspiled files.
+ ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
+
+ gypopts="--verbose"
+
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+ gypopts+=" --jobs ${jobs}"
+ fi
+
+ mkdir -p "${BUILD_DIR}/modules/" || die
+
+ for binmod in ${BINMODS[@]}; do
+ einfo "Building ${binmod}..."
+ cd "${WORKDIR}/$(package_dir ${binmod})" || die
+ enodegyp_atom ${gypopts} build
+ x=${binmod##node-}
+ mkdir -p "${BUILD_DIR}/modules/${x}" || die
+ cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
+ done
+
+ # Put compiled binary modules in place
+ _fix_binmods "${BUILD_DIR}/app" "apm"
+ _fix_binmods "${BUILD_DIR}/app" "node_modules"
+
+ # Remove non-Linux vendored ctags binaries
+ rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
+ "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
+
+ # Re-pack app.asar
+ # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+ cd "${BUILD_DIR}" || die
+ x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
+ xd="--unpack-dir=apm"
+ easar pack "${x}" "${xd}" "app" "app.asar"
+
+ rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
+
+ # Replace vendored ctags with a symlink to system ctags
+ rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+ ln -s "/usr/bin/ctags" \
+ "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+src_test() {
+ local electron="$(get_electron_dir)/electron"
+ local app="${BUILD_DIR}/app.asar"
+
+ virtx "${electron}" --app="${app}" --test "${app}/spec"
+}
+
+src_install() {
+ local install_dir="$(get_install_dir)"
+ local suffix="$(get_install_suffix)"
+
+ insinto "${install_dir}"
+
+ doins "${BUILD_DIR}/app.asar"
+ doins -r "${BUILD_DIR}/app.asar.unpacked"
+
+ insinto "${install_dir}/app"
+ doins -r "${BUILD_DIR}/app/apm"
+
+ insinto "/usr/share/applications/"
+ newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
+ "atom${suffix}.desktop"
+
+ insinto "/usr/share/icons/"
+ doins -r "${BIN_S}/usr/share/icons/hicolor"
+
+ exeinto "${install_dir}"
+ newexe "${BUILD_DIR}/app/atom.sh" atom
+ insinto "/usr/share/licenses/${PN}${suffix}"
+ doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
+ dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+ 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"
+}
+
+# Helpers
+# -------
+
+# Return the installation suffix appropriate for the slot.
+get_install_suffix() {
+ local c=(${SLOT//\// })
+ local slot=${c[0]}
+ local suffix
+
+ if [[ "${slot}" == "0" ]]; then
+ suffix=""
+ else
+ suffix="-${slot}"
+ fi
+
+ echo -n "${suffix}"
+}
+
+# Return the upstream app name appropriate for $PV.
+get_atom_appname() {
+ if [[ "${PV}" == *beta* ]]; then
+ echo -n "atom-beta"
+ else
+ echo -n "atom"
+ fi
+}
+
+# Return the app installation path inside the upstream archive.
+get_atom_rpmdir() {
+ echo -n "usr/share/$(get_atom_appname)"
+}
+
+# Return the installation target directory.
+get_install_dir() {
+ echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+# Return the Electron installation directory.
+get_electron_dir() {
+ echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+# Return the directory containing appropriate Node headers
+# for the required version of Electron.
+get_electron_nodedir() {
+ echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+# Run JavaScript using Electron's version of Node.
+enode_electron() {
+ "$(get_electron_dir)"/node $@
+}
+
+# Run node-gyp using Electron's version of Node.
+enodegyp_atom() {
+ local apmpath="$(get_atom_rpmdir)/resources/app/apm"
+ local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+ PATH="$(get_electron_dir):${PATH}" \
+ enode_electron "${nodegyp}" \
+ --nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+# Coffee Script wrapper.
+ecoffeescript() {
+ local cscript="${FILESDIR}/transpile-coffee-script.js"
+
+ # Disable shell glob expansion, as we want the coffee script
+ # transpiler to do that instead.
+ set -f
+ echo "ecoffeescript" $@
+ ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
+ NODE_PATH="${BUILD_DIR}/app/node_modules" \
+ enode_electron "${cscript}" $@ || die
+ set +f
+}
+
+# asar wrapper.
+easar() {
+ local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+ echo "asar" $@
+ enode_electron "${asar}" $@ || die
+}
+
+# Return a $WORKDIR directory for a given package name.
+package_dir() {
+ local binmod="${1//-/_}"
+ local binmod_v="${binmod^^}_V"
+ echo -n ${1}-${!binmod_v}
+}
+
+# Check if there are patches for a given package.
+_have_patches_for() {
+ local _patches="${1}-*.patch" _find
+ _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+ test -n "$_find"
+}
+
+# Tarballs on registry.npmjs.org are wildly inconsistent,
+# and violate the convention of having ${P} as the top directory name.
+# This helper detects and fixes that.
+_unpack() {
+ local a="${1}"
+ local b="${a%.tar.gz}"
+ local p="${b#atomdep-}"
+ local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
+
+ unpack "${a}"
+
+ if [[ "${dir}" != "${p}" ]]; then
+ # Set the correct name for the unpacked directory.
+ mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
+ fi
+}
+
+# Check if the binary node module is actually a valid dependency.
+# Sometimes the upstream removes a dependency from package.json but
+# forgets to remove the module from node_modules.
+_is_valid_binmod() {
+ local mod
+
+ for mod in "${BINMODS[@]}"; do
+ if [[ "${mod}" == "${1}" ]]; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+# Replace binary node modules with the newly compiled versions thereof.
+_fix_binmods() {
+ local _dir="${2}"
+ local _prefix="${1}"
+ local path
+ local relpath
+ local modpath
+ local mod
+ local f
+ local d
+ local cruft
+
+ (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+ | while IFS= read -r path; do
+ f=$(basename "${path}")
+ d=$(dirname "${path}")
+ relpath=${path#${_prefix}}
+ relpath=${relpath##/}
+ relpath=${relpath#W${_dir}}
+ modpath=$(dirname ${relpath})
+ modpath=${modpath%build/Release}
+ mod=$(basename ${modpath})
+
+ _is_valid_binmod "${mod}" || continue
+
+ # must copy here as symlinks will cause the module loading to fail
+ cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
+ cruft=$(find "${d}" -name '*.a' -print)
+ if [[ -n "${cruft}" ]]; then
+ rm ${cruft} || die
+ fi
+ done
+}
+
+# Fix script permissions and shebangs to point to the correct version
+# of Node.
+_fix_executables() {
+ local _dir="${1}"
+ local _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
+}
diff --git a/app-editors/atom/files/apm-python.patch b/app-editors/atom/files/apm-python.patch
new file mode 100644
index 00000000000..0467beaf10e
--- /dev/null
+++ b/app-editors/atom/files/apm-python.patch
@@ -0,0 +1,16 @@
+diff --git a/apm/bin/python-interceptor.sh b/apm/bin/python-interceptor.sh
+index 7ce1965..12cc72f 100755
+--- a/apm/bin/python-interceptor.sh
++++ b/apm/bin/python-interceptor.sh
+@@ -34,9 +34,9 @@ case $1 in
+ ARGS+=("--format=safemake.py")
+ fi
+
+- exec python "${ARGS[@]}"
++ exec python2 "${ARGS[@]}"
+ ;;
+ *)
+- exec python "$@"
++ exec python2 "$@"
+ ;;
+ esac
diff --git a/app-editors/atom/files/atom-apm-path-r1.patch b/app-editors/atom/files/atom-apm-path-r1.patch
new file mode 100644
index 00000000000..c30987d8a30
--- /dev/null
+++ b/app-editors/atom/files/atom-apm-path-r1.patch
@@ -0,0 +1,16 @@
+diff --git a/src/config-schema.js b/src/config-schema.js
+index 39f0585..24ee2de 100644
+--- a/src/config-schema.js
++++ b/src/config-schema.js
+@@ -5,6 +5,11 @@ const configSchema = {
+ core: {
+ type: 'object',
+ properties: {
++ apmPath: {
++ type: 'string',
++ "default": '/usr/bin/apm{{ATOM_SUFFIX}}',
++ description: 'Path to apm executable.'
++ },
+ ignoredNames: {
+ type: 'array',
+ default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
diff --git a/app-editors/atom/files/atom-fix-app-restart-r1.patch b/app-editors/atom/files/atom-fix-app-restart-r1.patch
new file mode 100644
index 00000000000..f984d7841be
--- /dev/null
+++ b/app-editors/atom/files/atom-fix-app-restart-r1.patch
@@ -0,0 +1,12 @@
+diff --git a/atom-application.js.orig b/atom-application.js
+index 92d985f..9a120e6 100644
+--- a/src/main-process/atom-application.js
++++ b/src/main-process/atom-application.js
+@@ -1178,6 +1178,7 @@
+ AtomApplication.prototype.restart = function() {
+ var args;
+ args = [];
++ args.push("--app=" + this.resourcePath);
+ if (this.safeMode) {
+ args.push("--safe");
+ }
diff --git a/app-editors/atom/files/atom-license-path-r1.patch b/app-editors/atom/files/atom-license-path-r1.patch
new file mode 100644
index 00000000000..c8d6ab9784f
--- /dev/null
+++ b/app-editors/atom/files/atom-license-path-r1.patch
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.js
++++ b/src/main-process/atom-application.js
+@@ -406,7 +406,7 @@
+ this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap');
+ this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets');
+ this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet');
+- this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'));
++ this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md');
+ this.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) {
+ return function(event) {
+ if (!_this.quitting) {
diff --git a/app-editors/atom/files/atom-marker-layer-r1.patch b/app-editors/atom/files/atom-marker-layer-r1.patch
new file mode 100644
index 00000000000..1dcdecbd4eb
--- /dev/null
+++ b/app-editors/atom/files/atom-marker-layer-r1.patch
@@ -0,0 +1,11 @@
+--- a/node_modules/text-buffer/lib/marker-layer.js
+--- b/node_modules/text-buffer/lib/marker-layer.js
+@@ -192,7 +192,7 @@
+ return function(markerId) {
+ var marker;
+ marker = _this.markersById[markerId];
+- if (!marker.matchesParams(params)) {
++ if (marker == null || !marker.matchesParams(params)) {
+ return;
+ }
+ return result.push(marker);
diff --git a/app-editors/atom/files/atom-unbundle-electron.patch b/app-editors/atom/files/atom-unbundle-electron.patch
index f9c7351a6e4..296b17b0c15 100644
--- a/app-editors/atom/files/atom-unbundle-electron.patch
+++ b/app-editors/atom/files/atom-unbundle-electron.patch
@@ -1,17 +1,17 @@
-From 19f9a5c6f8be7b4df069f728d9ea037a36bc03d2 Mon Sep 17 00:00:00 2001
+From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001
From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 5 May 2016 17:23:35 -0400
+Date: Thu, 27 Jul 2017 13:18:54 -0400
Subject: [PATCH] Unbundle electron
---
- atom.sh | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
+ atom.sh | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/atom.sh b/atom.sh
-index b68716b..e119cbd 100755
+index 6b0e94430..ea8e0dc2e 100755
--- a/atom.sh
+++ b/atom.sh
-@@ -87,11 +87,9 @@ elif [ $OS == 'Linux' ]; then
+@@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then
SCRIPT=$(readlink -f "$0")
USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
@@ -22,11 +22,12 @@ index b68716b..e119cbd 100755
- fi
+ export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
+ export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
++ export LOCAL_GIT_DIRECTORY="/usr"
+ ATOM_PATH="{{ATOM_PATH}}"
ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
mkdir -p "$ATOM_HOME"
-@@ -101,11 +99,11 @@ elif [ $OS == 'Linux' ]; then
+@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then
[ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
if [ $EXPECT_OUTPUT ]; then
@@ -41,5 +42,4 @@ index b68716b..e119cbd 100755
cat "$ATOM_HOME/nohup.out"
exit $?
--
-2.7.3
-
+2.13.3
diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py
index 9ab7bf77ea0..370221380b6 100644
--- a/app-editors/atom/files/gyp-unbundle.py
+++ b/app-editors/atom/files/gyp-unbundle.py
@@ -4,6 +4,7 @@ from __future__ import print_function
import argparse
+import pprint
import sys
@@ -19,7 +20,7 @@ def do_unbundle(gypdata, targets):
def _unbundle_in_block(gypblock):
gypdeps = gypblock.get('dependencies') or {}
- for dep, libs in unbundlings.items():
+ for dep, (libs, defines) in unbundlings.items():
if dep not in gypdeps:
continue
@@ -37,6 +38,14 @@ def do_unbundle(gypdata, targets):
gyplibs.extend('-l{}'.format(lib) for lib in libs)
+ if defines:
+ try:
+ dd = gyptarget['defines']
+ except KeyError:
+ dd = gyptarget['defines'] = []
+
+ dd.extend(defines)
+
dropped_deps.add(dep)
gypconds = gypblock.get('conditions') or []
@@ -84,7 +93,8 @@ def main():
parser.add_argument('gypfile', type=str, help='input gyp file')
parser.add_argument(
'--unbundle', type=str, action='append',
- help='unbundle rule in the format <target>;<dep>;<lib>[;lib]')
+ help='unbundle rule in the format '
+ '<target>;<dep>;<lib>[;lib][;-DMACRO]')
parser.add_argument(
'-i', '--inplace', action='store_true',
help='modify gyp file in-place')
@@ -94,18 +104,26 @@ def main():
targets = {}
for unbundle in args.unbundle:
- rule = unbundle.split(';')
+ rule = list(filter(None, (i.strip() for i in unbundle.split(';'))))
if len(rule) < 3:
die('Invalid unbundle rule: {!r}'.format(unbundle))
target, dep = rule[:2]
- libs = rule[2:]
+
+ defines = []
+ libs = []
+
+ for item in rule[2:]:
+ if item.startswith('-D'):
+ defines.append(item[2:])
+ else:
+ libs.append(item)
try:
target_unbundlings = targets[target]
except KeyError:
target_unbundlings = targets[target] = {}
- target_unbundlings[dep] = libs
+ target_unbundlings[dep] = libs, defines
with open(args.gypfile, 'rt') as f:
gypdata = eval(f.read())
@@ -114,9 +132,9 @@ def main():
if args.inplace:
with open(args.gypfile, 'wt') as f:
- f.write(repr(gypdata) + "\n")
+ pprint.pprint(gypdata, stream=f)
else:
- print(repr(gypdata))
+ pprint.pprint(gypdata)
if __name__ == '__main__':
diff --git a/app-editors/atom/files/transpile-coffee-script.js b/app-editors/atom/files/transpile-coffee-script.js
new file mode 100644
index 00000000000..c32e09cad92
--- /dev/null
+++ b/app-editors/atom/files/transpile-coffee-script.js
@@ -0,0 +1,23 @@
+'use strict'
+
+const CompileCache = require(process.env.ATOM_SRC_ROOT + '/src/compile-cache')
+const fs = require('fs')
+const glob = require('glob')
+const path = require('path')
+
+module.exports = function () {
+ let paths = new Set()
+
+ for (let pattern of process.argv.slice(2)) {
+ for (let path of glob.sync(pattern, {nodir: true})) {
+ paths.add(path)
+ }
+ }
+
+ for (let path of paths) {
+ let jsPath = coffeePath.replace(/coffee$/g, 'js')
+ fs.writeFileSync(
+ jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME))
+ fs.unlinkSync(coffeePath)
+ }
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index bbbcc070110..1f6f318b2e2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,10 @@
#--- END OF EXAMPLES ---
+# Patrice Clement <elvis@magic.io> (01 Oct 2017)
+# Mask Atom betas for testing.
+app-editors/atom:beta
+
# Michael Palimaka <kensington@gentoo.org> (01 Oct 2017)
# Fails to build (bug #622632). Requires dead and vulnerable qtwebkit4
# (bug #620710). Masked for removal in 30 days.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-10-02 21:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-02 21:59 [gentoo-commits] repo/gentoo:master commit in: profiles/, app-editors/atom/files/, app-editors/atom/ Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox