gentoo auto-resync : 24:05:2024 - 00:07:11

12 files changed, 24 insertions, 332 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index ea0b9aea46a2..4d9a4f13e32c 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 7d3f59c19826..21e343e42ad4 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -3,8 +3,8 @@ AUX wlroots-hyprland-apply-0.40.0.patch 669 BLAKE2B be2bd47edc1eb640dd8a8e0be24c
 DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139e7b86f7655c7a8126eaf90b6ef6d7d5affaf0bc55ca1647a2f80b6d767afc00e1efe5f2241b2bc88d20357acee611b92 SHA512 f09316e210805b833a27524894222edc7a048b77f9f5d9cc8faa5b4e37040485ad3b9638f60a346da8d4d4aff24bbd6382b7fde64d07528990e9a521b2f46454
 DIST hyprland-0.39.1.gh.tar.gz 54681029 BLAKE2B 5a78c5e7cef3369fd72abc05941f88f0391fb87e79afaa13c128acd9f8d2aa79d6af4d0dc82a90c09689993fe914ac48bc5ba4a32173eed31ecc20204f5a4edc SHA512 da8ee577aa823c9fb7b45bfd07503656561c1cd4cac42a9bf8f582f653c93b20824b3bce7bbcbd47b7f7f8e83fb1b630d6d5c983fe345c971322369f193c2c8f
 DIST hyprland-0.40.0.gh.tar.gz 54734246 BLAKE2B 54d5b1bb062003e38156c67bfc0b796d0e4d855f35b0122fa191037caa47e5be2a25acfe588835c49ac747fc7430124480e4a7716782fd23d028289bee236e7f SHA512 948e7237fa811f104ee11764d7947d2fd8291e79cf6db00d3f3905204f5bb2df1e51e26b2600f086f5b22d910ef50c2941343dd05e7a5d2f4b6053b150800f21
-EBUILD hyprland-0.37.1.ebuild 3715 BLAKE2B 9ad1db0bcb9e2c63fa3a23abe14c26c4a3fae60a46985731fbea497a9fa86165f1f7c942ad744cd84a5f8a7d2b711f93493ad04faf23317c89bee3adb631c499 SHA512 3de2a9ed87567edf2707e2997ebc2cef0ac3f914aed184ae4121515298f1c566075fcb3e4b1ca2dc19b333676dcc259dfea110b5deb177629ed6d46396938e35
-EBUILD hyprland-0.39.1-r2.ebuild 3906 BLAKE2B 8341946d0afe3c75c6bc30cb72f275e0792dbd3576195da30649070cabcbdae95ec9827328253e3931edbee6e98b66dfacd82282825e5f1c70e49fc8bd8480a5 SHA512 2ed56e04300995827428c5dd50dc71221d3346dad0c205e3d45f6ae0f6df0bf133e9a63e7a3c02069c51734f7936bb22093b5874d70c3ac259d437ddda13eb2f
-EBUILD hyprland-0.40.0.ebuild 3995 BLAKE2B becf3268ebc3d5e12ddd9d62c00e4faec409f4d92b588028339d2fceed53a86fa9a719f57f1256c69b527c3a15f16d9f2170c9d5cb108e62c8fcb8d1d133d2f7 SHA512 8175d2dc1d08edd01c8b9b0545fb2f583ada10adb39bd0e021b3ca8b31b162f97f56d1bf1479e21786f36f43d5af032bfa1e31eb219f88456053c640d1416f06
-EBUILD hyprland-9999.ebuild 3812 BLAKE2B c74f955cbb1d0a5e24e42dcc924c34ccee4f7adc5b0a7a4192a94313ccd76585e6e724f98d17d88e3267521e8c90baf3b7af9985b752cc82d3dbfdbeb10e5544 SHA512 2fbe82d774bbaaa77742fd07b268a067c6548ec09bcc78b777ba8ed374856d1f308c51d4d67d6abe8b68f8a2aa173036401cb5c46d449270cea0b1b2b6ac8d99
+EBUILD hyprland-0.37.1-r1.ebuild 3776 BLAKE2B 695ad287b51c217d6b6cf340e9737de64d43a21bb03265d5dc8ac738c91aac37af020950b81d928d6b182b49388855b68a752e614a6b96db11045d9b37afec4d SHA512 663d4f5a8e8ed20c6a80ca7fc9d3b86605a48651c0900f173d98110b494200b1832a7ca195c79e72a08b38c1e64eb6de54aa16e38ce606c81aa4007c354c95f1
+EBUILD hyprland-0.39.1-r3.ebuild 3967 BLAKE2B 2d469c0a319227b1ce83fd1ab8be9cc04cfeb43737ee717ec0f163afb0c3f162332760c5c5cedea089303e6d913a20ac91719cb37ff1f36aa3c290085527af9c SHA512 038d6297db31571f67cf3b4181012ab29625d13d2a3952bb4214539dede9dfdafc7ea4429523fb47e2fb407cb6c7bc5f8c4ecd6d3328e01aa5e5f75184464830
+EBUILD hyprland-0.40.0-r1.ebuild 4009 BLAKE2B 129b4d55aa26fbc9f282a1b2de230a1431770aaec9c088a28874dfb08de81871774df26f3571494dfa62c3ed9631aa0af739e169e95269ba416edae2344ee01a SHA512 2be06355e9fb98a187e9aa3754cae800eab0fa91ffaac7ce69f0f8cf955a67bf3affc6a73b7c3d78af5ed8da1b2ba0150f323dbea5940c855c7398eb20799224
+EBUILD hyprland-9999.ebuild 3826 BLAKE2B 2573f604b74112964b3ad7e54108952c138bc6742851e85d60581f10b8f6046e028801349f4493da2748b4e7b309f16a309e4cb401a3fef5ac3e16e25eadc035 SHA512 9a26bd78fb57f9db3e89e1225db84f9c92890d2352e394e67ae94bf42b13a4bf4b692e751867f6fa167ca635910cdad73c1692b243bc4188a33206f5ffd28b16
 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-r1.ebuild
