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

9 files changed, 174 insertions, 272 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 8568bbeabfe6..08f223da54ab 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index c70f91ef8a36..11ff7a0e9b7a 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -4,8 +4,10 @@ AUX tty-freeze.patch 486 BLAKE2B 366e7214a6c266446ca2121ad44561084427cd6ec2e306a
 DIST hyprland-0.34.0.gh.tar.gz 14128415 BLAKE2B 059fc8b849daeb71b08d7114fd8aea1264c0e9967f471df66b27aca46b95fd499d2929730ba66981bb7d6c423479533b280839db7839ca1df007825f72fb9bf8 SHA512 35cce0668a13d7e7fd220d62efd965a069ff0213996bfa47ca0852c6258881bc070020d4831364b325b71d8ce7373d1793a89006a4341088dcbaf01914920f1a
 DIST hyprland-0.35.0.gh.tar.gz 54200453 BLAKE2B f5a8a5ed5f5ca28e5fc5a329d5191abce458b9bf0b99bee970aaa4be40671bfe945dabe2b3ff34ca753beeb35ec7fe016e6a54669dbe1ee4f25e2c128c3e390d SHA512 5afe7c340b994f2542982d8c8fa837b2a43ef9e487810fec0b33e4a5cc9188b71e41a0be22839191cf15e9c1fdfd964d0751def51f93db438e4a45649077c8a7
 DIST hyprland-0.36.0.gh.tar.gz 54632144 BLAKE2B 8f27044702d50fd5b937cab096c340ed7b7c86fda65e2b15fd4704038f2f4a62eb5a75cf00cc721da66dd7aaf820052ba02d8457bef928ad0ecc8622d4e151c1 SHA512 964f60baf08d9e5cc978853f24d3fca8cb5115eab3dd5e9c6542db2bbb0b5b73fa61a863077e12bcfc9ed70c6af75f380928e21246e42af0870ee3a6475df5cc
+DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139e7b86f7655c7a8126eaf90b6ef6d7d5affaf0bc55ca1647a2f80b6d767afc00e1efe5f2241b2bc88d20357acee611b92 SHA512 f09316e210805b833a27524894222edc7a048b77f9f5d9cc8faa5b4e37040485ad3b9638f60a346da8d4d4aff24bbd6382b7fde64d07528990e9a521b2f46454
 EBUILD hyprland-0.34.0.ebuild 3732 BLAKE2B 931c743c8bf05fe46179ec7fd4968439899b1dcd6e9afc23b01ab86372a666342b9fe7b27b49dca10d08e1c6eb667dae823e0acdfccdbdb05ceed7856a80a8e0 SHA512 dada8e515fb9eaae7bca023b5e5442f78c19ff9483a0a7f30b148fad7fc1cf6222d739bf35ad41a494f10dba59faa0f0c416c06064b139b166b9ff8a6e1c2533
 EBUILD hyprland-0.35.0-r3.ebuild 3839 BLAKE2B bd0eb075b785b64c609081320460d7aedfdc379ca6dd143dc30e3ed604da8597ee71ec5841cf873fabf5d4b96fed29afb652001dbfd668d0ce328555721a1c55 SHA512 51cc1adbc9d0464741c4b8014cf255a344248fbea3fdede33dd494fb51ed85aeb11645e0a468df6ac2ded42755bb7c7bb3717fb129108c23e6fea422ce65271d
 EBUILD hyprland-0.36.0-r2.ebuild 3865 BLAKE2B b654e0966cf4dae7ce60ca00f41c39ae234cbe93ef3aa7d7416943424264b936d426a64768fba01c9ee212db39fc4d47b2c15aa89371a8f630c345c1b62bcac1 SHA512 424f4876d86c898628a060c727fd7580038d1a27c03e28799386eb26093a7520a2c8c163af89a5081940061daedbdac5596ef89f18fd9e293d17a26871cfb986
