Merge updates from master

2026-07-18 11:33:15 -04:00 · 2024-02-22 01:33:22 +00:00
parent 0924d0f1c5 d8c5da07a8
commit 5565e56f27
16 changed files with 441 additions and 97 deletions
--- a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2-r1.ebuild
+++ b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -7,8 +7,9 @@ EPYTEST_DESELECT=(
 	jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_fields_value
 	jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_shortcut_functions
 )
+DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit distutils-r1 pypi

@@ -29,11 +30,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 	)
 "

--- a/gui-apps/eww/eww-0.5.0.ebuild
+++ b/gui-apps/eww/eww-0.5.0.ebuild
@@ -299,10 +299,16 @@ inherit cargo

 DESCRIPTION="Elkowars Wacky Widgets is a standalone widget system made in Rust"
 HOMEPAGE="https://github.com/elkowar/eww"
-SRC_URI="
-	https://github.com/elkowar/eww/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/elkowar/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/elkowar/${PV}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}
+	"
+fi

 LICENSE="
 	Apache-2.0
@@ -317,18 +323,18 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="wayland"
+IUSE="X wayland"
+REQUIRED_USE="|| ( X wayland )"

 DEPEND="
-	x11-libs/gtk+:3
+	X? ( x11-libs/gtk+:3[X] )
+	wayland? ( x11-libs/gtk+:3[wayland] )
 	x11-libs/pango
 	x11-libs/gdk-pixbuf
 	x11-libs/cairo
 	>=dev-libs/glib-2.0
 	sys-devel/gcc
-	wayland? (
 	gui-libs/gtk-layer-shell
-	)
 "
 BDEPEND="
 	$DEPEND
@@ -341,7 +347,9 @@ RDEPEND="
 QA_FLAGS_IGNORED="usr/bin/.*"

 src_compile() {
+	use X && features="--no-default-features --features=x11"
 	use wayland && features="--no-default-features --features=wayland"
+	use X && use wayland && features="--no-default-features --features=wayland,x11"
 	cargo_src_compile ${features}
 }

--- a/gui-apps/eww/eww-9999.ebuild
+++ b/gui-apps/eww/eww-9999.ebuild
@@ -3,11 +3,312 @@

 EAPI=8

