diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2016-05-11 22:07:39 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-05-11 22:07:39 +1000 |
| commit | d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b (patch) | |
| tree | f978e5a70fb0e26e3f8cdc850f9868a7d6afcaa5 | |
| parent | 309dc9c34bee9438291e03781aa3ad842940d492 (diff) | |
| download | kde-d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b.tar.gz kde-d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b.tar.bz2 kde-d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b.zip | |
kde-plasma/plasma-workspace: introduce temporary subslot operator on dev-qt/qtgui
There are a few code paths that are built conditionally depending on which
version of Qt is installed.
Package-Manager: portage-2.2.28
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild | 3 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild index 3e9b16d12fc..98151618a21 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild @@ -14,6 +14,7 @@ DESCRIPTION="KDE Plasma workspace" KEYWORDS="" IUSE="dbus +geolocation gps prison qalculate" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 COMMON_DEPEND=" $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) @@ -62,7 +63,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtgui 'jpeg' '' '' '5=') $(add_qt_dep qtnetwork) $(add_qt_dep qtscript) $(add_qt_dep qtsql) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 5365e9c2ca9..9393e80cf43 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -14,6 +14,7 @@ DESCRIPTION="KDE Plasma workspace" KEYWORDS="" IUSE="dbus +geolocation gps prison qalculate" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 COMMON_DEPEND=" $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) @@ -62,7 +63,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtgui 'jpeg' '' '' '5=') $(add_qt_dep qtnetwork) $(add_qt_dep qtscript) $(add_qt_dep qtsql) |