13 files changed, 85 insertions, 45 deletions
diff --git a/metadata/md5-cache/gui-apps/wcm-0.4.0 b/metadata/md5-cache/gui-apps/wcm-0.4.0-r1
index cd853d6de4d5..fb9654744116 100644
--- a/metadata/md5-cache/gui-apps/wcm-0.4.0
+++ b/metadata/md5-cache/gui-apps/wcm-0.4.0-r1
@@ -1,14 +1,13 @@
-BDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-0.4.0[debug=] dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-0.4.0 dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-0.4.0[debug=]
+DEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-0.4.0
 DESCRIPTION=Wayfire Config Manager
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wcm
-IUSE=debug
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-0.4.0[debug=]
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-0.4.0
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wcm/archive/v0.4.0.tar.gz -> wcm-0.4.0.tar.gz
 _eclasses_=meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=15cc49c66c0ea9e1c6bc56611b484726
+_md5_=49976b51d3dbd9c5de24d467c8811567
diff --git a/metadata/md5-cache/gui-apps/wcm-9999 b/metadata/md5-cache/gui-apps/wcm-9999
index 2c35a9e5bf4f..37a68913734b 100644
--- a/metadata/md5-cache/gui-apps/wcm-9999
+++ b/metadata/md5-cache/gui-apps/wcm-9999
@@ -1,13 +1,12 @@
-BDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-9999[debug=] dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-9999 dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-9999[debug=]
+DEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-9999
 DESCRIPTION=Wayfire Config Manager
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wcm
-IUSE=debug
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-9999[debug=]
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-wm/wayfire-9999
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=15cc49c66c0ea9e1c6bc56611b484726
+_md5_=49976b51d3dbd9c5de24d467c8811567
diff --git a/metadata/md5-cache/gui-apps/wf-shell-0.4.0 b/metadata/md5-cache/gui-apps/wf-shell-0.4.0-r1
index 9763fed4f401..823e98002a86 100644
--- a/metadata/md5-cache/gui-apps/wf-shell-0.4.0
+++ b/metadata/md5-cache/gui-apps/wf-shell-0.4.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-0.4.0[debug=] >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio ) dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-0.4.0 >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio ) dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-0.4.0[debug=] >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
+DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-0.4.0 >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=A compiz like 3D wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-shell
-IUSE=+pulseaudio debug
+IUSE=+pulseaudio
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-0.4.0[debug=] >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-0.4.0 >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wf-shell/releases/download/0.4.0/wf-shell-0.4.0.tar.xz
 _eclasses_=meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=528f6b1a42c804cb7d4ae74bfd46d349
+_md5_=5ddb76ce0c9dc8c7e6ffd5f4dd38798a
diff --git a/metadata/md5-cache/gui-apps/wf-shell-9999 b/metadata/md5-cache/gui-apps/wf-shell-9999
index dc17afeafd9b..03d07d003fb0 100644
--- a/metadata/md5-cache/gui-apps/wf-shell-9999
+++ b/metadata/md5-cache/gui-apps/wf-shell-9999
@@ -1,13 +1,13 @@
-BDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-9999[debug=] >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio ) dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-9999 >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio ) dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-9999[debug=] >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
+DEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-9999 >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=A compiz like 3D wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-shell
-IUSE=+pulseaudio debug
+IUSE=+pulseaudio
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-9999[debug=] >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection ~gui-wm/wayfire-9999 >=gui-libs/gtk-layer-shell-0.1 pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=528f6b1a42c804cb7d4ae74bfd46d349
+_md5_=5ddb76ce0c9dc8c7e6ffd5f4dd38798a
diff --git a/metadata/md5-cache/gui-libs/wf-config-0.4.0 b/metadata/md5-cache/gui-libs/wf-config-0.4.0-r1
index 453a60b24eeb..d566a635695c 100644
--- a/metadata/md5-cache/gui-libs/wf-config-0.4.0
+++ b/metadata/md5-cache/gui-libs/wf-config-0.4.0-r1
@@ -1,14 +1,13 @@
-BDEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm <=gui-libs/wlroots-0.10.1 dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm <=gui-libs/wlroots-0.10.1
+DEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
-IUSE=debug
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm <=gui-libs/wlroots-0.10.1
+RDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-0.10.1 media-libs/glm
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/0.4.0/wf-config-0.4.0.tar.xz
 _eclasses_=meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=5986b2ab33e8f8cfc303235cb8077379
