dev-qt/qtwayland: introduce libinput USE flag

qtwayland has conditionals like qtConfig(xkbcommon-evdev), which is provided by qtgui[libinput]. Enabling it by default for now, since currently keyboard does not work in Plasma/Wayland without it. Package-Manager: Portage-2.3.5, Repoman-2.3.2
gentoo · Jun 11, 2017 · 648d83e · 648d83e
1 parent 604de1a
commit 648d83e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
 		<flag name="wayland-compositor">Build Qt compositor for wayland</flag>
 	</use>

diff --git a/dev-qt/qtwayland/qtwayland-5.9.0.ebuild b/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl=]
+	~dev-qt/qtgui-${PV}[egl=,libinput?]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	qt5-build_src_prepare
+}
+
 src_configure() {
 	qt_use_compile_test xcomposite
 

diff --git a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl=]
+	~dev-qt/qtgui-${PV}[egl=,libinput?]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	qt5-build_src_prepare
+}
+
 src_configure() {
 	qt_use_compile_test xcomposite
 

diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.4.0
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl=]
+	~dev-qt/qtgui-${PV}[egl=,libinput?]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	qt5-build_src_prepare
+}
+
 src_configure() {
 	qt_use_compile_test xcomposite