-EBUILD hyprland-9999.ebuild 3688 BLAKE2B 0807116ff1b4bcdff900c0d86984ffb3bd149f7418115aa54e7a5545454caf5e5c766f5069b204a1f35819afeeb5aa7f03cb11959b24a74b277e07fff17d8dc4 SHA512 16ed656c75a06df000d6e0a5e184606b4fbc57fc8568e54d5cc7eeffdd1d4ce7a405b39e9351b61ad5221544d91564e8207f185e712cfac36742bb92121e4ef4
+EBUILD hyprland-0.37.1.ebuild 3709 BLAKE2B 71bccc3a7ea591f2d91c192d3cec48f8c1218507851bf5fdd9b93f0ff69191c27b1e52beec781ba02aea624fe09a520aa23e87059056970cb37396be3383df40 SHA512 ebc011e832f723c6dfb2087e159f45eda07ab96ce27baf7a24a4a842801a940351045a5081e1f5ae2ed07fdd4b1a4917e63bae395443364f23207427b127c7ba
+EBUILD hyprland-9999.ebuild 3709 BLAKE2B 71bccc3a7ea591f2d91c192d3cec48f8c1218507851bf5fdd9b93f0ff69191c27b1e52beec781ba02aea624fe09a520aa23e87059056970cb37396be3383df40 SHA512 ebc011e832f723c6dfb2087e159f45eda07ab96ce27baf7a24a4a842801a940351045a5081e1f5ae2ed07fdd4b1a4917e63bae395443364f23207427b127c7ba
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.37.1.ebuild b/gui-wm/hyprland/hyprland-0.37.1.ebuild
new file mode 100644
index 000000000000..d319336d3193
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.37.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
+HOMEPAGE="https://github.com/hyprwm/Hyprland"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-source"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="X legacy-renderer systemd"
+
+# hyprpm (hyprland plugin manager) requires the dependencies at runtime
+# so that it can clone, compile and install plugins.
+HYPRPM_RDEPEND="
+	app-alternatives/ninja
+	dev-build/cmake
+	dev-build/meson
+	dev-vcs/git
+	virtual/pkgconfig
+"
+# bundled wlroots has the following dependency string according to included headers.
+# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
+# enable x11-backend with X and vice versa
+WLROOTS_RDEPEND="
+	>=dev-libs/libinput-1.14.0:=
+	dev-libs/libliftoff
+	>=dev-libs/wayland-1.22
+	media-libs/libdisplay-info
+	media-libs/libglvnd
+	media-libs/mesa[egl(+),gles2]
+	sys-apps/hwdata:=
+	sys-auth/seatd:=
+	>=x11-libs/libdrm-2.4.118
+	x11-libs/libxkbcommon
+	>=x11-libs/pixman-0.42.0
+	virtual/libudev:=
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+WLROOTS_DEPEND="
+	>=dev-libs/wayland-protocols-1.33
+"
+WLROOTS_BDEPEND="
+	dev-util/glslang
+	dev-util/wayland-scanner
+"
+RDEPEND="
+	${HYPRPM_RDEPEND}
+	${WLROOTS_RDEPEND}
+	dev-cpp/tomlplusplus
+	dev-libs/glib:2
+	dev-libs/libinput
+	dev-libs/wayland
+	gui-libs/hyprcursor
+	media-libs/libglvnd
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	X? (
+		x11-libs/libxcb:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	${WLROOTS_DEPEND}
+	dev-libs/hyprland-protocols
+	dev-libs/hyprlang
+	>=dev-libs/wayland-protocols-1.25
+"
+BDEPEND="
+	${WLROOTS_BDEPEND}
+	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
+	app-misc/jq
+	dev-build/cmake
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
+		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile Hyprland!"
+	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
+		eerror "Hyprland requires >=sys-devel/clang-16 to build"
+		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		die "Clang version is too old to compile Hyprland!"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature legacy-renderer legacy_renderer)
+		$(meson_feature systemd)
+		$(meson_feature X xwayland)
+		$(meson_feature X wlroots:xwayland)
+		-Dwlroots:backends=drm,libinput$(usev X ',x11')
+		-Dwlroots:xcb-errors=disabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	# First install everything except wlroots to avoid conflicts.
+	meson_src_install --skip-subprojects wlroots
+	# Then install development files (mainly wlroots) for bug #916760.
+	meson_src_install --tags devel
+
+	# Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
+	# them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there.
+	# Ideally you could override includedir per subproject and the install tags would
+	# be granular enough to only install headers. But its not requiring this.
+	mkdir "${ED}"/usr/include/hyprland/wlroots || die
+	mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die
+	# devel tag includes wlroots .pc and .a files still
+	rm -rf "${ED}"/usr/$(get_libdir)/ || die
+}
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index d0249e1bfa35..d319336d3193 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -68,6 +68,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libinput
 	dev-libs/wayland
