gentoo resync : 25.11.2020

16 files changed, 274 insertions, 423 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 3e76bb695b11..815492300205 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 4fdcebf9057e..79f92cc0849d 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,6 +1,4 @@
-AUX hikari-2.1.1-gnu-make.patch 10450 BLAKE2B a956a4c49d95d99d84147a083f56e23a2e6a995fdeb79994c556eca4df364167fae58bddb824ceef1ff952442f9591e198effaf9daffc997a11f7ae8dc7e903b SHA512 033d6a3b200eaa1bdedbe6b7cb110207046e535dd43a0ac6628c2dadf7f23e3ce9d63c7101cbf5d217ac43483f31baaeb459464a69a92d120963c96a290caa5f
-DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
-DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
-EBUILD hikari-2.1.1.ebuild 1243 BLAKE2B a7661734f9a46267934ad187a1bed2d028f23044b681c5cac6318f1674c2e8745c26c43edcc6f0f40e3a2ce8c1cd2be0b8aa2e65b7605b8bd63da9a45feb36a1 SHA512 048270c859405fc622772444eb84d1b06a781c80b9c4d454bdcaefb41d2537bdee991753bcf1c6151b9ee2012ad9391bb3098b7b949ec03ea07ab3e0439f4062
-EBUILD hikari-2.1.2.ebuild 1217 BLAKE2B fa3af4a381bb04eeb41069c54a37752c56d0938925c7b2b45b09f4caa81358346d8181626a8857d273fcc0ec2d913a4569b269e71fa29f1d2a1f1ed934b8e36f SHA512 9bc1adad3cebd4905a21bbda269d755a9c545e4a4fe747d2a99bd32e2c88f07942e35daa371d3b065585139c1d626fea4c929974907308859638f36d9fd28ead
+AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378
+DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
+EBUILD hikari-2.2.2.ebuild 1395 BLAKE2B 89adb4ea6468cb0404858b1da7dfebeb5fdbe19392282b3a69a3cb55e779bd0c806da0dcbaef114b34d88930cbf5cd1ed92c5d782f7942578c4f00a73b8485fe SHA512 c02f303b6c6bfb0e9fca846aa75b606241c15956fd57e7fd1b173c98380e2c58fbab2be815ba0546f3ab74ff90420e54a38bf354d7bf3d0effc5a36abb92f35e
 MISC metadata.xml 1015 BLAKE2B cf0b1938d20d91676068e3fe8d5556da68afc6c3d5c1f56da1a8b18b60d3ed932c43b084cd2fd99cf5c0f713f6684da5b907a650f7f37d671d12b15de894624a SHA512 fe3983cb19d30846c315db699947be49e5ca046a320ecd56dbde122ebd5380d896210ea3fbbb860f164bc4140e7199d0cc26b067dfcab6f492932b31fdaf593c
