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 BBE511384B4 for ; Tue, 15 Dec 2015 13:26:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF23F21C031; Tue, 15 Dec 2015 13:26:46 +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 EB6E721C006 for ; Tue, 15 Dec 2015 13:26:45 +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 EED653404A5 for ; Tue, 15 Dec 2015 13:26:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7827FC94 for ; Tue, 15 Dec 2015 13:26:41 +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: <1450137271.b008a506372b86224d781f66c2430aebc673d85b.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b008a506372b86224d781f66c2430aebc673d85b X-VCS-Branch: master Date: Tue, 15 Dec 2015 13:26:41 +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: 481e483a-4c89-4286-b4ca-9a284e998fc6 X-Archives-Hash: daaa29985c125805f4930a8474d60dbb commit: b008a506372b86224d781f66c2430aebc673d85b Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Dec 14 23:10:29 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Dec 14 23:54:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b008a506 dev-util/kdevelop: Force handbook optional, block colliding kapptemplate Reason: /usr/share/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 dev-util/kdevelop/kdevelop-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index 228c72e..1f91fee 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -4,6 +4,7 @@ EAPI=5 +KDE_HANDBOOK="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 @@ -31,13 +32,13 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep threadweaver) - dev-util/kdevplatform:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 + >=dev-util/kdevplatform-${PV}:5 cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) ) plasma? ( $(add_frameworks_dep krunner) @@ -54,6 +55,7 @@ RDEPEND="${DEPEND} !dev-util/kdevelop:4 !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs + !