summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm/wayfire')
-rw-r--r--gui-wm/wayfire/Manifest2
-rw-r--r--gui-wm/wayfire/metadata.xml2
-rw-r--r--gui-wm/wayfire/wayfire-0.7.2.ebuild (renamed from gui-wm/wayfire/wayfire-0.7.1.ebuild)33
-rw-r--r--gui-wm/wayfire/wayfire-9999.ebuild11
4 files changed, 23 insertions, 25 deletions
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 5454f153084..c664604cabb 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1 +1 @@
-DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969
+DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309ecccc75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index ebb88ce3d36..bc435a800ec 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription>
compiz like eye-candy 3D wayland, with low memory footprint.
diff --git a/gui-wm/wayfire/wayfire-0.7.1.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild
index 10e6172e29c..eca2999b571 100644
--- a/gui-wm/wayfire/wayfire-0.7.1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild
@@ -13,13 +13,12 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~riscv ~x86"
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,31 +26,33 @@ 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?] )
+ X? (
+ x11-base/xwayland
+ x11-libs/libxcb
+ )
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.13.0:=[elogind=,systemd=,X?]
- <gui-libs/wlroots-0.14.0:=
+ >=gui-libs/wlroots-0.14.0:=[X?]
+ <gui-libs/wlroots-0.15.0:=
)
!system-wlroots? ( !gui-libs/wlroots )
"
RDEPEND="
${DEPEND}
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
x11-misc/xkeyboard-config
"
@@ -75,30 +76,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/wayfire.ini ~/.config/wayfire.ini"
fi
}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index ed76917f7d8..8c86b4aadda 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
LICENSE="MIT"
@@ -35,7 +35,10 @@ DEPEND="
x11-libs/cairo:=[X?,svg]
x11-libs/libxkbcommon:=[X?]
x11-libs/pixman
- X? ( x11-libs/libxcb )
+ X? (
+ x11-libs/libxcb
+ x11-base/xwayland
+ )
system-wfconfig? ( ~gui-libs/wf-config-9999:= )
!system-wfconfig? ( !gui-libs/wf-config )
system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
@@ -54,9 +57,9 @@ BDEPEND="
src_configure() {
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
local emesonargs=(
$(meson_feature system-wfconfig use_system_wfconfig)
$(meson_feature system-wlroots use_system_wlroots)