diff --git a/gui-libs/scenefx/Manifest b/gui-libs/scenefx/Manifest
index 3812bf4eb7..c2e4afa04e 100644
--- a/gui-libs/scenefx/Manifest
+++ b/gui-libs/scenefx/Manifest
@@ -1,4 +1 @@
-DIST scenefx-0.2.1.tar.gz 85884 BLAKE2B a0208af6586534355e8ea17eba3e02781ca0279dacc93c75366d1c44547ebb7cd8a99d5303054b2685a0ff19076e12384da25086bd9a904769c21070abc2d564 SHA512 69aa95de00e086ad38f6f878d865197fcf00dd88cbcec5376c52fcce496e1135b237dafda27cf49a0d168a8a34864bdabe0d119d474a379cf84c9e9efee114c7
-DIST scenefx-0.2.tar.gz 85823 BLAKE2B 45a4f85cd0f926700e6283dde0d35390e628680e2abe8098ed244475f2ae25067f1fdfccd375f7e0d402e9aaaf720550642bd6f13808856eb21f252b86d71d56 SHA512 b63511147a1f68320b40760586481678076d29daf8aad1dca32889f1029dd064929163513fedabd9c2e2a85444034c5518bd4ee706633786cfda632a4b027791
-DIST scenefx-0.3.tar.gz 86815 BLAKE2B 8c5cc72067f36c34f0f0c083d4962b68221daefa0eaff783efb8e03bdd11dad03c3f6cb1b7b19982d13ccea43a2bc5e79c067e6fc0576df3614747e9f9016aac SHA512 533abfa4f625e6368cc19a90f72e0bdf3c1e5b372e61906e0a4710dbd9945446d02ca30237c33a98c336698001e17893f336590e864cfa75fe0018c55e928ebe
 DIST scenefx-0.4.1.tar.gz 92158 BLAKE2B f4d8cf0d531009bd849fa05d0b4b6940002e0f8e54c89ba4226b95885f796ab75fc879b649b0d75190169ea6080a65b1ce75aaa0da72c019303fa38c634a7af2 SHA512 e56d35fe8c1d3a31623aa62177957460592ac90dfcbc100539dd45d6aec51cc55cf0930f8b66e3c1d48b2380bf84245497ba204bc2e94da1da6a7399b0d14cfd
diff --git a/gui-libs/scenefx/scenefx-0.2.ebuild b/gui-libs/scenefx/scenefx-0.2.ebuild
deleted file mode 100644
index adb9a744a1..0000000000
--- a/gui-libs/scenefx/scenefx-0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="A replacement for the wlroots scene API with eye-candy effects."
-HOMEPAGE="https://github.com/wlrfx/scenefx"
-
-SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="examples X"
-
-DEPEND="
-	>=dev-libs/wayland-1.23.0
-	>=x11-libs/libdrm-2.4.122
-	media-libs/mesa[egl(+),gles2(+)]
-	>=x11-libs/pixman-0.42.0
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-"
-
-DEPEND+="
-	>=gui-libs/wlroots-0.18:=[X?]
-	<gui-libs/wlroots-0.19:=[X?]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.35
-	>=dev-build/meson-0.59.0
-	virtual/pkgconfig
-	dev-build/ninja
-	dev-util/wayland-scanner
-"
-
-src_configure() {
-	local emesonargs=(
-		-Drenderers='gles2'
-		$(meson_use examples)
-	)
-
-	meson_src_configure
-}
diff --git a/gui-libs/scenefx/scenefx-0.3.ebuild b/gui-libs/scenefx/scenefx-0.3.ebuild
deleted file mode 100644
index adb9a744a1..0000000000
--- a/gui-libs/scenefx/scenefx-0.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="A replacement for the wlroots scene API with eye-candy effects."
-HOMEPAGE="https://github.com/wlrfx/scenefx"
-
-SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="examples X"
-
-DEPEND="
-	>=dev-libs/wayland-1.23.0
-	>=x11-libs/libdrm-2.4.122
-	media-libs/mesa[egl(+),gles2(+)]
-	>=x11-libs/pixman-0.42.0
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-"
-
-DEPEND+="
-	>=gui-libs/wlroots-0.18:=[X?]
-	<gui-libs/wlroots-0.19:=[X?]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.35
-	>=dev-build/meson-0.59.0
-	virtual/pkgconfig
-	dev-build/ninja
-	dev-util/wayland-scanner
-"
-
-src_configure() {
-	local emesonargs=(
-		-Drenderers='gles2'
-		$(meson_use examples)
-	)
-
-	meson_src_configure
-}
diff --git a/gui-libs/scenefx/scenefx-0.4.1.ebuild b/gui-libs/scenefx/scenefx-0.4.1.ebuild
index 9e918f1cb9..651a5ab45e 100644
--- a/gui-libs/scenefx/scenefx-0.4.1.ebuild
+++ b/gui-libs/scenefx/scenefx-0.4.1.ebuild
@@ -5,15 +5,20 @@ EAPI=8
 
 inherit meson
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/wlrfx/scenefx"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PV}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
 DESCRIPTION="A replacement for the wlroots scene API with eye-candy effects."
 HOMEPAGE="https://github.com/wlrfx/scenefx"
 
-SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
 IUSE="examples X"
 
 DEPEND="
diff --git a/gui-libs/scenefx/scenefx-0.2.1.ebuild b/gui-libs/scenefx/scenefx-9999.ebuild
similarity index 66%
rename from gui-libs/scenefx/scenefx-0.2.1.ebuild
rename to gui-libs/scenefx/scenefx-9999.ebuild
index adb9a744a1..651a5ab45e 100644
--- a/gui-libs/scenefx/scenefx-0.2.1.ebuild
+++ b/gui-libs/scenefx/scenefx-9999.ebuild
@@ -5,29 +5,34 @@ EAPI=8
 
 inherit meson
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/wlrfx/scenefx"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PV}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
 DESCRIPTION="A replacement for the wlroots scene API with eye-candy effects."
 HOMEPAGE="https://github.com/wlrfx/scenefx"
 
-SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
 IUSE="examples X"
 
 DEPEND="
-	>=dev-libs/wayland-1.23.0
+	>=dev-libs/wayland-1.23.1
 	>=x11-libs/libdrm-2.4.122
 	media-libs/mesa[egl(+),gles2(+)]
-	>=x11-libs/pixman-0.42.0
+	>=x11-libs/pixman-0.43.0
 	media-libs/libglvnd
 	x11-libs/libxkbcommon
 "
 
 DEPEND+="
-	>=gui-libs/wlroots-0.18:=[X?]
-	<gui-libs/wlroots-0.19:=[X?]
+	>=gui-libs/wlroots-0.19:=[X?]
+	<gui-libs/wlroots-0.20:=[X?]
 "
 
 RDEPEND="