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
