summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-08-17 22:56:37 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-08-17 22:56:37 +0200
commit553357d9f56c01b2ad979a6ca23972e7ca4b2243 (patch)
tree097849f7fb0ca6e0d14145944ffea78ff13006b9
parente7753972dc103b968580bd0ca0a548b640e6d9fe (diff)
downloadkde-553357d9f56c01b2ad979a6ca23972e7ca4b2243.tar.gz
kde-553357d9f56c01b2ad979a6ca23972e7ca4b2243.tar.bz2
kde-553357d9f56c01b2ad979a6ca23972e7ca4b2243.zip
dev-util/kdevelop: Switch to KDE_TEST=true, drop USE=qthelp
Upstream commit b6f966d6b38002b12f4508a2cbc62f874a4f32ff Package-Manager: Portage-2.3.8, Repoman-2.3.3
-rw-r--r--dev-util/kdevelop/kdevelop-5.1.9999.ebuild8
-rw-r--r--dev-util/kdevelop/metadata.xml1
2 files changed, 4 insertions, 5 deletions
diff --git a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
index d9f720e8f12..ffbbca5b1bc 100644
--- a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
@@ -5,13 +5,13 @@ EAPI=6
EGIT_BRANCH="5.1"
KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui okteta +plasma +qmake qthelp"
+IUSE="+gdbui okteta +plasma +qmake"
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
@@ -40,6 +40,7 @@ COMMON_DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui)
+ $(add_qt_dep qthelp)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
@@ -54,7 +55,6 @@ COMMON_DEPEND="
$(add_frameworks_dep plasma)
)
qmake? ( dev-util/kdevelop-pg-qt:5 )
- qthelp? ( $(add_qt_dep qthelp) )
"
DEPEND="${COMMON_DEPEND}
$(add_qt_dep qtconcurrent)
@@ -82,7 +82,7 @@ src_configure() {
$(cmake-utils_use_find_package plasma KF5Plasma)
$(cmake-utils_use_find_package okteta OktetaKastenControllers)
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
- -DBUILD_qthelp=$(usex qthelp)
+ -DBUILD_qthelp=ON
)
kde5_src_configure
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 6d10f19d58a..a5bf469b2fb 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -9,7 +9,6 @@
<flag name="gdbui">Enable GUI for attaching GDB to a running process</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>
<flag name="reviewboard">Enable reviewboard support</flag>
<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>