dev-libs/wlc: fix missing RDEPEND and X configuration

Gentoo-Bug: 584462

Package-Manager: portage-2.3.0

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 71e2e7872a0ebf611cafc228318a52b94eb0111a..220b06b29cf4d549319557b2b8205f9ceb875234 100644 (file)
--- 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 84647c88fc61b770ed77e60ab82a6057ebe2fbf7..5a3e040fbf84a3c09fe02119e011db1445aa3c7a 100644 (file)
--- 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=(