| 1 |
commit: 58aaed8538c56bafb25d1b4b1d132cafd3c043f2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 9 01:41:37 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 9 01:52:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=58aaed85 |
| 7 |
|
| 8 |
kde-apps: Move remaining slot 4 blockers where they belong |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
kde-apps/akonadi/akonadi-18.12.1.ebuild | 1 + |
| 14 |
kde-apps/akonadi/akonadi-18.12.49.9999.ebuild | 1 + |
| 15 |
kde-apps/akregator/akregator-18.12.1.ebuild | 1 + |
| 16 |
kde-apps/akregator/akregator-18.12.49.9999.ebuild | 1 + |
| 17 |
kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild | 4 +++- |
| 18 |
kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild | 4 +++- |
| 19 |
kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild | 1 + |
| 20 |
kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild | 1 + |
| 21 |
kde-apps/kalarm/kalarm-18.12.1.ebuild | 1 + |
| 22 |
kde-apps/kalarm/kalarm-18.12.49.9999.ebuild | 1 + |
| 23 |
kde-apps/kjots/kjots-9999.ebuild | 6 +++--- |
| 24 |
kde-apps/kleopatra/kleopatra-18.12.1.ebuild | 1 + |
| 25 |
kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild | 1 + |
| 26 |
kde-apps/kmail/kmail-18.12.1.ebuild | 1 + |
| 27 |
kde-apps/kmail/kmail-18.12.49.9999.ebuild | 1 + |
| 28 |
kde-apps/knotes/knotes-18.12.1.ebuild | 1 + |
| 29 |
kde-apps/knotes/knotes-18.12.49.9999.ebuild | 1 + |
| 30 |
kde-apps/konqueror/konqueror-18.12.1.ebuild | 1 + |
| 31 |
kde-apps/konqueror/konqueror-18.12.49.9999.ebuild | 1 + |
| 32 |
kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild | 1 + |
| 33 |
kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild | 1 + |
| 34 |
kde-apps/kontact/kontact-18.12.1.ebuild | 1 + |
| 35 |
kde-apps/kontact/kontact-18.12.49.9999.ebuild | 1 + |
| 36 |
kde-apps/kopete/kopete-18.12.1.ebuild | 1 + |
| 37 |
kde-apps/kopete/kopete-18.12.49.9999.ebuild | 1 + |
| 38 |
kde-apps/korganizer/korganizer-18.12.1.ebuild | 1 + |
| 39 |
kde-apps/korganizer/korganizer-18.12.49.9999.ebuild | 1 + |
| 40 |
kde-apps/minuet/minuet-18.12.1.ebuild | 7 +++++-- |
| 41 |
kde-apps/minuet/minuet-18.12.49.9999.ebuild | 7 +++++-- |
| 42 |
29 files changed, 43 insertions(+), 9 deletions(-) |
| 43 |
|
| 44 |
diff --git a/kde-apps/akonadi/akonadi-18.12.1.ebuild b/kde-apps/akonadi/akonadi-18.12.1.ebuild |
| 45 |
index 1a0a2c2243..e80a4b6a95 100644 |
| 46 |
--- a/kde-apps/akonadi/akonadi-18.12.1.ebuild |
| 47 |
+++ b/kde-apps/akonadi/akonadi-18.12.1.ebuild |
| 48 |
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND} |
| 49 |
test? ( sys-apps/dbus ) |
| 50 |
" |
| 51 |
RDEPEND="${COMMON_DEPEND} |
| 52 |
+ !kde-apps/akonadi:4 |
| 53 |
!<kde-apps/kapptemplate-17.11.80 |
| 54 |
!kde-apps/kdepim-l10n |
| 55 |
!kde-apps/kdepimlibs |
| 56 |
|
| 57 |
diff --git a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild |
| 58 |
index 89eddb63f3..7ddc4ea8c4 100644 |
| 59 |
--- a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild |
| 60 |
+++ b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild |
| 61 |
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND} |
| 62 |
test? ( sys-apps/dbus ) |
| 63 |
" |
| 64 |
RDEPEND="${COMMON_DEPEND} |
| 65 |
+ !kde-apps/akonadi:4 |
| 66 |
!<kde-apps/kapptemplate-17.11.80 |
| 67 |
!kde-apps/kdepim-l10n |
| 68 |
!kde-apps/kdepimlibs |
| 69 |
|
| 70 |
diff --git a/kde-apps/akregator/akregator-18.12.1.ebuild b/kde-apps/akregator/akregator-18.12.1.ebuild |
| 71 |
index 0bb31dcaf0..2eaee653ee 100644 |
| 72 |
--- a/kde-apps/akregator/akregator-18.12.1.ebuild |
| 73 |
+++ b/kde-apps/akregator/akregator-18.12.1.ebuild |
| 74 |
@@ -51,5 +51,6 @@ DEPEND="${COMMON_DEPEND} |
| 75 |
dev-libs/grantlee:5 |
| 76 |
" |
| 77 |
RDEPEND="${COMMON_DEPEND} |
| 78 |
+ !kde-apps/akregator:4 |
| 79 |
!kde-apps/kdepim-l10n |
| 80 |
" |
| 81 |
|
| 82 |
diff --git a/kde-apps/akregator/akregator-18.12.49.9999.ebuild b/kde-apps/akregator/akregator-18.12.49.9999.ebuild |
| 83 |
index 89b106bdb7..3787c616d2 100644 |
| 84 |
--- a/kde-apps/akregator/akregator-18.12.49.9999.ebuild |
| 85 |
+++ b/kde-apps/akregator/akregator-18.12.49.9999.ebuild |
| 86 |
@@ -51,5 +51,6 @@ DEPEND="${COMMON_DEPEND} |
| 87 |
dev-libs/grantlee:5 |
| 88 |
" |
| 89 |
RDEPEND="${COMMON_DEPEND} |
| 90 |
+ !kde-apps/akregator:4 |
| 91 |
!kde-apps/kdepim-l10n |
| 92 |
" |
| 93 |
|
| 94 |
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild |
| 95 |
index 3a35111321..3ab410379f 100644 |
| 96 |
--- a/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild |
| 97 |
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild |
| 98 |
@@ -29,7 +29,9 @@ DEPEND=" |
| 99 |
media-libs/libvorbis |
| 100 |
) |
| 101 |
" |
| 102 |
-RDEPEND="${DEPEND}" |
| 103 |
+RDEPEND="${DEPEND} |
| 104 |
+ !kde-apps/audiocd-kio:4 |
| 105 |
+" |
| 106 |
|
| 107 |
src_configure() { |
| 108 |
local mycmakeargs=( |
| 109 |
|
| 110 |
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild |
| 111 |
index 11ec6e3bcd..99a384ff78 100644 |
| 112 |
--- a/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild |
| 113 |
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild |
| 114 |
@@ -29,7 +29,9 @@ DEPEND=" |
| 115 |
media-libs/libvorbis |
| 116 |
) |
| 117 |
" |
| 118 |
-RDEPEND="${DEPEND}" |
| 119 |
+RDEPEND="${DEPEND} |
| 120 |
+ !kde-apps/audiocd-kio:4 |
| 121 |
+" |
| 122 |
|
| 123 |
src_configure() { |
| 124 |
local mycmakeargs=( |
| 125 |
|
| 126 |
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild |
| 127 |
index 5389e3b6c7..765ce86305 100644 |
| 128 |
--- a/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild |
| 129 |
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild |
| 130 |
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND} |
| 131 |
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) |
| 132 |
" |
| 133 |
RDEPEND="${COMMON_DEPEND} |
| 134 |
+ !kde-apps/kaddressbook:4 |
| 135 |
!kde-apps/kdepim-l10n |
| 136 |
$(add_kdeapps_dep kdepim-runtime) |
| 137 |
" |
| 138 |
|
| 139 |
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild |
| 140 |
index 2b47f5f96b..8de675c691 100644 |
| 141 |
--- a/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild |
| 142 |
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild |
| 143 |
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND} |
| 144 |
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) |
| 145 |
" |
| 146 |
RDEPEND="${COMMON_DEPEND} |
| 147 |
+ !kde-apps/kaddressbook:4 |
| 148 |
!kde-apps/kdepim-l10n |
| 149 |
$(add_kdeapps_dep kdepim-runtime) |
| 150 |
" |
| 151 |
|
| 152 |
diff --git a/kde-apps/kalarm/kalarm-18.12.1.ebuild b/kde-apps/kalarm/kalarm-18.12.1.ebuild |
| 153 |
index 0eb0134d15..441a00da05 100644 |
| 154 |
--- a/kde-apps/kalarm/kalarm-18.12.1.ebuild |
| 155 |
+++ b/kde-apps/kalarm/kalarm-18.12.1.ebuild |
| 156 |
@@ -64,6 +64,7 @@ COMMON_DEPEND=" |
| 157 |
) |
| 158 |
" |
| 159 |
RDEPEND="${COMMON_DEPEND} |
| 160 |
+ !kde-apps/kalarm:4 |
| 161 |
!kde-apps/kdepim-l10n |
| 162 |
$(add_kdeapps_dep kdepim-runtime) |
| 163 |
" |
| 164 |
|
| 165 |
diff --git a/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild b/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild |
| 166 |
index 61a03a814f..b0914fc9c5 100644 |
| 167 |
--- a/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild |
| 168 |
+++ b/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild |
| 169 |
@@ -64,6 +64,7 @@ COMMON_DEPEND=" |
| 170 |
) |
| 171 |
" |
| 172 |
RDEPEND="${COMMON_DEPEND} |
| 173 |
+ !kde-apps/kalarm:4 |
| 174 |
!kde-apps/kdepim-l10n |
| 175 |
$(add_kdeapps_dep kdepim-runtime) |
| 176 |
" |
| 177 |
|
| 178 |
diff --git a/kde-apps/kjots/kjots-9999.ebuild b/kde-apps/kjots/kjots-9999.ebuild |
| 179 |
index 48c438a7e1..7b7e5eff14 100644 |
| 180 |
--- a/kde-apps/kjots/kjots-9999.ebuild |
| 181 |
+++ b/kde-apps/kjots/kjots-9999.ebuild |
| 182 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/utilities/kjots/" |
| 183 |
KEYWORDS="" |
| 184 |
IUSE="" |
| 185 |
|
| 186 |
-RDEPEND=" |
| 187 |
+DEPEND=" |
| 188 |
$(add_frameworks_dep kbookmarks) |
| 189 |
$(add_frameworks_dep kcmutils) |
| 190 |
$(add_frameworks_dep kconfig) |
| 191 |
@@ -36,6 +36,6 @@ RDEPEND=" |
| 192 |
dev-libs/grantlee:5 |
| 193 |
dev-libs/libxslt |
| 194 |
" |
| 195 |
-DEPEND="${RDEPEND} |
| 196 |
- sys-devel/gettext |
| 197 |
+RDEPEND="${DEPEND} |
| 198 |
+ !kde-apps/kjots:4 |
| 199 |
" |
| 200 |
|
| 201 |
diff --git a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild |
| 202 |
index 9d50875fbf..f846276c10 100644 |
| 203 |
--- a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild |
| 204 |
+++ b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild |
| 205 |
@@ -44,6 +44,7 @@ DEPEND=" |
| 206 |
" |
| 207 |
RDEPEND="${DEPEND} |
| 208 |
!kde-apps/kdepim-l10n |
| 209 |
+ !kde-apps/kleopatra:4 |
| 210 |
>=app-crypt/gnupg-2.1 |
| 211 |
app-crypt/paperkey |
| 212 |
" |
| 213 |
|
| 214 |
diff --git a/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild b/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild |
| 215 |
index a0bbc2a40a..7e48839bcd 100644 |
| 216 |
--- a/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild |
| 217 |
+++ b/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild |
| 218 |
@@ -44,6 +44,7 @@ DEPEND=" |
| 219 |
" |
| 220 |
RDEPEND="${DEPEND} |
| 221 |
!kde-apps/kdepim-l10n |
| 222 |
+ !kde-apps/kleopatra:4 |
| 223 |
>=app-crypt/gnupg-2.1 |
| 224 |
app-crypt/paperkey |
| 225 |
" |
| 226 |
|
| 227 |
diff --git a/kde-apps/kmail/kmail-18.12.1.ebuild b/kde-apps/kmail/kmail-18.12.1.ebuild |
| 228 |
index 14e6f0ac94..4827eb3089 100644 |
| 229 |
--- a/kde-apps/kmail/kmail-18.12.1.ebuild |
| 230 |
+++ b/kde-apps/kmail/kmail-18.12.1.ebuild |
| 231 |
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND} |
| 232 |
RDEPEND="${COMMON_DEPEND} |
| 233 |
!kde-apps/kdepim-common-libs:4 |
| 234 |
!kde-apps/kdepim-l10n |
| 235 |
+ !kde-apps/kmail:4 |
| 236 |
!kde-apps/ktnef |
| 237 |
$(add_kdeapps_dep kdepim-runtime) |
| 238 |
$(add_kdeapps_dep kmail-account-wizard) |
| 239 |
|
| 240 |
diff --git a/kde-apps/kmail/kmail-18.12.49.9999.ebuild b/kde-apps/kmail/kmail-18.12.49.9999.ebuild |
| 241 |
index 45fb30d520..ff8a7efea7 100644 |
| 242 |
--- a/kde-apps/kmail/kmail-18.12.49.9999.ebuild |
| 243 |
+++ b/kde-apps/kmail/kmail-18.12.49.9999.ebuild |
| 244 |
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND} |
| 245 |
RDEPEND="${COMMON_DEPEND} |
| 246 |
!kde-apps/kdepim-common-libs:4 |
| 247 |
!kde-apps/kdepim-l10n |
| 248 |
+ !kde-apps/kmail:4 |
| 249 |
!kde-apps/ktnef |
| 250 |
$(add_kdeapps_dep kdepim-runtime) |
| 251 |
$(add_kdeapps_dep kmail-account-wizard) |
| 252 |
|
| 253 |
diff --git a/kde-apps/knotes/knotes-18.12.1.ebuild b/kde-apps/knotes/knotes-18.12.1.ebuild |
| 254 |
index 2c843e3002..733b2b997f 100644 |
| 255 |
--- a/kde-apps/knotes/knotes-18.12.1.ebuild |
| 256 |
+++ b/kde-apps/knotes/knotes-18.12.1.ebuild |
| 257 |
@@ -58,6 +58,7 @@ DEPEND=" |
| 258 |
" |
| 259 |
RDEPEND="${DEPEND} |
| 260 |
!kde-apps/kdepim-l10n |
| 261 |
+ !kde-apps/knotes:4 |
| 262 |
$(add_kdeapps_dep kdepim-runtime) |
| 263 |
" |
| 264 |
|
| 265 |
|
| 266 |
diff --git a/kde-apps/knotes/knotes-18.12.49.9999.ebuild b/kde-apps/knotes/knotes-18.12.49.9999.ebuild |
| 267 |
index 8ae6b59c3d..6e8382a51d 100644 |
| 268 |
--- a/kde-apps/knotes/knotes-18.12.49.9999.ebuild |
| 269 |
+++ b/kde-apps/knotes/knotes-18.12.49.9999.ebuild |
| 270 |
@@ -58,6 +58,7 @@ DEPEND=" |
| 271 |
" |
| 272 |
RDEPEND="${DEPEND} |
| 273 |
!kde-apps/kdepim-l10n |
| 274 |
+ !kde-apps/knotes:4 |
| 275 |
$(add_kdeapps_dep kdepim-runtime) |
| 276 |
" |
| 277 |
|
| 278 |
|
| 279 |
diff --git a/kde-apps/konqueror/konqueror-18.12.1.ebuild b/kde-apps/konqueror/konqueror-18.12.1.ebuild |
| 280 |
index baabe39de7..407768a1f1 100644 |
| 281 |
--- a/kde-apps/konqueror/konqueror-18.12.1.ebuild |
| 282 |
+++ b/kde-apps/konqueror/konqueror-18.12.1.ebuild |
| 283 |
@@ -60,6 +60,7 @@ DEPEND="${COMMON_DEPEND} |
| 284 |
RDEPEND="${COMMON_DEPEND} |
| 285 |
!kde-apps/kfmclient:4 |
| 286 |
!kde-apps/konq-plugins |
| 287 |
+ !kde-apps/konqueror:4 |
| 288 |
!kde-apps/libkonq:5 |
| 289 |
$(add_kdeapps_dep kfind) |
| 290 |
$(add_plasma_dep kde-cli-tools) |
| 291 |
|
| 292 |
diff --git a/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild b/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild |
| 293 |
index 9e76874a1a..08966366c4 100644 |
| 294 |
--- a/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild |
| 295 |
+++ b/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild |
| 296 |
@@ -60,6 +60,7 @@ DEPEND="${COMMON_DEPEND} |
| 297 |
RDEPEND="${COMMON_DEPEND} |
| 298 |
!kde-apps/kfmclient:4 |
| 299 |
!kde-apps/konq-plugins |
| 300 |
+ !kde-apps/konqueror:4 |
| 301 |
!kde-apps/libkonq:5 |
| 302 |
$(add_kdeapps_dep kfind) |
| 303 |
$(add_plasma_dep kde-cli-tools) |
| 304 |
|
| 305 |
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild |
| 306 |
index 536e8f06fe..6b040a998b 100644 |
| 307 |
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild |
| 308 |
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild |
| 309 |
@@ -27,6 +27,7 @@ DEPEND=" |
| 310 |
" |
| 311 |
RDEPEND="${DEPEND} |
| 312 |
!kde-apps/kdepim-l10n |
| 313 |
+ !kde-apps/konsolekalendar:4 |
| 314 |
" |
| 315 |
|
| 316 |
src_prepare() { |
| 317 |
|
| 318 |
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild |
| 319 |
index c451ebf790..56d16ac77e 100644 |
| 320 |
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild |
| 321 |
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild |
| 322 |
@@ -27,6 +27,7 @@ DEPEND=" |
| 323 |
" |
| 324 |
RDEPEND="${DEPEND} |
| 325 |
!kde-apps/kdepim-l10n |
| 326 |
+ !kde-apps/konsolekalendar:4 |
| 327 |
" |
| 328 |
|
| 329 |
src_prepare() { |
| 330 |
|
| 331 |
diff --git a/kde-apps/kontact/kontact-18.12.1.ebuild b/kde-apps/kontact/kontact-18.12.1.ebuild |
| 332 |
index 20b93280af..31acd1a9fa 100644 |
| 333 |
--- a/kde-apps/kontact/kontact-18.12.1.ebuild |
| 334 |
+++ b/kde-apps/kontact/kontact-18.12.1.ebuild |
| 335 |
@@ -41,4 +41,5 @@ DEPEND=" |
| 336 |
" |
| 337 |
RDEPEND="${DEPEND} |
| 338 |
!kde-apps/kdepim-l10n |
| 339 |
+ !kde-apps/kontact:4 |
| 340 |
" |
| 341 |
|
| 342 |
diff --git a/kde-apps/kontact/kontact-18.12.49.9999.ebuild b/kde-apps/kontact/kontact-18.12.49.9999.ebuild |
| 343 |
index 2f238309d7..f83f171eec 100644 |
| 344 |
--- a/kde-apps/kontact/kontact-18.12.49.9999.ebuild |
| 345 |
+++ b/kde-apps/kontact/kontact-18.12.49.9999.ebuild |
| 346 |
@@ -41,4 +41,5 @@ DEPEND=" |
| 347 |
" |
| 348 |
RDEPEND="${DEPEND} |
| 349 |
!kde-apps/kdepim-l10n |
| 350 |
+ !kde-apps/kontact:4 |
| 351 |
" |
| 352 |
|
| 353 |
diff --git a/kde-apps/kopete/kopete-18.12.1.ebuild b/kde-apps/kopete/kopete-18.12.1.ebuild |
| 354 |
index e48a51d593..2738349796 100644 |
| 355 |
--- a/kde-apps/kopete/kopete-18.12.1.ebuild |
| 356 |
+++ b/kde-apps/kopete/kopete-18.12.1.ebuild |
| 357 |
@@ -117,6 +117,7 @@ COMMONDEPEND=" |
| 358 |
" |
| 359 |
RDEPEND="${COMMONDEPEND} |
| 360 |
!kde-apps/kde4-l10n |
| 361 |
+ !kde-apps/kopete:4 |
| 362 |
latex? ( |
| 363 |
|| ( |
| 364 |
media-gfx/imagemagick |
| 365 |
|
| 366 |
diff --git a/kde-apps/kopete/kopete-18.12.49.9999.ebuild b/kde-apps/kopete/kopete-18.12.49.9999.ebuild |
| 367 |
index 767193885c..833652e6d5 100644 |
| 368 |
--- a/kde-apps/kopete/kopete-18.12.49.9999.ebuild |
| 369 |
+++ b/kde-apps/kopete/kopete-18.12.49.9999.ebuild |
| 370 |
@@ -117,6 +117,7 @@ COMMONDEPEND=" |
| 371 |
" |
| 372 |
RDEPEND="${COMMONDEPEND} |
| 373 |
!kde-apps/kde4-l10n |
| 374 |
+ !kde-apps/kopete:4 |
| 375 |
latex? ( |
| 376 |
|| ( |
| 377 |
media-gfx/imagemagick |
| 378 |
|
| 379 |
diff --git a/kde-apps/korganizer/korganizer-18.12.1.ebuild b/kde-apps/korganizer/korganizer-18.12.1.ebuild |
| 380 |
index a631ad0154..baee0100f6 100644 |
| 381 |
--- a/kde-apps/korganizer/korganizer-18.12.1.ebuild |
| 382 |
+++ b/kde-apps/korganizer/korganizer-18.12.1.ebuild |
| 383 |
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND} |
| 384 |
RDEPEND="${COMMON_DEPEND} |
| 385 |
!kde-apps/kdepim-common-libs:4 |
| 386 |
!kde-apps/kdepim-l10n |
| 387 |
+ !kde-apps/korganizer:4 |
| 388 |
$(add_kdeapps_dep kdepim-runtime) |
| 389 |
" |
| 390 |
|
| 391 |
|
| 392 |
diff --git a/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild b/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild |
| 393 |
index a388d91f68..e5c27357b6 100644 |
| 394 |
--- a/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild |
| 395 |
+++ b/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild |
| 396 |
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND} |
| 397 |
RDEPEND="${COMMON_DEPEND} |
| 398 |
!kde-apps/kdepim-common-libs:4 |
| 399 |
!kde-apps/kdepim-l10n |
| 400 |
+ !kde-apps/korganizer:4 |
| 401 |
$(add_kdeapps_dep kdepim-runtime) |
| 402 |
" |
| 403 |
|
| 404 |
|
| 405 |
diff --git a/kde-apps/minuet/minuet-18.12.1.ebuild b/kde-apps/minuet/minuet-18.12.1.ebuild |
| 406 |
index 790d4e71ff..d9136c0bf4 100644 |
| 407 |
--- a/kde-apps/minuet/minuet-18.12.1.ebuild |
| 408 |
+++ b/kde-apps/minuet/minuet-18.12.1.ebuild |
| 409 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://minuet.kde.org/" |
| 410 |
KEYWORDS="~amd64 ~x86" |
| 411 |
IUSE="" |
| 412 |
|
| 413 |
-RDEPEND=" |
| 414 |
+COMMON_DEPEND=" |
| 415 |
$(add_frameworks_dep kcoreaddons) |
| 416 |
$(add_frameworks_dep kcrash) |
| 417 |
$(add_frameworks_dep ki18n) |
| 418 |
@@ -21,6 +21,9 @@ RDEPEND=" |
| 419 |
$(add_qt_dep qtquickcontrols2) |
| 420 |
media-sound/fluidsynth |
| 421 |
" |
| 422 |
-DEPEND="${RDEPEND} |
| 423 |
+DEPEND="${COMMON_DEPEND} |
| 424 |
virtual/pkgconfig |
| 425 |
" |
| 426 |
+RDEPEND="${COMMON_DEPEND} |
| 427 |
+ !kde-apps/minuet:4 |
| 428 |
+" |
| 429 |
|
| 430 |
diff --git a/kde-apps/minuet/minuet-18.12.49.9999.ebuild b/kde-apps/minuet/minuet-18.12.49.9999.ebuild |
| 431 |
index b1f25f1391..310d404ed7 100644 |
| 432 |
--- a/kde-apps/minuet/minuet-18.12.49.9999.ebuild |
| 433 |
+++ b/kde-apps/minuet/minuet-18.12.49.9999.ebuild |
| 434 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://minuet.kde.org/" |
| 435 |
KEYWORDS="" |
| 436 |
IUSE="" |
| 437 |
|
| 438 |
-RDEPEND=" |
| 439 |
+COMMON_DEPEND=" |
| 440 |
$(add_frameworks_dep kcoreaddons) |
| 441 |
$(add_frameworks_dep kcrash) |
| 442 |
$(add_frameworks_dep ki18n) |
| 443 |
@@ -21,6 +21,9 @@ RDEPEND=" |
| 444 |
$(add_qt_dep qtquickcontrols2) |
| 445 |
media-sound/fluidsynth |
| 446 |
" |
| 447 |
-DEPEND="${RDEPEND} |
| 448 |
+DEPEND="${COMMON_DEPEND} |
| 449 |
virtual/pkgconfig |
| 450 |
" |
| 451 |
+RDEPEND="${COMMON_DEPEND} |
| 452 |
+ !kde-apps/minuet:4 |
| 453 |
+" |
Archives