commit: 8f09798b3c427b6c40fc8747aa47e407381713ee
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 13:10:29 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 13:14:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f09798b
dev-qt/qtgui: update 5.12 configure and dependencies
With the 'xinput2' feature replaced by 'xcb-xinput', bump
the minimum required 'x11-libs/libxcb' version, and remove
'x11-libs/libXi'.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 7 +++----
dev-qt/qtgui/qtgui-5.9999.ebuild | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
index c8309dc2..6f6d4286 100644
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
@@ -54,8 +54,7 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXi-1.7.5
- >=x11-libs/libxcb-1.10:=[xkb]
+ >=x11-libs/libxcb-1.12:=[xkb]
>=x11-libs/libxkbcommon-0.4.1[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
@@ -116,7 +115,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-render:
xcb:xcb-sm:
xcb:xcb-xlib:
- xcb:xinput2:
+ xcb:xcb-xinput:
xcb::XKB
)
@@ -164,7 +163,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+ $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index c8309dc2..6f6d4286 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -54,8 +54,7 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXi-1.7.5
- >=x11-libs/libxcb-1.10:=[xkb]
+ >=x11-libs/libxcb-1.12:=[xkb]
>=x11-libs/libxkbcommon-0.4.1[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
@@ -116,7 +115,7 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-render:
xcb:xcb-sm:
xcb:xcb-xlib:
- xcb:xinput2:
+ xcb:xcb-xinput:
xcb::XKB
)
@@ -164,7 +163,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon-x11 system)
- $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+ $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
qt5-build_src_configure
}
