gentoo auto-resync : 17:03:2024 - 00:48:58

16 files changed, 233 insertions, 69 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index e8f6f00044f4..a536e920035c 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/hyprcursor/Manifest b/gui-libs/hyprcursor/Manifest
new file mode 100644
index 000000000000..034a4c4b607a
--- /dev/null
+++ b/gui-libs/hyprcursor/Manifest
@@ -0,0 +1,3 @@
+DIST hyprcursor-0.1.4.gh.tar.gz 20072 BLAKE2B 9f4aafc673185ca522f16325529de30fb24cc962779358bc06e21fc148adae64156731d4d3e4a1f7bb2d72d4592cb238b8fefe33c473e86a1678cc5ec8677725 SHA512 6af0a81c39b73c804f5587be7a626db125a99318089c39769a26a4c2ebf0322a82c4ef690f0fda3b60301972bfd1c3a489209fa8157e6a43dec52fa2a6ccb9c9
+EBUILD hyprcursor-0.1.4.ebuild 657 BLAKE2B 5c2fa6640d30e34e3f1a4844803aabcd27ce98ea78885a990e889dcf8afc3b0e8cf3cc13eb2d0f935cde349bca34713268d2b52ba77833cc7d394998adee2ee5 SHA512 7b100ff15c53b9f662bdcf8f18c25f688a2ee7ca63ff76f39061205a1da1f839dbd18d6c8d33b8e6acfeb1c73253c44bd002ead2b203ba7385b94fc7773f1135
+MISC metadata.xml 671 BLAKE2B a58a3afafa4440b47b1106b69e93cabbfa20f147fad094aaf117d8daecd641662309ef8641f029220e20504939e86a307d7b1392af7fad1d6e44cfacbc334140 SHA512 9ac835082f59787ccca1e798bc85fcaf669a601b1dbb8f66f7b575e6fc0c2e857d269c918d100d1a26cb8c41a6e406247434935b26479a6dab31f6d348cc7463
diff --git a/gui-libs/hyprcursor/hyprcursor-0.1.4.ebuild b/gui-libs/hyprcursor/hyprcursor-0.1.4.ebuild
new file mode 100644
index 000000000000..d006f21c4a9e
--- /dev/null
+++ b/gui-libs/hyprcursor/hyprcursor-0.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The hyprland cursor format, library and utilities"
+HOMEPAGE="https://github.com/hyprwm/hyprcursor"
+SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Disable tests since as per the documentation, tests require a theme to be installed
+# See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
+RESTRICT="test"
+RDEPEND="
+	>=dev-libs/hyprlang-0.4.2
+	dev-libs/libzip
+	gnome-base/librsvg:2
+	x11-libs/cairo
+"
diff --git a/gui-libs/hyprcursor/metadata.xml b/gui-libs/hyprcursor/metadata.xml
new file mode 100644
index 000000000000..227e37ab55b9
--- /dev/null
+++ b/gui-libs/hyprcursor/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>julien@jroy.ca</email>
+		<name>Julien Roy</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://github.com/hyprwm/hyprcursor/releases</changelog>
+		<doc>https://github.com/hyprwm/hyprcursor/tree/main/docs</doc>
+		<bugs-to>https://github.com/hyprwm/hyprcursor/issues</bugs-to>
+		<remote-id type="github">hyprwm/hyprcursor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gui-libs/neatvnc/Manifest b/gui-libs/neatvnc/Manifest
index ef87777a5a62..2ff88297235f 100644
--- a/gui-libs/neatvnc/Manifest
+++ b/gui-libs/neatvnc/Manifest
@@ -1,6 +1,7 @@
-DIST neatvnc-0.6.0.tar.gz 578084 BLAKE2B 63a064054a61996bd09064e4684d6d4e836290b9c0a097138a8dbefc3615b8d22f1932caef3b147bf3a12fa14ef808d314016d53411e2d461e775e1a34522e15 SHA512 7fc38aa36faba227e37ec241b874f7c83e7bb912b22cb1f2198622a0bb3145661111bf58b3f9e376b0d03f04b667ba94f2e60f7f5e886c141178a874c820ea91
+AUX neatvnc-0.8.0-fix-tracing-undeclared-variable.patch 861 BLAKE2B 3c2f679d7f836c86d84f27043d2c3b48e30b47983919a71c5de70e8b91c91f5e4ae9797bd6238996120d2a4ae172ac735f2544f64430a3f4f4d079f949fb8fe1 SHA512 e5d04b2845094d078c2f5189e4de34f7e5c3de916d9a8c960a3bce354e6c09068b09062cb08ade21eef5c9c700c9474c065d91c7118678c037763bb00e7978fa
 DIST neatvnc-0.7.0.tar.gz 660642 BLAKE2B ae14f3d35839ae141d6cce760c118f6605b66c16e3d8e6fae4606deaa63adacab13d3c8dbc001a3937f4f1f6f9c908607176ea36a914d39a126730c77f3470c7 SHA512 79abf2f6d5676e1d8dc9f70a341ae0247ae20dd95f8724d27c667ae42d45c8b5f4de2321c0dad6278e0eebefbcda0a512da917fa6e5def801f938875bdab18d0
