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 08B6713877A for ; Mon, 28 Jul 2014 22:05:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4188E0C14; Mon, 28 Jul 2014 22:04:59 +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 60E6AE0B91 for ; Mon, 28 Jul 2014 22:04:59 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8952533FE0A for ; Mon, 28 Jul 2014 22:04:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 534A018BF3 for ; Mon, 28 Jul 2014 22:04:57 +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: <1406585083.01ecc51d82d85de241fb4f9adac3f5eac14da708.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/about-distro/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/about-distro/about-distro-9999.ebuild X-VCS-Directories: kde-misc/about-distro/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 01ecc51d82d85de241fb4f9adac3f5eac14da708 X-VCS-Branch: master Date: Mon, 28 Jul 2014 22:04:57 +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: 936d708b-229a-41ce-a2a2-85456e741676 X-Archives-Hash: 827ecf472e2a88dc3dc4bb592a187503 commit: 01ecc51d82d85de241fb4f9adac3f5eac14da708 Author: Johannes Huber gentoo org> AuthorDate: Mon Jul 28 22:04:43 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Jul 28 22:04:43 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=01ecc51d [kde-misc/about-distro] Fix file collision Package-Manager: portage-2.2.10 --- kde-misc/about-distro/about-distro-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kde-misc/about-distro/about-distro-9999.ebuild b/kde-misc/about-distro/about-distro-9999.ebuild index 1c923a7..06bed86 100644 --- a/kde-misc/about-distro/about-distro-9999.ebuild +++ b/kde-misc/about-distro/about-distro-9999.ebuild @@ -30,7 +30,9 @@ DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-misc/about-distro:4 +" src_install() { kde5_src_install