[gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     ef3dfe71841c72d6d5833fffce9c54c57977268a
Author:     Aisha Tammy <floss <AT> bsd <DOT> ac>
AuthorDate: Mon Apr 19 20:32:44 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 20:38:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3dfe71

gui-libs/wlroots: fix slot and live ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 gui-libs/wlroots/wlroots-0.13.0.ebuild |  2 +-
 gui-libs/wlroots/wlroots-9999.ebuild   | 25 +++++++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/gui-libs/wlroots/wlroots-0.13.0.ebuild b/gui-libs/wlroots/wlroots-0.13.0.ebuild
index 1a25bccc084..f370f34a654 100644
--- a/gui-libs/wlroots/wlroots-0.13.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.13.0.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0/9999"
+SLOT="0/13"
 IUSE="elogind icccm seatd systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 

diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 1a25bccc084..9cf3f67c741 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit fcaps meson
+inherit meson
 
 DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
 HOMEPAGE="https://github.com/swaywm/wlroots"
@@ -18,27 +18,24 @@ fi
 
 LICENSE="MIT"
 SLOT="0/9999"
-IUSE="elogind icccm seatd systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="x11-backend X"
 
 DEPEND="
 	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.19.0
 	>=dev-libs/wayland-protocols-1.17.0
 	media-libs/mesa[egl,gles2,gbm]
+	sys-auth/seatd:=
 	virtual/libudev
 	x11-libs/libdrm
 	x11-libs/libxkbcommon
 	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
-	icccm? ( x11-libs/xcb-util-wm )
-	seatd? ( sys-auth/seatd:= )
-	systemd? ( >=sys-apps/systemd-237 )
 	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
 		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
 	)
 "
 RDEPEND="
@@ -54,20 +51,12 @@ src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
 		"-Dxcb-errors=disabled"
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
 		"-Dexamples=false"
 		"-Dwerror=false"
-		-Dlibseat=$(usex seatd enabled disabled)
+		"-Drenderers=gles2"
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
 	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
 
 	meson_src_configure
 }