gentoo resync : 13.06.2020

14 files changed, 932 insertions, 30 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index fe03674c88aa..b9da8f75dded 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
new file mode 100644
index 000000000000..1b1e95e12b6d
--- /dev/null
+++ b/gui-wm/hikari/Manifest
@@ -0,0 +1,7 @@
+AUX hikari-1.2.0-gnu-make.patch 9378 BLAKE2B 77cb4dce472803167db411114f3259a21d15f46e0427d5c0ecfd59611440581120b6a1488c619ab0b85d8a97312878b59e6f7228392b5a41a740c52c8cc70fde SHA512 15fcdb0a4bcbcb846ce0cb8abb2b7980ff2f6aae191b592b254805a99149f63f65af572e848b9f7a19820b11fd4cd4dce8e6de5ea24e2fc2bac42a81ad98380d
+AUX hikari-2.0.1-gnu-make.patch 10167 BLAKE2B 70c1620b331cac9f3df11576d52f93ebc7c87465ddf9cc1b250a364b88276b8d4a5882d22f3ad4f773ac4bebcc71ef6c997344fa21d41d0dd06338dae34cc826 SHA512 83ab45d6e7debb7ac3304c4314bd02949e507eac10b91f4aba1a1d6692d497df155d93abefd55849bc6f3d18eae9b722be43c01bc3a9ba04b8d5d724822f7c9b
+DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
+DIST hikari-2.0.1.tar.gz 1003467 BLAKE2B 8a299fe1d85fac5df04f2475295250d78706c5da9c14a965ff8c7c91af36eaf5711675dc07c43c83974411719b88d483eee24ebd24a87eb1b3280a89b521a19e SHA512 18f8f46ae38fa307b63c44011da084ee0ec4a0925ff8ea3677fda9171bfd25b42853719cea812aabee2d377e6208ddcaf69692e1fb0655110f8d1905d1be00e8
+EBUILD hikari-1.2.0.ebuild 1081 BLAKE2B ff23f482966cb8b8487bbe001618d9fcfffc6eb4e2e76e49a8160e5859eeb5240432be3f0ff3ad2d796ac441e0bb4cf0a71dedbb1c701b6d470b26c68d4b578c SHA512 78676b87836d736bc6c7cf8f905e5d74b93c6739117089694db827307d1ecaa362c93399c3c73e5ce8a1035129b6acebe471bbf595ce35f9f496e1992abefc2b
+EBUILD hikari-2.0.1.ebuild 1250 BLAKE2B 078f91684adbf93f2463aa9e64563698f0138a6a4ffdb5e1ce29b88151a7ef256de902187c584a3fd1c60905694340cdc754169f0a0fc446c06bc6973f5911f2 SHA512 6a906f7b769ab00719be409365fccd7e64a380edcb5a964ff40b39dc4d8fcac2ab4b4b1ff800fedb49616145109dd004b2880bd45ad5545b9b71db82b3336f04
+MISC metadata.xml 970 BLAKE2B 3862fa99df4057da6ef427fefe51f33b1ac2adcc2c9ce51393f5189fa85ffea7b19b06898b23433e1980e32c08f5597f92e133095a4a849f3447bf77e1e4623e SHA512 c1032c3c177cdc0ad4afea2276f451bf39a7220c6d7f015d89c7a193b6fc194dae9e0711382126cf6df828c8b93e2445f3c28d93a2459cae1991d39fb2340430
diff --git a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch b/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
new file mode 100644
index 000000000000..01a9b87c4ce2
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
@@ -0,0 +1,315 @@
+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 11fc449..d73c4e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,24 +1,22 @@
+-.ifmake doc || dist
+-.ifndef VERSION
+-.error please specify VERSION
+-.endif
+-.endif
+-
+-VERSION ?= "darcs"
+-
+-.ifmake install || uninstall
+-.ifndef PREFIX
+-.error please specify PREFIX
+-.endif
++TARGET =	hikari
++
++DESTDIR	?=
++
++prefix ?=	/usr/local
++exec_prefix ?=	$(prefix)
++bindir ?=	$(exec_prefix)/bin
++sysconfdir ?=	$(prefix)/etc
++
++PKG_CONFIG ?=	pkg-config
++
++VERSION ?=	"darcs"
++
++### Upstream variables
++PREFIX ?=	$(prefix)
++ETC_PREFIX ?=	$(sysconfdir)
++
+ OS != uname
+ INSTALL_GROUP != id -gn
+-.endif
+-
+-.ifmake install || uninstall
+-.ifndef ETC_PREFIX
+-.error please specify ETC_PREFIX
+-.endif
+-.endif
+
+ OBJS = \
+ 	action.o \
+@@ -45,7 +43,6 @@ OBJS = \
+ 	layout.o \
+ 	layout_config.o \
+ 	layout_select_mode.o \
+-	main.o \
+ 	mark.o \
+ 	mark_assign_mode.o \
+ 	mark_select_mode.o \
+@@ -72,106 +69,117 @@ OBJS = \
+ 	xwayland_unmanaged_view.o \
+ 	xwayland_view.o
+
+-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
+-
+-.PHONY: distclean clean clean-doc doc dist install uninstall
+-.PATH: src
++WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
+
+-.ifdef DEBUG
+-CFLAGS += -g -O0 -fsanitize=address
+-.else
+-CFLAGS += -DNDEBUG
+-.endif
++ifeq ($(DEBUG),1)
++	CFLAGS += -g -O0 -fsanitize=address
++else
++	CFLAGS += -DNDEBUG
++endif
+
+-.ifdef WITH_POSIX_C_SOURCE
+-CFLAGS += -D_POSIX_C_SOURCE=200809L
+-.endif
++ifeq ($(WITH_POSIX_C_SOURCE),1)
++	CFLAGS += -D_POSIX_C_SOURCE=200809L
++endif
+
+-.ifdef WITH_XWAYLAND
+-CFLAGS += -DHAVE_XWAYLAND=1
+-.endif
++ifeq ($(WITH_XWAYLAND),1)
++	CFLAGS += -DHAVE_XWAYLAND=1
++endif
+
+-.ifdef WITH_GAMMACONTROL
+-CFLAGS += -DHAVE_GAMMACONTROL=1
+-.endif
++ifeq ($(WITH_GAMMACONTROL),1)
++	CFLAGS += -DHAVE_GAMMACONTROL=1
++endif
+
+-.ifdef WITH_SCREENCOPY
+-CFLAGS += -DHAVE_SCREENCOPY=1
+-.endif
++ifeq ($(WITH_SCREENCOPY),1)
++	CFLAGS += -DHAVE_SCREENCOPY=1
++endif
+
+-.ifdef WITH_LAYERSHELL
+-CFLAGS += -DHAVE_LAYERSHELL=1
+-.endif
++ifeq ($(WITH_LAYERSHELL),1)
++	CFLAGS += -DHAVE_LAYERSHELL=1
++endif
+
+ CFLAGS += -Wall -I. -Iinclude
+
+-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
+
+-GLIB_CFLAGS != pkg-config --cflags glib-2.0
+-GLIB_LIBS != pkg-config --libs glib-2.0
++GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
++GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
+
+-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} \
+-	${GLIB_CFLAGS} \
+-	${PIXMAN_CFLAGS} \
+-	${XKBCOMMON_CFLAGS} \
+-	${WAYLAND_CFLAGS} \
+-	${LIBINPUT_CFLAGS} \
+-	${UCL_CFLAGS}
++	$(WLROOTS_CFLAGS) \
++	$(PANGO_CFLAGS) \
++	$(CAIRO_CFLAGS) \
++	$(GLIB_CFLAGS) \
++	$(PIXMAN_CFLAGS) \
++	$(XKBCOMMON_CFLAGS) \
++	$(WAYLAND_CFLAGS) \
++	$(LIBINPUT_CFLAGS) \
++	$(UCL_CFLAGS)
+
+ LIBS = \
+-	${WLROOTS_LIBS} \
+-	${PANGO_LIBS} \
+-	${CAIRO_LIBS} \
+-	${GLIB_LIBS} \
+-	${PIXMAN_LIBS} \
+-	${XKBCOMMON_LIBS} \
+-	${WAYLAND_LIBS} \
+-	${LIBINPUT_LIBS} \
+-	${UCL_LIBS}
+-
+-all: hikari hikari-unlocker
++	$(WLROOTS_LIBS) \
++	$(PANGO_LIBS) \
++	$(CAIRO_LIBS) \
++	$(GLIB_LIBS) \
++	$(PIXMAN_LIBS) \
++	$(XKBCOMMON_LIBS) \
++	$(WAYLAND_LIBS) \
++	$(LIBINPUT_LIBS) \
++	$(UCL_LIBS)
++
++.PHONY: distclean clean clean-doc doc dist install uninstall
++
++all: hikari hikari-unlocker doc
+
+ 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} ${LIBS} ${OBJS} -o ${.TARGET}
++$(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} -lpam hikari_unlocker.c -o hikari-unlocker
++	$(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
+
+ clean-doc:
+ 	@test -e _darcs && echo "cleaning manpage" ||:
+@@ -183,20 +191,15 @@ 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
++hikari-$(VERSION).tar.gz: version.h share/man/man1/hikari.1
+ 	@darcs revert
+-	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
++	@tar -s "#^#hikari-$(VERSION)/#" -czf hikari-$(VERSION).tar.gz \
+ 		version.h \
+ 		main.c \
+ 		hikari_unlocker.c \
+@@ -215,22 +218,22 @@ distclean: clean-doc
+ 	@test -e _darcs && echo "cleaning version.h" ||:
+ 	@test -e _darcs && rm version.h ||:
+
+-dist: distclean hikari-${VERSION}.tar.gz
++dist: distclean hikari-$(VERSION).tar.gz
+
+ install: hikari hikari-unlocker share/man/man1/hikari.1
+-	mkdir -p ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/share/man/man1
+-	mkdir -p ${PREFIX}/share/examples/hikari
+-	mkdir -p ${ETC_PREFIX}/pam.d
+-	install -m 4555 -g ${INSTALL_GROUP} hikari hikari-unlocker ${PREFIX}/bin
+-	install -m 644 -g ${INSTALL_GROUP} share/man/man1/hikari.1 ${PREFIX}/share/man/man1
+-	install -m 644 -g ${INSTALL_GROUP} share/examples/hikari/hikari.conf ${PREFIX}/share/examples/hikari
+-	install -m 644 -g ${INSTALL_GROUP} pam.d/hikari-unlocker.${OS} ${ETC_PREFIX}/pam.d/hikari-unlocker
++	mkdir -p $(PREFIX)/bin
++	mkdir -p $(PREFIX)/share/man/man1
++	mkdir -p $(PREFIX)/share/examples/hikari
++	mkdir -p $(ETC_PREFIX)/pam.d
++	install -m 4555 -g $(INSTALL_GROUP) hikari hikari-unlocker $(PREFIX)/bin
++	install -m 644 -g $(INSTALL_GROUP) share/man/man1/hikari.1 $(PREFIX)/share/man/man1
++	install -m 644 -g $(INSTALL_GROUP) share/examples/hikari/hikari.conf $(PREFIX)/share/examples/hikari
++	install -m 644 -g $(INSTALL_GROUP) pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/pam.d/hikari-unlocker
+
+ uninstall:
+-	-rm ${PREFIX}/bin/hikari
+-	-rm ${PREFIX}/bin/hikari-unlocker
+-	-rm ${PREFIX}/share/examples/hikari/hikari.conf
+-	-rmdir ${PREFIX}/share/examples/hikari
+-	-rm ${PREFIX}/share/man/man1/hikari.1
+-	-rm ${ETC_PREFIX}/pam.d/hikari-unlocker
++	-rm $(PREFIX)/bin/hikari
++	-rm $(PREFIX)/bin/hikari-unlocker
++	-rm $(PREFIX)/share/examples/hikari/hikari.conf
++	-rmdir $(PREFIX)/share/examples/hikari
++	-rm $(PREFIX)/share/man/man1/hikari.1
++	-rm $(ETC_PREFIX)/pam.d/hikari-unlocker
diff --git a/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch b/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch
new file mode 100644
index 000000000000..0f5a67a62425
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch
@@ -0,0 +1,327 @@
+diff --git a/Makefile b/Makefile
+index 0f104d0..39d6972 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 \
+@@ -29,7 +44,6 @@ OBJS = \
+ 	layout.o \
+ 	layout_config.o \
+ 	layout_select_mode.o \
+-	main.o \
+ 	mark.o \
+ 	mark_assign_mode.o \
+ 	mark_select_mode.o \
+@@ -56,116 +70,127 @@ OBJS = \
+ 	xwayland_unmanaged_view.o \
+ 	xwayland_view.o
+ 
+-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
+-
+-.PHONY: distclean clean clean-doc doc dist install uninstall
+-.PATH: src
++WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
+ 
+ # Allow specification of /extra/ CFLAGS and LDFLAGS
+-CFLAGS += ${CFLAGS_EXTRA}
+-LDFLAGS += ${LDFLAGS_EXTRA}
++CFLAGS += $(CFLAGS_EXTRA)
++LDFLAGS += $(LDFLAGS_EXTRA)
+ 
+-.ifdef DEBUG
++ifdef DEBUG
+ CFLAGS += -g -O0 -fsanitize=address
+-.else
++else
+ CFLAGS += -DNDEBUG
+-.endif
++endif
+ 
+-.ifdef WITH_POSIX_C_SOURCE
++ifdef WITH_POSIX_C_SOURCE
+ CFLAGS += -D_POSIX_C_SOURCE=200809L
+-.endif
++endif
+ 
+-.ifdef WITH_XWAYLAND
++ifdef WITH_XWAYLAND
+ CFLAGS += -DHAVE_XWAYLAND=1
+-.endif
++endif
+ 
+-.ifdef WITH_GAMMACONTROL
++ifdef WITH_GAMMACONTROL
+ CFLAGS += -DHAVE_GAMMACONTROL=1
+-.endif
++endif
+ 
+-.ifdef WITH_SCREENCOPY
++ifdef WITH_SCREENCOPY
+ CFLAGS += -DHAVE_SCREENCOPY=1
+-.endif
++endif
+ 
+-.ifdef WITH_LAYERSHELL
++ifdef WITH_LAYERSHELL
+ CFLAGS += -DHAVE_LAYERSHELL=1
+-.endif
++endif
+ 
+-.ifdef WITHOUT_SUID
++ifdef WITHOUT_SUID
+ 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
+ 
+-GLIB_CFLAGS != pkg-config --cflags glib-2.0
+-GLIB_LIBS != pkg-config --libs glib-2.0
++GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
++GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
+ 
+-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} \
+-	${GLIB_CFLAGS} \
+-	${PIXMAN_CFLAGS} \
+-	${XKBCOMMON_CFLAGS} \
+-	${WAYLAND_CFLAGS} \
+-	${LIBINPUT_CFLAGS} \
+-	${UCL_CFLAGS}
++	$(WLROOTS_CFLAGS) \
++	$(PANGO_CFLAGS) \
++	$(CAIRO_CFLAGS) \
++	$(GLIB_CFLAGS) \
++	$(PIXMAN_CFLAGS) \
++	$(XKBCOMMON_CFLAGS) \
++	$(WAYLAND_CFLAGS) \
++	$(LIBINPUT_CFLAGS) \
++	$(UCL_CFLAGS)
+ 
+ LIBS = \
+-	${WLROOTS_LIBS} \
+-	${PANGO_LIBS} \
+-	${CAIRO_LIBS} \
+-	${GLIB_LIBS} \
+-	${PIXMAN_LIBS} \
+-	${XKBCOMMON_LIBS} \
+-	${WAYLAND_LIBS} \
+-	${LIBINPUT_LIBS} \
+-	${UCL_LIBS}
++	$(WLROOTS_LIBS) \
++	$(PANGO_LIBS) \
++	$(CAIRO_LIBS) \
++	$(GLIB_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" ||:
+@@ -177,66 +202,37 @@ 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/hikari-1.2.0.ebuild b/gui-wm/hikari/hikari-1.2.0.ebuild
new file mode 100644
index 000000000000..7297d36915d0
--- /dev/null
+++ b/gui-wm/hikari/hikari-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# 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 +X"
+
+DEPEND="
+	dev-libs/glib
+	dev-libs/libinput:=
+	dev-libs/libucl
+	gui-libs/wlroots
+	x11-libs/cairo:=[X,svg]
+	x11-libs/pango:=[X]
+	x11-libs/pixman
+	x11-libs/libxkbcommon:=[X]
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	${DEPEND}
+	app-text/pandoc
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+"
+
+# 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_XWAYLAND=$(usex X 1 0) \
+		  all
+}
+
+src_install() {
+	emake PREFIX=${D}/usr ETC_PREFIX=${D}/etc install
+}
diff --git a/gui-wm/hikari/hikari-2.0.1.ebuild b/gui-wm/hikari/hikari-2.0.1.ebuild
new file mode 100644
index 000000000000..58e416a60cc6
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.0.1.ebuild
@@ -0,0 +1,63 @@
+# 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 +man screencopy +X"
+
+DEPEND="
+	dev-libs/glib
+	dev-libs/libinput:=
+	dev-libs/libucl
+	gui-libs/wlroots
+	media-libs/libglvnd
+	x11-libs/cairo:=[X,svg]
+	x11-libs/pango:=[X]
+	x11-libs/pixman
+	x11-libs/libxkbcommon:=[X]
+	sys-libs/pam
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+	dev-libs/wayland-protocols
+	man? ( app-text/pandoc )
+"
+
+# 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_XWAYLAND=$(usex X 1 0) \
+		  all
+	if use man; then
+		emake doc
+	fi
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" ETC_PREFIX="${D}/etc" install
+	if use man; then
+		emake PREFIX="${D}/usr" ETC_PREFIX="${D}/etc" install-doc
+	fi
+}
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
new file mode 100644
index 000000000000..c932df87cce3
--- /dev/null
+++ b/gui-wm/hikari/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <longdescription>
+        hikari is a minimalistic wayland window manager
+        based on wlroots trying inspired by the simplicity
+        of CWM in the X days. It aims stay out of your way
+        and focus more on the task than the windows.
+    </longdescription>
+    <maintainer type="person">
+        <email>gentoo@aisha.cc</email>
+        <name>Aisha Tammy</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="gamma">add gamma control for redshift</flag>
+        <flag name="layershell">add support for wayland apps using layer shell</flag>
+        <flag name="screencopy">add support for screen grabbing</flag>
+        <flag name="man">build and install man pages</flag>
+    </use>
+</pkgmetadata>
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index c41a8912769b..130fc8b804fa 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,7 @@
 AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69
 DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
 EBUILD sway-1.4-r2.ebuild 3133 BLAKE2B 84082c22f9aaee17f4779ca857aff8f0af679c1a1e114ea33198ee767dacfebd894134428b33cf141bfcfaeb7daebf7284281c9a18f7b38a4b8af3e31d5b4f28 SHA512 8e53dca4dd27e4b2b2f751299fc3eb3ca90bd965e13b378d1eada64c5d054fd1e7dbd750a9abf9d185074030fe61878f4caf02092e59d560385f261a6e357ff6