index e4a269ccec3e..55ee5f9ac613 100644
--- a/gui-wm/hyprland/hyprland-0.37.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.37.1-r1.ebuild
@@ -40,7 +40,10 @@ WLROOTS_RDEPEND="
 	>=dev-libs/wayland-1.22
 	media-libs/libdisplay-info
 	media-libs/libglvnd
-	media-libs/mesa[egl(+),gles2]
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+	)
 	sys-apps/hwdata:=
 	sys-auth/seatd:=
 	>=x11-libs/libdrm-2.4.118
diff --git a/gui-wm/hyprland/hyprland-0.39.1-r2.ebuild b/gui-wm/hyprland/hyprland-0.39.1-r3.ebuild
index ace618c16dda..f73b6ead07a1 100644
--- a/gui-wm/hyprland/hyprland-0.39.1-r2.ebuild
+++ b/gui-wm/hyprland/hyprland-0.39.1-r3.ebuild
@@ -38,7 +38,10 @@ HYPRPM_RDEPEND="
 WLROOTS_DEPEND="
 	>=dev-libs/wayland-1.22
 	media-libs/libglvnd
-	media-libs/mesa[egl(+),gles2]
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+	)
 	>=x11-libs/libdrm-2.4.114
 	x11-libs/libxkbcommon
 	>=x11-libs/pixman-0.42.0
diff --git a/gui-wm/hyprland/hyprland-0.40.0.ebuild b/gui-wm/hyprland/hyprland-0.40.0-r1.ebuild
index 0893dbca86c0..bd53ad9b0cf6 100644
--- a/gui-wm/hyprland/hyprland-0.40.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.40.0-r1.ebuild
@@ -38,8 +38,10 @@ HYPRPM_RDEPEND="
 WLROOTS_DEPEND="
 	>=dev-libs/wayland-1.22
 	media-libs/libglvnd
-	|| ( <media-libs/mesa-24.1[egl(+),gles2]
-		 >=media-libs/mesa-24.1[egl(+)] )
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+	)
 	>=x11-libs/libdrm-2.4.114
 	x11-libs/libxkbcommon
 	>=x11-libs/pixman-0.42.0
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 932052e219d2..ad5b3e956be3 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -38,8 +38,10 @@ HYPRPM_RDEPEND="
 WLROOTS_DEPEND="
 	>=dev-libs/wayland-1.22
 	media-libs/libglvnd
