[gentoo-commits] repo/gentoo:master commit in: gui-libs/wayfire-plugins-extra/, gui-wm/wayfire/, gui-libs/wf-config/

[gentoo-commits] repo/gentoo:master commit in: gui-libs/wayfire-plugins-extra/, gui-wm/wayfire/, gui-libs/wf-config/

[Joonas Niilola]

commit:     b3ac30298572acacc878e954f2b8b56f867222aa
Author:     Aisha Tammy <floss <AT> bsd <DOT> ac>
AuthorDate: Mon May 17 15:25:47 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 12:45:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ac3029

gui-wm/wayfire: fix live ebuild for wlroots changes

Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/20472
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../wayfire-plugins-extra-9999.ebuild              |  4 ++--
 gui-libs/wf-config/wf-config-9999.ebuild           |  2 +-
 gui-wm/wayfire/wayfire-9999.ebuild                 | 28 ++++++++--------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
index 8b6d8095961..2558b0e7956 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
@@ -21,8 +21,8 @@ SLOT="0"
 
 DEPEND="
 	dev-cpp/glibmm:2
-	>=gui-libs/wlroots-0.11.0
-	>=gui-wm/wayfire-${PV%.*}
+	~gui-libs/wlroots-9999:=
+	~gui-wm/wayfire-9999
 	x11-libs/cairo
 "
 RDEPEND="${DEPEND}"

diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index 26f5dea6385..8f57443366f 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 DEPEND="
 	dev-libs/libevdev
 	dev-libs/libxml2
-	>=gui-libs/wlroots-0.12.0
+	~gui-libs/wlroots-9999:=
 	media-libs/glm
 "
 

diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 339de620d25..ed76917f7d8 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -18,8 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="+gles +system-wfconfig +system-wlroots X"
 
 DEPEND="
 	dev-libs/libevdev
@@ -27,25 +26,24 @@ DEPEND="
 	gui-libs/gtk-layer-shell
 	media-libs/glm
 	media-libs/mesa:=[gles2,wayland,X?]
+	media-libs/libglvnd[X?]
 	media-libs/libjpeg-turbo
 	media-libs/libpng
 	media-libs/freetype:=[X?]
 	x11-libs/libdrm
 	x11-libs/gtk+:3=[wayland,X?]
 	x11-libs/cairo:=[X?,svg]
-	X? ( x11-libs/libxkbcommon:=[X] )
+	x11-libs/libxkbcommon:=[X?]
 	x11-libs/pixman
-	gles? ( media-libs/libglvnd[X?] )
-	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
+	X? ( x11-libs/libxcb )
+	system-wfconfig? ( ~gui-libs/wf-config-9999:= )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
+	system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
 RDEPEND="
 	${DEPEND}
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
 	x11-misc/xkeyboard-config
 "
 
@@ -69,30 +67,24 @@ src_configure() {
 }
 
 src_install() {
-	default
 	meson_src_install
 	dobin "${T}"/wayfire-session
-	einstalldocs
 
 	insinto "/usr/share/wayland-sessions/"
 	insopts -m644
 	doins wayfire.desktop
 	doins "${T}"/wayfire-session.desktop
 
-	dodoc wayfire.ini
-
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/wayfire
-		fperms 4511 /usr/bin/wayfire
-	fi
+	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/doc/${PF}/wayfire.ini.bz2\""
+		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
 		elog "To install the file execute"
-		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
+		elog "\$ cp /usr/share/wayfire.ini ~/.config/wayfire.ini"
 	fi
 }