From 6fcac629ac74724313d9afbaaeb0f5839bd779bb Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 4 Sep 2018 22:03:44 +0200
Subject: 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(-)

(limited to 'dev-util/kdevelop')

diff --git a/dev-util/kdevelop/kdevelop-5.3.9999.ebuild b/dev-util/kdevelop/kdevelop-5.3.9999.ebuild
index 27f5a037db0..891ec74222c 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 e549767c484..e0b0543a37f 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 9b8c92eb6da..b3d54d19751 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -11,6 +11,5 @@
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
 		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
-		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>
 </pkgmetadata>
-- 
cgit v1.2.3