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 0EDEE139897 for ; Mon, 24 Aug 2015 09:44:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74FF2E07F4; Mon, 24 Aug 2015 09:44:12 +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 147EEE07F2 for ; Mon, 24 Aug 2015 09:44:12 +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 6FE0E340817 for ; Mon, 24 Aug 2015 09:44:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D14FE16B for ; Mon, 24 Aug 2015 09:44:07 +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: <1440409572.a6992213687b1ed6be9a77c034fe99ec68cd0cc5.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop/kdevelop-9999.ebuild X-VCS-Directories: dev-util/kdevelop/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: a6992213687b1ed6be9a77c034fe99ec68cd0cc5 X-VCS-Branch: master Date: Mon, 24 Aug 2015 09:44:07 +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: 602a1608-a158-488b-ba3d-443089ce7da8 X-Archives-Hash: 0d897f360c7dddc5d4319956f50617dc commit: a6992213687b1ed6be9a77c034fe99ec68cd0cc5 Author: Johannes Huber gentoo org> AuthorDate: Mon Aug 24 09:46:12 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Aug 24 09:46:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6992213 dev-util/kdevelop: Prevent file collisions dev-util/kdevelop-qmljs was merged into dev-util/kdevelop. Package-Manager: portage-2.2.20.1 dev-util/kdevelop/kdevelop-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index bd4a014..c72b5d7 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -50,6 +50,7 @@ RDEPEND="${DEPEND} ninja? ( dev-util/ninja ) !dev-util/kdevelop:4 !dev-util/kdevelop-qmake + !dev-util/kdevelop-qmljs " RESTRICT="test"