gui-wm/wayfire: update live ebuild

* Remove system-wfconfig and system-wlroots use flags, the default will
  be to use system wf-config and system wlroots. Now that upstream is more
  active and targets specific wlroots major releases the point of
  system-wlroots has gone. wf-config has the same upstream so using a
  bundled version doesn't have much rationale.
* Remove dependency on wlroots-9999 and instead require a specific major
  release of wlroots that could be updated as seen fit.

Closes: https://bugs.gentoo.org/916431
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

1 files changed, 15 insertions, 64 deletions

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