Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/
Date: Sat, 02 Sep 2017 14:10:39
Message-Id: 1504361354.c231d199607b80abe3367967186bad8edc67bd54.asturm@gentoo
1 commit: c231d199607b80abe3367967186bad8edc67bd54
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 2 14:05:01 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 2 14:09:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c231d199
7
8 kde-plasma/kwin: Drop deprecated dev-qt/qtmultimedia[gstreamer010] option
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 kde-plasma/kwin/kwin-5.10.4-r1.ebuild | 9 ++-------
13 kde-plasma/kwin/kwin-5.10.5.ebuild | 9 ++-------
14 2 files changed, 4 insertions(+), 14 deletions(-)
15
16 diff --git a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
17 index 3ab1a1d6f51..f98474e5968 100644
18 --- a/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
19 +++ b/kde-plasma/kwin/kwin-5.10.4-r1.ebuild
20 @@ -68,12 +68,7 @@ COMMON_DEPEND="
21 "
22 RDEPEND="${COMMON_DEPEND}
23 $(add_plasma_dep kde-cli-tools)
24 - multimedia? (
25 - || (
26 - $(add_qt_dep qtmultimedia 'gstreamer,qml')
27 - $(add_qt_dep qtmultimedia 'gstreamer010,qml')
28 - )
29 - )
30 + multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
31 !<kde-apps/kdeartwork-meta-15.08.3-r1:4
32 !kde-plasma/kwin:4
33 !kde-plasma/systemsettings:4
34 @@ -82,7 +77,7 @@ DEPEND="${COMMON_DEPEND}
35 $(add_qt_dep designer)
36 $(add_qt_dep qtconcurrent)
37 x11-proto/xproto
38 - test? ( x11-libs/xcb-util-wm )
39 + test? ( x11-libs/xcb-util-wm )
40 "
41
42 RESTRICT+=" test"
43
44 diff --git a/kde-plasma/kwin/kwin-5.10.5.ebuild b/kde-plasma/kwin/kwin-5.10.5.ebuild
45 index 587690a9e94..62acba894c7 100644
46 --- a/kde-plasma/kwin/kwin-5.10.5.ebuild
47 +++ b/kde-plasma/kwin/kwin-5.10.5.ebuild
48 @@ -69,12 +69,7 @@ COMMON_DEPEND="
49 "
50 RDEPEND="${COMMON_DEPEND}
51 $(add_plasma_dep kde-cli-tools)
52 - multimedia? (
53 - || (
54 - $(add_qt_dep qtmultimedia 'gstreamer,qml')
55 - $(add_qt_dep qtmultimedia 'gstreamer010,qml')
56 - )
57 - )
58 + multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
59 !<kde-apps/kdeartwork-meta-15.08.3-r1:4
60 !kde-plasma/kwin:4
61 !kde-plasma/systemsettings:4
62 @@ -83,7 +78,7 @@ DEPEND="${COMMON_DEPEND}
63 $(add_qt_dep designer)
64 $(add_qt_dep qtconcurrent)
65 x11-proto/xproto
66 - test? ( x11-libs/xcb-util-wm )
67 + test? ( x11-libs/xcb-util-wm )
68 "
69
70 RESTRICT+=" test"