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 BBF06138A1A for ; Sat, 17 Jan 2015 19:10:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49B26E08F7; Sat, 17 Jan 2015 19:10:31 +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 A4B4AE0935 for ; Sat, 17 Jan 2015 19:10:30 +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 BC6B1340775 for ; Sat, 17 Jan 2015 19:10:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FD9FFCAD for ; Sat, 17 Jan 2015 19:10:27 +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: <1421515870.9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kde-cli-tools/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild X-VCS-Directories: kde-plasma/kde-cli-tools/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32 X-VCS-Branch: master Date: Sat, 17 Jan 2015 19:10:27 +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: 60f29f96-8bdb-4fb3-b02f-b95492a18baa X-Archives-Hash: ed806fdfebebd90e8e27591ebec2dda8 commit: 9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32 Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 17 17:31:10 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 17 17:31:10 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9b57ee3f [kde-plasma/kde-cli-tools] Fix file collisions with kde-base/kde-cli-tools Package-Manager: portage-2.2.15 --- kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild | 4 +++- kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild | 4 +++- kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild index 0405eff..3f60a7f 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild @@ -36,7 +36,9 @@ DEPEND=" x11-libs/libX11 ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kde-cli-tools +" # requires running kde environment RESTRICT="test" diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild index 0405eff..3f60a7f 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild @@ -36,7 +36,9 @@ DEPEND=" x11-libs/libX11 ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kde-cli-tools +" # requires running kde environment RESTRICT="test" diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild index 67fe968..7fb5d77 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild @@ -36,7 +36,9 @@ DEPEND=" x11-libs/libX11 ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kde-cli-tools +" # requires running kde environment RESTRICT="test"