| 1 |
commit: 56465b29dec3343c508afbf33b0fe6b0df632332 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 8 23:22:35 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 9 06:50:29 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=56465b29 |
| 7 |
|
| 8 |
kde-frameworks/kio: Add block against kde-apps/libkonq[-minimal] |
| 9 |
|
| 10 |
File collisions in the template directory, see also: |
| 11 |
https://quickgit.kde.org/?p=kio.git&a=commit&h=1b98a313983b75f3340639e5cd9519c56fca7113 |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.22 |
| 14 |
|
| 15 |
kde-frameworks/kio/kio-9999.ebuild | 7 +++++-- |
| 16 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild |
| 19 |
index a6aa39f..91d7b8c 100644 |
| 20 |
--- a/kde-frameworks/kio/kio-9999.ebuild |
| 21 |
+++ b/kde-frameworks/kio/kio-9999.ebuild |
| 22 |
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+" |
| 23 |
KEYWORDS="" |
| 24 |
IUSE="acl kerberos X" |
| 25 |
|
| 26 |
-RDEPEND=" |
| 27 |
+COMMON_DEPEND=" |
| 28 |
$(add_frameworks_dep karchive) |
| 29 |
$(add_frameworks_dep kbookmarks) |
| 30 |
$(add_frameworks_dep kcodecs) |
| 31 |
@@ -49,7 +49,7 @@ RDEPEND=" |
| 32 |
kerberos? ( virtual/krb5 ) |
| 33 |
X? ( dev-qt/qtx11extras:5 ) |
| 34 |
" |
| 35 |
-DEPEND="${RDEPEND} |
| 36 |
+DEPEND="${COMMON_DEPEND} |
| 37 |
$(add_frameworks_dep kdoctools) |
| 38 |
dev-qt/qtconcurrent:5 |
| 39 |
test? ( sys-libs/zlib ) |
| 40 |
@@ -62,6 +62,9 @@ DEPEND="${RDEPEND} |
| 41 |
PDEPEND=" |
| 42 |
$(add_frameworks_dep kded) |
| 43 |
" |
| 44 |
+RDEPEND="${COMMON_DEPEND} |
| 45 |
+ !kde-apps/libkonq[-minimal(-)] |
| 46 |
+" |
| 47 |
|
| 48 |
# tests hang |
| 49 |
RESTRICT="test" |
Archives