| 1 |
commit: 0a0962fb6f9399f7dbba8e2231e1ff7b83f12c15 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 10:43:05 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 3 10:43:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a0962fb |
| 7 |
|
| 8 |
kde-apps/konqueror: Add USE=webengine |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.33, Repoman-2.3.9 |
| 11 |
|
| 12 |
kde-apps/konqueror/konqueror-18.04.49.9999.ebuild | 14 ++++++++++---- |
| 13 |
kde-apps/konqueror/konqueror-9999.ebuild | 14 ++++++++++---- |
| 14 |
kde-apps/konqueror/metadata.xml | 1 + |
| 15 |
3 files changed, 21 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild b/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild |
| 18 |
index 49e5bd7b70..ad0cc0383f 100644 |
| 19 |
--- a/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild |
| 20 |
+++ b/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild |
| 21 |
@@ -14,7 +14,7 @@ HOMEPAGE=" |
| 22 |
https://konqueror.org/ |
| 23 |
" |
| 24 |
KEYWORDS="" |
| 25 |
-IUSE="activities speech tidy X" |
| 26 |
+IUSE="activities speech tidy +webengine X" |
| 27 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
| 28 |
RESTRICT+=" test" |
| 29 |
|
| 30 |
@@ -46,28 +46,34 @@ COMMON_DEPEND=" |
| 31 |
$(add_frameworks_dep kxmlgui) |
| 32 |
$(add_qt_dep qtdbus) |
| 33 |
$(add_qt_dep qtgui) |
| 34 |
- $(add_qt_dep qtwebengine 'widgets') |
| 35 |
$(add_qt_dep qtwidgets) |
| 36 |
$(add_qt_dep qtxml) |
| 37 |
sys-libs/zlib |
| 38 |
speech? ( $(add_qt_dep qtspeech) ) |
| 39 |
tidy? ( app-text/htmltidy ) |
| 40 |
+ webengine? ( $(add_qt_dep qtwebengine 'widgets') ) |
| 41 |
X? ( $(add_qt_dep qtx11extras) ) |
| 42 |
" |
| 43 |
DEPEND="${COMMON_DEPEND} |
| 44 |
activities? ( $(add_frameworks_dep kactivities) ) |
| 45 |
" |
| 46 |
RDEPEND="${COMMON_DEPEND} |
| 47 |
- $(add_kdeapps_dep kfind) |
| 48 |
- $(add_plasma_dep kde-cli-tools) |
| 49 |
!kde-apps/kfmclient:4 |
| 50 |
!kde-apps/konq-plugins |
| 51 |
!kde-apps/libkonq:5 |
| 52 |
+ $(add_kdeapps_dep kfind) |
| 53 |
+ $(add_plasma_dep kde-cli-tools) |
| 54 |
+ !webengine? ( kde-misc/kwebkitpart:5 ) |
| 55 |
" |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
| 59 |
|
| 60 |
+ if ! use webengine; then |
| 61 |
+ punt_bogus_dep Qt5 WebEngineWidgets |
| 62 |
+ cmake_comment_add_subdirectory webenginepartexit |
| 63 |
+ fi |
| 64 |
+ |
| 65 |
kde5_src_prepare |
| 66 |
} |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild |
| 70 |
index 49e5bd7b70..ad0cc0383f 100644 |
| 71 |
--- a/kde-apps/konqueror/konqueror-9999.ebuild |
| 72 |
+++ b/kde-apps/konqueror/konqueror-9999.ebuild |
| 73 |
@@ -14,7 +14,7 @@ HOMEPAGE=" |
| 74 |
https://konqueror.org/ |
| 75 |
" |
| 76 |
KEYWORDS="" |
| 77 |
-IUSE="activities speech tidy X" |
| 78 |
+IUSE="activities speech tidy +webengine X" |
| 79 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
| 80 |
RESTRICT+=" test" |
| 81 |
|
| 82 |
@@ -46,28 +46,34 @@ COMMON_DEPEND=" |
| 83 |
$(add_frameworks_dep kxmlgui) |
| 84 |
$(add_qt_dep qtdbus) |
| 85 |
$(add_qt_dep qtgui) |
| 86 |
- $(add_qt_dep qtwebengine 'widgets') |
| 87 |
$(add_qt_dep qtwidgets) |
| 88 |
$(add_qt_dep qtxml) |
| 89 |
sys-libs/zlib |
| 90 |
speech? ( $(add_qt_dep qtspeech) ) |
| 91 |
tidy? ( app-text/htmltidy ) |
| 92 |
+ webengine? ( $(add_qt_dep qtwebengine 'widgets') ) |
| 93 |
X? ( $(add_qt_dep qtx11extras) ) |
| 94 |
" |
| 95 |
DEPEND="${COMMON_DEPEND} |
| 96 |
activities? ( $(add_frameworks_dep kactivities) ) |
| 97 |
" |
| 98 |
RDEPEND="${COMMON_DEPEND} |
| 99 |
- $(add_kdeapps_dep kfind) |
| 100 |
- $(add_plasma_dep kde-cli-tools) |
| 101 |
!kde-apps/kfmclient:4 |
| 102 |
!kde-apps/konq-plugins |
| 103 |
!kde-apps/libkonq:5 |
| 104 |
+ $(add_kdeapps_dep kfind) |
| 105 |
+ $(add_plasma_dep kde-cli-tools) |
| 106 |
+ !webengine? ( kde-misc/kwebkitpart:5 ) |
| 107 |
" |
| 108 |
|
| 109 |
src_prepare() { |
| 110 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
| 111 |
|
| 112 |
+ if ! use webengine; then |
| 113 |
+ punt_bogus_dep Qt5 WebEngineWidgets |
| 114 |
+ cmake_comment_add_subdirectory webenginepartexit |
| 115 |
+ fi |
| 116 |
+ |
| 117 |
kde5_src_prepare |
| 118 |
} |
| 119 |
|
| 120 |
|
| 121 |
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml |
| 122 |
index a198affb54..462e8ca374 100644 |
| 123 |
--- a/kde-apps/konqueror/metadata.xml |
| 124 |
+++ b/kde-apps/konqueror/metadata.xml |
| 125 |
@@ -8,5 +8,6 @@ |
| 126 |
<use> |
| 127 |
<flag name="activities">Enable kactivities support</flag> |
| 128 |
<flag name="speech">Build text-to-speech plugin</flag> |
| 129 |
+ <flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag> |
| 130 |
</use> |
| 131 |
</pkgmetadata> |
Archives