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 51D4259CAF for ; Wed, 6 Apr 2016 13:58:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C62121C00C; Wed, 6 Apr 2016 13:58:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3618021C00C for ; Wed, 6 Apr 2016 13:58:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC454340E13 for ; Wed, 6 Apr 2016 13:58:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABDD076 for ; Wed, 6 Apr 2016 13:57:54 +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: <1459950570.c750571d1c9505aae42d555685ef65fa6618e3d2.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/krunner/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/krunner/krunner-5.21.0.ebuild kde-frameworks/krunner/krunner-9999.ebuild X-VCS-Directories: kde-frameworks/krunner/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c750571d1c9505aae42d555685ef65fa6618e3d2 X-VCS-Branch: master Date: Wed, 6 Apr 2016 13:57:54 +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: 6448b56a-5dc9-4b94-93c1-461c5a6c933c X-Archives-Hash: aa8e1b470afd37dfb34706d781c41181 commit: c750571d1c9505aae42d555685ef65fa6618e3d2 Author: Michael Palimaka gentoo org> AuthorDate: Wed Apr 6 13:49:30 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Apr 6 13:49:30 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c750571d kde-frameworks/krunner: solve file collision with kde-apps/kapptemplate * kde-apps/kapptemplate-15.12.2:5::kde * /usr/share/kdevappwizard/templates/runner.tar.bz2 This file was imported from kapptemplate. Upstream-commit: 3aed2212ccc417b9c15fc91ea0dabb482cd85c32 Package-Manager: portage-2.2.28 kde-frameworks/krunner/krunner-5.21.0.ebuild | 6 ++++-- kde-frameworks/krunner/krunner-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kde-frameworks/krunner/krunner-5.21.0.ebuild b/kde-frameworks/krunner/krunner-5.21.0.ebuild index c8bf7cc..6ba3c5d 100644 --- a/kde-frameworks/krunner/krunner-5.21.0.ebuild +++ b/kde-frameworks/krunner/krunner-5.21.0.ebuild @@ -12,7 +12,7 @@ LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -RDEPEND=" +DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) @@ -25,4 +25,6 @@ RDEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) " -DEPEND="${RDEPEND}" +RDEPEND="${DEPEND} + !