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 3C433138334 for ; Tue, 4 Sep 2018 22:06:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7277BE01E4; Tue, 4 Sep 2018 22:06:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DB0DE01E4 for ; Tue, 4 Sep 2018 22:06:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02F7C335C94 for ; Tue, 4 Sep 2018 22:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B21B3B8 for ; Tue, 4 Sep 2018 22:06:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1536097587.6fcac629ac74724313d9afbaaeb0f5839bd779bb.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop/kdevelop-5.3.9999.ebuild dev-util/kdevelop/kdevelop-9999.ebuild dev-util/kdevelop/metadata.xml X-VCS-Directories: dev-util/kdevelop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6fcac629ac74724313d9afbaaeb0f5839bd779bb X-VCS-Branch: master Date: Tue, 4 Sep 2018 22:06:45 +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: 476b9601-f9c6-44d0-b132-391086e62f7a X-Archives-Hash: 80ce15b43c95a58d4741c7104aff66f3 commit: 6fcac629ac74724313d9afbaaeb0f5839bd779bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 4 20:03:44 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 4 21:46:27 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fcac629 dev-util/kdevelop: Drop USE=welcomepage, less complexity/cmake fix Closes: https://bugs.gentoo.org/665218 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-util/kdevelop/kdevelop-5.3.9999.ebuild | 8 ++------ dev-util/kdevelop/kdevelop-9999.ebuild | 8 ++------ dev-util/kdevelop/metadata.xml | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dev-util/kdevelop/kdevelop-5.3.9999.ebuild b/dev-util/kdevelop/kdevelop-5.3.9999.ebuild index 27f5a037db..891ec74222 100644 --- a/dev-util/kdevelop/kdevelop-5.3.9999.ebuild +++ b/dev-util/kdevelop/kdevelop-5.3.9999.ebuild @@ -12,11 +12,9 @@ inherit kde5 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" LICENSE="GPL-2 LGPL-2" -IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage" +IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit" [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" -REQUIRED_USE="test? ( welcomepage )" - COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kbookmarks) @@ -49,7 +47,7 @@ COMMON_DEPEND=" $(add_frameworks_dep threadweaver) $(add_kdeapps_dep libkomparediff2) $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) + $(add_qt_dep qtdeclarative 'widgets') $(add_qt_dep qtgui) $(add_qt_dep qthelp) $(add_qt_dep qtnetwork) @@ -74,7 +72,6 @@ COMMON_DEPEND=" ) webkit? ( $(add_qt_dep qtwebkit) ) !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) - welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') ) " DEPEND="${COMMON_DEPEND} dev-libs/boost @@ -108,7 +105,6 @@ src_configure() { $(cmake-utils_use_find_package reviewboard KF5Purpose) $(cmake-utils_use_find_package subversion SubversionLibrary) $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets) - $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets) ) use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index e549767c48..e0b0543a37 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -11,11 +11,9 @@ inherit kde5 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" LICENSE="GPL-2 LGPL-2" -IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage" +IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit" [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" -REQUIRED_USE="test? ( welcomepage )" - COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kbookmarks) @@ -48,7 +46,7 @@ COMMON_DEPEND=" $(add_frameworks_dep threadweaver) $(add_kdeapps_dep libkomparediff2) $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) + $(add_qt_dep qtdeclarative 'widgets') $(add_qt_dep qtgui) $(add_qt_dep qthelp) $(add_qt_dep qtnetwork) @@ -73,7 +71,6 @@ COMMON_DEPEND=" ) webkit? ( $(add_qt_dep qtwebkit) ) !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) - welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') ) " DEPEND="${COMMON_DEPEND} dev-libs/boost @@ -107,7 +104,6 @@ src_configure() { $(cmake-utils_use_find_package reviewboard KF5Purpose) $(cmake-utils_use_find_package subversion SubversionLibrary) $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets) - $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets) ) use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml index 9b8c92eb6d..b3d54d1975 100644 --- a/dev-util/kdevelop/metadata.xml +++ b/dev-util/kdevelop/metadata.xml @@ -11,6 +11,5 @@ Enable support for QMake build system Enable reviewboard support Enable deprecated dev-qt/qtwebkit instead of dev-qt/qtwebengine for integrated documentation - Enable welcome page, requires dev-qt/qtdeclarative