commit: 085ca84d81440d0d31296a0f99e8b72920099ac4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 17 22:36:41 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 18 11:06:55 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=085ca84d
dev-qt/qtwayland: Drop USE libinput USE -libinput is broken with dev-qt/qtgui[-libinput,X], would also need -X. Closes: https://bugs.gentoo.org/711476 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtwayland/qtwayland-5.14.9999.ebuild | 14 ++------------ dev-qt/qtwayland/qtwayland-5.15.9999.ebuild | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild index 5fa75b67..474000fb 100644 --- a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild @@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="+libinput vulkan xcomposite" +IUSE="vulkan xcomposite" DEPEND=" >=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=] + ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) @@ -28,16 +28,6 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - qt_use_disable_config libinput xkbcommon \ - src/client/client.pro \ - src/compositor/wayland_wrapper/wayland_wrapper.pri \ - src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ - src/plugins/shellintegration/wl-shell/wl-shell.pro \ - src/plugins/shellintegration/xdg-shell/xdg-shell.pro \ - src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \ - src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \ - tests/auto/compositor/compositor/compositor.pro - qt_use_disable_config vulkan wayland-vulkan-server-buffer \ src/plugins/hardwareintegration/client/client.pro \ src/plugins/hardwareintegration/compositor/compositor.pro diff --git a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild index 0f7e93ca..52fb0bcb 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild @@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="+libinput vulkan xcomposite" +IUSE="vulkan xcomposite" DEPEND=" >=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=] + ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) @@ -28,16 +28,6 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - qt_use_disable_config libinput xkbcommon \ - src/client/client.pro \ - src/compositor/wayland_wrapper/wayland_wrapper.pri \ - src/plugins/shellintegration/ivi-shell/ivi-shell.pro \ - src/plugins/shellintegration/wl-shell/wl-shell.pro \ - src/plugins/shellintegration/xdg-shell/xdg-shell.pro \ - src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \ - src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \ - tests/auto/compositor/compositor/compositor.pro - qt_use_disable_config vulkan wayland-vulkan-server-buffer \ src/plugins/hardwareintegration/client/client.pro \ src/plugins/hardwareintegration/compositor/compositor.pro
