dev-libs/libdbusmenu-qt: Prepare rdeps for dropping USE=qt5

diff --git a/kde-frameworks/knotifications/knotifications-5.34.0-r1.ebuild b/kde-frameworks/knotifications/knotifications-5.34.0-r1.ebuild
index ccaa4691dcce7d6a823eeb51d913de7cf636b4be..ce529c31487b5416ae0cebff4ec695a61d28b1a2 100644 (file)
--- a/kde-frameworks/knotifications/knotifications-5.34.0-r1.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.34.0-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
        $(add_qt_dep qtgui '' '' '5=')
        $(add_qt_dep qtwidgets)
        media-libs/phonon[qt5(+)]
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+       dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
        speech? ( $(add_qt_dep qtspeech) )
        X? (
                $(add_qt_dep qtx11extras)

diff --git a/kde-frameworks/knotifications/knotifications-5.34.0.ebuild b/kde-frameworks/knotifications/knotifications-5.34.0.ebuild
index 9b0f451c440bba2658ab68192011828530303971..35125e938114c56ecd1b3fac7d79d97e3c0689d1 100644 (file)
--- a/kde-frameworks/knotifications/knotifications-5.34.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.34.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
        $(add_qt_dep qtgui '' '' '5=')
        $(add_qt_dep qtwidgets)
        media-libs/phonon[qt5(+)]
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+       dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
        speech? ( $(add_qt_dep qtspeech) )
        X? (
                $(add_qt_dep qtx11extras)

diff --git a/kde-frameworks/knotifications/knotifications-5.37.0-r1.ebuild b/kde-frameworks/knotifications/knotifications-5.37.0-r1.ebuild
index 67277ce9939579e3fec908e674d1f50312a81503..4c247c35c18f382ef96d7b16e4e8b19ed6970b9c 100644 (file)
--- a/kde-frameworks/knotifications/knotifications-5.37.0-r1.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.37.0-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
        media-libs/phonon[qt5(+)]
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+       dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
        speech? ( $(add_qt_dep qtspeech) )
        X? (
                $(add_qt_dep qtx11extras)

diff --git a/kde-frameworks/knotifications/knotifications-5.37.0.ebuild b/kde-frameworks/knotifications/knotifications-5.37.0.ebuild
index 4028a224d81496ba9e33d9de18f46eb011695f3e..46d46ca122ec4e5bc71a9303e2b024e9e0697ea0 100644 (file)
--- a/kde-frameworks/knotifications/knotifications-5.37.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.37.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
        media-libs/phonon[qt5(+)]
-       dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+       dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
        speech? ( $(add_qt_dep qtspeech) )
        X? (
                $(add_qt_dep qtx11extras)

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild
index a036ecb99378b0e2bd7490e76b206fa8495b4213..b342e0bc9d24ca54affb9514c353b887309a3876 100644 (file)
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
        mount? ( kde-frameworks/solid:5 )
        networkmonitor? ( sys-libs/libstatgrab )
        sensors? ( sys-apps/lm_sensors )
-       statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] )
+       statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
        sysstat? ( =lxqt-base/libsysstat-0.3* )
        tray? ( x11-libs/libXcomposite
                x11-libs/libXdamage

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
index 5fde8c3050a6adc1c0e1fe5d036bdd76b1c01563..adcf675304e64d16d0801410ff895df0f187e27b 100644 (file)
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
        mount? ( kde-frameworks/solid:5 )
        networkmonitor? ( sys-libs/libstatgrab )
        sensors? ( sys-apps/lm_sensors )
-       statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] )
+       statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
        sysstat? ( =lxqt-base/libsysstat-0.3* )
        tray? ( x11-libs/libXcomposite
                x11-libs/libXdamage

diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0.ebuild
index 145afd114987e30f61dea83cc5a5b314e095d2bc..c37a9c770f7a1a564bd1f9ee661ce52ca7816d01 100644 (file)
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.10.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 
 RDEPEND="
-       dev-libs/libdbusmenu-qt[qt5]
+       dev-libs/libdbusmenu-qt[qt5(+)]
        dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5

diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild
index 41f1dffd4a12cbd6bb3d1df72c0f7c28b3314acb..13292f49909bfe1af1f7ab712299835cac0b241d 100644 (file)
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 
 RDEPEND="
-       dev-libs/libdbusmenu-qt[qt5]
+       dev-libs/libdbusmenu-qt[qt5(+)]
        >=dev-libs/libqtxdg-2.0.0
        dev-qt/qtcore:5
        dev-qt/qtgui:5

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
index ddac78adccfebfe4f0a231c114cb596774eed4bd..4b8e4eb39bec3bd8cca5b41a3ac58a73fbc81d70 100644 (file)
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -27,7 +27,7 @@ SERVER_RDEPEND="
        )
        !qt5? (
                dev-qt/qtscript:4
-               crypt? ( app-crypt/qca:2[qt4(+),ssl] )
+               crypt? ( app-crypt/qca:2[qt4,ssl] )
                postgres? ( dev-qt/qtsql:4[postgres] )
                !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        )
@@ -39,7 +39,7 @@ GUI_RDEPEND="
                dev-qt/qtgui:5
                dev-qt/qtwidgets:5
                dbus? (
-                       >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
+                       >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
                        dev-qt/qtdbus:5
                )
                kde? (
@@ -60,7 +60,7 @@ GUI_RDEPEND="
                dev-qt/qtgui:4
                ayatana? ( dev-libs/libindicate-qt )
                dbus? (
-                       >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)]
+                       >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4]
                        dev-qt/qtdbus:4
                        kde? (
                                kde-frameworks/kdelibs:4

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a79337d4d34b561f9641df90dba5df9de45803fd..7bf54b67a40acb3f3204461f7e764f740b6b3e43 100644 (file)
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -31,7 +31,7 @@ GUI_RDEPEND="
        dev-qt/qtwidgets:5
        breeze? ( kde-frameworks/breeze-icons:5 )
        dbus? (
-               >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
+               >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
                dev-qt/qtdbus:5
        )
        kde? (

diff --git a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
index 30565963a7d95e4b4ee90b3af9146a8f40228907..6cb5af4fb456146b1afc0a67c3efbdd3f5dddbdc 100644 (file)
--- a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
+++ b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="
        dev-qt/qtcore:4
        dev-qt/qtdbus:4
        dev-qt/qtgui:4
-       >=dev-libs/libdbusmenu-qt-0.9.0[qt4(+)]"
+       >=dev-libs/libdbusmenu-qt-0.9.0[qt4]"
 RDEPEND="${DEPEND}"
 
 DOCS=( NEWS README )