-EBUILD neatvnc-0.6.0.ebuild 1185 BLAKE2B 1148e00d4070a2393dde1f417cc4a83c8b792ac37d45b4fd26c54b4a4dab6c48f53530351e8272ad5fa1b5e1081a27c2869b906c8a744a11b95c2aabdf53a2b5 SHA512 f43ef0257b988d43d081727fa0a0ae183a45fd7d44b577ba74b70c26c29e62e1e924b6ed309f6db9901a15e88be19d8ae70ee531f3c1a0102498ef44c39da09d
+DIST neatvnc-0.8.0.tar.gz 661726 BLAKE2B 075831ad8f2a4e209b316b848ac2f5b2dbcd0ecf36e2ecc2b264be255ca0250d9a61ae5df1c522c310459cc2a536958cb01567ee640fca52db3966329d89cd09 SHA512 bd5bfbcec88711a64eb45c12cad208d594f24e3812d98ccb9eb3a3f8a933df3040fcb21e4bdf0df3ea44332096b6f0bca6dcb8f4be15d42541ab98b2295d4091
 EBUILD neatvnc-0.7.0.ebuild 1293 BLAKE2B b34983d1d7e02ad2d23c0fa35a8c9c92c31a786f9bf8bafed436d0b880ebe2c65d2227ee7169bfeccd106de69c24969b8b8075f8e0a0e38bc692d0659b852c7c SHA512 8507a1cbb539104add751185eb0b1d5a397a8247ec07960dcf679dad4fa48b5e40bc2a5a9cdc677fb8d39dd78699aa6ba1675f4f8ec3ac03dbd4c381e6e1f974
-EBUILD neatvnc-9999.ebuild 1286 BLAKE2B 7e1ecb6e57001e34c4609c0b038d0f922090b1b3b4f5cf670ca346dc0269bb586e496fe076d2f17cd3a001b0cb4262fabcae4675f474ff73b6df210873932db6 SHA512 cd1038d81756d6260cfa4f72c1acfdf9bbb97e54788e386237417e257edfabd161f93e94d3cad1908c0f6ea48a5bbd199cf00de2fb3fa814d8d6fb8f65fd95a5
+EBUILD neatvnc-0.8.0.ebuild 1734 BLAKE2B cf61460ab4d1b55e9824fd9cfca3dd9952272b9c3417a037b93d59e2626d92ba6391e7e7fb6c9fcafb6c43fe0e539505dee29eac1886dc268d4de575403ee126 SHA512 db1cdde25027fe050c20cf3ac733ea9d83a934db1235bec484b8c69921616a8eabf50772fc1323e04cc3ec8c690a9e17fdb20129224cf1baeb64fea4625a6358
+EBUILD neatvnc-9999.ebuild 1654 BLAKE2B c43dc6c9e93d978ba3c43f8e9d04a01f59b7bf94bdef0a590f28a0e66d6e40d5bb56b0b77be70a81d54e28c59608b61afc397f8ee3d8cadf09be5fec1fea280a SHA512 11194c9425246ec7a437c9c00131b94b568ae659e6f40daddd555e8d9eff3a2ae1ae187a1c937842e518e845766499173b9f2cfa7c60c65d3eebac5561f98884
 MISC metadata.xml 615 BLAKE2B de4d4bf8c3d9719208f89c1e5dabd0d040393ec50d992a727e2b68f1704c4cede37373c814cca67014ca4177e2672fb5e60012962e6b1ad4033a450a51e925a9 SHA512 8c8ed696e6ff9cda622aef0d9eee93d5292be5dde69c926d40f230c13881b5c3424882d758f7eda8e9f989370c9dfeeb0fad9336f81e963a7a5065047c0eba2a
diff --git a/gui-libs/neatvnc/files/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch b/gui-libs/neatvnc/files/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch
new file mode 100644
index 000000000000..72bf4285d9fd
--- /dev/null
+++ b/gui-libs/neatvnc/files/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/902141
+https://github.com/any1/neatvnc/pull/110
+
+From ce654aaf8b680768c4c51bef858e16f0db895814 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Sun, 25 Feb 2024 19:31:47 +0200
+Subject: [PATCH] server: remove undeclared variable from tracing macro
+
+* 3647457f6d769fe3c9518078008ef56be58b70b1 accidentally referred to
+  an nonexistant variable.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/src/server.c
++++ b/src/server.c
+@@ -2109,7 +2109,7 @@ static void complete_fb_update(struct nvnc_client* client)
+ 	client->current_fb = NULL;
+ 	process_fb_update_requests(client);
+ 	client_unref(client);
+-	DTRACE_PROBE2(neatvnc, update_fb_done, client, pts);
++	DTRACE_PROBE1(neatvnc, update_fb_done, client);
+ }
+ 
+ static void on_write_frame_done(void* userdata, enum stream_req_status status)
+-- 
+2.43.2
+
diff --git a/gui-libs/neatvnc/neatvnc-0.6.0.ebuild b/gui-libs/neatvnc/neatvnc-0.8.0.ebuild
index d773faec3821..45912b2bf4d3 100644
--- a/gui-libs/neatvnc/neatvnc-0.6.0.ebuild
+++ b/gui-libs/neatvnc/neatvnc-0.8.0.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="examples gbm h264 jpeg ssl test tracing"
+IUSE="examples gbm h264 jpeg ssl test tracing websockets"
 REQUIRED_USE="h264? ( gbm )"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +26,9 @@ RDEPEND="
 	=dev-libs/aml-0.3*
 	sys-libs/zlib
 	x11-libs/pixman
+	examples? (
+		media-libs/libpng:=
+	)
 	gbm? ( media-libs/mesa )
 	h264? (
 		media-video/ffmpeg:=
@@ -34,6 +37,10 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	ssl? ( net-libs/gnutls:= )
 	tracing? ( dev-debug/systemtap )
+	websockets? (
+		dev-libs/gmp:=
+		dev-libs/nettle:=[gmp]
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -43,15 +50,37 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch"
+)
+
+src_prepare() {
+	default
+
+	# useful soname
+	sed -i -e "s/'0.0.0'/meson.project_version()/" meson.build || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
 		$(meson_use test tests)
 		$(meson_feature jpeg)
 		$(meson_feature ssl tls)
+		$(meson_feature websockets nettle)
 		$(meson_use tracing systemtap)
 		$(meson_feature gbm)
 		$(meson_feature h264)
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	einstalldocs
+
+	if use examples; then
+		newbin "${BUILD_DIR}"/examples/draw neatvnc-example-draw
+		newbin "${BUILD_DIR}"/examples/png-server neatvnc-example-png-server
+	fi
+}
diff --git a/gui-libs/neatvnc/neatvnc-9999.ebuild b/gui-libs/neatvnc/neatvnc-9999.ebuild
index 64004b4ea3b4..6e2c4493b97e 100644
--- a/gui-libs/neatvnc/neatvnc-9999.ebuild
+++ b/gui-libs/neatvnc/neatvnc-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/neatvnc.git"
 else
 	SRC_URI="https://github.com/any1/neatvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
@@ -26,6 +26,9 @@ RDEPEND="
 	=dev-libs/aml-0.3*
 	sys-libs/zlib
 	x11-libs/pixman
+	examples? (
+		media-libs/libpng:=
+	)
 	gbm? ( media-libs/mesa )
 	h264? (
 		media-video/ffmpeg:=
@@ -47,6 +50,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+
+	# useful soname
+	sed -i -e "s/'0.0.0'/meson.project_version()/" meson.build || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
@@ -60,3 +70,13 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	einstalldocs
+
+	if use examples; then
+		newbin "${BUILD_DIR}"/examples/draw neatvnc-example-draw
+		newbin "${BUILD_DIR}"/examples/png-server neatvnc-example-png-server
+	fi
+}
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
index 5664003d6d7c..3092b297b95b 100644
--- a/gui-libs/wayfire-plugins-extra/Manifest
+++ b/gui-libs/wayfire-plugins-extra/Manifest
@@ -1,6 +1,6 @@
-DIST wayfire-plugins-extra-0.7.5.tar.xz 75136 BLAKE2B 7ffbb73f09175cc92f09b8a3f0493942741564278f95ff1d80066044b02ce4ceb925919ddb54fc6a37676b925d95ea7f93d09c6b0ccd448c6e9b821106d6e3ea SHA512 9cc816c3c727b0093fd15ef52dea215598b4c49ef96c098f53938c041b3908b30f4dd616be4b459b7382d630a47b36baf845c24de84f35670ba2912711205911
 DIST wayfire-plugins-extra-0.8.0.tar.xz 70324 BLAKE2B f8f46782e31f170eb566567f50d302df4db23fbeb29c71569624a7f79c2bbcfcf48b070e7b55bf1880a9cd02afe78783d6680c457e466d765eb0db72f4b1f61b SHA512 8105fea3d8405a88d8c872c1012dadfab55f987a8ff8401f5caeec155214727021cbc7cfaba71c5ee3bc869caf136dcd78c189921c2f41a938b8552962f1597c
-EBUILD wayfire-plugins-extra-0.7.5.ebuild 772 BLAKE2B 879920d3d9f4d8745a2960aa546284ddeb3332b910303d07e2393c4690b792a4517eea9b066606bd001be7de7c5f9cf52cb1d4bfd09e8f29fb5c5a24cd47d43d SHA512 1a10d25b9a5e29723f881ea820a8b044f84bb7891baee1fc61e3f21217abcc8120b1d3c8e487ce0e027f933684686d22f3458c0253541c964963413367545069
+DIST wayfire-plugins-extra-0.8.1.tar.xz 75908 BLAKE2B 65c14281fd9738864f2d63f01250e6384cdf46929ee6df653a5614805b89686f0020799246d6caf16b8d45aa16a66f314e705ae96c37188d892d339875ed4c03 SHA512 ebe12545b0a0ca1c443f334b9bfa31d1f446636dbef2b91c280715ad58d8802ab129f6894959727c0b872558f799c973a158e679683f915a5ef89b67087eed01
 EBUILD wayfire-plugins-extra-0.8.0.ebuild 794 BLAKE2B b87ba6fe515dad120533142529439855d750111727ddc5b1bff2cadcbaeefd5fed185a9fe85088a2e2708780ad1c98247499d80e2dafcfcd7ba8308cdf47659b SHA512 b887109ee68483db24de1b6efa6ba16dedb0dcba0c6051b3c844b8bb144bb05cd0d476f0eada1f84566ccf6f2e462fe8a7d5f45fc64a51375905d362cb9f1290
-EBUILD wayfire-plugins-extra-9999.ebuild 795 BLAKE2B 644aa003b662a74250c8096c777132a2679095cd9560d01d36e096d27c96fe00454d84a7829b89bf1569ed00d1988c103a321b44a444ba658e81312584d4ec62 SHA512 d51423c890adafb3a4531a7309de70fc09d258dfeb5bfed4353c25f76904f7579cd96c64f9de4f016c19b9339738734fadde1b94abe6a54cf2be07ee0fa9a53f
+EBUILD wayfire-plugins-extra-0.8.1.ebuild 925 BLAKE2B 66d6204ae116ec5f90f9ed6852966e1c842e877a546f1139cdb1c224a2a911aa1b4ae692eecc46a1800144f2e754624aaf57af5307c6da8c505df78116b5eb6a SHA512 164095808f2667986b5decc9f069a728292dfb954e6bc2e0635b5bcfd0a510c20c7d189f2f5ad63ccca9b9f8383dcdfb70b3914f8b399b477dcd021077a68791
+EBUILD wayfire-plugins-extra-9999.ebuild 925 BLAKE2B d45e44dba6e39fdac5461ead5001d00b48ae3c8bf26585984aa30a64fe0f122dc5f4212f1d6f3563814b9dfe051199e2307674383891292edd4798182c682ef4 SHA512 f1e939b9be7af641f1838b775dbcbd09e95f0a71a48c9527fbfd6459f8a06d45f831b95187d68301f7eae0b3b2c69d28bf2d84cc4cd4449be1c417ac8d092ae3
 MISC metadata.xml 279 BLAKE2B d81a0199be218cc849144ac91b5ebbfef4385b127e52b16cf0596868d6f0e1f17211de6cc7ebea1b93851adf8740037363b53b00acfa567eb7b0a22ba3f6c3cd SHA512 808e43fbf58e326971fa370ce5146432266cc8b80464470606e36242b03c14e17a1bb4e90a144b554f65ebd36e8fc1fdbaefeb2ee445ab03c644f71fc981f9b7
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.5.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.1.ebuild
index c0a8a93d13b4..9a4704dc5c89 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.5.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,26 +11,37 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
+	SLOT="0/0.8"
 else
 	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
+	SLOT="0/$(ver_cut 1-2)"
 fi
 
 LICENSE="MIT"
-SLOT="0"
+
+# no tests
+RESTRICT="test"
+
+WAYFIRE_REVDEP="
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	gui-libs/wf-config:=
+	gui-libs/wlroots:=
+	x11-libs/cairo
+"
 
 DEPEND="
+	${WAYFIRE_REVDEP}
 	dev-cpp/glibmm:2
-	x11-libs/pixman
-	gnome-base/librsvg
-	>=gui-libs/wlroots-0.16.0:0/16
-	<gui-libs/wlroots-0.17.0:=
-	>=gui-wm/wayfire-0.7.5
-	x11-libs/cairo
-	x11-libs/pixman
+	dev-cpp/nlohmann_json
+	dev-libs/libevdev
+	dev-libs/wayland
+	>=gui-wm/wayfire-0.8.1
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	dev-libs/wayland-protocols
+	>=dev-libs/wayland-protocols-1.12
+	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
index 245409005bf2..72311100c56b 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,10 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
-	SLOT="0/9999"
+	SLOT="0/0.9"
 else
 	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
@@ -23,12 +23,21 @@ LICENSE="MIT"
 # no tests
 RESTRICT="test"
 
+WAYFIRE_REVDEP="
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	gui-libs/wf-config:=
+	gui-libs/wlroots:=
+	x11-libs/cairo
+"
+
 DEPEND="
+	${WAYFIRE_REVDEP}
 	dev-cpp/glibmm:2
 	dev-cpp/nlohmann_json
 	dev-libs/libevdev
 	dev-libs/wayland
-	gui-wm/wayfire:${SLOT}
+	>=gui-wm/wayfire-0.9.0
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index c9af132a06e5..766894ac455f 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,7 +1,5 @@
 AUX wf-config-0.8.0-gcc14.patch 1384 BLAKE2B f613694071da0b61a9044987b011becbb020f2ad1fe5aab3c91d5622619b050cc961b53f8b3250ee8bdb89ab0d0c504f0050f50ad485d9a1feccd8bfee8f00b2 SHA512 5ce79a063246d3ba38ff1ff6ac23810415a57189b17320cce89874fc1e59c1d1edb852d06fec99a191018687516a1928ed1144b78e99642d8ed8f3d9f31490a5
-DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
 DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f
-EBUILD wf-config-0.7.1-r1.ebuild 809 BLAKE2B 9f67605ea19118594c5a1d4a7e908787b9731234efa01ed4dcf5957d4a8c7e2f2dab90983e3b45a9a760ac2a0bbc7873ef09cc04c1247e326f0cf5a19e51de46 SHA512 0c48c0fc68edb3aab37eec47058db82434b3ce970b473927067aa94d274360faa5a871857466d4df54aaec138a7e13d371c54ef59af2e598498e8a15dccb317f
 EBUILD wf-config-0.8.0.ebuild 958 BLAKE2B de6b7bdc0aeca10eb6ff2479ee04eb9bac877eda0298216d32e4f77ae8021ae2d1ee96559062575a083fff6dc5946dec0bc004f293d03db036f4e9fc9ba591b2 SHA512 d38bc91f1aa759832c7f7bb086443f3b17b2271330a7a983770cc2551f5a4d98bce2d78c995b0108c35951fdbab8b363619803213f2ce20ddfbe4f8b33584294
-EBUILD wf-config-9999.ebuild 903 BLAKE2B c4612bc2f5a3e3715855c5a50d81935e887b0bf5c6b54f86b1ab3081b78e1de12955bc65322e49cad9ffcabc78e2acfa24166b0eada426f2c44885cfa65d5662 SHA512 fbfd146303c215107751ea179a425c5be25c5810c237d610b12a9ae037ad27417ab601c2072b006f1bba82db60d14accf7405ce2182c70e7d03e8fa301a058d2
+EBUILD wf-config-9999.ebuild 902 BLAKE2B 39cf89d2e1734db0df60d0bc2c69dc12810b8f9c05756517280adb635b27055dc25488653353d12b3f2ad753e375c75b0b2d87e9d7244e746b04e73ed50d6d0c SHA512 2c164c2ef084a18033609c68f55210125845e3cddecec62359915c2e59b7a7a82319b55355bfadf771d136ace1504d88390bb74ad3c43cb40f5e8f2366eedcff
 MISC metadata.xml 507 BLAKE2B 503103e40f0527b6593821f4170bf58d7077d6d32096cb71d125ed88ac768c341b089a6d7c173797aa4604e6450f9c9716fb4122d8d499b67f1067f75d3c60a0 SHA512 122c9699e3a22be6d91680ac303d09b9614313345f11a9a3a344c4064fecede8107f3b891c9e04bb19479aeed846beb18355803dc41b2052a81fb6c016c25f5f
diff --git a/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild b/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
deleted file mode 100644
index a223d4b9907c..000000000000
--- a/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="library for managing wayfire configuration files"
-HOMEPAGE="https://github.com/WayfireWM/wf-config"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
-else
-	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libxml2
-	media-libs/glm
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-	test? ( dev-cpp/doctest )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test tests)
-	)
-
-	meson_src_configure
-}
diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index 45a7d00fb05c..d01859840af0 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/WayfireWM/wf-config"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
-	SLOT="0/9999"
+	SLOT="0/0.9"
 else
 	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index 7683f3b391cd..a3d68b584065 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -2,9 +2,11 @@ AUX xdg-desktop-portal-wlr-0.7.0-portal-config.patch 1235 BLAKE2B 9fcba6a71e2627
 DIST xdg-desktop-portal-wlr-0.5.0.tar.gz 31622 BLAKE2B 9314a1bfd121f25c6f615e1cfaa62d071224b5da9373bb3a954a06aa7ef9527617e34ae29192e25ca9c13c53eb77eb137fbaa1b121c9365397d64845c0cc3e36 SHA512 9ece46f2381e83cac8002a8175a13b0c29c0a2dab49cf11ed5ffa3448f176802b9d324b7e4fe9c15d3fb65087be42299f21a0ef505088e6281787f4067d256ac
 DIST xdg-desktop-portal-wlr-0.6.0.tar.gz 35654 BLAKE2B 1c213e9789db14366639d924d673fd05d94463f7fda8f3afb03f74269162f00e986c157d9741cb6b243d79e04230399b0bbc400f1d1e2bb72c9f53a9d6bc1e15 SHA512 e325c2de2a98ffc4612da3492138843b6c9927e536f52f7a87e794380c099f84ab8d344ee989bf88e71faaad2e5300fc31ac74058cea5040654ac74ce270ee53
 DIST xdg-desktop-portal-wlr-0.7.0.tar.gz 37812 BLAKE2B 6f8a8f5e8bc5d60df8f7bddce3a5da2ef9a4b74b490595b73b925f177ee28467bba3738d8c5b0852754bc702ca950f657c58b735b5775d0b07e906547419f79f SHA512 7efb3b66130f2f8ef8538ced3a9785bbae8382bbb9171fb4b6496567e39a69cd8b6e687f1b18b5eb90be175bf7c0737c3a51daa3eef784f88c4ee0bf70ad6d87