-inherit cargo git-r3
+CRATES="
+	addr2line@0.21.0
+	adler@1.0.2
+	ahash@0.8.8
+	aho-corasick@1.1.2
+	allocator-api2@0.2.16
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.11
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.79
+	ascii-canvas@3.0.0
+	atk-sys@0.17.0
+	atk@0.17.1
+	autocfg@1.1.0
+	backtrace@0.3.69
+	base64@0.21.7
+	bincode@1.3.3
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	bitflags@1.3.2
+	bitflags@2.4.2
+	bumpalo@3.15.0
+	bytes@1.5.0
+	cached@0.48.1
+	cached_proc_macro@0.19.1
+	cached_proc_macro_types@0.1.1
+	cairo-rs@0.17.10
+	cairo-sys-rs@0.17.10
+	cc@1.0.83
+	cfg-expr@0.15.7
+	cfg-if@1.0.0
+	chrono-tz-build@0.2.1
+	chrono-tz@0.8.6
+	chrono@0.4.34
+	chumsky@0.9.3
+	clap@4.5.1
+	clap_builder@4.5.1
+	clap_complete@4.5.1
+	clap_derive@4.5.0
+	clap_lex@0.7.0
+	codemap@0.1.3
+	codespan-reporting@0.11.1
+	colorchoice@1.0.0
+	console@0.15.8
+	convert_case@0.4.0
+	core-foundation-sys@0.8.6
+	crossbeam-channel@0.5.11
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	crunchy@0.2.2
+	darling@0.14.4
+	darling_core@0.14.4
+	darling_macro@0.14.4
+	deranged@0.3.11
+	derive_more@0.99.17
+	diff@0.1.13
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dyn-clone@1.0.16
+	either@1.10.0
+	ena@0.14.2
+	encode_unicode@0.3.6
+	env_logger@0.10.2
+	equivalent@1.0.1
+	extend@1.2.0
+	field-offset@0.3.6
+	filetime@0.2.23
+	fixedbitset@0.4.2
+	fnv@1.0.7
+	fsevent-sys@4.1.0
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	gdk-pixbuf-sys@0.17.10
+	gdk-pixbuf@0.17.10
+	gdk-sys@0.17.0
+	gdk@0.17.1
+	gdkx11-sys@0.17.0
+	gdkx11@0.17.0
+	gethostname@0.2.3
+	getrandom@0.2.12
+	gimli@0.28.1
+	gio-sys@0.17.10
+	gio@0.17.10
+	glib-macros@0.17.10
+	glib-sys@0.17.10
+	glib@0.17.10
+	gobject-sys@0.17.10
+	grass@0.13.2
+	grass_compiler@0.13.2
+	gtk-layer-shell-sys@0.6.0
+	gtk-layer-shell@0.6.1
+	gtk-sys@0.17.0
+	gtk3-macros@0.17.1
+	gtk@0.17.1
+	hashbrown@0.13.2
+	hashbrown@0.14.3
+	heck@0.4.1
+	hermit-abi@0.3.6
+	hifijson@0.2.0
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	indexmap@2.2.3
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	insta@1.34.0
+	instant@0.1.12
+	is-terminal@0.4.12
+	itertools@0.10.5
+	itertools@0.12.1
+	itoa@1.0.10
+	jaq-core@1.2.1
+	jaq-interpret@1.2.1
+	jaq-parse@1.0.2
+	jaq-std@1.2.1
+	jaq-syn@1.1.0
+	js-sys@0.3.68
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lalrpop-util@0.20.0
+	lalrpop@0.20.0
+	lasso@0.7.2
+	lazy_static@1.4.0
+	libc@0.2.153
+	libm@0.2.8
+	libredox@0.0.1
+	linked-hash-map@0.5.6
+	lock_api@0.4.11
+	log@0.4.20
+	maplit@1.0.2
+	memchr@2.7.1
+	memoffset@0.6.5
+	memoffset@0.9.0
+	miniz_oxide@0.7.2
+	mio@0.8.10
+	new_debug_unreachable@1.0.4
+	nix@0.25.1
+	nix@0.27.1
+	notify@6.1.1
+	ntapi@0.4.1
+	num-conv@0.1.0
+	num-traits@0.2.18
+	num_cpus@1.16.0
+	object@0.32.2
+	once_cell@1.19.0
+	pango-sys@0.17.10
+	pango@0.17.10
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	parse-zoneinfo@0.3.0
+	petgraph@0.6.4
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_macros@0.11.2
+	phf_shared@0.10.0
+	phf_shared@0.11.2
+	pico-args@0.5.0
+	pin-project-lite@0.2.13
+	pin-utils@0.1.0
+	pkg-config@0.3.30
+	powerfmt@0.2.0
+	precomputed-hash@0.1.1
+	pretty_assertions@1.4.0
+	pretty_env_logger@0.5.0
+	proc-macro-crate@1.3.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.78
+	quote@1.0.35
+	rand@0.8.5
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.8.1
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	ref-cast-impl@1.0.22
+	ref-cast@1.0.22
+	regex-automata@0.4.5
+	regex-syntax@0.7.5
+	regex-syntax@0.8.2
+	regex@1.10.3
+	rustc-demangle@0.1.23
+	rustc_version@0.4.0
+	rustversion@1.0.14
+	ryu@1.0.16
+	same-file@1.0.6
+	scopeguard@1.2.0
+	semver@1.0.21
+	serde@1.0.196
+	serde_derive@1.0.196
+	serde_json@1.0.113
+	serde_spanned@0.6.5
+	signal-hook-registry@1.4.1
+	similar@2.4.0
+	simple-signal@1.1.1
+	siphasher@0.3.11
+	slab@0.4.9
+	smallvec@1.13.1
+	smart-default@0.7.1
+	socket2@0.5.5
+	static_assertions@1.1.0
+	string_cache@0.8.7
+	strsim@0.10.0
+	strsim@0.11.0
+	strum@0.26.1
+	strum_macros@0.26.1
+	syn@1.0.109
+	syn@2.0.49
+	sysinfo@0.30.5
+	system-deps@6.2.0
+	target-lexicon@0.12.13
+	term@0.7.0
+	termcolor@1.4.1
+	thiserror-impl@1.0.57
+	thiserror@1.0.57
+	time-core@0.1.2
+	time-macros@0.2.17
+	time@0.3.34
+	tiny-keccak@2.0.2
+	tokio-macros@2.2.0
+	tokio-util@0.7.10
+	tokio@1.36.0
+	toml@0.8.10
+	toml_datetime@0.6.5
+	toml_edit@0.19.15
+	toml_edit@0.22.6
+	unescape@0.1.0
+	unicode-ident@1.0.12
+	unicode-width@0.1.11
+	unicode-xid@0.2.4
+	urlencoding@2.1.3
+	utf8parse@0.2.1
+	version-compare@0.1.1
+	version_check@0.9.4
+	wait-timeout@0.2.0
+	walkdir@2.4.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.91
+	wasm-bindgen-macro-support@0.2.91
+	wasm-bindgen-macro@0.2.91
+	wasm-bindgen-shared@0.2.91
+	wasm-bindgen@0.2.91
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.6
+	winapi-wsapoll@0.1.1
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	winnow@0.5.40
+	winnow@0.6.1
+	x11@2.21.0
+	x11rb-protocol@0.11.1
+	x11rb@0.11.1
+	yaml-rust@0.4.5
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+"
+
+inherit cargo

 DESCRIPTION="Elkowars Wacky Widgets is a standalone widget system made in Rust"
 HOMEPAGE="https://github.com/elkowar/eww"
