From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-764968-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1DA75138A1A for <garchives@archives.gentoo.org>; Sat, 17 Jan 2015 19:10:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79EC4E0966; Sat, 17 Jan 2015 19:10:32 +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 A9E2CE0966 for <gentoo-commits@lists.gentoo.org>; 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 F128A34078F for <gentoo-commits@lists.gentoo.org>; 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 72BF2FCB2 for <gentoo-commits@lists.gentoo.org>; Sat, 17 Jan 2015 19:10:27 +0000 (UTC) From: "Johannes Huber" <johu@gentoo.org> 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" <johu@gentoo.org> Message-ID: <1421517467.7fcd6b5bab576594d9dc50dda8d3d4c1fa52760e.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/ksysguard/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/ksysguard/ksysguard-5.1.2.ebuild kde-plasma/ksysguard/ksysguard-5.1.95.ebuild kde-plasma/ksysguard/ksysguard-9999.ebuild X-VCS-Directories: kde-plasma/ksysguard/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 7fcd6b5bab576594d9dc50dda8d3d4c1fa52760e X-VCS-Branch: master Date: Sat, 17 Jan 2015 19:10:27 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: af30dc87-2f9c-4675-9acf-344da410e48e X-Archives-Hash: 0d9bee7f1b24f1118add4d3aab00f8a5 commit: 7fcd6b5bab576594d9dc50dda8d3d4c1fa52760e Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sat Jan 17 17:57:47 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sat Jan 17 17:57:47 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7fcd6b5b [kde-plasma/ksysguard] Fix file collisions with kde-base/ksysguard Package-Manager: portage-2.2.15 --- kde-plasma/ksysguard/ksysguard-5.1.2.ebuild | 2 +- kde-plasma/ksysguard/ksysguard-5.1.95.ebuild | 2 +- kde-plasma/ksysguard/ksysguard-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-plasma/ksysguard/ksysguard-5.1.2.ebuild b/kde-plasma/ksysguard/ksysguard-5.1.2.ebuild index a357f3f..3eb25c1 100644 --- a/kde-plasma/ksysguard/ksysguard-5.1.2.ebuild +++ b/kde-plasma/ksysguard/ksysguard-5.1.2.ebuild @@ -35,7 +35,7 @@ DEPEND=" lm_sensors? ( sys-apps/lm_sensors ) " RDEPEND="${DEPEND} - !kde-base/ksysguard:4 + !kde-base/ksysguard " src_configure() { diff --git a/kde-plasma/ksysguard/ksysguard-5.1.95.ebuild b/kde-plasma/ksysguard/ksysguard-5.1.95.ebuild index a357f3f..3eb25c1 100644 --- a/kde-plasma/ksysguard/ksysguard-5.1.95.ebuild +++ b/kde-plasma/ksysguard/ksysguard-5.1.95.ebuild @@ -35,7 +35,7 @@ DEPEND=" lm_sensors? ( sys-apps/lm_sensors ) " RDEPEND="${DEPEND} - !kde-base/ksysguard:4 + !kde-base/ksysguard " src_configure() { diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild b/kde-plasma/ksysguard/ksysguard-9999.ebuild index 0311970..a467854 100644 --- a/kde-plasma/ksysguard/ksysguard-9999.ebuild +++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild @@ -35,7 +35,7 @@ DEPEND=" lm_sensors? ( sys-apps/lm_sensors ) " RDEPEND="${DEPEND} - !kde-base/ksysguard:4 + !kde-base/ksysguard " src_configure() {