1 |
commit: e26e0a291ae93431f6d6ec0e6efb4f3c94323a80 |
2 |
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io> |
3 |
AuthorDate: Fri Apr 28 16:57:30 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 2 21:02:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26e0a29 |
7 |
|
8 |
app-editors/atom: Version bump to 1.16.0. |
9 |
|
10 |
Drop old versions as well. |
11 |
|
12 |
Gentoo-Bug: https://bugs.gentoo.org/616058 |
13 |
|
14 |
Package-Manager: Portage-2.3.4, Repoman-2.3.1 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/4518 |
16 |
|
17 |
app-editors/atom/Manifest | 8 +- |
18 |
app-editors/atom/atom-1.13.1.ebuild | 406 --------------------- |
19 |
.../{atom-1.15.0.ebuild => atom-1.15.0-r1.ebuild} | 5 +- |
20 |
.../{atom-1.12.7.ebuild => atom-1.16.0.ebuild} | 27 +- |
21 |
4 files changed, 19 insertions(+), 427 deletions(-) |
22 |
|
23 |
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest |
24 |
index ff41775c316..22431b145e1 100644 |
25 |
--- a/app-editors/atom/Manifest |
26 |
+++ b/app-editors/atom/Manifest |
27 |
@@ -1,19 +1,15 @@ |
28 |
DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e |
29 |
-DIST atom-1.12.7.rpm 84755598 SHA256 8eaa5426c9209efc91969e3f3b1535f2c1895daf6259c07cbd595dd0a599553f SHA512 f2d582eb916e95373a08a1e56b89492f52547ab853fae7975b8193ee5d0a23dfc86bcaf9de5b53bc0dbd955c784abfede5b162fb6ef5ee0f7424fc0882da848c WHIRLPOOL aa029e8ef519f475b0a9a9f592cb685b4f15f4c257774c7ca644ed69bf50128bce4c382581b133e7c43438f690ed6b3d791ad379109b96a8ef9893ef93e0ad98 |
30 |
-DIST atom-1.13.1.rpm 86119349 SHA256 593fa81abb3a3a8c89713de1fb9d7d3dd4e4b34211de69fee67469b63be98f01 SHA512 57e587441fbc5ed7864d54f067386a54e854c761b3ad577e07d58253d693c90de934af98e1dc16bf1b645a7b87e9169d0a869509c0192103ddede51a1d8b95d6 WHIRLPOOL 51b8ce72c4b9b01ca8afc3ae5a548e0dbf437fc629305acf357c6de44a05b20a7d8736c89d78cd1cb84fe22109445e5d9d773e0d50e321fcdabca015f64a55a7 |
31 |
DIST atom-1.15.0.rpm 86561729 SHA256 935b444d9122f46d3ab490611476498c963de1232f9c732d9ad33f0e380a37be SHA512 e8f5ceaae020f9fbf8cb1ffbef0f64b7b5d23a0be20d063591e3ba3b9fd33c771a028aca9aa0ecad254e250342d40106dac85bf6bdeff4de64da0b57fe6de3ea WHIRLPOOL 4d4311654b8afaa4aa2d07611960d24775aeb825e97ea65e6f69d72790d4c160e8a371432346f1873a71b2e1bf4158f3eb5d35fc1fd882906765f3ea4328e526 |
32 |
-DIST atom-buffer-offset-index-9588080533c9d0a8a71ee1cfd98596f485940e91.tar.gz 5558 SHA256 ea940264e4d6f2b5ad319c50e7e4ece64e1fd4d1f790c847dedf0a5bc4e9b2c9 SHA512 ebcfa7057c9db85a7884cbb19fa561821fc883bbd6a5d0186fcf68782697a7c7677e019334b44b3477d26e1febccb3a7690dc3390dcb55ca838e176f390b11b7 WHIRLPOOL 1c438ec18c2fcf1c7b1a11421eb9944a2fd90f920dc4dc5cf0b8c5300f9f285cc993689312a23b9882f13316956077bf9994173c0b1c9cd54c6f5ccdd667d16f |
33 |
+DIST atom-1.16.0.rpm 90249819 SHA256 6305f149f7b85e498e56d92fe0927ca81fd4cce62153f266fcd8f39958a59e69 SHA512 e3e9096caf6d5ca802ad47e434a6e8a51c0ab25b967747621e2ea4eb440d5401df3b7cd3d101d6d5a1f2f12fa77525e7e54e252438ff24ec9b651601bb7f4d97 WHIRLPOOL b294fa728388a2b10000a85c02d7548e077e34c5db83ddea1d2b5d6bdebd4c72db906ccc856fd766e3f2f3900ad5f02de3c4bd22e273683c92e4f0dd027fa6f3 |
34 |
DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d WHIRLPOOL 573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4 |
35 |
DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a WHIRLPOOL 4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937 |
36 |
DIST atom-keyboard-layout-2.0.11.tar.gz 19294 SHA256 fcef31c36619b76dd5f13a53c40eb9d3a7206a85cac3cd9dd0ba8e89d128258e SHA512 e7cbf3e8686ce6a86549d913523db75af623d4c5a18104f911b7f3931c273b87b4695b9b85afaea9a5cb440201b34d9e7445786c9328b87a5b58176cf2dbb877 WHIRLPOOL 85f06e125fca0e4e4c8a50fba539d674a0aadd1fba0c75b2be5663503c97bc8b6a6c75ee6b9916df5e598f3cc2a18f84e8392f1fb1145113d36d5216c0a2e5af |
37 |
-DIST atom-keyboard-layout-2.0.7.tar.gz 18687 SHA256 3fb6c702c07d4d7116d73e5ed457f8dd2b07a99eafb7da830c032545d6da1f1e SHA512 96a10dad193d2e870e518eb863e4bf758e1efa86c4e377a3dcb818b5f51d42eaab9211732eddac106b7d4dddf6d9ebe80fb4a16ca24c647a0599a3a92e2c4591 WHIRLPOOL 01c28f7dadb8961ed6480a6ca2f9fab6c7e78436317b12f2731e130af405a456ea21719c0a409aa87248eaee956792fc37dcb040d900e2acc5005917c0f4666c |
38 |
-DIST atom-marker-index-4.0.1.tar.gz 18433 SHA256 ecb6a5294088feb2a2b8ae71845dc262e1ab551a6a75e9ac99b05807b62b2d4a SHA512 2f5639ac0fef1a9d735dc10b464a046ee78f8cf7ecd8a6705232c319958a46056146bd91a0bf421aa0c6da39106f6deacaedaa40c442c0c08f0e6fbfd938b3ea WHIRLPOOL ccbd0f6a515b97a1fcf460f13388206ab3ccee364264203fa6d6ad3d6e68a4e06bad5f38ce19008d2a5f79d2becb14a459cbd016f0daaea48c5387c21ad1bb77 |
39 |
DIST atom-node-ctags-3.0.0.tar.gz 15062 SHA256 40605012d06d4dcbfc369862b57900b6963613e2e4ee3b37fea21693b2b418a7 SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87 WHIRLPOOL 2cff81d2ca405a615e5c7d284785f129f8fcd968998c68a42af1ca2e6d76a6fcb404a92f3c0d20220567b28593448b91657db6df8bce19de1f2eedbfe2959140 |
40 |
DIST atom-node-keytar-3.0.2.tar.gz 5718 SHA256 16af03d2a7876e3008f82d35e913753384655bc181e93cb771639b6d5a2439bf SHA512 f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a WHIRLPOOL 69b10619531bedb839c61c1b29d18d1a0bf4e468ed05ebd58db349010b8de555673f45bdf98c4ad252aaa960b47faa00d952470e9b3545a0e1e189bbb3e49ded |
41 |
DIST atom-node-nslog-3.0.0.tar.gz 2774 SHA256 6f2c7b79dd27688829d72dcbb94cc3da8b86fe74f355e1d407907cc56da29747 SHA512 1891632486acfa014eec79f70b14d56d967670310e46dedccfc9dfa505581365765f6bd42ad538b29e74d7c7de83d045b4199dd634fc588734a1ee086dcddb0a WHIRLPOOL d29f2c68e6168ce020c2a73d73f107ffb4c777e006fba4f01a93045ad631fb2d8b83f989244caf4d5e2f66474e660f3479d79a03e82a6b8fa8a297586ee6e556 |
42 |
DIST atom-node-oniguruma-6.1.0.tar.gz 661394 SHA256 dab5322efac0cbe2c646559f130a2832be24e7caf8becabeedaf66842b72b289 SHA512 6443881353b61ad59d29cab6628f07d488e54df7b5a04ddffe4de11329e928b2a9cfc7582e22e0a90b6a3c6bf0e37873d8a5e34036cee5f7187ed4ae11fd6507 WHIRLPOOL 9c67fc6800e3d2b15160faa763539aefa2a40584697619b46098bd0f1c2820904ca6cae638e442c102c09616f62817c0df11f9c2da11d65c7dc9c98d04f668a4 |
43 |
-DIST atom-node-pathwatcher-6.5.0.tar.gz 23926 SHA256 a2f72f00cbe6a49152cdae85fb7585a77f0ee8b01be54fbc27a24f93935445c3 SHA512 0b8471885acc44f38161b4758951cff762f4c9ca2d17aefdb286b99fdefa6843eaa86d463e4ac54563a79f6701fcaa40252a72d73baf2b6c4e47aa00692ee314 WHIRLPOOL f3a82776b05416eda4e763c0f1db1e422b299f78cf516576b0d13b0447024962538603ce47c12a4889f7d9c984b98ca75013230ba3f1cea1575453e5c2e445dc |
44 |
DIST atom-node-pathwatcher-6.8.0.tar.gz 24627 SHA256 a714ed58e709f72a8f687d697d68332c5a2c4d0019e3cdc09886e5ff85bd493f SHA512 ccb4d1270ba91cf31c5725e985b7bf224a8878fbeeb5fd2e78e22de7e25d382fc5b1c9e05ce1f2c23968d4ca3018e1db611c9485dbbd6eca2169228fb0a136e9 WHIRLPOOL b7080b82d6b8564aa84040c2f1d2fa4546a0dd073f7f78fb5503dc36dec4316fe4750c38757397a8c4782680ec9e0458ad4428368279990f3ba23f3f929b8459 |
45 |
+DIST atom-node-pathwatcher-6.9.0.tar.gz 24821 SHA256 25c10c4a4a68a6ec17f3830c909faaac5f68ab418065f1035d81129ad1fb19ba SHA512 fc2842a6ee75981590b445c4f51ce3f44baabee879377397d5bd4092964c21e726be44b94ffd751bd496d66963fb71ff59fbdf9f9fc9c3f7cd83af1fd5d65fb6 WHIRLPOOL 8c0f7e7291bf4f9f8f89845fcde6ac437fd108fae5052efcd217da8ee2171b757f35c66e4082971eac9ae4c7e17fcb5220a585729faade15f498484510f07837 |
46 |
DIST atom-node-runas-3.1.1.tar.gz 6628 SHA256 9d7d5a157b16fdd7263f50adb2831706d6fcf0902a1af528fc2602db6f9dc1cf SHA512 bada6e99ceb833c8c6e74f4b3116c49f21b54b922c1a27668312552779b9e5ccebf380b41c781d49c1c0dd0fdff6de8b71a0dcaf1f992892593e85f4572238df WHIRLPOOL d286d76f38ee8a23b4b76a9070913abe901f4db273073d9c0dcef13004abe7e10e9b4cad451cfe8d0cd4cc1e0ac2ab28ed50f327c1b9d317689153658f7b8944 |
47 |
DIST atom-node-spellchecker-3.2.3.tar.gz 481966 SHA256 bf4a07b4c671cd38b176ff8ef375f3cdf277decb941a0a279f8ffb36151fad55 SHA512 b0209fdfcbee53d289443e1c203a720888a82fa59648b4038c036c6afe68a6b04624e23267e69c36f23c185160d6ab84b1e4020047fbe6d94354e99d717a60b9 WHIRLPOOL d883cd3d3962e38ebe4c55e997ce461fa0b0da98e8b982793b77342eac1413e16090d562a9a50cb8200a18eda751a873528fdfde3b1f1928629bd56c5568f887 |
48 |
DIST atom-scrollbar-style-3.2.0.tar.gz 4609 SHA256 ea0f8f00cac609537af0d10d228054371c58b5a74785bd52fbbd276af02911ef SHA512 fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc WHIRLPOOL f6e75aafa8946ccc16949bdffa33b2bf050f06434a3fedcf8e1abac8b6b2d31dd37fcc137a43274d4c55d5926349486fda157d3fb6948d97063aac33b99e6578 |
49 |
|
50 |
diff --git a/app-editors/atom/atom-1.13.1.ebuild b/app-editors/atom/atom-1.13.1.ebuild |
51 |
deleted file mode 100644 |
52 |
index 838a90adc69..00000000000 |
53 |
--- a/app-editors/atom/atom-1.13.1.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,406 +0,0 @@ |
56 |
-# Copyright 1999-2017 Gentoo Foundation |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-EAPI=6 |
60 |
- |
61 |
-PYTHON_COMPAT=( python2_7 ) |
62 |
-inherit python-any-r1 multiprocessing rpm |
63 |
- |
64 |
-DESCRIPTION="A hackable text editor for the 21st Century" |
65 |
-HOMEPAGE="https://atom.io" |
66 |
-MY_PV="${PV//_/-}" |
67 |
- |
68 |
-ELECTRON_V=1.3.5 |
69 |
-ELECTRON_SLOT=1.3 |
70 |
- |
71 |
-# All binary packages depend on this |
72 |
-NAN_V=2.4.0 |
73 |
- |
74 |
-# Keep dep versions in sync with atom/package.json |
75 |
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1 |
76 |
-GIT_UTILS_V=4.1.2 |
77 |
-NODE_NSLOG_V=3.0.0 |
78 |
-NODE_ONIGURUMA_V=6.1.0 |
79 |
-NODE_PATHWATCHER_V=6.5.0 |
80 |
-NODE_RUNAS_V=3.1.1 |
81 |
-SCROLLBAR_STYLE_V=3.2.0 |
82 |
-SPELL_CHECK_V=0.68.5 |
83 |
- |
84 |
-# text-buffer dependencies |
85 |
-BUFFER_OFFSET_INDEX_V=9588080533c9d0a8a71ee1cfd98596f485940e91 |
86 |
-MARKER_INDEX_V=4.0.1 |
87 |
- |
88 |
-# apm dependency |
89 |
-NODE_KEYTAR_V=3.0.2 |
90 |
- |
91 |
-# atom-keymap dependency |
92 |
-KEYBOARD_LAYOUT_V=2.0.7 |
93 |
- |
94 |
-# symbols-view dependency |
95 |
-NODE_CTAGS_V=3.0.0 |
96 |
- |
97 |
-# spell-check dependency |
98 |
-NODE_SPELLCHECKER_V=3.2.3 |
99 |
- |
100 |
-ASAR_V=0.12.1 |
101 |
- |
102 |
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages. |
103 |
-SRC_URI=" |
104 |
- https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-${MY_PV}.rpm |
105 |
- https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz |
106 |
- https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz |
107 |
- https://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz |
108 |
- https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz |
109 |
- https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz |
110 |
- https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz |
111 |
- https://github.com/atom/buffer-offset-index/archive/${BUFFER_OFFSET_INDEX_V}.tar.gz -> atom-buffer-offset-index-${BUFFER_OFFSET_INDEX_V}.tar.gz |
112 |
- https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz -> atom-marker-index-${MARKER_INDEX_V}.tar.gz |
113 |
- https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz |
114 |
- https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz |
115 |
- https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz |
116 |
- https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz |
117 |
- https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz |
118 |
- https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz |
119 |
- https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz |
120 |
-" |
121 |
- |
122 |
-BINMODS=" |
123 |
- cached-run-in-this-context |
124 |
- node-ctags |
125 |
- git-utils |
126 |
- keyboard-layout |
127 |
- node-nslog |
128 |
- node-oniguruma |
129 |
- node-pathwatcher |
130 |
- node-runas |
131 |
- node-keytar |
132 |
- scrollbar-style |
133 |
- node-spellchecker |
134 |
- marker-index |
135 |
- buffer-offset-index |
136 |
-" |
137 |
- |
138 |
-RESTRICT="mirror" |
139 |
-LICENSE="MIT" |
140 |
-SLOT="0" |
141 |
-KEYWORDS="~amd64" |
142 |
-IUSE="" |
143 |
- |
144 |
-DEPEND=" |
145 |
- ${PYTHON_DEPS} |
146 |
- >=app-text/hunspell-1.3.3:= |
147 |
- >=dev-libs/libgit2-0.23:=[ssh] |
148 |
- >=gnome-base/libgnome-keyring-3.12:= |
149 |
- >=dev-libs/oniguruma-5.9.5:= |
150 |
- >=dev-util/ctags-5.8 |
151 |
- >=dev-util/electron-1.3.5:${ELECTRON_SLOT} |
152 |
- x11-libs/libxkbfile" |
153 |
-RDEPEND=" |
154 |
- ${DEPEND} |
155 |
- !sys-apps/apmd |
156 |
-" |
157 |
- |
158 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
159 |
- |
160 |
-pkg_setup() { |
161 |
- python-any-r1_pkg_setup |
162 |
-} |
163 |
- |
164 |
-get_install_suffix() { |
165 |
- local c=(${SLOT//\// }) |
166 |
- local slot=${c[0]} |
167 |
- local suffix |
168 |
- |
169 |
- if [[ "${slot}" == "0" ]]; then |
170 |
- suffix="" |
171 |
- else |
172 |
- suffix="-${slot}" |
173 |
- fi |
174 |
- |
175 |
- echo -n "${suffix}" |
176 |
-} |
177 |
- |
178 |
-get_install_dir() { |
179 |
- echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)" |
180 |
-} |
181 |
- |
182 |
-get_electron_dir() { |
183 |
- echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}" |
184 |
-} |
185 |
- |
186 |
-get_electron_nodedir() { |
187 |
- echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/" |
188 |
-} |
189 |
- |
190 |
-enode_electron() { |
191 |
- "$(get_electron_dir)"/node $@ |
192 |
-} |
193 |
- |
194 |
-enodegyp_atom() { |
195 |
- local apmpath="/usr/share/atom/resources/app/apm" |
196 |
- local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js" |
197 |
- |
198 |
- PATH="$(get_electron_dir):${PATH}" \ |
199 |
- enode_electron "${nodegyp}" \ |
200 |
- --nodedir="$(get_electron_nodedir)" $@ || die |
201 |
-} |
202 |
- |
203 |
-easar() { |
204 |
- local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar" |
205 |
- echo "asar" $@ |
206 |
- enode_electron "${asar}" $@ || die |
207 |
-} |
208 |
- |
209 |
-package_dir() { |
210 |
- local binmod="${1//-/_}" |
211 |
- local binmod_v="${binmod^^}_V" |
212 |
- echo -n ${1}-${!binmod_v} |
213 |
-} |
214 |
- |
215 |
-_unpack_npm_package() { |
216 |
- local a="${1}" basename suffix |
217 |
- |
218 |
- basename=${a%.*} |
219 |
- suffix=${basename##*.} |
220 |
- if [[ "${suffix}" == "tar" ]]; then |
221 |
- basename=${basename%.*} |
222 |
- fi |
223 |
- |
224 |
- unpack ${a} |
225 |
- mv package "${basename}" || die |
226 |
-} |
227 |
- |
228 |
-_have_patches_for() { |
229 |
- local _patches="${1}-*.patch" _find |
230 |
- _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit) |
231 |
- test -n "$_find" |
232 |
-} |
233 |
- |
234 |
-src_unpack() { |
235 |
- local a |
236 |
- |
237 |
- for a in ${A} ; do |
238 |
- case ${a} in |
239 |
- *.rpm) srcrpm_unpack "${a}" ;; |
240 |
- *) unpack "${a}" ;; |
241 |
- esac |
242 |
- done |
243 |
- |
244 |
- mkdir "${WORKDIR}/atom-${MY_PV}" || die |
245 |
- mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die |
246 |
-} |
247 |
- |
248 |
-src_prepare() { |
249 |
- local install_dir="$(get_install_dir)" |
250 |
- local suffix="$(get_install_suffix)" |
251 |
- local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}" |
252 |
- |
253 |
- cd "${S}/usr/share/atom/resources/app" || die |
254 |
- eapply "${FILESDIR}/${PN}-python.patch" |
255 |
- eapply "${FILESDIR}/${PN}-unbundle-electron.patch" |
256 |
- |
257 |
- sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \ |
258 |
- ./atom.sh \ |
259 |
- || die |
260 |
- |
261 |
- sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \ |
262 |
- ./atom.sh \ |
263 |
- || die |
264 |
- |
265 |
- sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \ |
266 |
- ./atom.sh \ |
267 |
- || die |
268 |
- |
269 |
- local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)" |
270 |
- sed -i -e \ |
271 |
- "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \ |
272 |
- apm/bin/apm || die |
273 |
- |
274 |
- sed -i -e \ |
275 |
- "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \ |
276 |
- apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die |
277 |
- |
278 |
- rm apm/bin/node || die |
279 |
- |
280 |
- sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \ |
281 |
- "${S}/usr/share/applications/atom.desktop" || die |
282 |
- |
283 |
- cd "${S}" || die |
284 |
- |
285 |
- for binmod in ${BINMODS}; do |
286 |
- _s="${WORKDIR}/$(package_dir ${binmod})" |
287 |
- cd "${_s}" || die |
288 |
- if _have_patches_for "${binmod}"; then |
289 |
- for patch in "${FILESDIR}"/${binmod}-*.patch; do |
290 |
- eapply "${patch}" |
291 |
- done |
292 |
- fi |
293 |
- done |
294 |
- |
295 |
- # Unbundle bundled libs from modules |
296 |
- |
297 |
- _s="${WORKDIR}/$(package_dir git-utils)" |
298 |
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \ |
299 |
- --inplace --unbundle "git;libgit2;git2" \ |
300 |
- "${_s}/binding.gyp" || die |
301 |
- |
302 |
- _s="${WORKDIR}/$(package_dir node-oniguruma)" |
303 |
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \ |
304 |
- --inplace --unbundle "onig_scanner;oniguruma;onig" \ |
305 |
- "${_s}/binding.gyp" || die |
306 |
- |
307 |
- _s="${WORKDIR}/$(package_dir node-spellchecker)" |
308 |
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \ |
309 |
- --inplace --unbundle "spellchecker;hunspell;hunspell" \ |
310 |
- "${_s}/binding.gyp" || die |
311 |
- |
312 |
- for binmod in ${BINMODS}; do |
313 |
- _s="${WORKDIR}/$(package_dir ${binmod})" |
314 |
- mkdir -p "${_s}/node_modules" || die |
315 |
- ln -s "${nan_s}" "${_s}/node_modules/nan" || die |
316 |
- done |
317 |
- |
318 |
- # Unpack app.asar |
319 |
- easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app" |
320 |
- |
321 |
- cd "${S}" || die |
322 |
- |
323 |
- eapply "${FILESDIR}/atom-1.13-apm-path.patch" |
324 |
- eapply "${FILESDIR}/atom-license-path.patch" |
325 |
- eapply "${FILESDIR}/atom-fix-app-restart.patch" |
326 |
- |
327 |
- sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \ |
328 |
- "${S}/build/app/src/config-schema.js" || die |
329 |
- |
330 |
- eapply_user |
331 |
-} |
332 |
- |
333 |
-src_configure() { |
334 |
- local binmod _s |
335 |
- |
336 |
- for binmod in ${BINMODS}; do |
337 |
- einfo "Configuring ${binmod}..." |
338 |
- _s="${WORKDIR}/$(package_dir ${binmod})" |
339 |
- cd "${_s}" || die |
340 |
- enodegyp_atom configure |
341 |
- done |
342 |
-} |
343 |
- |
344 |
-src_compile() { |
345 |
- local binmod _s x |
346 |
- local ctags_d="node_modules/symbols-view/vendor" |
347 |
- local jobs=$(makeopts_jobs) gypopts |
348 |
- |
349 |
- gypopts="--verbose" |
350 |
- |
351 |
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then |
352 |
- gypopts+=" --jobs ${jobs}" |
353 |
- fi |
354 |
- |
355 |
- mkdir -p "${S}/build/modules/" || die |
356 |
- |
357 |
- for binmod in ${BINMODS}; do |
358 |
- einfo "Building ${binmod}..." |
359 |
- _s="${WORKDIR}/$(package_dir ${binmod})" |
360 |
- cd "${_s}" || die |
361 |
- enodegyp_atom ${gypopts} build |
362 |
- x=${binmod##node-} |
363 |
- mkdir -p "${S}/build/modules/${x}" || die |
364 |
- cp build/Release/*.node "${S}/build/modules/${x}" || die |
365 |
- done |
366 |
- |
367 |
- # Put compiled binary modules in place |
368 |
- _fix_binmods "${S}/build" "app" |
369 |
- _fix_binmods "${S}/usr/share/atom/resources" "app" |
370 |
- |
371 |
- # Remove non-Linux vendored ctags binaries |
372 |
- rm "${S}/build/app/${ctags_d}/ctags-darwin" \ |
373 |
- "${S}/build/app/${ctags_d}/ctags-win32.exe" || die |
374 |
- |
375 |
- # Re-pack app.asar |
376 |
- # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee |
377 |
- cd "${S}/build" || die |
378 |
- x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}" |
379 |
- easar pack "${x}" "app" "app.asar" |
380 |
- cd "${S}" || die |
381 |
-} |
382 |
- |
383 |
-_fix_binmods() { |
384 |
- local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d |
385 |
- local cruft |
386 |
- |
387 |
- (find "${_prefix}/${_dir}" -name '*.node' -print || die) \ |
388 |
- | while IFS= read -r path; do |
389 |
- f=$(basename "${path}") |
390 |
- d=$(dirname "${path}") |
391 |
- relpath=${path#${_prefix}} |
392 |
- relpath=${relpath##/} |
393 |
- relpath=${relpath#W${_dir}} |
394 |
- modpath=$(dirname ${relpath}) |
395 |
- modpath=${modpath%build/Release} |
396 |
- mod=$(basename ${modpath}) |
397 |
- |
398 |
- # must copy here as symlinks will cause the module loading to fail |
399 |
- cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die |
400 |
- cruft=$(find "${d}" -name '*.a' -print) |
401 |
- if [[ -n "${cruft}" ]]; then |
402 |
- rm ${cruft} || die |
403 |
- fi |
404 |
- done |
405 |
-} |
406 |
- |
407 |
-_fix_executables() { |
408 |
- local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node |
409 |
- |
410 |
- (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \ |
411 |
- | while IFS= read -r f; do |
412 |
- IFS= read -r shebang < "${f}" |
413 |
- |
414 |
- if [[ ${shebang} == '#!'* ]]; then |
415 |
- fperms +x "${f#${ED}}" |
416 |
- if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then |
417 |
- einfo "Fixing node shebang in ${f#${ED}}" |
418 |
- sed --follow-symlinks -i \ |
419 |
- -e "1s:${shebang}$:${_node_sb}:" "${f}" || die |
420 |
- fi |
421 |
- fi |
422 |
- done || die |
423 |
-} |
424 |
- |
425 |
-src_install() { |
426 |
- local install_dir="$(get_install_dir)" |
427 |
- local suffix="$(get_install_suffix)" |
428 |
- local ctags_d="node_modules/symbols-view/vendor" |
429 |
- |
430 |
- cd "${S}" || die |
431 |
- |
432 |
- # Replace vendored ctags with a symlink to system ctags |
433 |
- rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die |
434 |
- ln -s "/usr/bin/ctags" \ |
435 |
- "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die |
436 |
- |
437 |
- insinto "${install_dir}" |
438 |
- |
439 |
- doins build/app.asar |
440 |
- doins -r build/app.asar.unpacked |
441 |
- doins -r usr/share/atom/resources/app |
442 |
- |
443 |
- insinto /usr/share/applications/ |
444 |
- newins usr/share/applications/atom.desktop "atom${suffix}.desktop" |
445 |
- |
446 |
- insinto /usr/share/icons/ |
447 |
- doins -r usr/share/icons/hicolor |
448 |
- |
449 |
- exeinto "${install_dir}" |
450 |
- newexe usr/share/atom/resources/app/atom.sh atom |
451 |
- insinto /usr/share/licenses/"${PN}${suffix}" |
452 |
- doins usr/share/atom/resources/LICENSE.md |
453 |
- dosym "${install_dir}/atom" "/usr/bin/atom${suffix}" |
454 |
- dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}" |
455 |
- |
456 |
- _fix_executables "${install_dir}/app/apm/bin" |
457 |
- _fix_executables "${install_dir}/app/apm/node_modules/.bin" |
458 |
- _fix_executables "${install_dir}/app/apm/node_modules/npm/bin" |
459 |
- _fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin" |
460 |
- _fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin" |
461 |
-} |
462 |
|
463 |
diff --git a/app-editors/atom/atom-1.15.0.ebuild b/app-editors/atom/atom-1.15.0-r1.ebuild |
464 |
similarity index 99% |
465 |
rename from app-editors/atom/atom-1.15.0.ebuild |
466 |
rename to app-editors/atom/atom-1.15.0-r1.ebuild |
467 |
index 9f0812c5818..b564d861165 100644 |
468 |
--- a/app-editors/atom/atom-1.15.0.ebuild |
469 |
+++ b/app-editors/atom/atom-1.15.0-r1.ebuild |
470 |
@@ -4,7 +4,7 @@ |
471 |
EAPI=6 |
472 |
|
473 |
PYTHON_COMPAT=( python2_7 ) |
474 |
-inherit python-any-r1 multiprocessing rpm |
475 |
+inherit python-single-r1 multiprocessing rpm |
476 |
|
477 |
DESCRIPTION="A hackable text editor for the 21st Century" |
478 |
HOMEPAGE="https://atom.io" |
479 |
@@ -82,6 +82,7 @@ LICENSE="MIT" |
480 |
SLOT="0" |
481 |
KEYWORDS="~amd64" |
482 |
IUSE="" |
483 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
484 |
|
485 |
DEPEND=" |
486 |
${PYTHON_DEPS} |
487 |
@@ -100,7 +101,7 @@ RDEPEND=" |
488 |
S="${WORKDIR}/${PN}-${MY_PV}" |
489 |
|
490 |
pkg_setup() { |
491 |
- python-any-r1_pkg_setup |
492 |
+ python-single-r1_pkg_setup |
493 |
} |
494 |
|
495 |
get_install_suffix() { |
496 |
|
497 |
diff --git a/app-editors/atom/atom-1.12.7.ebuild b/app-editors/atom/atom-1.16.0.ebuild |
498 |
similarity index 95% |
499 |
rename from app-editors/atom/atom-1.12.7.ebuild |
500 |
rename to app-editors/atom/atom-1.16.0.ebuild |
501 |
index 316f00a7523..1af228834d8 100644 |
502 |
--- a/app-editors/atom/atom-1.12.7.ebuild |
503 |
+++ b/app-editors/atom/atom-1.16.0.ebuild |
504 |
@@ -4,13 +4,13 @@ |
505 |
EAPI=6 |
506 |
|
507 |
PYTHON_COMPAT=( python2_7 ) |
508 |
-inherit python-any-r1 multiprocessing rpm |
509 |
+inherit python-single-r1 multiprocessing rpm |
510 |
|
511 |
DESCRIPTION="A hackable text editor for the 21st Century" |
512 |
HOMEPAGE="https://atom.io" |
513 |
MY_PV="${PV//_/-}" |
514 |
|
515 |
-ELECTRON_V=1.3.5 |
516 |
+ELECTRON_V=1.3.13 |
517 |
ELECTRON_SLOT=1.3 |
518 |
|
519 |
# All binary packages depend on this |
520 |
@@ -21,19 +21,19 @@ CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1 |
521 |
GIT_UTILS_V=4.1.2 |
522 |
NODE_NSLOG_V=3.0.0 |
523 |
NODE_ONIGURUMA_V=6.1.0 |
524 |
-NODE_PATHWATCHER_V=6.5.0 |
525 |
+NODE_PATHWATCHER_V=6.9.0 |
526 |
NODE_RUNAS_V=3.1.1 |
527 |
SCROLLBAR_STYLE_V=3.2.0 |
528 |
-SPELL_CHECK_V=0.68.4 |
529 |
+SPELL_CHECK_V=0.71.3 |
530 |
|
531 |
-# textbuffer dependency |
532 |
-MARKER_INDEX_V=4.0.1 |
533 |
+# text-buffer dependencies |
534 |
+SUPERSTRING_V=1.1.0 |
535 |
|
536 |
# apm dependency |
537 |
NODE_KEYTAR_V=3.0.2 |
538 |
|
539 |
# atom-keymap dependency |
540 |
-KEYBOARD_LAYOUT_V=2.0.7 |
541 |
+KEYBOARD_LAYOUT_V=2.0.11 |
542 |
|
543 |
# symbols-view dependency |
544 |
NODE_CTAGS_V=3.0.0 |
545 |
@@ -52,7 +52,7 @@ SRC_URI=" |
546 |
https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz |
547 |
https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz |
548 |
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz |
549 |
- https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz -> atom-marker-index-${MARKER_INDEX_V}.tar.gz |
550 |
+ https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz |
551 |
https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz |
552 |
https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz |
553 |
https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz |
554 |
@@ -74,7 +74,7 @@ BINMODS=" |
555 |
node-keytar |
556 |
scrollbar-style |
557 |
node-spellchecker |
558 |
- marker-index |
559 |
+ superstring |
560 |
" |
561 |
|
562 |
RESTRICT="mirror" |
563 |
@@ -82,6 +82,7 @@ LICENSE="MIT" |
564 |
SLOT="0" |
565 |
KEYWORDS="~amd64" |
566 |
IUSE="" |
567 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
568 |
|
569 |
DEPEND=" |
570 |
${PYTHON_DEPS} |
571 |
@@ -91,8 +92,7 @@ DEPEND=" |
572 |
>=dev-libs/oniguruma-5.9.5:= |
573 |
>=dev-util/ctags-5.8 |
574 |
>=dev-util/electron-1.3.5:${ELECTRON_SLOT} |
575 |
- x11-libs/libxkbfile |
576 |
-" |
577 |
+ x11-libs/libxkbfile" |
578 |
RDEPEND=" |
579 |
${DEPEND} |
580 |
!sys-apps/apmd |
581 |
@@ -101,7 +101,7 @@ RDEPEND=" |
582 |
S="${WORKDIR}/${PN}-${MY_PV}" |
583 |
|
584 |
pkg_setup() { |
585 |
- python-any-r1_pkg_setup |
586 |
+ python-single-r1_pkg_setup |
587 |
} |
588 |
|
589 |
get_install_suffix() { |
590 |
@@ -263,9 +263,10 @@ src_prepare() { |
591 |
|
592 |
cd "${S}" || die |
593 |
|
594 |
- eapply "${FILESDIR}/atom-apm-path.patch" |
595 |
+ eapply "${FILESDIR}/atom-1.13-apm-path.patch" |
596 |
eapply "${FILESDIR}/atom-license-path.patch" |
597 |
eapply "${FILESDIR}/atom-fix-app-restart.patch" |
598 |
+ eapply "${FILESDIR}/atom-marker-layer.patch" |
599 |
|
600 |
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \ |
601 |
"${S}/build/app/src/config-schema.js" || die |