Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/plasma/
Date: Thu, 29 Sep 2016 11:39:27
Message-Id: 1475149146.6a029ea00735eaeedf07879b987df4be5bca52b0.kensington@gentoo
1 commit: 6a029ea00735eaeedf07879b987df4be5bca52b0
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 29 08:43:31 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 11:39:06 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a029ea0
7
8 profiles: Update plasma package.use
9
10 Changes:
11 separated ^^ ( qt4 qt5 ) cases from qt4? ( !qt5 )
12 added version info where newer packages have conflict resolved
13 Added:
14 >=net-misc/x2goclient-4.0.5.2 -qt4
15 Dropped:
16 kde-apps/kde4-l10n minimal (default +minimal in ebuild)
17
18 profiles/targets/desktop/plasma/package.use | 34 +++++++++++++++--------------
19 1 file changed, 18 insertions(+), 16 deletions(-)
20
21 diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
22 index 171e1f1..57ebd98 100644
23 --- a/profiles/targets/desktop/plasma/package.use
24 +++ b/profiles/targets/desktop/plasma/package.use
25 @@ -47,38 +47,40 @@ media-libs/mesa egl wayland
26 # Required by kde-apps/kdenlive
27 >=media-libs/mlt-0.9.8-r2 kdenlive melt
28
29 +# Required by app-office/libreoffice
30 +media-libs/phonon designer
31 +
32 # Allow certain KDE 4 components to be coinstalled with Plasma 5
33 <dev-util/kdevelop-4.8.0 -gdbui
34 -kde-apps/kde4-l10n minimal
35 kde-apps/solid-runtime -bluetooth
36 kde-base/baloo minimal
37 net-p2p/ktorrent:4 -plasma
38 sys-auth/polkit-kde-agent minimal
39
40 -# Required by app-office/libreoffice
41 -media-libs/phonon designer
42 -
43 -# Fix REQUIRED_USE conflicts: qt5? ( !qt4 )
44 ->=app-crypt/pinentry-0.9.6-r5 -qt4
45 +# FIXME: unnecessary REQUIRED_USE ^^ ( qt4 qt5 )
46 >=app-office/texmaker-4.4.1 -qt4
47 >=app-office/texstudio-2.9.4 -qt4
48 -app-text/qpdfview -qt4
49 dev-db/sqlitebrowser -qt4
50 ->=dev-games/openscenegraph-3.2.1-r1 -qt4
51 >=dev-libs/quazip-0.7.1 -qt4
52 +>=media-sound/mixxx-2.0.0-r1 -qt4
53 +net-misc/owncloud-client -qt4
54 +>=net-misc/x2goclient-4.0.5.2 -qt4
55 +net-news/rssguard -qt4
56 +net-p2p/bitcoin-qt -qt4
57 +<net-p2p/qbittorrent-3.3.4-r1 -qt4
58 +>=sci-geosciences/merkaartor-0.18.2 -qrcode -qt4
59 +
60 +# Fix REQUIRED_USE conflicts: qt5? ( !qt4 )
61 +>=app-crypt/pinentry-0.9.6-r5 -qt4
62 +<app-text/qpdfview-0.4.16 -qt4
63 +>=dev-games/openscenegraph-3.2.1-r1 -qt4
64 >=kde-misc/kdiff3-0.9.98-r1 -kde -qt4
65 >=media-libs/opencv-2.4.12-r1 -qt4
66 >=media-sound/cantata-2.0.1 -kde
67 ->=media-sound/mixxx-2.0.0-r1 -qt4
68 ->=media-video/smplayer-14.9.0.6690 -qt4
69 +<media-video/smplayer-16.4.0-r2 -qt4
70 media-video/vlc -qt4
71 net-analyzer/wireshark -qt4
72 -net-misc/owncloud-client -qt4
73 -net-news/rssguard -qt4
74 -net-p2p/bitcoin-qt -qt4
75 ->=net-p2p/qbittorrent-3.2.0 -qt4
76 net-p2p/transmission -qt4
77 >=net-print/hplip-3.16.5 -qt4
78 >=net-wireless/wpa_supplicant-2.5 -qt4
79 ->=sci-geosciences/merkaartor-0.18.2 -qrcode -qt4
80 -www-client/qupzilla -kde -qt4
81 +<www-client/qupzilla-2.0.0 -kde -qt4