diff --git a/dev-libs/wlc/wlc-0.0.3.ebuild b/dev-libs/wlc/wlc-0.0.3-r1.ebuild
similarity index 91%
rename from dev-libs/wlc/wlc-0.0.3.ebuild
rename to dev-libs/wlc/wlc-0.0.3-r1.ebuild
index 71e2e7872a0eb..220b06b29cf4d 100644
--- a/dev-libs/wlc/wlc-0.0.3.ebuild
+++ b/dev-libs/wlc/wlc-0.0.3-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="virtual/opengl
 		x11-libs/libdrm
 		x11-libs/pixman
 		x11-libs/libxkbcommon
+		x11-misc/xkeyboard-config
 		dev-libs/libinput
 		dev-libs/wayland
 		X? ( x11-libs/libX11
@@ -32,7 +33,7 @@ RDEPEND="virtual/opengl
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-		dev-libs/wayland-protocols"
+	dev-libs/wayland-protocols"
 
 src_configure() {
 	local mycmakeargs=(
@@ -41,10 +42,10 @@ src_configure() {
 
 		-DWLC_BUILD_STATIC=$(usex static-libs)
 
+		-DWLC_X11_SUPPORT=$(usex X)
+
 		$(cmake-utils_use_find_package systemd Systemd)
 		$(cmake-utils_use_find_package systemd Dbus)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
 	)
 
 	cmake-utils_src_configure
diff --git a/dev-libs/wlc/wlc-9999.ebuild b/dev-libs/wlc/wlc-9999.ebuild
index 84647c88fc61b..5a3e040fbf84a 100644
--- a/dev-libs/wlc/wlc-9999.ebuild
+++ b/dev-libs/wlc/wlc-9999.ebuild
@@ -21,6 +21,7 @@ RDEPEND="virtual/opengl
 		x11-libs/libdrm
 		x11-libs/pixman
 		x11-libs/libxkbcommon
+		x11-misc/xkeyboard-config
 		dev-libs/libinput
 		dev-libs/wayland
 		X? ( x11-libs/libX11
@@ -32,7 +33,7 @@ RDEPEND="virtual/opengl
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-		dev-libs/wayland-protocols"
+	dev-libs/wayland-protocols"
 
 src_configure() {
 	local mycmakeargs=(