[gentoo-commits] repo/proj/guru:dev commit in: www-apps/code-server-bin/, www-apps/code-server-bin/files/

[Leonardo Hernandez]

commit:     9fc03881ea9d691d839ba27384d2d94d3f54bfba
Author:     Leonardo Hernández Hernández <leohdz172 <AT> outlook <DOT> com>
AuthorDate: Tue Aug  2 19:29:20 2022 +0000
Commit:     Leonardo Hernandez <leohdz172 <AT> outlook <DOT> com>
CommitDate: Tue Aug  2 19:49:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9fc03881

www-apps/code-server-bin: drop old, add 4.5.1

Closes: https://bugs.gentoo.org/838835
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> outlook.com>

 www-apps/code-server-bin/Manifest                  |   6 +-
 .../code-server-bin/code-server-bin-4.1.0.ebuild   | 132 ---------------------
 ...n-4.3.0.ebuild => code-server-bin-4.5.1.ebuild} |  20 ++--
 ...code-server.service => code-server-bin.service} |   4 +-
 4 files changed, 15 insertions(+), 147 deletions(-)

diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index e28bc2a7f..cf97e193e 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -1,4 +1,2 @@
-DIST code-server-4.1.0-linux-amd64.tar.gz 189936485 BLAKE2B 002f90ffd550061cb9161776559a4ca2562c682aa7737bb5213bfb657d792b8ba92f8132d33b741d53c0f6eb2988f1e5703af3380b184bc97e44d4e29053bb97 SHA512 33d77d08e7401c7d7b87da6c217e4504b813aa2a6045bff4aaacda7b1ff73cbcddeeb6e4b844d6ddfbde26cce42179098c60bec5ecc960a6c54b2ebc7a726c6a
-DIST code-server-4.1.0-linux-arm64.tar.gz 186692988 BLAKE2B 6379d9bbcea11f3c68eb281abe820c4740bdc19699292c80b7aa42a442478f5964a06a965aac0719f110b9e08431d5a9359484130203cedcc3ad3b38e3a70388 SHA512 a3750e7468037951342772d578a08defd65de1694c649161c6027980920fba9b079ecf63ac7ae05731afc209e4fa4020be857a563a4b599c22bb5d867c5d47c7
-DIST code-server-4.3.0-linux-amd64.tar.gz 95902305 BLAKE2B 37fd4c821c2d9fde01c483cba9657632d8d07ce7af3a884aa959c7ff722d25300d822dac84e0a173e9f8eedc0e49f5f52ca7779b850e5b3007516f7c6bf2e569 SHA512 9f7fc56b69a928dcd348cf27ce65a93b2732b9001cc51388807aa78e68a31ba4a8c891b93b079efe27196069c5a4530c0c15e78070b86922262fa4f61adbda83
-DIST code-server-4.3.0-linux-arm64.tar.gz 87052785 BLAKE2B 0255e8779e3e9b4ad74f512e2ae70a40bc1b72ee43140d095a7cc5d4444337b4b8b61d6d4d1408b5abd6d8e36d0e5911732c0330cdd8a2667c70b9cde47ca9fd SHA512 8df885698addff944afc4b69f743ec14f464eb00d3ddd61e8e9665a130aaacb6487db65d549ec401bbda2c81631c9b088c3950551e26672f3be93a804913787e
+DIST code-server-4.5.1-linux-amd64.tar.gz 99839294 BLAKE2B a72b14b8647b8814d4c79e84f2cf0ef09f8db5462bb1a4611cb65c089e9dea24d72bda3a20ac3a606d7c5ff2f62e23b0d53daec0444421ad3d302343e947468b SHA512 d53f2187830617ce83a0b23ad7258571436fe0d2e259a2d2f0f5869c6588c68974ddcc1871a5eb09c5106e32460732a3449a1d4b0a5d14b921061eea080e89fc
+DIST code-server-4.5.1-linux-arm64.tar.gz 90931432 BLAKE2B 829c405c4b47339dad4bcc883433716e2f2da2b64e90b461fa8fb12f61414768a0705624c01f1eb13fc984a09fe1d8ce15c36aefd33afcd8406af7688d58a552 SHA512 91f1554c0505eefc717ea6f479fa6d7560c1abd121934842e333775d0a01a205dea203914d223a8c4ea69edd65203a557243e4a4fe040e0833531e77a31e5398

