From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5FB0B158090 for ; Fri, 6 May 2022 05:21:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF7E9E0898; Fri, 6 May 2022 05:21:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CCDAE0898 for ; Fri, 6 May 2022 05:21:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52B98341CBC for ; Fri, 6 May 2022 05:21:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85AE944B for ; Fri, 6 May 2022 05:21:43 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1651814386.553eb1d927158864d66881473770799759c6e6ea.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch X-VCS-Directories: net-libs/nodejs/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 553eb1d927158864d66881473770799759c6e6ea X-VCS-Branch: master Date: Fri, 6 May 2022 05:21:43 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4462fefc-00df-4a36-b60e-ed916b001728 X-Archives-Hash: 25af29e5be502ea2a47d3a8e82d3b1e5 commit: 553eb1d927158864d66881473770799759c6e6ea Author: Joonas Niilola gentoo org> AuthorDate: Fri May 6 05:19:46 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri May 6 05:19:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553eb1d9 net-libs/nodejs: remove unneeded patch Signed-off-by: Joonas Niilola gentoo.org> .../files/nodejs-12.22.10-global-npm-config.patch | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch b/net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch deleted file mode 100644 index 09d9dbe47be0..000000000000 --- a/net-libs/nodejs/files/nodejs-12.22.10-global-npm-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js -index 36420b3450..0afb0b6792 100644 ---- a/deps/npm/lib/config/core.js -+++ b/deps/npm/lib/config/core.js -@@ -151,11 +151,10 @@ function load_ (builtin, rc, cli, cb) { - // Eg, `npm config get globalconfig --prefix ~/local` should - // return `~/local/etc/npmrc` - // annoying humans and their expectations! -- if (conf.get('prefix')) { -- var etc = path.resolve(conf.get('prefix'), 'etc') -- defaults.globalconfig = path.resolve(etc, 'npmrc') -- defaults.globalignorefile = path.resolve(etc, 'npmignore') -- } -+ // gentoo deviates wrt global config; store in /etc/npm -+ var globalconfig = path.resolve('/etc', 'npm') -+ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') -+ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') - - conf.addFile(conf.get('globalconfig'), 'global') -