+EBUILD sway-1.4-r3.ebuild 3182 BLAKE2B 57da09638c27b8fb371c16dda3b5dd3c02b36f95709ee95165bbf9cfb891d74145f3326338668b6847433b3ba9f7f5122faac17febb71f59f7851e40652791a4 SHA512 69202970d00f8e0bedd4f49ed7cd2a62efdd2f9614087d23d97717469cd8e712ee02166b68e41f40d1e68414c478d14af0915dc6c4a58ba2993d2da1ee039716
 EBUILD sway-1.4.ebuild 3042 BLAKE2B ed83ac7e11b7d9261a8f1ab419c625dfe79b5df0d4aaae40b7b8f19f0efc3c4566f1efe5e31388a90c7448ebad5afa2817d45453380a03d7793b0f28ccf463ba SHA512 bb74a92ffe6ebf4e6f167ceba1f2ab49c08d17ab7a3837d7245b9b917d3a83e788fc860d9612146456d21c4ed9039cc419b74ef940bac88a1f3d6eeb597a03a5
-EBUILD sway-9999.ebuild 3090 BLAKE2B e14238694d2cec935caf206e4cbd029f84760acc099539a76295f8ce659a29611387c5d716d2e9cb537700e17db9d010bebeb82efdd8bbf1036a879fb3c9aed5 SHA512 0ebf33f6efc5e0b9357b642c060c5877b294a7f60f7f623a16cdce779fb83061cdf8eb5bff1dfc95a9007ae909ea1e27c4ab4e746c498de8189497b8ef3025f1
+EBUILD sway-9999.ebuild 3139 BLAKE2B c601d6dc353ccb6aa616704b2cf2284c886a0c93d0d855ee5c7c71b3f30e0ad9f51f29c82a09c810a41a2588e7aba43cecca5f2b1bfdd4d039de7da3ef7cbaf7 SHA512 ec245a600d7dbba9b3c7324cd327d38a4ffd92f2b502314762dcd5053220a79bf758cab4d56c0677afcac5d41161e4869704e0734cc5be4e01302b8d93ebae6d
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.4-r3.ebuild b/gui-wm/sway/sway-1.4-r3.ebuild
new file mode 100644
index 000000000000..1f261585bb13
--- /dev/null
+++ b/gui-wm/sway/sway-1.4-r3.ebuild
@@ -0,0 +1,120 @@
+# 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 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]
+	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=,systemd=,X=]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=]
+		<gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	!elogind? ( !systemd? ( sys-auth/consolekit ) )
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
+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; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind; 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 e4618c207ab9..c1b6403cdb81 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -53,6 +53,7 @@ else
 fi
 RDEPEND="
 	x11-misc/xkeyboard-config
