From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2035F138252 for ; Thu, 12 May 2016 08:30:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0C4021C01D; Thu, 12 May 2016 08:30:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AADB21C01D for ; Thu, 12 May 2016 08:30:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 370823407B8 for ; Thu, 12 May 2016 08:30:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DE3733E for ; Thu, 12 May 2016 08:30:20 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1463040928.eba335738e239f5b106d38e2526420f680574f11.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/atom/, app-editors/atom/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/atom/atom-1.7.3-r1.ebuild app-editors/atom/atom-1.7.3.ebuild app-editors/atom/files/gyp-unbundle.py X-VCS-Directories: app-editors/atom/files/ app-editors/atom/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: eba335738e239f5b106d38e2526420f680574f11 X-VCS-Branch: master Date: Thu, 12 May 2016 08:30:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7cb958a8-539d-43be-9496-0ffdcc4245d5 X-Archives-Hash: 06fc258913b2bf9aebabd41da96f64f2 commit: eba335738e239f5b106d38e2526420f680574f11 Author: Elvis Pranskevichus magic io> AuthorDate: Wed May 11 14:51:18 2016 +0000 Commit: Patrice Clement gentoo 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 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