Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/
Date: Thu, 03 Sep 2015 19:29:59
Message-Id: 1441308527.baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6.kensington@gentoo
1 commit: baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 3 19:28:01 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 3 19:28:47 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=baa1be65
7
8 kde-plasma/plasma-nm: Fix RDEPEND !{kde-base => kde-misc}/plasma-nm
9
10 File collisions:
11
12 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement-kded.mo
13 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
14 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
15 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openswanui.mo
16 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
17 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
18 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
19 /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo
20
21 Package-Manager: portage-2.2.20.1
22
23 kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild | 2 +-
24 kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 2 +-
25 2 files changed, 2 insertions(+), 2 deletions(-)
26
27 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild
28 index 77a0fd7..d26481f 100644
29 --- a/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild
30 +++ b/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild
31 @@ -50,7 +50,7 @@ DEPEND="
32 )
33 "
34 RDEPEND="${DEPEND}
35 - !kde-base/plasma-nm
36 + !kde-misc/plasma-nm
37 "
38
39 src_configure() {
40
41 diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
42 index 77a0fd7..d26481f 100644
43 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
44 +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
45 @@ -50,7 +50,7 @@ DEPEND="
46 )
47 "
48 RDEPEND="${DEPEND}
49 - !kde-base/plasma-nm
50 + !kde-misc/plasma-nm
51 "
52
53 src_configure() {