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 3DF241399CE for ; Thu, 3 Sep 2015 19:29:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 027DF957B6; Thu, 3 Sep 2015 19:29:10 +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 69B0D957B3 for ; Thu, 3 Sep 2015 19:29:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27AA83408D4 for ; Thu, 3 Sep 2015 19:29:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52326144 for ; Thu, 3 Sep 2015 19:29:06 +0000 (UTC) From: "Michael Palimaka" 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" Message-ID: <1441308527.baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6.kensington@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.4.49.9999.ebuild kde-plasma/plasma-nm/plasma-nm-9999.ebuild X-VCS-Directories: kde-plasma/plasma-nm/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6 X-VCS-Branch: master Date: Thu, 3 Sep 2015 19:29:06 +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: b41dd58f-853d-45e4-a13c-a728b3ede3b8 X-Archives-Hash: f2102ad7239bb640964febe8d8ed5f89 commit: baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Sep 3 19:28:01 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 3 19:28:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=baa1be65 kde-plasma/plasma-nm: Fix RDEPEND !{kde-base => kde-misc}/plasma-nm File collisions: /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement-kded.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openswanui.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo /usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo Package-Manager: portage-2.2.20.1 kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild | 2 +- kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild index 77a0fd7..d26481f 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.4.49.9999.ebuild @@ -50,7 +50,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kde-base/plasma-nm + !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 77a0fd7..d26481f 100644 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild @@ -50,7 +50,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kde-base/plasma-nm + !kde-misc/plasma-nm " src_configure() {