From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-839138-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id CFCF313888F
for <garchives@archives.gentoo.org>; Fri, 9 Oct 2015 06:50:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D1A5CE0833;
Fri, 9 Oct 2015 06:50:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 731CBE0833
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Oct 2015 06:50:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 744053406DD
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Oct 2015 06:50:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 247B0D17
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Oct 2015 06:50:40 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1444373429.56465b29dec3343c508afbf33b0fe6b0df632332.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-frameworks/kio/kio-9999.ebuild
X-VCS-Directories: kde-frameworks/kio/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 56465b29dec3343c508afbf33b0fe6b0df632332
X-VCS-Branch: master
Date: Fri, 9 Oct 2015 06:50:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6ece991c-5b97-4972-aa86-a40f7d397c48
X-Archives-Hash: 7f2e8e030f94cfc53d70205da0e2554e
commit: 56465b29dec3343c508afbf33b0fe6b0df632332
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Oct 8 23:22:35 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 06:50:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=56465b29
kde-frameworks/kio: Add block against kde-apps/libkonq[-minimal]
File collisions in the template directory, see also:
https://quickgit.kde.org/?p=kio.git&a=commit&h=1b98a313983b75f3340639e5cd9519c56fca7113
Package-Manager: portage-2.2.22
kde-frameworks/kio/kio-9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index a6aa39f..91d7b8c 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
KEYWORDS=""
IUSE="acl kerberos X"
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcodecs)
@@ -49,7 +49,7 @@ RDEPEND="
kerberos? ( virtual/krb5 )
X? ( dev-qt/qtx11extras:5 )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kdoctools)
dev-qt/qtconcurrent:5
test? ( sys-libs/zlib )
@@ -62,6 +62,9 @@ DEPEND="${RDEPEND}
PDEPEND="
$(add_frameworks_dep kded)
"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/libkonq[-minimal(-)]
+"
# tests hang
RESTRICT="test"