From 4892001b00c9bd1955de6084249a57ec5e8e0376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Fri, 21 Jul 2023 19:35:16 -0600 Subject: [PATCH 1/8] www-apps/code-server-bin: drop 4.12.0-r1, 4.13.0, 4.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonardo Hernández Hernández --- www-apps/code-server-bin/Manifest | 4 - .../code-server-bin-4.12.0-r1.ebuild | 103 ----------------- .../code-server-bin-4.13.0.ebuild | 103 ----------------- .../code-server-bin-4.14.0.ebuild | 105 ------------------ 4 files changed, 315 deletions(-) delete mode 100644 www-apps/code-server-bin/code-server-bin-4.12.0-r1.ebuild delete mode 100644 www-apps/code-server-bin/code-server-bin-4.13.0.ebuild delete mode 100644 www-apps/code-server-bin/code-server-bin-4.14.0.ebuild diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest index c666fe8725..22962e599b 100644 --- a/www-apps/code-server-bin/Manifest +++ b/www-apps/code-server-bin/Manifest @@ -1,8 +1,4 @@ -DIST code-server-4.12.0-linux-amd64.tar.gz 97828967 BLAKE2B 60089c914ba94eff0bfa142254635188c138553ce81e66aff8f24f6be9a1a7bc35efc5d900e010437e7cdcb2209c55cf988a9c88d65b063bcc0eb233d0a7b929 SHA512 5ef36f8d3b3838ce1b30f460748f44e89f77843e6b8fec18bbb4b69028558c041b1b31af576f51693091d6f8e2b9bd03d94a8c4e3f7389b613dae8986f64cb6a -DIST code-server-4.12.0-linux-arm64.tar.gz 96637295 BLAKE2B ab842644f50871e97016c08e9470fa24ae2a1d2b4dc344faf7a45153595deed6cd88146adbf1871db2082a0a06a0d12fc50eb588c7307f51d9737cb5c6b230f1 SHA512 dc09e21ff35f987cdb7f5b62d2133b53af5f634b747a13b7fe9cff0c6be61a93950b1e23a8869206b8ed3544bb34221d2c38d6fb25d176e8136ebd0d255fe7ad DIST code-server-4.13.0-linux-amd64.tar.gz 97870904 BLAKE2B 320b845f1cca424c52022795bd77d1646786dfa1582944aa402e49e877c90af32a069662af5bd8385671118f74d4f66bfc95d4d1f875e865f74fd81732290559 SHA512 e7f50fb0bff5dbe5b075d6c1410f056f0e78e790eeab91fd0fa9596b1c52b8243798f10d5f609beb0288f965eb40b4519a0ad83972804f52dc1b88e456d91a7f DIST code-server-4.13.0-linux-arm64.tar.gz 96675774 BLAKE2B 4c117fa6e0c06b5203863ae1a35d5a57e36c0bc339ddf009ff106efbf3a0207ea9deb9efbf868a14f9c0bf64e3034c626d99647073c90fa9c4dd59b938b2e0ae SHA512 04478cc1280326fede817549e21a086f1f0281a79b52059a1523246f42d024463a7aac61f443b6441e10f202558889ad9cb63c962f4a075cd78c14b00318d5b9 -DIST code-server-4.14.0-linux-amd64.tar.gz 98653504 BLAKE2B 342363a9c00894b65e716352c14b87230704e47ddb068079b25957577a90c1dddf77cfbdc715261d6eb849a5f2569401cb062c0fe6f804c8e60169855b5b2212 SHA512 7772397d5abc0a290a15899346a5dcbe8eec5bc44948a5845ed23758ecec1fd0f21e8ab0ac413053b1e36ccc5c69e877ed01fce1d0f09ebf12aa3e96b0483ee4 -DIST code-server-4.14.0-linux-arm64.tar.gz 97470074 BLAKE2B 414da8e74184672201772470d940a4a323b5f0757962b7d753556420693f46c334235c0e5d5f12ab5372ca28b44bea2f630185deb8efd7a81fe5c50aed1cbd27 SHA512 ac303aa02719a897941f2d117168395d590f2efa366cc2b8a90699ef265032183f3a8c221451cb0f3228ecc13767fc896a903adfdac7e636782f262b44b69f0c DIST code-server-4.14.1-linux-amd64.tar.gz 98672270 BLAKE2B 9b7389b3578209391ac0c4a622e4e9a8bdb2bfcbc3f9eda5b26264b122273777819d097f6fa03114429a7bdc4ab7ac943bb104683b5867e3df248171551548d9 SHA512 1d70f5dbc4f4605d5fd254df117d34c8b05fc33085c27c909f8ec73d5ef9a3d71bb11617b38a6fa3dc32138c6df92db0555c14ede814b6868cb43acec182c70a DIST code-server-4.14.1-linux-arm64.tar.gz 97486113 BLAKE2B d918d2a7f5f0be73f26408d9bb0f4a499d98044da58b19dce1146508c9a68cdf8abfb577789a70fc15658c2265b1fc548f9ed96fbf69859a5993d0218d3cca0f SHA512 70db38d528ea24446859eab61c9a502e901dc325f15a50bc5788acf42bd49e29750350748a1534dbaaceb59fd1654d43e2092a481fae0768916031d07ad1e501 diff --git a/www-apps/code-server-bin/code-server-bin-4.12.0-r1.ebuild b/www-apps/code-server-bin/code-server-bin-4.12.0-r1.ebuild deleted file mode 100644 index 09b0e996ed..0000000000 --- a/www-apps/code-server-bin/code-server-bin-4.12.0-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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" -} - -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.13.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.13.0.ebuild deleted file mode 100644 index 09b0e996ed..0000000000 --- a/www-apps/code-server-bin/code-server-bin-4.13.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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" -} - -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.14.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.14.0.ebuild deleted file mode 100644 index 35845168af..0000000000 --- a/www-apps/code-server-bin/code-server-bin-4.14.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# 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'" -} From 3186b48ffc09274b77d7353e043e479639b003d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Fri, 21 Jul 2023 19:41:44 -0600 Subject: [PATCH 2/8] www-apps/code-server-bin: add 4.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonardo Hernández Hernández --- www-apps/code-server-bin/Manifest | 2 + .../code-server-bin-4.15.0.ebuild | 105 ++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 www-apps/code-server-bin/code-server-bin-4.15.0.ebuild diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest index 22962e599b..addd04f0dd 100644 --- a/www-apps/code-server-bin/Manifest +++ b/www-apps/code-server-bin/Manifest @@ -2,3 +2,5 @@ DIST code-server-4.13.0-linux-amd64.tar.gz 97870904 BLAKE2B 320b845f1cca424c5202 DIST code-server-4.13.0-linux-arm64.tar.gz 96675774 BLAKE2B 4c117fa6e0c06b5203863ae1a35d5a57e36c0bc339ddf009ff106efbf3a0207ea9deb9efbf868a14f9c0bf64e3034c626d99647073c90fa9c4dd59b938b2e0ae SHA512 04478cc1280326fede817549e21a086f1f0281a79b52059a1523246f42d024463a7aac61f443b6441e10f202558889ad9cb63c962f4a075cd78c14b00318d5b9 DIST code-server-4.14.1-linux-amd64.tar.gz 98672270 BLAKE2B 9b7389b3578209391ac0c4a622e4e9a8bdb2bfcbc3f9eda5b26264b122273777819d097f6fa03114429a7bdc4ab7ac943bb104683b5867e3df248171551548d9 SHA512 1d70f5dbc4f4605d5fd254df117d34c8b05fc33085c27c909f8ec73d5ef9a3d71bb11617b38a6fa3dc32138c6df92db0555c14ede814b6868cb43acec182c70a DIST code-server-4.14.1-linux-arm64.tar.gz 97486113 BLAKE2B d918d2a7f5f0be73f26408d9bb0f4a499d98044da58b19dce1146508c9a68cdf8abfb577789a70fc15658c2265b1fc548f9ed96fbf69859a5993d0218d3cca0f SHA512 70db38d528ea24446859eab61c9a502e901dc325f15a50bc5788acf42bd49e29750350748a1534dbaaceb59fd1654d43e2092a481fae0768916031d07ad1e501 +DIST code-server-4.15.0-linux-amd64.tar.gz 99499811 BLAKE2B b14a712624d312190be8320103f156fdefb99ab0990e11a555e3d2eb647bd28b7296e55ce9080d4b642ae1eda3780db6e6ab24310635ec1b714e7df7749250f9 SHA512 5c825ef33458bc7d8cb53657d7160dd01afe6fda4ce9f5dadcb9e977ab921dd092320c3e8bb1120543782a1591745dc46e712e87964f1abcc5fcc554566f9193 +DIST code-server-4.15.0-linux-arm64.tar.gz 98256392 BLAKE2B 0a9391ab69139e8674fe0f408bc98946e50114239d08bcb152f617fba2bbf42601432c05861e19fff1500574f8d54df4b1d768898c381fe31d518f0d2d8886f5 SHA512 95f0a1ac33ef0280f3195fbf0563f8e5f3d3fce18991758edf095dec52cd501769951b4905a83fcb100b0c5aec8db29feea6cb992e945b4f4447e56be26df2db diff --git a/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild new file mode 100644 index 0000000000..35845168af --- /dev/null +++ b/www-apps/code-server-bin/code-server-bin-4.15.0.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'" +} From 62751a63881e36b8d5fbdbf835d8dfac0af5dbb6 Mon Sep 17 00:00:00 2001 From: Steven Burnham Date: Sat, 22 Jul 2023 00:34:09 -0400 Subject: [PATCH 3/8] app-emulation/quickemu: add 4.8 Signed-off-by: Steven Burnham --- app-emulation/quickemu/Manifest | 1 + app-emulation/quickemu/quickemu-4.8.ebuild | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 app-emulation/quickemu/quickemu-4.8.ebuild diff --git a/app-emulation/quickemu/Manifest b/app-emulation/quickemu/Manifest index 90817dda94..633ddc4a71 100644 --- a/app-emulation/quickemu/Manifest +++ b/app-emulation/quickemu/Manifest @@ -1 +1,2 @@ DIST quickemu-3.11.tar.gz 128498 BLAKE2B 15791e21733a2b77b54e8b25d37f9f8b7a112e249635c187ba1267f2bea089f38d96e5690da2d44b82b3668827df524afa765b42f90f61bfe368f53c773c51b4 SHA512 076c6e4108c5bb0e85e36c13da91e3c7f3f607b54cd50cbf73cc64fc157198a18daaa7131473e5d6166e1babd905645b673d05373a2f18959bdb4a8a1c9f897f +DIST quickemu-4.8.tar.gz 166544 BLAKE2B 527ce0cb7310d4d4f3ce19900a60b40b1534a637c58899beb48a947b4bd29c02c8381af65b966f205883c811219cadd2c6dcb40d5bb6925ed92db4283b7d1d4c SHA512 1f09e99ac4e508d5fe9e26482bd6b318f4cc0256bb8079799dc162ea5789ca99a07a11af283456f7832eed0c970ec0dae46e3ab2e80696954f16ff6807e32765 diff --git a/app-emulation/quickemu/quickemu-4.8.ebuild b/app-emulation/quickemu/quickemu-4.8.ebuild new file mode 100644 index 0000000000..b20d3412b6 --- /dev/null +++ b/app-emulation/quickemu/quickemu-4.8.ebuild @@ -0,0 +1,42 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_10 ) +inherit python-single-r1 + +DESCRIPTION="Create and run optimised Windows, macOS and Linux desktop virtual machines" +HOMEPAGE="https://github.com/quickemu-project/quickemu" +SRC_URI="https://github.com/quickemu-project/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + >=app-emulation/qemu-6.0.0[gtk,sdl,spice] + >=app-shells/bash-4.0:= + app-cdr/cdrtools + app-crypt/swtpm + app-misc/jq + net-misc/spice-gtk[gtk3] + net-misc/wget + net-misc/zsync + sys-apps/usbutils + sys-apps/util-linux + sys-firmware/edk2-ovmf + sys-process/procps + x11-apps/xrandr + x11-misc/xdg-user-dirs +" +RDEPEND="${DEPEND}" +BDEPEND="" + +src_install() { + python_doscript macrecovery macrecovery + dobin quickemu + dobin quickget +} From 511c020a964063ab44fc086e7ba316e9b00ac636 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 22 Jul 2023 17:47:22 +0500 Subject: [PATCH 4/8] dev-python/findpython: treeclean duplicate Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/findpython/Manifest | 1 - dev-python/findpython/findpython-0.2.4.ebuild | 25 ------------------- dev-python/findpython/metadata.xml | 16 ------------ 3 files changed, 42 deletions(-) delete mode 100644 dev-python/findpython/Manifest delete mode 100644 dev-python/findpython/findpython-0.2.4.ebuild delete mode 100644 dev-python/findpython/metadata.xml diff --git a/dev-python/findpython/Manifest b/dev-python/findpython/Manifest deleted file mode 100644 index 58ae65c037..0000000000 --- a/dev-python/findpython/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST findpython-0.2.4.tar.gz 16109 BLAKE2B 1f30682d5a68f03338ce57af8e37c89567e611142f1854baa2032eabee7f41eff3382be2a3ceaac4808db18a7ff65eb9af929c8dea16be772c4ba34f8b0ee2ea SHA512 7b4ea68c07eb81b18107b5976fd5ca32220d0299f08e5c87b94e0d92f1b0f4abe146be22320c9aa46a329877f83073793cf9953d6a40a5eb09c87a9dc9d02cd5 diff --git a/dev-python/findpython/findpython-0.2.4.ebuild b/dev-python/findpython/findpython-0.2.4.ebuild deleted file mode 100644 index 11e4b12ece..0000000000 --- a/dev-python/findpython/findpython-0.2.4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=pdm -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A utility to find python versions on your system" -HOMEPAGE=" - https://github.com/frostming/findpython/ - https://pypi.org/project/findpython/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/dev-python/findpython/metadata.xml b/dev-python/findpython/metadata.xml deleted file mode 100644 index b1ab8b2d69..0000000000 --- a/dev-python/findpython/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - falbrechtskirchinger@gmail.com - Florian Albrechtskirchinger - - - findpython - frostming/findpython - - Frost Ming - mianghong@gmail.com - - - From 3deea9022558b0c6c7ec429f6f85e7e467aa65a4 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 22 Jul 2023 17:47:30 +0500 Subject: [PATCH 5/8] dev-python/pdm: treeclean duplicate Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/pdm/Manifest | 1 - dev-python/pdm/metadata.xml | 18 -------- dev-python/pdm/pdm-2.7.1.ebuild | 75 --------------------------------- 3 files changed, 94 deletions(-) delete mode 100644 dev-python/pdm/Manifest delete mode 100644 dev-python/pdm/metadata.xml delete mode 100644 dev-python/pdm/pdm-2.7.1.ebuild diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest deleted file mode 100644 index 3785869aaa..0000000000 --- a/dev-python/pdm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pdm-2.7.1.tar.gz 3060384 BLAKE2B b8d848099cf9a72dab98546422ef9aaec32841b73086923817d0da9d7218856f49a21b189134161269f4dc13025fd7b42c577a5f4ca502750cd9b584255622f2 SHA512 51eadc7f8b026cdecdfb45732fcb3145f822a2b0b8b9ebb6fc42f3824d1f56ac6fb37c77e84f50af5bfc949262e596d633c4bf30d7cd5d88b13fd9c9a2f19485 diff --git a/dev-python/pdm/metadata.xml b/dev-python/pdm/metadata.xml deleted file mode 100644 index 7a470fde05..0000000000 --- a/dev-python/pdm/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - falbrechtskirchinger@gmail.com - Florian Albrechtskirchinger - - - pdm - pdm-project/pdm - - Frost Ming - mianghong@gmail.com - - https://pdm.fming.dev - https://pdm.fming.dev/latest/dev/changelog/ - - diff --git a/dev-python/pdm/pdm-2.7.1.ebuild b/dev-python/pdm/pdm-2.7.1.ebuild deleted file mode 100644 index 15f1a7911e..0000000000 --- a/dev-python/pdm/pdm-2.7.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=pdm-backend -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 pypi - -DESCRIPTION="Modern Python package and dependency manager supporting latest PEP standards" -HOMEPAGE=" - https://github.com/pdm-project/pdm/ - https://pypi.org/project/pdm/ -" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0" - -RDEPEND=" - dev-python/blinker[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/platformdirs[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/pyproject-hooks[${PYTHON_USEDEP}] - dev-python/requests-toolbelt[${PYTHON_USEDEP}] - >=dev-python/unearth-0.9.0[${PYTHON_USEDEP}] - dev-python/findpython[${PYTHON_USEDEP}] - dev-python/tomlkit[${PYTHON_USEDEP}] - dev-python/shellingham[${PYTHON_USEDEP}] - dev-python/python-dotenv[${PYTHON_USEDEP}] - dev-python/resolvelib[${PYTHON_USEDEP}] - dev-python/installer[${PYTHON_USEDEP}] - dev-python/cachecontrol[${PYTHON_USEDEP}] - - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - dev-python/pytest-httpserver[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_compile_all() { - PDM_CHECK_UPDATE=0 "${EPYTHON}" -m pdm completion bash > completion.bash || die - PDM_CHECK_UPDATE=0 "${EPYTHON}" -m pdm completion zsh > completion.zsh || die -} - -python_test() { - epytest -m "not network" - - # clear saved python version - rm -f .pdm-python -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp completion.bash pdm - - insinto /usr/share/zsh/site-functions - newins completion.zsh _pdm -} From 3a85a7e42e1955b4b85622da46537ac04df6d7dc Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 22 Jul 2023 17:47:36 +0500 Subject: [PATCH 6/8] dev-python/requests-wsgi-adapter: treeclean duplicate Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/requests-wsgi-adapter/Manifest | 1 - dev-python/requests-wsgi-adapter/metadata.xml | 12 ----------- .../requests-wsgi-adapter-0.4.1.ebuild | 20 ------------------- 3 files changed, 33 deletions(-) delete mode 100644 dev-python/requests-wsgi-adapter/Manifest delete mode 100644 dev-python/requests-wsgi-adapter/metadata.xml delete mode 100644 dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild diff --git a/dev-python/requests-wsgi-adapter/Manifest b/dev-python/requests-wsgi-adapter/Manifest deleted file mode 100644 index 71f3a17f54..0000000000 --- a/dev-python/requests-wsgi-adapter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST requests-wsgi-adapter-0.4.1.tar.gz 3035 BLAKE2B 6c495a9af66ac8674b4fa14df4f089f82873159d082d12259fdb3ceece2b95c239115b8557de34dbb07efec861d367562aba4d0bebd12500dbbeb446e05d378c SHA512 8557743b668bdcbb414e4a4afb254573aebdd378a22b0d64392ad669ca2cef91c6f1fbc60cefa8bc0f23a072ffcaa0ffffec7cbbb1c6dfc430068af16192d7ee diff --git a/dev-python/requests-wsgi-adapter/metadata.xml b/dev-python/requests-wsgi-adapter/metadata.xml deleted file mode 100644 index 62d45493f1..0000000000 --- a/dev-python/requests-wsgi-adapter/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - falbrechtskirchinger@gmail.com - Florian Albrechtskirchinger - - - seanbrant/requests-wsgi-adapter - requests-wsgi-adapter - - diff --git a/dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild b/dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild deleted file mode 100644 index 64c7b3cf31..0000000000 --- a/dev-python/requests-wsgi-adapter/requests-wsgi-adapter-0.4.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} pypy3 ) -PYPI_NO_NORMALIZE=1 - -inherit distutils-r1 pypi - -DESCRIPTION="WSGI Transport Adapter for Requests" -HOMEPAGE=" - https://github.com/seanbrant/requests-wsgi-adapter/ - https://pypi.org/project/requests-wsgi-adapter/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" From 647b7d7f402db8889cf0a749c32141dbdd35893f Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 22 Jul 2023 17:47:46 +0500 Subject: [PATCH 7/8] dev-python/unearth: treeclean duplicate Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/unearth/Manifest | 1 - dev-python/unearth/metadata.xml | 18 ------------- dev-python/unearth/unearth-0.9.0.ebuild | 36 ------------------------- 3 files changed, 55 deletions(-) delete mode 100644 dev-python/unearth/Manifest delete mode 100644 dev-python/unearth/metadata.xml delete mode 100644 dev-python/unearth/unearth-0.9.0.ebuild diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest deleted file mode 100644 index 22ef20674f..0000000000 --- a/dev-python/unearth/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST unearth-0.9.0.tar.gz 270152 BLAKE2B 4d5bb2fd1199d74742165b63bcd2e6f2760d919608a76f0d17552e258c2478746f737d01b270fafd019b8739d71071533569c81f5b2c2afbdd34929e3601c721 SHA512 8eed609da6f70855824fee64408a437a58b2531fb58b87ab93587b8a620b611109b82414744f323d961c2c40ad40ae40c5b8d6e44ca5a9caa2c9693da0f529dd diff --git a/dev-python/unearth/metadata.xml b/dev-python/unearth/metadata.xml deleted file mode 100644 index 945e89bf38..0000000000 --- a/dev-python/unearth/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - falbrechtskirchinger@gmail.com - Florian Albrechtskirchinger - - - frostming/unearth - unearth - - Frost Ming - me@frostming.com - - https://unearth.readthedocs.io - https://github.com/frostming/unearth/releases - - diff --git a/dev-python/unearth/unearth-0.9.0.ebuild b/dev-python/unearth/unearth-0.9.0.ebuild deleted file mode 100644 index c05f0acb87..0000000000 --- a/dev-python/unearth/unearth-0.9.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=pdm -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A utility to fetch and download python packages" -HOMEPAGE=" - https://github.com/frostming/unearth/ - https://pypi.org/project/unearth/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/pytest-httpserver[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}] - dev-python/trustme[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest From 7d1773d97f934e5243c3e2edace54dec6c9b3851 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 22 Jul 2023 17:59:07 +0500 Subject: [PATCH 8/8] x11-misc/pywal: drop use flags Signed-off-by: Anna (cybertailor) Vyalkova --- x11-misc/pywal/metadata.xml | 8 ++++++++ x11-misc/pywal/pywal-3.3.0.ebuild | 30 ++++++++++-------------------- 2 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 x11-misc/pywal/metadata.xml diff --git a/x11-misc/pywal/metadata.xml b/x11-misc/pywal/metadata.xml new file mode 100644 index 0000000000..96d98f7b19 --- /dev/null +++ b/x11-misc/pywal/metadata.xml @@ -0,0 +1,8 @@ + + + + + + dylanaraps/pywal + + diff --git a/x11-misc/pywal/pywal-3.3.0.ebuild b/x11-misc/pywal/pywal-3.3.0.ebuild index fe9d877cd8..c48e55cec7 100644 --- a/x11-misc/pywal/pywal-3.3.0.ebuild +++ b/x11-misc/pywal/pywal-3.3.0.ebuild @@ -3,34 +3,24 @@ EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 optfeature -inherit distutils-r1 - -DESCRIPTION="A tool that generates color schemes from images" +DESCRIPTION="Tool that generates color schemes from images" HOMEPAGE="https://github.com/dylanaraps/pywal" -SRC_URI="https://github.com/dylanaraps/pywal/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="feh nitrogen" -RDEPEND="feh? ( media-gfx/feh ) -nitrogen? ( x11-misc/nitrogen )" +RDEPEND="media-gfx/imagemagick[jpeg]" -DEPEND="${RDEPEND} - media-gfx/imagemagick[jpeg]" - -src_compile() { - distutils-r1_src_compile -} - -src_install() { - distutils-r1_src_install - - insinto /usr/share/licenses/${PF} - doins LICENSE.md +pkg_postinst() { + optfeature "setting wallpaper support" \ + media-gfx/feh \ + x11-misc/hsetroot \ + x11-misc/nitrogen }