diff options
-rw-r--r-- | app-editors/atom/Manifest | 31 | ||||
-rw-r--r-- | app-editors/atom/atom-1.32.1.ebuild | 562 | ||||
-rw-r--r-- | app-editors/atom/files/apm-python.patch | 16 | ||||
-rw-r--r-- | app-editors/atom/files/atom-apm-path-r2.patch | 16 | ||||
-rw-r--r-- | app-editors/atom/files/atom-fix-app-restart-r2.patch | 24 | ||||
-rw-r--r-- | app-editors/atom/files/atom-fix-config-watcher-r1.patch | 41 | ||||
-rw-r--r-- | app-editors/atom/files/atom-marker-layer-r1.patch | 11 | ||||
-rw-r--r-- | app-editors/atom/files/atom-python-r1.patch | 25 | ||||
-rw-r--r-- | app-editors/atom/files/atom-unbundle-electron-r3.patch | 39 | ||||
-rw-r--r-- | app-editors/atom/files/gyp-unbundle.py | 141 | ||||
-rw-r--r-- | app-editors/atom/files/transpile-coffee-script.js | 25 | ||||
-rw-r--r-- | app-editors/atom/metadata.xml | 10 |
12 files changed, 0 insertions, 941 deletions
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest deleted file mode 100644 index c03891ad7c95..000000000000 --- a/app-editors/atom/Manifest +++ /dev/null @@ -1,31 +0,0 @@ -DIST asar-0.14.3.tar.gz 1516628 BLAKE2B 4f04d08c3084843bc3974e99dea2bd327843afd97575fbedcc0ae224c9511be2b2a178a0ff0e555f1c890218d768cca6616a39a0a4fb2fd119f94b074db73ef7 SHA512 8dc099d038d7c8748d20d64adb037167e43640bb923391d2d94f1e2859d41700b39d6b631ee959505cffc695b8284f7e09d43a914af7effc349a768cfaf1efb4 -DIST atom-1.32.1.tar.gz 11685572 BLAKE2B 4e2463d56d3c4c54e3661e8eeb665a86b165f317dd221d849fd6b447bf6e895ac573b019356695fce0da0c176702356cbd5ff53e0878edbd49aa95e15323cda5 SHA512 8220c7cf1bb602dbcb312e986b4c2ff560baf3e46903e770135da36d92920da4d9f2490e9a5dc6b04821dbbb033415b6008f0f483d88c841996c06a9bf36f7e3 -DIST atom-bin-1.32.1.rpm 281163511 BLAKE2B 4ff4e055d1cad690c37e6264a7e5771bf50047246950fc45a94cb5217e6cfef2abb8c067efa1ca780550db7f046a8fecc623013cab27fe56df3e22af68f018b6 SHA512 9ff621cb8bcfb185c36eb56cac698a9bd0d2a02b5cc9c7982786b0db241a625188fc6ea9079943bb2c83a122f916a387810fa30161ee9531c1c5c3e28f876f52 -DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff -DIST atomdep-atom--watcher-1.0.8.tar.gz 702118 BLAKE2B 21fdb472bc1cd6cc396f686e45f1048ff5507d2126e71d92e1531601d142339a97f3ab8748b34cf8ff8c935fc4f2fa36e86a379a05f79403c7bc3949f5ae8ebb SHA512 e77ba7faf192698ec5b1bbe683c81ead8380dc84a2a4c591dea89847d8595aa49fbc5b24b1725f1ab985b1f6c18f7baa19143780f4e2eb0a717054968db59515 -DIST atomdep-cached-run-in-this-context-0.5.0.tar.gz 2697 BLAKE2B aada7cb35fa57abc4e97bc76a1a1c77f167441bf82bec4743b4e570721f67edd1c037033dcf058bf72957c7423c957343697e816e85c401e6497c43af41aa3a1 SHA512 15db433f4bbc5a37ad43de672f3f6f234e9e7c94c5ae6b66939653e85102a724ca8bd69a90d2cc1f2307db55916c66325a56e607f42546807f83595c129ca333 -DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc -DIST atomdep-fs-admin-0.1.7.tar.gz 5465 BLAKE2B 50e2f5a2b013d3ca877ad608f62c0bb5464b32af55167d3d97b5d03530ff53cf7e84360fe8de2a7e3b29a226ee462b4735ffe5a16d9e6a6e51027f5bd34431b6 SHA512 110362a2a50782d9d7f44acc88fbaf1c2031d0cd5549af6ee28c4617e10655804bd79320e41c44cc606b4c06075100c3a1bab0d5873ee98a995b048821ef84c1 -DIST atomdep-git-utils-5.2.1.tar.gz 4142068 BLAKE2B 7a803e0bbfb8c6afc2e7c82f782d3d80482646935b94e6d878d13120dc0294818a60bfb898a82d3fdea02300bbe473640c1c8fdf2ece9a531eb4b0eb564edad5 SHA512 3eb5da5f8a9bead8bdc94e29d794567969251ddc845c210871d8db9b75f998058bd55085a65d613ddc64ed3daa70544d845ed3557ab7822a2d9c95677bed61b4 -DIST atomdep-keyboard-layout-2.0.14.tar.gz 17919 BLAKE2B 9b2a83cf0b4db13e402d6a97fd8729041a25e7296f5e5be23181bad84a314a9012dc69cc387699b3edc5d37a98fcfe8923feb457c3f80e7d0db7b1610542e49b SHA512 42e09fa440bca1a8ba17ca1a3507718b9fb5408a5a42ef4749523dcb3902d876c85de0676a1cc7143455194b70c005a2367ce33418d423f763b2b30651380ad7 -DIST atomdep-keytar-4.3.0.tar.gz 8896 BLAKE2B 56d669320ee7eeb78eb676a76de6efe4417b80b5931507009b73cf4aa70b4125fd96a7b1ec0bf05ada86d3107dbdb82028517eccccabfb1d61b1fecd08261de8 SHA512 a5dfbefeff9f4b42d02a6cd6956e91d65ce24d716a85f19e4bab182dfb9322a132da90f301b8eeb5b496f1ff6d9c974410c9fff578404254f7e1502d97d87831 -DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1 -DIST atomdep-oniguruma-7.0.2.tar.gz 584590 BLAKE2B 2e3e622fdf7c463fa670786f0af8815ffbb1d7a85ff5759b8b13fa2b4ed8cec5959b4186b09521a3060e42abb5d83505f7b925a18f41c99e4d9dab809e39ec01 SHA512 cc2b1d3714ebac1e3254f33185c20e0c6bf5a7835506ef56bec5a720684ca6ee5d8cee0c4165eb0bb60a8edcdaf8eca846aaa0cb6ec2a9859ad61e5ed830db8a -DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999 -DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18 -DIST atomdep-spellchecker-3.5.0.tar.gz 476758 BLAKE2B 73ca0225bedf7daa0b9f9e3ad5a549cb124443de0887ee77f1a7a7c1e31f1a1c363a5f0118ecb17e70c4ae64338eac83c24dbe4cd13a6ae182d314d22bef3dc4 SHA512 5daed79d1ba562187937f5c435e2f63bcffcef95e12c18e8b3b05e9afd2b7dc815ea88cd60c4ab5ec714654189c27897dadebb798fa535425ea6d0f56cc6ae1d -DIST atomdep-superstring-2.3.4.tar.gz 822697 BLAKE2B 0e81ab0fe8d429c80298a70034c0645412e16dcd38540f5a87433689581c741b554a82739e6bb6954d316bd9a9a6425b9770b3880fe883e27199ea1aa10bbe81 SHA512 0dc3644c2741f45dc531945d5114802ec1e2fbb0d6a85088d1c1fe120f26c0183e93142ce86781dcbac652f088e5b101e83b65bb6a31f1460dd289cf37825e65 -DIST atomdep-tree-sitter-0.13.15.tar.gz 193608 BLAKE2B adcc1cec97e0675868b4782a4dede09bbad58e3d85fb55eba9ec0867bc4bc91045db8023aff3975471748297563325359cd6a4819c4474e5aedfec3e8d7565c9 SHA512 16ebd4f9cb0eeedfeb42a2dd2f7fb0e0983ee19976d98e2e0a2e0bf57fea246e7b667ef56733f7a07b434918298889acea0dd8edc109bc5ecafeb0b0d75abdd9 -DIST atomdep-tree-sitter-bash-0.13.6.tar.gz 346883 BLAKE2B f1a7bd0391d3d21223d889deb4e38ecf5e323051977cd42095fdb2ac458803968d1c435e6f7c12b0073486eb677ab2f2748fc7dd76e9228e746ac634221ea1c5 SHA512 9761d822c2f5f608950fa4f91b237db136afd4d545b708412b993f89785eb3a931a9a29fc3a652169af20e3c8281ab28ca117bc59bb4b1f2e1dfb6298c843712 -DIST atomdep-tree-sitter-c-0.13.7.tar.gz 192058 BLAKE2B e673311a6903736d204b149a983159f7ca52ffc3e1b44f7e800f6a8fcebb49059d6fd6e341506d50d19d3781b495bf0414f8794af2f9e6a93e341fd55fdfa264 SHA512 af533977d06be796c3c1a98fbc44f60cf46a4fdc0f233edd9766c462cdad5116398231863d9cfbe4ffb49befe9bf97466c6d8b9a1535d0af835aa0242e4f5ed5 -DIST atomdep-tree-sitter-cpp-0.13.8.tar.gz 610448 BLAKE2B df5ac56a6317c39b5ac1a4d248b0c96751ebed08868977417f68daf30a1c04806874128dd75667d7b543b3062d168ba570783df291931c0a3bed990526eea727 SHA512 3d3b488f8b1e277a73c9c961bf48f3207e6720faac5731d1ed9a02bd01fad0bd844180e867f2bc7b3bc278fe5d218d6808e0e191cf20c763d9fa7e326b34de4e -DIST atomdep-tree-sitter-css-0.13.7.tar.gz 79065 BLAKE2B 5671e6395f41b3dd2f3154d335e9b581507a8a7ad90ed3f4f27bd89055c96bef82d883984055dbf1675c93fe8aa9edce5151902261300d1cedf1dc7d955b9149 SHA512 c4c85564779300081c5f8991eb7ab32eecd5e477eba7c2217430ec2c0b276bba5b4f5107859c412bba68b1531fd5089c6db9491f81aa1409d9e9f3aa5036ca5d -DIST atomdep-tree-sitter-embedded-template-0.13.0.tar.gz 6153 BLAKE2B 7da15e09def3a4088b16f691273f0e99311aea53a20577a618026fbd3f4bd78d3cb4c5a6aa694ed3122465621128d26dd084c85d492f8a6d62246a1e50f29a2f SHA512 20956331c2f6060faa17e1e26ed1174c5e0213a03aea9a464aa53c13ed9d767da90aa0ed646444848f8a7ea7ab17d369292a353ad6ef8578845cf75740034b1a -DIST atomdep-tree-sitter-go-0.13.3.tar.gz 162468 BLAKE2B a3530580f1cddd672807d1d4c6652405a0558edf7d362523d507edacb6ba2abefa58fefe50d762e9c611ab51f6a4b6e62000f2e898058ac3f892fe6e6a11940c SHA512 a579e5103330ac276761a3b37c4ce53255aa644283257106e1b3ef73d8f925277b2180d606bc31a3e5d7bab68b4a56e3d6624bda428b2033bc70a0cdc54b1c1f -DIST atomdep-tree-sitter-html-0.13.5.tar.gz 13738 BLAKE2B c33b69eeb6b1eba0c864988eafe49327eb2f9a770678b03c49548aeb2fff2a1f31a5132565ca4025c008914a410d6cd0a757e9e435efc90cba58443cc2dc88be SHA512 95ac288df0e58fff6e8c462f2e85b8f964d3876a1cad80983f60f0e4b9b0c6ebef136947aff0f845603c5b53788e9479f2d55e7f4492aa79d0c09925d6934878 -DIST atomdep-tree-sitter-javascript-0.13.8.tar.gz 1729028 BLAKE2B ea2c8de9091ae224e595b0f50d4b32797c0b87937698b074e6603cdde0ecbfd57e6da7d9d6540d0de7175c6386130de5fb3db6a537a935c121eee8c5ae46879a SHA512 a7bbba657117d6c2238063408ae48d9cae8f4a5e45894b10cc457640e018547e46375ddc52752ca1afc189a0cc590dee75da0d5f04ddc6107c530340a258b341 -DIST atomdep-tree-sitter-python-0.13.4.tar.gz 204998 BLAKE2B 54d22a4482705cf482cd13bf8786f2d4a26e709b836007a1cd2bf43a537738a2b27474bc050253462f834f7f211b4c6b5b8b82cc3a1de41faa334c93fdc02db3 SHA512 250ef9ffaf15b0f3125ad7a88ad37181d4e5030e6ca5b4c518ad97822478d6d893b6493c70e35db5f07b3dedb25928285c60cdb5cbb4fd392ae07acaad6aca7d -DIST atomdep-tree-sitter-regex-0.13.1.tar.gz 17153 BLAKE2B 44e137c5464af5e77011a9d8bb9cd6ffa7abf50bbd27a6fc3b8e53739fd6e6c664bce7c1ed348ecbb2a27e8f301caa8a783c5ba756870622fbe1bfe76ee4a8bb SHA512 03e50bb9539cdfb34e8e69a675da97311c14abc839d4509167b612ba92dd15c1e7825d5a748de70513ec902f40f1efbef6317ee5f2f2b700385fab875bfbff9a -DIST atomdep-tree-sitter-ruby-0.13.11.tar.gz 2020951 BLAKE2B 106eb35468106d971338e3387484470a61c84da8a1a2f9632eecd0e84fe13dc801da527652817633083469668f03cc9ea4241526cfe414a7c0c2c2d96d44f311 SHA512 101981059db4c9aa11a834604287fd622af6f7fde5bf9718ff2f140d40b51b345fe6961de02b185345808c827b77202ffb79fba77cbf2ceb9793224b888375c0 -DIST atomdep-tree-sitter-typescript-0.13.6.tar.gz 662334 BLAKE2B a4e7898fc115fd73c9a86578aa214cfb11ac0b57bcfe3db8226463a7613d78bec11b987311f8ee884a4aa679ff16deaee158eb36ba8a370be65daff98e41cdac SHA512 d5cb2f0ab5b981fe1de03d195c272db150ebd0cf9f3825d87d7fd3bdee8e01e1d4745bb426c23e084b12e97dd51fbba65f9ffad910d87b57306ef3a10ae2225c -DIST nodejs-nan-2.11.1.tar.gz 170929 BLAKE2B 21287b45865c578257399abddd2fb6a7234891da47bb97073b7595ace6bafc83630f44141d871b061e5d13b6c4b9e02c0d4883ef0a6d6f0d9851ff645a0ab616 SHA512 a80c2857c2f15c085c506cabd081338e25a5de2028327567a039ed9219b912d36ebdfec80f13bebab9872b981d86a2fcc2c8145739b428b8f4148d1a883e408f diff --git a/app-editors/atom/atom-1.32.1.ebuild b/app-editors/atom/atom-1.32.1.ebuild deleted file mode 100644 index cb97004c983d..000000000000 --- a/app-editors/atom/atom-1.32.1.ebuild +++ /dev/null @@ -1,562 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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. If you would like to make changes, please consider -# modifying the ebuild template and submitting a PR to -# https://github.com/elprans/atom-overlay. - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit multiprocessing python-single-r1 rpm xdg-utils - -DESCRIPTION="A hackable text editor for the 21st Century" -HOMEPAGE="https://atom.io" -MY_PV="${PV//_/-}" - -ELECTRON_V=2.0.9 -ELECTRON_SLOT=2.0 - -ASAR_V=0.14.3 -# All binary packages depend on this -NAN_V=2.11.1 - -ATOM__NSFW_V=1.0.18 -ATOM__WATCHER_V=1.0.8 -CACHED_RUN_IN_THIS_CONTEXT_V=0.5.0 -CTAGS_V=3.0.0 -FS_ADMIN_V=0.1.7 -GIT_UTILS_V=5.2.1 -KEYBOARD_LAYOUT_V=2.0.14 -KEYTAR_V=4.3.0 -NSLOG_V=3.0.0 -ONIGURUMA_V=7.0.2 -PATHWATCHER_V=8.0.1 -SCROLLBAR_STYLE_V=3.2.0 -SPELLCHECKER_V=3.5.0 -SUPERSTRING_V=2.3.4 -TREE_SITTER_V=0.13.15 -TREE_SITTER_BASH_V=0.13.6 -TREE_SITTER_C_V=0.13.7 -TREE_SITTER_CPP_V=0.13.8 -TREE_SITTER_CSS_V=0.13.7 -TREE_SITTER_EMBEDDED_TEMPLATE_V=0.13.0 -TREE_SITTER_GO_V=0.13.3 -TREE_SITTER_HTML_V=0.13.5 -TREE_SITTER_JAVASCRIPT_V=0.13.8 -TREE_SITTER_PYTHON_V=0.13.4 -TREE_SITTER_REGEX_V=0.13.1 -TREE_SITTER_RUBY_V=0.13.11 -TREE_SITTER_TYPESCRIPT_V=0.13.6 - -# 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/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-${ATOM__NSFW_V}.tar.gz - https://registry.npmjs.org/@atom/watcher/-/watcher-1.0.8.tgz -> atomdep-atom--watcher-${ATOM__WATCHER_V}.tar.gz - 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 - https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-${CTAGS_V}.tar.gz - https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.7.tgz -> atomdep-fs-admin-${FS_ADMIN_V}.tar.gz - https://registry.npmjs.org/git-utils/-/git-utils-5.2.1.tgz -> atomdep-git-utils-${GIT_UTILS_V}.tar.gz - https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.14.tgz -> atomdep-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz - https://registry.npmjs.org/keytar/-/keytar-4.3.0.tgz -> atomdep-keytar-${KEYTAR_V}.tar.gz - https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-${NSLOG_V}.tar.gz - https://registry.npmjs.org/oniguruma/-/oniguruma-7.0.2.tgz -> atomdep-oniguruma-${ONIGURUMA_V}.tar.gz - https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-${PATHWATCHER_V}.tar.gz - https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz - https://registry.npmjs.org/spellchecker/-/spellchecker-3.5.0.tgz -> atomdep-spellchecker-${SPELLCHECKER_V}.tar.gz - https://registry.npmjs.org/superstring/-/superstring-2.3.4.tgz -> atomdep-superstring-${SUPERSTRING_V}.tar.gz - https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.15.tgz -> atomdep-tree-sitter-${TREE_SITTER_V}.tar.gz - https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.13.6.tgz -> atomdep-tree-sitter-bash-${TREE_SITTER_BASH_V}.tar.gz - https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.13.7.tgz -> atomdep-tree-sitter-c-${TREE_SITTER_C_V}.tar.gz - https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.13.8.tgz -> atomdep-tree-sitter-cpp-${TREE_SITTER_CPP_V}.tar.gz - https://registry.npmjs.org/tree-sitter-css/-/tree-sitter-css-0.13.7.tgz -> atomdep-tree-sitter-css-${TREE_SITTER_CSS_V}.tar.gz - 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 - https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.13.3.tgz -> atomdep-tree-sitter-go-${TREE_SITTER_GO_V}.tar.gz - https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.13.5.tgz -> atomdep-tree-sitter-html-${TREE_SITTER_HTML_V}.tar.gz - https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.8.tgz -> atomdep-tree-sitter-javascript-${TREE_SITTER_JAVASCRIPT_V}.tar.gz - https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.4.tgz -> atomdep-tree-sitter-python-${TREE_SITTER_PYTHON_V}.tar.gz - https://registry.npmjs.org/tree-sitter-regex/-/tree-sitter-regex-0.13.1.tgz -> atomdep-tree-sitter-regex-${TREE_SITTER_REGEX_V}.tar.gz - https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.11.tgz -> atomdep-tree-sitter-ruby-${TREE_SITTER_RUBY_V}.tar.gz - https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.13.6.tgz -> atomdep-tree-sitter-typescript-${TREE_SITTER_TYPESCRIPT_V}.tar.gz -" - -BINMODS=( - atom--nsfw - atom--watcher - cached-run-in-this-context - ctags - fs-admin - git-utils - keyboard-layout - keytar - nslog - oniguruma - pathwatcher - scrollbar-style - spellchecker - superstring - tree-sitter - tree-sitter-bash - tree-sitter-c - tree-sitter-cpp - tree-sitter-css - tree-sitter-embedded-template - tree-sitter-go - tree-sitter-html - tree-sitter-javascript - tree-sitter-python - tree-sitter-regex - tree-sitter-ruby - tree-sitter-typescript -) - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT} -" - -DEPEND=" - >=app-text/hunspell-1.3.3:= - >=dev-libs/libgit2-0.23:=[ssh] - >=dev-libs/libpcre2-10.22:=[jit,pcre16] - >=dev-libs/oniguruma-6.6.0:= - >=dev-util/ctags-5.8 - >=gnome-base/libgnome-keyring-3.12:= - x11-libs/libxkbfile -" - -RDEPEND=" - ${DEPEND} - >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT} - dev-vcs/git - !sys-apps/apmd - ${PYTHON_DEPS} -" - -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 - - mkdir "${BIN_S}" || die - - for a in ${A} ; do - case "${a}" in - *.rpm) - pushd "${BIN_S}" >/dev/null || die - srcrpm_unpack "${a}" - popd >/dev/null || die - ;; - - *.tar|*.tar.gz|*.tar.bz2|*.tar.xz) - # Tarballs on registry.npmjs.org are wildly inconsistent, - # and violate the convention of having ${P} as the top - # directory name, so we strip the first component and - # unpack into a correct directory explicitly. - local basename=${a%.tar.*} - local destdir=${WORKDIR}/${basename#atomdep-} - mkdir "${destdir}" || die - tar -C "${destdir}" -x -o --strip-components 1 \ - -f "${DISTDIR}/${a}" || die - ;; - - *) - # Fallback to the default unpacker. - unpack "${a}" - ;; - esac - done -} - -src_prepare() { - local suffix="$(get_install_suffix)" - local atom_rpmdir=$(get_atom_rpmdir) - local install_dir="${EPREFIX}$(get_install_dir)" - local electron_dir="${EPREFIX}$(get_electron_dir)" - local electron_path="${electron_dir}/electron" - local node_path="${electron_dir}/node" - local node_includes="${EPREFIX}$(get_node_includedir)" - local binmod - local pkgdir - - mkdir "${BUILD_DIR}" || die - cp -a "${BIN_S}/${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 "${S}/spec" "${BUILD_DIR}/app" || die - - # Unpack app.asar - easar extract "${BIN_S}/${atom_rpmdir}/resources/app.asar" \ - "${BUILD_DIR}/app" - - cd "${BUILD_DIR}/app" || die - - eapply "${FILESDIR}/apm-python.patch" - eapply "${FILESDIR}/atom-unbundle-electron-r3.patch" - eapply "${FILESDIR}/atom-python-r1.patch" - eapply "${FILESDIR}/atom-apm-path-r2.patch" - eapply "${FILESDIR}/atom-fix-app-restart-r2.patch" - eapply "${FILESDIR}/atom-marker-layer-r1.patch" - eapply "${FILESDIR}/atom-fix-config-watcher-r1.patch" - - sed -i -e "s|path.join(process.resourcesPath, 'LICENSE.md')|'/usr/share/licenses/$(get_atom_appname)/LICENSE.md'|g" \ - ./src/main-process/atom-application.js \ - || die - - sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|${node_includes}|g" \ - -e "s|{{ATOM_PATH}}|${electron_path}|g" \ - -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \ - -e "s|{{ATOM_PREFIX}}|${EPREFIX}|g" \ - -e "s|^#!/bin/bash|#!${EPREFIX}/bin/bash|g" \ - ./atom.sh \ - || die - - local env="export NPM_CONFIG_NODEDIR=${node_includes}\nexport ELECTRON_NO_ASAR=1" - sed -i -e \ - "s|\"\$binDir/\$nodeBin\"|${env}\nexec \"${node_path}\"|g" \ - apm/bin/apm || die - - sed -i -e \ - "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"${node_path}\" |g" \ - apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die - - sed -i -e \ - "s|atomCommand = 'atom';|atomCommand = '${EPREFIX}/usr/bin/atom${suffix}'|g" \ - apm/lib/test.js || die - - rm apm/bin/node || die - - sed -i -e "s|/${atom_rpmdir}/atom|${EPREFIX}/usr/bin/atom${suffix}|g" \ - "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die - - for binmod in "${BINMODS[@]}"; do - pkgdir="${WORKDIR}/$(package_dir ${binmod})" - cd "${pkgdir}" || die - if have_patches_for "${binmod}"; then - eapply "${FILESDIR}"/${binmod}-*.patch - fi - done - - cd "${BUILD_DIR}/app" || die - - # Unbundle bundled libs from modules - - pkgdir="${WORKDIR}/$(package_dir git-utils)" - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \ - --inplace --unbundle "git;libgit2;git2" \ - "${pkgdir}/binding.gyp" || die - - pkgdir="${WORKDIR}/$(package_dir oniguruma)" - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \ - --inplace --unbundle "onig_scanner;oniguruma;onig" \ - "${pkgdir}/binding.gyp" || die - - pkgdir="${WORKDIR}/$(package_dir spellchecker)" - ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \ - --inplace --unbundle "spellchecker;hunspell;hunspell" \ - "${pkgdir}/binding.gyp" || die - - pkgdir="${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" \ - "${pkgdir}/binding.gyp" || die - - for binmod in "${BINMODS[@]}"; do - pkgdir="${WORKDIR}/$(package_dir ${binmod})" - mkdir -p "${pkgdir}/node_modules" || die - ln -s "${WORKDIR}/nodejs-nan-${NAN_V}" \ - "${pkgdir}/node_modules/nan" || die - done - - sed -i -e "s|{{ATOM_PREFIX}}|${EPREFIX}|g" \ - "${BUILD_DIR}/app/src/config-schema.js" || die - - 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 ctags_d="node_modules/symbols-view/vendor" - local jobs=$(makeopts_jobs) - local unpacked_paths - - # Transpile any yet untranspiled files. - ecoffeescript "${BUILD_DIR}"/app/spec/'*.coffee' - - mkdir -p "${BUILD_DIR}/modules/" || die - - for binmod in "${BINMODS[@]}"; do - local binmod_name=${binmod##node-} - - einfo "Building ${binmod}..." - cd "${WORKDIR}/$(package_dir ${binmod})" || die - enodegyp_atom --verbose --jobs="$(makeopts_jobs)" build - mkdir -p "${BUILD_DIR}/modules/${binmod_name}" || die - cp build/Release/*.node "${BUILD_DIR}/modules/${binmod_name}" || 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 - - # Remove bundled git - rm -r "${BUILD_DIR}/app/node_modules/dugite/git" || die - - # Re-pack app.asar - # Keep unpack rules in sync with buildAsarUnpackGlobExpression() - # in script/lib/package-application.js - unpacked_paths=( - "*.node" - "ctags-config" - "ctags-linux" - "**/spec/fixtures/**" - "**/node_modules/github/bin/**" - "**/node_modules/spellchecker/**" - "**/resources/atom.png") - - unpacked_paths=$(IFS=,; echo "${unpacked_paths[*]}") - - cd "${BUILD_DIR}" || die - easar pack --unpack="{${unpacked_paths}}" --unpack-dir=apm "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 "${EPREFIX}/usr/bin/ctags" \ - "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die -} - -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" -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -# Helpers -# ------- - -# Return the installation suffix appropriate for the slot. -get_install_suffix() { - local slot=${SLOT%%/*} - local suffix - - if [[ "${slot}" == "0" ]]; then - suffix="" - else - suffix="-${slot}" - fi - - echo "${suffix}" -} - -# Return the upstream app name appropriate for $PV. -get_atom_appname() { - if [[ "${PV}" == *beta* ]]; then - echo "atom-beta" - else - echo "atom" - fi -} - -# Return the app installation path inside the upstream archive. -get_atom_rpmdir() { - echo "usr/share/$(get_atom_appname)" -} - -# Return the installation target directory. -get_install_dir() { - echo "/usr/$(get_libdir)/atom$(get_install_suffix)" -} - -# Return the Electron installation directory. -get_electron_dir() { - echo "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}" -} - -# Return the directory containing appropriate Node headers -# for the required version of Electron. -get_node_includedir() { - echo "/usr/include/electron-${ELECTRON_SLOT}/node/" -} - -# Run JavaScript using Electron's version of Node. -enode_electron() { - "${BROOT}/$(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="${BROOT}/$(get_electron_dir):${PATH}" \ - enode_electron "${nodegyp}" \ - --nodedir="${BROOT}/$(get_node_includedir)" "${@}" || die -} - -# Coffee Script wrapper. -ecoffeescript() { - local cscript="${FILESDIR}/transpile-coffee-script.js" - - echo "ecoffeescript" "${@}" - echo ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \ - NODE_PATH="${BUILD_DIR}/app/node_modules" \ - enode_electron "${cscript}" "${@}" || die - ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \ - NODE_PATH="${BUILD_DIR}/app/node_modules" \ - enode_electron "${cscript}" "${@}" || die -} - -# 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" - if [[ -z "${binmod_v}" ]]; then - die "${binmod_v} is not set." - fi - - echo ${1}-${!binmod_v} -} - -# Check if there are patches for a given package. -have_patches_for() { - local patches="${1}-*.patch" - local found - found=$(find "${FILESDIR}" -maxdepth 1 -name "${patches}" -print -quit) - test -n "${found}" -} - -# 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 cruft - - while IFS= read -r -d '' path; do - relpath=${path#${prefix}} - relpath=${relpath##/} - relpath=${relpath#W${dir}} - modpath=$(dirname ${relpath}) - modpath=${modpath%build/Release} - mod=$(basename ${modpath}) - - # 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. - has "${mod}" "${BINMODS[@]}" || continue - - # Must copy here as symlinks will cause the module loading to fail. - cp -f "${BUILD_DIR}/modules/${mod}/${path##*/}" "${path}" || die - - # Drop unnecessary static libraries. - find "${path%/*}" -name '*.a' -delete || die - done < <(find "${prefix}/${dir}" -name '*.node' -print0 || die) -} - -# Fix script permissions and shebangs to point to the correct version -# of Node. -fix_executables() { - local dir="${1}" - local node_sb="#!${EPREFIX}$(get_electron_dir)"/node - - while IFS= read -r -d '' 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 < <(find -L "${ED}${dir}" -maxdepth 1 -mindepth 1 -type f -print0 || die) -} diff --git a/app-editors/atom/files/apm-python.patch b/app-editors/atom/files/apm-python.patch deleted file mode 100644 index 0467beaf10ee..000000000000 --- a/app-editors/atom/files/apm-python.patch +++ /dev/null @@ -1,16 +0,0 @@ -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-r2.patch b/app-editors/atom/files/atom-apm-path-r2.patch deleted file mode 100644 index 12234b6bab13..000000000000 --- a/app-editors/atom/files/atom-apm-path-r2.patch +++ /dev/null @@ -1,16 +0,0 @@ -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": '{{ATOM_PREFIX}}/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-r2.patch b/app-editors/atom/files/atom-fix-app-restart-r2.patch deleted file mode 100644 index a2defa21db2f..000000000000 --- a/app-editors/atom/files/atom-fix-app-restart-r2.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bf4c1ab651a82eb369ffa3dc4b20246d043d797a Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Wed, 28 Mar 2018 12:02:53 -0400 -Subject: [PATCH] Fix app restart - ---- - src/main-process/atom-application.js | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js -index 10b791761..d16a68fba 100644 ---- a/src/main-process/atom-application.js -+++ b/src/main-process/atom-application.js -@@ -1344,6 +1344,7 @@ class AtomApplication extends EventEmitter { - - restart () { - const args = [] -+ args.push("--app=" + this.resourcePath); - if (this.safeMode) args.push('--safe') - if (this.logFile != null) args.push(`--log-file=${this.logFile}`) - if (this.socketPath != null) args.push(`--socket-path=${this.socketPath}`) --- -2.16.1 - diff --git a/app-editors/atom/files/atom-fix-config-watcher-r1.patch b/app-editors/atom/files/atom-fix-config-watcher-r1.patch deleted file mode 100644 index 7af82050d46b..000000000000 --- a/app-editors/atom/files/atom-fix-config-watcher-r1.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5f1f840372611b8f42d8fd3be7b680f90958f015 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Wed, 28 Mar 2018 18:52:58 -0400 -Subject: [PATCH] Unbreak config watcher in the main process - ---- - src/path-watcher.js | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/src/path-watcher.js b/src/path-watcher.js -index 6693489ef..f3ddc6fe4 100644 ---- a/src/path-watcher.js -+++ b/src/path-watcher.js -@@ -544,12 +544,22 @@ class PathWatcherManager { - // Private: Access the currently active manager instance, creating one if necessary. - static active () { - if (!this.activeManager) { -- this.activeManager = new PathWatcherManager(atom.config.get('core.fileSystemWatcher')) -- this.sub = atom.config.onDidChange('core.fileSystemWatcher', ({newValue}) => { this.transitionTo(newValue) }) -+ let config = this.getConfig() -+ this.activeManager = new PathWatcherManager(config.get('core.fileSystemWatcher')) -+ this.sub = config.onDidChange('core.fileSystemWatcher', ({newValue}) => { this.transitionTo(newValue) }) - } - return this.activeManager - } - -+ // Private: get config instance for the current application -+ static getConfig() { -+ if (typeof(global.atom) != 'undefined') { -+ return global.atom.config -+ } else { -+ return global.atomApplication.config -+ } -+ } -+ - // Private: Replace the active {PathWatcherManager} with a new one that creates [NativeWatchers]{NativeWatcher} - // based on the value of `setting`. - static async transitionTo (setting) { --- -2.17.0 - diff --git a/app-editors/atom/files/atom-marker-layer-r1.patch b/app-editors/atom/files/atom-marker-layer-r1.patch deleted file mode 100644 index 1dcdecbd4eba..000000000000 --- a/app-editors/atom/files/atom-marker-layer-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-python-r1.patch b/app-editors/atom/files/atom-python-r1.patch deleted file mode 100644 index 96d6b0327faf..000000000000 --- a/app-editors/atom/files/atom-python-r1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fae3881a3fa5bf58c696c5bd9c74c62a2113cb12 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Sat, 29 Sep 2018 16:12:39 -0400 -Subject: [PATCH] Use Python 2 - ---- - atom.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/atom.sh b/atom.sh -index 0ad3f5b23..62fe682fe 100755 ---- a/atom.sh -+++ b/atom.sh -@@ -62,6 +62,8 @@ if [ $REDIRECT_STDERR ]; then - exec 2> /dev/null - fi - -+export PYTHON=python2 -+ - ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" - mkdir -p "$ATOM_HOME" - --- -2.16.4 - diff --git a/app-editors/atom/files/atom-unbundle-electron-r3.patch b/app-editors/atom/files/atom-unbundle-electron-r3.patch deleted file mode 100644 index 1a6ea109d05c..000000000000 --- a/app-editors/atom/files/atom-unbundle-electron-r3.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 342dc685f8139e950924c04f1d460052e7531fb5 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Thu, 5 May 2016 17:23:35 -0400 -Subject: [PATCH] Unbundle electron - ---- - atom.sh | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/atom.sh b/atom.sh -index 935204bfc..0ad3f5b23 100755 ---- a/atom.sh -+++ b/atom.sh -@@ -138,16 +138,21 @@ elif [ $OS == 'Linux' ]; then - ;; - esac - -+ export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}" -+ export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}" -+ export LOCAL_GIT_DIRECTORY="{{ATOM_PREFIX}}/usr" -+ ATOM_PATH="{{ATOM_PATH}}" -+ - : ${TMPDIR:=/tmp} - - [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" - - if [ $EXPECT_OUTPUT ]; then -- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" -+ "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" - exit $? - else - ( -- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 -+ nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 - if [ $? -ne 0 ]; then - cat "$ATOM_HOME/nohup.out" - exit $? --- -2.16.4 diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py deleted file mode 100644 index 370221380b64..000000000000 --- a/app-editors/atom/files/gyp-unbundle.py +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env python2 - -from __future__ import print_function - - -import argparse -import pprint -import sys - - -def die(msg): - print(msg, file=sys.stderr) - sys.exit(1) - - -def do_unbundle(gypdata, targets): - gyptargets = {t['target_name']: t for t in gypdata['targets']} - dropped_deps = set() - - def _unbundle_in_block(gypblock): - gypdeps = gypblock.get('dependencies') or {} - - for dep, (libs, defines) in unbundlings.items(): - if dep not in gypdeps: - continue - - gypdeps.remove(dep) - - try: - ls = gyptarget['link_settings'] - except KeyError: - ls = gyptarget['link_settings'] = {} - - try: - gyplibs = ls['libraries'] - except KeyError: - gyplibs = ls['libraries'] = [] - - 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 [] - for cond in gypconds: - condblocks = cond[1:] - for condblock in condblocks: - _unbundle_in_block(condblock) - - for target, unbundlings in targets.items(): - if target not in gyptargets: - die('There is no {} target in gyp file'.format(target)) - - gyptarget = gyptargets[target] - - _unbundle_in_block(gyptarget) - - for gyptarget in gypdata['targets']: - if gyptarget['target_name'] in dropped_deps: - if gyptarget.get('dependencies'): - dropped_deps.update(gyptarget.get('dependencies')) - - new_targets = [] - for gyptarget in gypdata['targets']: - if gyptarget['target_name'] not in dropped_deps: - new_targets.append(gyptarget) - - gypdata['targets'] = new_targets - - gypconds = gypdata.get('conditions') - if gypconds: - for cond in gypconds: - condblocks = cond[1:] - for condblock in condblocks: - new_targets = [] - blocktargets = condblock.get('targets') - if blocktargets: - for blocktarget in blocktargets: - if blocktarget['target_name'] not in dropped_deps: - new_targets.append(blocktarget) - condblock['targets'] = new_targets - - -def main(): - parser = argparse.ArgumentParser(description='Unbundle libs in gyp files') - 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][;-DMACRO]') - parser.add_argument( - '-i', '--inplace', action='store_true', - help='modify gyp file in-place') - - args = parser.parse_args() - - targets = {} - - for unbundle in args.unbundle: - 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] - - 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, defines - - with open(args.gypfile, 'rt') as f: - gypdata = eval(f.read()) - - do_unbundle(gypdata, targets) - - if args.inplace: - with open(args.gypfile, 'wt') as f: - pprint.pprint(gypdata, stream=f) - else: - pprint.pprint(gypdata) - - -if __name__ == '__main__': - main() diff --git a/app-editors/atom/files/transpile-coffee-script.js b/app-editors/atom/files/transpile-coffee-script.js deleted file mode 100644 index bbea175b6721..000000000000 --- a/app-editors/atom/files/transpile-coffee-script.js +++ /dev/null @@ -1,25 +0,0 @@ -'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') - -function do_compile() { - 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 coffeePath of paths) { - let jsPath = coffeePath.replace(/coffee$/g, 'js') - fs.writeFileSync( - jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME)) - fs.unlinkSync(coffeePath) - } -} - -do_compile() diff --git a/app-editors/atom/metadata.xml b/app-editors/atom/metadata.xml deleted file mode 100644 index f35968a5e1fd..000000000000 --- a/app-editors/atom/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>cynede@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">atom/node-spellchecker</remote-id> - </upstream> -</pkgmetadata> |