* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2016-05-12 8:30 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-05-12 8:30 UTC (permalink / raw
To: gentoo-commits
commit: eba335738e239f5b106d38e2526420f680574f11
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Wed May 11 14:51:18 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu May 12 08:15:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba33573
app-editors/atom: Build fixes.
Fixed node-gyp invocation and added gnome-keyring dependency.
Gentoo-Bug: https://bugs.gentoo.org/582748
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1453
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
app-editors/atom/{atom-1.7.3.ebuild => atom-1.7.3-r1.ebuild} | 9 +++++----
app-editors/atom/files/gyp-unbundle.py | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app-editors/atom/atom-1.7.3.ebuild b/app-editors/atom/atom-1.7.3-r1.ebuild
similarity index 96%
rename from app-editors/atom/atom-1.7.3.ebuild
rename to app-editors/atom/atom-1.7.3-r1.ebuild
index 36de15d..1b45786 100644
--- a/app-editors/atom/atom-1.7.3.ebuild
+++ b/app-editors/atom/atom-1.7.3-r1.ebuild
@@ -114,6 +114,7 @@ DEPEND="
>=net-libs/nodejs-5.9.0:=[npm]
>=app-text/hunspell-1.3.3:=
=dev-libs/libgit2-0.23*:=[ssh]
+ >=gnome-base/libgnome-keyring-3.12:=
>=dev-libs/oniguruma-5.9.5:=
>=dev-util/ctags-5.8
dev-util/electron:0/36
@@ -269,7 +270,7 @@ src_prepare() {
}
src_configure() {
- local binmod _s
+ local binmod _s nodegyp="/usr/$(get_libdir)/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
_s="${WORKDIR}/$(package_dir nodegit)"
cd "${_s}" || die
@@ -283,14 +284,14 @@ src_configure() {
einfo "Configuring ${binmod}..."
_s="${WORKDIR}/$(package_dir ${binmod})"
cd "${_s}" || die
- node-gyp --nodedir=/usr/include/electron/node/ configure || die
+ "${nodegyp}" --nodedir=/usr/include/electron/node/ configure || die
# Unclobber MAKEFLAGS
sed -i -e '/MAKEFLAGS=-r/d' build/Makefile || die
done
}
src_compile() {
- local binmod _s x
+ local binmod _s x nodegyp="/usr/$(get_libdir)/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
mkdir -p "${S}/build/modules/" || die
@@ -298,7 +299,7 @@ src_compile() {
einfo "Building ${binmod}..."
_s="${WORKDIR}/$(package_dir ${binmod})"
cd "${_s}" || die
- node-gyp --nodedir=/usr/include/electron/node/ --verbose build || die
+ "${nodegyp}" --nodedir=/usr/include/electron/node/ --verbose build || die
x=${binmod##node-}
mkdir -p "${S}/build/modules/${x}"
cp build/Release/*.node "${S}/build/modules/${x}"
diff --git a/app-editors/atom/files/gyp-unbundle.py b/app-editors/atom/files/gyp-unbundle.py
index 381de79..9ab7bf7 100644
--- a/app-editors/atom/files/gyp-unbundle.py
+++ b/app-editors/atom/files/gyp-unbundle.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
from __future__ import print_function
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2016-05-27 14:15 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-05-27 14:15 UTC (permalink / raw
To: gentoo-commits
commit: dd47bfc852882b48eb465dcde3ba90b4857a0964
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Wed May 25 15:11:17 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri May 27 13:47:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd47bfc8
app-editors/atom: Fix apm under Node 5+.
apm monkey-patches Node's module system to add support for module loading
from "asar" archives. Add a case to make this work under Node 5+.
Gentoo-Bug: https://bugs.gentoo.org/584000
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1539
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../{atom-1.7.4.ebuild => atom-1.7.4-r1.ebuild} | 1 +
app-editors/atom/files/asar-require.patch | 45 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/app-editors/atom/atom-1.7.4.ebuild b/app-editors/atom/atom-1.7.4-r1.ebuild
similarity index 99%
rename from app-editors/atom/atom-1.7.4.ebuild
rename to app-editors/atom/atom-1.7.4-r1.ebuild
index c408132..c45728c 100644
--- a/app-editors/atom/atom-1.7.4.ebuild
+++ b/app-editors/atom/atom-1.7.4-r1.ebuild
@@ -279,6 +279,7 @@ src_prepare() {
cd "${S}" || die
epatch "${FILESDIR}/atom-apm-path.patch"
+ epatch "${FILESDIR}/asar-require.patch"
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
"${S}/build/app.asar/src/config-schema.js" || die
diff --git a/app-editors/atom/files/asar-require.patch b/app-editors/atom/files/asar-require.patch
new file mode 100644
index 0000000..a00169b
--- /dev/null
+++ b/app-editors/atom/files/asar-require.patch
@@ -0,0 +1,45 @@
+diff --git a/usr/share/atom/resources/app/apm/node_modules/asar-require/lib/require.js b/usr/share/atom/resources/app/apm/node_modules/asar-require/lib/require.js
+index 47cb1bb..67895d5 100644
+--- a/usr/share/atom/resources/app/apm/node_modules/asar-require/lib/require.js
++++ b/usr/share/atom/resources/app/apm/node_modules/asar-require/lib/require.js
+@@ -1,5 +1,7 @@
+ (function() {
+- var asar, asarStatsToFsStats, fakeTime, fs, gid, nextInode, path, readFileSync, realpathSync, splitPath, statSync, uid;
++ var asar, asarStatsToFsStats, fakeTime, fs, gid, nextInode, path, readFileSync, realpathSync, splitPath, statSync, uid;
++
++ var module, module_findPath, _e;
+
+ asar = require('asar');
+
+@@ -7,6 +9,12 @@
+
+ path = require('path');
+
++ try {
++ module = require('module');
++ } catch (_e) {
++ module = null;
++ }
++
+ splitPath = function(p) {
+ var index;
+ if (typeof p !== 'string') {
+@@ -124,5 +132,18 @@
+ }
+ return path.join(realpathSync(asarPath), filePath);
+ };
++
++ if (module && module._findPath) {
++ module_findPath = module._findPath;
++
++ module._findPath = function(request, paths, isMain) {
++ var asarPath, filePath, isAsar, _ref;
++ _ref = splitPath(request), isAsar = _ref[0], asarPath = _ref[1], filePath = _ref[2];
++ if (isAsar) {
++ return request;
++ }
++ return module_findPath.apply(this, arguments);
++ }
++ }
+
+ }).call(this);
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2016-06-10 16:50 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-06-10 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 16c842dc06be668d6b9491eba9bf5c234fc2c00a
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Fri Jun 10 14:35:46 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 16:22:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c842dc
app-editors/atom: Fix app.asar repacking. Fixes bug 585490.
Gentoo-Bug: https://bugs.gentoo.org/585490
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1640
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../{atom-1.7.4-r1.ebuild => atom-1.7.4-r2.ebuild} | 57 +++++++++++++---------
app-editors/atom/files/atom-apm-path.patch | 4 +-
2 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/app-editors/atom/atom-1.7.4-r1.ebuild b/app-editors/atom/atom-1.7.4-r2.ebuild
similarity index 89%
rename from app-editors/atom/atom-1.7.4-r1.ebuild
rename to app-editors/atom/atom-1.7.4-r2.ebuild
index c45728c..68fb871 100644
--- a/app-editors/atom/atom-1.7.4-r1.ebuild
+++ b/app-editors/atom/atom-1.7.4-r2.ebuild
@@ -5,7 +5,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic python-any-r1 eutils rpm
+inherit flag-o-matic python-any-r1 eutils multiprocessing rpm
DESCRIPTION="A hackable text editor for the 21st Century"
HOMEPAGE="https://atom.io"
@@ -274,7 +274,7 @@ src_prepare() {
_s="${WORKDIR}/$(package_dir asar)"
"${_s}"/node_modules/asar/bin/asar \
extract "${S}/usr/share/atom/resources/app.asar" \
- "${S}/build/app.asar" || die
+ "${S}/build/app" || die
cd "${S}" || die
@@ -282,7 +282,7 @@ src_prepare() {
epatch "${FILESDIR}/asar-require.patch"
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
- "${S}/build/app.asar/src/config-schema.js" || die
+ "${S}/build/app/src/config-schema.js" || die
eapply_user
}
@@ -310,6 +310,14 @@ src_configure() {
src_compile() {
local binmod _s x nodegyp="/usr/$(get_libdir)/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
+ local ctags_d="node_modules/symbols-view/vendor"
+ local jobs=$(makeopts_jobs) gypopts
+
+ gypopts="--nodedir=/usr/include/electron/node/ --verbose"
+
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+ gypopts+=" --jobs ${jobs}"
+ fi
mkdir -p "${S}/build/modules/" || die
@@ -317,17 +325,33 @@ src_compile() {
einfo "Building ${binmod}..."
_s="${WORKDIR}/$(package_dir ${binmod})"
cd "${_s}" || die
- "${nodegyp}" --nodedir=/usr/include/electron/node/ --verbose build || die
+ "${nodegyp}" ${gypopts} build || die
x=${binmod##node-}
mkdir -p "${S}/build/modules/${x}"
cp build/Release/*.node "${S}/build/modules/${x}"
done
+ # Put compiled binary modules in place
+ _fix_binmods "${S}/build" "app"
+ _fix_binmods "${S}/usr/share/atom/resources" "app"
+
+ # Remove non-Linux vendored ctags binaries
+ rm "${S}/build/app/${ctags_d}/ctags-darwin" \
+ "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
+
# Re-pack app.asar
- _s="${WORKDIR}/$(package_dir asar)"
- "${_s}"/node_modules/asar/bin/asar \
- pack "${S}/build/app.asar" \
- "${S}/usr/share/atom/resources/app.asar" || die
+ # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+ x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
+ _s="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin"
+ cd "${S}/build" || die
+ echo "asar" pack "${x}" "app" "app.asar"
+ "${_s}/asar" pack "${x}" "app" "app.asar" || die
+ cd "${S}" || die
+
+ # Replace vendored ctags with a symlink to system ctags
+ rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+ ln -s "/usr/bin/ctags" \
+ "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
}
_fix_binmods() {
@@ -345,7 +369,7 @@ _fix_binmods() {
mod=$(basename ${modpath})
# must copy here as symlinks will cause the module loading to fail
- cp "${ED}/${install_dir}/modules/${mod}/${f}" "${path}" || die
+ cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
cruft=$(find "${d}" -name '*.a' -print)
if [ -n "${cruft}" ]; then
rm ${cruft} || die
@@ -356,25 +380,14 @@ _fix_binmods() {
src_install() {
local install_dir="$(get_install_dir)"
local suffix="$(get_install_suffix)"
- local ctags_d="${ED}/${install_dir}/app.asar.unpacked/node_modules/symbols-view/vendor"
cd "${S}" || die
insinto "${install_dir}"
- doins -r build/modules
- doins usr/share/atom/resources/app.asar
+ doins build/app.asar
+ doins -r build/app.asar.unpacked
doins -r usr/share/atom/resources/app
- doins -r usr/share/atom/resources/app.asar.unpacked
-
- _fix_binmods "${ED}/${install_dir}" "app"
- _fix_binmods "${ED}/${install_dir}" "app.asar.unpacked"
-
- rm -r "${ED}/${install_dir}/modules" || die
-
- # Remove vendored ctags binary and replace with a symlink to system ctags
- rm "${ctags_d}"/* || die
- ln -s "/usr/bin/ctags" "${ctags_d}/ctags-linux" || die
insinto /usr/share/applications/
newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
diff --git a/app-editors/atom/files/atom-apm-path.patch b/app-editors/atom/files/atom-apm-path.patch
index 8746b95..957fed4 100644
--- a/app-editors/atom/files/atom-apm-path.patch
+++ b/app-editors/atom/files/atom-apm-path.patch
@@ -1,5 +1,5 @@
---- build/app.asar/src/config-schema.js.orig 2016-05-24 16:59:41.284449076 -0400
-+++ build/app.asar/src/config-schema.js 2016-05-24 17:01:05.685447769 -0400
+--- build/app/src/config-schema.js.orig 2016-05-24 16:59:41.284449076 -0400
++++ build/app/src/config-schema.js 2016-05-24 17:01:05.685447769 -0400
@@ -9,6 +9,11 @@
core: {
type: 'object',
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2017-02-08 12:40 Mikhail Pukhlikov
0 siblings, 0 replies; 7+ messages in thread
From: Mikhail Pukhlikov @ 2017-02-08 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 2614f489c95624b45b9c5e573887a4a6baeb3326
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Wed Feb 1 15:31:09 2017 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 12:40:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2614f489
app-editors/atom: Version bump to 1.12.7, 1.13.1
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3761
app-editors/atom/Manifest | 6 ++++--
.../atom/{atom-1.12.2.ebuild => atom-1.12.7.ebuild} | 5 +++--
.../atom/{atom-1.12.2.ebuild => atom-1.13.1.ebuild} | 14 +++++++++-----
app-editors/atom/files/atom-1.13-apm-path.patch | 16 ++++++++++++++++
app-editors/atom/files/atom-fix-app-restart.patch | 12 ++++++++++++
5 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index 0e8e0bf35e..0186079974 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -1,8 +1,10 @@
DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
-DIST atom-1.12.2.rpm 84876214 SHA256 bcf95d7a8f4105c016d2940540d7c8db9bf0948a7dc8b5411294bd0fac48ec15 SHA512 a63af5e0da6ce0e9cc70c47da55b13fe463903c27a7df4e7ce311f08ed16fb4e04712678479661febcdf70afa400e3a8235d540bacaf4078e92b1e3d42fdfc11 WHIRLPOOL 4d6793741496cc240da18540bb74751b193e293a2df14c365c8fed2a2672422f87b36c5faf324790cc45951c8006a4b482656e8c8d3fd46d723c12c8ca073b4e
+DIST atom-1.12.7.rpm 84755598 SHA256 8eaa5426c9209efc91969e3f3b1535f2c1895daf6259c07cbd595dd0a599553f SHA512 f2d582eb916e95373a08a1e56b89492f52547ab853fae7975b8193ee5d0a23dfc86bcaf9de5b53bc0dbd955c784abfede5b162fb6ef5ee0f7424fc0882da848c WHIRLPOOL aa029e8ef519f475b0a9a9f592cb685b4f15f4c257774c7ca644ed69bf50128bce4c382581b133e7c43438f690ed6b3d791ad379109b96a8ef9893ef93e0ad98
+DIST atom-1.13.1.rpm 86119349 SHA256 593fa81abb3a3a8c89713de1fb9d7d3dd4e4b34211de69fee67469b63be98f01 SHA512 57e587441fbc5ed7864d54f067386a54e854c761b3ad577e07d58253d693c90de934af98e1dc16bf1b645a7b87e9169d0a869509c0192103ddede51a1d8b95d6 WHIRLPOOL 51b8ce72c4b9b01ca8afc3ae5a548e0dbf437fc629305acf357c6de44a05b20a7d8736c89d78cd1cb84fe22109445e5d9d773e0d50e321fcdabca015f64a55a7
+DIST atom-buffer-offset-index-9588080533c9d0a8a71ee1cfd98596f485940e91.tar.gz 5558 SHA256 ea940264e4d6f2b5ad319c50e7e4ece64e1fd4d1f790c847dedf0a5bc4e9b2c9 SHA512 ebcfa7057c9db85a7884cbb19fa561821fc883bbd6a5d0186fcf68782697a7c7677e019334b44b3477d26e1febccb3a7690dc3390dcb55ca838e176f390b11b7 WHIRLPOOL 1c438ec18c2fcf1c7b1a11421eb9944a2fd90f920dc4dc5cf0b8c5300f9f285cc993689312a23b9882f13316956077bf9994173c0b1c9cd54c6f5ccdd667d16f
DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d WHIRLPOOL 573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4
DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a WHIRLPOOL 4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937
-DIST atom-keyboard-layout-2.0.1.tar.gz 18561 SHA256 057d01745b5cfb47381aa89d64344d4c1576d3b490756a25e3f616bfc68f6516 SHA512 f5b90c1c83574cd2cb49c82d11fabadb58ec41d34b5b6ea17b28b8a34b22ed9ce1afb1602cf1d3d28ba79e3cebcb60d8659201eea4c5294e0db2b29d7632b07a WHIRLPOOL a859b0d364b9059f4482b52f049e9a420bf356e00a5cfe5b657fbd0e1868fd6cd2bf39846560b88c9763e1ebc54fb7acb025a67af21182b00c3f83b380f4443f
+DIST atom-keyboard-layout-2.0.7.tar.gz 18687 SHA256 3fb6c702c07d4d7116d73e5ed457f8dd2b07a99eafb7da830c032545d6da1f1e SHA512 96a10dad193d2e870e518eb863e4bf758e1efa86c4e377a3dcb818b5f51d42eaab9211732eddac106b7d4dddf6d9ebe80fb4a16ca24c647a0599a3a92e2c4591 WHIRLPOOL 01c28f7dadb8961ed6480a6ca2f9fab6c7e78436317b12f2731e130af405a456ea21719c0a409aa87248eaee956792fc37dcb040d900e2acc5005917c0f4666c
DIST atom-marker-index-4.0.1.tar.gz 18433 SHA256 ecb6a5294088feb2a2b8ae71845dc262e1ab551a6a75e9ac99b05807b62b2d4a SHA512 2f5639ac0fef1a9d735dc10b464a046ee78f8cf7ecd8a6705232c319958a46056146bd91a0bf421aa0c6da39106f6deacaedaa40c442c0c08f0e6fbfd938b3ea WHIRLPOOL ccbd0f6a515b97a1fcf460f13388206ab3ccee364264203fa6d6ad3d6e68a4e06bad5f38ce19008d2a5f79d2becb14a459cbd016f0daaea48c5387c21ad1bb77
DIST atom-node-ctags-3.0.0.tar.gz 15062 SHA256 40605012d06d4dcbfc369862b57900b6963613e2e4ee3b37fea21693b2b418a7 SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87 WHIRLPOOL 2cff81d2ca405a615e5c7d284785f129f8fcd968998c68a42af1ca2e6d76a6fcb404a92f3c0d20220567b28593448b91657db6df8bce19de1f2eedbfe2959140
DIST atom-node-keytar-3.0.2.tar.gz 5718 SHA256 16af03d2a7876e3008f82d35e913753384655bc181e93cb771639b6d5a2439bf SHA512 f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a WHIRLPOOL 69b10619531bedb839c61c1b29d18d1a0bf4e468ed05ebd58db349010b8de555673f45bdf98c4ad252aaa960b47faa00d952470e9b3545a0e1e189bbb3e49ded
diff --git a/app-editors/atom/atom-1.12.2.ebuild b/app-editors/atom/atom-1.12.7.ebuild
similarity index 98%
copy from app-editors/atom/atom-1.12.2.ebuild
copy to app-editors/atom/atom-1.12.7.ebuild
index 4c9b026e95..19991e7199 100644
--- a/app-editors/atom/atom-1.12.2.ebuild
+++ b/app-editors/atom/atom-1.12.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -34,7 +34,7 @@ MARKER_INDEX_V=4.0.1
NODE_KEYTAR_V=3.0.2
# atom-keymap dependency
-KEYBOARD_LAYOUT_V=2.0.1
+KEYBOARD_LAYOUT_V=2.0.7
# symbols-view dependency
NODE_CTAGS_V=3.0.0
@@ -265,6 +265,7 @@ src_prepare() {
eapply "${FILESDIR}/atom-apm-path.patch"
eapply "${FILESDIR}/atom-license-path.patch"
+ eapply "${FILESDIR}/atom-fix-app-restart.patch"
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
"${S}/build/app/src/config-schema.js" || die
diff --git a/app-editors/atom/atom-1.12.2.ebuild b/app-editors/atom/atom-1.13.1.ebuild
similarity index 96%
rename from app-editors/atom/atom-1.12.2.ebuild
rename to app-editors/atom/atom-1.13.1.ebuild
index 4c9b026e95..84c2ee311f 100644
--- a/app-editors/atom/atom-1.12.2.ebuild
+++ b/app-editors/atom/atom-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,16 +25,17 @@ NODE_ONIGURUMA_V=6.1.0
NODE_PATHWATCHER_V=6.5.0
NODE_RUNAS_V=3.1.1
SCROLLBAR_STYLE_V=3.2.0
-SPELL_CHECK_V=0.68.4
+SPELL_CHECK_V=0.68.5
-# textbuffer dependency
+# text-buffer dependencies
+BUFFER_OFFSET_INDEX_V=9588080533c9d0a8a71ee1cfd98596f485940e91
MARKER_INDEX_V=4.0.1
# apm dependency
NODE_KEYTAR_V=3.0.2
# atom-keymap dependency
-KEYBOARD_LAYOUT_V=2.0.1
+KEYBOARD_LAYOUT_V=2.0.7
# symbols-view dependency
NODE_CTAGS_V=3.0.0
@@ -53,6 +54,7 @@ SRC_URI="
https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
+ https://github.com/atom/buffer-offset-index/archive/${BUFFER_OFFSET_INDEX_V}.tar.gz -> atom-buffer-offset-index-${BUFFER_OFFSET_INDEX_V}.tar.gz
https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz -> atom-marker-index-${MARKER_INDEX_V}.tar.gz
https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
@@ -76,6 +78,7 @@ BINMODS="
scrollbar-style
node-spellchecker
marker-index
+ buffer-offset-index
"
RESTRICT="mirror"
@@ -263,8 +266,9 @@ src_prepare() {
cd "${S}" || die
- eapply "${FILESDIR}/atom-apm-path.patch"
+ eapply "${FILESDIR}/atom-1.13-apm-path.patch"
eapply "${FILESDIR}/atom-license-path.patch"
+ eapply "${FILESDIR}/atom-fix-app-restart.patch"
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
"${S}/build/app/src/config-schema.js" || die
diff --git a/app-editors/atom/files/atom-1.13-apm-path.patch b/app-editors/atom/files/atom-1.13-apm-path.patch
new file mode 100644
index 0000000000..0dcb7914c6
--- /dev/null
+++ b/app-editors/atom/files/atom-1.13-apm-path.patch
@@ -0,0 +1,16 @@
+diff --git a/build/app/src/config-schema.js b/build/app/src/config-schema.js
+index 1307db6..d6a1ba4 100644
+--- a/build/app/src/config-schema.js
++++ b/build/app/src/config-schema.js
+@@ -21,6 +21,11 @@ var configSchema = {
+ core: {
+ type: 'object',
+ properties: {
++ apmPath: {
++ type: 'string',
++ 'default': '/usr/bin/apm{{ATOM_SUFFIX}}',
++ description: 'Path to apm executable.'
++ },
+ ignoredNames: {
+ type: 'array',
+ 'default': ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db'],
diff --git a/app-editors/atom/files/atom-fix-app-restart.patch b/app-editors/atom/files/atom-fix-app-restart.patch
new file mode 100644
index 0000000000..1bfa1ed429
--- /dev/null
+++ b/app-editors/atom/files/atom-fix-app-restart.patch
@@ -0,0 +1,12 @@
+diff --git a/atom-application.js.orig b/atom-application.js
+index 92d985f..9a120e6 100644
+--- a/build/app/src/main-process/atom-application.js
++++ b/build/app/src/main-process/atom-application.js
+@@ -1178,6 +1178,7 @@
+ AtomApplication.prototype.restart = function() {
+ var args;
+ args = [];
++ args.push("--app=" + this.resourcePath);
+ if (this.safeMode) {
+ args.push("--safe");
+ }
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2017-04-08 21:22 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2017-04-08 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 2e1f7ec8103c4e7dbeca50f558438d6429dd3589
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Thu Mar 30 13:05:22 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 21:21:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1f7ec8
app-editors/atom: version bump to 1.15.0.
Gentoo-Bug: https://bugs.gentoo.org/608478
Package-Manager: Portage-2.3.4, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4330
app-editors/atom/Manifest | 4 +
app-editors/atom/atom-1.15.0.ebuild | 405 +++++++++++++++++++++++++
app-editors/atom/files/atom-marker-layer.patch | 11 +
3 files changed, 420 insertions(+)
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index 0186079974c..ff41775c316 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -1,9 +1,11 @@
DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
DIST atom-1.12.7.rpm 84755598 SHA256 8eaa5426c9209efc91969e3f3b1535f2c1895daf6259c07cbd595dd0a599553f SHA512 f2d582eb916e95373a08a1e56b89492f52547ab853fae7975b8193ee5d0a23dfc86bcaf9de5b53bc0dbd955c784abfede5b162fb6ef5ee0f7424fc0882da848c WHIRLPOOL aa029e8ef519f475b0a9a9f592cb685b4f15f4c257774c7ca644ed69bf50128bce4c382581b133e7c43438f690ed6b3d791ad379109b96a8ef9893ef93e0ad98
DIST atom-1.13.1.rpm 86119349 SHA256 593fa81abb3a3a8c89713de1fb9d7d3dd4e4b34211de69fee67469b63be98f01 SHA512 57e587441fbc5ed7864d54f067386a54e854c761b3ad577e07d58253d693c90de934af98e1dc16bf1b645a7b87e9169d0a869509c0192103ddede51a1d8b95d6 WHIRLPOOL 51b8ce72c4b9b01ca8afc3ae5a548e0dbf437fc629305acf357c6de44a05b20a7d8736c89d78cd1cb84fe22109445e5d9d773e0d50e321fcdabca015f64a55a7
+DIST atom-1.15.0.rpm 86561729 SHA256 935b444d9122f46d3ab490611476498c963de1232f9c732d9ad33f0e380a37be SHA512 e8f5ceaae020f9fbf8cb1ffbef0f64b7b5d23a0be20d063591e3ba3b9fd33c771a028aca9aa0ecad254e250342d40106dac85bf6bdeff4de64da0b57fe6de3ea WHIRLPOOL 4d4311654b8afaa4aa2d07611960d24775aeb825e97ea65e6f69d72790d4c160e8a371432346f1873a71b2e1bf4158f3eb5d35fc1fd882906765f3ea4328e526
DIST atom-buffer-offset-index-9588080533c9d0a8a71ee1cfd98596f485940e91.tar.gz 5558 SHA256 ea940264e4d6f2b5ad319c50e7e4ece64e1fd4d1f790c847dedf0a5bc4e9b2c9 SHA512 ebcfa7057c9db85a7884cbb19fa561821fc883bbd6a5d0186fcf68782697a7c7677e019334b44b3477d26e1febccb3a7690dc3390dcb55ca838e176f390b11b7 WHIRLPOOL 1c438ec18c2fcf1c7b1a11421eb9944a2fd90f920dc4dc5cf0b8c5300f9f285cc993689312a23b9882f13316956077bf9994173c0b1c9cd54c6f5ccdd667d16f
DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d WHIRLPOOL 573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4
DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a WHIRLPOOL 4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937
+DIST atom-keyboard-layout-2.0.11.tar.gz 19294 SHA256 fcef31c36619b76dd5f13a53c40eb9d3a7206a85cac3cd9dd0ba8e89d128258e SHA512 e7cbf3e8686ce6a86549d913523db75af623d4c5a18104f911b7f3931c273b87b4695b9b85afaea9a5cb440201b34d9e7445786c9328b87a5b58176cf2dbb877 WHIRLPOOL 85f06e125fca0e4e4c8a50fba539d674a0aadd1fba0c75b2be5663503c97bc8b6a6c75ee6b9916df5e598f3cc2a18f84e8392f1fb1145113d36d5216c0a2e5af
DIST atom-keyboard-layout-2.0.7.tar.gz 18687 SHA256 3fb6c702c07d4d7116d73e5ed457f8dd2b07a99eafb7da830c032545d6da1f1e SHA512 96a10dad193d2e870e518eb863e4bf758e1efa86c4e377a3dcb818b5f51d42eaab9211732eddac106b7d4dddf6d9ebe80fb4a16ca24c647a0599a3a92e2c4591 WHIRLPOOL 01c28f7dadb8961ed6480a6ca2f9fab6c7e78436317b12f2731e130af405a456ea21719c0a409aa87248eaee956792fc37dcb040d900e2acc5005917c0f4666c
DIST atom-marker-index-4.0.1.tar.gz 18433 SHA256 ecb6a5294088feb2a2b8ae71845dc262e1ab551a6a75e9ac99b05807b62b2d4a SHA512 2f5639ac0fef1a9d735dc10b464a046ee78f8cf7ecd8a6705232c319958a46056146bd91a0bf421aa0c6da39106f6deacaedaa40c442c0c08f0e6fbfd938b3ea WHIRLPOOL ccbd0f6a515b97a1fcf460f13388206ab3ccee364264203fa6d6ad3d6e68a4e06bad5f38ce19008d2a5f79d2becb14a459cbd016f0daaea48c5387c21ad1bb77
DIST atom-node-ctags-3.0.0.tar.gz 15062 SHA256 40605012d06d4dcbfc369862b57900b6963613e2e4ee3b37fea21693b2b418a7 SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87 WHIRLPOOL 2cff81d2ca405a615e5c7d284785f129f8fcd968998c68a42af1ca2e6d76a6fcb404a92f3c0d20220567b28593448b91657db6df8bce19de1f2eedbfe2959140
@@ -11,7 +13,9 @@ DIST atom-node-keytar-3.0.2.tar.gz 5718 SHA256 16af03d2a7876e3008f82d35e91375338
DIST atom-node-nslog-3.0.0.tar.gz 2774 SHA256 6f2c7b79dd27688829d72dcbb94cc3da8b86fe74f355e1d407907cc56da29747 SHA512 1891632486acfa014eec79f70b14d56d967670310e46dedccfc9dfa505581365765f6bd42ad538b29e74d7c7de83d045b4199dd634fc588734a1ee086dcddb0a WHIRLPOOL d29f2c68e6168ce020c2a73d73f107ffb4c777e006fba4f01a93045ad631fb2d8b83f989244caf4d5e2f66474e660f3479d79a03e82a6b8fa8a297586ee6e556
DIST atom-node-oniguruma-6.1.0.tar.gz 661394 SHA256 dab5322efac0cbe2c646559f130a2832be24e7caf8becabeedaf66842b72b289 SHA512 6443881353b61ad59d29cab6628f07d488e54df7b5a04ddffe4de11329e928b2a9cfc7582e22e0a90b6a3c6bf0e37873d8a5e34036cee5f7187ed4ae11fd6507 WHIRLPOOL 9c67fc6800e3d2b15160faa763539aefa2a40584697619b46098bd0f1c2820904ca6cae638e442c102c09616f62817c0df11f9c2da11d65c7dc9c98d04f668a4
DIST atom-node-pathwatcher-6.5.0.tar.gz 23926 SHA256 a2f72f00cbe6a49152cdae85fb7585a77f0ee8b01be54fbc27a24f93935445c3 SHA512 0b8471885acc44f38161b4758951cff762f4c9ca2d17aefdb286b99fdefa6843eaa86d463e4ac54563a79f6701fcaa40252a72d73baf2b6c4e47aa00692ee314 WHIRLPOOL f3a82776b05416eda4e763c0f1db1e422b299f78cf516576b0d13b0447024962538603ce47c12a4889f7d9c984b98ca75013230ba3f1cea1575453e5c2e445dc
+DIST atom-node-pathwatcher-6.8.0.tar.gz 24627 SHA256 a714ed58e709f72a8f687d697d68332c5a2c4d0019e3cdc09886e5ff85bd493f SHA512 ccb4d1270ba91cf31c5725e985b7bf224a8878fbeeb5fd2e78e22de7e25d382fc5b1c9e05ce1f2c23968d4ca3018e1db611c9485dbbd6eca2169228fb0a136e9 WHIRLPOOL b7080b82d6b8564aa84040c2f1d2fa4546a0dd073f7f78fb5503dc36dec4316fe4750c38757397a8c4782680ec9e0458ad4428368279990f3ba23f3f929b8459
DIST atom-node-runas-3.1.1.tar.gz 6628 SHA256 9d7d5a157b16fdd7263f50adb2831706d6fcf0902a1af528fc2602db6f9dc1cf SHA512 bada6e99ceb833c8c6e74f4b3116c49f21b54b922c1a27668312552779b9e5ccebf380b41c781d49c1c0dd0fdff6de8b71a0dcaf1f992892593e85f4572238df WHIRLPOOL d286d76f38ee8a23b4b76a9070913abe901f4db273073d9c0dcef13004abe7e10e9b4cad451cfe8d0cd4cc1e0ac2ab28ed50f327c1b9d317689153658f7b8944
DIST atom-node-spellchecker-3.2.3.tar.gz 481966 SHA256 bf4a07b4c671cd38b176ff8ef375f3cdf277decb941a0a279f8ffb36151fad55 SHA512 b0209fdfcbee53d289443e1c203a720888a82fa59648b4038c036c6afe68a6b04624e23267e69c36f23c185160d6ab84b1e4020047fbe6d94354e99d717a60b9 WHIRLPOOL d883cd3d3962e38ebe4c55e997ce461fa0b0da98e8b982793b77342eac1413e16090d562a9a50cb8200a18eda751a873528fdfde3b1f1928629bd56c5568f887
DIST atom-scrollbar-style-3.2.0.tar.gz 4609 SHA256 ea0f8f00cac609537af0d10d228054371c58b5a74785bd52fbbd276af02911ef SHA512 fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc WHIRLPOOL f6e75aafa8946ccc16949bdffa33b2bf050f06434a3fedcf8e1abac8b6b2d31dd37fcc137a43274d4c55d5926349486fda157d3fb6948d97063aac33b99e6578
+DIST atom-superstring-1.1.0.tar.gz 259961 SHA256 fcfc7f94bc3631fda8b08b2b91778f8a62e863b346a2f90b66f9af9f4f3f8cbb SHA512 880c97d696036065aeb4320dc71c88b49b22b04e6582c75310131e61d8067fdf3d26c901d7b22a2bfd2a2a2056f350ba9485b7e55410cdee9ef29f5a75a8af59 WHIRLPOOL 6f857ea91c8df678c592232816ec3c251355cb7af4f1f6dbf0f16c44aa1a978c66c0ce8225d176e7b253addb1e38795a3902a8dd302dd72db1f35e4c18cd3236
DIST nodejs-nan-2.4.0.tar.gz 157071 SHA256 290b4cd678bb0770fcc0dfa8415f908db09173acfdde31135a4e31716c311883 SHA512 e6f3ab3f67c72b3cc9e6e6b9b5de0f73134ef504dedae5e68376198858a6796f00c35869438e0480f28006dd8f6be13dca3bcc436a1a6b28b1dea5cbc72f9e45 WHIRLPOOL 8628452c69c1774e02b8069ee8db12b7b97bc45166dd4dbec3e8d3f532c97f15a24920f2f59ecb3b8d4addcbada33eb04c1f71222531a7377bcbfaf7d4f3d86b
diff --git a/app-editors/atom/atom-1.15.0.ebuild b/app-editors/atom/atom-1.15.0.ebuild
new file mode 100644
index 00000000000..d62dfb4083d
--- /dev/null
+++ b/app-editors/atom/atom-1.15.0.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 multiprocessing rpm
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.3.13
+ELECTRON_SLOT=1.3
+
+# All binary packages depend on this
+NAN_V=2.4.0
+
+# Keep dep versions in sync with atom/package.json
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+GIT_UTILS_V=4.1.2
+NODE_NSLOG_V=3.0.0
+NODE_ONIGURUMA_V=6.1.0
+NODE_PATHWATCHER_V=6.8.0
+NODE_RUNAS_V=3.1.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELL_CHECK_V=0.70.2
+
+# text-buffer dependencies
+SUPERSTRING_V=1.1.0
+
+# apm dependency
+NODE_KEYTAR_V=3.0.2
+
+# atom-keymap dependency
+KEYBOARD_LAYOUT_V=2.0.11
+
+# symbols-view dependency
+NODE_CTAGS_V=3.0.0
+
+# spell-check dependency
+NODE_SPELLCHECKER_V=3.2.3
+
+ASAR_V=0.12.1
+
+# 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-${MY_PV}.rpm
+ 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://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
+ https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
+ https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
+ https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
+ https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
+ https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
+ https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
+ https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
+ https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
+ https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
+ https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
+ https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
+"
+
+BINMODS="
+ cached-run-in-this-context
+ node-ctags
+ git-utils
+ keyboard-layout
+ node-nslog
+ node-oniguruma
+ node-pathwatcher
+ node-runas
+ node-keytar
+ scrollbar-style
+ node-spellchecker
+ superstring
+"
+
+RESTRICT="mirror"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ ${PYTHON_DEPS}
+ >=app-text/hunspell-1.3.3:=
+ >=dev-libs/libgit2-0.23:=[ssh]
+ >=gnome-base/libgnome-keyring-3.12:=
+ >=dev-libs/oniguruma-5.9.5:=
+ >=dev-util/ctags-5.8
+ >=dev-util/electron-1.3.5:${ELECTRON_SLOT}
+ x11-libs/libxkbfile"
+RDEPEND="
+ ${DEPEND}
+ !sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+get_install_suffix() {
+ local c=(${SLOT//\// })
+ local slot=${c[0]}
+ local suffix
+
+ if [[ "${slot}" == "0" ]]; then
+ suffix=""
+ else
+ suffix="-${slot}"
+ fi
+
+ echo -n "${suffix}"
+}
+
+get_install_dir() {
+ echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+get_electron_dir() {
+ echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+get_electron_nodedir() {
+ echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+enode_electron() {
+ "$(get_electron_dir)"/node $@
+}
+
+enodegyp_atom() {
+ local apmpath="/usr/share/atom/resources/app/apm"
+ local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+ PATH="$(get_electron_dir):${PATH}" \
+ enode_electron "${nodegyp}" \
+ --nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+easar() {
+ local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+ echo "asar" $@
+ enode_electron "${asar}" $@ || die
+}
+
+package_dir() {
+ local binmod="${1//-/_}"
+ local binmod_v="${binmod^^}_V"
+ echo -n ${1}-${!binmod_v}
+}
+
+_unpack_npm_package() {
+ local a="${1}" basename suffix
+
+ basename=${a%.*}
+ suffix=${basename##*.}
+ if [[ "${suffix}" == "tar" ]]; then
+ basename=${basename%.*}
+ fi
+
+ unpack ${a}
+ mv package "${basename}" || die
+}
+
+_have_patches_for() {
+ local _patches="${1}-*.patch" _find
+ _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+ test -n "$_find"
+}
+
+src_unpack() {
+ local a
+
+ for a in ${A} ; do
+ case ${a} in
+ *.rpm) srcrpm_unpack "${a}" ;;
+ *) unpack "${a}" ;;
+ esac
+ done
+
+ mkdir "${WORKDIR}/atom-${MY_PV}" || die
+ mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
+}
+
+src_prepare() {
+ local install_dir="$(get_install_dir)"
+ local suffix="$(get_install_suffix)"
+ local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
+
+ cd "${S}/usr/share/atom/resources/app" || die
+ eapply "${FILESDIR}/${PN}-python.patch"
+ eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
+
+ sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+ ./atom.sh \
+ || die
+
+ sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
+ ./atom.sh \
+ || die
+
+ sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
+ ./atom.sh \
+ || die
+
+ local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
+ sed -i -e \
+ "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
+ apm/bin/apm || die
+
+ sed -i -e \
+ "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+ apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
+ rm apm/bin/node || die
+
+ sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
+ "${S}/usr/share/applications/atom.desktop" || die
+
+ cd "${S}" || die
+
+ for binmod in ${BINMODS}; do
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ cd "${_s}" || die
+ if _have_patches_for "${binmod}"; then
+ for patch in "${FILESDIR}"/${binmod}-*.patch; do
+ eapply "${patch}"
+ done
+ fi
+ done
+
+ # Unbundle bundled libs from modules
+
+ _s="${WORKDIR}/$(package_dir git-utils)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "git;libgit2;git2" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir node-oniguruma)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "onig_scanner;oniguruma;onig" \
+ "${_s}/binding.gyp" || die
+
+ _s="${WORKDIR}/$(package_dir node-spellchecker)"
+ ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+ --inplace --unbundle "spellchecker;hunspell;hunspell" \
+ "${_s}/binding.gyp" || die
+
+ for binmod in ${BINMODS}; do
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ mkdir -p "${_s}/node_modules" || die
+ ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+ done
+
+ # Unpack app.asar
+ easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
+
+ cd "${S}" || die
+
+ eapply "${FILESDIR}/atom-1.13-apm-path.patch"
+ eapply "${FILESDIR}/atom-license-path.patch"
+ eapply "${FILESDIR}/atom-fix-app-restart.patch"
+ eapply "${FILESDIR}/atom-marker-layer.patch"
+
+ sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+ "${S}/build/app/src/config-schema.js" || die
+
+ eapply_user
+}
+
+src_configure() {
+ local binmod _s
+
+ for binmod in ${BINMODS}; do
+ einfo "Configuring ${binmod}..."
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ cd "${_s}" || die
+ enodegyp_atom configure
+ done
+}
+
+src_compile() {
+ local binmod _s x
+ local ctags_d="node_modules/symbols-view/vendor"
+ local jobs=$(makeopts_jobs) gypopts
+
+ gypopts="--verbose"
+
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+ gypopts+=" --jobs ${jobs}"
+ fi
+
+ mkdir -p "${S}/build/modules/" || die
+
+ for binmod in ${BINMODS}; do
+ einfo "Building ${binmod}..."
+ _s="${WORKDIR}/$(package_dir ${binmod})"
+ cd "${_s}" || die
+ enodegyp_atom ${gypopts} build
+ x=${binmod##node-}
+ mkdir -p "${S}/build/modules/${x}" || die
+ cp build/Release/*.node "${S}/build/modules/${x}" || die
+ done
+
+ # Put compiled binary modules in place
+ _fix_binmods "${S}/build" "app"
+ _fix_binmods "${S}/usr/share/atom/resources" "app"
+
+ # Remove non-Linux vendored ctags binaries
+ rm "${S}/build/app/${ctags_d}/ctags-darwin" \
+ "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
+
+ # Re-pack app.asar
+ # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+ cd "${S}/build" || die
+ x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
+ easar pack "${x}" "app" "app.asar"
+ cd "${S}" || die
+}
+
+_fix_binmods() {
+ local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
+ local cruft
+
+ (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+ | while IFS= read -r path; do
+ f=$(basename "${path}")
+ d=$(dirname "${path}")
+ relpath=${path#${_prefix}}
+ relpath=${relpath##/}
+ relpath=${relpath#W${_dir}}
+ modpath=$(dirname ${relpath})
+ modpath=${modpath%build/Release}
+ mod=$(basename ${modpath})
+
+ # must copy here as symlinks will cause the module loading to fail
+ cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
+ cruft=$(find "${d}" -name '*.a' -print)
+ if [[ -n "${cruft}" ]]; then
+ rm ${cruft} || die
+ fi
+ done
+}
+
+_fix_executables() {
+ local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
+
+ (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
+ | while IFS= read -r f; do
+ IFS= read -r shebang < "${f}"
+
+ if [[ ${shebang} == '#!'* ]]; then
+ fperms +x "${f#${ED}}"
+ if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
+ einfo "Fixing node shebang in ${f#${ED}}"
+ sed --follow-symlinks -i \
+ -e "1s:${shebang}$:${_node_sb}:" "${f}" || die
+ fi
+ fi
+ done || die
+}
+
+src_install() {
+ local install_dir="$(get_install_dir)"
+ local suffix="$(get_install_suffix)"
+ local ctags_d="node_modules/symbols-view/vendor"
+
+ cd "${S}" || die
+
+ # Replace vendored ctags with a symlink to system ctags
+ rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+ ln -s "/usr/bin/ctags" \
+ "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+
+ insinto "${install_dir}"
+
+ doins build/app.asar
+ doins -r build/app.asar.unpacked
+ doins -r usr/share/atom/resources/app
+
+ insinto /usr/share/applications/
+ newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
+
+ insinto /usr/share/icons/
+ doins -r usr/share/icons/hicolor
+
+ exeinto "${install_dir}"
+ newexe usr/share/atom/resources/app/atom.sh atom
+ insinto /usr/share/licenses/"${PN}${suffix}"
+ doins usr/share/atom/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"
+}
diff --git a/app-editors/atom/files/atom-marker-layer.patch b/app-editors/atom/files/atom-marker-layer.patch
new file mode 100644
index 00000000000..2d797aa293d
--- /dev/null
+++ b/app-editors/atom/files/atom-marker-layer.patch
@@ -0,0 +1,11 @@
+--- a/build/app/node_modules/text-buffer/lib/marker-layer.js
+--- b/build/app/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);
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2017-12-12 20:32 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2017-12-12 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 5401b6b6519b38cffa7a9319f1103c50101cd59f
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Tue Dec 12 20:26:32 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 20:31:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5401b6b6
app-editors/atom: drop old versions.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-editors/atom/Manifest | 33 --
app-editors/atom/atom-1.15.0-r1.ebuild | 405 ----------------
app-editors/atom/atom-1.16.0.ebuild | 405 ----------------
app-editors/atom/atom-1.18.0.ebuild | 411 ----------------
app-editors/atom/atom-1.20.1.ebuild | 514 --------------------
app-editors/atom/atom-1.21.0.ebuild | 522 ---------------------
app-editors/atom/files/atom-1.13-apm-path.patch | 16 -
app-editors/atom/files/atom-apm-path-r1.patch | 16 -
app-editors/atom/files/atom-fix-app-restart.patch | 12 -
app-editors/atom/files/atom-license-path.patch | 11 -
app-editors/atom/files/atom-marker-layer.patch | 11 -
.../atom/files/atom-unbundle-electron.patch | 45 --
12 files changed, 2401 deletions(-)
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index 9064ef1fb4a..6f88d803c19 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -1,54 +1,21 @@
-DIST asar-0.12.1.tar.gz 1016626 BLAKE2B f3e2bee6e844fffcc19150f96cf4b20b5f6bf398d9c4c89f0527ded20478ad100e9fd1eadb3685ad05853b07b0e084c8cdcf99bb0d646e7f7acdcd9e3e9ec3cf SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7
DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
-DIST atom-1.15.0.rpm 86561729 BLAKE2B 4b76613c955d0ad02d9bd13de1a969362b20bc7bdba6b912395c4a9de48d4130a427f6d0432411cc5acfd40d328e50c2461c847bc5c8b16dbf44147728491f9b SHA512 e8f5ceaae020f9fbf8cb1ffbef0f64b7b5d23a0be20d063591e3ba3b9fd33c771a028aca9aa0ecad254e250342d40106dac85bf6bdeff4de64da0b57fe6de3ea
-DIST atom-1.16.0.rpm 90249819 BLAKE2B a01866affda5bf206b1bec7966e35ca8889a4804f4972da853913602c779a5d6e3479cba24273a9e6e047cca403dab06fd19a07152c1e6b00783aa2df89eee29 SHA512 e3e9096caf6d5ca802ad47e434a6e8a51c0ab25b967747621e2ea4eb440d5401df3b7cd3d101d6d5a1f2f12fa77525e7e54e252438ff24ec9b651601bb7f4d97
-DIST atom-1.18.0.rpm 128551353 BLAKE2B 535016084340a347453e83120bde96b2100d5819f28c267caeb9dbe8f54f8caf455ccdeb3a20b7e5c8392170a8facf106e642efe5037e4c0d16c6a713cf73fd0 SHA512 c30df4b3c10e2e886c349a8c255ea6e9e308b38811f02b2517ba464959a873d159b5fa4fe89d68ed50500038b92219cb061d9dee0917b0b807e086cceec2803b
-DIST atom-1.20.1.tar.gz 9358859 BLAKE2B 5b20b29656ec70b4f885bf0cb2209903c3e344913acfb0802d25b3f6d0415c87849dd42a4d6515467c4a1e511e24e19487395f6f984161760077c8f4c34c7623 SHA512 a7f9edcfc84b81d768a92af5967a6889f85155c46a623b33e51999706e22f411ce570f42777fb3015174611ef19a956d8ed336ab1172612b27d75de8ef9c96fa
-DIST atom-1.21.0.tar.gz 9378180 BLAKE2B 3b2706d8b3691ffc2e55347ba415d5ff1a9cc085a6af92cd581f04d5288b4597fa1b83a0bf94b0e0c6cecca61d9be646065a5b3b27465890d63cbe173f47d81d SHA512 98afc286afc5ad46a28c3db7bfb7857c15a87711dae6b07046cd1aae5c7c2a30be847aec9eb779fdceaeb7e4f86f54ffd1262d6f0ba2d5a6c1b7d4ce5b8d2104
DIST atom-1.22.1.tar.gz 9541647 BLAKE2B 8801172da7b59dcf0974dc916e83633d52de8419b28db46578851d528dfce55b8dff1103e8e485a54203a7732e9288254d4d1b6ce1328d5e7340412e45fa14be SHA512 fb1a27c59ee6db8c659eb91fb397def3c05bd094b8a0614eb81a0ffabddcd61d480783f37af303773a9a9d15712630966ac162f3978e00ea2d8f8ef1ac78191a
DIST atom-1.23.0-beta1.tar.gz 9553918 BLAKE2B ed44c6fca17bad667da145e1bcea17ae85330f4bb0dadf886c7b9ab929e3f580cb074532b0cc60f96d75d4d2bb68fedd7c25c4569983d008a024575a6d9b21e2 SHA512 3bcbe9ab9090eeb26cc6f121349c2c6bc4a3bdd58c36b7a2452320dde851bb0e2e60ed8040f406ed560cfd1a3cc217f220d98755ae50b8b81f123fca8e33bd44
-DIST atom-bin-1.20.1.rpm 134506625 BLAKE2B ec25844e31f6d146a973698872d5141abab531e625312252bb2b5d2365a0daaf28e25e2cdc54c899582cb503b6e9b2705ca4d36ad7160ebc16d779d7ce7c6a61 SHA512 7bf8c4b092e0b45d56c5414d088633ae016b5564a7a97e1d706ad46743b6aad43a7268b7ade881680fa5f005eed0f46ba1523909a09cf3ec0aa51ce2335b8d92
-DIST atom-bin-1.21.0.rpm 131039632 BLAKE2B e155afd174896c7fee40f8ab6b3c25b49d1b1e023f63aaf3da4e0ea2baa68ff2dac65e9d6f9349f9ea1895675709544916ec04a947411de6b2a514f1507ec400 SHA512 8425b8d8741632e9fcc28127c8f2cbe5901c8a4a3b2a8a1cb5d4b1410374a841241e90939952db749334c829ac541925b3785a787c60adf32cfdfa5abc2e3b8a
DIST atom-bin-1.22.1.rpm 129683452 BLAKE2B 7f408fced77dd1a965521ca7d905b568c2e5c9db19f5948a7c4c711372d53dfcc9b0988d5ec7c1ee748b1a1a3edc7c8e1e7cb919a223069263004e8683694404 SHA512 bd8305a36a8f6755907de576fe02bba64fcff08f804cf22f784323f58440d7c5b251d8da34c74a679c2d7f66b5afdf11c897337a314e829e2b5f06573ef0bddc
DIST atom-bin-1.23.0-beta1.rpm 129888621 BLAKE2B f32ee16773fcf4cc956fd21adb6c3a03e2ba07f2c7ce4518e2f2721b1cf6051bcee01934d657ade38050b8d4c2049d693bf53ccb834301e71078a81d6f2e87d7 SHA512 44c19db7452cbbf704950e2ce3347fa52525f44563744860061fd07880a7f7eaa958de8c954b634df7055c26953a99321c1aeb332cbd290d86369d0e3a31ccf9
-DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 BLAKE2B 38a52632b94bc803a0ba2a6cd05a58443e2ecc5e780be5b51f500e4b6c06f03ec3dbb01bf2beb02a63f55ec6db21c61642a821259f090677137502c73b866fe4 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d
-DIST atom-git-utils-4.1.2.tar.gz 36492 BLAKE2B b8cd425395a77e3f82f6d0505d32737f4e4630dc8f2f5ed6f025500ba377bfb0b90f2280d5b753263e98be2e978865e5bf470933535988255f6cd6ab5e569b36 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a
-DIST atom-git-utils-5.0.0.tar.gz 36545 BLAKE2B 537dc044d1f471af5ad5d9befcc7a6c5e4e2a68c84f97eb1fd76a3d608ccc2b856cae6b939964d2c67c367b25e076f3ccf1712f8dc073b5196409fda11e99287 SHA512 42fd7589ca56049b1ad5cf7f2df7e295fc8575f4eee8a562fa103541157bd487c1748e3d6c536237b260dcbb4b530619dfcc121ba84b6d2fbf6d684dc959f819
-DIST atom-keyboard-layout-2.0.11.tar.gz 19294 BLAKE2B 9f3749b9c46383cfbebed98416ea1901219c857c25225951cdc0e55c4bc60c9fe3d450d3240cc72857e75593c92749f25ce5f5ba975113c302c263714115d29f SHA512 e7cbf3e8686ce6a86549d913523db75af623d4c5a18104f911b7f3931c273b87b4695b9b85afaea9a5cb440201b34d9e7445786c9328b87a5b58176cf2dbb877
-DIST atom-keyboard-layout-2.0.12.tar.gz 19605 BLAKE2B f0c4c966e0469cb845c524d65318dda572f2c3461e6416fb9bd783a0e67e1dd0e242909cf004edeae6f00426dc0a40c0ebe7436a0c2529d382a10e0f23fe12f4 SHA512 ad6c3f9289ec015406fb85fde5e6dd5111b0fad70ec311df2d26dec257bfff674e65ff0827025b1394f3773ddf6957deb67fa5dba647d3bc5485b928b2cf966b
-DIST atom-node-ctags-3.0.0.tar.gz 15062 BLAKE2B c27c883dc98da78e0eb496bebb2848276f9f0ecfc41974cb22ce1bada648f1ee4e304322650fc02a59d98d8e649449906c44666a0595dfca171fac3e2a2c64fa SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87
-DIST atom-node-keytar-3.0.2.tar.gz 5718 BLAKE2B be80724f87a8f07b57cd44b5cd77a8dd383b38bb6676c7bb23cf4c469c4f5df919b474d7aa79d15305529f79c777106155857a2bc4014a7f1557c59725bebbf1 SHA512 f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a
-DIST atom-node-nslog-3.0.0.tar.gz 2774 BLAKE2B ddf49f9f27986e70c9f5a446cb8530ce3c447aca4c2603a1be67b24e82c8628b4181711539504d0af829082e856c6d8b644afa13e513a949c70d706874901459 SHA512 1891632486acfa014eec79f70b14d56d967670310e46dedccfc9dfa505581365765f6bd42ad538b29e74d7c7de83d045b4199dd634fc588734a1ee086dcddb0a
-DIST atom-node-oniguruma-6.1.0.tar.gz 661394 BLAKE2B 60ac2a1c5ca0584399afb6dafcb83fcb1fc271fe4746c111b1fe29a69e9e0956a0edaea54259e25ea597b8d10c6ad94e9e738fe06adbf5a23eedd35a271c310f SHA512 6443881353b61ad59d29cab6628f07d488e54df7b5a04ddffe4de11329e928b2a9cfc7582e22e0a90b6a3c6bf0e37873d8a5e34036cee5f7187ed4ae11fd6507
-DIST atom-node-oniguruma-6.2.1.tar.gz 662040 BLAKE2B 0372a0238978babb72b1f874dc351a313b953cb12869cec1dc2b0cc9c5dca7768518d907e2d4b616efb9226d7cf41c8ee2ac8ece6813d2a502eda157393b54a1 SHA512 5a7d601f58957eb2cca879bf1dccd32ba6be3d6728ceb7926ee9944e23d981d5a8e70a3cbc1ecb7a99f130760d0c8513539a00bbae731b49ab9cef18aec2e6cb
-DIST atom-node-pathwatcher-6.8.0.tar.gz 24627 BLAKE2B 5e1fab25b54e3ebfcadd9a938b5066fcec7089401698d0df35b5e3346cec4be00a593bf5c1f8be380b7a1216b0b2740c0bb047823e6c845db9cbf6951521ac8a SHA512 ccb4d1270ba91cf31c5725e985b7bf224a8878fbeeb5fd2e78e22de7e25d382fc5b1c9e05ce1f2c23968d4ca3018e1db611c9485dbbd6eca2169228fb0a136e9
-DIST atom-node-pathwatcher-6.9.0.tar.gz 24821 BLAKE2B bedd1bb454f8ecc040acf03aadc4703eb9f3a9291ed734d85e060f9bdfb7b142d14715cead34ab6f2230a55c40237ab708067206ff9c7894c94168905a61af7e SHA512 fc2842a6ee75981590b445c4f51ce3f44baabee879377397d5bd4092964c21e726be44b94ffd751bd496d66963fb71ff59fbdf9f9fc9c3f7cd83af1fd5d65fb6
-DIST atom-node-pathwatcher-7.0.0.tar.gz 24822 BLAKE2B 6d8d6bbff6c28d283eac8ef8d7d6a27a4373650ad579589dcf2065933d9690c8fb818959570e5dc9cef3437fcdd5a9ff3978e6c21e7890b3fc03b49ee825770c SHA512 c6d72809b7f07d31f8d1624d6aa7565d8db6f4844febbedee9cca16cfb258bf3f55eefbd9247a0ab3f732d5e7433616e25d9adf5692f382ce3129b0963228bde
-DIST atom-node-runas-3.1.1.tar.gz 6628 BLAKE2B 00f2c7aeb5c60c238437e818a7eefa5f8ae382e67e418cb9a33595326b04fa6de8fa1278205fbd619877789d8743d2c366c0c5fdb9b1db1dc2983a75269c1a4e SHA512 bada6e99ceb833c8c6e74f4b3116c49f21b54b922c1a27668312552779b9e5ccebf380b41c781d49c1c0dd0fdff6de8b71a0dcaf1f992892593e85f4572238df
-DIST atom-node-spellchecker-3.2.3.tar.gz 481966 BLAKE2B f5197f47ee60cb88e0fb2a2fde949e2c45e177ed966d723f04ca26ac38e1f171e8fad74d2451ed83da02e0a9f06dfe819196d3743acaeb38717a0c2463874327 SHA512 b0209fdfcbee53d289443e1c203a720888a82fa59648b4038c036c6afe68a6b04624e23267e69c36f23c185160d6ab84b1e4020047fbe6d94354e99d717a60b9
-DIST atom-nsfw-1.0.15.tar.gz 45222 BLAKE2B ac8fcebf840afa1f3357a34d53a7289dc37ec0d34b8f16fec2a5228fc0227210a957d31dfed8c3862bee0def1e76dbc06f04acae1827c874121cf9390779d8a3 SHA512 dc2337caf6f82f0cd205af4bf92bf7d28b8eae091f8bbfb41f4ce6a4fe20d8ea4c793d1c51684a34bee2d264c420904db73992dad78eb6d6e584909c28a17746
-DIST atom-scrollbar-style-3.2.0.tar.gz 4609 BLAKE2B ae931b9a95b5bfac619e5737336671e41c782279e2db6c7c5f3cd4df6d227a28b0fcb04e4b5e1372f84176da7be183aff7c4b655e2903935dfad889c0133e682 SHA512 fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc
-DIST atom-superstring-1.1.0.tar.gz 259961 BLAKE2B 7474bea436e8567ca4412a7e6e8dc7a37d35931103cce2fc301c7f7beb6c606011c936cef7db5532a26fc919a97a794af6e1599abd0fb407d6d4a99a1d606efd SHA512 880c97d696036065aeb4320dc71c88b49b22b04e6582c75310131e61d8067fdf3d26c901d7b22a2bfd2a2a2056f350ba9485b7e55410cdee9ef29f5a75a8af59
-DIST atom-superstring-1.2.1.tar.gz 264386 BLAKE2B ad2b19ab97bbf52244f08aca74a3b429829a40492db0761a4cc21969c060c042d018aebb4013e46f399a4474fb8a8c1170b16323a0f589dc612d2d2a9d4c4d12 SHA512 8641f44defb9248c4fd91c4c7d5117322f83613386693ab51c3e77c9ad95ae383f69e662b6a870196504d7d99cd23527a822e989babdd95f42b6ddf517df7afc
DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff
DIST atomdep-cached-run-in-this-context-0.4.1.tar.gz 2388 BLAKE2B 9cf59f69c3433a9982c1dedf58c03eef5e1ccf1275f92ed192a2de601f38caceea5926e9b3a8571e2124b83e49c99a14f262db39a44732e1ff6550d6cd46d500 SHA512 942db40139b0beda616a25628772e515ce92ceca3e9a5288b10920e68c35149c52677a975e6e30f278ec64f06ae341fa1fa00702b339b2fb8f7af1cf9685efe5
DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc
DIST atomdep-fs-admin-0.1.6.tar.gz 5539 BLAKE2B 9ee1857152cca343673a270c1044ad33a3ddbfb5b8389f2e0449e99348d0bdd4aaaa7e4c07bfb8871ae840f1a69cd90074a769f80fa3cc7f914050bc6f45b29c SHA512 2474523d5441ad882000633a929bcdbc5771b859a80f16a69c15504ff240a59b558e2edb1ca6e12ce91ad58da935243f3950a16e664529c59da70b9912903ae7
-DIST atomdep-git-utils-5.0.0.tar.gz 4147470 BLAKE2B bb35abe46aa96791f9b79316edd64a31fd8d0bf7c34bdc20e4a5b3bdaa2e4f2a9e833d28a17368c3f23935e7321339248968669ad9b1599a99c0efbeb558099f SHA512 ffb2ecf8eb89f7e4cbf51e5953d4e547c4ccf21985a6177cffd5f958433ac7c98d36070ffea82dae65b02bed53c49ba94fc12fb4823e1ef985a350726fe46424
DIST atomdep-git-utils-5.1.0.tar.gz 4141959 BLAKE2B 7504a4ba57b093da659ed0ba7319863636d7f9f1e9a6a4bbd4b6c6fcf9922c9ca32398b44550e4a94d519471ca5cf249976426583f998186398c147c6cce5636 SHA512 1f9c38646b25a526c0399d538e58864c552d65802402df82f8303a936374121db40f61195ea3254e56e31dd9d25b847b325264911f62d6beddfc24931a9367bf
DIST atomdep-keyboard-layout-2.0.13.tar.gz 17881 BLAKE2B e86a399be545a43768a53d5d9279dae1bc4d87fd99af87a10861f2e3367d6786e3631f8dc77671b08b06e30290f2c97833402e3732a010ae31c7c1c02d9d6afd SHA512 5b155cddb0484edb47a334b21183eccabe6b376290b97b4469732541f4231337b526b90bc37d321ff6dc367d481b1e3c6feb5d39dc9ba67abef8914b53615a66
-DIST atomdep-keytar-4.0.4.tar.gz 6550 BLAKE2B 3195b13f0a611acef28447fcdc46647110f12acfb1a6a47076cf5562724886d2b48307116ef6965bc68b71e58c561771b51bc6f3900488347ef69a07aa1038aa SHA512 78544e3646ce0f772a9adae055e137034d4b0e83bb8b95647a4efe239bf4bdf863f05317f4b37b0d2ac89e6a6e0107abd0022ccd7abb4310a39fa1c07982b4d4
DIST atomdep-keytar-4.0.5.tar.gz 15594 BLAKE2B 3ced4a3eca1036ce21435473d013bc98537959d8488425581089c230b3e6ce276264754c607c29adf9d9d6272bde10066b23c7de502030c35ff2a5d907b17a4b SHA512 bd4dcd75517c057bacfed57490b9c1614f52169cc786a167eb1b391bf83845b23cdc53e20c72e7902140a5da7f865ad8bdc2d456063ebc1b86f6cb9fa1178929
DIST atomdep-nsfw-1.0.16.tar.gz 43214 BLAKE2B 261539bebfe494aad0b372f1837a87c7c2a410bb591df523ea25bd5acd008f7eb0e8460a218fd4ee70d98bc26dd166472e9ea0aea265971cf2e904da913dda88 SHA512 0060d7fb5016454aaaf7df438d973b9a389a6e5f7a166c5d402cf8ef8bcda724501c3bfbd44e37e9e6c38d5f1decaeb48c571aad9145dec38ba0c94073b9702a
DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1
DIST atomdep-oniguruma-6.2.1.tar.gz 586350 BLAKE2B 65574ef004c98cced7a9f5917845015ccd84b2383a85d889365da5c73313114454458b441bf6588eaee2a17150d674b7754ccc0bbb2d68ae3d98f7d5ca63530e SHA512 faa46dc4c1b8d7e75ab54512de9a823c5b958a7ccb43333375b33e16de47a464ea2a9ba9996596a8359d423a3e8c9d63cc92a5162b3f9d44b4485304073b41f1
DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999
-DIST atomdep-runas-3.1.1.tar.gz 6197 BLAKE2B 4625b085aa280a120ab66d295c8ca90c59151c65c3f3798b462beeb9f4bd9821022c4fd3a85c49828e3dbca06df730f1f49605f9f25f1cbc6ad715511e00beec SHA512 29b01d8a1bd05f7f0ad7cf4472f13d12ff27524d44fc0c2ffcf87c187633ccdd5a2d9ae6af2a771eb8e2432b6a957451ea6a6c68d15aa861c4a29affac711d79
DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18
-DIST atomdep-spellchecker-3.4.2.tar.gz 476093 BLAKE2B 17ea32be639ed3ea03593e8c29e0970068f36a0545edd9c962443b4d6d4f6d8954c09d93c54ea348a396d10b7bef743c7f25a5cbab7a449c9bb57b9a38886528 SHA512 8ed6fa4251cd79de6e77004ea91a438080df7109ebbe2c92934366c34433388bc30c8b1ebc97a47aa2a9f3eb28ac5ba2ccf3a0de9d6f59b2d3125ff7ff2c06a4
DIST atomdep-spellchecker-3.4.3.tar.gz 480739 BLAKE2B 5549ca23c50efc4573cb990d8cd79bc564dd4890e8509915e89173c8cb49ed0f9d17ff22c73f61e00487f9a09de3e6b0de542a755fa3eeeb2cc8bd766016ec62 SHA512 cef2aa6adf95772f0d38760adb9a805ad540bfb422647486ccd63db7afcca508eb821b6099d9913912dd1b0881f3b5ccc62d203f2ce6bc47859f36a76c781376
DIST atomdep-spellchecker-3.4.4.tar.gz 481892 BLAKE2B 3bae26ffffbaffdbac6f082c6f33ea4f5127583663e1df3ed8d98cebed2ce11ea0d9965615e369383695df6ad55aa996e8968e6616415d359ffae640a679f47b SHA512 974b3ce9866ce7e3f30137856ea0f4b1348c105edb833a94620c6b53cfa7052c37575f6dcd160a322fa10c61babfc32c916786d9d44ad10efdb2ab3578620ac1
DIST atomdep-superstring-2.2.13.tar.gz 793833 BLAKE2B b5e8003c25ec38da1eae92022e972467b33ab45ea9db918a0acae6af10abb8a48609d76318558d327d013f65ea01888450ceb991dbfed39530ddd7076f1cf995 SHA512 9e2ce1ec9dffc0ccd700ed4b2f069dfc6cf258ae842dfe7a5242db99c0899ad77a692d2697695c3ca6d42cf4b9c590e9f29f469399d519029052b7ed806b39f8
-DIST atomdep-superstring-2.2.3.tar.gz 785373 BLAKE2B 01ecaf112b76dfe4957a8ded5af23d1dcdecf5ed92bda20ee034c1b1a0516d7f9157d7c8ad21bc005e14a00115b81c8dca18296cc01dc3146d58adf7c96e9ec3 SHA512 edb71f4cc54436f563b6491f71e8c6c78aa711d1da821619031062e5e85fd60d66f0bcb6a70184b1fd55f31724d63ed9ba9c872d6d80387710262e404541a355
-DIST nodejs-nan-2.4.0.tar.gz 157071 BLAKE2B 081881da40f1afa8dfe7edb9db7cad0aa96a8057f2b13a21c7a9eabc514e10da5837d4f7ea5144b78f958f1f14f38a944a475b23d994f94def72236a89fec80b SHA512 e6f3ab3f67c72b3cc9e6e6b9b5de0f73134ef504dedae5e68376198858a6796f00c35869438e0480f28006dd8f6be13dca3bcc436a1a6b28b1dea5cbc72f9e45
DIST nodejs-nan-2.6.2.tar.gz 161949 BLAKE2B f74e8d56e67ae03e60e0be7752ed9527bd8499c01f7df8899f3eb6735b1286633753e8bf595781b6d3d1446df20483fc0377bd745be10c6bae0ad66426751b79 SHA512 d1b5ed12e90accfa117cb73b9432897631ed2dd6045f93fa8b53237a13cec0ec467b14c035e9e4d4a5c6588949c1c80b0eef48a46d5c9c0a1f81ef400da031c3
diff --git a/app-editors/atom/atom-1.15.0-r1.ebuild b/app-editors/atom/atom-1.15.0-r1.ebuild
deleted file mode 100644
index b564d861165..00000000000
--- a/app-editors/atom/atom-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,405 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.3.13
-ELECTRON_SLOT=1.3
-
-# All binary packages depend on this
-NAN_V=2.4.0
-
-# Keep dep versions in sync with atom/package.json
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-GIT_UTILS_V=4.1.2
-NODE_NSLOG_V=3.0.0
-NODE_ONIGURUMA_V=6.1.0
-NODE_PATHWATCHER_V=6.8.0
-NODE_RUNAS_V=3.1.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELL_CHECK_V=0.70.2
-
-# text-buffer dependencies
-SUPERSTRING_V=1.1.0
-
-# apm dependency
-NODE_KEYTAR_V=3.0.2
-
-# atom-keymap dependency
-KEYBOARD_LAYOUT_V=2.0.11
-
-# symbols-view dependency
-NODE_CTAGS_V=3.0.0
-
-# spell-check dependency
-NODE_SPELLCHECKER_V=3.2.3
-
-ASAR_V=0.12.1
-
-# 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-${MY_PV}.rpm
- 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://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
- https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
- https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
- https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
- https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
- https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
- https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
- https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
- https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
- https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
- https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
- https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
-"
-
-BINMODS="
- cached-run-in-this-context
- node-ctags
- git-utils
- keyboard-layout
- node-nslog
- node-oniguruma
- node-pathwatcher
- node-runas
- node-keytar
- scrollbar-style
- node-spellchecker
- superstring
-"
-
-RESTRICT="mirror"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=app-text/hunspell-1.3.3:=
- >=dev-libs/libgit2-0.23:=[ssh]
- >=gnome-base/libgnome-keyring-3.12:=
- >=dev-libs/oniguruma-5.9.5:=
- >=dev-util/ctags-5.8
- >=dev-util/electron-1.3.5:${ELECTRON_SLOT}
- x11-libs/libxkbfile"
-RDEPEND="
- ${DEPEND}
- !sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-get_install_dir() {
- echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-get_electron_dir() {
- echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-get_electron_nodedir() {
- echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-enode_electron() {
- "$(get_electron_dir)"/node $@
-}
-
-enodegyp_atom() {
- local apmpath="/usr/share/atom/resources/app/apm"
- local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
- PATH="$(get_electron_dir):${PATH}" \
- enode_electron "${nodegyp}" \
- --nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-easar() {
- local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
- echo "asar" $@
- enode_electron "${asar}" $@ || die
-}
-
-package_dir() {
- local binmod="${1//-/_}"
- local binmod_v="${binmod^^}_V"
- echo -n ${1}-${!binmod_v}
-}
-
-_unpack_npm_package() {
- local a="${1}" basename suffix
-
- basename=${a%.*}
- suffix=${basename##*.}
- if [[ "${suffix}" == "tar" ]]; then
- basename=${basename%.*}
- fi
-
- unpack ${a}
- mv package "${basename}" || die
-}
-
-_have_patches_for() {
- local _patches="${1}-*.patch" _find
- _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
- test -n "$_find"
-}
-
-src_unpack() {
- local a
-
- for a in ${A} ; do
- case ${a} in
- *.rpm) srcrpm_unpack "${a}" ;;
- *) unpack "${a}" ;;
- esac
- done
-
- mkdir "${WORKDIR}/atom-${MY_PV}" || die
- mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
-}
-
-src_prepare() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
-
- cd "${S}/usr/share/atom/resources/app" || die
- eapply "${FILESDIR}/${PN}-python.patch"
- eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
-
- sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
- ./atom.sh \
- || die
-
- local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
- sed -i -e \
- "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
- apm/bin/apm || die
-
- sed -i -e \
- "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
- apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
- rm apm/bin/node || die
-
- sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
- "${S}/usr/share/applications/atom.desktop" || die
-
- cd "${S}" || die
-
- for binmod in ${BINMODS}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- if _have_patches_for "${binmod}"; then
- for patch in "${FILESDIR}"/${binmod}-*.patch; do
- eapply "${patch}"
- done
- fi
- done
-
- # Unbundle bundled libs from modules
-
- _s="${WORKDIR}/$(package_dir git-utils)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "git;libgit2;git2" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir node-oniguruma)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "onig_scanner;oniguruma;onig" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir node-spellchecker)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "spellchecker;hunspell;hunspell" \
- "${_s}/binding.gyp" || die
-
- for binmod in ${BINMODS}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- mkdir -p "${_s}/node_modules" || die
- ln -s "${nan_s}" "${_s}/node_modules/nan" || die
- done
-
- # Unpack app.asar
- easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
-
- cd "${S}" || die
-
- eapply "${FILESDIR}/atom-1.13-apm-path.patch"
- eapply "${FILESDIR}/atom-license-path.patch"
- eapply "${FILESDIR}/atom-fix-app-restart.patch"
- eapply "${FILESDIR}/atom-marker-layer.patch"
-
- sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
- "${S}/build/app/src/config-schema.js" || die
-
- eapply_user
-}
-
-src_configure() {
- local binmod _s
-
- for binmod in ${BINMODS}; do
- einfo "Configuring ${binmod}..."
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- enodegyp_atom configure
- done
-}
-
-src_compile() {
- local binmod _s x
- local ctags_d="node_modules/symbols-view/vendor"
- local jobs=$(makeopts_jobs) gypopts
-
- gypopts="--verbose"
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- gypopts+=" --jobs ${jobs}"
- fi
-
- mkdir -p "${S}/build/modules/" || die
-
- for binmod in ${BINMODS}; do
- einfo "Building ${binmod}..."
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- enodegyp_atom ${gypopts} build
- x=${binmod##node-}
- mkdir -p "${S}/build/modules/${x}" || die
- cp build/Release/*.node "${S}/build/modules/${x}" || die
- done
-
- # Put compiled binary modules in place
- _fix_binmods "${S}/build" "app"
- _fix_binmods "${S}/usr/share/atom/resources" "app"
-
- # Remove non-Linux vendored ctags binaries
- rm "${S}/build/app/${ctags_d}/ctags-darwin" \
- "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
-
- # Re-pack app.asar
- # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
- cd "${S}/build" || die
- x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
- easar pack "${x}" "app" "app.asar"
- cd "${S}" || die
-}
-
-_fix_binmods() {
- local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
- local cruft
-
- (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
- | while IFS= read -r path; do
- f=$(basename "${path}")
- d=$(dirname "${path}")
- relpath=${path#${_prefix}}
- relpath=${relpath##/}
- relpath=${relpath#W${_dir}}
- modpath=$(dirname ${relpath})
- modpath=${modpath%build/Release}
- mod=$(basename ${modpath})
-
- # must copy here as symlinks will cause the module loading to fail
- cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
- cruft=$(find "${d}" -name '*.a' -print)
- if [[ -n "${cruft}" ]]; then
- rm ${cruft} || die
- fi
- done
-}
-
-_fix_executables() {
- local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
-
- (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
- | while IFS= read -r f; do
- IFS= read -r shebang < "${f}"
-
- if [[ ${shebang} == '#!'* ]]; then
- fperms +x "${f#${ED}}"
- if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
- einfo "Fixing node shebang in ${f#${ED}}"
- sed --follow-symlinks -i \
- -e "1s:${shebang}$:${_node_sb}:" "${f}" || die
- fi
- fi
- done || die
-}
-
-src_install() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local ctags_d="node_modules/symbols-view/vendor"
-
- cd "${S}" || die
-
- # Replace vendored ctags with a symlink to system ctags
- rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
- ln -s "/usr/bin/ctags" \
- "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-
- insinto "${install_dir}"
-
- doins build/app.asar
- doins -r build/app.asar.unpacked
- doins -r usr/share/atom/resources/app
-
- insinto /usr/share/applications/
- newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
-
- insinto /usr/share/icons/
- doins -r usr/share/icons/hicolor
-
- exeinto "${install_dir}"
- newexe usr/share/atom/resources/app/atom.sh atom
- insinto /usr/share/licenses/"${PN}${suffix}"
- doins usr/share/atom/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"
-}
diff --git a/app-editors/atom/atom-1.16.0.ebuild b/app-editors/atom/atom-1.16.0.ebuild
deleted file mode 100644
index 1af228834d8..00000000000
--- a/app-editors/atom/atom-1.16.0.ebuild
+++ /dev/null
@@ -1,405 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.3.13
-ELECTRON_SLOT=1.3
-
-# All binary packages depend on this
-NAN_V=2.4.0
-
-# Keep dep versions in sync with atom/package.json
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-GIT_UTILS_V=4.1.2
-NODE_NSLOG_V=3.0.0
-NODE_ONIGURUMA_V=6.1.0
-NODE_PATHWATCHER_V=6.9.0
-NODE_RUNAS_V=3.1.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELL_CHECK_V=0.71.3
-
-# text-buffer dependencies
-SUPERSTRING_V=1.1.0
-
-# apm dependency
-NODE_KEYTAR_V=3.0.2
-
-# atom-keymap dependency
-KEYBOARD_LAYOUT_V=2.0.11
-
-# symbols-view dependency
-NODE_CTAGS_V=3.0.0
-
-# spell-check dependency
-NODE_SPELLCHECKER_V=3.2.3
-
-ASAR_V=0.12.1
-
-# 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-${MY_PV}.rpm
- 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://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
- https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
- https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
- https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
- https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
- https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
- https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
- https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
- https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
- https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
- https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
- https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
-"
-
-BINMODS="
- cached-run-in-this-context
- node-ctags
- git-utils
- keyboard-layout
- node-nslog
- node-oniguruma
- node-pathwatcher
- node-runas
- node-keytar
- scrollbar-style
- node-spellchecker
- superstring
-"
-
-RESTRICT="mirror"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=app-text/hunspell-1.3.3:=
- >=dev-libs/libgit2-0.23:=[ssh]
- >=gnome-base/libgnome-keyring-3.12:=
- >=dev-libs/oniguruma-5.9.5:=
- >=dev-util/ctags-5.8
- >=dev-util/electron-1.3.5:${ELECTRON_SLOT}
- x11-libs/libxkbfile"
-RDEPEND="
- ${DEPEND}
- !sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-get_install_dir() {
- echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-get_electron_dir() {
- echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-get_electron_nodedir() {
- echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-enode_electron() {
- "$(get_electron_dir)"/node $@
-}
-
-enodegyp_atom() {
- local apmpath="/usr/share/atom/resources/app/apm"
- local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
- PATH="$(get_electron_dir):${PATH}" \
- enode_electron "${nodegyp}" \
- --nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-easar() {
- local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
- echo "asar" $@
- enode_electron "${asar}" $@ || die
-}
-
-package_dir() {
- local binmod="${1//-/_}"
- local binmod_v="${binmod^^}_V"
- echo -n ${1}-${!binmod_v}
-}
-
-_unpack_npm_package() {
- local a="${1}" basename suffix
-
- basename=${a%.*}
- suffix=${basename##*.}
- if [[ "${suffix}" == "tar" ]]; then
- basename=${basename%.*}
- fi
-
- unpack ${a}
- mv package "${basename}" || die
-}
-
-_have_patches_for() {
- local _patches="${1}-*.patch" _find
- _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
- test -n "$_find"
-}
-
-src_unpack() {
- local a
-
- for a in ${A} ; do
- case ${a} in
- *.rpm) srcrpm_unpack "${a}" ;;
- *) unpack "${a}" ;;
- esac
- done
-
- mkdir "${WORKDIR}/atom-${MY_PV}" || die
- mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
-}
-
-src_prepare() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
-
- cd "${S}/usr/share/atom/resources/app" || die
- eapply "${FILESDIR}/${PN}-python.patch"
- eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
-
- sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
- ./atom.sh \
- || die
-
- local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
- sed -i -e \
- "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
- apm/bin/apm || die
-
- sed -i -e \
- "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
- apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
- rm apm/bin/node || die
-
- sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
- "${S}/usr/share/applications/atom.desktop" || die
-
- cd "${S}" || die
-
- for binmod in ${BINMODS}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- if _have_patches_for "${binmod}"; then
- for patch in "${FILESDIR}"/${binmod}-*.patch; do
- eapply "${patch}"
- done
- fi
- done
-
- # Unbundle bundled libs from modules
-
- _s="${WORKDIR}/$(package_dir git-utils)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "git;libgit2;git2" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir node-oniguruma)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "onig_scanner;oniguruma;onig" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir node-spellchecker)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "spellchecker;hunspell;hunspell" \
- "${_s}/binding.gyp" || die
-
- for binmod in ${BINMODS}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- mkdir -p "${_s}/node_modules" || die
- ln -s "${nan_s}" "${_s}/node_modules/nan" || die
- done
-
- # Unpack app.asar
- easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
-
- cd "${S}" || die
-
- eapply "${FILESDIR}/atom-1.13-apm-path.patch"
- eapply "${FILESDIR}/atom-license-path.patch"
- eapply "${FILESDIR}/atom-fix-app-restart.patch"
- eapply "${FILESDIR}/atom-marker-layer.patch"
-
- sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
- "${S}/build/app/src/config-schema.js" || die
-
- eapply_user
-}
-
-src_configure() {
- local binmod _s
-
- for binmod in ${BINMODS}; do
- einfo "Configuring ${binmod}..."
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- enodegyp_atom configure
- done
-}
-
-src_compile() {
- local binmod _s x
- local ctags_d="node_modules/symbols-view/vendor"
- local jobs=$(makeopts_jobs) gypopts
-
- gypopts="--verbose"
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- gypopts+=" --jobs ${jobs}"
- fi
-
- mkdir -p "${S}/build/modules/" || die
-
- for binmod in ${BINMODS}; do
- einfo "Building ${binmod}..."
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- enodegyp_atom ${gypopts} build
- x=${binmod##node-}
- mkdir -p "${S}/build/modules/${x}" || die
- cp build/Release/*.node "${S}/build/modules/${x}" || die
- done
-
- # Put compiled binary modules in place
- _fix_binmods "${S}/build" "app"
- _fix_binmods "${S}/usr/share/atom/resources" "app"
-
- # Remove non-Linux vendored ctags binaries
- rm "${S}/build/app/${ctags_d}/ctags-darwin" \
- "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
-
- # Re-pack app.asar
- # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
- cd "${S}/build" || die
- x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
- easar pack "${x}" "app" "app.asar"
- cd "${S}" || die
-}
-
-_fix_binmods() {
- local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
- local cruft
-
- (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
- | while IFS= read -r path; do
- f=$(basename "${path}")
- d=$(dirname "${path}")
- relpath=${path#${_prefix}}
- relpath=${relpath##/}
- relpath=${relpath#W${_dir}}
- modpath=$(dirname ${relpath})
- modpath=${modpath%build/Release}
- mod=$(basename ${modpath})
-
- # must copy here as symlinks will cause the module loading to fail
- cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
- cruft=$(find "${d}" -name '*.a' -print)
- if [[ -n "${cruft}" ]]; then
- rm ${cruft} || die
- fi
- done
-}
-
-_fix_executables() {
- local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
-
- (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
- | while IFS= read -r f; do
- IFS= read -r shebang < "${f}"
-
- if [[ ${shebang} == '#!'* ]]; then
- fperms +x "${f#${ED}}"
- if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
- einfo "Fixing node shebang in ${f#${ED}}"
- sed --follow-symlinks -i \
- -e "1s:${shebang}$:${_node_sb}:" "${f}" || die
- fi
- fi
- done || die
-}
-
-src_install() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local ctags_d="node_modules/symbols-view/vendor"
-
- cd "${S}" || die
-
- # Replace vendored ctags with a symlink to system ctags
- rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
- ln -s "/usr/bin/ctags" \
- "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-
- insinto "${install_dir}"
-
- doins build/app.asar
- doins -r build/app.asar.unpacked
- doins -r usr/share/atom/resources/app
-
- insinto /usr/share/applications/
- newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
-
- insinto /usr/share/icons/
- doins -r usr/share/icons/hicolor
-
- exeinto "${install_dir}"
- newexe usr/share/atom/resources/app/atom.sh atom
- insinto /usr/share/licenses/"${PN}${suffix}"
- doins usr/share/atom/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"
-}
diff --git a/app-editors/atom/atom-1.18.0.ebuild b/app-editors/atom/atom-1.18.0.ebuild
deleted file mode 100644
index a5bf085f0cf..00000000000
--- a/app-editors/atom/atom-1.18.0.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.3.13
-ELECTRON_SLOT=1.3
-
-# All binary packages depend on this
-NAN_V=2.4.0
-
-# Keep dep versions in sync with atom/package.json
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-GIT_UTILS_V=5.0.0
-NODE_NSLOG_V=3.0.0
-NODE_ONIGURUMA_V=6.2.1
-NODE_PATHWATCHER_V=7.0.0
-NODE_RUNAS_V=3.1.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELL_CHECK_V=0.71.4
-
-# text-buffer dependencies
-SUPERSTRING_V=1.2.1
-
-# apm dependency
-NODE_KEYTAR_V=3.0.2
-
-# atom-keymap dependency
-KEYBOARD_LAYOUT_V=2.0.12
-
-# symbols-view dependency
-NODE_CTAGS_V=3.0.0
-
-# spell-check dependency
-NODE_SPELLCHECKER_V=3.2.3
-
-NSFW_V=1.0.15
-
-ASAR_V=0.12.1
-
-# 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-${MY_PV}.rpm
- 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://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
- https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
- https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
- https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
- https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
- https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
- https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
- https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
- https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
- https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
- https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
- https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
- https://github.com/Axosoft/nsfw/archive/v${NSFW_V}.tar.gz -> atom-nsfw-${NSFW_V}.tar.gz
-"
-
-BINMODS="
- cached-run-in-this-context
- node-ctags
- git-utils
- keyboard-layout
- node-nslog
- node-oniguruma
- node-pathwatcher
- node-runas
- node-keytar
- scrollbar-style
- node-spellchecker
- superstring
- nsfw
-"
-
-RESTRICT="mirror"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=app-text/hunspell-1.3.3:=
- >=dev-libs/libgit2-0.23:=[ssh]
- >=gnome-base/libgnome-keyring-3.12:=
- >=dev-libs/oniguruma-5.9.5:=
- >=dev-util/ctags-5.8
- >=dev-util/electron-1.3.5:${ELECTRON_SLOT}
- x11-libs/libxkbfile"
-RDEPEND="
- ${DEPEND}
- !sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-get_install_dir() {
- echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-get_electron_dir() {
- echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-get_electron_nodedir() {
- echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-enode_electron() {
- "$(get_electron_dir)"/node $@
-}
-
-enodegyp_atom() {
- local apmpath="/usr/share/atom/resources/app/apm"
- local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
- PATH="$(get_electron_dir):${PATH}" \
- enode_electron "${nodegyp}" \
- --nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-easar() {
- local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
- echo "asar" $@
- enode_electron "${asar}" $@ || die
-}
-
-package_dir() {
- local binmod="${1//-/_}"
- local binmod_v="${binmod^^}_V"
- echo -n ${1}-${!binmod_v}
-}
-
-_unpack_npm_package() {
- local a="${1}" basename suffix
-
- basename=${a%.*}
- suffix=${basename##*.}
- if [[ "${suffix}" == "tar" ]]; then
- basename=${basename%.*}
- fi
-
- unpack ${a}
- mv package "${basename}" || die
-}
-
-_have_patches_for() {
- local _patches="${1}-*.patch" _find
- _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
- test -n "$_find"
-}
-
-src_unpack() {
- local a
-
- for a in ${A} ; do
- case ${a} in
- *.rpm) srcrpm_unpack "${a}" ;;
- *) unpack "${a}" ;;
- esac
- done
-
- mkdir "${WORKDIR}/atom-${MY_PV}" || die
- mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
-}
-
-src_prepare() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
-
- cd "${S}/usr/share/atom/resources/app" || die
- eapply "${FILESDIR}/${PN}-python.patch"
- eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
-
- sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
- ./atom.sh \
- || die
-
- local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
- sed -i -e \
- "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
- apm/bin/apm || die
-
- sed -i -e \
- "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
- apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
- rm apm/bin/node || die
-
- sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
- "${S}/usr/share/applications/atom.desktop" || die
-
- cd "${S}" || die
-
- for binmod in ${BINMODS}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- if _have_patches_for "${binmod}"; then
- for patch in "${FILESDIR}"/${binmod}-*.patch; do
- eapply "${patch}"
- done
- fi
- done
-
- # Unbundle bundled libs from modules
-
- _s="${WORKDIR}/$(package_dir git-utils)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "git;libgit2;git2" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir node-oniguruma)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "onig_scanner;oniguruma;onig" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir node-spellchecker)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "spellchecker;hunspell;hunspell" \
- "${_s}/binding.gyp" || die
-
- for binmod in ${BINMODS}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- mkdir -p "${_s}/node_modules" || die
- ln -s "${nan_s}" "${_s}/node_modules/nan" || die
- done
-
- mkdir "${S}/build" || die
- cp -a "${S}/usr/share/atom/resources/app" "${S}/build/app" || die
-
- cd "${S}" || die
-
- eapply "${FILESDIR}/atom-1.13-apm-path.patch"
- eapply "${FILESDIR}/atom-license-path.patch"
- eapply "${FILESDIR}/atom-fix-app-restart.patch"
- eapply "${FILESDIR}/atom-marker-layer.patch"
-
- sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
- "${S}/build/app/src/config-schema.js" || die
-
- eapply_user
-}
-
-src_configure() {
- local binmod _s
-
- for binmod in ${BINMODS}; do
- einfo "Configuring ${binmod}..."
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- enodegyp_atom configure
- done
-}
-
-src_compile() {
- local binmod _s x
- local ctags_d="node_modules/symbols-view/vendor"
- local jobs=$(makeopts_jobs) gypopts
-
- gypopts="--verbose"
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- gypopts+=" --jobs ${jobs}"
- fi
-
- mkdir -p "${S}/build/modules/" || die
-
- for binmod in ${BINMODS}; do
- einfo "Building ${binmod}..."
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- enodegyp_atom ${gypopts} build
- x=${binmod##node-}
- mkdir -p "${S}/build/modules/${x}" || die
- cp build/Release/*.node "${S}/build/modules/${x}" || die
- done
-
- # Put compiled binary modules in place
- _fix_binmods "${S}/build" "app"
- _fix_binmods "${S}/usr/share/atom/resources" "app"
-
- # Remove non-Linux vendored ctags binaries
- rm "${S}/build/app/${ctags_d}/ctags-darwin" \
- "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
-
- # Re-pack app.asar
- # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
- cd "${S}/build" || die
- x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
- easar pack "${x}" "app" "app.asar"
- cd "${S}" || die
-}
-
-_fix_binmods() {
- local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
- local cruft
-
- (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
- | while IFS= read -r path; do
- f=$(basename "${path}")
- d=$(dirname "${path}")
- relpath=${path#${_prefix}}
- relpath=${relpath##/}
- relpath=${relpath#W${_dir}}
- modpath=$(dirname ${relpath})
- modpath=${modpath%build/Release}
- mod=$(basename ${modpath})
-
- # must copy here as symlinks will cause the module loading to fail
- cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
- cruft=$(find "${d}" -name '*.a' -print)
- if [[ -n "${cruft}" ]]; then
- rm ${cruft} || die
- fi
- done
-}
-
-_fix_executables() {
- local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
-
- (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
- | while IFS= read -r f; do
- IFS= read -r shebang < "${f}"
-
- if [[ ${shebang} == '#!'* ]]; then
- fperms +x "${f#${ED}}"
- if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
- einfo "Fixing node shebang in ${f#${ED}}"
- sed --follow-symlinks -i \
- -e "1s:${shebang}$:${_node_sb}:" "${f}" || die
- fi
- fi
- done || die
-}
-
-src_install() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local ctags_d="node_modules/symbols-view/vendor"
-
- cd "${S}" || die
-
- # Replace vendored ctags with a symlink to system ctags
- rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
- ln -s "/usr/bin/ctags" \
- "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-
- insinto "${install_dir}"
-
- doins build/app.asar
- doins -r build/app.asar.unpacked
-
- insinto "${install_dir}/app"
- doins -r usr/share/atom/resources/app/apm
-
- insinto /usr/share/applications/
- newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
-
- insinto /usr/share/icons/
- doins -r usr/share/icons/hicolor
-
- exeinto "${install_dir}"
- newexe usr/share/atom/resources/app/atom.sh atom
- insinto /usr/share/licenses/"${PN}${suffix}"
- doins usr/share/atom/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"
-}
diff --git a/app-editors/atom/atom-1.20.1.ebuild b/app-editors/atom/atom-1.20.1.ebuild
deleted file mode 100644
index e3b34cfffb4..00000000000
--- a/app-editors/atom/atom-1.20.1.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-# atom overlay.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm virtualx
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.6.9
-ELECTRON_SLOT=1.6
-
-ASAR_V=0.13.0
-# All binary packages depend on this
-NAN_V=2.6.2
-
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.6
-GIT_UTILS_V=5.0.0
-KEYBOARD_LAYOUT_V=2.0.13
-KEYTAR_V=4.0.4
-NSFW_V=1.0.16
-NSLOG_V=3.0.0
-ONIGURUMA_V=6.2.1
-PATHWATCHER_V=8.0.1
-RUNAS_V=3.1.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.4.2
-SUPERSTRING_V=2.2.3
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
- https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
- https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
- https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
- https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
- https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
- https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
- https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
- https://registry.npmjs.org/git-utils/-/git-utils-5.0.0.tgz -> atomdep-git-utils-5.0.0.tar.gz
- https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
- https://registry.npmjs.org/keytar/-/keytar-4.0.4.tgz -> atomdep-keytar-4.0.4.tar.gz
- https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
- https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
- https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
- https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
- https://registry.npmjs.org/runas/-/runas-3.1.1.tgz -> atomdep-runas-3.1.1.tar.gz
- https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
- https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.2.tgz -> atomdep-spellchecker-3.4.2.tar.gz
- https://registry.npmjs.org/superstring/-/superstring-2.2.3.tgz -> atomdep-superstring-2.2.3.tar.gz
-"
-
-BINMODS=(
- cached-run-in-this-context
- ctags
- fs-admin
- git-utils
- keyboard-layout
- keytar
- nsfw
- nslog
- oniguruma
- pathwatcher
- runas
- scrollbar-style
- spellchecker
- superstring
-)
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=app-text/hunspell-1.3.3:=
- >=dev-libs/libgit2-0.23:=[ssh]
- >=dev-libs/libpcre2-10.22:=[jit,pcre16]
- >=gnome-base/libgnome-keyring-3.12:=
- >=dev-libs/oniguruma-5.9.5:=
- >=dev-util/ctags-5.8
- >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
- x11-libs/libxkbfile"
-RDEPEND="
- ${DEPEND}
- !sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local a
-
- for a in ${A} ; do
- case ${a} in
- *.rpm) srcrpm_unpack "${a}" ;;
- *) _unpack "${a}" ;;
- esac
- done
-
- mkdir "${BIN_S}" || die
- mv "${WORKDIR}/usr" "${BIN_S}" || die
-}
-
-src_prepare() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
- local patch
- local binmod
- local _s
-
- mkdir "${BUILD_DIR}" || die
- cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
- "${BUILD_DIR}/app" || die
-
- # Add source files omitted from the upstream binary distribution,
- # and which we want to include in ours.
- cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
-
- # Unpack app.asar
- if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
- easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
- "${BUILD_DIR}/app"
- fi
-
- cd "${BUILD_DIR}/app" || die
-
- eapply "${FILESDIR}/atom-python.patch"
- eapply "${FILESDIR}/apm-python.patch"
- eapply "${FILESDIR}/atom-unbundle-electron.patch"
- eapply "${FILESDIR}/atom-apm-path-r1.patch"
- eapply "${FILESDIR}/atom-license-path-r1.patch"
- eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
- eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-
- sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
- ./atom.sh \
- || die
-
- local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
- export ELECTRON_NO_ASAR=1"
- sed -i -e \
- "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
- apm/bin/apm || die
-
- sed -i -e \
- "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
- apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
- sed -i -e \
- "s|atomCommand = 'atom';|atomCommand = '/usr/bin/atom${suffix}'|g" \
- apm/lib/test.js || die
-
- rm apm/bin/node || die
-
- sed -i -e "s|/$(get_atom_rpmdir)/atom|/usr/bin/atom${suffix}|g" \
- "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
- for binmod in ${BINMODS[@]}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- if _have_patches_for "${binmod}"; then
- for patch in "${FILESDIR}"/${binmod}-*.patch; do
- eapply "${patch}"
- done
- fi
- done
-
- cd "${BUILD_DIR}/app" || die
-
- # Unbundle bundled libs from modules
-
- _s="${WORKDIR}/$(package_dir git-utils)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "git;libgit2;git2" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir oniguruma)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "onig_scanner;oniguruma;onig" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir spellchecker)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "spellchecker;hunspell;hunspell" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir superstring)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle \
- "superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
- -DPCRE2_CODE_UNIT_WIDTH=16" \
- "${_s}/binding.gyp" || die
-
- for binmod in ${BINMODS[@]}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- mkdir -p "${_s}/node_modules" || die
- ln -s "${nan_s}" "${_s}/node_modules/nan" || die
- done
-
- sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
- "${BUILD_DIR}/app/src/config-schema.js" || die
-
- eapply_user
-}
-
-src_configure() {
- local binmod
-
- for binmod in ${BINMODS[@]}; do
- einfo "Configuring ${binmod}..."
- cd "${WORKDIR}/$(package_dir ${binmod})" || die
- enodegyp_atom configure
- done
-}
-
-src_compile() {
- local binmod
- local x
- local ctags_d="node_modules/symbols-view/vendor"
- local jobs=$(makeopts_jobs)
- local gypopts
-
- # Transpile any yet untranspiled files.
- ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
-
- gypopts="--verbose"
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- gypopts+=" --jobs ${jobs}"
- fi
-
- mkdir -p "${BUILD_DIR}/modules/" || die
-
- for binmod in ${BINMODS[@]}; do
- einfo "Building ${binmod}..."
- cd "${WORKDIR}/$(package_dir ${binmod})" || die
- enodegyp_atom ${gypopts} build
- x=${binmod##node-}
- mkdir -p "${BUILD_DIR}/modules/${x}" || die
- cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
- done
-
- # Put compiled binary modules in place
- _fix_binmods "${BUILD_DIR}/app" "apm"
- _fix_binmods "${BUILD_DIR}/app" "node_modules"
-
- # Remove non-Linux vendored ctags binaries
- rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
- "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
- # Re-pack app.asar
- # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
- cd "${BUILD_DIR}" || die
- x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
- xd="--unpack-dir=apm"
- easar pack "${x}" "${xd}" "app" "app.asar"
-
- rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
- # Replace vendored ctags with a symlink to system ctags
- rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
- ln -s "/usr/bin/ctags" \
- "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_test() {
- local electron="$(get_electron_dir)/electron"
- local app="${BUILD_DIR}/app.asar"
-
- virtx "${electron}" --app="${app}" --test "${app}/spec"
-}
-
-src_install() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
-
- insinto "${install_dir}"
-
- doins "${BUILD_DIR}/app.asar"
- doins -r "${BUILD_DIR}/app.asar.unpacked"
-
- insinto "${install_dir}/app"
- doins -r "${BUILD_DIR}/app/apm"
-
- insinto "/usr/share/applications/"
- newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
- "atom${suffix}.desktop"
-
- insinto "/usr/share/icons/"
- doins -r "${BIN_S}/usr/share/icons/hicolor"
-
- exeinto "${install_dir}"
- newexe "${BUILD_DIR}/app/atom.sh" atom
- insinto "/usr/share/licenses/${PN}${suffix}"
- doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
- dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
- dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
- _fix_executables "${install_dir}/app/apm/bin"
- _fix_executables "${install_dir}/app/apm/node_modules/.bin"
- _fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
- _fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
- _fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
- if [[ "${PV}" == *beta* ]]; then
- echo -n "atom-beta"
- else
- echo -n "atom"
- fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
- echo -n "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
- echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
- echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_electron_nodedir() {
- echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
- "$(get_electron_dir)"/node $@
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
- local apmpath="$(get_atom_rpmdir)/resources/app/apm"
- local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
- PATH="$(get_electron_dir):${PATH}" \
- enode_electron "${nodegyp}" \
- --nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
- local cscript="${FILESDIR}/transpile-coffee-script.js"
-
- # Disable shell glob expansion, as we want the coffee script
- # transpiler to do that instead.
- set -f
- echo "ecoffeescript" $@
- ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
- NODE_PATH="${BUILD_DIR}/app/node_modules" \
- enode_electron "${cscript}" $@ || die
- set +f
-}
-
-# asar wrapper.
-easar() {
- local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
- echo "asar" $@
- enode_electron "${asar}" $@ || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
- local binmod="${1//-/_}"
- local binmod_v="${binmod^^}_V"
- echo -n ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-_have_patches_for() {
- local _patches="${1}-*.patch" _find
- _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
- test -n "$_find"
-}
-
-# Tarballs on registry.npmjs.org are wildly inconsistent,
-# and violate the convention of having ${P} as the top directory name.
-# This helper detects and fixes that.
-_unpack() {
- local a="${1}"
- local b="${a%.tar.gz}"
- local p="${b#atomdep-}"
- local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
-
- unpack "${a}"
-
- if [[ "${dir}" != "${p}" ]]; then
- # Set the correct name for the unpacked directory.
- mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
- fi
-}
-
-# Check if the binary node module is actually a valid dependency.
-# Sometimes the upstream removes a dependency from package.json but
-# forgets to remove the module from node_modules.
-_is_valid_binmod() {
- local mod
-
- for mod in "${BINMODS[@]}"; do
- if [[ "${mod}" == "${1}" ]]; then
- return 0
- fi
- done
-
- return 1
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-_fix_binmods() {
- local _dir="${2}"
- local _prefix="${1}"
- local path
- local relpath
- local modpath
- local mod
- local f
- local d
- local cruft
-
- (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
- | while IFS= read -r path; do
- f=$(basename "${path}")
- d=$(dirname "${path}")
- relpath=${path#${_prefix}}
- relpath=${relpath##/}
- relpath=${relpath#W${_dir}}
- modpath=$(dirname ${relpath})
- modpath=${modpath%build/Release}
- mod=$(basename ${modpath})
-
- _is_valid_binmod "${mod}" || continue
-
- # must copy here as symlinks will cause the module loading to fail
- cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
- cruft=$(find "${d}" -name '*.a' -print)
- if [[ -n "${cruft}" ]]; then
- rm ${cruft} || die
- fi
- done
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-_fix_executables() {
- local _dir="${1}"
- local _node_sb="#!$(get_electron_dir)"/node
-
- (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
- | while IFS= read -r f; do
- IFS= read -r shebang < "${f}"
-
- if [[ ${shebang} == '#!'* ]]; then
- fperms +x "${f#${ED}}"
- if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
- einfo "Fixing node shebang in ${f#${ED}}"
- sed --follow-symlinks -i \
- -e "1s:${shebang}$:${_node_sb}:" "${f}" || die
- fi
- fi
- done || die
-}
diff --git a/app-editors/atom/atom-1.21.0.ebuild b/app-editors/atom/atom-1.21.0.ebuild
deleted file mode 100644
index bb5d91505c9..00000000000
--- a/app-editors/atom/atom-1.21.0.ebuild
+++ /dev/null
@@ -1,522 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
-# atom overlay.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multiprocessing rpm virtualx
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-HOMEPAGE="https://atom.io"
-MY_PV="${PV//_/-}"
-
-ELECTRON_V=1.6.9
-ELECTRON_SLOT=1.6
-
-ASAR_V=0.13.0
-# All binary packages depend on this
-NAN_V=2.6.2
-
-CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
-CTAGS_V=3.0.0
-FS_ADMIN_V=0.1.6
-GIT_UTILS_V=5.0.0
-KEYBOARD_LAYOUT_V=2.0.13
-KEYTAR_V=4.0.4
-NSFW_V=1.0.16
-NSLOG_V=3.0.0
-ONIGURUMA_V=6.2.1
-PATHWATCHER_V=8.0.1
-SCROLLBAR_STYLE_V=3.2.0
-SPELLCHECKER_V=3.4.3
-SUPERSTRING_V=2.2.3
-
-# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
-SRC_URI="
- https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
- https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
- https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
- https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
- https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
- https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
- https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
- https://registry.npmjs.org/git-utils/-/git-utils-5.0.0.tgz -> atomdep-git-utils-5.0.0.tar.gz
- https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
- https://registry.npmjs.org/keytar/-/keytar-4.0.4.tgz -> atomdep-keytar-4.0.4.tar.gz
- https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
- https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
- https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
- https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
- https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
- https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.3.tgz -> atomdep-spellchecker-3.4.3.tar.gz
- https://registry.npmjs.org/superstring/-/superstring-2.2.3.tgz -> atomdep-superstring-2.2.3.tar.gz
-"
-
-BINMODS=(
- cached-run-in-this-context
- ctags
- fs-admin
- git-utils
- keyboard-layout
- keytar
- nsfw
- nslog
- oniguruma
- pathwatcher
- scrollbar-style
- spellchecker
- superstring
-)
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=app-text/hunspell-1.3.3:=
- >=dev-libs/libgit2-0.23:=[ssh]
- >=dev-libs/libpcre2-10.22:=[jit,pcre16]
- >=gnome-base/libgnome-keyring-3.12:=
- >=dev-libs/oniguruma-5.9.5:=
- >=dev-util/ctags-5.8
- >=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
- x11-libs/libxkbfile"
-RDEPEND="
- ${DEPEND}
- !sys-apps/apmd
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
-BUILD_DIR="${S}/out"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- local a
-
- for a in ${A} ; do
- case ${a} in
- *.rpm) srcrpm_unpack "${a}" ;;
- *) _unpack "${a}" ;;
- esac
- done
-
- mkdir "${BIN_S}" || die
- mv "${WORKDIR}/usr" "${BIN_S}" || die
-}
-
-src_prepare() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
- local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
- local patch
- local binmod
- local _s
-
- mkdir "${BUILD_DIR}" || die
- cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
- "${BUILD_DIR}/app" || die
-
- # Add source files omitted from the upstream binary distribution,
- # and which we want to include in ours.
- cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
-
- # Unpack app.asar
- if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
- easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
- "${BUILD_DIR}/app"
- fi
-
- cd "${BUILD_DIR}/app" || die
-
- eapply "${FILESDIR}/atom-python.patch"
- eapply "${FILESDIR}/apm-python.patch"
- eapply "${FILESDIR}/atom-unbundle-electron-r1.patch"
- eapply "${FILESDIR}/atom-apm-path-r2.patch"
- eapply "${FILESDIR}/atom-license-path-r1.patch"
- eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
- eapply "${FILESDIR}/atom-marker-layer-r1.patch"
-
- sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${EROOT%/}${install_dir}/app.asar|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|g" \
- ./atom.sh \
- || die
-
- sed -i -e "s|^#!/bin/bash|#!${EROOT%/}/bin/bash|g" \
- ./atom.sh \
- || die
-
- local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
- export ELECTRON_NO_ASAR=1"
- sed -i -e \
- "s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
- apm/bin/apm || die
-
- sed -i -e \
- "s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
- apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
-
- sed -i -e \
- "s|atomCommand = 'atom';|atomCommand = '${EROOT%/}/usr/bin/atom${suffix}'|g" \
- apm/lib/test.js || die
-
- rm apm/bin/node || die
-
- sed -i -e "s|/$(get_atom_rpmdir)/atom|${EROOT%/}/usr/bin/atom${suffix}|g" \
- "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
-
- for binmod in ${BINMODS[@]}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- cd "${_s}" || die
- if _have_patches_for "${binmod}"; then
- for patch in "${FILESDIR}"/${binmod}-*.patch; do
- eapply "${patch}"
- done
- fi
- done
-
- cd "${BUILD_DIR}/app" || die
-
- # Unbundle bundled libs from modules
-
- _s="${WORKDIR}/$(package_dir git-utils)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "git;libgit2;git2" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir oniguruma)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "onig_scanner;oniguruma;onig" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir spellchecker)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle "spellchecker;hunspell;hunspell" \
- "${_s}/binding.gyp" || die
-
- _s="${WORKDIR}/$(package_dir superstring)"
- ${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
- --inplace --unbundle \
- "superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
- -DPCRE2_CODE_UNIT_WIDTH=16" \
- "${_s}/binding.gyp" || die
-
- for binmod in ${BINMODS[@]}; do
- _s="${WORKDIR}/$(package_dir ${binmod})"
- mkdir -p "${_s}/node_modules" || die
- ln -s "${nan_s}" "${_s}/node_modules/nan" || die
- done
-
- sed -i -e "s|{{ATOM_PREFIX}}|${EROOT%/}|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 x
- local ctags_d="node_modules/symbols-view/vendor"
- local jobs=$(makeopts_jobs)
- local gypopts
-
- # Transpile any yet untranspiled files.
- ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
-
- gypopts="--verbose"
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- gypopts+=" --jobs ${jobs}"
- fi
-
- mkdir -p "${BUILD_DIR}/modules/" || die
-
- for binmod in ${BINMODS[@]}; do
- einfo "Building ${binmod}..."
- cd "${WORKDIR}/$(package_dir ${binmod})" || die
- enodegyp_atom ${gypopts} build
- x=${binmod##node-}
- mkdir -p "${BUILD_DIR}/modules/${x}" || die
- cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
- done
-
- # Put compiled binary modules in place
- _fix_binmods "${BUILD_DIR}/app" "apm"
- _fix_binmods "${BUILD_DIR}/app" "node_modules"
-
- # Remove non-Linux vendored ctags binaries
- rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
- "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
-
- # Re-pack app.asar
- # Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
- cd "${BUILD_DIR}" || die
- x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
- xd="--unpack-dir=apm"
- easar pack "${x}" "${xd}" "app" "app.asar"
-
- rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
-
- # Replace vendored ctags with a symlink to system ctags
- rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
- ln -s "${EROOT%/}/usr/bin/ctags" \
- "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
-}
-
-src_test() {
- local electron="$(get_electron_dir)/electron"
- local app="${BUILD_DIR}/app.asar"
-
- virtx "${electron}" --app="${app}" --test "${app}/spec"
-}
-
-src_install() {
- local install_dir="$(get_install_dir)"
- local suffix="$(get_install_suffix)"
-
- insinto "${install_dir}"
-
- doins "${BUILD_DIR}/app.asar"
- doins -r "${BUILD_DIR}/app.asar.unpacked"
-
- insinto "${install_dir}/app"
- doins -r "${BUILD_DIR}/app/apm"
-
- insinto "/usr/share/applications/"
- newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
- "atom${suffix}.desktop"
-
- insinto "/usr/share/icons/"
- doins -r "${BIN_S}/usr/share/icons/hicolor"
-
- exeinto "${install_dir}"
- newexe "${BUILD_DIR}/app/atom.sh" atom
- insinto "/usr/share/licenses/${PN}${suffix}"
- doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
- dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
- dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
-
- _fix_executables "${install_dir}/app/apm/bin"
- _fix_executables "${install_dir}/app/apm/node_modules/.bin"
- _fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
- _fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
- _fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
-}
-
-# Helpers
-# -------
-
-# Return the installation suffix appropriate for the slot.
-get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-# Return the upstream app name appropriate for $PV.
-get_atom_appname() {
- if [[ "${PV}" == *beta* ]]; then
- echo -n "atom-beta"
- else
- echo -n "atom"
- fi
-}
-
-# Return the app installation path inside the upstream archive.
-get_atom_rpmdir() {
- echo -n "usr/share/$(get_atom_appname)"
-}
-
-# Return the installation target directory.
-get_install_dir() {
- echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
-}
-
-# Return the Electron installation directory.
-get_electron_dir() {
- echo -n "${EROOT%/}/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
-}
-
-# Return the directory containing appropriate Node headers
-# for the required version of Electron.
-get_electron_nodedir() {
- echo -n "${EROOT%/}/usr/include/electron-${ELECTRON_SLOT}/node/"
-}
-
-# Run JavaScript using Electron's version of Node.
-enode_electron() {
- "$(get_electron_dir)"/node $@
-}
-
-# Run node-gyp using Electron's version of Node.
-enodegyp_atom() {
- local apmpath="$(get_atom_rpmdir)/resources/app/apm"
- local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
-
- PATH="$(get_electron_dir):${PATH}" \
- enode_electron "${nodegyp}" \
- --nodedir="$(get_electron_nodedir)" $@ || die
-}
-
-# Coffee Script wrapper.
-ecoffeescript() {
- local cscript="${FILESDIR}/transpile-coffee-script.js"
-
- # Disable shell glob expansion, as we want the coffee script
- # transpiler to do that instead.
- set -f
- echo "ecoffeescript" $@
- ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
- NODE_PATH="${BUILD_DIR}/app/node_modules" \
- enode_electron "${cscript}" $@ || die
- set +f
-}
-
-# asar wrapper.
-easar() {
- local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
- echo "asar" $@
- enode_electron "${asar}" $@ || die
-}
-
-# Return a $WORKDIR directory for a given package name.
-package_dir() {
- local binmod="${1//-/_}"
- local binmod_v="${binmod^^}_V"
- echo -n ${1}-${!binmod_v}
-}
-
-# Check if there are patches for a given package.
-_have_patches_for() {
- local _patches="${1}-*.patch" _find
- _find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
- test -n "$_find"
-}
-
-# Tarballs on registry.npmjs.org are wildly inconsistent,
-# and violate the convention of having ${P} as the top directory name.
-# This helper detects and fixes that.
-_unpack() {
- local a="${1}"
- local b="${a%.tar.gz}"
- local p="${b#atomdep-}"
- local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
-
- unpack "${a}"
-
- if [[ "${dir}" != "${p}" ]]; then
- # Set the correct name for the unpacked directory.
- mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
- fi
-}
-
-# Check if the binary node module is actually a valid dependency.
-# Sometimes the upstream removes a dependency from package.json but
-# forgets to remove the module from node_modules.
-_is_valid_binmod() {
- local mod
-
- for mod in "${BINMODS[@]}"; do
- if [[ "${mod}" == "${1}" ]]; then
- return 0
- fi
- done
-
- return 1
-}
-
-# Replace binary node modules with the newly compiled versions thereof.
-_fix_binmods() {
- local _dir="${2}"
- local _prefix="${1}"
- local path
- local relpath
- local modpath
- local mod
- local f
- local d
- local cruft
-
- (find "${_prefix}/${_dir}" -name '*.node' -print || die) \
- | while IFS= read -r path; do
- f=$(basename "${path}")
- d=$(dirname "${path}")
- relpath=${path#${_prefix}}
- relpath=${relpath##/}
- relpath=${relpath#W${_dir}}
- modpath=$(dirname ${relpath})
- modpath=${modpath%build/Release}
- mod=$(basename ${modpath})
-
- _is_valid_binmod "${mod}" || continue
-
- # must copy here as symlinks will cause the module loading to fail
- cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
- cruft=$(find "${d}" -name '*.a' -print)
- if [[ -n "${cruft}" ]]; then
- rm ${cruft} || die
- fi
- done
-}
-
-# Fix script permissions and shebangs to point to the correct version
-# of Node.
-_fix_executables() {
- local _dir="${1}"
- local _node_sb="#!$(get_electron_dir)"/node
-
- (find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
- | while IFS= read -r f; do
- IFS= read -r shebang < "${f}"
-
- if [[ ${shebang} == '#!'* ]]; then
- fperms +x "${f#${ED}}"
- if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
- einfo "Fixing node shebang in ${f#${ED}}"
- sed --follow-symlinks -i \
- -e "1s:${shebang}$:${_node_sb}:" "${f}" || die
- fi
- fi
- done || die
-}
diff --git a/app-editors/atom/files/atom-1.13-apm-path.patch b/app-editors/atom/files/atom-1.13-apm-path.patch
deleted file mode 100644
index 0dcb7914c66..00000000000
--- a/app-editors/atom/files/atom-1.13-apm-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/build/app/src/config-schema.js b/build/app/src/config-schema.js
-index 1307db6..d6a1ba4 100644
---- a/build/app/src/config-schema.js
-+++ b/build/app/src/config-schema.js
-@@ -21,6 +21,11 @@ var configSchema = {
- core: {
- type: 'object',
- properties: {
-+ apmPath: {
-+ type: 'string',
-+ 'default': '/usr/bin/apm{{ATOM_SUFFIX}}',
-+ description: 'Path to apm executable.'
-+ },
- ignoredNames: {
- type: 'array',
- 'default': ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db'],
diff --git a/app-editors/atom/files/atom-apm-path-r1.patch b/app-editors/atom/files/atom-apm-path-r1.patch
deleted file mode 100644
index c30987d8a30..00000000000
--- a/app-editors/atom/files/atom-apm-path-r1.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": '/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.patch b/app-editors/atom/files/atom-fix-app-restart.patch
deleted file mode 100644
index 1bfa1ed429a..00000000000
--- a/app-editors/atom/files/atom-fix-app-restart.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/atom-application.js.orig b/atom-application.js
-index 92d985f..9a120e6 100644
---- a/build/app/src/main-process/atom-application.js
-+++ b/build/app/src/main-process/atom-application.js
-@@ -1178,6 +1178,7 @@
- AtomApplication.prototype.restart = function() {
- var args;
- args = [];
-+ args.push("--app=" + this.resourcePath);
- if (this.safeMode) {
- args.push("--safe");
- }
diff --git a/app-editors/atom/files/atom-license-path.patch b/app-editors/atom/files/atom-license-path.patch
deleted file mode 100644
index 0ddf993448a..00000000000
--- a/app-editors/atom/files/atom-license-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/app/src/main-process/atom-application.js
-+++ b/build/app/src/main-process/atom-application.js
-@@ -406,7 +406,7 @@
- this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap');
- this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets');
- this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet');
-- this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'));
-+ this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md');
- this.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) {
- return function(event) {
- if (!_this.quitting) {
diff --git a/app-editors/atom/files/atom-marker-layer.patch b/app-editors/atom/files/atom-marker-layer.patch
deleted file mode 100644
index 2d797aa293d..00000000000
--- a/app-editors/atom/files/atom-marker-layer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/app/node_modules/text-buffer/lib/marker-layer.js
---- b/build/app/node_modules/text-buffer/lib/marker-layer.js
-@@ -192,7 +192,7 @@
- return function(markerId) {
- var marker;
- marker = _this.markersById[markerId];
-- if (!marker.matchesParams(params)) {
-+ if (marker == null || !marker.matchesParams(params)) {
- return;
- }
- return result.push(marker);
diff --git a/app-editors/atom/files/atom-unbundle-electron.patch b/app-editors/atom/files/atom-unbundle-electron.patch
deleted file mode 100644
index 296b17b0c15..00000000000
--- a/app-editors/atom/files/atom-unbundle-electron.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 27 Jul 2017 13:18:54 -0400
-Subject: [PATCH] Unbundle electron
-
----
- atom.sh | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/atom.sh b/atom.sh
-index 6b0e94430..ea8e0dc2e 100755
---- a/atom.sh
-+++ b/atom.sh
-@@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then
- SCRIPT=$(readlink -f "$0")
- USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
-
-- if [ -n "$BETA_VERSION" ]; then
-- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
-- else
-- ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-- fi
-+ export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
-+ export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
-+ export LOCAL_GIT_DIRECTORY="/usr"
-+ ATOM_PATH="{{ATOM_PATH}}"
-
- ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
- mkdir -p "$ATOM_HOME"
-@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then
- [ -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.13.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/
@ 2020-04-29 12:45 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2020-04-29 12:45 UTC (permalink / raw
To: gentoo-commits
commit: b152bd2627d961e6c4d9ba47e8c34e14bdd80be9
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 12:32:32 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 12:43:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b152bd26
app-editors/atom remove last-rited pkg
Closes: https://bugs.gentoo.org/show_bug.cgi?id=584348
Closes: https://bugs.gentoo.org/show_bug.cgi?id=621798
Closes: https://bugs.gentoo.org/show_bug.cgi?id=677294
Closes: https://bugs.gentoo.org/show_bug.cgi?id=713014
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-editors/atom/Manifest | 31 --
app-editors/atom/atom-1.32.1.ebuild | 562 ---------------------
app-editors/atom/files/apm-python.patch | 16 -
app-editors/atom/files/atom-apm-path-r2.patch | 16 -
.../atom/files/atom-fix-app-restart-r2.patch | 24 -
.../atom/files/atom-fix-config-watcher-r1.patch | 41 --
app-editors/atom/files/atom-marker-layer-r1.patch | 11 -
app-editors/atom/files/atom-python-r1.patch | 25 -
.../atom/files/atom-unbundle-electron-r3.patch | 39 --
app-editors/atom/files/gyp-unbundle.py | 141 ------
app-editors/atom/files/transpile-coffee-script.js | 25 -
app-editors/atom/metadata.xml | 10 -
12 files changed, 941 deletions(-)
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
deleted file mode 100644
index c03891ad7c9..00000000000
--- 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 cb97004c983..00000000000
--- 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 0467beaf10e..00000000000
--- 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 12234b6bab1..00000000000
--- 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 a2defa21db2..00000000000
--- 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 7af82050d46..00000000000
--- 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 1dcdecbd4eb..00000000000
--- 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 96d6b0327fa..00000000000
--- 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 1a6ea109d05..00000000000
--- 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 370221380b6..00000000000
--- 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 bbea175b672..00000000000
--- 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 f35968a5e1f..00000000000
--- 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>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-04-29 12:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-08 12:40 [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/ Mikhail Pukhlikov
-- strict thread matches above, loose matches on Subject: below --
2020-04-29 12:45 Mikle Kolyada
2017-12-12 20:32 Patrice Clement
2017-04-08 21:22 Patrice Clement
2016-06-10 16:50 Patrice Clement
2016-05-27 14:15 Patrice Clement
2016-05-12 8:30 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox