diff --git a/x11-libs/libxcb-errors/Manifest b/x11-libs/libxcb-errors/Manifest
deleted file mode 100644
index eb0188f..0000000
--- a/x11-libs/libxcb-errors/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxcb-errors-1.0.zip 16009 BLAKE2B 0718912a6d6c22927c841cafbf33d31063025499e206ef34b830e9e3385fe93b9b12ca9a33f2abac1b7ec041fe5cc89a68f7067d4a3570a059a21ec8c285bf37 SHA512 cdd894880f73e62eeb1c81217d464015f2732aa45b97c422a0dd35ecc1cb18ac02edda14a98d9aacf3ffae0720f0289cbe064e8b209ce40f72f46cd07c079ece
diff --git a/x11-libs/libxcb-errors/libxcb-errors-1.0.ebuild b/x11-libs/libxcb-errors/libxcb-errors-1.0.ebuild
deleted file mode 100644
index b55d2f9..0000000
--- a/x11-libs/libxcb-errors/libxcb-errors-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_MULTILIB=yes
-XORG_DOC=doc
-
-inherit python-any-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings library error module"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-SRC_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-errors/-/archive/${PV}/libxcb-errors-${PV}.zip"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0/1.12"
-
-RDEPEND="
-	x11-libs/libxcb
-"
-
-#src_configure() {
-	#xorg-3_src_configure
-#}
-
diff --git a/x11-wm/phoc/phoc-0.21.1-r1.ebuild b/x11-wm/phoc/phoc-0.21.1-r1.ebuild
deleted file mode 100755
index 722f909..0000000
--- a/x11-wm/phoc/phoc-0.21.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg gnome2-utils
-
-MY_PV="v${PV}"
-MY_P="${PN}-${MY_PV}"
-
-WL_COMMIT="1f8bb9e0e3058fc31a14866dc52e8f83c1287a09"
-WL_P="wlroots-${WL_COMMIT}"
-
-DESCRIPTION="Wlroots based Phone compositor"
-HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"
-
-SRC_URI="
-	https://gitlab.gnome.org/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz
-	https://source.puri.sm/Librem5/wlroots/-/archive/${WL_COMMIT}/${WL_P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+introspection +systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/gobject-introspection
-	dev-libs/libinput
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gnome-settings-daemon
-	gnome-base/gnome-desktop
-	dev-util/vulkan-headers
-	sys-apps/systemd
-	x11-libs/libdrm
-	x11-libs/pixman
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-renderutil
-	x11-wm/mutter
-	sys-auth/seatd
-	sys-auth/seatd
-	x11-apps/xkbcomp
-	x11-libs/libdrm	
-"
-
-BDEPEND="
-	dev-util/ctags
-	dev-util/meson
-	virtual/pkgconfig
-	x11-base/xorg-server
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false
-	)
-	
-	meson_src_configure
-}
-
-src_install() {
-	DESTDIR="${D}" meson_src_install
-	dobin "${S}"/helpers/scale-to-fit
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/x11-wm/phoc/phoc-0.21.1-r2.ebuild b/x11-wm/phoc/phoc-0.21.1-r2.ebuild
index 8eece0b..3b6148f 100755
--- a/x11-wm/phoc/phoc-0.21.1-r2.ebuild
+++ b/x11-wm/phoc/phoc-0.21.1-r2.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	sys-auth/seatd
 	x11-apps/xkbcomp
 	x11-libs/libdrm	
-	=gui-libs/wlroots-0.15.1
+	!gui-libs/wlroots
 "
 
 BDEPEND="
@@ -63,7 +63,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 	rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots"
-	#cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots"
+	cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots"
 }
 
 src_configure() {