diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
deleted file mode 100644
index ec440af038..0000000000
--- a/gui-apps/wcm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wcm-0.4.0.tar.gz 263841 BLAKE2B 28cdf87c479cc7a4a5a40f17a1ec26688bae6a0cd5699b51ad7db2adca89946d7687ae345a7a82d71464df413c956aceeb3db8195c5b40da5f32043821883c49 SHA512 4136ceba90c054165b4b0e7a79d78af827d8b8ddb8b54820bda0c17bbaa28eb74981ce94d8c386b91257ca023a34f76f121a003229365afe72d65323f0a1d2cd
diff --git a/gui-apps/wcm/metadata.xml b/gui-apps/wcm/metadata.xml
deleted file mode 100644
index a3865a3c5a..0000000000
--- a/gui-apps/wcm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- gentoo@aisha.cc
- Aisha Tammy
-
-
diff --git a/gui-apps/wcm/wcm-0.4.0.ebuild b/gui-apps/wcm/wcm-0.4.0.ebuild
deleted file mode 100644
index 6d619b52bd..0000000000
--- a/gui-apps/wcm/wcm-0.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayfire Config Manager"
-HOMEPAGE="https://github.com/WayfireWM/wcm"
-EGIT_REPO_URI="https://github.compu/WayfireWM/wcm.git"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-libs/libevdev
- dev-libs/libxml2
- dev-cpp/gtkmm:3.0[wayland]
- ~gui-apps/wf-config-${PV}
- ~gui-wm/wayfire-${PV}
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
diff --git a/gui-apps/wcm/wcm-9999.ebuild b/gui-apps/wcm/wcm-9999.ebuild
deleted file mode 100644
index 095dd27cc6..0000000000
--- a/gui-apps/wcm/wcm-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayfire Config Manager"
-HOMEPAGE="https://github.com/WayfireWM/wcm"
-EGIT_REPO_URI="https://github.compu/WayfireWM/wcm.git"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-libs/libevdev
- dev-libs/libxml2
- dev-cpp/gtkmm:3.0[wayland]
- ~gui-apps/wf-config-${PV}
- ~gui-wm/wayfire-${PV}
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
diff --git a/gui-apps/wf-config/Manifest b/gui-apps/wf-config/Manifest
deleted file mode 100644
index d96518e9b6..0000000000
--- a/gui-apps/wf-config/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wf-config-0.4.0.tar.xz 64108 BLAKE2B 83999dd246e6b7a6c54bbbcdf7abf08767b31bd29e75cd41d9844c4b98c66fbe787b7d87ec433e2c5e860e476f4f621116aac16c7f3f56903ee1689c5d1bc6c9 SHA512 30358ada695012b9f4be835f2b2d032e0d8d52c3e9d49d39ae975c74bc0cac188341e507124a088d8cdb3d62c77645a7d435262d15a6cc604b4738861362a299
diff --git a/gui-apps/wf-config/metadata.xml b/gui-apps/wf-config/metadata.xml
deleted file mode 100644
index a3865a3c5a..0000000000
--- a/gui-apps/wf-config/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- gentoo@aisha.cc
- Aisha Tammy
-
-
diff --git a/gui-apps/wf-config/wf-config-0.4.0.ebuild b/gui-apps/wf-config/wf-config-0.4.0.ebuild
deleted file mode 100644
index 23122a7d06..0000000000
--- a/gui-apps/wf-config/wf-config-0.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A library for managing configuration files, written for wayfire"
-HOMEPAGE="https://github.com/WayfireWM/wf-config"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
- dev-libs/libevdev
- media-libs/glm
- dev-libs/libxml2
- >=gui-libs/wlroots-0.10.0
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
diff --git a/gui-apps/wf-config/wf-config-9999.ebuild b/gui-apps/wf-config/wf-config-9999.ebuild
deleted file mode 100644
index 23122a7d06..0000000000
--- a/gui-apps/wf-config/wf-config-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A library for managing configuration files, written for wayfire"
-HOMEPAGE="https://github.com/WayfireWM/wf-config"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
- dev-libs/libevdev
- media-libs/glm
- dev-libs/libxml2
- >=gui-libs/wlroots-0.10.0
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
deleted file mode 100644
index e210eeae0b..0000000000
--- a/gui-apps/wf-shell/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wf-shell-0.4.0.tar.xz 8996656 BLAKE2B 609668bcf00fcc7a0b8142d84a7101f07578c2d6a88616da286a615076372e5a356387cf5e3fdee9b4aba6f027d8d081a5cce32f7f00682a756d4ee9bc46916d SHA512 1b293ce3fc2b12acbadb75e0de28217ed24f733e26d7ad12ada9a5f0673df911e75eea5af6841c466f031151f881a8e36dda229ea4dc2f91825e2e6df42d4903
diff --git a/gui-apps/wf-shell/metadata.xml b/gui-apps/wf-shell/metadata.xml
deleted file mode 100644
index a3865a3c5a..0000000000
--- a/gui-apps/wf-shell/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- gentoo@aisha.cc
- Aisha Tammy
-
-
diff --git a/gui-apps/wf-shell/wf-shell-0.4.0.ebuild b/gui-apps/wf-shell/wf-shell-0.4.0.ebuild
deleted file mode 100644
index f530d24920..0000000000
--- a/gui-apps/wf-shell/wf-shell-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wf-shell"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND="
- ~gui-apps/wf-config-${PV}
- dev-cpp/gtkmm:3.0=[wayland]
- dev-libs/gobject-introspection
- pulseaudio? ( media-sound/pulseaudio )
- ~gui-wm/wayfire-${PV}
- >=gui-libs/gtk-layer-shell-0.1
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-BDEPEND="
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
-
-src_configure () {
- local emesonargs=(
- "-Dpulse=$(usex pulseaudio enabled disabled)"
- )
- meson_src_configure
-}
diff --git a/gui-apps/wf-shell/wf-shell-9999.ebuild b/gui-apps/wf-shell/wf-shell-9999.ebuild
deleted file mode 100644
index bee0ee0f75..0000000000
--- a/gui-apps/wf-shell/wf-shell-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wf-shell"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND="
- ~gui-apps/wf-config-${PV}
- dev-cpp/gtkmm:3.0=[wayland]
- dev-libs/gobject-introspection
- pulseaudio? ( media-sound/pulseaudio )
- ~gui-wm/wayfire-${PV}
- >=gui-libs/gtk-layer-shell-0.1
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-BDEPEND="
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
-
-src_configure () {
- local emesonargs=(
- "-Dpulse=$(usex pulseaudio enabled disabled)"
- )
- meson_src_configure
-}
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
deleted file mode 100644
index f03e463761..0000000000
--- a/gui-wm/wayfire/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
deleted file mode 100644
index 2a2e1db003..0000000000
--- a/gui-wm/wayfire/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- gentoo@aisha.cc
- Aisha Tammy
-
-
-
diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0.ebuild
deleted file mode 100644
index 01cbee0228..0000000000
--- a/gui-wm/wayfire/wayfire-0.4.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wayfire"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+wf-config +wlroots +elogind systemd debug"
-
-DEPEND="
- dev-libs/libevdev
- dev-libs/libinput
- 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
- gui-libs/gtk-layer-shell
- wf-config? ( ~gui-apps/wf-config-${PV} )
- wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
-"
-
-RDEPEND="
- ${DEPEND}
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
- x11-misc/xkeyboard-config
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- >=dev-libs/wayland-protocols-1.14
-"
-
-src_configure(){
- local emesonargs=(
- -Duse_system_wfconfig=$(usex wf-config enabled disabled)
- -Duse_system_wlroots=$(usex wlroots enabled disabled)
- )
- if use debug; then
- emesonargs+=(
- "-Db_sanitize=address,undefined"
- )
- fi
- meson_src_configure
-}
-
-pkg_preinst() {
- if ! use systemd && ! use elogind; then
- fowners root:0 /usr/bin/wayfire
- fperms 4511 /usr/bin/wayfire
- fi
-}
-
-src_install() {
- default
- meson_src_install
- einstalldocs
-
- insinto "/usr/share/wayland-sessions/"
- insopts -m644
- doins wayfire.desktop
-
- dodoc wayfire.ini
-}
-
-pkg_postinst() {
- 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 "To install the file execute"
- elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
-}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
deleted file mode 100644
index 21f3f20ddf..0000000000
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wayfire"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+wf-config +wlroots +elogind systemd debug"
-
-DEPEND="
- dev-libs/libevdev
- dev-libs/libinput
- 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
- gui-libs/gtk-layer-shell
- wf-config? ( ~gui-apps/wf-config-${PV} )
- wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
-"
-
-RDEPEND="
- ${DEPEND}
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
- x11-misc/xkeyboard-config
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- >=dev-libs/wayland-protocols-1.14
-"
-
-src_configure(){
- local emesonargs=(
- -Duse_system_wfconfig=$(usex wf-config enabled disabled)
- -Duse_system_wlroots=$(usex wlroots enabled disabled)
- )
- if use debug; then
- emesonargs+=(
- "-Db_sanitize=address,undefined"
- )
- fi
- meson_src_configure
-}
-
-pkg_preinst() {
- if ! use systemd && ! use elogind; then
- fowners root:0 /usr/bin/wayfire
- fperms 4511 /usr/bin/wayfire
- fi
-}
-
-src_install() {
- default
- meson_src_install
- einstalldocs
-
- insinto "/usr/share/wayland-sessions/"
- insopts -m644
- doins wayfire.desktop
-
- dodoc wayfire.ini
-}
-
-pkg_postinst() {
- 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 "To install the file execute"
- elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
-}