* [gentoo-commits] repo/proj/guru:master commit in: www-apps/code-server-bin/files/, www-apps/code-server-bin/
@ 2020-09-01 13:05 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2020-09-01 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 66c23f17e3a84935036a0acf3a804247887f697a
Author: Maciej Barć <xgqt <AT> protonmail <DOT> com>
AuthorDate: Mon Aug 31 14:11:04 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Aug 31 14:11:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66c23f17
www-apps/code-server-bin: rename the patch file
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Maciej Barć <xgqt <AT> protonmail.com>
www-apps/code-server-bin/code-server-bin-3.4.1.ebuild | 2 +-
.../{code-server-bin-3.4.1-node.patch => code-server-bin-node.patch} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
index 939c658..7446e32 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
PATCHES=(
- "${FILESDIR}/${PN}-${PV}-node.patch"
+ "${FILESDIR}/${PN}-node.patch"
)
src_prepare() {
diff --git a/www-apps/code-server-bin/files/code-server-bin-3.4.1-node.patch b/www-apps/code-server-bin/files/code-server-bin-node.patch
similarity index 72%
rename from www-apps/code-server-bin/files/code-server-bin-3.4.1-node.patch
rename to www-apps/code-server-bin/files/code-server-bin-node.patch
index 8bcfe36..ee4ce6c 100644
--- a/www-apps/code-server-bin/files/code-server-bin-3.4.1-node.patch
+++ b/www-apps/code-server-bin/files/code-server-bin-node.patch
@@ -5,4 +5,4 @@
ROOT="$(root)"
-exec "$ROOT/lib/node" "$ROOT" "$@"
-+exec node "$ROOT" --disable-telemetry "$@"
++exec node "${ROOT}" --disable-telemetry "${@}"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: www-apps/code-server-bin/files/, www-apps/code-server-bin/
@ 2020-12-19 10:09 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2020-12-19 10:09 UTC (permalink / raw
To: gentoo-commits
commit: b6a4f9695676610e1eee469c40d7f50c81a054fe
Author: Maciej Barć <xgqt <AT> protonmail <DOT> com>
AuthorDate: Sat Dec 19 06:26:08 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Dec 19 06:26:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b6a4f969
www-apps/code-server-bin: bump to 3.8.0; 0/12 slot; other misc fixes
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt <AT> protonmail.com>
www-apps/code-server-bin/Manifest | 2 ++
www-apps/code-server-bin/code-server-bin-3.4.1.ebuild | 17 ++++++++---------
www-apps/code-server-bin/code-server-bin-3.6.1.ebuild | 17 ++++++++---------
...er-bin-3.4.1.ebuild => code-server-bin-3.8.0.ebuild} | 17 ++++++++---------
.../code-server-bin/files/code-server-bin-node.patch | 2 +-
5 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index 6d4a66b6..832a710b 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -2,3 +2,5 @@ DIST code-server-3.4.1-linux-amd64.tar.gz 74127655 BLAKE2B 95e916e64c886688b3704
DIST code-server-3.4.1-linux-arm64.tar.gz 73470946 BLAKE2B 278a1fef95b612242f4126eea53d7b8dc824fc5dda55ff6b2f1e7752d3ebecebcf30045c1c2bb2a18d1ad7999b20c29398a3c5715920d6e8d8c94eaa76e8a619 SHA512 24168006e737a6579869b8e4b157e21d9ef85282b811783163f0d2291e47bee7e0794c8327663182922b473ff57999432e6c53502849836a53d300728341d1bc
DIST code-server-3.6.1-linux-amd64.tar.gz 76288261 BLAKE2B 443135065cdab9e0477d9665e9e56d924bd9199ce19cfbdea1e811c2517e7e71beaf18a347a287d0013d7df655900fc08a8f7fcbfe402b1e22487a80876d1eaa SHA512 0e875dc78a2776897a5a1556183808da70c8a0b2e4d96653a419bdab08df6f3d10643f90f568edeafcb38c36bfefa9fe0a674ad020b5e08c17b2e0eece940bc1
DIST code-server-3.6.1-linux-arm64.tar.gz 75331263 BLAKE2B c390e11b02472409ef0147f6dc5392f36eff93dd19a07e2eeed09a2626b541740c0191fdac0cca43e843b3195fc803921bf37b704b67a2e41fa0a531feca560c SHA512 badc150af52263232240edc16e960ac9e51b22e05bc96d81d11726e28d733b1d79139b0d85aa108011f2993c6a6e395134d2524e5fc13fe3b7dfeac24899eb75
+DIST code-server-3.8.0-linux-amd64.tar.gz 78942963 BLAKE2B 4c78ed40aec86a72dede21a82ae111884be5cba1958fb22d6353d63af98f6d3bab50c7ae1fa0b81079be6d035e84d873f4ebf00da76edaa15b2356e89b3d1261 SHA512 76cdbbdb63b3061ce9d1cb016466356d5184b83e742fc084d9a0376aa12dc9d68314061ea5cde93f6590b07862169cbd291f77b71dfadc4bee4140e277813ae8
+DIST code-server-3.8.0-linux-arm64.tar.gz 77939946 BLAKE2B c154561c308e5e233016f1b9b5f53647a2aaad12b73d27d1e84ee37234104048005b36cccdda5593973238ef279428b8f38309cad193a67afd87d77205eeb27c SHA512 0fe4a42eb1c50ae1d33f9c94e592ac8a3e69fad51abc1f5c90595a1588350e95f78bc2c44f728b3f155112f2db11e79b2227f2e847a45d58c87078d667119a1a
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
index d3bdc55e..81ec629c 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
@@ -4,8 +4,8 @@
EAPI=7
MY_PN="${PN/-bin/}"
-MY_PV="${MY_PN}-${PV}"
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-linux"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
inherit systemd
@@ -16,6 +16,7 @@ SRC_URI="
arm64? ( ${BASE_URI}-arm64.tar.gz )
"
+RESTRICT="test"
LICENSE="MIT"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm64"
@@ -26,16 +27,18 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- >=net-libs/nodejs-12.16.1[ssl]
+ >=net-libs/nodejs-12.16.1:0/12[ssl]
sys-apps/ripgrep
"
-S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
PATCHES=(
"${FILESDIR}/${PN}-node.patch"
)
+DOCS=( README.md ThirdPartyNotices.txt )
+
src_prepare() {
default
@@ -58,11 +61,7 @@ src_prepare() {
}
src_install() {
- local mydocs="README.md ThirdPartyNotices.txt"
- for doc in ${mydocs}
- do
- (dodoc "${doc}" && rm "${doc}") || die
- done
+ einstalldocs
insinto "/usr/lib/${MY_PN}"
doins -r .
diff --git a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
index d3bdc55e..81ec629c 100644
--- a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
@@ -4,8 +4,8 @@
EAPI=7
MY_PN="${PN/-bin/}"
-MY_PV="${MY_PN}-${PV}"
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-linux"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
inherit systemd
@@ -16,6 +16,7 @@ SRC_URI="
arm64? ( ${BASE_URI}-arm64.tar.gz )
"
+RESTRICT="test"
LICENSE="MIT"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm64"
@@ -26,16 +27,18 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- >=net-libs/nodejs-12.16.1[ssl]
+ >=net-libs/nodejs-12.16.1:0/12[ssl]
sys-apps/ripgrep
"
-S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
PATCHES=(
"${FILESDIR}/${PN}-node.patch"
)
+DOCS=( README.md ThirdPartyNotices.txt )
+
src_prepare() {
default
@@ -58,11 +61,7 @@ src_prepare() {
}
src_install() {
- local mydocs="README.md ThirdPartyNotices.txt"
- for doc in ${mydocs}
- do
- (dodoc "${doc}" && rm "${doc}") || die
- done
+ einstalldocs
insinto "/usr/lib/${MY_PN}"
doins -r .
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
similarity index 86%
copy from www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
copy to www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
index d3bdc55e..81ec629c 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
@@ -4,8 +4,8 @@
EAPI=7
MY_PN="${PN/-bin/}"
-MY_PV="${MY_PN}-${PV}"
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-linux"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
inherit systemd
@@ -16,6 +16,7 @@ SRC_URI="
arm64? ( ${BASE_URI}-arm64.tar.gz )
"
+RESTRICT="test"
LICENSE="MIT"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm64"
@@ -26,16 +27,18 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- >=net-libs/nodejs-12.16.1[ssl]
+ >=net-libs/nodejs-12.16.1:0/12[ssl]
sys-apps/ripgrep
"
-S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
PATCHES=(
"${FILESDIR}/${PN}-node.patch"
)
+DOCS=( README.md ThirdPartyNotices.txt )
+
src_prepare() {
default
@@ -58,11 +61,7 @@ src_prepare() {
}
src_install() {
- local mydocs="README.md ThirdPartyNotices.txt"
- for doc in ${mydocs}
- do
- (dodoc "${doc}" && rm "${doc}") || die
- done
+ einstalldocs
insinto "/usr/lib/${MY_PN}"
doins -r .
diff --git a/www-apps/code-server-bin/files/code-server-bin-node.patch b/www-apps/code-server-bin/files/code-server-bin-node.patch
index ee4ce6cd..9437a14b 100644
--- a/www-apps/code-server-bin/files/code-server-bin-node.patch
+++ b/www-apps/code-server-bin/files/code-server-bin-node.patch
@@ -5,4 +5,4 @@
ROOT="$(root)"
-exec "$ROOT/lib/node" "$ROOT" "$@"
-+exec node "${ROOT}" --disable-telemetry "${@}"
++exec node "${ROOT}" --disable-telemetry --disable-update-check "${@}"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: www-apps/code-server-bin/files/, www-apps/code-server-bin/
@ 2023-06-10 10:56 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-06-10 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 6a6e0013d14ed626692045b82795de5a41ccfba8
Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Fri Jun 9 07:19:25 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 07:20:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a6e0013
www-apps/code-server-bin: add OpenRC init script
Closes: https://bugs.gentoo.org/907847
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
.../code-server-bin-4.13.0-r1.ebuild | 105 +++++++++++++++++++++
.../code-server-bin/files/code-server-bin.conf | 13 +++
www-apps/code-server-bin/files/code-server-bin.rc | 47 +++++++++
3 files changed, 165 insertions(+)
diff --git a/www-apps/code-server-bin/code-server-bin-4.13.0-r1.ebuild b/www-apps/code-server-bin/code-server-bin-4.13.0-r1.ebuild
new file mode 100644
index 000000000..35845168a
--- /dev/null
+++ b/www-apps/code-server-bin/code-server-bin-4.13.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 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 WTFPL )
+ || ( BSD GPL-2 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ ${DEPEND}
+ >=net-libs/nodejs-16.0.0[ssl]
+ sys-apps/ripgrep
+ app-crypt/libsecret
+"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
+PATCHES=( "${FILESDIR}/${PN}-node.patch" )
+
+DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
+
+QA_PREBUILT="*"
+
+# Relative
+VSCODE_MODULES="lib/vscode/node_modules"
+
+QA_PRESTRIPPED="
+ opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
+ opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
+ opt/${PN}/${VSCODE_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 ./lib/node || die "Failed to remove bundled nodejs"
+
+ # remove bundled ripgrep binary
+ rm ./"${VSCODE_MODULES}"/@vscode/ripgrep/bin/rg \
+ || die "Failed to remove bundled ripgrep"
+
+ # Only required at build time
+ find "${S}" -type l -name python3 -delete || die
+
+ # not needed
+ rm ./postinstall.sh || die
+
+ # For windows
+ rm -r ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die
+
+ if [[ $ELIBC != "musl" ]]; then
+ 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() {
+ einstalldocs
+
+ insinto "/opt/${PN}"
+ doins -r .
+ fperms +x "/opt/${PN}/bin/${MY_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}/${PN}.service"
+ newinitd "${FILESDIR}/${PN}.rc" "${PN}"
+ newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+}
+
+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/files/code-server-bin.conf b/www-apps/code-server-bin/files/code-server-bin.conf
new file mode 100644
index 000000000..336f7bc71
--- /dev/null
+++ b/www-apps/code-server-bin/files/code-server-bin.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/code-server-bin: config file for /etc/init.d/code-server-bin.<user>
+# This can also be used as multiplexed configuration, i.e. openrc-run
+# looks for both /etc/conf.d/code-server-bin and /etc/conf.d/code-server-bin.<user>.
+
+# Options to pass to code-server-bin.
+# NOTE: if you want to run multiple instances, be make sure to change
+# the port for each one (it is preferred to use the configuration file).
+#command_args="--port 8080"
+
+# Specify the network service that corresponds to the "bind-addr" setting
+# in your configuration file. For example, if you bind to 127.0.0.1,
+# this should be set to "loopback" which provides the loopback interface.
+rc_need="loopback"
diff --git a/www-apps/code-server-bin/files/code-server-bin.rc b/www-apps/code-server-bin/files/code-server-bin.rc
new file mode 100644
index 000000000..445f05a64
--- /dev/null
+++ b/www-apps/code-server-bin/files/code-server-bin.rc
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+
+NAME=${RC_SVCNAME%%.*}
+USER=${RC_SVCNAME##*.}
+PIDFILE_DIR=/run/${NAME}/${USER}
+
+description="Start code server in the background"
+command="/usr/bin/${NAME}"
+command_user="${USER}"
+pidfile="${PIDFILE_DIR}/${NAME}.pid"
+command_background=true
+
+depend() {
+ use logger dns
+}
+
+checkconfig() {
+ if [ "${RC_VERSION:-0}" = "0" ]; then
+ eerror "This script cannot be used for baselayout-1."
+ return 1
+ fi
+
+ if [ "${USER}" = "${RC_SVCNAME}" ]; then
+ eerror "You have to create an init script for each user:"
+ eerror "ln -s emacs /etc/init.d/emacs.<user>"
+ return 1
+ fi
+
+ if ! id -u "${USER}" >/dev/null; then
+ eerror "${USER}: No such user"
+ return 1
+ fi
+
+ checkpath -d --owner 0 --mode 0755 "${PIDFILE_DIR%/*}"
+ checkpath -d --owner "${USER}" --mode 0755 "${PIDFILE_DIR}"
+}
+
+start() {
+ local home
+ checkconfig || return 1
+
+ eval home="~${USER}"
+
+ default_start
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-10 10:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-10 10:56 [gentoo-commits] repo/proj/guru:master commit in: www-apps/code-server-bin/files/, www-apps/code-server-bin/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2020-12-19 10:09 Andrew Ammerlaan
2020-09-01 13:05 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox