gentoo auto-resync : 13:02:2023 - 08:16:09

10 files changed, 354 insertions, 20 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 7c1f97be7a65..35403dd078d5 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index 9b9364b96c1c..56c042eacf9d 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,3 +1,5 @@
 DIST gamescope-3.11.51.tar.gz 209920 BLAKE2B fdccd6659e33a9ae43eaabc5d41cfa6d0a92bda1a283e23f101296713f5094093b7b41135de44abd65ff17c66d70b27baf50685dcd2a47084022fb611e150a5b SHA512 a4ddd96a4fdacd62eee800f6fb331d08fca32c2798d64148529181a0ee8d8af57d5d67bfa28bff8e9cf62047a7572c43b36e2968660ea2984b8e21fa812baf9e
-EBUILD gamescope-3.11.51.ebuild 1811 BLAKE2B 94cb48edfa00c881346c2dbda4ff07f476cf97132364517451b4de85c3193e480be0194c13b7c1046cc083dd8af07fd1019a9c7b8e8891b4941054f16641b5ba SHA512 0b5d06d7fbea7eb144275f8cb345647fd844ff8aa5fa25aefd4718bfdb1f81b2817f57fb4a49a2340179a571fe3742d8fec3c63bf3f64e3d46b5913b3250aab6
-MISC metadata.xml 411 BLAKE2B c6f08c2a8b130c5b5b7085e3b6db62c0a2a9b0965b6e004e6394da7625b2e9430fdedffcddf4dfba50d2c4fa40b20ceda0743294d86229272364e8785c359584 SHA512 ce196e3fee976ea76038e3603ec33da7dbdce267ee2ffd233c29fb7ac6f64fd38b1ad8b421929374a1a2c53f91fa83c243175836ddda4b04f6f3b7f22833ee42
+DIST gamescope-3.11.52_beta1.tar.gz 256753 BLAKE2B b25dc6609ab4f2639c7dfa1d972c41697632cc2fc7afc8bb6eeaa6271bf16fe19f9a4f553395eefbdc92f2d896c2f9e7489bdb664ea679a8b514ac5c8a50b60c SHA512 7fb8e2d45e6eb66bb8dbdac9aa39e4492d27b9b7b6175314877082c83cdf8891eb1bd00d86b9109e392b4c877919956feaa420c0d71e59e34e224f7223050ada
+EBUILD gamescope-3.11.51.ebuild 1824 BLAKE2B a2d3471ce89c79c87c3c1e47007f915b078c319be2cc7309c42a06bc3dc04ac8505f693245f3f18388413b09d1ab1b278efd7641730fdadffac33ffe2a52052a SHA512 4e440dc6c36800b2cf4d93697d54ec1cae3890d1d91a348680ffa54df5770532d04d71bacd98e86a2c1cecb943f74672f55874d7611f8f01e1a0d5c8e8f1854c
+EBUILD gamescope-3.11.52_beta1.ebuild 1737 BLAKE2B d52b65c2bbc071ef9cc99b7c776a8226192209b4cebe642b6615542f0043ee0782795eb223637f9f2069700610a9866993f27a3e4d260a0331f7ffb777581b31 SHA512 8b0baedc0202873d6dc818300b16a4f6be56ed7b5d6e8858a5db709e062e933e4b1d3db107006a4905251ed05bb6001fe24b606b99137cb5a1656afdd4631052
+MISC metadata.xml 483 BLAKE2B 707c65db5f28be5da95a68a7428a33a342aa8689d3021b82e7de006f7bcc9a6a476cf9450c889cef0e922a71e8086ad20a3de885c157840621187956d9d1d8e0 SHA512 6b8392e60e5b651720a678296acfb3ed7f910fecee71f5d756c201eefe7516dcc04ca148d4b0f416fc07acfc70b3e09f553b505106b95d504c63d763b791dd3d
diff --git a/gui-wm/gamescope/gamescope-3.11.51.ebuild b/gui-wm/gamescope/gamescope-3.11.51.ebuild
index a8464a5a2e68..b8dbd943a190 100644
--- a/gui-wm/gamescope/gamescope-3.11.51.ebuild
+++ b/gui-wm/gamescope/gamescope-3.11.51.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 	${RDEPEND}
 	dev-libs/stb
 	dev-util/vulkan-headers
-	media-libs/vkroots
+	~media-libs/vkroots-0_p20221205
 "
 BDEPEND="
 	dev-util/glslang
