Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/
Date: Tue, 04 Sep 2018 20:49:57
Message-Id: 1536094157.5f255e64e3814cb09c4e65dfc1f0e61200186e49.asturm@gentoo
1 commit: 5f255e64e3814cb09c4e65dfc1f0e61200186e49
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 4 20:03:44 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 4 20:49:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f255e64
7
8 dev-util/kdevelop: Drop USE=welcomepage, less complexity/cmake fix
9
10 Closes: https://bugs.gentoo.org/665218
11 Package-Manager: Portage-2.3.49, Repoman-2.3.10
12
13 dev-util/kdevelop/kdevelop-5.2.4.ebuild | 8 ++------
14 1 file changed, 2 insertions(+), 6 deletions(-)
15
16 diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
17 index 361ca0737b8..f07d8b229fd 100644
18 --- a/dev-util/kdevelop/kdevelop-5.2.4.ebuild
19 +++ b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
20 @@ -12,11 +12,9 @@ inherit kde5
21
22 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
23 LICENSE="GPL-2 LGPL-2"
24 -IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
25 +IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit"
26 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
27
28 -REQUIRED_USE="test? ( welcomepage )"
29 -
30 COMMON_DEPEND="
31 $(add_frameworks_dep karchive)
32 $(add_frameworks_dep kbookmarks)
33 @@ -49,7 +47,7 @@ COMMON_DEPEND="
34 $(add_frameworks_dep threadweaver)
35 $(add_kdeapps_dep libkomparediff2)
36 $(add_qt_dep qtdbus)
37 - $(add_qt_dep qtdeclarative)
38 + $(add_qt_dep qtdeclarative 'widgets')
39 $(add_qt_dep qtgui)
40 $(add_qt_dep qthelp)
41 $(add_qt_dep qtnetwork)
42 @@ -74,7 +72,6 @@ COMMON_DEPEND="
43 )
44 webkit? ( $(add_qt_dep qtwebkit) )
45 !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
46 - welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
47 "
48 DEPEND="${COMMON_DEPEND}
49 dev-libs/boost
50 @@ -109,7 +106,6 @@ src_configure() {
51 $(cmake-utils_use_find_package reviewboard KF5Purpose)
52 $(cmake-utils_use_find_package subversion SubversionLibrary)
53 $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
54 - $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
55 )
56
57 use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )