commit: 375b3f21c0bdfb25b6700db864775536f3fb3131
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 19:10:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 20:02:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=375b3f21
dev-util/kdevplatform: Fix DEPENDs, use KDE_TEST=forceoptional-recursive
This has ~20 active tests subdirectories, except for ./tests
which does *NOT* contain tests but installs stuff.
Drop USE classbrowser, konsole: Minimal footprint, no additional deps
Drop USE templates: It disabled codeutils in addition to templates,
'recommended' by upstream.
Package-Manager: portage-2.2.28
dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild | 45 +++++++++++++++-------
dev-util/kdevplatform/kdevplatform-9999.ebuild | 45 +++++++++++++++-------
dev-util/kdevplatform/metadata.xml | 1 +
3 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
index 0a31d7e..5d10518 100644
--- a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
@@ -4,17 +4,15 @@
EAPI=6
-# TODO tests hang + fail
-# KDE_TEST="true"
-# VIRTUALDBUS_TEST="true"
-# VIRTUALX_REQUIRED="test"
EGIT_BRANCH="5.0"
-RESTRICT="test"
KDEBASE="kdevelop"
+KDE_TEST="forceoptional-recursive"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="KDE development support libraries and apps"
-IUSE="classbrowser cvs konsole reviewboard subversion +templates"
+IUSE="cvs reviewboard subversion +welcomepage"
KEYWORDS=""
COMMON_DEPEND="
@@ -48,18 +46,19 @@ COMMON_DEPEND="
$(add_frameworks_dep threadweaver)
$(add_kdeapps_dep libkomparediff2)
$(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ dev-libs/grantlee:5
+ reviewboard? ( dev-libs/purpose )
subversion? (
dev-libs/apr:1
dev-libs/apr-util:1
dev-vcs/subversion
)
- templates? ( dev-libs/grantlee:5 )
+ welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -68,20 +67,40 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
cvs? ( dev-vcs/cvs )
- konsole? ( $(add_kdeapps_dep konsole) )
!dev-util/kdevelop:4
!dev-util/kdevplatform:4
"
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+ # root tests subdirectory actually does not contain tests, installs
stuff
+ if ! use test; then
+ sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
+ CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+ sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
+ tests/CMakeLists.txt || die "Failed to fix
tests/CMakeLists.txt"
+ fi
+}
+
src_configure() {
local mycmakeargs=(
- -DBUILD_classbrowser=$(usex classbrowser)
-DBUILD_cvs=$(usex cvs)
- -DBUILD_konsole=$(usex konsole)
- -DBUILD_reviewboard=$(usex reviewboard)
+ $(cmake-utils_use_find_package reviewboard
KDEExperimentalPurpose)
$(cmake-utils_use_find_package subversion SubversionLibrary)
- $(cmake-utils_use_find_package templates Grantlee5)
+ $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
)
kde5_src_configure
}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version "kde-apps/konsole" ; then
+ echo
+ elog "For konsole view, please install kde-apps/konsole"
+ echo
+ fi
+}
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild
b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 4aa62d3..098ac05 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -4,16 +4,14 @@
EAPI=6
-# TODO tests hang + fail
-# KDE_TEST="true"
-# VIRTUALDBUS_TEST="true"
-# VIRTUALX_REQUIRED="test"
-RESTRICT="test"
KDEBASE="kdevelop"
+KDE_TEST="forceoptional-recursive"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="KDE development support libraries and apps"
-IUSE="classbrowser cvs konsole reviewboard subversion +templates"
+IUSE="cvs reviewboard subversion +welcomepage"
KEYWORDS=""
COMMON_DEPEND="
@@ -47,18 +45,19 @@ COMMON_DEPEND="
$(add_frameworks_dep threadweaver)
$(add_kdeapps_dep libkomparediff2)
$(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ dev-libs/grantlee:5
+ reviewboard? ( dev-libs/purpose )
subversion? (
dev-libs/apr:1
dev-libs/apr-util:1
dev-vcs/subversion
)
- templates? ( dev-libs/grantlee:5 )
+ welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -67,20 +66,40 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
cvs? ( dev-vcs/cvs )
- konsole? ( $(add_kdeapps_dep konsole) )
!dev-util/kdevelop:4
!dev-util/kdevplatform:4
"
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+ # root tests subdirectory actually does not contain tests, installs
stuff
+ if ! use test; then
+ sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
+ CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+ sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
+ tests/CMakeLists.txt || die "Failed to fix
tests/CMakeLists.txt"
+ fi
+}
+
src_configure() {
local mycmakeargs=(
- -DBUILD_classbrowser=$(usex classbrowser)
-DBUILD_cvs=$(usex cvs)
- -DBUILD_konsole=$(usex konsole)
- -DBUILD_reviewboard=$(usex reviewboard)
+ $(cmake-utils_use_find_package reviewboard
KDEExperimentalPurpose)
$(cmake-utils_use_find_package subversion SubversionLibrary)
- $(cmake-utils_use_find_package templates Grantlee5)
+ $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
)
kde5_src_configure
}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version "kde-apps/konsole" ; then
+ echo
+ elog "For konsole view, please install kde-apps/konsole"
+ echo
+ fi
+}
diff --git a/dev-util/kdevplatform/metadata.xml
b/dev-util/kdevplatform/metadata.xml
index 6fe9499..de7e29a 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/metadata.xml
@@ -10,5 +10,6 @@
<flag name="konsole">Enable Konsole integration</flag>
<flag name="reviewboard">Enable reviewboard support</flag>
<flag name="templates">Enable file templates through
<pkg>dev-libs/grantlee</pkg></flag>
+ <flag name="welcomepage">Enable welcome page, requires
<pkg>dev-qt/qtdeclarative[widgets]</pkg></flag>
</use>
</pkgmetadata>