+DIST xdg-desktop-portal-wlr-0.7.1.tar.gz 38849 BLAKE2B 41bbb177dc4df65f9ca5bc8a6c18775357e71948026864b3ca157d3d0834b41cfd4188bd1d4d2417973cac434b1b7f2a2e6b4a2fec45cd2d8b36b8a8f55a498a SHA512 87aa5255d3de3203c2bfa6986c2acbffbfd414d12fb72aeca25249d3b528ffb948858a787c9c4206b18faaddd6ce09c95c257e969cc3cfeee8e376c3846f2b9d
 EBUILD xdg-desktop-portal-wlr-0.5.0.ebuild 1106 BLAKE2B 0cc1cead17aecdba3ea3d2e2b0ef296c413ab30e29290f4d9fd137ad401f871ce6d0fa8261e442dd4ec7e1263579499abee45d1f0391c89ac628358fb27d90b9 SHA512 5e550aa1e96fdc5ce13a5907e648e11dd9e1dc205426ab9c43e5c19261cab3b5598d29d3d01c50137c1a1c5d8508443d182116c25e7a8a6fd2118e5b31a37489
 EBUILD xdg-desktop-portal-wlr-0.6.0.ebuild 1208 BLAKE2B b0e524da8ff6947ebd8ff3f2ee757b0578acc137d27c6fd51354a5c1c8cfbfe05953aa964c26119635b6ee4d3046a0f6d3ad2b8029a657e188444c41060c336d SHA512 23d8cf37bb2510f925412b9c254c715ef2eda39f46fd38e9beb280052d720125ac1a92dfd69568e7577a601874bdde9febe36e8c918e82b7d43889951687af26
 EBUILD xdg-desktop-portal-wlr-0.7.0-r1.ebuild 1411 BLAKE2B 2a8c2a94615773ddc7f8b253097dfa7a4aafe0d3a1994f685b4cf67645bfd5431f7c8874f2311f70927a893ff7bed0bf93656cff76a9c7859699b106b553fb71 SHA512 1474c9f9db8a83d599d64a229a51bcc5a45fdf0ff771a68ef965854f6f914364192030a991364c8245f5c6ce1608c3e7eec1b2fb6d115a6e0d12c763f4305ad5
 EBUILD xdg-desktop-portal-wlr-0.7.0.ebuild 1203 BLAKE2B f283f8ff7e0e26224d8c2a2d261705410d30283cf359aa483fe94981dc37fab5221a50c9b835a2d54ad7deda336d9b98c01911b5a598680a0cf0f55e2405b25e SHA512 1ef37b5d5aa13825f0e1a624ce9a40e1f0d2abe84236098e6a2ee400bb16f9e644070e8ef57ca2c3af9bc30ec812644b4af83e81c0109e6c7a2e67cd924a4385
