diff options
67 files changed, 309 insertions, 312 deletions
diff --git a/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild b/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild index 310cdc25590..52c765769a8 100644 --- a/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild +++ b/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild @@ -25,10 +25,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep plasma) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " DEPEND="${COMMON_DEPEND} x11-misc/shared-mime-info diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild index 310cdc25590..52c765769a8 100644 --- a/kde-plasma/bluedevil/bluedevil-9999.ebuild +++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild @@ -25,10 +25,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep plasma) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " DEPEND="${COMMON_DEPEND} x11-misc/shared-mime-info diff --git a/kde-plasma/breeze/breeze-5.5.49.9999.ebuild b/kde-plasma/breeze/breeze-5.5.49.9999.ebuild index 4f4d3123d82..81ccf3b1e4c 100644 --- a/kde-plasma/breeze/breeze-5.5.49.9999.ebuild +++ b/kde-plasma/breeze/breeze-5.5.49.9999.ebuild @@ -23,10 +23,10 @@ DEPEND=" $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep plasma) $(add_plasma_dep kdecoration) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) x11-libs/libxcb qt4? ( kde-base/kdelibs:4 diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild index 4f4d3123d82..81ccf3b1e4c 100644 --- a/kde-plasma/breeze/breeze-9999.ebuild +++ b/kde-plasma/breeze/breeze-9999.ebuild @@ -23,10 +23,10 @@ DEPEND=" $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep plasma) $(add_plasma_dep kdecoration) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) x11-libs/libxcb qt4? ( kde-base/kdelibs:4 diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild index a75fc20392f..6794eb126da 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild @@ -26,14 +26,14 @@ DEPEND=" $(add_frameworks_dep kservice) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) kdesu? ( $(add_frameworks_dep kdesu) ) X? ( $(add_frameworks_dep kdelibs4support) - dev-qt/qtx11extras:5 + $(add_qt_dep qtx11extras) x11-libs/libX11 ) " diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild index a75fc20392f..6794eb126da 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild @@ -26,14 +26,14 @@ DEPEND=" $(add_frameworks_dep kservice) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) kdesu? ( $(add_frameworks_dep kdesu) ) X? ( $(add_frameworks_dep kdelibs4support) - dev-qt/qtx11extras:5 + $(add_qt_dep qtx11extras) x11-libs/libX11 ) " diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild index 894e33bfe8e..bf1230e1db4 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild @@ -25,8 +25,8 @@ DEPEND=" $(add_frameworks_dep knewstuff) $(add_frameworks_dep kwidgetsaddons) dev-libs/glib:2 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) " diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild index 894e33bfe8e..bf1230e1db4 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild @@ -25,8 +25,8 @@ DEPEND=" $(add_frameworks_dep knewstuff) $(add_frameworks_dep kwidgetsaddons) dev-libs/glib:2 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) " diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild index 5538e6bf8df..9587d28347c 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild @@ -35,15 +35,15 @@ DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep plasma) $(add_frameworks_dep sonnet) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) ibus? ( app-i18n/ibus dev-libs/glib:2 - dev-qt/qtx11extras:5 + $(add_qt_dep qtx11extras) x11-libs/libxcb x11-libs/xcb-util-keysyms ) diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild index 5538e6bf8df..9587d28347c 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild @@ -35,15 +35,15 @@ DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep plasma) $(add_frameworks_dep sonnet) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) ibus? ( app-i18n/ibus dev-libs/glib:2 - dev-qt/qtx11extras:5 + $(add_qt_dep qtx11extras) x11-libs/libxcb x11-libs/xcb-util-keysyms ) diff --git a/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild b/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild index 6aac9ee1b05..6933b1cb43c 100644 --- a/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild +++ b/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild @@ -18,9 +18,9 @@ RDEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) x11-libs/libX11 x11-libs/libXxf86vm " diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild index c2a1b981506..6933b1cb43c 100644 --- a/kde-plasma/kgamma/kgamma-9999.ebuild +++ b/kde-plasma/kgamma/kgamma-9999.ebuild @@ -18,8 +18,9 @@ RDEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) x11-libs/libX11 x11-libs/libXxf86vm " diff --git a/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild index 8f3add6648b..bcef29d30b3 100644 --- a/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild +++ b/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild @@ -31,10 +31,10 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) " RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) diff --git a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild index 8f3add6648b..bcef29d30b3 100644 --- a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild +++ b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild @@ -31,10 +31,10 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) " RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) diff --git a/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild b/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild index 9ef8a674c73..231d10144ae 100644 --- a/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild @@ -27,10 +27,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) $(add_plasma_dep plasma-workspace) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) x11-libs/libX11 " RDEPEND="${COMMON_DEPEND} diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild index 9ef8a674c73..231d10144ae 100644 --- a/kde-plasma/khotkeys/khotkeys-9999.ebuild +++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild @@ -27,10 +27,10 @@ COMMON_DEPEND=" $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) $(add_plasma_dep plasma-workspace) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) x11-libs/libX11 " RDEPEND="${COMMON_DEPEND} diff --git a/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild index 00f0cca27cb..12a10e115c9 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild @@ -32,12 +32,12 @@ COMMON_DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep solid) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5[opengl(+)] - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui 'opengl(+)') + $(add_qt_dep qtwidgets) gles? ( - dev-qt/qtgui:5[gles2] + $(add_qt_dep qtgui 'gles2') || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index 00f0cca27cb..12a10e115c9 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -32,12 +32,12 @@ COMMON_DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep solid) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5[opengl(+)] - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui 'opengl(+)') + $(add_qt_dep qtwidgets) gles? ( - dev-qt/qtgui:5[gles2] + $(add_qt_dep qtgui 'gles2') || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] diff --git a/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild index fc75c3dcac4..d1873d41cab 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild @@ -26,10 +26,10 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep sonnet) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) hotkeys? ( $(add_plasma_dep khotkeys) ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild index fc75c3dcac4..d1873d41cab 100644 --- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild @@ -26,10 +26,10 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep sonnet) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) hotkeys? ( $(add_plasma_dep khotkeys) ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild b/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild index 15cb0eab2f4..441068df666 100644 --- a/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild +++ b/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild @@ -22,13 +22,13 @@ DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) - dev-qt/qtgraphicaleffects:5 + $(add_qt_dep qtgraphicaleffects) !kde-misc/kscreen " diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild index 15cb0eab2f4..441068df666 100644 --- a/kde-plasma/kscreen/kscreen-9999.ebuild +++ b/kde-plasma/kscreen/kscreen-9999.ebuild @@ -22,13 +22,13 @@ DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) - dev-qt/qtgraphicaleffects:5 + $(add_qt_dep qtgraphicaleffects) !kde-misc/kscreen " diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild index 570094215ed..2e0db86aaba 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=6 KDE_TEST="forceoptional" -QT_MINIMAL="5.5.0" VIRTUALX_REQUIRED="test" inherit kde5 pam @@ -30,13 +29,13 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep plasma) $(add_plasma_dep kwayland) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) dev-libs/wayland - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 |