-	|| ( <media-libs/mesa-24.1[egl(+),gles2]
-		 >=media-libs/mesa-24.1[egl(+)] )
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+	)
 	>=x11-libs/libdrm-2.4.114
 	x11-libs/libxkbcommon
 	>=x11-libs/pixman-0.42.0
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 76d4017be40b..82f4afe4bf5f 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,5 +1,5 @@
 AUX sway-portals.conf 216 BLAKE2B d30b62bb142802e5067c2829d69faba87b07c8a36661f43473b0a107fd57d020b3dcc5e7a1967a1fca13b7a5e9140063b7285c44b766f67002213521d676b1ab SHA512 790741df028822bf4d83170dea57e1c63f7d7938cf31969e4cd347b0fc07330322b603c9ec0091b7a3f425132bed9dee6f261074cc273555120858beaaaf5da1
 DIST sway-1.9.tar.gz 5581281 BLAKE2B 11d90866e3d12a76880f41e006be5ae7f3a3b1e6cbeb2412d30b673be91be7f60523dcce2892579e1da76de1d0498e0669138aa953bf1f595b97123720812e06 SHA512 7ec0a29078eb7e0fb1b6af97613c263adec78ddb03a63cb75fb5e44c7241ed144687fd094ee2eb70f4397832ca9bdffc88bc32dee7683bf0e515417c7a05d4c4
-EBUILD sway-1.9.ebuild 2690 BLAKE2B 525da24f7b6a2cef34e8e9fdc88bf0d659a8cbe81938f57923fd830f42165e3f77db6f5ce01f4b40e59925cf71455ace91b544cdd00af6f0adb986c871a9c59b SHA512 504a560698dcdbb7402624bb9478d86f4082b16d72ab7d8c6093985129b16477078981a97aab2162462a35262d6f03cc005d419594afaa2490529417c2b44e0f
-EBUILD sway-9999.ebuild 2604 BLAKE2B 30b11f23111326ec38b54bb67b222b712cd9929b4a7fbb3b83ab69751358b21f89e38de0f49e4cee4cc2c6cecfeb05f2e19978cf34f35efa84d6034f5c79445b SHA512 458f99b52201846dfe23173066a85bf1f165861b63a888b42c4e2fb8e6cddf7b14e8b96f04b411f66a04a03ddb8875f7f6ac21afc3b5105c304e459596bcaf8b
+EBUILD sway-1.9-r1.ebuild 2675 BLAKE2B 24bebac0e03fb711ca35ef9f1573cbc6e93e328b44ecdc4c820d8eb1547f20ea282b7d47e80bbba1ac880ad4f47da30303aa8c9bca76e1ef40fdd0dcaccf13ff SHA512 2400edfa580ecce14f2fdc2e825557d682b21bbd5dadf609d10e0769b3dcb1007ba75aed3b6c311dc6ec8fada33ccd5720d84d2a640dafd3032b5a483fc85295
+EBUILD sway-9999.ebuild 2589 BLAKE2B 991b6e622b5e9bdeea4dd508e81966b49dad4b76aa03396664e81cafe67f91b77090c2c6281eb5c645082ed23615e14c86703114ec4d0670e8f241923d05f896 SHA512 449731888489840e692af395baa8ca4e1266de8cbe783c74edd05c259e73b9d26a3e377c06d8abe91fd29376dfcab714a4f0b83ad53068cec48a1b2cca219016
 MISC metadata.xml 1721 BLAKE2B 39795f8d7c4a736141417e267e2c4645f4f963107c47516747c7fbc1643ed2e9787812c5571369b795e3648d4801dff32c062bf2db6d80ce79735d1be65b8ac8 SHA512 458d2adb61ecb91cc9d589409c69bffa7dee51328a557567e66c21eeff7e23eadaf36a04ca9fae32aa9d6edf1e28fa1bcba62f3e185699a8c08785f84977bb88
diff --git a/gui-wm/sway/sway-1.9.ebuild b/gui-wm/sway/sway-1.9-r1.ebuild
index 85c49a9b40ca..d9a62c2120ec 100644
--- a/gui-wm/sway/sway-1.9.ebuild
+++ b/gui-wm/sway/sway-1.9-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	>=x11-libs/libxkbcommon-1.5.0:0=
 	x11-libs/pango
 	x11-libs/pixman
-	media-libs/mesa[gles2,libglvnd(+)]
+	media-libs/libglvnd
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	tray? ( || (
 		sys-apps/systemd
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index a23327214abb..60561d8f0deb 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	>=x11-libs/libxkbcommon-1.5.0:0=
 	x11-libs/pango
 	x11-libs/pixman
-	media-libs/mesa[gles2,libglvnd(+)]
+	media-libs/libglvnd
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	tray? ( || (
 		sys-apps/systemd
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 403e745e54d8..62ba7669da4a 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -4,10 +4,7 @@ AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143
 AUX wayfire-session-2 871 BLAKE2B cb2db6d1a2944d0ce60e67328e9353d3e4c69b5d5f9e4fee4351e51d78dc9deb3f8ddd338bbbd7b047cd029360b66d02ec9791f049f59eed8155992c89062e11 SHA512 380708daacc92cf8c94c9fee9c1e374dddb90f83438277c360d904dd34cf30634f90caf9e53ca3511b679f499f0044e35f80516bea1f1bbe8057fae85cad9963
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
 AUX wayfire.env 80 BLAKE2B ff44da0d760ab3ba5e68009e4eea3112d4882331fd678b286f741bb87e2319c87e48d689318fe99a79bb6af3127ec97a99de8994f5c18d96086cc7f3d1e68160 SHA512 2118195fb4ceb6a994043a4bd5608ee9bb104dd769cf3ffba449b053fa05a6e7464ab9c3f812bd0f9bf4ed73eb7f5e2afa1ee48373765b8429317efa11089cd6
-DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
 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-r2.ebuild 3776 BLAKE2B b848744075d055977581665f1b4cccaf5608e0ad0516730c11970a56bde7394b28201f43850a154ea3094e7333e8903576bbb3d32f9415835232aa9617f3b970 SHA512 2ece76e1779c0259a14be3599961cbd7ddd2cb7c2481a1e60009074669b4f1e265a93886999223d8894c96f115ee0b6fe642204323babb53bf2b534bfc5aea27
 EBUILD wayfire-0.8.1-r1.ebuild 2471 BLAKE2B 49d1238ea8136959b2acd3504a2a72a81b340660de7ba28c8935833e984a1b95272db93793bdc685aa9f9de7ef2c8500b3eccae143199f94a5f5dfa5a6dd3c19 SHA512 a8ac07b6ea9c6397345b5913dda1910a89976d36d37414f8debaca2c225c7ce545dc472b92aafec66f611fd91097dfbfdc7706d33e4abfb98aa14c70e164a947
 EBUILD wayfire-0.8.1-r2.ebuild 2280 BLAKE2B 147c76241aa0465a6e48a423fb33f63358d5b64f187b180c5f5baec38b9b361da191e87d16215699b9bdb36cdedf48eec483de13130e6a0dd415c7db50ae4619 SHA512 96e0ef86dd0b8b298c11389a6929b07e1182eccd8375b156838e7b03377411171967787af61a5e6daea232f9ce3b00f485f08ee370bf4ecadbba87222021d7a0
 EBUILD wayfire-9999.ebuild 2204 BLAKE2B f99a53028c1b2cac6922f71a9e250857767c45692bc2d252fc58c9a6c855a2966ccbf78c364d9c9bcdf5e9c21c4048307e6a2ccb15bb44c9e4b575615acea2d3 SHA512 65f8095127deaa1433c0625e059322bb0ce73ef485677c5e848191330eee0df0682cbed29610b177b2257a5b6e204d9bf7cba689cc8fe5852a109966487dacc0
diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
deleted file mode 100644
index 4dd1a09a0f71..000000000000
--- a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,157 +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"
-	SLOT="0/9999"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-	SLOT="0/$(ver_cut 1-2)"
-fi
-
-LICENSE="MIT"
-IUSE="+gles +system-wfconfig +system-wlroots 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/libevdev
-	>=dev-libs/libinput-1.7.0
-	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.12
-	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} )
-"
-
-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} )
-"
-
-PATCHES=(
-	"${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch"
-)
-
-src_prepare() {
-	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)
-	)
-
-	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-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
deleted file mode 100644
index d2c8b090436a..000000000000
--- a/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,158 +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"
-	SLOT="0/9999"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	SLOT="0/$(ver_cut 1-2)"
-fi
-
-LICENSE="MIT"
-IUSE="+gles3 +system-wfconfig +system-wlroots 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/libevdev
-	>=dev-libs/libinput-1.7.0
-	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.12
-	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} )
-"
-
-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} )
-"
-
-PATCHES=(
-	"${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch"
-	"${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch"
-)
-
-src_prepare() {
-	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 gles3 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
-}