commit: c71732263c2d058de8ae78ce83b57f2db27208fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 22:23:44 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:04:14 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c7173226
dev-qt/qtgui: drop obsolete blockers, properly fixed by cmake patch
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtgui/qtgui-5.14.9999.ebuild | 11 ++---------
dev-qt/qtgui/qtgui-5.15.9999.ebuild | 11 ++---------
dev-qt/qtgui/qtgui-5.9999.ebuild | 7 +++++--
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild
b/dev-qt/qtgui/qtgui-5.14.9999.ebuild
index e9b747e5..474c2a42 100644
--- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
X? ( gles2? ( egl ) )
"
-COMMON_DEPEND="
+RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
dev-util/gtk-update-icon-cache
@@ -66,17 +66,10 @@ COMMON_DEPEND="
x11-libs/xcb-util-wm
)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
- !<dev-qt/qtimageformats-5.14.0:5
- !<dev-qt/qtsvg-5.14.0:5
- !<dev-qt/qtvirtualkeyboard-5.14.0:5
- !<dev-qt/qtwayland-5.14.0:5
-"
PDEPEND="
ibus? ( app-i18n/ibus )
wayland? ( ~dev-qt/qtwayland-${PV} )
diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild
b/dev-qt/qtgui/qtgui-5.15.9999.ebuild
index 27b95fde..cf523927 100644
--- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
X? ( gles2? ( egl ) )
"
-COMMON_DEPEND="
+RDEPEND="
dev-libs/glib:2
~dev-qt/qtcore-${PV}
dev-util/gtk-update-icon-cache
@@ -66,17 +66,10 @@ COMMON_DEPEND="
x11-libs/xcb-util-wm
)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
"
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
- !<dev-qt/qtimageformats-5.14.0:5
- !<dev-qt/qtsvg-5.14.0:5
- !<dev-qt/qtvirtualkeyboard-5.14.0:5
- !<dev-qt/qtwayland-5.14.0:5
-"
PDEPEND="
ibus? ( app-i18n/ibus )
wayland? ( ~dev-qt/qtwayland-${PV} )
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 3fb1bce4..d8d3e0e7 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -15,8 +15,8 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +X"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+ +libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
accessibility? ( dbus X )
@@ -53,6 +53,7 @@ RDEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
+ vulkan? ( dev-util/vulkan-headers )
X? (
x11-libs/libICE
x11-libs/libSM
@@ -113,6 +114,7 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
+ vulkan:vulkan:
X:xcb:
X:xcb-glx:
X:xcb-plugin:
@@ -166,6 +168,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
+ $(qt_use vulkan)
$(qt_use X xcb system)
$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)
