[gentoo-commits] repo/user/ssnb:master commit in: dev-nodejs/sellside-emitter/, eclass/

[gentoo-commits] repo/user/ssnb:master commit in: dev-nodejs/sellside-emitter/, eclass/

[Samuel Bernardo]

commit:     1478d88285b8402ec8257169580a3432be59f8d2
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 00:59:02 2020 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sat Jun 13 00:59:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=1478d882

Correct url for sellside-emitter and improve npm.eclass to allow to select a group diferent from the npm package name

Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 dev-nodejs/sellside-emitter/Manifest                      |  4 ++--
 dev-nodejs/sellside-emitter/sellside-emitter-1.2.1.ebuild |  3 ++-
 eclass/npm.eclass                                         | 12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dev-nodejs/sellside-emitter/Manifest b/dev-nodejs/sellside-emitter/Manifest
index 7e803aa..0beaf54 100644
--- a/dev-nodejs/sellside-emitter/Manifest
+++ b/dev-nodejs/sellside-emitter/Manifest
@@ -1,3 +1,3 @@
-DIST %40sellside%2Femitter-1.2.1.tgz 4515 BLAKE2B db44371979be00abfdb832b9f86f7d421df0e46d7ed9f4d48845c4b877781d5807d6e51e34b9e2912e4edc220954b97a773113147e39ed747332b3619d30709a SHA512 3f5ad469de2f0e7a787791c1ecd109fcc0dfe33837a4cd90f195c9db1806906a39c9c9320e7e7a60f02f5061fed55b0eb9de5d6e58bc319bb5e23fc470d6421b
-EBUILD sellside-emitter-1.2.1.ebuild 354 BLAKE2B 1b2f2323ef593d59b5a9d6c25ebe370798df4171e548754a4a074370234a082f85ad98218470ac90ca7bc64531a2e760417d2271e1e25e7f096d36852c84007b SHA512 d5e7accf0993791e671104345ce7690843d1dd9d76b1e5517493ac9c3f87c538727339fa90494e71c4661a6130eec55c61cbbf0af5ea7eb8bfc34f723cecb57c
+DIST emitter-1.2.1.tgz 4515 BLAKE2B db44371979be00abfdb832b9f86f7d421df0e46d7ed9f4d48845c4b877781d5807d6e51e34b9e2912e4edc220954b97a773113147e39ed747332b3619d30709a SHA512 3f5ad469de2f0e7a787791c1ecd109fcc0dfe33837a4cd90f195c9db1806906a39c9c9320e7e7a60f02f5061fed55b0eb9de5d6e58bc319bb5e23fc470d6421b
+EBUILD sellside-emitter-1.2.1.ebuild 374 BLAKE2B f53dad0fad247aa77a366d3b2522bf1f0b75e80c14273beedfd8dff2cfeb58840b1075de3f79c1be2de1ff50946949cd37430997a70c731be0e3a22043fe3799 SHA512 2f3d309989b48bdd91403cd4d5dcc615c84fcdeed986a28d8db610f0efb1ac23c76dc033ffe44b6c005cf8d53f8901cfb5c22424c436e0f66581f43fd11e77bd
 MISC metadata.xml 159 BLAKE2B 1874e3af4a6c7f7ae7f3e6d4c497285da514376330d15173d0b667317398c37989e85c7fa71cff0b53c1fdd3e6358955b1ad12238b324b9cc174afe0fca5ce2d SHA512 0d6d278aef7bd376d99b4f23af5d26573e625e50864403c2dd0f5c253a4f7ddd5e8dcccc3363ddddf154cbf020a7ecd9d3ecb64e0e4c144860602ae2aee9cd50

diff --git a/dev-nodejs/sellside-emitter/sellside-emitter-1.2.1.ebuild b/dev-nodejs/sellside-emitter/sellside-emitter-1.2.1.ebuild
index 99a9b3e..33c6fbf 100644
--- a/dev-nodejs/sellside-emitter/sellside-emitter-1.2.1.ebuild
+++ b/dev-nodejs/sellside-emitter/sellside-emitter-1.2.1.ebuild
@@ -5,7 +5,8 @@
 EAPI=6
 
 NPM_MODULE="@sellside/emitter"
-NPM_PN_URI="%40sellside%2Femitter"
+NPM_GROUP_URI="@sellside/emitter"
+NPM_PN_URI="emitter"
 
 inherit npm
 

diff --git a/eclass/npm.eclass b/eclass/npm.eclass
index 3ec0bf5..a0f7271 100644
--- a/eclass/npm.eclass
+++ b/eclass/npm.eclass
@@ -65,8 +65,18 @@ if [[ -z $NPM_PN_URI ]]; then
 	NPM_PN_URI="${PN}"
 fi
 
+# @ECLASS-VARIABLE: NPM_GROUP_URI
+# @DESCRIPTION:
+# Name of the group at the npm registry. 
+# The Default value for NPM_GROUP_URI is ${NPM_PN_URI}
+#
+# Example: NPM_GROUP_URI="${MY_PN}"
+if [[ -z $NPM_GROUP_URI ]]; then
+	NPM_GROUP_URI="${NPM_PN_URI}"
+fi
+
 HOMEPAGE="https://www.npmjs.org/package/${NPM_PN_URI}"
-SRC_URI="http://registry.npmjs.org/${NPM_PN_URI}/-/${NPM_PN_URI}-${PV}.tgz"
+SRC_URI="http://registry.npmjs.org/${NPM_GROUP_URI}/-/${NPM_PN_URI}-${PV}.tgz"
 
 # @FUNCTION: npm-src_unpack
 # @DESCRIPTION: