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 F0654138A1A 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 60A2CE0965; 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 76FC1E0965 for ; Sat, 17 Jan 2015 19:10:32 +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 8EEBE3407A4 for ; Sat, 17 Jan 2015 19:10:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 045CAFCBA for ; Sat, 17 Jan 2015 19:10:28 +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: <1421521467.978d128aa91033539926c94a5c70b3ccb63788a1.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kmenuedit/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kmenuedit/kmenuedit-5.1.2.ebuild kde-plasma/kmenuedit/kmenuedit-5.1.95.ebuild kde-plasma/kmenuedit/kmenuedit-9999.ebuild X-VCS-Directories: kde-plasma/kmenuedit/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 978d128aa91033539926c94a5c70b3ccb63788a1 X-VCS-Branch: master Date: Sat, 17 Jan 2015 19:10:28 +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: 9ab16f31-d901-4720-a927-9dd94c23a0b0 X-Archives-Hash: 88fa29adba0f355750fddb4bd1ad84cc commit: 978d128aa91033539926c94a5c70b3ccb63788a1 Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 17 19:04:27 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 17 19:04:27 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=978d128a [kde-plasma/kmenuedit] Fix file collisions with kde-base/kmenuedit Package-Manager: portage-2.2.15 --- kde-plasma/kmenuedit/kmenuedit-5.1.2.ebuild | 2 +- kde-plasma/kmenuedit/kmenuedit-5.1.95.ebuild | 2 +- kde-plasma/kmenuedit/kmenuedit-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-plasma/kmenuedit/kmenuedit-5.1.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.1.2.ebuild index 8fdcff2..3aba8ad 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.1.2.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.1.2.ebuild @@ -32,7 +32,7 @@ DEPEND=" hotkeys? ( $(add_kdeplasma_dep khotkeys) ) " RDEPEND="${DEPEND} - !kde-base/kmenuedit:4 + !kde-base/kmenuedit " src_configure() { diff --git a/kde-plasma/kmenuedit/kmenuedit-5.1.95.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.1.95.ebuild index 8fdcff2..3aba8ad 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.1.95.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.1.95.ebuild @@ -32,7 +32,7 @@ DEPEND=" hotkeys? ( $(add_kdeplasma_dep khotkeys) ) " RDEPEND="${DEPEND} - !kde-base/kmenuedit:4 + !kde-base/kmenuedit " src_configure() { diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild index 82d019f..efd2406 100644 --- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild @@ -32,7 +32,7 @@ DEPEND=" hotkeys? ( $(add_kdeplasma_dep khotkeys) ) " RDEPEND="${DEPEND} - !kde-base/kmenuedit:4 + !kde-base/kmenuedit " src_configure() {