| 1 |
commit: 9699a0efbcd83298e9c32c8b04e31cc63b0a3913 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 8 17:53:36 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 8 18:11:33 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9699a0ef |
| 7 |
|
| 8 |
dev-util/kdevelop: Drop USE=ninja |
| 9 |
|
| 10 |
It is not saving us anything these days, deps pull it in anyway. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch | 11 ----------- |
| 15 |
dev-util/kdevelop/kdevelop-5.1.9999.ebuild | 7 ++----- |
| 16 |
dev-util/kdevelop/kdevelop-9999.ebuild | 7 ++----- |
| 17 |
dev-util/kdevelop/metadata.xml | 1 - |
| 18 |
4 files changed, 4 insertions(+), 22 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index a60da91df6..0000000000 |
| 23 |
--- a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,11 +0,0 @@ |
| 26 |
-diff --git a/projectbuilders/CMakeLists.txt b/projectbuilders/CMakeLists.txt |
| 27 |
-index 80d7866..825ca8b 100644 |
| 28 |
---- a/projectbuilders/CMakeLists.txt |
| 29 |
-+++ b/projectbuilders/CMakeLists.txt |
| 30 |
-@@ -1,5 +1,5 @@ |
| 31 |
- add_subdirectory(makebuilder) |
| 32 |
--add_subdirectory(ninjabuilder) |
| 33 |
-+ecm_optional_add_subdirectory(ninjabuilder) |
| 34 |
- ecm_optional_add_subdirectory(cmakebuilder) |
| 35 |
- if (KDevelop-PG-Qt_FOUND) |
| 36 |
- ecm_optional_add_subdirectory(qmakebuilder) |
| 37 |
|
| 38 |
diff --git a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild |
| 39 |
index acb31ee1a3..5830cee06b 100644 |
| 40 |
--- a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild |
| 41 |
+++ b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild |
| 42 |
@@ -11,7 +11,7 @@ inherit kde5 |
| 43 |
|
| 44 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
| 45 |
LICENSE="GPL-2 LGPL-2" |
| 46 |
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp" |
| 47 |
+IUSE="+gdbui okteta +plasma +qmake qthelp" |
| 48 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
| 49 |
|
| 50 |
COMMON_DEPEND=" |
| 51 |
@@ -62,8 +62,8 @@ DEPEND="${COMMON_DEPEND} |
| 52 |
RDEPEND="${COMMON_DEPEND} |
| 53 |
$(add_kdeapps_dep kapptemplate) |
| 54 |
$(add_kdeapps_dep kio-extras) |
| 55 |
+ dev-util/ninja |
| 56 |
>=sys-devel/gdb-7.0[python] |
| 57 |
- ninja? ( dev-util/ninja ) |
| 58 |
!dev-util/kdevelop:4 |
| 59 |
!dev-util/kdevelop-clang |
| 60 |
!dev-util/kdevelop-cppcheck |
| 61 |
@@ -75,14 +75,11 @@ RDEPEND="${COMMON_DEPEND} |
| 62 |
RESTRICT+=" test" |
| 63 |
# see bug 366471 |
| 64 |
|
| 65 |
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" ) |
| 66 |
- |
| 67 |
src_configure() { |
| 68 |
local mycmakeargs=( |
| 69 |
$(cmake-utils_use_find_package gdbui KF5SysGuard) |
| 70 |
-DBUILD_executeplasmoid=$(usex plasma) |
| 71 |
$(cmake-utils_use_find_package plasma KF5Plasma) |
| 72 |
- -DBUILD_ninjabuilder=$(usex ninja) |
| 73 |
$(cmake-utils_use_find_package okteta OktetaKastenControllers) |
| 74 |
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt) |
| 75 |
-DBUILD_qthelp=$(usex qthelp) |
| 76 |
|
| 77 |
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild |
| 78 |
index fd0eeb63c3..929a93e10f 100644 |
| 79 |
--- a/dev-util/kdevelop/kdevelop-9999.ebuild |
| 80 |
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild |
| 81 |
@@ -10,7 +10,7 @@ inherit kde5 |
| 82 |
|
| 83 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
| 84 |
LICENSE="GPL-2 LGPL-2" |
| 85 |
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp" |
| 86 |
+IUSE="+gdbui okteta +plasma +qmake qthelp" |
| 87 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
| 88 |
|
| 89 |
COMMON_DEPEND=" |
| 90 |
@@ -60,8 +60,8 @@ DEPEND="${COMMON_DEPEND} |
| 91 |
RDEPEND="${COMMON_DEPEND} |
| 92 |
$(add_kdeapps_dep kapptemplate) |
| 93 |
$(add_kdeapps_dep kio-extras) |
| 94 |
+ dev-util/ninja |
| 95 |
>=sys-devel/gdb-7.0[python] |
| 96 |
- ninja? ( dev-util/ninja ) |
| 97 |
!dev-util/kdevelop:4 |
| 98 |
!dev-util/kdevelop-clang |
| 99 |
!dev-util/kdevelop-cppcheck |
| 100 |
@@ -73,14 +73,11 @@ RDEPEND="${COMMON_DEPEND} |
| 101 |
RESTRICT+=" test" |
| 102 |
# see bug 366471 |
| 103 |
|
| 104 |
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" ) |
| 105 |
- |
| 106 |
src_configure() { |
| 107 |
local mycmakeargs=( |
| 108 |
$(cmake-utils_use_find_package gdbui KF5SysGuard) |
| 109 |
-DBUILD_executeplasmoid=$(usex plasma) |
| 110 |
$(cmake-utils_use_find_package plasma KF5Plasma) |
| 111 |
- -DBUILD_ninjabuilder=$(usex ninja) |
| 112 |
$(cmake-utils_use_find_package okteta OktetaKastenControllers) |
| 113 |
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt) |
| 114 |
-DBUILD_qthelp=$(usex qthelp) |
| 115 |
|
| 116 |
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml |
| 117 |
index cfde64ce07..1aa0399b05 100644 |
| 118 |
--- a/dev-util/kdevelop/metadata.xml |
| 119 |
+++ b/dev-util/kdevelop/metadata.xml |
| 120 |
@@ -7,7 +7,6 @@ |
| 121 |
</maintainer> |
| 122 |
<use> |
| 123 |
<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag> |
| 124 |
- <flag name="ninja">Enable support for Ninja build system</flag> |
| 125 |
<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag> |
| 126 |
<flag name="qmake">Enable support for QMake build system</flag> |
| 127 |
<flag name="qthelp">Enable support for QtHelp documentation browsing</flag> |
Archives