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 16F8213877A for ; Mon, 11 Aug 2014 21:50:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34D30E0CA0; Mon, 11 Aug 2014 21:16:01 +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 8E8ACE0BEB 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 3E4193402B7 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 D37E91881B 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: <1407782407.0ff5601d655fecb6021f847e296dc44111544c15.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/khotkeys/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/khotkeys/khotkeys-5.0.0.ebuild kde-base/khotkeys/khotkeys-5.0.9999.ebuild kde-base/khotkeys/khotkeys-9999.ebuild X-VCS-Directories: kde-base/khotkeys/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0ff5601d655fecb6021f847e296dc44111544c15 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: 01eef7ec-965c-4718-9cfa-7e4f03953580 X-Archives-Hash: 03fed7a4c8e5f2599a4134702ca81642 commit: 0ff5601d655fecb6021f847e296dc44111544c15 Author: Matthew Dawson mjdsystems ca> AuthorDate: Mon Aug 11 15:45:28 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Aug 11 18:40:07 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0ff5601d [kde-base/khotkeys] Block kde-base/systemsettings:4 Add a block on kde-base/systemsettings:4, due to a file conflict in the handbooks. Package-Manager: portage-2.2.8-r1 --- kde-base/khotkeys/khotkeys-5.0.0.ebuild | 1 + kde-base/khotkeys/khotkeys-5.0.9999.ebuild | 1 + kde-base/khotkeys/khotkeys-9999.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/kde-base/khotkeys/khotkeys-5.0.0.ebuild b/kde-base/khotkeys/khotkeys-5.0.0.ebuild index b2425b3..c854e57 100644 --- a/kde-base/khotkeys/khotkeys-5.0.0.ebuild +++ b/kde-base/khotkeys/khotkeys-5.0.0.ebuild @@ -36,6 +36,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) !kde-base/khotkeys:4 + !kde-base/systemsettings:4 " DEPEND="${COMMON_DEPEND} x11-libs/libxcb diff --git a/kde-base/khotkeys/khotkeys-5.0.9999.ebuild b/kde-base/khotkeys/khotkeys-5.0.9999.ebuild index 9891f28..e01f394 100644 --- a/kde-base/khotkeys/khotkeys-5.0.9999.ebuild +++ b/kde-base/khotkeys/khotkeys-5.0.9999.ebuild @@ -36,6 +36,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) !kde-base/khotkeys:4 + !kde-base/systemsettings:4 " DEPEND="${COMMON_DEPEND} x11-libs/libxcb diff --git a/kde-base/khotkeys/khotkeys-9999.ebuild b/kde-base/khotkeys/khotkeys-9999.ebuild index 9891f28..e01f394 100644 --- a/kde-base/khotkeys/khotkeys-9999.ebuild +++ b/kde-base/khotkeys/khotkeys-9999.ebuild @@ -36,6 +36,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) !kde-base/khotkeys:4 + !kde-base/systemsettings:4 " DEPEND="${COMMON_DEPEND} x11-libs/libxcb