diff --git a/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild
deleted file mode 100644
index 49963aa49..000000000
--- a/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-MY_P="${MY_PN}-${PV}"
-BASE_URI="https://github.com/coder/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
-
-inherit systemd
-
-DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)"
-HOMEPAGE="https://coder.com/"
-SRC_URI="
-	amd64? ( ${BASE_URI}-amd64.tar.gz )
-	arm64? ( ${BASE_URI}-arm64.tar.gz )
-"
-
-RESTRICT="test"
-LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
-	|| ( BSD-2 MIT Apache-2.0 )
-	|| ( MIT CC0-1.0 )
-	|| ( MIT WTFPL )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="gnome-keyring"
-
-RDEPEND="
-	${DEPEND}
-	>=net-libs/nodejs-14[ssl]
-	sys-apps/ripgrep
-	gnome-keyring? (
-		app-crypt/libsecret
-	)
-"
-
-S="${WORKDIR}/${MY_P}-linux-${ARCH}"
-
-PATCHES=( "${FILESDIR}/${PN}-node.patch" )
-
-DOCS=( "README.md" "ThirdPartyNotices.txt" )
-
-# Relative to parent
-CODE_OSS_MODULES="vendor/modules/code-oss-dev/node_modules"
-
-QA_PREBUILT="
-	opt/${PN}/lib/coder-cloud-agent
-	opt/${PN}/node_modules/argon2/lib/binding/napi-v3/argon2.node
-	opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/argon2.node
-	opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/obj.target/argon2.node
-	opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
-	opt/${PN}/node_modules/@node-rs/argon2-linux-x64-gnu/argon2.linux-x64-gnu.node
-	opt/${PN}/${CODE_OSS_MODULES}/native-is-elevated/build/Release/obj.target/iselevated.node
-	opt/${PN}/${CODE_OSS_MODULES}/native-is-elevated/build/Release/iselevated.node
-	opt/${PN}/${CODE_OSS_MODULES}/node-pty/build/Release/pty.node
-	opt/${PN}/${CODE_OSS_MODULES}/native-watchdog/build/Release/obj.target/watchdog.node
-	opt/${PN}/${CODE_OSS_MODULES}/native-watchdog/build/Release/watchdog.node
-	opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
-	opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node
-	opt/${PN}/${CODE_OSS_MODULES}/spdlog/build/Release/obj.target/spdlog.node
-	opt/${PN}/${CODE_OSS_MODULES}/spdlog/build/Release/spdlog.node
-	opt/${PN}/${CODE_OSS_MODULES}/vscode-nsfw/build/Release/obj.target/nsfw.node
-	opt/${PN}/${CODE_OSS_MODULES}/vscode-nsfw/build/Release/nsfw.node
-	opt/${PN}/${CODE_OSS_MODULES}/@vscode/sqlite3/build/Release/obj.target/sqlite.node
-	opt/${PN}/${CODE_OSS_MODULES}/@vscode/sqlite3/build/Release/sqlite.node
-	opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/build/Release/watcher.node
-	opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/build/Release/obj.target/watcher.node
-"
-
-QA_PRESTRIPPED="
-	opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
-	opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
-	opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node
-"
-
-src_prepare() {
-	default
-
-	# We remove as much precompiled code as we can,
-	# node modules not written in JS cannot be removed
-	# thus "-bin".
-
-	# use system node
-	rm ./node ./lib/node \
-		|| die "Failed to remove bundled nodejs"
-
-	# remove bundled ripgrep binary
-	rm ./"${CODE_OSS_MODULES}"/vscode-ripgrep/bin/rg \
-		|| die "Failed to remove bundled ripgrep"
-
-	# not needed
-	rm ./code-server || die
-	rm ./postinstall.sh || die
-
-	# already in /usr/portage/licenses/MIT
-	rm ./LICENSE.txt || die
-
-	# For windows
-	rm -rf ./"${CODE_OSS_MODULES}"/windows-foreground-love || die
-	rm -rf ."${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die
-
-	if [[ $ELIBC != "musl" ]]; then
-		rm -rf ./node_modules/@node-rs/argon2-linux-x64-musl || die
-		rm ./"${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die
-	elif [[ $ELIBC != "glibc" ]]; then
-		rm ./"${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die
-	fi
-
-	# We don't need electron
-	rm -rf ./"${CODE_OSS_MODULES}"/electron || die
-	rm ./"${CODE_OSS_MODULES}"/.bin/electron
-}
-
-src_install() {
-	einstalldocs
-
-	insinto "/opt/${PN}"
-	doins -r .
-	fperms +x "/opt/${PN}/bin/${MY_PN}"
-	dosym -r "/opt/${PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${PN}"
-
-	dosym -r "/usr/bin/rg" \
-		"${EPREFIX}/opt/${PN}/${CODE_OSS_MODULES}/vscode-ripgrep/bin/rg"
-
-	systemd_douserunit "${FILESDIR}/${MY_PN}.service"
-}
-
-pkg_postinst() {
-	elog "When using code-server systemd service run it as a user"
-	elog "For example: 'systemctl --user enable --now code-server'"
-}

