summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAisha Tammy <floss@bsd.ac>2021-05-17 15:25:47 +0000
committerJoonas Niilola <juippis@gentoo.org>2021-06-03 15:45:16 +0300
commitb3ac30298572acacc878e954f2b8b56f867222aa (patch)
tree50e6f3629a6bddc469e2d2ee75fb1cd5ffc5ccba /gui-wm/wayfire
parentgui-wm/wayfire: version bump to 0.7.1 (diff)
downloadgentoo-b3ac30298572acacc878e954f2b8b56f867222aa.tar.gz
gentoo-b3ac30298572acacc878e954f2b8b56f867222aa.tar.bz2
gentoo-b3ac30298572acacc878e954f2b8b56f867222aa.zip
gui-wm/wayfire: fix live ebuild for wlroots changes
Signed-off-by: Aisha Tammy <gentoo@aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/20472 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'gui-wm/wayfire')
-rw-r--r--gui-wm/wayfire/wayfire-9999.ebuild28
1 files changed, 10 insertions, 18 deletions
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 339de620d255..ed76917f7d82 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
}