+	gui-libs/hyprcursor
 	media-libs/libglvnd
 	x11-libs/cairo
 	x11-libs/libdrm
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index d1dc123122ab..4daa6b2b6edd 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,11 +1,9 @@
-AUX wayfire-0.7.5-gcc13.patch 824 BLAKE2B 1825db0a5bfa1ace6e6d99889b4934e863e338e62ae15db806b4cfe3b5923f8c7c6c4fe3a45b31db9d909b3250bed3d3a0bd5d3b0c2ab77d957313ce4842b39b SHA512 f03b85bdd69876fa5624148e2b1f6e7627f0abd605615d4314b46d460427c62be2689157b6c5648b6b2f1f53edb9a0c80e1ca4c017c0167733b72306f6e26624
 AUX wayfire-0.8.0-fix-duplicate-manpage.patch 755 BLAKE2B c4e3fec4c5861eadd58480d098f92ae5d24b798d29e2e5898eda80132df53705e440516b6af67de4eadd7d788c106b72693e315467f3397be12ab6d03da5082c SHA512 77930c892938d3f27e12e9a2f1ac31f9552c91869e011b933d2bb1f6b986abda75f71d1bb008f71665d3edf9a2fb0e650ad1fc397f4dc0c9bcb77f94d7f8ea24
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
-DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
 DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
-EBUILD wayfire-0.7.5-r1.ebuild 2713 BLAKE2B 31c696b51d11a6ac6fa1888a5f426e9169ee16c37307519471536d32bf63ab3e2719b064e1dde4ca279eb682a86585cdd830bc9f02ab1e9b837f4dde70951150 SHA512 3c0ab1ab5680d90681edc838c02ea67590ca5c648d72b7bd0533274c0769edb2439bf46927e137cc43571acbc8a871d24136e360e2fc66a4e161e3f955dc1c1b
+DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
 EBUILD wayfire-0.8.0-r1.ebuild 3710 BLAKE2B 5f64dbdb42209d9b05a0eaa30f47fdbf0d3622e242cf5eb31598efdc615201a53c733d4ba0a4d5710d0131e91bcc3bd242e524493d37652e0a8110ba3c8bc1d7 SHA512 968704fbb1d2145064e98da1f0aad422eac38ecd2aac4009663a97efe5f11f9d1420e2a251815255b47afcd326646119a94769e0f4b569fb4c83326e08f1e56c
-EBUILD wayfire-0.8.0.ebuild 3644 BLAKE2B c7b4cfe3f9dd95924b30408a55e0c56e834f0ecd008c90e05b02f8e768ec89909ab7819ac2430450c8c2b69c25d9284f4026fd78c72bc8f43a115f716b3c133e SHA512 4b9500a79e00d85592fd1ca3db5321ef7af9b318831ae817039ca5ca77e4b7daf12b60acc44680f52e6941ab805f6b3ed9ee66622744bb63ecf3bb9d23b5bb53
-EBUILD wayfire-9999.ebuild 3667 BLAKE2B 31749f91a69cec00f8c40513f75c534366b89379fd5180fd11be5d777b95e1b3cdeb5b27430cf9552e776cc85f5340deaebb97393702727b6d55d501d03a9503 SHA512 c01badcb642bff5f548550d468811c116a3ca6de8b65528df7a6f5bc44632c31d0c8a1e011e29afe7d9bbf1a0cbd21fd208cb9da4b02d432e878372f91d87d39
+EBUILD wayfire-0.8.1.ebuild 2394 BLAKE2B 240d0dfb82d8558a24788a01ed3d160817e8daf677872ad43617d084b17164db2ed51bd8b69dae28e3151b6891123419b7c1b6cf652d8d28276e4ec68a11b6dd SHA512 c378a7447877a77054feb423b7cf70b580ded1367656811734bd54ebd3a082f69f54b5ae2e7bd9c04e92baf44bc02b9a1cf10a9732676ada950aaed2eec0b6f5
+EBUILD wayfire-9999.ebuild 2394 BLAKE2B a505a34384530f77a28d64dcd595a8ebd648e1b3040fb0ab6dbee24ce2190dea40cabeb23f14955ecdad63ca16f699e0b17cde36e1422a5d5713173aef8c7b79 SHA512 4ccdc73fd11af122c7c91065309d3ebe7cdd5ca7b852a7d5bd679604d649ad87ed78eb94354664c05ad9e6600567a25c0821467e49c889bede747ac5ab1018d7
 MISC metadata.xml 920 BLAKE2B 0b0ad723f8383bc65a87cbab8b7195d33a3dabd9ea73c8c2f91957151b9f324e63ea4b25c480d44eba391f595ffe3a9d0c39800eaa9bf4b81b47cb8e3262222f SHA512 c0eb23bcfc87b274bcb2c96b0e52cb91fb6dd3ffb51ef4285f34af3a9861122c0d30179c5989070de85ebcd0dff282906bb4c15c4983bfdce123c5c3b101561e