+EBUILD xdg-desktop-portal-wlr-0.7.1.ebuild 1358 BLAKE2B df6522ad97cb491963baeba51e3fcfb4325ef0dadad3d53961a17ef3942d4cc2ea54657b3dbacbf5196989ce1b4487fa7496f0b808679f63a85e01601ccbad16 SHA512 420ae3a3d3622f6c0957e146109cc17d494517c37e770eedff28e88068da1ae085be4e1234df80a1ac044f9edfcdd34754b14d30ff99afb9b1c9eedc69a3f582
 EBUILD xdg-desktop-portal-wlr-9999.ebuild 1358 BLAKE2B a3771d6558f0aaa7124dcd8e5a1fd2c1c5fb68a9b9468e68f0fb59097ad33583acab3d1e660e9eea3c4506a0c2d3f837f52211b07d50b07382c5871126ad4309 SHA512 39f0811d3d76a1b08e181660dc0a22003e09262c13d5c1f97436c1e9f261fbb2a70b56e4625d8009fed3a7668f24f6c54a87f57331bbded05e4a9088c9e6f564
 MISC metadata.xml 444 BLAKE2B 44732ae1920d37f03d5b233037876c050b8b65a0175c35d516f3d3a7dc76389a4876de84e69b875730b81a7f7cfbc7842f7e8820a40401ad1199f850a8d48049 SHA512 0f025bbc99adcbe21ea8ae5d26d639cfbd6465c7a2976605087898087cd51aee09b9bdf5371681d9b820ae2dd1d03006a4a7971a87918f63530d64ddbe538703
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1.ebuild
new file mode 100644
index 000000000000..305cb089f788
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="xdg-desktop-portal backend for wlroots"
+HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.62:=
+	dev-libs/inih
+	dev-libs/wayland
+	media-libs/mesa
+	x11-libs/libdrm
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
+"
+# mesa is needed for gbm dep (which it hards sets to 'on')
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=()
+
+	if use systemd; then
+		emesonargs+=(-Dsd-bus-provider=libsystemd)
+	elif use elogind; then
+		emesonargs+=(-Dsd-bus-provider=libelogind)
+	else
+		emesonargs+=(-Dsd-bus-provider=basu)
+	fi
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# bug #915702
+	insinto /usr/share/xdg-desktop-portal/portals
+	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
+}