+	!elogind? ( !systemd? ( sys-auth/consolekit ) )
 	${DEPEND}
 "
 BDEPEND="
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 661e3591eeb2..4183e66a89e9 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,4 +1,4 @@
 DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649
-EBUILD wayfire-0.4.0.ebuild 2287 BLAKE2B 83f8b62d0b931abe3da13c8dd9756ab5b283aa6667f5c89529e87a38639505b19182837f57cb01543703cbebd8cb483dd7d181479b963ff7c11b9f036dacc778 SHA512 422dfd773ec8518110076038ad8ab09337c51a0b0e7f872c7236147b302148bcbb31a3534a704e41d93a344197ac0ab1ae7b51c00d1a00b29d1dcf97df9cd2c1
-EBUILD wayfire-9999.ebuild 2287 BLAKE2B 83f8b62d0b931abe3da13c8dd9756ab5b283aa6667f5c89529e87a38639505b19182837f57cb01543703cbebd8cb483dd7d181479b963ff7c11b9f036dacc778 SHA512 422dfd773ec8518110076038ad8ab09337c51a0b0e7f872c7236147b302148bcbb31a3534a704e41d93a344197ac0ab1ae7b51c00d1a00b29d1dcf97df9cd2c1
-MISC metadata.xml 1180 BLAKE2B 5436b507ccd19b5462a9cd64bd1c0929ac6ed57a94f52945479edc60ebcf655c7f53d7eeaa871ca63c1aef9adfda5ca4c758fa470f5e1e4a422143304be993a3 SHA512 1f84c75e4ef44543221220dcbdf3ecfb9f5e0bf06e3a0b5c9a934dc36412c213c11053e29fa3b6389e7bfaf007dab8a79d9dd3a92f1fd6d30d193b8d8447d920
+EBUILD wayfire-0.4.0-r1.ebuild 2194 BLAKE2B 21a6e27a3588ff7363b677291d873e8a5a346cb6c563f4ab268b5ec10462f268690c41ba1e51d955f2bfb96723c65630feb6e6c8bef7caf3c0eabe05f24cab85 SHA512 1b0d24952d7625a212edc50255e579dafc0a4780ca28f1dc5b0fa38ad2fc0a9a93d70a1342e98bf22c7fbb84e1ea7756ab41a6ac5d31dcb85a50283e1b23dc12
+EBUILD wayfire-9999.ebuild 2192 BLAKE2B 2641ce27a3bf3aed1483d492d21500cba7a06028a462067b732e76e00771b6fb03782d8f9ec93e48935be2eeaebd6b743f2f55c45ba4165e561d1b2adfed04c1 SHA512 a5eaf39d90c03a99166b6193f6e11a82031055626103edb8a65f1c12a9a4b4e5a7e6870245c8a7fe757ef7226847a470ee75f2c8be8d2cc4ae715f21fe6865e7
+MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index c61941f4b35f..5765c019ed73 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -15,9 +15,8 @@
         <name>Proxy Maintainers</name>
     </maintainer>
     <use>
