diff --git a/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff b/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
new file mode 100644
index 0000000..be1eeb5
--- /dev/null
+++ b/x11-wm/phoc/files/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
@@ -0,0 +1,42 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Fri, 1 Jan 2021 13:58:55 +0100
+Subject: Revert "layer-shell: error on 0 dimension without anchors"
+
+This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
+
+Revert this until phosh has a fixed release.
+---
+ types/wlr_layer_shell_v1.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
+index bc68111..d83b22b 100644
+--- a/types/wlr_layer_shell_v1.c
++++ b/types/wlr_layer_shell_v1.c
+@@ -307,26 +307,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
+ 		return;
+ 	}
+ 
+-	const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
+-		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+-	if (surface->client_pending.desired_width == 0 &&
+-		(surface->client_pending.anchor & horiz) != horiz) {
+-		wl_resource_post_error(surface->resource,
+-			ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
+-			"width 0 requested without setting left and right anchors");
+-		return;
+-	}
+-
+-	const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
+-		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+-	if (surface->client_pending.desired_height == 0 &&
+-		(surface->client_pending.anchor & vert) != vert) {
+-		wl_resource_post_error(surface->resource,
+-			ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
+-			"height 0 requested without setting top and bottom anchors");
+-		return;
+-	}
+-
+ 	if (surface->closed) {
+ 		// Ignore commits after the compositor has closed it
+ 		return;
diff --git a/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff b/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff
new file mode 100644
index 0000000..d08b859
--- /dev/null
+++ b/x11-wm/phoc/files/xcursor-fix-false-positive-stringop-truncation.diff
@@ -0,0 +1,21 @@
+Description: xcursor: strncpy truncation warning with GCC 10 on s390x
+ Fix false positive stringop-truncation warning/error with GCC 10 on s390x
+ .
+Author: Lukas Märdian <slyon@ubuntu.com>
+Bug: https://github.com/swaywm/wlroots/issues/2018
+Last-Update: 2021-03-03
+---
+--- wlroots-0.12.0.orig/xcursor/xcursor.c
++++ wlroots-0.12.0/xcursor/xcursor.c
+@@ -655,8 +655,11 @@ _XcursorAddPathElt (char *path, const ch
+ 	elt++;
+ 	len--;
+     }
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wstringop-truncation"
+     strncpy (path + pathlen, elt, len);
+     path[pathlen + len] = '\0';
++#pragma GCC diagnostic pop
+ }
+ 
+ static char *
diff --git a/x11-wm/phoc/phoc-0.8.0-r1.ebuild b/x11-wm/phoc/phoc-0.8.0-r1.ebuild
new file mode 100644
index 0000000..282186a
--- /dev/null
+++ b/x11-wm/phoc/phoc-0.8.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala meson gnome2-utils git-r3 xdg
+EGIT_REPO_URI="https://source.puri.sm/Librem5/phoc.git"
+
+KEYWORDS="~x86 ~amd64 ~arm ~arm64"
+if [[ ${PV} != 9999 ]]; then
+    #EGIT_COMMIT="tags/v${PV}"
+	EGIT_COMMIT="527689df1300277af2cdfc872474c8322e38f690"
+else
+    KEYWORDS=""
+fi
+
+WLROOT=0.12.0
+
+SRC_URI="https://github.com/swaywm/wlroots/archive/${WLROOT}.tar.gz -> wlroot-${WLROOT}.tar.gz"
+
+
+PATCHES=(
+	"${FILESDIR}/0001-seat-Don-t-notify-on-key-release.patch"
+	"${FILESDIR}/0002-seat-inhibit-touch-events-when-in-power-save-mode-or.patch"
+	#"${FILESDIR}/xcursor-fix-false-positive-stringop-truncation.diff"
+	#"${FILESDIR}/Revert-layer-shell-error-on-0-dimension-without-anchors.diff"
+)
+
+DESCRIPTION="Wlroots based Phone compositor"
+HOMEPAGE="https://source.puri.sm/Librem5/phoc"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+introspection"
+
+	#<=gui-libs/wlroots-0.11.0:0/11
+DEPEND="
+	dev-libs/glib
+	dev-libs/gobject-introspection
+	dev-libs/libinput
+	gnome-base/gnome-desktop
+	!gui-libs/wlroots
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-wm/mutter
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+		dev-util/ctags
+		x11-base/xorg-server
+		dev-util/meson
+		virtual/pkgconfig
+"
+
+src_unpack() {
+	default
+	git-r3_fetch
+	git-r3_checkout
+	rm -rf ${S}/subprojects/wlroots
+	mv ${WORKDIR}/wlroots-${WLROOT} ${S}/subprojects/wlroots
+}
+
+src_prepare() {
+	default
+	eapply_user
+	cd subprojects/wlroots
+	eapply ${FILESDIR}/xcursor-fix-false-positive-stringop-truncation.diff
+	eapply ${FILESDIR}/Revert-layer-shell-error-on-0-dimension-without-anchors.diff
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+		-Dtests=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobin ${S}/helpers/scale-to-fit
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}