-EGIT_REPO_URI="https://github.com/elkowar/eww.git"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/elkowar/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/elkowar/${PV}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}
+	"
+fi

 LICENSE="
 	Apache-2.0
@@ -21,22 +322,23 @@ LICENSE="
 	|| ( MIT Unlicense )
 "
 SLOT="0"
-IUSE="wayland"
+KEYWORDS="~amd64"
+IUSE="X wayland"
+REQUIRED_USE="|| ( X wayland )"

 DEPEND="
-	x11-libs/gtk+:3
+	X? ( x11-libs/gtk+:3[X] )
+	wayland? ( x11-libs/gtk+:3[wayland] )
 	x11-libs/pango
 	x11-libs/gdk-pixbuf
 	x11-libs/cairo
 	>=dev-libs/glib-2.0
 	sys-devel/gcc
-	wayland? (
 	gui-libs/gtk-layer-shell
-	)
 "
 BDEPEND="
 	$DEPEND
-	>=dev-lang/rust-1.73.0[nightly]
+	dev-lang/rust[nightly]
 "
 RDEPEND="
 	$DEPEND
@@ -44,13 +346,10 @@ RDEPEND="

 QA_FLAGS_IGNORED="usr/bin/.*"

-src_unpack() {
-	git-r3_src_unpack
-	cargo_live_src_unpack
-}
-
 src_compile() {
+	use X && features="--no-default-features --features=x11"
 	use wayland && features="--no-default-features --features=wayland"
+	use X && use wayland && features="--no-default-features --features=wayland,x11"
 	cargo_src_compile ${features}
 }

--- a/gui-apps/hypridle/files/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch
+++ b/gui-apps/hypridle/files/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch
@@ -0,0 +1,29 @@
+From e2b3acf133c104574724f705f9f07007ec8bbe3b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
+ <gonegrier.duarte@gmail.com>
+Date: Wed, 21 Feb 2024 15:29:01 +0000
+Subject: [PATCH] Removed added CFLAGS/CXXFLAGS by CMakeLists.txt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1b4e95..cb6b632 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -13,7 +13,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+     message(STATUS "Configuring hypridle in Debug with CMake")
+     add_compile_definitions(HYPRLAND_DEBUG)
+ else()
+-    add_compile_options(-O3)
+     message(STATUS "Configuring hypridle in Release with CMake")
+ endif()
+ 
+-- 
+2.43.2
+
--- a/gui-apps/hypridle/hypridle-0_pre20240220.ebuild
+++ b/gui-apps/hypridle/hypridle-0_pre20240220.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	dev-cpp/sdbus-c++
 "

