From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 931F413832E for ; Sun, 21 Aug 2016 20:21:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8D7C21C08C; Sun, 21 Aug 2016 20:21:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE18B21C04E for ; Sun, 21 Aug 2016 20:21:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D2A43406AD for ; Sun, 21 Aug 2016 20:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B7EE2464 for ; Sun, 21 Aug 2016 20:21:32 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1471809736.375b3f21c0bdfb25b6700db864775536f3fb3131.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild dev-util/kdevplatform/kdevplatform-9999.ebuild dev-util/kdevplatform/metadata.xml X-VCS-Directories: dev-util/kdevplatform/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 375b3f21c0bdfb25b6700db864775536f3fb3131 X-VCS-Branch: master Date: Sun, 21 Aug 2016 20:21:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ca2bec3-a7d6-4428-853a-a4033f718ec7 X-Archives-Hash: 9ff5bf164d201330c5f679cfe2b1db58 commit: 375b3f21c0bdfb25b6700db864775536f3fb3131 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Aug 21 19:10:10 2016 +0000 Commit: Michael Palimaka gentoo 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 @@ Enable Konsole integration Enable reviewboard support Enable file templates through dev-libs/grantlee + Enable welcome page, requires dev-qt/qtdeclarative[widgets]