-        <flag name="gles2">use libglvnd to do animations more efficiently</flag>
+        <flag name="gles">use libglvnd to do animations more efficiently</flag>
         <flag name='system-wfconfig'>use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
         <flag name='system-wlroots'>use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
-        <flag name='debug'>add debugging symbols for error reporting. DISABLE ALL SYSTEM USE FLAGS BEFORE REPORTING BUGS.</flag>
     </use>
 </pkgmetadata>
diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
index 96c6375e2b05..9de00654b844 100644
--- a/gui-wm/wayfire/wayfire-0.4.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles2 +system-wfconfig +system-wlroots elogind systemd debug"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -35,10 +35,10 @@ DEPEND="
 	x11-libs/cairo:=[X,svg]
 	x11-libs/libxkbcommon:=[X]
 	x11-libs/pixman
-	gles2? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] )
+	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.0[elogind=,systemd=,X] )
+	system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -55,18 +55,13 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.18
 "
 
-src_compile(){
+src_configure() {
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_use gles2 enable_gles32)
+		$(meson_use gles enable_gles32)
 	)
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
+	meson_src_configure
 }
 
 src_install() {
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 96c6375e2b05..3a3d136e62b0 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles2 +system-wfconfig +system-wlroots elogind systemd debug"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -35,10 +35,10 @@ DEPEND="
 	x11-libs/cairo:=[X,svg]
 	x11-libs/libxkbcommon:=[X]
 	x11-libs/pixman
-	gles2? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] )
+	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.0[elogind=,systemd=,X] )
+	system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -55,18 +55,13 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.18
 "
 
-src_compile(){
+src_configure() {
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_use gles2 enable_gles32)
+		$(meson_use gles enable_gles32)
 	)
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
+	meson_src_configure
 }
 
 src_install() {