main/nodejs: rename subpackage nodejs-npm to npm

npm is bundled in node.js, but it's a standalone project with its
own release cycle. This aport provides LTS version of node.js, i.e.
an old npm version. So it'd be better to extract it into a separate
aport; this is a preparation for that.

community/kiwiirc/APKBUILD

@@ -9,7 +9,7 @@ url="https://www.kiwiirc.com/"
 arch="noarch"
 license="AGPL-3.0"
 depends="nodejs>=0.10.0"
-makedepends="nodejs nodejs-npm"
+makedepends="nodejs npm"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 pkgusers="kiwiirc"

main/nodejs/APKBUILD

@@ -26,7 +26,7 @@ pkgname=nodejs
 # Note: Update only to even-numbered versions (e.g. 6.y.z, 8.y.z)!
 # Odd-numbered versions are supported only for 9 months by upstream.
 pkgver=8.11.3
-pkgrel=0
+pkgrel=1
 pkgdesc="JavaScript runtime built on V8 engine - LTS version"
 url="https://nodejs.org/"
 arch="all"
@@ -36,7 +36,7 @@ depends_dev="libuv"
 # gold is needed for mksnapshot
 makedepends="$depends_dev python2 openssl-dev zlib-dev libuv-dev linux-headers
 	paxmark binutils-gold http-parser-dev ca-certificates c-ares-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-npm::noarch"
+subpackages="$pkgname-dev $pkgname-doc npm::noarch"
 provides="nodejs-lts=$pkgver"  # for backward compatibility
 replaces="nodejs-current nodejs-lts"  # nodejs-lts for backward compatibility
 source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz
@@ -100,8 +100,9 @@ dev() {
 npm() {
 	pkgdesc="A package manager for JavaScript"
 	depends="$pkgname"
-	provides="nodejs-current-npm"  # for backward compatibility
-	replaces="nodejs-current-npm $pkgname"  # $pkgname for backward compatibility
+	# for backward compatibility
+	provides="nodejs-npm=$pkgver-r$pkgrel nodejs-current-npm=$pkgver-r$pkgrel"
+	replaces="nodejs-npm nodejs-current-npm $pkgname"
 
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/np[mx] "$subpkgdir"/usr/bin/

testing/node-sodium/APKBUILD

@@ -9,7 +9,7 @@ url="https://github.com/paixaop/node-sodium"
 arch="x86 x86_64"
 license="MIT"
 depends="nodejs"
-makedepends="libsodium-dev=1.0.11-r0 python2 nodejs-npm"
+makedepends="libsodium-dev=1.0.11-r0 python2 npm"
 source="$pkgname-$pkgver.tar.gz::https://github.com/paixaop/$pkgname/archive/$pkgver.tar.gz
 fix-gyp-binding.patch
 remove-preinstall.patch

testing/zerotier-one/APKBUILD

@@ -8,7 +8,7 @@ url="https://www.zerotier.com/"
 arch="x86_64 ppc64le"
 license="GPL-3.0"
 depends=""
-makedepends="nodejs-npm linux-headers"
+makedepends="npm linux-headers"
 install=""
 subpackages="$pkgname-doc"
 source="