+_md5_=f327b4bd3b6e74a6efe5df1e46143119
diff --git a/metadata/md5-cache/gui-libs/wf-config-9999 b/metadata/md5-cache/gui-libs/wf-config-9999
index 38cde14c64de..2bc009cb1733 100644
--- a/metadata/md5-cache/gui-libs/wf-config-9999
+++ b/metadata/md5-cache/gui-libs/wf-config-9999
@@ -4,10 +4,9 @@ DEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-9999 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
-IUSE=debug
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 ~gui-libs/wlroots-9999 media-libs/glm
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=91f3cde4a8c3bb3c76092801cac1a9da
+_md5_=137f1187de3c084f96b06943d537344b
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.4.0 b/metadata/md5-cache/gui-wm/wayfire-0.4.0-r1
index df93d6495d1d..bc049f964ded 100644
--- a/metadata/md5-cache/gui-wm/wayfire-0.4.0
+++ b/metadata/md5-cache/gui-wm/wayfire-0.4.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) virtual/pkgconfig >=dev-libs/wayland-protocols-1.18 >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) virtual/pkgconfig >=dev-libs/wayland-protocols-1.18 >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
+DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
 DESCRIPTION=compiz like 3D wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wayfire
-IUSE=+gles2 +system-wfconfig +system-wlroots elogind systemd debug
+IUSE=+gles +system-wfconfig +system-wlroots elogind systemd
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
+RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-0.4.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/0.4.0/wayfire-0.4.0.tar.xz
 _eclasses_=meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=7cb6c32f1a7facdf1359b2830c56e3be
+_md5_=458e478abeeb23fa024ebe64d88c58de
diff --git a/metadata/md5-cache/gui-wm/wayfire-9999 b/metadata/md5-cache/gui-wm/wayfire-9999
index 55fa26c85676..5999b32cddf5 100644
--- a/metadata/md5-cache/gui-wm/wayfire-9999
+++ b/metadata/md5-cache/gui-wm/wayfire-9999
@@ -1,14 +1,14 @@
-BDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-9999[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) virtual/pkgconfig >=dev-libs/wayland-protocols-1.18 >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) virtual/pkgconfig >=dev-libs/wayland-protocols-1.18 >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-9999[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
+DEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots )
 DESCRIPTION=compiz like 3D wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wayfire
-IUSE=+gles2 +system-wfconfig +system-wlroots elogind systemd debug
+IUSE=+gles +system-wfconfig +system-wlroots elogind systemd
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-9999[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
+RDEPEND=dev-libs/libevdev dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,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] x11-libs/libxkbcommon:=[X] x11-libs/pixman gles? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-9999 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
-_md5_=913d01543b129779476fae2f7a1fc929
+_md5_=3ae432affa618b4adb6f2d39625918d3
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.5 b/metadata/md5-cache/net-firewall/nftables-0.9.5
new file mode 100644
index 000000000000..a78a5053c9db
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.5
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=0
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.5.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multibuild	40fe59465edacd730c644ec2bc197809	multilib	0914eab919f4f11dd9e0407b92af4726	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97
+_md5_=bc466643ead97d9cd0b6e8a83cde4040
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.7 b/metadata/md5-cache/net-libs/libnftnl-1.1.7
new file mode 100644
index 000000000000..e70029a260e6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install setup
+DEPEND=>=net-libs/libmnl-1.0.4
+DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=examples static-libs test kernel_linux split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.7.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	0914eab919f4f11dd9e0407b92af4726	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=199b972ffddc2b7002960b99bebaa253
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.8.3 b/metadata/md5-cache/x11-wm/herbstluftwm-0.8.3
new file mode 100644
index 000000000000..d4b7906de05f
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.8.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama
+DESCRIPTION=A manual tiling window manager for X
+EAPI=7
+HOMEPAGE=https://herbstluftwm.org/
+IUSE=examples zsh-completion
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama app-shells/bash zsh-completion? ( app-shells/zsh )
+SLOT=0
+SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.8.3.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	0914eab919f4f11dd9e0407b92af4726	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	d3e75048a89c0445838d2f44e5c65d97	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=23c081551f6e7a25aed76dadfc9e5297
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 1ac01c7c2d78..e36ad5b77663 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -11602,21 +11602,21 @@ gui-apps/swaybg 1.0 9999: A wallpaper utility for Wayland
 gui-apps/swayidle 1.6 9999: Idle management daemon for Wayland
 gui-apps/swaylock 1.3 1.4 1.5 9999: Screen locker for Wayland
 gui-apps/waybar 0.8.0 9999: Highly customizable Wayland bar for Sway and Wlroots based compositors.
-gui-apps/wcm 0.4.0 9999: Wayfire Config Manager
+gui-apps/wcm 0.4.0-r1 9999: Wayfire Config Manager
 gui-apps/wf-recorder 0.2.1: Screen recorder for wlroots-based compositors
-gui-apps/wf-shell 0.4.0 9999: A compiz like 3D wayland compositor
+gui-apps/wf-shell 0.4.0-r1 9999: A compiz like 3D wayland compositor
 gui-apps/wl-clipboard 1.0.0 2.0.0 9999: Wayland clipboard utilities
 gui-libs/amtk 5.0.2: Actions, Menus and Toolbars Kit for GTK+ applications
 gui-libs/gtk-layer-shell 0.1.0-r1: Library to create desktop components for Wayland using the Layer Shell protocol
 gui-libs/libhandy 0.0.13: Library with GTK widgets for mobile phones
 gui-libs/libwpe 1.4.0.1: Platform-agnostic interfaces for WPE WebKit
 gui-libs/tepl 4.2.1: GtkSourceView-based text editors and IDE helper library
