commit: 9699a0efbcd83298e9c32c8b04e31cc63b0a3913
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 17:53:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 18:11:33 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9699a0ef
dev-util/kdevelop: Drop USE=ninja
It is not saving us anything these days, deps pull it in anyway.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch | 11 -----------
dev-util/kdevelop/kdevelop-5.1.9999.ebuild | 7 ++-----
dev-util/kdevelop/kdevelop-9999.ebuild | 7 ++-----
dev-util/kdevelop/metadata.xml | 1 -
4 files changed, 4 insertions(+), 22 deletions(-)
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
deleted file mode 100644
index a60da91df6..0000000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/projectbuilders/CMakeLists.txt b/projectbuilders/CMakeLists.txt
-index 80d7866..825ca8b 100644
---- a/projectbuilders/CMakeLists.txt
-+++ b/projectbuilders/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_subdirectory(makebuilder)
--add_subdirectory(ninjabuilder)
-+ecm_optional_add_subdirectory(ninjabuilder)
- ecm_optional_add_subdirectory(cmakebuilder)
- if (KDevelop-PG-Qt_FOUND)
- ecm_optional_add_subdirectory(qmakebuilder)
diff --git a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
index acb31ee1a3..5830cee06b 100644
--- a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and
much more"
LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
+IUSE="+gdbui okteta +plasma +qmake qthelp"
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
@@ -62,8 +62,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kapptemplate)
$(add_kdeapps_dep kio-extras)
+ dev-util/ninja
>=sys-devel/gdb-7.0[python]
- ninja? ( dev-util/ninja )
!dev-util/kdevelop:4
!dev-util/kdevelop-clang
!dev-util/kdevelop-cppcheck
@@ -75,14 +75,11 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# see bug 366471
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package gdbui KF5SysGuard)
-DBUILD_executeplasmoid=$(usex plasma)
$(cmake-utils_use_find_package plasma KF5Plasma)
- -DBUILD_ninjabuilder=$(usex ninja)
$(cmake-utils_use_find_package okteta OktetaKastenControllers)
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-DBUILD_qthelp=$(usex qthelp)
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild
b/dev-util/kdevelop/kdevelop-9999.ebuild
index fd0eeb63c3..929a93e10f 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and
much more"
LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
+IUSE="+gdbui okteta +plasma +qmake qthelp"
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
@@ -60,8 +60,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kapptemplate)
$(add_kdeapps_dep kio-extras)
+ dev-util/ninja
>=sys-devel/gdb-7.0[python]
- ninja? ( dev-util/ninja )
!dev-util/kdevelop:4
!dev-util/kdevelop-clang
!dev-util/kdevelop-cppcheck
@@ -73,14 +73,11 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# see bug 366471
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package gdbui KF5SysGuard)
-DBUILD_executeplasmoid=$(usex plasma)
$(cmake-utils_use_find_package plasma KF5Plasma)
- -DBUILD_ninjabuilder=$(usex ninja)
$(cmake-utils_use_find_package okteta OktetaKastenControllers)
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-DBUILD_qthelp=$(usex qthelp)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index cfde64ce07..1aa0399b05 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="gdbui">Enable GUI for attaching GDB to a running
process</flag>
- <flag name="ninja">Enable support for Ninja build system</flag>
<flag name="okteta">Enable hex editor plugin via
<pkg>kde-apps/okteta</pkg></flag>
<flag name="qmake">Enable support for QMake build system</flag>
<flag name="qthelp">Enable support for QtHelp documentation
browsing</flag>