diff --git a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch b/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch
deleted file mode 100644
index 0ee666664c93..000000000000
--- a/gui-wm/wayfire/files/wayfire-0.7.5-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/WayfireWM/wf-utils/pull/5
-
-From 57460e364f6a1e5bdbad424e8cc576e346c8b7b6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 18 Apr 2023 08:26:50 +0100
-Subject: [PATCH] Fix build with GCC 13
-
-GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
-are no longer transitively included.
-
-See https://gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/895570
-Closes: https://github.com/WayfireWM/wayfire/issues/1758
---- a/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp
-+++ b/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp
-@@ -1,6 +1,7 @@
- #include "wayfire/rule/lambda_rule.hpp"
- #include "wayfire/condition/condition.hpp"
- #include <cstddef>
-+#include <cstdint>
- #include <functional>
- #include <memory>
- #include <sstream>
-
diff --git a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
deleted file mode 100644
index eed7d341eeca..000000000000
--- a/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-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="+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:=[drm(+),libinput(+),x11-backend,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[drm(+),libinput(+),x11-backend,X?]
-		)
-		!system-wlroots? ( !gui-libs/wlroots )
-	"
-fi
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.5-gcc13.patch
-)
-
-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)
-	)
-
-	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-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.1.ebuild
index 15e5598edc0f..a5e655f6d398 100644
--- a/gui-wm/wayfire/wayfire-0.8.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.8.1.ebuild
@@ -11,119 +11,71 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-	SLOT="0/9999"
+	SLOT="0/0.8"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
 LICENSE="MIT"
-IUSE="+gles +system-wfconfig +system-wlroots test X"
+IUSE="+gles test X"
 RESTRICT="!test? ( test )"
 
 # bundled wlroots has the following dependency string according to included headers.
 # wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
 # enable x11-backend with X and vice versa
-WLROOTS_CDEPEND="
-	>=dev-libs/libinput-1.14.0:=
-	>=dev-libs/wayland-1.21
-	media-libs/libglvnd
-	media-libs/mesa[egl(+),gles2]
-	sys-apps/hwdata:=
-	sys-auth/seatd:=
-	>=x11-libs/libdrm-2.4.114:=
-	x11-libs/libxkbcommon
-	>=x11-libs/pixman-0.42.0
-	virtual/libudev
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-protocols-1.28
-"
-WLROOTS_BDEPEND="
-	dev-util/glslang
-	dev-util/wayland-scanner
-"
-
 CDEPEND="
 	dev-cpp/nlohmann_json
+	dev-libs/glib:2
 	dev-libs/libevdev
-	>=dev-libs/libinput-1.7.0
+	>=dev-libs/libinput-1.7.0:=
 	dev-libs/wayland
 	>=dev-libs/wayland-protocols-1.12
+	gui-libs/wf-config:${SLOT}
+	gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?]
 	media-libs/glm
 	media-libs/libglvnd
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	x11-libs/cairo
-	x11-libs/libdrm:=
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	system-wfconfig? ( gui-libs/wf-config:${SLOT} )
-	!system-wfconfig? ( dev-libs/libxml2 )
-	!system-wlroots? ( ${WLROOTS_CDEPEND} )
+	X? (
+		x11-libs/libxcb:=
+	)
 "
 
-if [[ ${PV} == 9999 ]] ; then
-	CDEPEND+="
-		system-wlroots? ( gui-libs/wlroots:0/9999[drm(+),libinput(+),x11-backend,X?] )
-	"
-else
-	CDEPEND+="
-		system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] )
-	"
-fi
-
 RDEPEND="
 	${CDEPEND}
 	x11-misc/xkeyboard-config
-	!system-wfconfig? ( !gui-libs/wf-config )
-	!system-wlroots? ( !gui-libs/wlroots )
 "
 DEPEND="
 	${CDEPEND}
