[gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/

[Viorel Munteanu]

commit:     54d29f0c8fe0ed7b9270b1db95061a598b7c890b
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 18:08:15 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun May  5 18:27:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d29f0c

gui-wm/wayfire: sync live ebuild

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 gui-wm/wayfire/wayfire-9999.ebuild | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/gui-wm/wayfire/wayfire-9999.ebuild 
b/gui-wm/wayfire/wayfire-9999.ebuild
index 6a2f5696709d..bce466406ffd 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="+gles3 test X"
+IUSE="+dbus +gles3 test X"
 RESTRICT="!test? ( test )"
 
 # bundled wlroots has the following dependency string according to included 
headers.
@@ -42,9 +42,8 @@ CDEPEND="
        x11-libs/libxkbcommon
        x11-libs/pango
        x11-libs/pixman
-       X? (
-               x11-libs/libxcb:=
-       )
+       dbus? ( sys-apps/dbus )
+       X? ( x11-libs/libxcb:= )
 "
 
 RDEPEND="
@@ -63,8 +62,9 @@ BDEPEND="
 src_prepare() {
        default
 
-       sed -e "s:@EPREFIX@:${EPREFIX}:" \
-               "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+       local dbusrunsession=$(usev dbus dbus-run-session)
+       sed -e "s:@EPREFIX@:${EPREFIX}:g" -e 
"s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \
+               "${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die
        sed -e "s:@EPREFIX@:${EPREFIX}:" \
                "${FILESDIR}"/wayfire-session.desktop > 
"${T}"/wayfire-session.desktop || die
 }
@@ -92,14 +92,7 @@ src_install() {
 
        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
+       insinto "/etc"
+       doins "${FILESDIR}"/wayfire.env
 }