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 4E8B4138A1A for ; Sat, 17 Jan 2015 19:10:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A842E0951; Sat, 17 Jan 2015 19:10:33 +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 999D0E0951 for ; Sat, 17 Jan 2015 19:10:31 +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 D0B4A340786 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 4160BFCAF 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: <1421516322.5d17c91bd7caf88ac1d0f36166c2663c5a8d56f1.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild kde-plasma/plasma-nm/plasma-nm-9999.ebuild X-VCS-Directories: kde-plasma/plasma-nm/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 5d17c91bd7caf88ac1d0f36166c2663c5a8d56f1 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: 05b85b23-e36d-4b5a-9db2-9a1dd40f2e1e X-Archives-Hash: 3e2068519ffdcffe726841b616be6c9f commit: 5d17c91bd7caf88ac1d0f36166c2663c5a8d56f1 Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 17 17:38:42 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 17 17:38:42 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d17c91b [kde-plasma/plasma-nm] Fix file collisions with kde-base/plasma-nm Package-Manager: portage-2.2.15 --- kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild | 3 ++- kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild | 3 ++- kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild index d821210..2082ba6 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild @@ -50,8 +50,9 @@ DEPEND=" ) " RDEPEND="${DEPEND} + !kde-base/plasma-nm !kde-misc/networkmanagement - !kde-misc/plasma-nm:4 + !kde-misc/plasma-nm " src_configure() { diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild index f093485..3264060 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild @@ -50,8 +50,9 @@ DEPEND=" ) " RDEPEND="${DEPEND} + !kde-base/plasma-nm !kde-misc/networkmanagement - !kde-misc/plasma-nm:4 + !kde-misc/plasma-nm " src_configure() { diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild index 98509c3..8d71563 100644 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild @@ -50,8 +50,9 @@ DEPEND=" ) " RDEPEND="${DEPEND} + !kde-base/plasma-nm !kde-misc/networkmanagement - !kde-misc/plasma-nm:4 + !kde-misc/plasma-nm " src_configure() {