1 |
commit: 368f7fb2208055025d17f3cc08b925490baf413a |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 3 06:45:57 2014 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 3 06:45:57 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=368f7fb2 |
7 |
|
8 |
[kde-base] Add appropriate kde-apps blockers. |
9 |
|
10 |
--- |
11 |
kde-base/kinfocenter/kinfocenter-5.1.1.ebuild | 1 + |
12 |
kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild | 1 + |
13 |
kde-base/kinfocenter/kinfocenter-9999.ebuild | 1 + |
14 |
kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild | 2 ++ |
15 |
kde-base/kio-extras/kio-extras-5.1.9999.ebuild | 2 ++ |
16 |
kde-base/kio-extras/kio-extras-9999.ebuild | 2 ++ |
17 |
kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild | 6 +++++- |
18 |
kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild | 6 +++++- |
19 |
kde-base/plasma-desktop/plasma-desktop-9999.ebuild | 6 +++++- |
20 |
9 files changed, 24 insertions(+), 3 deletions(-) |
21 |
|
22 |
diff --git a/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild b/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild |
23 |
index f00ea90..f626b6f 100644 |
24 |
--- a/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild |
25 |
+++ b/kde-base/kinfocenter/kinfocenter-5.1.1.ebuild |
26 |
@@ -48,6 +48,7 @@ RDEPEND=" |
27 |
samba? ( net-fs/samba[server(+)] ) |
28 |
wayland? ( $(add_kdebase_dep kwayland) ) |
29 |
X? ( x11-libs/libX11 ) |
30 |
+ !kde-apps/kcontrol:4 |
31 |
!kde-base/kcontrol:4 |
32 |
!kde-base/kinfocenter:4 |
33 |
" |
34 |
|
35 |
diff --git a/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild b/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild |
36 |
index 491691e..0bdc24b 100644 |
37 |
--- a/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild |
38 |
+++ b/kde-base/kinfocenter/kinfocenter-5.1.9999.ebuild |
39 |
@@ -48,6 +48,7 @@ RDEPEND=" |
40 |
samba? ( net-fs/samba[server(+)] ) |
41 |
wayland? ( $(add_kdebase_dep kwayland) ) |
42 |
X? ( x11-libs/libX11 ) |
43 |
+ !kde-apps/kcontrol:4 |
44 |
!kde-base/kcontrol:4 |
45 |
!kde-base/kinfocenter:4 |
46 |
" |
47 |
|
48 |
diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild b/kde-base/kinfocenter/kinfocenter-9999.ebuild |
49 |
index 491691e..0bdc24b 100644 |
50 |
--- a/kde-base/kinfocenter/kinfocenter-9999.ebuild |
51 |
+++ b/kde-base/kinfocenter/kinfocenter-9999.ebuild |
52 |
@@ -48,6 +48,7 @@ RDEPEND=" |
53 |
samba? ( net-fs/samba[server(+)] ) |
54 |
wayland? ( $(add_kdebase_dep kwayland) ) |
55 |
X? ( x11-libs/libX11 ) |
56 |
+ !kde-apps/kcontrol:4 |
57 |
!kde-base/kcontrol:4 |
58 |
!kde-base/kinfocenter:4 |
59 |
" |
60 |
|
61 |
diff --git a/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild b/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild |
62 |
index b8ed91a..0d0c1ca 100644 |
63 |
--- a/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild |
64 |
+++ b/kde-base/kio-extras/kio-extras-5.1.1-r1.ebuild |
65 |
@@ -49,6 +49,8 @@ COMMON_DEPEND=" |
66 |
" |
67 |
RDEPEND="${COMMON_DEPEND} |
68 |
$(add_frameworks_dep kded) |
69 |
+ !kde-apps/kcontrol:4 |
70 |
+ !kde-apps/kdebase-kioslaves:4[-minimal(-)] |
71 |
!kde-base/kcontrol:4 |
72 |
!kde-base/kdebase-kioslaves:4[-minimal(-)] |
73 |
" |
74 |
|
75 |
diff --git a/kde-base/kio-extras/kio-extras-5.1.9999.ebuild b/kde-base/kio-extras/kio-extras-5.1.9999.ebuild |
76 |
index 0984633..7950c82 100644 |
77 |
--- a/kde-base/kio-extras/kio-extras-5.1.9999.ebuild |
78 |
+++ b/kde-base/kio-extras/kio-extras-5.1.9999.ebuild |
79 |
@@ -49,6 +49,8 @@ COMMON_DEPEND=" |
80 |
" |
81 |
RDEPEND="${COMMON_DEPEND} |
82 |
$(add_frameworks_dep kded) |
83 |
+ !kde-apps/kcontrol:4 |
84 |
+ !kde-apps/kdebase-kioslaves:4[-minimal(-)] |
85 |
!kde-base/kcontrol:4 |
86 |
!kde-base/kdebase-kioslaves:4[-minimal(-)] |
87 |
" |
88 |
|
89 |
diff --git a/kde-base/kio-extras/kio-extras-9999.ebuild b/kde-base/kio-extras/kio-extras-9999.ebuild |
90 |
index 0984633..7950c82 100644 |
91 |
--- a/kde-base/kio-extras/kio-extras-9999.ebuild |
92 |
+++ b/kde-base/kio-extras/kio-extras-9999.ebuild |
93 |
@@ -49,6 +49,8 @@ COMMON_DEPEND=" |
94 |
" |
95 |
RDEPEND="${COMMON_DEPEND} |
96 |
$(add_frameworks_dep kded) |
97 |
+ !kde-apps/kcontrol:4 |
98 |
+ !kde-apps/kdebase-kioslaves:4[-minimal(-)] |
99 |
!kde-base/kcontrol:4 |
100 |
!kde-base/kdebase-kioslaves:4[-minimal(-)] |
101 |
" |
102 |
|
103 |
diff --git a/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild b/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild |
104 |
index cc6bca6..df925e9 100644 |
105 |
--- a/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild |
106 |
+++ b/kde-base/plasma-desktop/plasma-desktop-5.1.1.ebuild |
107 |
@@ -90,9 +90,13 @@ COMMON_DEPEND=" |
108 |
RDEPEND="${COMMON_DEPEND} |
109 |
$(add_frameworks_dep kded) |
110 |
sys-apps/accountsservice |
111 |
+ !kde-apps/attica:4 |
112 |
!kde-base/attica:4 |
113 |
+ !kde-apps/kcontrol:4 |
114 |
!kde-base/kcontrol:4 |
115 |
- !kde-base/knetattach:4 |
116 |
+ !kde-apps/knetattach:4[-handbook(-)] |
117 |
+ !kde-base/knetattach:4[-handbook(-)] |
118 |
+ !kde-apps/kdepasswd:4 |
119 |
!kde-base/kdepasswd:4 |
120 |
!kde-base/solid-actions-kcm:4 |
121 |
!kde-base/plasma-workspace:4 |
122 |
|
123 |
diff --git a/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild b/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild |
124 |
index d6884e4..3693803 100644 |
125 |
--- a/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild |
126 |
+++ b/kde-base/plasma-desktop/plasma-desktop-5.1.9999.ebuild |
127 |
@@ -90,9 +90,13 @@ COMMON_DEPEND=" |
128 |
RDEPEND="${COMMON_DEPEND} |
129 |
$(add_frameworks_dep kded) |
130 |
sys-apps/accountsservice |
131 |
+ !kde-apps/attica:4 |
132 |
!kde-base/attica:4 |
133 |
+ !kde-apps/kcontrol:4 |
134 |
!kde-base/kcontrol:4 |
135 |
- !kde-base/knetattach:4 |
136 |
+ !kde-apps/knetattach:4[-handbook(-)] |
137 |
+ !kde-base/knetattach:4[-handbook(-)] |
138 |
+ !kde-apps/kdepasswd:4 |
139 |
!kde-base/kdepasswd:4 |
140 |
!kde-base/solid-actions-kcm:4 |
141 |
!kde-base/plasma-workspace:4 |
142 |
|
143 |
diff --git a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild |
144 |
index d6884e4..3693803 100644 |
145 |
--- a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild |
146 |
+++ b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild |
147 |
@@ -90,9 +90,13 @@ COMMON_DEPEND=" |
148 |
RDEPEND="${COMMON_DEPEND} |
149 |
$(add_frameworks_dep kded) |
150 |
sys-apps/accountsservice |
151 |
+ !kde-apps/attica:4 |
152 |
!kde-base/attica:4 |
153 |
+ !kde-apps/kcontrol:4 |
154 |
!kde-base/kcontrol:4 |
155 |
- !kde-base/knetattach:4 |
156 |
+ !kde-apps/knetattach:4[-handbook(-)] |
157 |
+ !kde-base/knetattach:4[-handbook(-)] |
158 |
+ !kde-apps/kdepasswd:4 |
159 |
!kde-base/kdepasswd:4 |
160 |
!kde-base/solid-actions-kcm:4 |
161 |
!kde-base/plasma-workspace:4 |