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 F1282138D1C for ; Thu, 16 Jul 2015 18:38:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9635BE07D4; Thu, 16 Jul 2015 18:38:34 +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 19976E07D4 for ; Thu, 16 Jul 2015 18:38:34 +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 E7781340B30 for ; Thu, 16 Jul 2015 18:36:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 363C417 for ; Thu, 16 Jul 2015 18:38:31 +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: <1437071858.3f9eafb6a6447654aa7112f1715d901c43b3c6be.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop/files/kdevelop-ninja-optional.patch dev-util/kdevelop/kdevelop-9999.ebuild dev-util/kdevelop/metadata.xml X-VCS-Directories: dev-util/kdevelop/files/ dev-util/kdevelop/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 3f9eafb6a6447654aa7112f1715d901c43b3c6be X-VCS-Branch: master Date: Thu, 16 Jul 2015 18:38:31 +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: ae61e7c6-f05a-4216-8f63-9b63081ba62e X-Archives-Hash: 2af86f73af748a597059c598f639585c commit: 3f9eafb6a6447654aa7112f1715d901c43b3c6be Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jul 6 21:19:25 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Jul 16 18:37:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f9eafb6 [dev-util/kdevelop] Add USE flag ninja and add optional RDEPEND Ninja reported missing in terminal output without dev-util/ninja, small patch makes it optional Package-Manager: portage-2.2.18 dev-util/kdevelop/files/kdevelop-ninja-optional.patch | 9 +++++++++ dev-util/kdevelop/kdevelop-9999.ebuild | 6 +++++- dev-util/kdevelop/metadata.xml | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dev-util/kdevelop/files/kdevelop-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch new file mode 100644 index 0000000..a84279b --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch @@ -0,0 +1,9 @@ +--- a/projectbuilders/CMakeLists.txt 2015-02-02 15:19:46.000000000 +0100 ++++ b/projectbuilders/CMakeLists.txt 2015-07-06 22:51:22.083293634 +0200 +@@ -1,5 +1,5 @@ + + add_subdirectory(makebuilder) +-add_subdirectory(ninjabuilder) ++ecm_optional_add_subdirectory(ninjabuilder) + ecm_optional_add_subdirectory(cmakebuilder) + diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index e655b38..1b74024 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages" LICENSE="GPL-2 LGPL-2" -IUSE="+cmake +cxx debug +plasma qthelp" +IUSE="+cmake +cxx debug +ninja +plasma qthelp" KEYWORDS="" # TODO: disabled upstream @@ -48,16 +48,20 @@ RDEPEND="${DEPEND} $(add_kdeapps_dep kapptemplate) $(add_plasma_dep kio-extras) cxx? ( >=sys-devel/gdb-7.0[python] ) + ninja? ( dev-util/ninja ) !dev-util/kdevelop:4 " RESTRICT="test" # see bug 366471 +PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_build cmake) $(cmake-utils_use_build cmake cmakebuilder) + $(cmake-utils_use_build ninja ninjabuilder) $(cmake-utils_use_build cxx cpp) $(cmake-utils_use_build qthelp) $(cmake-utils_use_find_package plasma KF5Plasma) diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml index d6717c3..2354710 100644 --- a/dev-util/kdevelop/metadata.xml +++ b/dev-util/kdevelop/metadata.xml @@ -4,6 +4,7 @@ kde Enable support for CMake build system + Enable support for Ninja build system Enable GUI for attaching GDB to a running process Enable hex editor plugin Enable support for QtHelp documentation browsing