gentoo auto-resync : 17:12:2023 - 20:58:01

1 files changed, 80 insertions, 38 deletions

diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 9ff84a6351ce..98fb0ebc32f0 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -11,76 +11,118 @@ 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"
-SLOT="0"
-IUSE="debug +gles +system-wfconfig +system-wlroots X"
+IUSE="debug +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.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
+"
 
-DEPEND="
-	dev-libs/libinput:=
+CDEPEND="
+	dev-cpp/nlohmann_json
+	dev-libs/libevdev
+	>=dev-libs/libinput-1.7.0
 	dev-libs/wayland
-	gui-libs/gtk-layer-shell
+	>=dev-libs/wayland-protocols-1.12
 	media-libs/glm
-	media-libs/mesa:=[gles2,wayland,X?]
-	media-libs/libglvnd[X?]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/freetype:=[X?]
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	x11-libs/cairo
 	x11-libs/libdrm
-	x11-libs/gtk+:3=[wayland,X?]
-	x11-libs/cairo[X?,svg(+)]
-	x11-libs/libxkbcommon[X?]
+	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb
-	)
+	system-wfconfig? ( gui-libs/wf-config:${SLOT} )
+	!system-wfconfig? ( dev-libs/libxml2 )
+	!system-wlroots? ( ${WLROOTS_CDEPEND} )
 "
 
 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 )
+	CDEPEND+="
+		system-wlroots? ( gui-libs/wlroots:0/9999[drm(+),libinput(+),x11-backend,X?] )
 	"
 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 )
+	CDEPEND+="
+		system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] )
 	"
 fi
 
 RDEPEND="
-	${DEPEND}
+	${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-libs/wayland-protocols
+	dev-util/wayland-scanner
 	virtual/pkgconfig
+	!system-wlroots? ( ${WLROOTS_BDEPEND} )
 "
 
-src_configure() {
+src_prepare() {
+	eapply_user
+
 	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
+
+	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)
 		$(usex debug --buildtype=debug "")