| 1 |
commit: 6fcac629ac74724313d9afbaaeb0f5839bd779bb |
| 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 21:46:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fcac629 |
| 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.3.9999.ebuild | 8 ++------ |
| 14 |
dev-util/kdevelop/kdevelop-9999.ebuild | 8 ++------ |
| 15 |
dev-util/kdevelop/metadata.xml | 1 - |
| 16 |
3 files changed, 4 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/kdevelop/kdevelop-5.3.9999.ebuild b/dev-util/kdevelop/kdevelop-5.3.9999.ebuild |
| 19 |
index 27f5a037db..891ec74222 100644 |
| 20 |
--- a/dev-util/kdevelop/kdevelop-5.3.9999.ebuild |
| 21 |
+++ b/dev-util/kdevelop/kdevelop-5.3.9999.ebuild |
| 22 |
@@ -12,11 +12,9 @@ inherit kde5 |
| 23 |
|
| 24 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
| 25 |
LICENSE="GPL-2 LGPL-2" |
| 26 |
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage" |
| 27 |
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit" |
| 28 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
| 29 |
|
| 30 |
-REQUIRED_USE="test? ( welcomepage )" |
| 31 |
- |
| 32 |
COMMON_DEPEND=" |
| 33 |
$(add_frameworks_dep karchive) |
| 34 |
$(add_frameworks_dep kbookmarks) |
| 35 |
@@ -49,7 +47,7 @@ COMMON_DEPEND=" |
| 36 |
$(add_frameworks_dep threadweaver) |
| 37 |
$(add_kdeapps_dep libkomparediff2) |
| 38 |
$(add_qt_dep qtdbus) |
| 39 |
- $(add_qt_dep qtdeclarative) |
| 40 |
+ $(add_qt_dep qtdeclarative 'widgets') |
| 41 |
$(add_qt_dep qtgui) |
| 42 |
$(add_qt_dep qthelp) |
| 43 |
$(add_qt_dep qtnetwork) |
| 44 |
@@ -74,7 +72,6 @@ COMMON_DEPEND=" |
| 45 |
) |
| 46 |
webkit? ( $(add_qt_dep qtwebkit) ) |
| 47 |
!webkit? ( $(add_qt_dep qtwebengine 'widgets') ) |
| 48 |
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') ) |
| 49 |
" |
| 50 |
DEPEND="${COMMON_DEPEND} |
| 51 |
dev-libs/boost |
| 52 |
@@ -108,7 +105,6 @@ src_configure() { |
| 53 |
$(cmake-utils_use_find_package reviewboard KF5Purpose) |
| 54 |
$(cmake-utils_use_find_package subversion SubversionLibrary) |
| 55 |
$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets) |
| 56 |
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets) |
| 57 |
) |
| 58 |
|
| 59 |
use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) |
| 60 |
|
| 61 |
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild |
| 62 |
index e549767c48..e0b0543a37 100644 |
| 63 |
--- a/dev-util/kdevelop/kdevelop-9999.ebuild |
| 64 |
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild |
| 65 |
@@ -11,11 +11,9 @@ inherit kde5 |
| 66 |
|
| 67 |
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
| 68 |
LICENSE="GPL-2 LGPL-2" |
| 69 |
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage" |
| 70 |
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit" |
| 71 |
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
| 72 |
|
| 73 |
-REQUIRED_USE="test? ( welcomepage )" |
| 74 |
- |
| 75 |
COMMON_DEPEND=" |
| 76 |
$(add_frameworks_dep karchive) |
| 77 |
$(add_frameworks_dep kbookmarks) |
| 78 |
@@ -48,7 +46,7 @@ COMMON_DEPEND=" |
| 79 |
$(add_frameworks_dep threadweaver) |
| 80 |
$(add_kdeapps_dep libkomparediff2) |
| 81 |
$(add_qt_dep qtdbus) |
| 82 |
- $(add_qt_dep qtdeclarative) |
| 83 |
+ $(add_qt_dep qtdeclarative 'widgets') |
| 84 |
$(add_qt_dep qtgui) |
| 85 |
$(add_qt_dep qthelp) |
| 86 |
$(add_qt_dep qtnetwork) |
| 87 |
@@ -73,7 +71,6 @@ COMMON_DEPEND=" |
| 88 |
) |
| 89 |
webkit? ( $(add_qt_dep qtwebkit) ) |
| 90 |
!webkit? ( $(add_qt_dep qtwebengine 'widgets') ) |
| 91 |
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') ) |
| 92 |
" |
| 93 |
DEPEND="${COMMON_DEPEND} |
| 94 |
dev-libs/boost |
| 95 |
@@ -107,7 +104,6 @@ src_configure() { |
| 96 |
$(cmake-utils_use_find_package reviewboard KF5Purpose) |
| 97 |
$(cmake-utils_use_find_package subversion SubversionLibrary) |
| 98 |
$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets) |
| 99 |
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets) |
| 100 |
) |
| 101 |
|
| 102 |
use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) |
| 103 |
|
| 104 |
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml |
| 105 |
index 9b8c92eb6d..b3d54d1975 100644 |
| 106 |
--- a/dev-util/kdevelop/metadata.xml |
| 107 |
+++ b/dev-util/kdevelop/metadata.xml |
| 108 |
@@ -11,6 +11,5 @@ |
| 109 |
<flag name="qmake">Enable support for QMake build system</flag> |
| 110 |
<flag name="reviewboard">Enable reviewboard support</flag> |
| 111 |
<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag> |
| 112 |
- <flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag> |
| 113 |
</use> |
| 114 |
</pkgmetadata> |
Archives