From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 2 Sep 2017 14:05:01 +0000 (+0200)
Subject: kde-plasma/kwin: Drop deprecated dev-qt/qtmultimedia[gstreamer010] option
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c231d199607b80abe3367967186bad8edc67bd54;p=gentoo.git

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

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---

diff --git a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
index 3ab1a1d6f51c..f98474e59683 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 587690a9e94b..62acba894c79 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"