summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-21 13:25:56 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-21 13:26:09 +0200
commit7bb2b0e5c7e131e99941defef188dad69170a107 (patch)
treeb917775eae5c5d310da1234c8682a8ca257d724e
parentdev-libs/kdiagram: 2.7.0 version bump (diff)
downloadgentoo-7bb2b0e5c7e131e99941defef188dad69170a107.tar.gz
gentoo-7bb2b0e5c7e131e99941defef188dad69170a107.tar.bz2
gentoo-7bb2b0e5c7e131e99941defef188dad69170a107.zip
dev-qt/qtgui: Drop obsolete blockers
In the hope it gets Portage over the depgraph a little better. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtgui/qtgui-5.14.1-r4.ebuild15
1 files changed, 4 insertions, 11 deletions
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
index 59370d3b5715..34de9be66424 100644
--- a/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${PV} # bug 707658
+SLOT=5/$(ver_cut 1-3) # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
@@ -26,7 +26,7 @@ REQUIRED_USE="
X? ( gles2-only? ( 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} )
@@ -179,8 +172,8 @@ src_configure() {
-opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
- $(qt_use vulkan)
$(qt_use udev libudev)
+ $(qt_use vulkan)
$(qt_use X xcb system)
$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)