+PATCHES=(
+	"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE:STRING=Release
--- a/gui-apps/hypridle/hypridle-9999.ebuild
+++ b/gui-apps/hypridle/hypridle-9999.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	dev-cpp/sdbus-c++
 "

+PATCHES=(
+	"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE:STRING=Release
--- a/gui-apps/hyprlock/files/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch
+++ b/gui-apps/hyprlock/files/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch
@@ -0,0 +1,29 @@
+From 8b3826337c13f98611b71abc0030e9a962303cf3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
+ <gonegrier.duarte@gmail.com>
+Date: Wed, 21 Feb 2024 15:31:55 +0000
+Subject: [PATCH] Removed added CFLAGS/CXXFLAGS by CMakeLists.txt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6aac750..a9df5b1 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -13,7 +13,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+     message(STATUS "Configuring hyprlock in Debug with CMake")
+     add_compile_definitions(HYPRLAND_DEBUG)
+ else()
+-    add_compile_options(-O3)
+     message(STATUS "Configuring hyprlock in Release with CMake")
+ endif()
+ 
+-- 
+2.43.2
+
--- a/gui-apps/hyprlock/hyprlock-0_pre20240220.ebuild
+++ b/gui-apps/hyprlock/hyprlock-0_pre20240220.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	virtual/pkgconfig
 "

+PATCHES=(
+	"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE:STRING=Release
--- a/gui-apps/hyprlock/hyprlock-9999.ebuild
+++ b/gui-apps/hyprlock/hyprlock-9999.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	virtual/pkgconfig
 "

+PATCHES=(
+	"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE:STRING=Release
--- a/gui-apps/nwg-menu/Manifest
+++ b/gui-apps/nwg-menu/Manifest
@@ -2,19 +2,16 @@ DIST github.com%2Fallan-simon%2Fgo-singleinstance%2F@v%2Fv0.0.0-20210120080615-d
 DIST github.com%2Fallan-simon%2Fgo-singleinstance%2F@v%2Fv0.0.0-20210120080615-d0997106ab37.zip 5647 BLAKE2B f25245db815bb803cfec3a4542c2e0134f8f766676a7b221dd7b88962f61cec90d7ea72301b38db99c2600f43eb2a506b465bf76d7ab46a7d83a0d97ce69e69c SHA512 a1bbe906a8567b590ed48f63de9aeae3dbc9201e5a5d199553b8cabe336be5c0711733ea419bd0a463436888eebc578d0a06582e717e277415548177f1aa9f47
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
-DIST github.com%2Fdlasky%2Fgotk3-layershell%2F@v%2Fv0.0.0-20210331230524-5cca0b819261.mod 120 BLAKE2B 20c762cdf8941a400d33c77d7ac4f800b7598a5003775f4ab459f943f011048ae48db2587af03bfdaed9941d60c6764142d741545057958fe68a8223068d18bd SHA512 de15195276d5a17840e08ca1dc3bd02cb69802d495abd12d81a01c3aa6f8ac540e765204248d7e0a83e99c666e925c003dff3f444f3be6e8a36b6b556bfa9927
-DIST github.com%2Fdlasky%2Fgotk3-layershell%2F@v%2Fv0.0.0-20210331230524-5cca0b819261.zip 3678 BLAKE2B a5dbd076df021bc1d7dd8ed4a96ed5184562c45d3296f8ffb9f62da59f7dc8b09a00115e944236f7c55f5091642a71fe73489354f0bb6e302a4f9ad108f9f0e9 SHA512 57d5ada5decc9019a20e0df36762f3fffecf77f9d08e7d3de18f9c99154572fb3c5a203c600fd8011f2bcfea8f91c5a2bf39d866c331045120cc0f3dbc52e848
 DIST github.com%2Fdlasky%2Fgotk3-layershell%2F@v%2Fv0.0.0-20210827021656-e6ecab2731f7.mod 90 BLAKE2B b8f340b487e8df1c3d35b380cf1d48fda80812d38939d8739a6a0048f8f6d90b03e23c34672edfc744c5d463a5174f25f522fea5fabd7d7a7544700b032e35ad SHA512 973282445fc5252760021848609aa6ac8dbd7571756eff402bd5c705e344e5969ea6a658c0aa21da8a97b9d20b2edf70125eb6013a9c42b01f57e59d4d21ad99
 DIST github.com%2Fdlasky%2Fgotk3-layershell%2F@v%2Fv0.0.0-20210827021656-e6ecab2731f7.zip 2336902 BLAKE2B 86cac68fbad1ccaf7e5975da9c7edafac80526cfe26f86e4051e3a21b26a46a7de8b7969f20d8d9ba588ab7bbd602069472fc009843d4ebaed9f3bd63bdd8564 SHA512 232285f641fbd58b6148638c5cbfe84506839337c064858fb332275587dc207b9a316f8bb180108c0b2495d24cfe6629b1ca0e7a45da657ff76a43753b047f83
 DIST github.com%2Fdlasky%2Fgotk3-layershell%2F@v%2Fv0.0.0-20230802002603-b0c42cd8474f.mod 90 BLAKE2B b8f340b487e8df1c3d35b380cf1d48fda80812d38939d8739a6a0048f8f6d90b03e23c34672edfc744c5d463a5174f25f522fea5fabd7d7a7544700b032e35ad SHA512 973282445fc5252760021848609aa6ac8dbd7571756eff402bd5c705e344e5969ea6a658c0aa21da8a97b9d20b2edf70125eb6013a9c42b01f57e59d4d21ad99
 DIST github.com%2Fdlasky%2Fgotk3-layershell%2F@v%2Fv0.0.0-20230802002603-b0c42cd8474f.zip 2402580 BLAKE2B 2a4599ae9f21a4530ef36d0f2a6dce5d0a0161dbe4c94d4f7bde82a8d1fa298bdb3bde3964207533d1cd5ce4d173e10b02ca8ae0e7ed3607f1d14112bda11f79 SHA512 8c555e52570ba25ce9ceef3d27e2be678bfff1d8dde8bd8dcc2cad8a81178319ce2a2687927eadf6ed9c3a21015d1f3c13f833e1ece344a83133733f741929a9
-DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.5.3-0.20210223154815-289cfb6dbf32.mod 39 BLAKE2B 4d10be140ba045a068e1a13a1302698ee76f21627f0fdde3d952c82706179fbfd0af3f13737bf8771366298c2e6aec48113682951b81ac9208c88b69cb4836d5 SHA512 2e251029136f540fd056077d2b41c7ed820ad3614bf50516ad9a60ba54e1808e18ccfdd91a4454428adcf1426fc2ab93636cc8f9e2a55c14ad07648dd31cc35d
-DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.0.mod 39 BLAKE2B 4d10be140ba045a068e1a13a1302698ee76f21627f0fdde3d952c82706179fbfd0af3f13737bf8771366298c2e6aec48113682951b81ac9208c88b69cb4836d5 SHA512 2e251029136f540fd056077d2b41c7ed820ad3614bf50516ad9a60ba54e1808e18ccfdd91a4454428adcf1426fc2ab93636cc8f9e2a55c14ad07648dd31cc35d
-DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.0.zip 401960 BLAKE2B 70fec601ae92b3ae0ebca563bef26d6a5619fb8509b7767bed25caaea36ac826fac1ae3067ad8e2dc0606d3bfcff6011da45abf513c5ac44aeb9cabc1153d334 SHA512 6a46b089108c36a892b676d89c34b97d4b402d7d4ce02766cefb3e3aa87c7f495588e27b0706c87ba791f34cf41f6e3c5b25c4abc0cc73b91ee454b1c47aaf0e
 DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.1.mod 39 BLAKE2B 4d10be140ba045a068e1a13a1302698ee76f21627f0fdde3d952c82706179fbfd0af3f13737bf8771366298c2e6aec48113682951b81ac9208c88b69cb4836d5 SHA512 2e251029136f540fd056077d2b41c7ed820ad3614bf50516ad9a60ba54e1808e18ccfdd91a4454428adcf1426fc2ab93636cc8f9e2a55c14ad07648dd31cc35d
 DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.1.zip 401975 BLAKE2B a1cd9ce75924c05b01d13964f5d6f7a959ed3656fa8293e168f74466c0ee63b06bb8aa168dcf240695cca833e264bcc71ed46776f8bf6a96702af9c918ebb9ec SHA512 4558b85341608e68dc710140270fc09564d0bf43f43c76c7cfe7a9848658d6dfa33ed8d08032d81efc11b32c563aa35a0a2b54f1efc180c7cb28cec731ec04b2
 DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.2.mod 39 BLAKE2B 4d10be140ba045a068e1a13a1302698ee76f21627f0fdde3d952c82706179fbfd0af3f13737bf8771366298c2e6aec48113682951b81ac9208c88b69cb4836d5 SHA512 2e251029136f540fd056077d2b41c7ed820ad3614bf50516ad9a60ba54e1808e18ccfdd91a4454428adcf1426fc2ab93636cc8f9e2a55c14ad07648dd31cc35d
 DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.2.zip 411600 BLAKE2B 87260dda08b03be8b9f164587177ed2f0b154d9adcaa973a7e980448e1402191518ef67b22f6c151057c7e3eeda676b0c4ae9e9cd4a3183e03a1285804655d15 SHA512 820127cfdc4674170226989501578d5ea72bad1baf8f0c2b1643fed4b88908f5f3b66e6ad66d6bb1c0c490156e53c5a83fe5b7960ec252fe1fc798b253eb24dd
+DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.3.mod 39 BLAKE2B 4d10be140ba045a068e1a13a1302698ee76f21627f0fdde3d952c82706179fbfd0af3f13737bf8771366298c2e6aec48113682951b81ac9208c88b69cb4836d5 SHA512 2e251029136f540fd056077d2b41c7ed820ad3614bf50516ad9a60ba54e1808e18ccfdd91a4454428adcf1426fc2ab93636cc8f9e2a55c14ad07648dd31cc35d
+DIST github.com%2Fgotk3%2Fgotk3%2F@v%2Fv0.6.3.zip 411758 BLAKE2B e8e3836c8b2387b7d27fa49023667dc18409295e57b036b86a47aa6fdad85176c38ee1a6ab6dcbd298e00a11324587f52225decded95760227298b0c65c10264 SHA512 5273f686f409e3879ce71ffa02f3e418b2ce4df30ed895beb486f36eec7bfa7a50e3b694a030a82ea94c8222ecdee6925e74319dccbb177f83c1fa8920938871
 DIST github.com%2Fjoshuarubin%2Fgo-sway%2F@v%2Fv0.0.4.mod 217 BLAKE2B 0c72b5cdc9867a219428b6ea11e5d19a77d6154284157ad42476eb0a1ef98c6726f95cdbbf2ac11629c9f0398bf8a04462803da27d7bbebed40ff60d1f1dfc57 SHA512 596d6fde403840c58c9682a21cfb3f08e02b408b14ad9dc96dae73285efca8bd68efb6913cfaed837e9be4e0e6c202a760626e11fe30d9f307810e124973e57a
 DIST github.com%2Fjoshuarubin%2Fgo-sway%2F@v%2Fv0.0.4.zip 11336 BLAKE2B 773128e41867aec222041dc706a362c05ab242ed2545ed5753c20c776aae6e17b70a875162f9cb2f21e4a7cfa5a7271256f4dd39430de15f44f5597dd57664ed SHA512 7f1e35eb1c0111a7591799697a411e917c9aeb949b492c010ccefc50b140d046269c6b463b9902018773dfa577ac7fbb2337e446af98e92ae35966f52ca2ed06
 DIST github.com%2Fjoshuarubin%2Fgo-sway%2F@v%2Fv1.2.0.mod 217 BLAKE2B 0c72b5cdc9867a219428b6ea11e5d19a77d6154284157ad42476eb0a1ef98c6726f95cdbbf2ac11629c9f0398bf8a04462803da27d7bbebed40ff60d1f1dfc57 SHA512 596d6fde403840c58c9682a21cfb3f08e02b408b14ad9dc96dae73285efca8bd68efb6913cfaed837e9be4e0e6c202a760626e11fe30d9f307810e124973e57a
@@ -42,5 +39,5 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20220513210516-0976fa681c29.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20220513210516-0976fa681c29.zip 29678 BLAKE2B b202a60241d7915384c35fa4fe349080ee40cc2f167a008585ff11a67bb35a3eb3eaaaa98a1483fd7060da39c8c4cbaf1f76d91b4014f68e4525e44dae04f670 SHA512 d11c165a3823110bf09fe9f356d565a24df687c6b8439dbd9635ea332b43b901bfedea6dc30cf1b39fd395779fc52d3f003bf4256baef58f7c0d9bae4479088b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.6.0.mod 34 BLAKE2B 778d81068a642eca75cb103aace68b0ff05a16cb1bd8ab9e28bc62e0464eb43fd5d4f94d5598370ce17448a1ec037168959d494416d957280abf6af98593e604 SHA512 2d159d931db45104e0714e311698dff5905d206e5740cb4f7e1442d1b561da91928b0882f9f56f8190abb7cddadeaec7684f8d598fb6afd6322c5782232b4d5b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.6.0.zip 26351 BLAKE2B d099efd046cde4825e73a3fb44e72dbbb736e77b3496c66076ea2f37962ca2265ed353e061b45c557e072357cd03ee28244a81ebfa5cc2aa1c1db68f78a5a054 SHA512 1ff862c77fd03b0887c2fbbc902d6119c501c967990b4e0ac4ef18ff3d67a4c5e9c8fe9a85edc14aaaec6c0ad57b2836c83912fc6de6a20bcb3a8e9ec3889605
-DIST nwg-menu-0.1.1.tar.gz 6474189 BLAKE2B e8d1896f10ba0fd8f5786e3805dcdbc87911295cd9a1cb070e023b61e089b8aa4d2620f8c0f4e7b116a5b2638bb17f08951181deb004d4b5c65a4fa9a64b5cc0 SHA512 481d1f81485aa5614eea96b1596f0a2e6852ca4467f2346c0e7faff773d45e106f5391d497ed5eda280d9c4ec0ab66b7402589c502521d8766c78d2495b78316
 DIST nwg-menu-0.1.2.tar.gz 3247673 BLAKE2B 594cc4e5277fbb3e6c075769747c026a2fb7660900e3189883af689ffc6b8ce84e715c52c5d304490b8649debc6534cc2c19f744be2472eed2bd1d038cb0d9f5 SHA512 9491091eb9c46fa4387f2da99c6e8193d58ba0939ce0c91fbd728b110429b131a2ea4b0f0bfb33d29c8cf791e03b4e72320d879d19ab99904000274a7e127964
+DIST nwg-menu-0.1.3.tar.gz 3247738 BLAKE2B 9325d08ad27e6ae07e5fdfa685312ae6d4803a566273cc29d3b7a2c4925619888bb6ae1c1170737579965d6c28403410b220e3d5344c203b497a8f70c45c845a SHA512 6295120f10e73b464506be0fbdb402a119a7d63c40f06fdcc0c86e27d520a603f7729af711c0facc9c904bbf99af9697d2e2b598914196de45504c8e377d4d9c
--- a/gui-apps/nwg-menu/nwg-menu-0.1.3.ebuild
+++ b/gui-apps/nwg-menu/nwg-menu-0.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit go-module

@@ -10,15 +10,24 @@ EGO_SUM=(
 	"github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37/go.mod"
 	"github.com/davecgh/go-spew v1.1.0"
 	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261"
-	"github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261/go.mod"
-	"github.com/gotk3/gotk3 v0.5.3-0.20210223154815-289cfb6dbf32/go.mod"
-	"github.com/gotk3/gotk3 v0.6.0"
-	"github.com/gotk3/gotk3 v0.6.0/go.mod"
+	"github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7"
+	"github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7/go.mod"
+	"github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f"
+	"github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f/go.mod"
+	"github.com/gotk3/gotk3 v0.6.1"
+	"github.com/gotk3/gotk3 v0.6.1/go.mod"
+	"github.com/gotk3/gotk3 v0.6.2"
+	"github.com/gotk3/gotk3 v0.6.2/go.mod"
+	"github.com/gotk3/gotk3 v0.6.3"
+	"github.com/gotk3/gotk3 v0.6.3/go.mod"
 	"github.com/joshuarubin/go-sway v0.0.4"
 	"github.com/joshuarubin/go-sway v0.0.4/go.mod"
+	"github.com/joshuarubin/go-sway v1.2.0"
+	"github.com/joshuarubin/go-sway v1.2.0/go.mod"
 	"github.com/joshuarubin/lifecycle v1.0.0"
 	"github.com/joshuarubin/lifecycle v1.0.0/go.mod"
+	"github.com/joshuarubin/lifecycle v1.1.4"
+	"github.com/joshuarubin/lifecycle v1.1.4/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
 	"github.com/stretchr/objx v0.1.0/go.mod"
@@ -26,10 +35,18 @@ EGO_SUM=(
 	"github.com/stretchr/testify v1.3.0/go.mod"
 	"go.uber.org/atomic v1.3.2"
 	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.11.0"
+	"go.uber.org/atomic v1.11.0/go.mod"
 	"go.uber.org/multierr v1.1.0"
 	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.11.0"
+	"go.uber.org/multierr v1.11.0/go.mod"
 	"golang.org/x/sync v0.0.0-20190412183630-56d357773e84"
 	"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
+	"golang.org/x/sync v0.0.0-20220513210516-0976fa681c29"
+	"golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod"
+	"golang.org/x/sync v0.6.0"
+	"golang.org/x/sync v0.6.0/go.mod"
 	)
 go-module_set_globals

@@ -44,8 +61,13 @@ LICENSE="MIT"
 SLOT="0"

 RDEPEND="
+	dev-libs/glib:2
 	gui-libs/gtk-layer-shell
+	media-libs/fontconfig
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
+	x11-libs/pango
 "
 DEPEND="
 	>=dev-lang/go-1.20
--- a/gui-apps/nwg-panel/Manifest
+++ b/gui-apps/nwg-panel/Manifest
@@ -1,3 +1,2 @@
-DIST nwg-panel-0.9.21.tar.gz 224453 BLAKE2B 33037f4934d42469e3ce4e35ca36cc9421f3ea594000e6fd90ac44739eb5b220a80d6e7a6f1162b5c8cfb32c64bd1fd9dd678e6b46cbd166cc04014951739c23 SHA512 542b574427b7f9ae2d6b57a32ecfd39282971fe848ff16a6c54f2f85898dfb30d9823a43fe9a509cf486cecb59ec675aa0b1cb2713dd2cc29b03a1ddb130eac4
-DIST nwg-panel-0.9.22.tar.gz 226330 BLAKE2B b3fce928e16177c58d4180178db6e702416fd04f2e4c80d155722c24df3299e2e1cd0646d85adf2d84ea64d59ecdc35eb36dd5011246189e989b32903db354e4 SHA512 d9be742b307152e76c8e97d16cb5eeb0e67018a8b84ea7e03838cc4b8d9881f50f297911ecb38209ce778112ae9645995727dbda8bf9981cc32da9dc02ff7c39
 DIST nwg-panel-0.9.23.tar.gz 227040 BLAKE2B bc0f5afd220bab8f360874b9744b21c8f1730cbd124763fe57d9707ae1169cce6d155dfe49dca37d45d398b5aeda38f3f68764e7cd5e11ac5392ad61d6b2a615 SHA512 1363ffab1124a17a4320a0350595808dda76fcfe1a97191e3b504b99a0733c9860d4aa35a97299605226f988687c3b4cf14794fe065e2e1ec11e1ca2e0fb0e9c
+DIST nwg-panel-0.9.24.tar.gz 227084 BLAKE2B 8a86923a0d457d55a1269b00c6955c51410fbd8f838c1b9b4526c37200b4f55c161d0df1ee4a3a0ef83f115c33563ffc8cc5907d601495d1b433ec04e93ac198 SHA512 68329511f20ce88738fb2b30efaa542fcbaf1376a7cb269755f99489cd89984d8986230eebd4c0c610cf5e935f85ba4d33108b7beff64dabc0d67f8f2af04c5b
--- a/gui-apps/nwg-panel/nwg-panel-0.9.22.ebuild
+++ b/gui-apps/nwg-panel/nwg-panel-0.9.22.ebuild
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit desktop distutils-r1 systemd xdg-utils
-
-if [[ "${PV}" == 9999 ]]
-then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nwg-piotr/nwg-panel.git"
-else
-	SRC_URI="https://github.com/nwg-piotr/nwg-panel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="GTK3-based panel for sway and Hyprland Wayland compositors"
-HOMEPAGE="https://github.com/nwg-piotr/nwg-panel"
-LICENSE="MIT"
-
-SLOT="0"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/i3ipc[${PYTHON_USEDEP}]
-	dev-python/dasbus[${PYTHON_USEDEP}]
-	gui-apps/nwg-icon-picker
-	media-sound/playerctl
-	gui-libs/gtk-layer-shell
-"
-DEPEND="${RDEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu nwg-panel-config.desktop
-	domenu nwg-processes.desktop
-	doicon nwg-panel.svg
-	doicon nwg-processes.svg
-	doicon nwg-shell.svg
-	systemd_dounit nwg-panel.service
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/gui-apps/nwg-panel/nwg-panel-0.9.24.ebuild
+++ b/gui-apps/nwg-panel/nwg-panel-0.9.24.ebuild
--- a/x11-misc/selx/Manifest
+++ b/x11-misc/selx/Manifest
@@ -1 +1 @@
-DIST selx-1.0.0.tar.gz 21423 BLAKE2B af7480e8ea5bfef8027c52acb6c0230888510abba31d117d650c8047c2f9fd680e5a2d2abec345048969957701e2bc14faf6e1396aac0e7f9e641ca6d4ae55e9 SHA512 4368f29731d81a3c91ac09093b6e721d850057900e21efea85ebbc29f851a7fd9b450d3ba7045e044ff0b6a87da1dc1d75f4e73b4dadbc7902192e0b4c753deb
+DIST selx-1.1.0.tar.gz 22109 BLAKE2B 73a68fa3a9c98f49705c8efd425523cbef8bfb15df9e73b0166985dfae3afe5bff9a22a88ff31d99a671e2d9e2bf482d18e8dd558d79e690e59d7bc976cb39bd SHA512 74aeb6ea5b9cf1d3793e8c5b90b44894d63096484f7d9c7fdf231d743f53178c85a9097d5daaa12739c0e83cdeb498d6454235c987267489757aa59080e3f131
--- a/x11-misc/selx/selx-1.1.0.ebuild
+++ b/x11-misc/selx/selx-1.1.0.ebuild
@@ -18,13 +18,12 @@ SLOT="0"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXrandr
 "
-# NOTE: next version also depends on:
-# x11-libs/libXrandr
 DEPEND="${RDEPEND}"

 src_compile() {
-	$(tc-getCC) -o selx selx.c ${CFLAGS} ${LDFLAGS} -l X11 -l Xext || die "Compilation failed"
+	$(tc-getCC) -o selx selx.c ${CFLAGS} ${LDFLAGS} -l X11 -l Xext -l Xrandr || die "Compilation failed"
 }

 src_install() {