From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1123993-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B507F138334
for <garchives@archives.gentoo.org>; Wed, 20 Nov 2019 12:15:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 244BCE08C2;
Wed, 20 Nov 2019 12:15:24 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id F378FE08C2
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Nov 2019 12:15:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CD1A434D13B
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Nov 2019 12:15:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 039A98BB
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Nov 2019 12:15:21 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1574252113.aaa41b69535aac00ba32b1f48c711bb7aaa36fb4.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/nodejs/nodejs-13.0.1.ebuild net-libs/nodejs/nodejs-13.1.0.ebuild net-libs/nodejs/nodejs-99999999.ebuild
X-VCS-Directories: net-libs/nodejs/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: aaa41b69535aac00ba32b1f48c711bb7aaa36fb4
X-VCS-Branch: master
Date: Wed, 20 Nov 2019 12:15:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 04834aba-b4f3-46b9-b38b-64614d13ceb3
X-Archives-Hash: 20721fc8a96b94ea94559e6b6fc45a91
commit: aaa41b69535aac00ba32b1f48c711bb7aaa36fb4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 12:12:55 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 12:15:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa41b69
net-libs/nodejs: Update python interpreter configuration
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-libs/nodejs/nodejs-13.0.1.ebuild | 7 ++-----
net-libs/nodejs/nodejs-13.1.0.ebuild | 7 ++-----
net-libs/nodejs/nodejs-99999999.ebuild | 7 ++-----
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/net-libs/nodejs/nodejs-13.0.1.ebuild b/net-libs/nodejs/nodejs-13.0.1.ebuild
index 64dd1ca4d15..56bbeb5526f 100644
--- a/net-libs/nodejs/nodejs-13.0.1.ebuild
+++ b/net-libs/nodejs/nodejs-13.0.1.ebuild
@@ -60,9 +60,6 @@ src_prepare() {
# https://code.google.com/p/gyp/issues/detail?id=260
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -119,7 +116,7 @@ src_configure() {
GYP_DEFINES="linux_use_gold_flags=0
linux_use_bundled_binutils=0
linux_use_bundled_gold=0" \
- "${PYTHON}" configure \
+ "${EPYTHON}" configure.py \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
$(use_with systemtap dtrace) \
@@ -192,7 +189,7 @@ src_install() {
src_test() {
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
}
pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-13.1.0.ebuild b/net-libs/nodejs/nodejs-13.1.0.ebuild
index 64dd1ca4d15..56bbeb5526f 100644
--- a/net-libs/nodejs/nodejs-13.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.1.0.ebuild
@@ -60,9 +60,6 @@ src_prepare() {
# https://code.google.com/p/gyp/issues/detail?id=260
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -119,7 +116,7 @@ src_configure() {
GYP_DEFINES="linux_use_gold_flags=0
linux_use_bundled_binutils=0
linux_use_bundled_gold=0" \
- "${PYTHON}" configure \
+ "${EPYTHON}" configure.py \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
$(use_with systemtap dtrace) \
@@ -192,7 +189,7 @@ src_install() {
src_test() {
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
}
pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e5e6f8a9d81..e36828c990a 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -56,9 +56,6 @@ src_prepare() {
# https://code.google.com/p/gyp/issues/detail?id=260
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -115,7 +112,7 @@ src_configure() {
GYP_DEFINES="linux_use_gold_flags=0
linux_use_bundled_binutils=0
linux_use_bundled_gold=0" \
- "${PYTHON}" configure \
+ "${EPYTHON}" configure.py \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
$(use_with systemtap dtrace) \
@@ -188,7 +185,7 @@ src_install() {
src_test() {
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
}
pkg_postinst() {