Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
Date: Wed, 29 Apr 2020 12:45:06
Message-Id: 1588164239.b152bd2627d961e6c4d9ba47e8c34e14bdd80be9.zlogene@gentoo
1 commit: b152bd2627d961e6c4d9ba47e8c34e14bdd80be9
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 29 12:32:32 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 12:43:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b152bd26
7
8 app-editors/atom remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/show_bug.cgi?id=584348
11 Closes: https://bugs.gentoo.org/show_bug.cgi?id=621798
12 Closes: https://bugs.gentoo.org/show_bug.cgi?id=677294
13 Closes: https://bugs.gentoo.org/show_bug.cgi?id=713014
14
15 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
16
17 app-editors/atom/Manifest | 31 --
18 app-editors/atom/atom-1.32.1.ebuild | 562 ---------------------
19 app-editors/atom/files/apm-python.patch | 16 -
20 app-editors/atom/files/atom-apm-path-r2.patch | 16 -
21 .../atom/files/atom-fix-app-restart-r2.patch | 24 -
22 .../atom/files/atom-fix-config-watcher-r1.patch | 41 --
23 app-editors/atom/files/atom-marker-layer-r1.patch | 11 -
24 app-editors/atom/files/atom-python-r1.patch | 25 -
25 .../atom/files/atom-unbundle-electron-r3.patch | 39 --
26 app-editors/atom/files/gyp-unbundle.py | 141 ------
27 app-editors/atom/files/transpile-coffee-script.js | 25 -
28 app-editors/atom/metadata.xml | 10 -
29 12 files changed, 941 deletions(-)
30
31 diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
32 deleted file mode 100644
33 index c03891ad7c9..00000000000
34 --- a/app-editors/atom/Manifest
35 +++ /dev/null
36 @@ -1,31 +0,0 @@
37 -DIST asar-0.14.3.tar.gz 1516628 BLAKE2B 4f04d08c3084843bc3974e99dea2bd327843afd97575fbedcc0ae224c9511be2b2a178a0ff0e555f1c890218d768cca6616a39a0a4fb2fd119f94b074db73ef7 SHA512 8dc099d038d7c8748d20d64adb037167e43640bb923391d2d94f1e2859d41700b39d6b631ee959505cffc695b8284f7e09d43a914af7effc349a768cfaf1efb4
38 -DIST atom-1.32.1.tar.gz 11685572 BLAKE2B 4e2463d56d3c4c54e3661e8eeb665a86b165f317dd221d849fd6b447bf6e895ac573b019356695fce0da0c176702356cbd5ff53e0878edbd49aa95e15323cda5 SHA512 8220c7cf1bb602dbcb312e986b4c2ff560baf3e46903e770135da36d92920da4d9f2490e9a5dc6b04821dbbb033415b6008f0f483d88c841996c06a9bf36f7e3
39 -DIST atom-bin-1.32.1.rpm 281163511 BLAKE2B 4ff4e055d1cad690c37e6264a7e5771bf50047246950fc45a94cb5217e6cfef2abb8c067efa1ca780550db7f046a8fecc623013cab27fe56df3e22af68f018b6 SHA512 9ff621cb8bcfb185c36eb56cac698a9bd0d2a02b5cc9c7982786b0db241a625188fc6ea9079943bb2c83a122f916a387810fa30161ee9531c1c5c3e28f876f52
40 -DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff
41 -DIST atomdep-atom--watcher-1.0.8.tar.gz 702118 BLAKE2B 21fdb472bc1cd6cc396f686e45f1048ff5507d2126e71d92e1531601d142339a97f3ab8748b34cf8ff8c935fc4f2fa36e86a379a05f79403c7bc3949f5ae8ebb SHA512 e77ba7faf192698ec5b1bbe683c81ead8380dc84a2a4c591dea89847d8595aa49fbc5b24b1725f1ab985b1f6c18f7baa19143780f4e2eb0a717054968db59515
42 -DIST atomdep-cached-run-in-this-context-0.5.0.tar.gz 2697 BLAKE2B aada7cb35fa57abc4e97bc76a1a1c77f167441bf82bec4743b4e570721f67edd1c037033dcf058bf72957c7423c957343697e816e85c401e6497c43af41aa3a1 SHA512 15db433f4bbc5a37ad43de672f3f6f234e9e7c94c5ae6b66939653e85102a724ca8bd69a90d2cc1f2307db55916c66325a56e607f42546807f83595c129ca333
43 -DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc
44 -DIST atomdep-fs-admin-0.1.7.tar.gz 5465 BLAKE2B 50e2f5a2b013d3ca877ad608f62c0bb5464b32af55167d3d97b5d03530ff53cf7e84360fe8de2a7e3b29a226ee462b4735ffe5a16d9e6a6e51027f5bd34431b6 SHA512 110362a2a50782d9d7f44acc88fbaf1c2031d0cd5549af6ee28c4617e10655804bd79320e41c44cc606b4c06075100c3a1bab0d5873ee98a995b048821ef84c1
45 -DIST atomdep-git-utils-5.2.1.tar.gz 4142068 BLAKE2B 7a803e0bbfb8c6afc2e7c82f782d3d80482646935b94e6d878d13120dc0294818a60bfb898a82d3fdea02300bbe473640c1c8fdf2ece9a531eb4b0eb564edad5 SHA512 3eb5da5f8a9bead8bdc94e29d794567969251ddc845c210871d8db9b75f998058bd55085a65d613ddc64ed3daa70544d845ed3557ab7822a2d9c95677bed61b4
46 -DIST atomdep-keyboard-layout-2.0.14.tar.gz 17919 BLAKE2B 9b2a83cf0b4db13e402d6a97fd8729041a25e7296f5e5be23181bad84a314a9012dc69cc387699b3edc5d37a98fcfe8923feb457c3f80e7d0db7b1610542e49b SHA512 42e09fa440bca1a8ba17ca1a3507718b9fb5408a5a42ef4749523dcb3902d876c85de0676a1cc7143455194b70c005a2367ce33418d423f763b2b30651380ad7
47 -DIST atomdep-keytar-4.3.0.tar.gz 8896 BLAKE2B 56d669320ee7eeb78eb676a76de6efe4417b80b5931507009b73cf4aa70b4125fd96a7b1ec0bf05ada86d3107dbdb82028517eccccabfb1d61b1fecd08261de8 SHA512 a5dfbefeff9f4b42d02a6cd6956e91d65ce24d716a85f19e4bab182dfb9322a132da90f301b8eeb5b496f1ff6d9c974410c9fff578404254f7e1502d97d87831
48 -DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1
49 -DIST atomdep-oniguruma-7.0.2.tar.gz 584590 BLAKE2B 2e3e622fdf7c463fa670786f0af8815ffbb1d7a85ff5759b8b13fa2b4ed8cec5959b4186b09521a3060e42abb5d83505f7b925a18f41c99e4d9dab809e39ec01 SHA512 cc2b1d3714ebac1e3254f33185c20e0c6bf5a7835506ef56bec5a720684ca6ee5d8cee0c4165eb0bb60a8edcdaf8eca846aaa0cb6ec2a9859ad61e5ed830db8a
50 -DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999
51 -DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18
52 -DIST atomdep-spellchecker-3.5.0.tar.gz 476758 BLAKE2B 73ca0225bedf7daa0b9f9e3ad5a549cb124443de0887ee77f1a7a7c1e31f1a1c363a5f0118ecb17e70c4ae64338eac83c24dbe4cd13a6ae182d314d22bef3dc4 SHA512 5daed79d1ba562187937f5c435e2f63bcffcef95e12c18e8b3b05e9afd2b7dc815ea88cd60c4ab5ec714654189c27897dadebb798fa535425ea6d0f56cc6ae1d
53 -DIST atomdep-superstring-2.3.4.tar.gz 822697 BLAKE2B 0e81ab0fe8d429c80298a70034c0645412e16dcd38540f5a87433689581c741b554a82739e6bb6954d316bd9a9a6425b9770b3880fe883e27199ea1aa10bbe81 SHA512 0dc3644c2741f45dc531945d5114802ec1e2fbb0d6a85088d1c1fe120f26c0183e93142ce86781dcbac652f088e5b101e83b65bb6a31f1460dd289cf37825e65
54 -DIST atomdep-tree-sitter-0.13.15.tar.gz 193608 BLAKE2B adcc1cec97e0675868b4782a4dede09bbad58e3d85fb55eba9ec0867bc4bc91045db8023aff3975471748297563325359cd6a4819c4474e5aedfec3e8d7565c9 SHA512 16ebd4f9cb0eeedfeb42a2dd2f7fb0e0983ee19976d98e2e0a2e0bf57fea246e7b667ef56733f7a07b434918298889acea0dd8edc109bc5ecafeb0b0d75abdd9
55 -DIST atomdep-tree-sitter-bash-0.13.6.tar.gz 346883 BLAKE2B f1a7bd0391d3d21223d889deb4e38ecf5e323051977cd42095fdb2ac458803968d1c435e6f7c12b0073486eb677ab2f2748fc7dd76e9228e746ac634221ea1c5 SHA512 9761d822c2f5f608950fa4f91b237db136afd4d545b708412b993f89785eb3a931a9a29fc3a652169af20e3c8281ab28ca117bc59bb4b1f2e1dfb6298c843712
56 -DIST atomdep-tree-sitter-c-0.13.7.tar.gz 192058 BLAKE2B e673311a6903736d204b149a983159f7ca52ffc3e1b44f7e800f6a8fcebb49059d6fd6e341506d50d19d3781b495bf0414f8794af2f9e6a93e341fd55fdfa264 SHA512 af533977d06be796c3c1a98fbc44f60cf46a4fdc0f233edd9766c462cdad5116398231863d9cfbe4ffb49befe9bf97466c6d8b9a1535d0af835aa0242e4f5ed5
57 -DIST atomdep-tree-sitter-cpp-0.13.8.tar.gz 610448 BLAKE2B df5ac56a6317c39b5ac1a4d248b0c96751ebed08868977417f68daf30a1c04806874128dd75667d7b543b3062d168ba570783df291931c0a3bed990526eea727 SHA512 3d3b488f8b1e277a73c9c961bf48f3207e6720faac5731d1ed9a02bd01fad0bd844180e867f2bc7b3bc278fe5d218d6808e0e191cf20c763d9fa7e326b34de4e
58 -DIST atomdep-tree-sitter-css-0.13.7.tar.gz 79065 BLAKE2B 5671e6395f41b3dd2f3154d335e9b581507a8a7ad90ed3f4f27bd89055c96bef82d883984055dbf1675c93fe8aa9edce5151902261300d1cedf1dc7d955b9149 SHA512 c4c85564779300081c5f8991eb7ab32eecd5e477eba7c2217430ec2c0b276bba5b4f5107859c412bba68b1531fd5089c6db9491f81aa1409d9e9f3aa5036ca5d
59 -DIST atomdep-tree-sitter-embedded-template-0.13.0.tar.gz 6153 BLAKE2B 7da15e09def3a4088b16f691273f0e99311aea53a20577a618026fbd3f4bd78d3cb4c5a6aa694ed3122465621128d26dd084c85d492f8a6d62246a1e50f29a2f SHA512 20956331c2f6060faa17e1e26ed1174c5e0213a03aea9a464aa53c13ed9d767da90aa0ed646444848f8a7ea7ab17d369292a353ad6ef8578845cf75740034b1a
60 -DIST atomdep-tree-sitter-go-0.13.3.tar.gz 162468 BLAKE2B a3530580f1cddd672807d1d4c6652405a0558edf7d362523d507edacb6ba2abefa58fefe50d762e9c611ab51f6a4b6e62000f2e898058ac3f892fe6e6a11940c SHA512 a579e5103330ac276761a3b37c4ce53255aa644283257106e1b3ef73d8f925277b2180d606bc31a3e5d7bab68b4a56e3d6624bda428b2033bc70a0cdc54b1c1f
61 -DIST atomdep-tree-sitter-html-0.13.5.tar.gz 13738 BLAKE2B c33b69eeb6b1eba0c864988eafe49327eb2f9a770678b03c49548aeb2fff2a1f31a5132565ca4025c008914a410d6cd0a757e9e435efc90cba58443cc2dc88be SHA512 95ac288df0e58fff6e8c462f2e85b8f964d3876a1cad80983f60f0e4b9b0c6ebef136947aff0f845603c5b53788e9479f2d55e7f4492aa79d0c09925d6934878
62 -DIST atomdep-tree-sitter-javascript-0.13.8.tar.gz 1729028 BLAKE2B ea2c8de9091ae224e595b0f50d4b32797c0b87937698b074e6603cdde0ecbfd57e6da7d9d6540d0de7175c6386130de5fb3db6a537a935c121eee8c5ae46879a SHA512 a7bbba657117d6c2238063408ae48d9cae8f4a5e45894b10cc457640e018547e46375ddc52752ca1afc189a0cc590dee75da0d5f04ddc6107c530340a258b341
63 -DIST atomdep-tree-sitter-python-0.13.4.tar.gz 204998 BLAKE2B 54d22a4482705cf482cd13bf8786f2d4a26e709b836007a1cd2bf43a537738a2b27474bc050253462f834f7f211b4c6b5b8b82cc3a1de41faa334c93fdc02db3 SHA512 250ef9ffaf15b0f3125ad7a88ad37181d4e5030e6ca5b4c518ad97822478d6d893b6493c70e35db5f07b3dedb25928285c60cdb5cbb4fd392ae07acaad6aca7d
64 -DIST atomdep-tree-sitter-regex-0.13.1.tar.gz 17153 BLAKE2B 44e137c5464af5e77011a9d8bb9cd6ffa7abf50bbd27a6fc3b8e53739fd6e6c664bce7c1ed348ecbb2a27e8f301caa8a783c5ba756870622fbe1bfe76ee4a8bb SHA512 03e50bb9539cdfb34e8e69a675da97311c14abc839d4509167b612ba92dd15c1e7825d5a748de70513ec902f40f1efbef6317ee5f2f2b700385fab875bfbff9a
65 -DIST atomdep-tree-sitter-ruby-0.13.11.tar.gz 2020951 BLAKE2B 106eb35468106d971338e3387484470a61c84da8a1a2f9632eecd0e84fe13dc801da527652817633083469668f03cc9ea4241526cfe414a7c0c2c2d96d44f311 SHA512 101981059db4c9aa11a834604287fd622af6f7fde5bf9718ff2f140d40b51b345fe6961de02b185345808c827b77202ffb79fba77cbf2ceb9793224b888375c0
66 -DIST atomdep-tree-sitter-typescript-0.13.6.tar.gz 662334 BLAKE2B a4e7898fc115fd73c9a86578aa214cfb11ac0b57bcfe3db8226463a7613d78bec11b987311f8ee884a4aa679ff16deaee158eb36ba8a370be65daff98e41cdac SHA512 d5cb2f0ab5b981fe1de03d195c272db150ebd0cf9f3825d87d7fd3bdee8e01e1d4745bb426c23e084b12e97dd51fbba65f9ffad910d87b57306ef3a10ae2225c
67 -DIST nodejs-nan-2.11.1.tar.gz 170929 BLAKE2B 21287b45865c578257399abddd2fb6a7234891da47bb97073b7595ace6bafc83630f44141d871b061e5d13b6c4b9e02c0d4883ef0a6d6f0d9851ff645a0ab616 SHA512 a80c2857c2f15c085c506cabd081338e25a5de2028327567a039ed9219b912d36ebdfec80f13bebab9872b981d86a2fcc2c8145739b428b8f4148d1a883e408f
68
69 diff --git a/app-editors/atom/atom-1.32.1.ebuild b/app-editors/atom/atom-1.32.1.ebuild
70 deleted file mode 100644
71 index cb97004c983..00000000000
72 --- a/app-editors/atom/atom-1.32.1.ebuild
73 +++ /dev/null
74 @@ -1,562 +0,0 @@
75 -# Copyright 1999-2019 Gentoo Authors
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
79 -# atom overlay. If you would like to make changes, please consider
80 -# modifying the ebuild template and submitting a PR to
81 -# https://github.com/elprans/atom-overlay.
82 -
83 -EAPI=7
84 -
85 -PYTHON_COMPAT=( python2_7 )
86 -inherit multiprocessing python-single-r1 rpm xdg-utils
87 -
88 -DESCRIPTION="A hackable text editor for the 21st Century"
89 -HOMEPAGE="https://atom.io"
90 -MY_PV="${PV//_/-}"
91 -
92 -ELECTRON_V=2.0.9
93 -ELECTRON_SLOT=2.0
94 -
95 -ASAR_V=0.14.3
96 -# All binary packages depend on this
97 -NAN_V=2.11.1
98 -
99 -ATOM__NSFW_V=1.0.18
100 -ATOM__WATCHER_V=1.0.8
101 -CACHED_RUN_IN_THIS_CONTEXT_V=0.5.0
102 -CTAGS_V=3.0.0
103 -FS_ADMIN_V=0.1.7
104 -GIT_UTILS_V=5.2.1
105 -KEYBOARD_LAYOUT_V=2.0.14
106 -KEYTAR_V=4.3.0
107 -NSLOG_V=3.0.0
108 -ONIGURUMA_V=7.0.2
109 -PATHWATCHER_V=8.0.1
110 -SCROLLBAR_STYLE_V=3.2.0
111 -SPELLCHECKER_V=3.5.0
112 -SUPERSTRING_V=2.3.4
113 -TREE_SITTER_V=0.13.15
114 -TREE_SITTER_BASH_V=0.13.6
115 -TREE_SITTER_C_V=0.13.7
116 -TREE_SITTER_CPP_V=0.13.8
117 -TREE_SITTER_CSS_V=0.13.7
118 -TREE_SITTER_EMBEDDED_TEMPLATE_V=0.13.0
119 -TREE_SITTER_GO_V=0.13.3
120 -TREE_SITTER_HTML_V=0.13.5
121 -TREE_SITTER_JAVASCRIPT_V=0.13.8
122 -TREE_SITTER_PYTHON_V=0.13.4
123 -TREE_SITTER_REGEX_V=0.13.1
124 -TREE_SITTER_RUBY_V=0.13.11
125 -TREE_SITTER_TYPESCRIPT_V=0.13.6
126 -
127 -# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
128 -SRC_URI="
129 - https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
130 - https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
131 - https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
132 - https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
133 - https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-${ATOM__NSFW_V}.tar.gz
134 - https://registry.npmjs.org/@atom/watcher/-/watcher-1.0.8.tgz -> atomdep-atom--watcher-${ATOM__WATCHER_V}.tar.gz
135 - https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.5.0.tgz -> atomdep-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
136 - https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-${CTAGS_V}.tar.gz
137 - https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.7.tgz -> atomdep-fs-admin-${FS_ADMIN_V}.tar.gz
138 - https://registry.npmjs.org/git-utils/-/git-utils-5.2.1.tgz -> atomdep-git-utils-${GIT_UTILS_V}.tar.gz
139 - https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.14.tgz -> atomdep-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
140 - https://registry.npmjs.org/keytar/-/keytar-4.3.0.tgz -> atomdep-keytar-${KEYTAR_V}.tar.gz
141 - https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-${NSLOG_V}.tar.gz
142 - https://registry.npmjs.org/oniguruma/-/oniguruma-7.0.2.tgz -> atomdep-oniguruma-${ONIGURUMA_V}.tar.gz
143 - https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-${PATHWATCHER_V}.tar.gz
144 - https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
145 - https://registry.npmjs.org/spellchecker/-/spellchecker-3.5.0.tgz -> atomdep-spellchecker-${SPELLCHECKER_V}.tar.gz
146 - https://registry.npmjs.org/superstring/-/superstring-2.3.4.tgz -> atomdep-superstring-${SUPERSTRING_V}.tar.gz
147 - https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.15.tgz -> atomdep-tree-sitter-${TREE_SITTER_V}.tar.gz
148 - https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.13.6.tgz -> atomdep-tree-sitter-bash-${TREE_SITTER_BASH_V}.tar.gz
149 - https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.13.7.tgz -> atomdep-tree-sitter-c-${TREE_SITTER_C_V}.tar.gz
150 - https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.13.8.tgz -> atomdep-tree-sitter-cpp-${TREE_SITTER_CPP_V}.tar.gz
151 - https://registry.npmjs.org/tree-sitter-css/-/tree-sitter-css-0.13.7.tgz -> atomdep-tree-sitter-css-${TREE_SITTER_CSS_V}.tar.gz
152 - https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.13.0.tgz -> atomdep-tree-sitter-embedded-template-${TREE_SITTER_EMBEDDED_TEMPLATE_V}.tar.gz
153 - https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.13.3.tgz -> atomdep-tree-sitter-go-${TREE_SITTER_GO_V}.tar.gz
154 - https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.13.5.tgz -> atomdep-tree-sitter-html-${TREE_SITTER_HTML_V}.tar.gz
155 - https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.8.tgz -> atomdep-tree-sitter-javascript-${TREE_SITTER_JAVASCRIPT_V}.tar.gz
156 - https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.4.tgz -> atomdep-tree-sitter-python-${TREE_SITTER_PYTHON_V}.tar.gz
157 - https://registry.npmjs.org/tree-sitter-regex/-/tree-sitter-regex-0.13.1.tgz -> atomdep-tree-sitter-regex-${TREE_SITTER_REGEX_V}.tar.gz
158 - https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.11.tgz -> atomdep-tree-sitter-ruby-${TREE_SITTER_RUBY_V}.tar.gz
159 - https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.13.6.tgz -> atomdep-tree-sitter-typescript-${TREE_SITTER_TYPESCRIPT_V}.tar.gz
160 -"
161 -
162 -BINMODS=(
163 - atom--nsfw
164 - atom--watcher
165 - cached-run-in-this-context
166 - ctags
167 - fs-admin
168 - git-utils
169 - keyboard-layout
170 - keytar
171 - nslog
172 - oniguruma
173 - pathwatcher
174 - scrollbar-style
175 - spellchecker
176 - superstring
177 - tree-sitter
178 - tree-sitter-bash
179 - tree-sitter-c
180 - tree-sitter-cpp
181 - tree-sitter-css
182 - tree-sitter-embedded-template
183 - tree-sitter-go
184 - tree-sitter-html
185 - tree-sitter-javascript
186 - tree-sitter-python
187 - tree-sitter-regex
188 - tree-sitter-ruby
189 - tree-sitter-typescript
190 -)
191 -
192 -LICENSE="MIT"
193 -SLOT="0"
194 -KEYWORDS="~amd64"
195 -IUSE=""
196 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
197 -
198 -BDEPEND="
199 - ${PYTHON_DEPS}
200 - >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
201 -"
202 -
203 -DEPEND="
204 - >=app-text/hunspell-1.3.3:=
205 - >=dev-libs/libgit2-0.23:=[ssh]
206 - >=dev-libs/libpcre2-10.22:=[jit,pcre16]
207 - >=dev-libs/oniguruma-6.6.0:=
208 - >=dev-util/ctags-5.8
209 - >=gnome-base/libgnome-keyring-3.12:=
210 - x11-libs/libxkbfile
211 -"
212 -
213 -RDEPEND="
214 - ${DEPEND}
215 - >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
216 - dev-vcs/git
217 - !sys-apps/apmd
218 - ${PYTHON_DEPS}
219 -"
220 -
221 -S="${WORKDIR}/${PN}-${MY_PV}"
222 -BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
223 -BUILD_DIR="${S}/out"
224 -
225 -pkg_setup() {
226 - python-single-r1_pkg_setup
227 -}
228 -
229 -src_unpack() {
230 - local a
231 -
232 - mkdir "${BIN_S}" || die
233 -
234 - for a in ${A} ; do
235 - case "${a}" in
236 - *.rpm)
237 - pushd "${BIN_S}" >/dev/null || die
238 - srcrpm_unpack "${a}"
239 - popd >/dev/null || die
240 - ;;
241 -
242 - *.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
243 - # Tarballs on registry.npmjs.org are wildly inconsistent,
244 - # and violate the convention of having ${P} as the top
245 - # directory name, so we strip the first component and
246 - # unpack into a correct directory explicitly.
247 - local basename=${a%.tar.*}
248 - local destdir=${WORKDIR}/${basename#atomdep-}
249 - mkdir "${destdir}" || die
250 - tar -C "${destdir}" -x -o --strip-components 1 \
251 - -f "${DISTDIR}/${a}" || die
252 - ;;
253 -
254 - *)
255 - # Fallback to the default unpacker.
256 - unpack "${a}"
257 - ;;
258 - esac
259 - done
260 -}
261 -
262 -src_prepare() {
263 - local suffix="$(get_install_suffix)"
264 - local atom_rpmdir=$(get_atom_rpmdir)
265 - local install_dir="${EPREFIX}$(get_install_dir)"
266 - local electron_dir="${EPREFIX}$(get_electron_dir)"
267 - local electron_path="${electron_dir}/electron"
268 - local node_path="${electron_dir}/node"
269 - local node_includes="${EPREFIX}$(get_node_includedir)"
270 - local binmod
271 - local pkgdir
272 -
273 - mkdir "${BUILD_DIR}" || die
274 - cp -a "${BIN_S}/${atom_rpmdir}/resources/app" \
275 - "${BUILD_DIR}/app" || die
276 -
277 - # Add source files omitted from the upstream binary distribution,
278 - # and which we want to include in ours.
279 - cp -a "${S}/spec" "${BUILD_DIR}/app" || die
280 -
281 - # Unpack app.asar
282 - easar extract "${BIN_S}/${atom_rpmdir}/resources/app.asar" \
283 - "${BUILD_DIR}/app"
284 -
285 - cd "${BUILD_DIR}/app" || die
286 -
287 - eapply "${FILESDIR}/apm-python.patch"
288 - eapply "${FILESDIR}/atom-unbundle-electron-r3.patch"
289 - eapply "${FILESDIR}/atom-python-r1.patch"
290 - eapply "${FILESDIR}/atom-apm-path-r2.patch"
291 - eapply "${FILESDIR}/atom-fix-app-restart-r2.patch"
292 - eapply "${FILESDIR}/atom-marker-layer-r1.patch"
293 - eapply "${FILESDIR}/atom-fix-config-watcher-r1.patch"
294 -
295 - sed -i -e "s|path.join(process.resourcesPath, 'LICENSE.md')|'/usr/share/licenses/$(get_atom_appname)/LICENSE.md'|g" \
296 - ./src/main-process/atom-application.js \
297 - || die
298 -
299 - sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|${node_includes}|g" \
300 - -e "s|{{ATOM_PATH}}|${electron_path}|g" \
301 - -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
302 - -e "s|{{ATOM_PREFIX}}|${EPREFIX}|g" \
303 - -e "s|^#!/bin/bash|#!${EPREFIX}/bin/bash|g" \
304 - ./atom.sh \
305 - || die
306 -
307 - local env="export NPM_CONFIG_NODEDIR=${node_includes}\nexport ELECTRON_NO_ASAR=1"
308 - sed -i -e \
309 - "s|\"\$binDir/\$nodeBin\"|${env}\nexec \"${node_path}\"|g" \
310 - apm/bin/apm || die
311 -
312 - sed -i -e \
313 - "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"${node_path}\" |g" \
314 - apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
315 -
316 - sed -i -e \
317 - "s|atomCommand = 'atom';|atomCommand = '${EPREFIX}/usr/bin/atom${suffix}'|g" \
318 - apm/lib/test.js || die
319 -
320 - rm apm/bin/node || die
321 -
322 - sed -i -e "s|/${atom_rpmdir}/atom|${EPREFIX}/usr/bin/atom${suffix}|g" \
323 - "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
324 -
325 - for binmod in "${BINMODS[@]}"; do
326 - pkgdir="${WORKDIR}/$(package_dir ${binmod})"
327 - cd "${pkgdir}" || die
328 - if have_patches_for "${binmod}"; then
329 - eapply "${FILESDIR}"/${binmod}-*.patch
330 - fi
331 - done
332 -
333 - cd "${BUILD_DIR}/app" || die
334 -
335 - # Unbundle bundled libs from modules
336 -
337 - pkgdir="${WORKDIR}/$(package_dir git-utils)"
338 - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
339 - --inplace --unbundle "git;libgit2;git2" \
340 - "${pkgdir}/binding.gyp" || die
341 -
342 - pkgdir="${WORKDIR}/$(package_dir oniguruma)"
343 - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
344 - --inplace --unbundle "onig_scanner;oniguruma;onig" \
345 - "${pkgdir}/binding.gyp" || die
346 -
347 - pkgdir="${WORKDIR}/$(package_dir spellchecker)"
348 - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
349 - --inplace --unbundle "spellchecker;hunspell;hunspell" \
350 - "${pkgdir}/binding.gyp" || die
351 -
352 - pkgdir="${WORKDIR}/$(package_dir superstring)"
353 - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
354 - --inplace --unbundle \
355 - "superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
356 - -DPCRE2_CODE_UNIT_WIDTH=16" \
357 - "${pkgdir}/binding.gyp" || die
358 -
359 - for binmod in "${BINMODS[@]}"; do
360 - pkgdir="${WORKDIR}/$(package_dir ${binmod})"
361 - mkdir -p "${pkgdir}/node_modules" || die
362 - ln -s "${WORKDIR}/nodejs-nan-${NAN_V}" \
363 - "${pkgdir}/node_modules/nan" || die
364 - done
365 -
366 - sed -i -e "s|{{ATOM_PREFIX}}|${EPREFIX}|g" \
367 - "${BUILD_DIR}/app/src/config-schema.js" || die
368 -
369 - sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
370 - "${BUILD_DIR}/app/src/config-schema.js" || die
371 -
372 - eapply_user
373 -}
374 -
375 -src_configure() {
376 - local binmod
377 -
378 - for binmod in "${BINMODS[@]}"; do
379 - einfo "Configuring ${binmod}..."
380 - cd "${WORKDIR}/$(package_dir ${binmod})" || die
381 - enodegyp_atom configure
382 - done
383 -}
384 -
385 -src_compile() {
386 - local binmod
387 - local ctags_d="node_modules/symbols-view/vendor"
388 - local jobs=$(makeopts_jobs)
389 - local unpacked_paths
390 -
391 - # Transpile any yet untranspiled files.
392 - ecoffeescript "${BUILD_DIR}"/app/spec/'*.coffee'
393 -
394 - mkdir -p "${BUILD_DIR}/modules/" || die
395 -
396 - for binmod in "${BINMODS[@]}"; do
397 - local binmod_name=${binmod##node-}
398 -
399 - einfo "Building ${binmod}..."
400 - cd "${WORKDIR}/$(package_dir ${binmod})" || die
401 - enodegyp_atom --verbose --jobs="$(makeopts_jobs)" build
402 - mkdir -p "${BUILD_DIR}/modules/${binmod_name}" || die
403 - cp build/Release/*.node "${BUILD_DIR}/modules/${binmod_name}" || die
404 - done
405 -
406 - # Put compiled binary modules in place
407 - fix_binmods "${BUILD_DIR}/app" "apm"
408 - fix_binmods "${BUILD_DIR}/app" "node_modules"
409 -
410 - # Remove non-Linux vendored ctags binaries
411 - rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
412 - "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
413 -
414 - # Remove bundled git
415 - rm -r "${BUILD_DIR}/app/node_modules/dugite/git" || die
416 -
417 - # Re-pack app.asar
418 - # Keep unpack rules in sync with buildAsarUnpackGlobExpression()
419 - # in script/lib/package-application.js
420 - unpacked_paths=(
421 - "*.node"
422 - "ctags-config"
423 - "ctags-linux"
424 - "**/spec/fixtures/**"
425 - "**/node_modules/github/bin/**"
426 - "**/node_modules/spellchecker/**"
427 - "**/resources/atom.png")
428 -
429 - unpacked_paths=$(IFS=,; echo "${unpacked_paths[*]}")
430 -
431 - cd "${BUILD_DIR}" || die
432 - easar pack --unpack="{${unpacked_paths}}" --unpack-dir=apm "app" "app.asar"
433 -
434 - rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
435 -
436 - # Replace vendored ctags with a symlink to system ctags
437 - rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
438 - ln -s "${EPREFIX}/usr/bin/ctags" \
439 - "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
440 -}
441 -
442 -src_install() {
443 - local install_dir="$(get_install_dir)"
444 - local suffix="$(get_install_suffix)"
445 -
446 - insinto "${install_dir}"
447 -
448 - doins "${BUILD_DIR}/app.asar"
449 - doins -r "${BUILD_DIR}/app.asar.unpacked"
450 -
451 - insinto "${install_dir}/app"
452 - doins -r "${BUILD_DIR}/app/apm"
453 -
454 - insinto "/usr/share/applications/"
455 - newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
456 - "atom${suffix}.desktop"
457 -
458 - insinto "/usr/share/icons/"
459 - doins -r "${BIN_S}/usr/share/icons/hicolor"
460 -
461 - exeinto "${install_dir}"
462 - newexe "${BUILD_DIR}/app/atom.sh" atom
463 - insinto "/usr/share/licenses/${PN}${suffix}"
464 - doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
465 - dosym "../..${install_dir}/atom" "/usr/bin/atom${suffix}"
466 - dosym "../..${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
467 -
468 - fix_executables "${install_dir}/app/apm/bin"
469 - fix_executables "${install_dir}/app/apm/node_modules/.bin"
470 - fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
471 - fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
472 - fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
473 -}
474 -
475 -pkg_postinst() {
476 - xdg_desktop_database_update
477 - xdg_mimeinfo_database_update
478 -}
479 -
480 -pkg_postrm() {
481 - xdg_desktop_database_update
482 - xdg_mimeinfo_database_update
483 -}
484 -
485 -# Helpers
486 -# -------
487 -
488 -# Return the installation suffix appropriate for the slot.
489 -get_install_suffix() {
490 - local slot=${SLOT%%/*}
491 - local suffix
492 -
493 - if [[ "${slot}" == "0" ]]; then
494 - suffix=""
495 - else
496 - suffix="-${slot}"
497 - fi
498 -
499 - echo "${suffix}"
500 -}
501 -
502 -# Return the upstream app name appropriate for $PV.
503 -get_atom_appname() {
504 - if [[ "${PV}" == *beta* ]]; then
505 - echo "atom-beta"
506 - else
507 - echo "atom"
508 - fi
509 -}
510 -
511 -# Return the app installation path inside the upstream archive.
512 -get_atom_rpmdir() {
513 - echo "usr/share/$(get_atom_appname)"
514 -}
515 -
516 -# Return the installation target directory.
517 -get_install_dir() {
518 - echo "/usr/$(get_libdir)/atom$(get_install_suffix)"
519 -}
520 -
521 -# Return the Electron installation directory.
522 -get_electron_dir() {
523 - echo "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
524 -}
525 -
526 -# Return the directory containing appropriate Node headers
527 -# for the required version of Electron.
528 -get_node_includedir() {
529 - echo "/usr/include/electron-${ELECTRON_SLOT}/node/"
530 -}
531 -
532 -# Run JavaScript using Electron's version of Node.
533 -enode_electron() {
534 - "${BROOT}/$(get_electron_dir)"/node "${@}"
535 -}
536 -
537 -# Run node-gyp using Electron's version of Node.
538 -enodegyp_atom() {
539 - local apmpath="$(get_atom_rpmdir)/resources/app/apm"
540 - local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
541 -
542 - PATH="${BROOT}/$(get_electron_dir):${PATH}" \
543 - enode_electron "${nodegyp}" \
544 - --nodedir="${BROOT}/$(get_node_includedir)" "${@}" || die
545 -}
546 -
547 -# Coffee Script wrapper.
548 -ecoffeescript() {
549 - local cscript="${FILESDIR}/transpile-coffee-script.js"
550 -
551 - echo "ecoffeescript" "${@}"
552 - echo ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
553 - NODE_PATH="${BUILD_DIR}/app/node_modules" \
554 - enode_electron "${cscript}" "${@}" || die
555 - ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
556 - NODE_PATH="${BUILD_DIR}/app/node_modules" \
557 - enode_electron "${cscript}" "${@}" || die
558 -}
559 -
560 -# asar wrapper.
561 -easar() {
562 - local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
563 - echo "asar" "${@}"
564 - enode_electron "${asar}" "${@}" || die
565 -}
566 -
567 -# Return a $WORKDIR directory for a given package name.
568 -package_dir() {
569 - local binmod="${1//-/_}"
570 - local binmod_v="${binmod^^}_V"
571 - if [[ -z "${binmod_v}" ]]; then
572 - die "${binmod_v} is not set."
573 - fi
574 -
575 - echo ${1}-${!binmod_v}
576 -}
577 -
578 -# Check if there are patches for a given package.
579 -have_patches_for() {
580 - local patches="${1}-*.patch"
581 - local found
582 - found=$(find "${FILESDIR}" -maxdepth 1 -name "${patches}" -print -quit)
583 - test -n "${found}"
584 -}
585 -
586 -# Replace binary node modules with the newly compiled versions thereof.
587 -fix_binmods() {
588 - local dir="${2}"
589 - local prefix="${1}"
590 - local path
591 - local relpath
592 - local modpath
593 - local mod
594 - local cruft
595 -
596 - while IFS= read -r -d '' path; do
597 - relpath=${path#${prefix}}
598 - relpath=${relpath##/}
599 - relpath=${relpath#W${dir}}
600 - modpath=$(dirname ${relpath})
601 - modpath=${modpath%build/Release}
602 - mod=$(basename ${modpath})
603 -
604 - # Check if the binary node module is actually a valid dependency.
605 - # Sometimes the upstream removes a dependency from package.json but
606 - # forgets to remove the module from node_modules.
607 - has "${mod}" "${BINMODS[@]}" || continue
608 -
609 - # Must copy here as symlinks will cause the module loading to fail.
610 - cp -f "${BUILD_DIR}/modules/${mod}/${path##*/}" "${path}" || die
611 -
612 - # Drop unnecessary static libraries.
613 - find "${path%/*}" -name '*.a' -delete || die
614 - done < <(find "${prefix}/${dir}" -name '*.node' -print0 || die)
615 -}
616 -
617 -# Fix script permissions and shebangs to point to the correct version
618 -# of Node.
619 -fix_executables() {
620 - local dir="${1}"
621 - local node_sb="#!${EPREFIX}$(get_electron_dir)"/node
622 -
623 - while IFS= read -r -d '' f; do
624 - IFS= read -r shebang < "${f}"
625 -
626 - if [[ ${shebang} == '#!'* ]]; then
627 - fperms +x "${f#${ED}}"
628 - if [[ "${shebang}" == "#!/usr/bin/env node" || \
629 - "${shebang}" == "#!/usr/bin/node" ]]; then
630 - einfo "Fixing node shebang in ${f#${ED}}"
631 - sed --follow-symlinks -i \
632 - -e "1s:${shebang}$:${node_sb}:" "${f}" || die
633 - fi
634 - fi
635 - done < <(find -L "${ED}${dir}" -maxdepth 1 -mindepth 1 -type f -print0 || die)
636 -}
637
638 diff --git a/app-editors/atom/files/apm-python.patch b/app-editors/atom/files/apm-python.patch
639 deleted file mode 100644
640 index 0467beaf10e..00000000000
641 --- a/app-editors/atom/files/apm-python.patch
642 +++ /dev/null
643 @@ -1,16 +0,0 @@
644 -diff --git a/apm/bin/python-interceptor.sh b/apm/bin/python-interceptor.sh
645 -index 7ce1965..12cc72f 100755
646 ---- a/apm/bin/python-interceptor.sh
647 -+++ b/apm/bin/python-interceptor.sh
648 -@@ -34,9 +34,9 @@ case $1 in
649 - ARGS+=("--format=safemake.py")
650 - fi
651 -
652 -- exec python "${ARGS[@]}"
653 -+ exec python2 "${ARGS[@]}"
654 - ;;
655 - *)
656 -- exec python "$@"
657 -+ exec python2 "$@"
658 - ;;
659 - esac
660
661 diff --git a/app-editors/atom/files/atom-apm-path-r2.patch b/app-editors/atom/files/atom-apm-path-r2.patch
662 deleted file mode 100644
663 index 12234b6bab1..00000000000
664 --- a/app-editors/atom/files/atom-apm-path-r2.patch
665 +++ /dev/null
666 @@ -1,16 +0,0 @@
667 -diff --git a/src/config-schema.js b/src/config-schema.js
668 -index 39f0585..24ee2de 100644
669 ---- a/src/config-schema.js
670 -+++ b/src/config-schema.js
671 -@@ -5,6 +5,11 @@ const configSchema = {
672 - core: {
673 - type: 'object',
674 - properties: {
675 -+ apmPath: {
676 -+ type: 'string',
677 -+ "default": '{{ATOM_PREFIX}}/usr/bin/apm{{ATOM_SUFFIX}}',
678 -+ description: 'Path to apm executable.'
679 -+ },
680 - ignoredNames: {
681 - type: 'array',
682 - default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
683
684 diff --git a/app-editors/atom/files/atom-fix-app-restart-r2.patch b/app-editors/atom/files/atom-fix-app-restart-r2.patch
685 deleted file mode 100644
686 index a2defa21db2..00000000000
687 --- a/app-editors/atom/files/atom-fix-app-restart-r2.patch
688 +++ /dev/null
689 @@ -1,24 +0,0 @@
690 -From bf4c1ab651a82eb369ffa3dc4b20246d043d797a Mon Sep 17 00:00:00 2001
691 -From: Elvis Pranskevichus <elvis@×××××.io>
692 -Date: Wed, 28 Mar 2018 12:02:53 -0400
693 -Subject: [PATCH] Fix app restart
694 -
695 ----
696 - src/main-process/atom-application.js | 1 +
697 - 1 file changed, 1 insertion(+)
698 -
699 -diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
700 -index 10b791761..d16a68fba 100644
701 ---- a/src/main-process/atom-application.js
702 -+++ b/src/main-process/atom-application.js
703 -@@ -1344,6 +1344,7 @@ class AtomApplication extends EventEmitter {
704 -
705 - restart () {
706 - const args = []
707 -+ args.push("--app=" + this.resourcePath);
708 - if (this.safeMode) args.push('--safe')
709 - if (this.logFile != null) args.push(`--log-file=${this.logFile}`)
710 - if (this.socketPath != null) args.push(`--socket-path=${this.socketPath}`)
711 ---
712 -2.16.1
713 -
714
715 diff --git a/app-editors/atom/files/atom-fix-config-watcher-r1.patch b/app-editors/atom/files/atom-fix-config-watcher-r1.patch
716 deleted file mode 100644
717 index 7af82050d46..00000000000
718 --- a/app-editors/atom/files/atom-fix-config-watcher-r1.patch
719 +++ /dev/null
720 @@ -1,41 +0,0 @@
721 -From 5f1f840372611b8f42d8fd3be7b680f90958f015 Mon Sep 17 00:00:00 2001
722 -From: Elvis Pranskevichus <elvis@×××××.io>
723 -Date: Wed, 28 Mar 2018 18:52:58 -0400
724 -Subject: [PATCH] Unbreak config watcher in the main process
725 -
726 ----
727 - src/path-watcher.js | 14 ++++++++++++--
728 - 1 file changed, 12 insertions(+), 2 deletions(-)
729 -
730 -diff --git a/src/path-watcher.js b/src/path-watcher.js
731 -index 6693489ef..f3ddc6fe4 100644
732 ---- a/src/path-watcher.js
733 -+++ b/src/path-watcher.js
734 -@@ -544,12 +544,22 @@ class PathWatcherManager {
735 - // Private: Access the currently active manager instance, creating one if necessary.
736 - static active () {
737 - if (!this.activeManager) {
738 -- this.activeManager = new PathWatcherManager(atom.config.get('core.fileSystemWatcher'))
739 -- this.sub = atom.config.onDidChange('core.fileSystemWatcher', ({newValue}) => { this.transitionTo(newValue) })
740 -+ let config = this.getConfig()
741 -+ this.activeManager = new PathWatcherManager(config.get('core.fileSystemWatcher'))
742 -+ this.sub = config.onDidChange('core.fileSystemWatcher', ({newValue}) => { this.transitionTo(newValue) })
743 - }
744 - return this.activeManager
745 - }
746 -
747 -+ // Private: get config instance for the current application
748 -+ static getConfig() {
749 -+ if (typeof(global.atom) != 'undefined') {
750 -+ return global.atom.config
751 -+ } else {
752 -+ return global.atomApplication.config
753 -+ }
754 -+ }
755 -+
756 - // Private: Replace the active {PathWatcherManager} with a new one that creates [NativeWatchers]{NativeWatcher}
757 - // based on the value of `setting`.
758 - static async transitionTo (setting) {
759 ---
760 -2.17.0
761 -
762
763 diff --git a/app-editors/atom/files/atom-marker-layer-r1.patch b/app-editors/atom/files/atom-marker-layer-r1.patch
764 deleted file mode 100644
765 index 1dcdecbd4eb..00000000000
766 --- a/app-editors/atom/files/atom-marker-layer-r1.patch
767 +++ /dev/null
768 @@ -1,11 +0,0 @@
769 ---- a/node_modules/text-buffer/lib/marker-layer.js
770 ---- b/node_modules/text-buffer/lib/marker-layer.js
771 -@@ -192,7 +192,7 @@
772 - return function(markerId) {
773 - var marker;
774 - marker = _this.markersById[markerId];
775 -- if (!marker.matchesParams(params)) {
776 -+ if (marker == null || !marker.matchesParams(params)) {
777 - return;
778 - }
779 - return result.push(marker);
780
781 diff --git a/app-editors/atom/files/atom-python-r1.patch b/app-editors/atom/files/atom-python-r1.patch
782 deleted file mode 100644
783 index 96d6b0327fa..00000000000
784 --- a/app-editors/atom/files/atom-python-r1.patch
785 +++ /dev/null
786 @@ -1,25 +0,0 @@
787 -From fae3881a3fa5bf58c696c5bd9c74c62a2113cb12 Mon Sep 17 00:00:00 2001
788 -From: Elvis Pranskevichus <elvis@×××××.io>
789 -Date: Sat, 29 Sep 2018 16:12:39 -0400
790 -Subject: [PATCH] Use Python 2
791 -
792 ----
793 - atom.sh | 2 ++
794 - 1 file changed, 2 insertions(+)
795 -
796 -diff --git a/atom.sh b/atom.sh
797 -index 0ad3f5b23..62fe682fe 100755
798 ---- a/atom.sh
799 -+++ b/atom.sh
800 -@@ -62,6 +62,8 @@ if [ $REDIRECT_STDERR ]; then
801 - exec 2> /dev/null
802 - fi
803 -
804 -+export PYTHON=python2
805 -+
806 - ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
807 - mkdir -p "$ATOM_HOME"
808 -
809 ---
810 -2.16.4
811 -
812
813 diff --git a/app-editors/atom/files/atom-unbundle-electron-r3.patch b/app-editors/atom/files/atom-unbundle-electron-r3.patch
814 deleted file mode 100644
815 index 1a6ea109d05..00000000000
816 --- a/app-editors/atom/files/atom-unbundle-electron-r3.patch
817 +++ /dev/null
818 @@ -1,39 +0,0 @@
819 -From 342dc685f8139e950924c04f1d460052e7531fb5 Mon Sep 17 00:00:00 2001
820 -From: Elvis Pranskevichus <elvis@×××××.io>
821 -Date: Thu, 5 May 2016 17:23:35 -0400
822 -Subject: [PATCH] Unbundle electron
823 -
824 ----
825 - atom.sh | 9 +++++++--
826 - 1 file changed, 7 insertions(+), 2 deletions(-)
827 -
828 -diff --git a/atom.sh b/atom.sh
829 -index 935204bfc..0ad3f5b23 100755
830 ---- a/atom.sh
831 -+++ b/atom.sh
832 -@@ -138,16 +138,21 @@ elif [ $OS == 'Linux' ]; then
833 - ;;
834 - esac
835 -
836 -+ export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
837 -+ export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
838 -+ export LOCAL_GIT_DIRECTORY="{{ATOM_PREFIX}}/usr"
839 -+ ATOM_PATH="{{ATOM_PATH}}"
840 -+
841 - : ${TMPDIR:=/tmp}
842 -
843 - [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
844 -
845 - if [ $EXPECT_OUTPUT ]; then
846 -- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
847 -+ "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
848 - exit $?
849 - else
850 - (
851 -- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
852 -+ nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
853 - if [ $? -ne 0 ]; then
854 - cat "$ATOM_HOME/nohup.out"
855 - exit $?
856 ---
857 -2.16.4
858
859 diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py
860 deleted file mode 100644
861 index 370221380b6..00000000000
862 --- a/app-editors/atom/files/gyp-unbundle.py
863 +++ /dev/null
864 @@ -1,141 +0,0 @@
865 -#!/usr/bin/env python2
866 -
867 -from __future__ import print_function
868 -
869 -
870 -import argparse
871 -import pprint
872 -import sys
873 -
874 -
875 -def die(msg):
876 - print(msg, file=sys.stderr)
877 - sys.exit(1)
878 -
879 -
880 -def do_unbundle(gypdata, targets):
881 - gyptargets = {t['target_name']: t for t in gypdata['targets']}
882 - dropped_deps = set()
883 -
884 - def _unbundle_in_block(gypblock):
885 - gypdeps = gypblock.get('dependencies') or {}
886 -
887 - for dep, (libs, defines) in unbundlings.items():
888 - if dep not in gypdeps:
889 - continue
890 -
891 - gypdeps.remove(dep)
892 -
893 - try:
894 - ls = gyptarget['link_settings']
895 - except KeyError:
896 - ls = gyptarget['link_settings'] = {}
897 -
898 - try:
899 - gyplibs = ls['libraries']
900 - except KeyError:
901 - gyplibs = ls['libraries'] = []
902 -
903 - gyplibs.extend('-l{}'.format(lib) for lib in libs)
904 -
905 - if defines:
906 - try:
907 - dd = gyptarget['defines']
908 - except KeyError:
909 - dd = gyptarget['defines'] = []
910 -
911 - dd.extend(defines)
912 -
913 - dropped_deps.add(dep)
914 -
915 - gypconds = gypblock.get('conditions') or []
916 - for cond in gypconds:
917 - condblocks = cond[1:]
918 - for condblock in condblocks:
919 - _unbundle_in_block(condblock)
920 -
921 - for target, unbundlings in targets.items():
922 - if target not in gyptargets:
923 - die('There is no {} target in gyp file'.format(target))
924 -
925 - gyptarget = gyptargets[target]
926 -
927 - _unbundle_in_block(gyptarget)
928 -
929 - for gyptarget in gypdata['targets']:
930 - if gyptarget['target_name'] in dropped_deps:
931 - if gyptarget.get('dependencies'):
932 - dropped_deps.update(gyptarget.get('dependencies'))
933 -
934 - new_targets = []
935 - for gyptarget in gypdata['targets']:
936 - if gyptarget['target_name'] not in dropped_deps:
937 - new_targets.append(gyptarget)
938 -
939 - gypdata['targets'] = new_targets
940 -
941 - gypconds = gypdata.get('conditions')
942 - if gypconds:
943 - for cond in gypconds:
944 - condblocks = cond[1:]
945 - for condblock in condblocks:
946 - new_targets = []
947 - blocktargets = condblock.get('targets')
948 - if blocktargets:
949 - for blocktarget in blocktargets:
950 - if blocktarget['target_name'] not in dropped_deps:
951 - new_targets.append(blocktarget)
952 - condblock['targets'] = new_targets
953 -
954 -
955 -def main():
956 - parser = argparse.ArgumentParser(description='Unbundle libs in gyp files')
957 - parser.add_argument('gypfile', type=str, help='input gyp file')
958 - parser.add_argument(
959 - '--unbundle', type=str, action='append',
960 - help='unbundle rule in the format '
961 - '<target>;<dep>;<lib>[;lib][;-DMACRO]')
962 - parser.add_argument(
963 - '-i', '--inplace', action='store_true',
964 - help='modify gyp file in-place')
965 -
966 - args = parser.parse_args()
967 -
968 - targets = {}
969 -
970 - for unbundle in args.unbundle:
971 - rule = list(filter(None, (i.strip() for i in unbundle.split(';'))))
972 - if len(rule) < 3:
973 - die('Invalid unbundle rule: {!r}'.format(unbundle))
974 - target, dep = rule[:2]
975 -
976 - defines = []
977 - libs = []
978 -
979 - for item in rule[2:]:
980 - if item.startswith('-D'):
981 - defines.append(item[2:])
982 - else:
983 - libs.append(item)
984 -
985 - try:
986 - target_unbundlings = targets[target]
987 - except KeyError:
988 - target_unbundlings = targets[target] = {}
989 -
990 - target_unbundlings[dep] = libs, defines
991 -
992 - with open(args.gypfile, 'rt') as f:
993 - gypdata = eval(f.read())
994 -
995 - do_unbundle(gypdata, targets)
996 -
997 - if args.inplace:
998 - with open(args.gypfile, 'wt') as f:
999 - pprint.pprint(gypdata, stream=f)
1000 - else:
1001 - pprint.pprint(gypdata)
1002 -
1003 -
1004 -if __name__ == '__main__':
1005 - main()
1006
1007 diff --git a/app-editors/atom/files/transpile-coffee-script.js b/app-editors/atom/files/transpile-coffee-script.js
1008 deleted file mode 100644
1009 index bbea175b672..00000000000
1010 --- a/app-editors/atom/files/transpile-coffee-script.js
1011 +++ /dev/null
1012 @@ -1,25 +0,0 @@
1013 -'use strict'
1014 -
1015 -const CompileCache = require(process.env.ATOM_SRC_ROOT + '/src/compile-cache')
1016 -const fs = require('fs')
1017 -const glob = require('glob')
1018 -const path = require('path')
1019 -
1020 -function do_compile() {
1021 - let paths = new Set()
1022 -
1023 - for (let pattern of process.argv.slice(2)) {
1024 - for (let path of glob.sync(pattern, {nodir: true})) {
1025 - paths.add(path)
1026 - }
1027 - }
1028 -
1029 - for (let coffeePath of paths) {
1030 - let jsPath = coffeePath.replace(/coffee$/g, 'js')
1031 - fs.writeFileSync(
1032 - jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME))
1033 - fs.unlinkSync(coffeePath)
1034 - }
1035 -}
1036 -
1037 -do_compile()
1038
1039 diff --git a/app-editors/atom/metadata.xml b/app-editors/atom/metadata.xml
1040 deleted file mode 100644
1041 index f35968a5e1f..00000000000
1042 --- a/app-editors/atom/metadata.xml
1043 +++ /dev/null
1044 @@ -1,10 +0,0 @@
1045 -<?xml version='1.0' encoding='UTF-8'?>
1046 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1047 -<pkgmetadata>
1048 - <maintainer type="person">
1049 - <email>cynede@g.o</email>
1050 - </maintainer>
1051 - <upstream>
1052 - <remote-id type="github">atom/node-spellchecker</remote-id>
1053 - </upstream>
1054 -</pkgmetadata>