From: "Göktürk Yüksek" <gokturk@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/files/, app-editors/atom/
Date: Mon, 21 Nov 2016 05:12:27 +0000 (UTC) [thread overview]
Message-ID: <1479705106.fa7a6c34df2baede60bd5b9134bf34753259ab1d.gokturk@gentoo> (raw)
commit: fa7a6c34df2baede60bd5b9134bf34753259ab1d
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io>
AuthorDate: Mon Nov 14 19:58:18 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 05:11:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7a6c34
app-editors/atom: Version bump to 1.12.2
Gentoo-Bug: https://bugs.gentoo.org/597442
Package-Manager: portage-2.3.0
app-editors/atom/Manifest | 4 +
app-editors/atom/atom-1.12.2.ebuild | 403 +++++++++++++++++++++++++
app-editors/atom/files/atom-apm-path.patch | 4 +-
app-editors/atom/files/atom-license-path.patch | 11 +
app-editors/atom/files/atom-python.patch | 4 +-
5 files changed, 422 insertions(+), 4 deletions(-)
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index b940055..7a18b4f 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -1,17 +1,21 @@
DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
DIST atom-1.10.2.rpm 67753816 SHA256 18ad153c932ef41e9c6b8394eeb114005c4d9c317a30dac238ecb51b78920c16 SHA512 1cc4ca2adec2fee66c30c4ef3b0c8f5613a83a54608a7c3bc677680db7657c8c6128a3e1c424251a7b2e9a13b6bc84ee280ec0ee7ea70815784a0432558ec17c WHIRLPOOL 288748edb89f466dc471ed22f008c84ba3a377fd50defa70a45059ae78a9e805026c97d4438b587472fbb37c15b63afb80c1910c5da87adf5a288fe198ec34a3
+DIST atom-1.12.2.rpm 84876214 SHA256 bcf95d7a8f4105c016d2940540d7c8db9bf0948a7dc8b5411294bd0fac48ec15 SHA512 a63af5e0da6ce0e9cc70c47da55b13fe463903c27a7df4e7ce311f08ed16fb4e04712678479661febcdf70afa400e3a8235d540bacaf4078e92b1e3d42fdfc11 WHIRLPOOL 4d6793741496cc240da18540bb74751b193e293a2df14c365c8fed2a2672422f87b36c5faf324790cc45951c8006a4b482656e8c8d3fd46d723c12c8ca073b4e
DIST atom-1.7.4.rpm 64439092 SHA256 601ffa5d683b02cbd95bc65c76e28ecc091b7f12092b69c6e65eb93e941450e6 SHA512 4033c8bc36ba43332a1c7e08cf0fa5deaefb53152b7a56c8ca5f9c68bd88761fb54c57aa031c6702d46ce531cf1e9a8a24d2b7271fe0017a022bc4671d85d68d WHIRLPOOL 4adf85334482c49104bc6b1e96753f5c3d5243b799a6d745bd7770968d57b0ddaebee1fea382542a4219849f360f04d6ffc9d0eede5f6eb0d5e3ead3989fea03
DIST atom-1.8.0.rpm 64364944 SHA256 7e9d64fd894ac8c307c377714cfb8d6ace44f80f09fec9222cd2e7858459a2d7 SHA512 1766cbb5a3cf544962a4adc2df4bc8de79d0ae8b90273e5798920f264dba100adf8f1bdfc2b7011c9d666f59bbc328dbf024ccab369ac76ebe6961c050f6e748 WHIRLPOOL 652a815a500cca79431a79dd43b8c0f73c3b7c7a387dc0bf5e89ef828df23670ab6a87df0737e66bd80b87ef474772ef31c27e17d014092ae33515ce1da10afc
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-1.0.0.tar.gz 6430 SHA256 d3f20f0765b7a243c3cfa3e49360851404977c2ed6e84dc84e9aaf28d8547d03 SHA512 a96b77c29eb1f5367f1d60ddc501fdd6e507fc92f980974bb2c1bec923b264e73104650180722819946e075284a928b4aaa01f8594365186bd8530a0179c7ff5 WHIRLPOOL 693f4a1546e0ca772ea2b2f860e6c2cf55f645031eb516021107296a3a05fca9086de62080255abae55c0ea42cc0f5aeeba26e6dd0b7eb274a8b69135bbf79c9
DIST atom-keyboard-layout-1.0.1.tar.gz 6512 SHA256 aed0c2745acaadf4c5fdcb74df4f0c0ad6fd6cb53742567c80a8220dc041aace SHA512 4d369a0a5cf9053929f20f21f3955703f5df6d44629a0208afd88d1d11af52fd30af6930de89480ab796f83202c21d42afbb56765cef0efb3b2ea381a9804081 WHIRLPOOL d600811081270a81c4ffb46883d24c5dca5c78023d83b6fce3375dd6ef140f39c7b83a4b8e4bcfcf304d8032b18c9461612316c71a8246ddb7465c1b3d781fd3
+DIST atom-keyboard-layout-2.0.1.tar.gz 18561 SHA256 057d01745b5cfb47381aa89d64344d4c1576d3b490756a25e3f616bfc68f6516 SHA512 f5b90c1c83574cd2cb49c82d11fabadb58ec41d34b5b6ea17b28b8a34b22ed9ce1afb1602cf1d3d28ba79e3cebcb60d8659201eea4c5294e0db2b29d7632b07a WHIRLPOOL a859b0d364b9059f4482b52f049e9a420bf356e00a5cfe5b657fbd0e1868fd6cd2bf39846560b88c9763e1ebc54fb7acb025a67af21182b00c3f83b380f4443f
DIST atom-marker-index-3.1.0.tar.gz 18065 SHA256 264e5553edee7e10766083433f952a515601201b53d332ecfe0fd43870fb4a38 SHA512 e50c2e03555d18e2eae0eb4ca5b16f486a53bf67803da6eb7eec90ef86048939f302baf15678a3af964b36ae809387d4665024e4d61bd9741738b12e84f4db64 WHIRLPOOL 179fafbd85d9b6e093ab646264716b0708d39aa3e1cd5771fbe173f2cd1ebb05f9a2525e5bb27d9605e2fd4ab5773a68d6552667c285ad3cbdbfbb6ae7d8b30e
DIST atom-marker-index-4.0.0.tar.gz 18344 SHA256 afb0da1f7006d044aeeb8adbfa94fdafde9902f26fbfeb012a3caa97aee11fb0 SHA512 43e68e655f49d7a092af5cba7cbb7e902221e6076e1f7dfd163bf316ef06883db713af71ac79e63c1c81c22ed9bed168e36a2616b64c70ef4b654c71bbf76cd8 WHIRLPOOL 9fbc6346db0297bc3a097e9497b0ea4be07f7bd4da3eb0343734e0041535cc749c16510b71b4abde0e31fdde241e4f7b4605a5c0df7713d8b9683f2f786c07b5
+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
DIST atom-node-nslog-3.0.0.tar.gz 2774 SHA256 6f2c7b79dd27688829d72dcbb94cc3da8b86fe74f355e1d407907cc56da29747 SHA512 1891632486acfa014eec79f70b14d56d967670310e46dedccfc9dfa505581365765f6bd42ad538b29e74d7c7de83d045b4199dd634fc588734a1ee086dcddb0a WHIRLPOOL d29f2c68e6168ce020c2a73d73f107ffb4c777e006fba4f01a93045ad631fb2d8b83f989244caf4d5e2f66474e660f3479d79a03e82a6b8fa8a297586ee6e556
DIST atom-node-oniguruma-5.1.2.tar.gz 662091 SHA256 130ab56cd6c29c4acc1f14ba31ec3f04146f02fe89c865c0af092f9d639fbdfb SHA512 e451f742ac1319b64e203848bce5d9c15251e15b083419b7a97588316eac3d86acfdbf6d7541cbd92eece48b41f90fd23f69b5e7e2d93e8bc18559c703944353 WHIRLPOOL 2cf44d2a4023655c96aed93c6c8faa45c569c75eaf2435b39f0a09ddcd53377c0ea05ac186b2e67f256c75c146bb50d971b7f9b7170d64031de79c4e76ef5252
+DIST atom-node-oniguruma-6.1.0.tar.gz 661394 SHA256 dab5322efac0cbe2c646559f130a2832be24e7caf8becabeedaf66842b72b289 SHA512 6443881353b61ad59d29cab6628f07d488e54df7b5a04ddffe4de11329e928b2a9cfc7582e22e0a90b6a3c6bf0e37873d8a5e34036cee5f7187ed4ae11fd6507 WHIRLPOOL 9c67fc6800e3d2b15160faa763539aefa2a40584697619b46098bd0f1c2820904ca6cae638e442c102c09616f62817c0df11f9c2da11d65c7dc9c98d04f668a4
DIST atom-node-pathwatcher-6.2.4.tar.gz 23324 SHA256 6b47f7f0e8009fe4dac0800ac11f2a2a0366fb4fd889e444d99787e093b8cf2e SHA512 f891777a326a4f11f36a64f382fb0c9bd3fa5e6478144130b0c554aaaced079223489461050667293f1392e356f5a84838196dc39f8d54f7b3fd537f361c2c9a WHIRLPOOL 67ea2fa8a98214f3ce64a3cc5ce1ff0a757c606c02599f1c1069e3e7aa2addd32a48da2273648632b92149027cf18b64131ee9070e46c6e0a2d227239a47eeaf
DIST atom-node-pathwatcher-6.5.0.tar.gz 23926 SHA256 a2f72f00cbe6a49152cdae85fb7585a77f0ee8b01be54fbc27a24f93935445c3 SHA512 0b8471885acc44f38161b4758951cff762f4c9ca2d17aefdb286b99fdefa6843eaa86d463e4ac54563a79f6701fcaa40252a72d73baf2b6c4e47aa00692ee314 WHIRLPOOL f3a82776b05416eda4e763c0f1db1e422b299f78cf516576b0d13b0447024962538603ce47c12a4889f7d9c984b98ca75013230ba3f1cea1575453e5c2e445dc
DIST atom-node-runas-3.1.1.tar.gz 6628 SHA256 9d7d5a157b16fdd7263f50adb2831706d6fcf0902a1af528fc2602db6f9dc1cf SHA512 bada6e99ceb833c8c6e74f4b3116c49f21b54b922c1a27668312552779b9e5ccebf380b41c781d49c1c0dd0fdff6de8b71a0dcaf1f992892593e85f4572238df WHIRLPOOL d286d76f38ee8a23b4b76a9070913abe901f4db273073d9c0dcef13004abe7e10e9b4cad451cfe8d0cd4cc1e0ac2ab28ed50f327c1b9d317689153658f7b8944
diff --git a/app-editors/atom/atom-1.12.2.ebuild b/app-editors/atom/atom-1.12.2.ebuild
new file mode 100644
index 00000000..70fdd96
--- /dev/null
+++ b/app-editors/atom/atom-1.12.2.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic 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.5
+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.5.0
+NODE_RUNAS_V=3.1.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELL_CHECK_V=0.68.4
+
+# textbuffer dependency
+MARKER_INDEX_V=4.0.1
+
+# apm dependency
+NODE_KEYTAR_V=3.0.2
+
+# atom-keymap dependency
+KEYBOARD_LAYOUT_V=2.0.1
+
+# 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/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
+ 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
+ marker-index
+"
+
+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}
+"
+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}" binmod_v
+ eval binmod_v=\${$(tr '[:lower:]' '[:upper:]' <<< ${binmod//-/_}_V)}
+ echo -n ${binmod}-${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-apm-path.patch"
+ eapply "${FILESDIR}/atom-license-path.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-apm-path.patch b/app-editors/atom/files/atom-apm-path.patch
index 957fed4..7ee7cdb 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/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
+--- a/build/app/src/config-schema.js
++++ b/build/app/src/config-schema.js
@@ -9,6 +9,11 @@
core: {
type: 'object',
diff --git a/app-editors/atom/files/atom-license-path.patch b/app-editors/atom/files/atom-license-path.patch
new file mode 100644
index 00000000..0ddf993
--- /dev/null
+++ b/app-editors/atom/files/atom-license-path.patch
@@ -0,0 +1,11 @@
+--- 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-python.patch b/app-editors/atom/files/atom-python.patch
index 250ca57..57a475e 100644
--- a/app-editors/atom/files/atom-python.patch
+++ b/app-editors/atom/files/atom-python.patch
@@ -1,5 +1,5 @@
---- ~atom.sh 2015-10-30 11:41:20.090417736 +0100
-+++ atom.sh 2015-10-30 11:42:19.707553644 +0100
+--- a/atom.sh
++++ b/atom.sh
@@ -92,6 +92,7 @@
fi
next reply other threads:[~2016-11-21 5:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-21 5:12 Göktürk Yüksek [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-11-10 22:37 [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/files/, app-editors/atom/ Patrice Clement
2018-11-10 22:37 Patrice Clement
2017-10-07 17:19 Patrice Clement
2016-11-21 5:12 Göktürk Yüksek
2016-09-20 6:12 Yixun Lan
2016-05-25 8:34 Patrice Clement
2016-05-10 11:28 Patrice Clement
2016-04-06 11:12 Heather Cynede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479705106.fa7a6c34df2baede60bd5b9134bf34753259ab1d.gokturk@gentoo \
--to=gokturk@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox