Merge updates from master

2026-07-17 19:13:13 -04:00 · 2022-12-31 10:46:57 +00:00
parent 866190b137 440360d24f
commit b8f326e86e
7 changed files with 209 additions and 1 deletions
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,2 +1,3 @@
 DIST dwl-0.3.1.tar.gz 51347 BLAKE2B 754dcf17de405f4a3f69478444fe46199f4e67fd7a7801e02131676e23e7324b49d6f31da629a6ab977262a210b95adcb8407c37b81031aac3ee6d2427f27a10 SHA512 c6bcaf26d6f67f7712f907331c947afc84a5c5b990f5ec6d568d65f624a2cafd1617055ed514cd7e8a331abcd4c37ed574672dcbeeb890607d8eb38e7a304215
+DIST dwl-0.4.tar.gz 55527 BLAKE2B a4c6d763574f2bf88db959a4730447874de61d4d868d12285feebc121204c4dbda82ab3cfef791999e138898daa5564d295d4943aff015d91d62d9c9ade6d005 SHA512 6e15e05001e6469d13bef2d532980585d57de55c8feb461a7c25a76d7cdaee022785485faca02cd9d1214457fbeb1bec0eb652700ba0ddccca4aa780df0046b2
 DIST dwl-0.4_rc2.tar.gz 54093 BLAKE2B 13ae6c071bd4fc8202101c689983e232a8af4ff1f83142a44954998a709307c447a611d8dd46a3534baf41e64a3f7ed4d6fa548b1426212114a463cc29f4e94a SHA512 5f95dac99b9fbec971366f55c7a41f2a0fcff7e321c52a4afe04dd17465cde063c37aee677e833c937169782ddfb59fde66eb3c556171d9d80205837a806c7ee
--- a/gui-wm/dwl/dwl-0.4.ebuild
+++ b/gui-wm/dwl/dwl-0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/djpohly/dwl"
+	inherit git-r3
+
+	# 9999-r0: main (latest wlroots release)
+	# 9999-r1: wlroots-next (wlroots-9999)
+	case ${PVR} in
+		9999)
+			EGIT_BRANCH=main
+			WLROOTS_SLOT="0/16"
+			;;
+		9999-r1)
+			EGIT_BRANCH=wlroots-next
+			WLROOTS_SLOT="0/9999"
+			;;
+	esac
+else
+	WLROOTS_SLOT="0/16"
+	SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="dwm for Wayland"
+HOMEPAGE="https://github.com/djpohly/dwl"
+
+LICENSE="CC0-1.0 GPL-3 MIT"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libinput:=
+	dev-libs/wayland
+	gui-libs/wlroots:${WLROOTS_SLOT}[X(-)?]
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	restore_config config.h
+
+	default
+}
+
+src_configure() {
+	sed -i "s:/local::g" config.mk || die
+
+	sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" config.mk || die
+
+	if use X; then
+		append-cppflags '-DXWAYLAND'
+		append-libs '-lxcb' '-lxcb-icccm'
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/wayland-sessions
+	doins "${FILESDIR}"/dwl.desktop
+
+	save_config config.h
+}
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-9999-r1.ebuild
@@ -22,6 +22,7 @@ if [[ ${PV} == *9999 ]]; then
 			;;
 	esac
 else
+	WLROOTS_SLOT="0/16"
 	SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -22,6 +22,7 @@ if [[ ${PV} == *9999 ]]; then
 			;;
 	esac
 else
+	WLROOTS_SLOT="0/16"
 	SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
--- a/media-sound/amberol/amberol-0.9.2.ebuild
+++ b/media-sound/amberol/amberol-0.9.2.ebuild
@@ -228,7 +228,6 @@ CRATES="

 inherit cargo gnome2-utils meson xdg

-
 HOMEPAGE="https://gitlab.gnome.org/World/amberol"
 DESCRIPTION="Simple GUI Music Player"
 SRC_URI=" https://gitlab.gnome.org/World/${PN}/-/archive/${PV}/${P}.tar.bz2
@@ -241,6 +240,7 @@ KEYWORDS="~amd64 ~x86"

 RDEPEND="
 	gui-libs/libadwaita:1
+	gui-libs/gtk:4[wayland]
 	dev-libs/libportal:=[gtk]
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -2,3 +2,5 @@ DIST code-server-4.7.1-linux-amd64.tar.gz 103979733 BLAKE2B 0346e107ef55d09094d3
 DIST code-server-4.7.1-linux-arm64.tar.gz 94777720 BLAKE2B 0d08f9b9966070a21918ce1a4e9d79c5ce9c4d4550d588cc6b0bf30777a015b4616c49a7fa9f776c303238a9920ebb0a341a9bd421067a333579cf38bc16dab5 SHA512 8ac49726830168786a4eac7f3b2182af9510443cd3bc0b5760ddee0ee6ce7845fdd91cd680c95821a3dce41c9c2cdf0b7f50ab7817b6764305e262c643c9d896
 DIST code-server-4.8.3-linux-amd64.tar.gz 106357330 BLAKE2B 2b72427abf01dd1ef0fcc85971d484b116a558ae586fbdaf0f40ded66ad1523c57449141f7ad1d8b2bf364094b2be7999f275d2a8d00ccb6194b56e89133ed0d SHA512 c074007129082819b70be588f5f1f81613f7b12d4b2bc9a606f56767747c13c62707c54694bdbc5a27da60027c0a9cc98efc3e5c64e05c0947dcb45b551efb4d
 DIST code-server-4.8.3-linux-arm64.tar.gz 97248777 BLAKE2B 11b4e504fc0bf78a2be1ce945ec5f2f7fabbef9264434d64564ec1bf73874d364f859867d19a17a4cebcbad9c6d1828c4e1e3c3ef1bd168a2484e00467f2b82f SHA512 07322fdd92b8986445d6ade10aa25f59353bed280c4c61cce307a67281353ea41d3d813065bb734fdbfc06fef65f19c4027ae690b7d165fe8bdbfea5c4f3fc20
+DIST code-server-4.9.1-linux-amd64.tar.gz 106765319 BLAKE2B 18b82c1daa4b005115de001e8065783dbc9042b1504a4323ad74d0002e331c3e24ee3856d39aa8e0777d6e0e93f7f0dfcc6b01fae0f2482ef881e8b9d867794d SHA512 1193c8690275c432e9126d18ab24bc50f199c585d3f5e9c2886a339b92d3d5e52103c8fec55189df1d149f3f7147ff2aeb97c70191ca996b5bc65e492c74454a
+DIST code-server-4.9.1-linux-arm64.tar.gz 97436984 BLAKE2B 7fb2b4ebc6dfbe0a2bb55b0f7d78a9c61045d328c6f71c4c6b32dac9fa9648aa96d5962975618e73962e2c53422c35dc5ebed2378eea18570016e0ba85f02686 SHA512 0a60f8eda68be6c939a1aab9012a4e1da429d9491a97dee2b0be78e68e6a4a79d12d855ec90208c9080ea4ee227b8c12f1203f71c81298e6ec2b7a66b6da451b
--- a/www-apps/code-server-bin/code-server-bin-4.9.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.9.1.ebuild
@@ -0,0 +1,125 @@
+# 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 WTFPL )
+	|| ( BSD GPL-2 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="gnome-keyring"
+
+RDEPEND="
+	${DEPEND}
+	>=net-libs/nodejs-16.0.0[ssl]
+	sys-apps/ripgrep
+	gnome-keyring? ( app-crypt/libsecret )
+"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
+PATCHES=( "${FILESDIR}/${PN}-node.patch" )
+
+DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
+
+# Relative
+VSCODE_MODULES="lib/vscode/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}/${VSCODE_MODULES}/native-is-elevated/build/Release/obj.target/iselevated.node
+	opt/${PN}/${VSCODE_MODULES}/native-is-elevated/build/Release/iselevated.node
+	opt/${PN}/${VSCODE_MODULES}/node-pty/build/Release/pty.node
+	opt/${PN}/${VSCODE_MODULES}/native-watchdog/build/Release/obj.target/watchdog.node
+	opt/${PN}/${VSCODE_MODULES}/native-watchdog/build/Release/watchdog.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
+	opt/${PN}/${VSCODE_MODULES}/spdlog/build/Release/obj.target/spdlog.node
+	opt/${PN}/${VSCODE_MODULES}/spdlog/build/Release/spdlog.node
+	opt/${PN}/${VSCODE_MODULES}/vscode-nsfw/build/Release/obj.target/nsfw.node
+	opt/${PN}/${VSCODE_MODULES}/vscode-nsfw/build/Release/nsfw.node
+	opt/${PN}/${VSCODE_MODULES}/@vscode/sqlite3/build/Release/obj.target/sqlite.node
+	opt/${PN}/${VSCODE_MODULES}/@vscode/sqlite3/build/Release/sqlite.node
+	opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/build/Release/watcher.node
+	opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/build/Release/obj.target/watcher.node
+	opt/${PN}/${VSCODE_MODULES}/keytar/build/Release/keytar.node
+	opt/${PN}/${VSCODE_MODULES}/keytar/build/Release/obj.target/keytar.node
+"
+
+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"
+
+	# 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'"
+}