[gentoo-commits] repo/gentoo:master commit in: dev-lang/typescript/

[Maciej Barć]

commit:     d2db2a52517cd974644c04fea991131457661f1d
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 13:17:28 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 13:18:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2db2a52

dev-lang/typescript: update to EAPI 8; misc tweaks

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 ...ipt-4.8.3.ebuild => typescript-4.5.4-r1.ebuild} | 38 ++++++++++-----------
 dev-lang/typescript/typescript-4.5.4.ebuild        | 39 ----------------------
 ...ipt-4.8.3.ebuild => typescript-4.8.3-r1.ebuild} | 38 ++++++++++-----------
 3 files changed, 38 insertions(+), 77 deletions(-)

diff --git a/dev-lang/typescript/typescript-4.8.3.ebuild b/dev-lang/typescript/typescript-4.5.4-r1.ebuild
similarity index 50%
copy from dev-lang/typescript/typescript-4.8.3.ebuild
copy to dev-lang/typescript/typescript-4.5.4-r1.ebuild
index 647f4a120aee..02196457057b 100644
--- a/dev-lang/typescript/typescript-4.8.3.ebuild
+++ b/dev-lang/typescript/typescript-4.5.4-r1.ebuild
@@ -1,39 +1,39 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
-HOMEPAGE="https://www.typescriptlang.org"
+HOMEPAGE="https://www.typescriptlang.org/
+	https://github.com/microsoft/TypeScript/"
 SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+S="${WORKDIR}"/package
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
 
-DEPEND=""
 RDEPEND="net-libs/nodejs"
 BDEPEND=">=net-libs/nodejs-16[npm]"
 
-S="${WORKDIR}/package"
-
 src_compile() {
-	# nothing to compile here
+	# Skip, nothing to compile here.
 	:
 }
 
 src_install() {
-	npm \
-		--audit false \
-		--color false \
-		--foreground-scripts \
-		--global \
-		--offline \
-		--omit dev \
-		--prefix "${ED}"/usr \
-		--progress false \
-		--verbose \
-		install "${DISTDIR}/${P}".tgz || die "npm install failed"
-
-	einstalldocs
+	local myopts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}"/usr
+		--progress false
+		--verbose
+	)
+	npm ${myopts[@]} install "${DISTDIR}"/${P}.tgz || die "npm install failed"
+
+	dodoc *.md *.txt
 }

diff --git a/dev-lang/typescript/typescript-4.5.4.ebuild b/dev-lang/typescript/typescript-4.5.4.ebuild
deleted file mode 100644
index dcbc71b38d89..000000000000
--- a/dev-lang/typescript/typescript-4.5.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
-HOMEPAGE="https://www.typescriptlang.org"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DEPEND=""
-RDEPEND="net-libs/nodejs"
-BDEPEND=">=net-libs/nodejs-16[npm]"
-
-S="${WORKDIR}/package"
-
-src_compile() {
-	# nothing to compile here
-	:
-}
-
-src_install() {
-	npm \
-		--audit false \
-		--color false \
-		--foreground-scripts \
-		--global \
-		--offline \
-		--omit dev \
-		--prefix "${ED}"/usr \
-		--progress false \
-		--verbose \
-		install "${DISTDIR}/${P}".tgz || die "npm install failed"
-
-	einstalldocs
-}

diff --git a/dev-lang/typescript/typescript-4.8.3.ebuild b/dev-lang/typescript/typescript-4.8.3-r1.ebuild
similarity index 50%
rename from dev-lang/typescript/typescript-4.8.3.ebuild
rename to dev-lang/typescript/typescript-4.8.3-r1.ebuild
index 647f4a120aee..02196457057b 100644
--- a/dev-lang/typescript/typescript-4.8.3.ebuild
+++ b/dev-lang/typescript/typescript-4.8.3-r1.ebuild
@@ -1,39 +1,39 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
-HOMEPAGE="https://www.typescriptlang.org"
+HOMEPAGE="https://www.typescriptlang.org/
+	https://github.com/microsoft/TypeScript/"
 SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+S="${WORKDIR}"/package
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
 
-DEPEND=""
 RDEPEND="net-libs/nodejs"
 BDEPEND=">=net-libs/nodejs-16[npm]"
 
-S="${WORKDIR}/package"
-
 src_compile() {
-	# nothing to compile here
+	# Skip, nothing to compile here.
 	:
 }
 
 src_install() {
-	npm \
-		--audit false \
-		--color false \
-		--foreground-scripts \
-		--global \
-		--offline \
-		--omit dev \
-		--prefix "${ED}"/usr \
-		--progress false \
-		--verbose \
-		install "${DISTDIR}/${P}".tgz || die "npm install failed"
-
-	einstalldocs
+	local myopts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}"/usr
+		--progress false
+		--verbose
+	)
+	npm ${myopts[@]} install "${DISTDIR}"/${P}.tgz || die "npm install failed"
+
+	dodoc *.md *.txt
 }