From 9fa1f6828f5af35745fbf59cd58b62f86bf13de7 Mon Sep 17 00:00:00 2001 From: Jasen Borisov Date: Mon, 4 Jul 2016 09:50:31 +0300 Subject: [PATCH] dev-libs/wlc: fix missing RDEPEND and X configuration Gentoo-Bug: 584462 Package-Manager: portage-2.3.0 --- dev-libs/wlc/{wlc-0.0.3.ebuild => wlc-0.0.3-r1.ebuild} | 7 ++++--- dev-libs/wlc/wlc-9999.ebuild | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) rename dev-libs/wlc/{wlc-0.0.3.ebuild => wlc-0.0.3-r1.ebuild} (91%) 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=(