diff --git a/gui-wm/gamescope/gamescope-3.11.52_beta1.ebuild b/gui-wm/gamescope/gamescope-3.11.52_beta1.ebuild
new file mode 100644
index 000000000000..83d9cba188f7
--- /dev/null
+++ b/gui-wm/gamescope/gamescope-3.11.52_beta1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps meson
+
+MY_PV=$(ver_rs 3 -)
+MY_PV="${MY_PV//_/-}"
+DESCRIPTION="Efficient micro-compositor for running games"
+HOMEPAGE="https://github.com/Plagman/gamescope"
+SRC_URI="https://github.com/Plagman/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="pipewire +wsi-layer"
+
+RDEPEND="
+	=dev-libs/libliftoff-0.3*
+	>=dev-libs/wayland-1.21
+	>=dev-libs/wayland-protocols-1.17
+	=gui-libs/wlroots-0.16*[X]
+	media-libs/libdisplay-info
+	media-libs/libsdl2[video,vulkan]
+	media-libs/vulkan-loader
+	sys-apps/hwdata
+	sys-libs/libcap
+	>=x11-libs/libdrm-2.4.109
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrender
+	x11-libs/libXres
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	wsi-layer? ( x11-libs/libxcb )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/stb
+	dev-util/vulkan-headers
+	wsi-layer? ( >=media-libs/vkroots-0_p20230103 )
+"
+BDEPEND="
+	dev-util/glslang
+	dev-util/wayland-scanner
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+FILECAPS=(
+	cap_sys_nice usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+
+	# Normally wraps stb with Meson. Upstream does not ship a pkg-config file so
+	# we don't install one. Work around this using symlinks.
+	mkdir subprojects/stb || die
+	ln -sn "${ESYSROOT}"/usr/include/stb/* "${S}"/subprojects/packagefiles/stb/* subprojects/stb/ || die
+}
+
+src_configure() {
+	local emesonargs=(
+		--force-fallback-for=
+		-Denable_openvr_support=false
+		$(meson_feature pipewire)
+		$(meson_use wsi-layer enable_gamescope_wsi_layer)
+	)
+	meson_src_configure
+}
diff --git a/gui-wm/gamescope/metadata.xml b/gui-wm/gamescope/metadata.xml
index 97b39dd3f361..f2337907378b 100644
--- a/gui-wm/gamescope/metadata.xml
+++ b/gui-wm/gamescope/metadata.xml
@@ -10,5 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="pipewire">Enable screen capture via PipeWire</flag>
+		<flag name="wsi-layer">Enable the WSI layer (required for HDR)</flag>
 	</use>
 </pkgmetadata>
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index dfe63f97447f..1c9553172863 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,8 +1,10 @@
 DIST sway-1.7.tar.gz 5559075 BLAKE2B 702b9a209d603c88743f2e89d0787431b7a30e8b7554c9596edb9735af862d23c585158737a0943a470637138cbc5275bee37bd2d820a7489cdd0747d98e6e22 SHA512 028cf5d504d5914bfb78d44156d6a290de660c5ed0638f4e2c56e5be76db9b0baeda035e1fa1ae23559016bd7e4312f7ff70c2fb4904df25358577c1a3d21243
+DIST sway-1.8.1.tar.gz 5577483 BLAKE2B 0e21c3a113b6bbb4a535ef77e347304ead98a424b65c176299f3d86fd52c35abf88d4e88fff0a8ecdb48494e8275110c79ea35fafd2902653db03fd938ee0323 SHA512 1f9909cb0402a99926d0ff1cefb98c40930e61678067413b6f195b036e6018a4f85bb3a6649d8bb743c93f0476b103791617a94d7c8c11a2c021f40131b65563
 DIST sway-1.8.tar.gz 5577138 BLAKE2B cf93db2d7722be5a14f3557087c8298cbbbaa7268ffb8540c5473581200323b6ba24c9a669e2b7fb31afe3cbe49314eef9f224c438ad3c4cd93ef939285be365 SHA512 9f4f24ecc16c2ffe0e2b17fa5f0da871493073fc96f2daf20323459b3adfb29bae3c369833d713ae254b5ac036d9b6625f76595ca31c3d216626095d1ef29615
 EBUILD sway-1.7-r1.ebuild 2175 BLAKE2B 9847fd44899ef922fa04ddfeb810b0ad4c9ae930f785c2393b6b5e1d348c893b19c0e9f791fbd661b76eed3e4c4f9eb16ecaac1c794479f1e86680180eb115e9 SHA512 c25c1776915883c42113c358783706181402c5f052ef08a81c20380af4bae37da5e3c53b59f0ac9d6bdfc197f94b33ba713830d9e85ad4a9ed74d5b3825fd85d
 EBUILD sway-1.7-r2.ebuild 2629 BLAKE2B 09ae1cd2a056ff6b775225ecc3fd81012fdd44d66cd2ec97e68874148872931a09b4ca9988fbf10287f9b032ac4e8f52766ef8f44a2b052f41aaaf381d515aec SHA512 88398a3f549b9c356c305df3a40a86987a842c05df320826195230585ca7da2a9c7a5f65f62ef73f9fe8c7f331926c8b5efb18bfd0e064ef8a2e00552f5ba94e
 EBUILD sway-1.7.ebuild 1900 BLAKE2B 7969c477bc7a65cb67ad007e9105c7046af2a873bd3fdd1924ed37e74f60819973ca96061dbb5b97fedd20d47bd1832f939c4ad9ae0885c2549dc03972f980b4 SHA512 a702d1a00d4019c72e0bd54262ac4d0d7304835df6cbd92e93f94e8aee56f556331b0452c10c4dd3e221cd31fd04859804f62027d1080a2c1fece797b9359bdb
 EBUILD sway-1.8-r1.ebuild 2697 BLAKE2B 3730a8549ac3e0371adf2ae476fee57b70435ebcc9d22618e8979b7b91c9476fde4b28cff77b4c0c7297ba9458f0fa7ab8a6192d0da57c9de7780510dd5d4547 SHA512 dd3641872fb7c499cf6161dea58686c89713efa69d56552a5df9e4a50f1f897053483ef6295bda2ef0314915d4b5e4c34a305e2f81032bee506cce84ec6cf1d4
+EBUILD sway-1.8.1.ebuild 2700 BLAKE2B ae0df7e4f0f76f79ae30d21a0d806ed6f2c5be5cf41e1e9ca54d0f60053b5cf1c32220cae457c401e3746e01f9af4ebb7133ede588ace80fde8fb639b85bb84b SHA512 304af51ab03a2a6b7f7c84c9be7dc9870a735a9f22440fb7f21154e010a5531149ed05070060f30de870da98079a9288888d61525ddb321d6eda9c9a5260dd9e
 EBUILD sway-9999.ebuild 2700 BLAKE2B cf8ffaff4cdf2a35e00c17382e15fba13933c400f82ecd2dc7520cb2dbf68d13b9310d3deb848a07e18bc279fcba55bbc43b8ef2a1fec3c401c444b5a7c23701 SHA512 1ba4e98ef41ee663d3a36f1434f322ebbfb1a2eafd43d4a848e125b1b55dba46351abe3cd3f684311e7f5a85c0720b0aaee14ab50dc6b9c123ab9de77290aa0c
 MISC metadata.xml 2165 BLAKE2B 5ebce1764fdd8aad171787dbf32dc5c1388506bbab5ef6a85c8990099f177edfed722c5d98a50e54620a7aad62c38072d2f8dbb34d28200902ad2d276e27164c SHA512 c8d70170b63cad752a666e75085f679b28ea520b460f01027d078dc178409dd43ab0f1b79033a149fbb2206a9e0fa6620623cb9df66343a734bdc3920c6c762c
diff --git a/gui-wm/sway/sway-1.8.1.ebuild b/gui-wm/sway/sway-1.8.1.ebuild
new file mode 100644
index 000000000000..8c30e4dd9e1f
--- /dev/null
+++ b/gui-wm/sway/sway-1.8.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="grimshot +man +swaybar +swaynag tray wallpapers X"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.21.0:0=
+	sys-auth/seatd:=
+	dev-libs/libpcre2
+	>=dev-libs/wayland-1.20.0
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	tray? ( || (
+		sys-apps/systemd
+		sys-auth/elogind
+		sys-libs/basu
+	) )
+	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
+	X? (
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-wm
+	)
+"
+# x11-libs/xcb-util-wm needed for xcb-iccm
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[X?]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.16:=[X?]
+		<gui-libs/wlroots-0.17:=[X?]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	grimshot? (
+		app-misc/jq
+		gui-apps/grim
+		gui-apps/slurp
+		gui-apps/wl-clipboard
+		x11-libs/libnotify
+	)
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+REQUIRED_USE="tray? ( swaybar )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-pages)
+		$(meson_feature tray)
+		$(meson_feature X xwayland)
+		$(meson_feature swaybar gdk-pixbuf)
+		$(meson_use swaynag)
+		$(meson_use swaybar)
+		$(meson_use wallpapers default-wallpaper)
+		-Dfish-completions=true
+		-Dzsh-completions=true
+		-Dbash-completions=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use grimshot; then
+		doman contrib/grimshot.1
+		dobin contrib/grimshot
+	fi
+}
+
+pkg_postinst() {
+	optfeature_header "There are several packages that may be useful with sway:"
+	optfeature "wallpaper utility" gui-apps/swaybg
+	optfeature "idle management utility" gui-apps/swayidle
+	optfeature "simple screen locker" gui-apps/swaylock
+	optfeature "lightweight notification daemon" gui-apps/mako
+	echo
+	einfo "For a list of additional addons and tools usable with sway please"
+	einfo "visit the offical wiki at:"
+	einfo "https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway"
+	einfo "Please note that some of them might not (yet) available on gentoo"
+}
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 60221c6f3c31..c8d5ce7da056 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,6 +1,8 @@
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
 DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
+DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
 EBUILD wayfire-0.7.3-r3.ebuild 2553 BLAKE2B b7d8caa0ef5e425ba5f4ffeef1f7dec8c39fbc2f6ef5aff0989f1aeac93c404550ba8d19e48e288fdfb683e89e982018718afab3b5ca68e0bce45217bea714bf SHA512 988f82606f448bac536e0e6633a0a23dbc513351a84df1fb81e1deb8298b9f0738ef559c15997693c7a93699198eeaf1904feff570b8e73a4e1a7d008aa7ff3f
-EBUILD wayfire-9999.ebuild 2501 BLAKE2B 91272a403814f085b1d5bc3efd9a5ec47ab60b5e27bfe8b679f5142d0c432997864ea6ab9ed61380cf9fb92ade3e5eb5629d4230d3d410c3596e68a1d3ce80b1 SHA512 3b99a0a6046ad22fac943d6b95a6c8d1c71714d7abed2466d42424591e8b2305b799592c8700f1e926c2d87dda559c2f77c4fd076f0e24fc2c7329e35d18dd41
+EBUILD wayfire-0.7.5.ebuild 2816 BLAKE2B f9090c39d744c03c46cd1467be69958debcf2d94702de78fffad9b3999d10a564ba07a7800f0eeddaf692b9c4f5a8d78f0cefa1a7a80082560c1f0fe048b4bdd SHA512 7d70ded038c7489b89b63e9ca1c6fa531a3d181672e806c6e625beb0b6660ad51a082cea6fe4c46f21e861cd9f7908ebef6a08fcb03ea845c71206ada88c4d8f
+EBUILD wayfire-9999.ebuild 2816 BLAKE2B f9090c39d744c03c46cd1467be69958debcf2d94702de78fffad9b3999d10a564ba07a7800f0eeddaf692b9c4f5a8d78f0cefa1a7a80082560c1f0fe048b4bdd SHA512 7d70ded038c7489b89b63e9ca1c6fa531a3d181672e806c6e625beb0b6660ad51a082cea6fe4c46f21e861cd9f7908ebef6a08fcb03ea845c71206ada88c4d8f
 MISC metadata.xml 920 BLAKE2B 0b0ad723f8383bc65a87cbab8b7195d33a3dabd9ea73c8c2f91957151b9f324e63ea4b25c480d44eba391f595ffe3a9d0c39800eaa9bf4b81b47cb8e3262222f SHA512 c0eb23bcfc87b274bcb2c96b0e52cb91fb6dd3ffb51ef4285f34af3a9861122c0d30179c5989070de85ebcd0dff282906bb4c15c4983bfdce123c5c3b101561e
diff --git a/gui-wm/wayfire/wayfire-0.7.5.ebuild b/gui-wm/wayfire/wayfire-0.7.5.ebuild
new file mode 100644
index 000000000000..42ab1b20d21d
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.7.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wayfire"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="debug +gles +system-wfconfig +system-wlroots X"
+
+DEPEND="
+	dev-libs/libinput:=
+	dev-libs/wayland
+	gui-libs/gtk-layer-shell
+	media-libs/glm
+	media-libs/mesa:=[gles2,wayland,X?]
+	media-libs/libglvnd[X?]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/freetype:=[X?]
+	x11-libs/libdrm
+	x11-libs/gtk+:3=[wayland,X?]
+	x11-libs/cairo[X?,svg(+)]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
+	x11-libs/pixman
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb
+	)
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	DEPEND+="
+		system-wfconfig? ( ~gui-libs/wf-config-9999:= )
+		!system-wfconfig? ( !gui-libs/wf-config )
+		system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
+		!system-wlroots? ( !gui-libs/wlroots )
+	"
+else
+	DEPEND+="
+		system-wfconfig? (
+			>=gui-libs/wf-config-0.7.1
+			<gui-libs/wf-config-0.8.0
+		)
+		!system-wfconfig? ( !gui-libs/wf-config )
+		system-wlroots? (
+			>=gui-libs/wlroots-0.16.0:0/16[X?]
+		)
+		!system-wlroots? ( !gui-libs/wlroots )
+	"
+fi
+
+RDEPEND="
+	${DEPEND}
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
+
+src_configure() {
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+	local emesonargs=(
+		$(meson_feature system-wfconfig use_system_wfconfig)
+		$(meson_feature system-wlroots use_system_wlroots)
+		$(meson_feature X xwayland)
+		$(meson_use gles enable_gles32)
+		$(usex debug --buildtype=debug "")
+		$(usex debug -Db_sanitize=address,undefined "")
+	)
+
+	# Clang will fail to link without this
+	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobin "${T}"/wayfire-session
+
+	insinto "/usr/share/wayland-sessions/"
+	insopts -m644
+	doins wayfire.desktop
+	doins "${T}"/wayfire-session.desktop
+
+	insinto "/usr/share/wayfire/"
+	doins wayfire.ini
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Wayfire has been installed but the session cannot be used"
+		elog "until you install a configuration file. The default config"
+		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
+		elog "To install the file execute"
+		elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
+	fi
+}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index c0233c805c44..42ab1b20d21d 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson toolchain-funcs
 
@@ -21,31 +21,48 @@ SLOT="0"
 IUSE="debug +gles +system-wfconfig +system-wlroots X"
 
 DEPEND="
-	dev-libs/libevdev
-	dev-libs/libinput
+	dev-libs/libinput:=
 	dev-libs/wayland
 	gui-libs/gtk-layer-shell
 	media-libs/glm
 	media-libs/mesa:=[gles2,wayland,X?]
 	media-libs/libglvnd[X?]
-	media-libs/libjpeg-turbo
-	media-libs/libpng
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/freetype:=[X?]
 	x11-libs/libdrm
 	x11-libs/gtk+:3=[wayland,X?]
-	x11-libs/cairo:=[X?,svg(+)]
-	x11-libs/libxkbcommon:=[X?]
+	x11-libs/cairo[X?,svg(+)]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
 	x11-libs/pixman
 	X? (
-		x11-libs/libxcb
 		x11-base/xwayland
+		x11-libs/libxcb
 	)
-	system-wfconfig? ( ~gui-libs/wf-config-9999:= )
-	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
-	!system-wlroots? ( !gui-libs/wlroots )
 "
 
+if [[ ${PV} == 9999 ]] ; then
+	DEPEND+="
+		system-wfconfig? ( ~gui-libs/wf-config-9999:= )
+		!system-wfconfig? ( !gui-libs/wf-config )
+		system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
+		!system-wlroots? ( !gui-libs/wlroots )
+	"
+else
+	DEPEND+="
+		system-wfconfig? (
+			>=gui-libs/wf-config-0.7.1
+			<gui-libs/wf-config-0.8.0
+		)
+		!system-wfconfig? ( !gui-libs/wf-config )
+		system-wlroots? (
+			>=gui-libs/wlroots-0.16.0:0/16[X?]
+		)
+		!system-wlroots? ( !gui-libs/wlroots )
+	"
+fi
+
 RDEPEND="
 	${DEPEND}
 	x11-misc/xkeyboard-config
@@ -58,9 +75,9 @@ BDEPEND="
 
 src_configure() {
 	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-		"${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
 	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-		"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)
@@ -95,6 +112,6 @@ pkg_postinst() {
 		elog "until you install a configuration file. The default config"
 		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
 		elog "To install the file execute"
-		elog "\$ cp /usr/share/wayfire.ini ~/.config/wayfire.ini"
+		elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
 	fi
 }