diff --git a/www-apps/code-server-bin/code-server-bin-4.3.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.5.1.ebuild
similarity index 86%
rename from www-apps/code-server-bin/code-server-bin-4.3.0.ebuild
rename to www-apps/code-server-bin/code-server-bin-4.5.1.ebuild
index c8e1add58..9c32a8ba2 100644
--- a/www-apps/code-server-bin/code-server-bin-4.3.0.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.5.1.ebuild
@@ -18,7 +18,6 @@ SRC_URI="
 RESTRICT="test"
 LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 	|| ( BSD-2 MIT Apache-2.0 )
-	|| ( MIT CC0-1.0 )
 	|| ( MIT WTFPL )
 "
 SLOT="0"
@@ -27,7 +26,7 @@ IUSE="gnome-keyring"
 
 RDEPEND="
 	${DEPEND}
-	>=net-libs/nodejs-14.0[ssl]
+	>=net-libs/nodejs-16.0.0[ssl]
 	sys-apps/ripgrep
 	gnome-keyring? (
 		app-crypt/libsecret
@@ -38,9 +37,9 @@ S="${WORKDIR}/${MY_P}-linux-${ARCH}"
 
 PATCHES=( "${FILESDIR}/${PN}-node.patch" )
 
-DOCS=( "README.md" "ThirdPartyNotices.txt" "LICENSE" )
+DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
 
-# Relative to parent
+# Relative
 VSCODE_MODULES="lib/vscode/node_modules"
 
 QA_PREBUILT="
@@ -93,15 +92,17 @@ src_prepare() {
 	rm ./postinstall.sh || die
 
 	# For windows
-	rm -rf ./"${VSCODE_MODULES}"/windows-foreground-love || die
-	rm -rf ."${VSCODE_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die
+	rm -r ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die
 
 	if [[ $ELIBC != "musl" ]]; then
-		rm -rf ./node_modules/@node-rs/argon2-linux-x64-musl || die
 		rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die
 	elif [[ $ELIBC != "glibc" ]]; then
 		rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die
+		rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/darwin-x64/node.napi.glibc.node || die
+		rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/darwin-arm64/node.napi.glibc.node || die
 	fi
+
+	rm -r ./lib/vscode/extensions/node_modules/.bin || die
 }
 
 src_install() {
@@ -110,12 +111,13 @@ src_install() {
 	insinto "/opt/${PN}"
 	doins -r .
 	fperms +x "/opt/${PN}/bin/${MY_PN}"
-	dosym -r "/opt/${PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${PN}"
+	dosym -r "/opt/${PN}/bin/${MY_PN}" "/opt/${PN}/bin/${PN}"
+	dosym -r "/opt/${PN}/bin/${PN}" "${EPREFIX}/usr/bin/${PN}"
 
 	dosym -r "/usr/bin/rg" \
 		"${EPREFIX}/opt/${PN}/${VSCODE_MODULES}/@vscode/ripgrep/bin/rg"
 
-	systemd_douserunit "${FILESDIR}/${MY_PN}.service"
+	systemd_douserunit "${FILESDIR}/${PN}.service"
 }
 
 pkg_postinst() {

diff --git a/www-apps/code-server-bin/files/code-server.service b/www-apps/code-server-bin/files/code-server-bin.service
similarity index 61%
rename from www-apps/code-server-bin/files/code-server.service
rename to www-apps/code-server-bin/files/code-server-bin.service
index a2f48e938..56e609266 100644
--- a/www-apps/code-server-bin/files/code-server.service
+++ b/www-apps/code-server-bin/files/code-server-bin.service
@@ -1,10 +1,10 @@
 [Unit]
-Description=code-server
+Description=code-server-bin
 After=network.target
 
 [Service]
 Type=exec
-ExecStart=/usr/bin/code-server
+ExecStart=/usr/bin/code-server-bin
 Restart=always
 
 [Install]