[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/

[Andreas Sturmlechner]

commit:     c231d199607b80abe3367967186bad8edc67bd54
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 14:05:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 14:09:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c231d199

kde-plasma/kwin: Drop deprecated dev-qt/qtmultimedia[gstreamer010] option

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-plasma/kwin/kwin-5.10.4-r1.ebuild | 9 ++-------
 kde-plasma/kwin/kwin-5.10.5.ebuild    | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild 
b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
index 3ab1a1d6f51..f98474e5968 100644
--- a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
@@ -68,12 +68,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
-       multimedia? (
-               || (
-                       $(add_qt_dep qtmultimedia 'gstreamer,qml')
-                       $(add_qt_dep qtmultimedia 'gstreamer010,qml')
-               )
-       )
+       multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
        !<kde-apps/kdeartwork-meta-15.08.3-r1:4
        !kde-plasma/kwin:4
        !kde-plasma/systemsettings:4
@@ -82,7 +77,7 @@ DEPEND="${COMMON_DEPEND}
        $(add_qt_dep designer)
        $(add_qt_dep qtconcurrent)
        x11-proto/xproto
-       test? ( x11-libs/xcb-util-wm )
+       test? ( x11-libs/xcb-util-wm )
 "
 
 RESTRICT+=" test"

diff --git a/kde-plasma/kwin/kwin-5.10.5.ebuild 
b/kde-plasma/kwin/kwin-5.10.5.ebuild
index 587690a9e94..62acba894c7 100644
--- a/kde-plasma/kwin/kwin-5.10.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.10.5.ebuild
@@ -69,12 +69,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
-       multimedia? (
-               || (
-                       $(add_qt_dep qtmultimedia 'gstreamer,qml')
-                       $(add_qt_dep qtmultimedia 'gstreamer010,qml')
-               )
-       )
+       multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
        !<kde-apps/kdeartwork-meta-15.08.3-r1:4
        !kde-plasma/kwin:4
        !kde-plasma/systemsettings:4
@@ -83,7 +78,7 @@ DEPEND="${COMMON_DEPEND}
        $(add_qt_dep designer)
        $(add_qt_dep qtconcurrent)
        x11-proto/xproto
-       test? ( x11-libs/xcb-util-wm )
+       test? ( x11-libs/xcb-util-wm )
 "
 
 RESTRICT+=" test"