--- a/xwayland-21.1.1-r2.ebuild	2021-07-04 19:09:52.000000000 -0500
+++ b/xwayland-21.1.1-r2.ebuild	2021-07-22 08:20:20.724860255 -0500
@@ -3,17 +3,23 @@
 
 EAPI=7
 
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="xwayland-21.1"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+	inherit git-r3
+else
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
 inherit meson
 
 DESCRIPTION="Standalone X server running under Wayland"
 HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
 
 IUSE="rpc unwind ipv6 xcsecurity selinux"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=x11-libs/pixman-0.27.2