commit: 0c35d883c982f11b516aad7d718bba0e1751e1ef
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 08:58:08 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 08:58:08 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0c35d883
[dev-util/kdevplatform] Update to reflect various upstream changes.
Package-Manager: portage-2.2.15
---
dev-util/kdevplatform/kdevplatform-9999.ebuild | 18 ++++++++++++------
dev-util/kdevplatform/metadata.xml | 2 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild
b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index f2f57fa..067dbcf 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -14,14 +14,12 @@ EGIT_REPONAME="${PN}"
inherit kde5
DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard"
+IUSE="classbrowser cvs konsole reviewboard"
KEYWORDS=""
# TODO features disabled by upstream, maybe more
-# Templates: dev-libs/grantlee
-# Konsole support: $(add_kdebase_dep konsole)
# Subversion integration: subversion? (dev-libs/apr dev-libs/apr-util
dev-vcs/subversion )
-DEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
@@ -30,6 +28,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -51,8 +50,9 @@ DEPEND="
$(add_frameworks_dep sonnet)
$(add_frameworks_dep threadweaver)
$(add_kdeapps_dep libkomparediff2)
- dev-libs/boost:=
+ dev-libs/grantlee:5
dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtquick1:5
@@ -61,15 +61,21 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ classbrowser? ( dev-libs/boost )
+"
+RDEPEND="${COMMON_DEPEND}
cvs? ( dev-vcs/cvs )
+ konsole? ( $(add_kdeapps_dep konsole) )
!dev-util/kdevelop:4
!dev-util/kdevplatform:4
"
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_build classbrowser)
$(cmake-utils_use_build cvs)
+ $(cmake-utils_use_build konsole)
$(cmake-utils_use_build reviewboard)
)
diff --git a/dev-util/kdevplatform/metadata.xml
b/dev-util/kdevplatform/metadata.xml
index afa9ff9..8def1ed 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/metadata.xml
@@ -3,6 +3,8 @@
<pkgmetadata>
<herd>kde</herd>
<use>
+ <flag name="classbrowser">Enable the class browser plugin</flag>
+ <flag name="konsole">Enable Konsole integration</flag>
<flag name="reviewboard">Enable reviewboard support</flag>
</use>
</pkgmetadata>