-gui-libs/wf-config 0.4.0 9999: library for managing wayfire configuration files
+gui-libs/wf-config 0.4.0-r1 9999: library for managing wayfire configuration files
 gui-libs/wlroots 0.10.0 0.10.1 9999: Pluggable, composable, unopinionated modules for building a Wayland compositor
 gui-libs/wpebackend-fdo 1.4.0: WPE backend designed for Linux desktop systems
 gui-wm/hikari 1.2.0: wayland compositor inspired by CWM
 gui-wm/sway 1.4 1.4-r2 9999: i3-compatible Wayland window manager
-gui-wm/wayfire 0.4.0 9999: compiz like 3D wayland compositor
+gui-wm/wayfire 0.4.0-r1 9999: compiz like 3D wayland compositor
 java-virtuals/ejb-api 0: Virtual for Enterprise JavaBeans API (javax.ejb)
 java-virtuals/interceptor-api 0: Virtual for Interceptor API (javax.interceptor)
 java-virtuals/jms 1.1: Virtual for Java Message Service (JMS) API
@@ -14255,7 +14255,7 @@ net-firewall/iptables 1.6.1-r3 1.6.2-r2 1.8.4-r2 1.8.5: Linux kernel (2.4+) fire
 net-firewall/itval 1.2_p20121104 1.2_p20121104-r1: Iptables policy testing and validation tool
 net-firewall/lutelwall 0.99-r1: IPTables firewall setup script
 net-firewall/nfacct 1.0.1 1.0.2: Command line tool to create/retrieve/delete accounting objects in NetFilter
-net-firewall/nftables 0.9.3-r1 0.9.4-r1 0.9.4-r2: Linux kernel (3.13+) firewall, NAT and packet mangling tools
+net-firewall/nftables 0.9.3-r1 0.9.4-r1 0.9.4-r2 0.9.5: Linux kernel (3.13+) firewall, NAT and packet mangling tools
 net-firewall/nftlb 0.6: nftables load balancer
 net-firewall/nufw 2.2.22-r3: An enterprise grade authenticating firewall based on netfilter
 net-firewall/pglinux 2.3.1_p20171006: Privacy oriented firewall application
@@ -14512,7 +14512,7 @@ net-libs/libnetfilter_log 1.0.1: interface to packets that have been logged by t
 net-libs/libnetfilter_queue 1.0.2 1.0.3: API to packets that have been queued by the kernel packet filter
 net-libs/libnfnetlink 1.0.1: the low-level library for netfilter related kernel/userspace communication
 net-libs/libnfsidmap 0.27: NFSv4 ID <-> name mapping library
-net-libs/libnftnl 1.1.3 1.1.4 1.1.5 1.1.6: Netlink API to the in-kernel nf_tables subsystem
+net-libs/libnftnl 1.1.3 1.1.4 1.1.5 1.1.6 1.1.7: Netlink API to the in-kernel nf_tables subsystem
 net-libs/libnice 0.1.13 0.1.15: An implementation of the Interactice Connectivity Establishment standard (ICE)
 net-libs/libnids 1.24-r6: an implementation of an E-component of Network Intrusion Detection System
 net-libs/libnipper 0.12.6-r1: A router configuration security analysis library
@@ -18774,7 +18774,7 @@ x11-wm/evilwm 1.0.1-r1 1.1.1: A minimalist, no frills window manager for X
 x11-wm/fluxbox 1.3.7-r4: X11 window manager featuring tabs and an iconbar
 x11-wm/fvwm 2.6.5-r3 2.6.8-r2 2.6.9: An extremely powerful ICCCM-compliant multiple virtual desktop window manager
 x11-wm/goomwwm 1.0.0 1.0.0-r1 9999: Get out of my way, Window Manager!
-x11-wm/herbstluftwm 0.7.2-r1 0.8.2 9999: A manual tiling window manager for X
+x11-wm/herbstluftwm 0.7.2-r1 0.8.2 0.8.3 9999: A manual tiling window manager for X
 x11-wm/i3 4.14-r1 4.15-r1 4.16-r1 4.16.1-r1 4.17.1-r1 4.18 9999: An improved dynamic tiling window manager
 x11-wm/i3-gaps 4.16.1-r2 4.17.1-r1: i3 fork with gaps and some more features
 x11-wm/icewm 1.5.5 1.6.5 1.6.6: Ice Window Manager with Themes
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3c017207ceeb..32c0f878d40d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 06 Jun 2020 22:35:33 +0000
+Sun, 07 Jun 2020 00:35:34 +0000