-	!system-wlroots? ( ${WLROOTS_DEPEND} )
 	test? ( dev-cpp/doctest )
 "
 BDEPEND="
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	!system-wlroots? ( ${WLROOTS_BDEPEND} )
 "
 
 src_prepare() {
-	eapply_user
+	default
 
 	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
-
-	if [[ "${PV}" != 9999 ]]; then
-		# Don't run git if git is installed and its not a git dir
-		sed -i \
-			-e "/git = find_program/ifs = import\('fs'\)" \
-			-e "s/if git.found()/if git.found() and fs.is_dir('.git')/" \
-			meson.build || die
-	fi
-
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature system-wfconfig use_system_wfconfig)
-		$(meson_feature system-wlroots use_system_wlroots)
 		$(meson_feature test tests)
 		$(meson_feature X xwayland)
 		$(meson_use gles enable_gles32)
+		-Duse_system_wfconfig=enabled
+		-Duse_system_wlroots=enabled
 	)
 
 	meson_src_configure
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index d1cadbe72df8..0666f1cd607d 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -11,120 +11,71 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-	SLOT="0/9999"
+	SLOT="0/0.9"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
 LICENSE="MIT"
-IUSE="+gles +system-wfconfig +system-wlroots test X"
+IUSE="+gles test X"
 RESTRICT="!test? ( test )"
 
 # bundled wlroots has the following dependency string according to included headers.
 # wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
 # enable x11-backend with X and vice versa
-WLROOTS_CDEPEND="
-	>=dev-libs/libinput-1.14.0:=
-	>=dev-libs/wayland-1.22
-	media-libs/libdisplay-info
-	media-libs/libglvnd
-	media-libs/mesa[egl(+),gles2]
-	sys-apps/hwdata:=
-	sys-auth/seatd:=
-	>=x11-libs/libdrm-2.4.114:=
-	x11-libs/libxkbcommon
-	>=x11-libs/pixman-0.42.0
-	virtual/libudev
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-protocols-1.32
-"
-WLROOTS_BDEPEND="
-	dev-util/glslang
-	dev-util/wayland-scanner
-"
-
 CDEPEND="
 	dev-cpp/nlohmann_json
+	dev-libs/glib:2
 	dev-libs/libevdev
-	>=dev-libs/libinput-1.7.0
+	>=dev-libs/libinput-1.7.0:=
 	dev-libs/wayland
 	>=dev-libs/wayland-protocols-1.12
+	gui-libs/wf-config:${SLOT}
+	gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?]
 	media-libs/glm
 	media-libs/libglvnd
-	media-libs/libjpeg-turbo
-	media-libs/libpng
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	x11-libs/cairo
-	x11-libs/libdrm
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	system-wfconfig? ( gui-libs/wf-config:${SLOT} )
-	!system-wfconfig? ( dev-libs/libxml2 )
-	!system-wlroots? ( ${WLROOTS_CDEPEND} )
+	X? (
+		x11-libs/libxcb:=
+	)
 "
 
-if [[ ${PV} == 9999 ]] ; then
-	CDEPEND+="
-		system-wlroots? ( gui-libs/wlroots:0/9999[drm(+),libinput(+),x11-backend,X?] )
-	"
-else
-	CDEPEND+="
-		system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] )
-	"
-fi
-
 RDEPEND="
 	${CDEPEND}
 	x11-misc/xkeyboard-config
-	!system-wfconfig? ( !gui-libs/wf-config )
-	!system-wlroots? ( !gui-libs/wlroots )
 "
 DEPEND="
 	${CDEPEND}
-	!system-wlroots? ( ${WLROOTS_DEPEND} )
 	test? ( dev-cpp/doctest )
 "
 BDEPEND="
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	!system-wlroots? ( ${WLROOTS_BDEPEND} )
 "
 
 src_prepare() {
-	eapply_user
+	default
 
 	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
-
-	if [[ "${PV}" != 9999 ]]; then
-		# Don't run git if git is installed and its not a git dir
-		sed -i \
-			-e "/git = find_program/ifs = import\('fs'\)" \
-			-e "s/if git.found()/if git.found() and fs.is_dir('.git')/" \
-			meson.build || die
-	fi
-
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature system-wfconfig use_system_wfconfig)
-		$(meson_feature system-wlroots use_system_wlroots)
 		$(meson_feature test tests)
 		$(meson_feature X xwayland)
 		$(meson_use gles enable_gles32)
+		-Duse_system_wfconfig=enabled
+		-Duse_system_wlroots=enabled
 	)
 
 	meson_src_configure