diff --git a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch b/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
deleted file mode 100644
index 4fd6d468d481..000000000000
--- a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-explain steps to guide future me and other patchers
-(1) define common variables on top
-(2) remove conditions for doc and others to define VERSION
-(3) replace all ${*} by $(*)
-(4) replace pkg-config by $(PKG_CONFIG)
-(6) remove .PATH: src
-(5) remove main.c from OBJS because it is in different directory
-    - we will define a separate target for it
-(6) add $(OBJS) target + main.o target and add then to the end
-    of dependencies for hikari
-(7) add main.o to be cleaned-up
-(8) reorder the library orders in the $(CC) steps because gcc
-diff --git a/Makefile b/Makefile
-index cab013a..b72e74c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,22 @@
-+TARGET =	hikari
-+
-+DESTDIR	?=
-+
-+prefix ?=	/usr/local
-+exec_prefix ?=	$(prefix)
-+bindir ?=	$(exec_prefix)/bin
-+sysconfdir ?=	$(prefix)/etc
-+
-+PKG_CONFIG ?=	pkg-config
-+
-+VERSION ?=	"CURRENT"
-+
-+### Upstream variables
-+PREFIX ?=	$(DESTDIR)$(prefix)
-+ETC_PREFIX ?=	$(DESTDIR)$(sysconfdir)
-+
- OS != uname
--VERSION ?= "CURRENT"
--PREFIX ?= /usr/local
--ETC_PREFIX ?= ${PREFIX}
-+INSTALL_GROUP != id -gn
- 
- OBJS = \
- 	action.o \
-@@ -33,7 +48,6 @@ OBJS = \
- 	layout_select_mode.o \
- 	lock_indicator.o \
- 	lock_mode.o \
--	main.o \
- 	mark.o \
- 	mark_assign_mode.o \
- 	mark_select_mode.o \
-@@ -64,109 +78,124 @@ OBJS = \
- 
- WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
- 
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
--
- # Allow specification of /extra/ CFLAGS and LDFLAGS
--CFLAGS += ${CFLAGS_EXTRA}
--LDFLAGS += ${LDFLAGS_EXTRA}
-+CFLAGS += $(CFLAGS_EXTRA)
-+LDFLAGS += $(LDFLAGS_EXTRA)
- 
--.ifdef DEBUG
-+ifeq ($(DEBUG),1)
- CFLAGS += -g -O0 -fsanitize=address
--.else
-+else
- CFLAGS += -DNDEBUG
--.endif
-+endif
- 
--.ifdef WITH_POSIX_C_SOURCE
-+ifeq ($(WITH_POSIX_C_SOURCE),1)
- CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+endif
- 
--.ifdef WITH_XWAYLAND
-+ifeq ($(WITH_XWAYLAND),1)
- CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+endif
- 
--.ifdef WITH_GAMMACONTROL
-+ifeq ($(WITH_GAMMACONTROL),1)
- CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+endif
- 
--.ifdef WITH_SCREENCOPY
-+ifeq ($(WITH_SCREENCOPY),1)
- CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+endif
- 
--.ifdef WITH_LAYERSHELL
-+ifeq ($(WITH_LAYERSHELL),1)
- CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+endif
-+
-+ifeq ($(WITH_VIRTUAL_INPUT),1)
-+CFLAGS += -DHAVE_VIRTUAL_INPUT=1
-+endif
- 
--.ifdef WITHOUT_SUID
-+ifeq ($(WITHOUT_SUID),1)
- PERMS = 555
--.else
-+else
- PERMS = 4555
--.endif
-+endif
- 
--CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-+CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
- 
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
-+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
- 
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
- 
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
-+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
- 
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
-+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
- 
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
-+PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
- 
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
-+XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
- 
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
-+WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
- 
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
-+LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
- 
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
-+UCL_LIBS != $(PKG_CONFIG) --libs libucl
- 
- CFLAGS += \
--	${WLROOTS_CFLAGS} \
--	${PANGO_CFLAGS} \
--	${CAIRO_CFLAGS} \
--	${PIXMAN_CFLAGS} \
--	${XKBCOMMON_CFLAGS} \
--	${WAYLAND_CFLAGS} \
--	${LIBINPUT_CFLAGS} \
--	${UCL_CFLAGS}
-+	$(WLROOTS_CFLAGS) \
-+	$(PANGO_CFLAGS) \
-+	$(CAIRO_CFLAGS) \
-+	$(PIXMAN_CFLAGS) \
-+	$(XKBCOMMON_CFLAGS) \
-+	$(WAYLAND_CFLAGS) \
-+	$(LIBINPUT_CFLAGS) \
-+	$(UCL_CFLAGS)
- 
- LIBS = \
--	${WLROOTS_LIBS} \
--	${PANGO_LIBS} \
--	${CAIRO_LIBS} \
--	${PIXMAN_LIBS} \
--	${XKBCOMMON_LIBS} \
--	${WAYLAND_LIBS} \
--	${LIBINPUT_LIBS} \
--	${UCL_LIBS}
-+	$(WLROOTS_LIBS) \
-+	$(PANGO_LIBS) \
-+	$(CAIRO_LIBS) \
-+	$(PIXMAN_LIBS) \
-+	$(XKBCOMMON_LIBS) \
-+	$(WAYLAND_LIBS) \
-+	$(LIBINPUT_LIBS) \
-+	$(UCL_LIBS)
- 
--all: hikari hikari-unlocker
-+.PHONY: distclean clean clean-doc doc dist install uninstall
- 
- version.h:
--	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+	echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
- 
--hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
--	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
-+$(OBJS): %.o: src/%.c
-+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+	$(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
- 
- xdg-shell-protocol.h:
--	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+	wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
- 
- wlr-layer-shell-unstable-v1-protocol.h:
--	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
- 
- hikari-unlocker: hikari_unlocker.c
--	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+	pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-+
-+all: hikari hikari-unlocker
- 
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:
-@@ -178,66 +207,38 @@ clean: clean-doc
- 	@rm xdg-shell-protocol.h 2> /dev/null ||:
- 	@rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- 	@echo "cleaning object files"
--	@rm ${OBJS} 2> /dev/null ||:
-+	@rm $(OBJS) 2> /dev/null ||:
-+	@rm main.o 2> /dev/null ||:
- 	@echo "cleaning executables"
- 	@rm hikari 2> /dev/null ||:
- 	@rm hikari-unlocker 2> /dev/null ||:
- 
--share/man/man1/hikari.1:
--	pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
--		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
--	@darcs revert
--	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
--		version.h \
--		main.c \
--		hikari_unlocker.c \
--		include/hikari/*.h \
--		src/*.c \
--		protocol/*.xml \
--		Makefile \
--		LICENSE \
--		README.md \
--		CHANGELOG.md \
--		share/man/man1/hikari.md \
--		share/man/man1/hikari.1 \
--		share/backgrounds/hikari/hikari_wallpaper.png \
--		share/wayland-sessions/hikari.desktop \
--		etc/hikari/hikari.conf \
--		etc/pam.d/hikari-unlocker.*
--
--distclean: clean-doc
--	@test -e _darcs && echo "cleaning version.h" ||:
--	@test -e _darcs && rm version.h ||:
--
--dist: distclean hikari-${VERSION}.tar.gz
--
--install: hikari hikari-unlocker share/man/man1/hikari.1
--	mkdir -p ${DESTDIR}/${PREFIX}/bin
--	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
--	mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
--	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
--	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
--	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
--	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
--	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-+install-doc:
-+	install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+
-+install:
-+	mkdir -p $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/man/man1
-+	mkdir -p $(PREFIX)/share/backgrounds/hikari
-+	mkdir -p $(PREFIX)/share/wayland-sessions
-+	mkdir -p $(ETC_PREFIX)/etc/hikari
-+	mkdir -p $(ETC_PREFIX)/etc/pam.d
-+	sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	install -m $(PERMS) hikari $(PREFIX)/bin
-+	install -m 4555 hikari-unlocker $(PREFIX)/bin
-+	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
- 
- uninstall:
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
--	-rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
--	-rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	-rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	-rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	-rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-+	-rm $(PREFIX)/bin/hikari
-+	-rm $(PREFIX)/bin/hikari-unlocker
-+	-rm $(PREFIX)/share/man/man1/hikari.1
-+	-rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	-rm $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	-rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-+	-rm $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	-rmdir $(ETC_PREFIX)/etc/hikari
-+	-rmdir $(PREFIX)/share/backgrounds/hikari
-+
diff --git a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
new file mode 100644
index 000000000000..472a9efa37df
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile b/Makefile
+index 555b770..01025b9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES
+ OS != uname
+ VERSION ?= "CURRENT"
+ PREFIX ?= /usr/local
++PKG_CONFIG ?= pkg-config
+ ETC_PREFIX ?= ${PREFIX}
+ 
+ OBJS = \
+@@ -78,7 +79,7 @@ OBJS += \
+ 	xwayland_view.o
+ .endif
+ 
+-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
++WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
+ 
+ .PHONY: distclean clean clean-doc doc dist install uninstall
+ .PATH: src
+@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1
+ 
+ CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
+ 
+-WLROOTS_CFLAGS != pkg-config --cflags wlroots
+-WLROOTS_LIBS != pkg-config --libs wlroots
++WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
++WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
+ 
+ WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
+ 
+-PANGO_CFLAGS != pkg-config --cflags pangocairo
+-PANGO_LIBS != pkg-config --libs pangocairo
++PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
++PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
+ 
+-CAIRO_CFLAGS != pkg-config --cflags cairo
+-CAIRO_LIBS != pkg-config --libs cairo
++CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
++CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
+ 
+-PIXMAN_CFLAGS != pkg-config --cflags pixman-1
+-PIXMAN_LIBS != pkg-config --libs pixman-1
++PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
++PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
+ 
+-XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
+-XKBCOMMON_LIBS != pkg-config --libs xkbcommon
++XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
++XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
+ 
+-WAYLAND_CFLAGS != pkg-config --cflags wayland-server
+-WAYLAND_LIBS != pkg-config --libs wayland-server
++WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
++WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
+ 
+-LIBINPUT_CFLAGS != pkg-config --cflags libinput
+-LIBINPUT_LIBS != pkg-config --libs libinput
++LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
++LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
+ 
+-UCL_CFLAGS != pkg-config --cflags libucl
+-UCL_LIBS != pkg-config --libs libucl
++UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
++UCL_LIBS != ${PKG_CONFIG} --libs libucl
+ 
+ CFLAGS += \
+ 	${WLROOTS_CFLAGS} \
+@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h:
+ 	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
+ 
+ hikari-unlocker: hikari_unlocker.c
+-	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
++	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker hikari_unlocker.c -lpam
+ 
+ clean-doc:
+ 	@test -e _darcs && echo "cleaning manpage" ||:
diff --git a/gui-wm/hikari/hikari-2.1.1.ebuild b/gui-wm/hikari/hikari-2.1.1.ebuild
deleted file mode 100644
index b8ef028dff7f..000000000000
--- a/gui-wm/hikari/hikari-2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell screencopy suid virtual-io +X"
-
-DEPEND="
-	dev-libs/libinput:=
-	dev-libs/libucl
-	>=gui-libs/wlroots-0.11.0
-	media-libs/libglvnd
-	x11-libs/cairo[X?,svg]
-	x11-libs/libxkbcommon[X?]
-	x11-libs/pango[X?]
-	x11-libs/pixman
-	sys-libs/pam
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
-	"${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
-	emake VERSION="{PV}" \
-		  WITH_POSIX_C_SOURCE=1 \
-		  WITH_GAMMACONTROL=$(usex gamma 1 0) \
-		  WITH_LAYERSHELL=$(usex layershell 1 0) \
-		  WITH_SCREENCOPY=$(usex screencopy 1 0) \
-		  WITH_SUID=$(usex suid 1 0) \
-		  WITH_VIRTUAL_INPUT=$(usex virtual-io 1 0) \
-		  WITH_XWAYLAND=$(usex X 1 0) \
-		  all
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install install-doc
-	doman share/man/man1/hikari.1
-}
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.2.2.ebuild
index 54f522c053ac..2d87cfd595d1 100644
--- a/gui-wm/hikari/hikari-2.1.2.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multiprocessing
+inherit multiprocessing toolchain-funcs
 
 DESCRIPTION="Wayland compositor inspired by CWM"
 HOMEPAGE="https://hikari.acmelabs.space/"
@@ -37,12 +37,19 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch )
+
 pkg_setup() {
 	export MAKE=bmake
+	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
+
 	${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+		CC="$(tc-getCC)" \
+		CFLAGS_EXTRA="${CFLAGS}" \
+		LDFLAGS_EXTRA="${LDFLAGS}" \
 		-DWITH_POSIX_C_SOURCE \
 		$(usex gamma -DWITH_GAMMACONTROL "") \
 		$(usex layershell -DWITH_LAYERSHELL "") \
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 18797409cc34..b2d884b6d126 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,6 @@
+DIST sway-1.5.1.tar.gz 5536721 BLAKE2B 4dcb6ca380ef8451ab9219a584598928a79e999bc0b1de0599cb7867c8fd94d54c55a2be9585635b4fd230fd83852141d6fd41ef35dbc4a8fef1bcc2828b3be4 SHA512 3b937249db2875100bc22e99f955a3300d3294a296fb37006fa1468a3986bf4fa8e5197279e3587bd8dc29f31adff8fbdc9ddc840e7be982b73331a05cd06ba5
 DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4
+EBUILD sway-1.5.1.ebuild 3126 BLAKE2B eccd23c8a4c57d9c8e05e41115b6038193e27c9fc3ff68ca70b4c04ecffb796abf95d1fe8990d324b49c27fe647a96dc51b6292d656face5e33c934afccfd2ff SHA512 bdbe1568aee63184c8a240c63090b929f12ee30dd246ddfa570d0c20b1f90dded9c233619a949f035ed997d03f3025836f07380df750d1aa642d32699f39a106
 EBUILD sway-1.5.ebuild 3124 BLAKE2B 62294350697990792f27d39c7c720455b50434bfbf805fd67b4c474750af3c7319e3877f2bd00b033a4a82cd8dcd5ae4cac5fcbd6c754d769c25d7e9a6b0f77c SHA512 6f991e0e9f8fc39f3d833e1636b529d8fb0e9b002a990ceefb43864db1febbd8657084a8e8849a11af4a4b00a721f14955ade2d1742ac051c68d1d1934939a09
-EBUILD sway-9999.ebuild 3127 BLAKE2B 20afb2533bb68898a63e0b8d20f06e12a23c4eda0f475ff04128dbdcb7755e5415e0595fc742790b2bbe59cd8bfb7dc759ef0060dba84a1e0e976e9acd0672c0 SHA512 2a1f18e4693613886f94933a3560388d9e961e7a37c0819edc80eaa6ea57902a2cb6b13c753c26c6323b5f9dd327a2c79c5285cff2077349edfac101551e5099
-MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
+EBUILD sway-9999.ebuild 3126 BLAKE2B eccd23c8a4c57d9c8e05e41115b6038193e27c9fc3ff68ca70b4c04ecffb796abf95d1fe8990d324b49c27fe647a96dc51b6292d656face5e33c934afccfd2ff SHA512 bdbe1568aee63184c8a240c63090b929f12ee30dd246ddfa570d0c20b1f90dded9c233619a949f035ed997d03f3025836f07380df750d1aa642d32699f39a106
+MISC metadata.xml 2468 BLAKE2B dc1da35dc84c5c977c7ecdd44972bea616119c166a5b4d138895a7c4327f8465db94f4b039afe4e1cab119063fa0d050a7ef9ef25ed77c22c3776098560cb7dd SHA512 1abe7b4a3871350e6573fb2eb88de1c2b908a13c18661a19a4a192e73ba5860bfdf268f10761413110c9eedea67c811c3a4dc0ce700ad9c59713b5c6546ddc0e
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index a7e995120512..f4fdcc1510d5 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="elogind">Enable support for rootless session via elogind</flag>
 		<flag name="fish-completion">Enable fish completion support</flag>
 		<flag name="man">Build and install man pages</flag>
+		<flag name="seatd">Enable support for rootless session via <pkg>sys-auth/seatd</pkg></flag>
 		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
 		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
 		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
diff --git a/gui-wm/sway/sway-1.5.1.ebuild b/gui-wm/sway/sway-1.5.1.ebuild
new file mode 100644
index 000000000000..ffac4374950d
--- /dev/null
+++ b/gui-wm/sway/sway-1.5.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	elogind? ( >=sys-auth/elogind-239 )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	systemd? ( >=sys-apps/systemd-239 )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
+else
+	DEPEND+="
+		=gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	if use swaybar; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
+	fi
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 336a2ad2f6d2..ffac4374950d 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
 REQUIRED_USE="?? ( elogind systemd )
 	tray? ( || ( elogind systemd ) )"
 
@@ -44,11 +44,10 @@ DEPEND="
 	X? ( x11-libs/libxcb:0= )
 "
 if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
 else
 	DEPEND+="
-		>=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
-		<gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
+		=gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
 	"
 fi
 RDEPEND="
@@ -99,14 +98,14 @@ src_configure() {
 }
 
 pkg_preinst() {
-	if ! use systemd && ! use elogind; then
+	if ! use systemd && ! use elogind && ! use seatd; then
 		fowners root:0 /usr/bin/sway
 		fperms 4511 /usr/bin/sway
 	fi
 }
 
 pkg_postinst() {
-	if ! use systemd && ! use elogind; then
+	if ! use systemd && ! use elogind && ! use seatd; then
 		elog ""
 		elog "If you use ConsoleKit2, remember to launch sway using:"
 		elog "exec ck-launch-session sway"
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 5ddbc71b41be..45247ee3dca8 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,6 +1,8 @@
-DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649
+AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
+AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
 DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811
-EBUILD wayfire-0.4.0-r2.ebuild 2195 BLAKE2B 5efde918474d27f67fc4f92d5f8698cc37f3c0c7a51ce9ec18c3de83665fa389bedcd216b6a677324d772bc0aac4932836ff78a0aa23f29d6fcfdfe14ca19e85 SHA512 f2ff58e2db827ecdaac14d00cfefca63d7bcba311733bfa38ecf9f3cdff23c1a7bcd9f0ae21110ced8752056bb86fdd6907716d5955ff7a656c2abbd61415451
-EBUILD wayfire-0.5.0.ebuild 2225 BLAKE2B 9fc4d1d219b17bca7857084d3d02badad0528fa303124a95e4935a05faee34324aebb30d1a2ef4b39abb2c5072127d4a923c696cbee8ae8ef2b8555493951eb2 SHA512 a8b343a776d2a458acdbac07c6114bcfb20c83178c3e6c0ac68c430408d3a010c073563072b4a47f01ea4811630d6845ea174862e9156ba307e9bcb61f2fe8b5
-EBUILD wayfire-9999.ebuild 2225 BLAKE2B 9fc4d1d219b17bca7857084d3d02badad0528fa303124a95e4935a05faee34324aebb30d1a2ef4b39abb2c5072127d4a923c696cbee8ae8ef2b8555493951eb2 SHA512 a8b343a776d2a458acdbac07c6114bcfb20c83178c3e6c0ac68c430408d3a010c073563072b4a47f01ea4811630d6845ea174862e9156ba307e9bcb61f2fe8b5
+DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e
+EBUILD wayfire-0.5.0.ebuild 2224 BLAKE2B 8723cb41fa204ecdd6a5b95936ba385750f63eaa76fd56e837536b489a7a06e50e026a02f3875188df7be62e761a7252e27353c97165b97ab1972654807c35ff SHA512 08a13c4cf252e83e1010b7d7a4b98a4fc445d5f8b64801d146034dc830c8a1bf6efe6252c355d3aff5ea7a47cdbca43dc2235635a713ed94fa78dc8a468f5130
+EBUILD wayfire-0.6.0.ebuild 2518 BLAKE2B 5dacd5c710808d54720bd6eba5fd070019c866ddbced26afe61db360da9a17c70413a5fdbdfc96169c5be55d31aa72b8324c5a96483570b78035b1a7fa5c889b SHA512 19eb652df74b90bfafdfa0833cf4429a99ce023ddd315cd5078c567df4bd7d025106806519ba941264ead8893edff2ee7b0824b25ecd657ce7539cfc12899ab2
+EBUILD wayfire-9999.ebuild 2518 BLAKE2B 5dacd5c710808d54720bd6eba5fd070019c866ddbced26afe61db360da9a17c70413a5fdbdfc96169c5be55d31aa72b8324c5a96483570b78035b1a7fa5c889b SHA512 19eb652df74b90bfafdfa0833cf4429a99ce023ddd315cd5078c567df4bd7d025106806519ba941264ead8893edff2ee7b0824b25ecd657ce7539cfc12899ab2
 MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf
diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session
new file mode 100644
index 000000000000..8267ea0e11fc
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-session
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# output to syslog and stderr
+# with PID and syslog identity 'wayfire'
+exec 1> >(logger --id=$$ --stderr --tag wayfire) 2>&1
+
+# if undefined, or empty, set to freedesktop specification defaults
+[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+
+# freedesktop specifications mandate that the definition
+# of XDG_SESSION_TYPE should be respected
+export XDG_SESSION_TYPE=wayland
+export GDK_BACKEND=wayland
+export QT_QPA_PLATFORM=wayland
+export MOZ_ENABLE_WAYLAND=1
+
+exec @EPREFIX@/usr/bin/wayfire "$@"
diff --git a/gui-wm/wayfire/files/wayfire-session.desktop b/gui-wm/wayfire/files/wayfire-session.desktop
new file mode 100644
index 000000000000..1088c4e0b793
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-session.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Wayfire Session
+Comment=wayfire session with proper env vars
+Exec=@EPREFIX@/usr/bin/wayfire-session $*
+TryExec=@EPREFIX@/usr/bin/wayfire-session
+Type=Application
+DesktopNames=Wayfire
diff --git a/gui-wm/wayfire/wayfire-0.5.0.ebuild b/gui-wm/wayfire/wayfire-0.5.0.ebuild
index f2df4accbaa3..5b1a4cb2d819 100644
--- a/gui-wm/wayfire/wayfire-0.5.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.5.0.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/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.6.0.ebuild
index bf539ba4965a..96f551ce51ca 100644
--- a/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild
+++ b/gui-wm/wayfire/wayfire-0.6.0.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -26,19 +26,19 @@ DEPEND="
 	dev-libs/libinput
 	gui-libs/gtk-layer-shell
 	media-libs/glm
-	media-libs/mesa:=[gles2,wayland,X]
+	media-libs/mesa:=[gles2,wayland,X?]
 	media-libs/libjpeg-turbo
 	media-libs/libpng
-	media-libs/freetype:=[X]
+	media-libs/freetype:=[X?]
 	x11-libs/libdrm
-	x11-libs/gtk+:3=[wayland,X]
-	x11-libs/cairo:=[X,svg]
-	x11-libs/libxkbcommon:=[X]
+	x11-libs/gtk+:3=[wayland,X?]
+	x11-libs/cairo:=[X?,svg]
+	X? ( x11-libs/libxkbcommon:=[X] )
 	x11-libs/pixman
-	gles? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( >=gui-libs/wf-config-${PV} )
+	gles? ( media-libs/libglvnd[X?] )
+	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
+	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -50,15 +50,19 @@ RDEPEND="
 "
 
 BDEPEND="
-	${DEPEND}
+	dev-libs/wayland-protocols
 	virtual/pkgconfig
-	>=dev-libs/wayland-protocols-1.18
 "
 
 src_configure() {
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${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)
+		$(meson_feature X xwayland)
 		$(meson_use gles enable_gles32)
 	)
 	meson_src_configure
@@ -67,11 +71,13 @@ 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
 
@@ -85,8 +91,8 @@ 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/${P}/wayfire.ini.bz2\""
+		elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\""
 		elog "To install the file execute"
-		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
+		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
 	fi
 }
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index f2df4accbaa3..96f551ce51ca 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -36,9 +36,9 @@ DEPEND="
 	X? ( x11-libs/libxkbcommon:=[X] )
 	x11-libs/pixman
 	gles? ( media-libs/libglvnd[X?] )
-	system-wfconfig? ( >=gui-libs/wf-config-${PV} )
+	system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] )
+	system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -55,6 +55,10 @@ BDEPEND="
 "
 
 src_configure() {
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+	    "${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)
@@ -67,11 +71,13 @@ 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