diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-07-06 23:19:25 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-07-16 20:37:38 +0200 |
| commit | 3f9eafb6a6447654aa7112f1715d901c43b3c6be (patch) | |
| tree | 2ae91c0b6257ef8422ca5249023d3d7f024a3879 /dev-util/kdevelop | |
| parent | 9c4412d64b46cb3d445af88e53b16a2f7c478a66 (diff) | |
| download | kde-3f9eafb6a6447654aa7112f1715d901c43b3c6be.tar.gz kde-3f9eafb6a6447654aa7112f1715d901c43b3c6be.tar.bz2 kde-3f9eafb6a6447654aa7112f1715d901c43b3c6be.zip | |
[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
Diffstat (limited to 'dev-util/kdevelop')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-ninja-optional.patch | 9 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-9999.ebuild | 6 | ||||
| -rw-r--r-- | dev-util/kdevelop/metadata.xml | 1 |
3 files changed, 15 insertions, 1 deletions
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 @@ <herd>kde</herd> <use> <flag name="cmake">Enable support for CMake build system</flag> + <flag name="ninja">Enable support for Ninja build system</flag> <flag name="gdbui">Enable GUI for attaching GDB to a running process</flag> <flag name="okteta">Enable hex editor plugin</flag> <flag name="qthelp">Enable support for QtHelp documentation browsing</flag> |