From 3f9eafb6a6447654aa7112f1715d901c43b3c6be Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 6 Jul 2015 23:19:25 +0200 Subject: [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(-) create mode 100644 dev-util/kdevelop/files/kdevelop-ninja-optional.patch (limited to 'dev-util/kdevelop') 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 00000000000..a84279bfc7d --- /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 e655b38eb13..1b7402493ae 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 d6717c393ca..2354710419c 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 -- cgit v1.2.3