From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AAEA413877A for ; Mon, 11 Aug 2014 21:50:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2B10E0CB2; Mon, 11 Aug 2014 21:16:00 +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 526A8E0BEB for ; Mon, 11 Aug 2014 21:16:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19D643403B9 for ; Mon, 11 Aug 2014 21:15:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A939C18815 for ; Mon, 11 Aug 2014 21:15:57 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1407782012.0e9a773d3828845cfce1523031a60ed6fd0addc1.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kio-extras/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kio-extras/kio-extras-5.0.0.ebuild kde-base/kio-extras/kio-extras-5.0.9999.ebuild kde-base/kio-extras/kio-extras-9999.ebuild X-VCS-Directories: kde-base/kio-extras/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0e9a773d3828845cfce1523031a60ed6fd0addc1 X-VCS-Branch: master Date: Mon, 11 Aug 2014 21:15:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5de71c5d-ed38-4f5f-ae05-cb3bd1e2b470 X-Archives-Hash: 2605a4b485289d6c11d064c3bc48746f commit: 0e9a773d3828845cfce1523031a60ed6fd0addc1 Author: Matthew Dawson mjdsystems ca> AuthorDate: Mon Aug 11 07:16:00 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Aug 11 18:33:32 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0e9a773d [kde-base/kio-extras] Block kde-base/kcontrol:4 Block kde-base/kcontrol:4 due to a conflict in the handbooks. Package-Manager: portage-2.2.8-r1 --- kde-base/kio-extras/kio-extras-5.0.0.ebuild | 1 + kde-base/kio-extras/kio-extras-5.0.9999.ebuild | 1 + kde-base/kio-extras/kio-extras-9999.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/kde-base/kio-extras/kio-extras-5.0.0.ebuild b/kde-base/kio-extras/kio-extras-5.0.0.ebuild index 21c216e..ddbd9e5 100644 --- a/kde-base/kio-extras/kio-extras-5.0.0.ebuild +++ b/kde-base/kio-extras/kio-extras-5.0.0.ebuild @@ -48,6 +48,7 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) + !kde-base/kcontrol:4 !kde-base/kdebase-kioslaves:4[-minimal(-)] " DEPEND="${COMMON_DEPEND} diff --git a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild index 0bce8e3..fe9d5c6 100644 --- a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild +++ b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild @@ -48,6 +48,7 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) + !kde-base/kcontrol:4 !kde-base/kdebase-kioslaves:4[-minimal(-)] " DEPEND="${COMMON_DEPEND} diff --git a/kde-base/kio-extras/kio-extras-9999.ebuild b/kde-base/kio-extras/kio-extras-9999.ebuild index 0bce8e3..fe9d5c6 100644 --- a/kde-base/kio-extras/kio-extras-9999.ebuild +++ b/kde-base/kio-extras/kio-extras-9999.ebuild @@ -48,6 +48,7 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) + !kde-base/kcontrol:4 !kde-base/kdebase-kioslaves:4[-minimal(-)] " DEPEND="${COMMON_DEPEND}