| 1 |
commit: 5f86bf66598ef2852575cad2767678247fde95fd |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 18 20:34:22 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 18 21:03:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f86bf66 |
| 7 |
|
| 8 |
app-office/skrooge: Add USE webkit, add missing RDEPEND |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/skrooge/metadata.xml | 1 + |
| 14 |
app-office/skrooge/skrooge-9999.ebuild | 9 ++++++--- |
| 15 |
2 files changed, 7 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml |
| 18 |
index 6afd808cbb..5156b3be98 100644 |
| 19 |
--- a/app-office/skrooge/metadata.xml |
| 20 |
+++ b/app-office/skrooge/metadata.xml |
| 21 |
@@ -8,5 +8,6 @@ |
| 22 |
<use> |
| 23 |
<flag name="activities">Enable kactivities support</flag> |
| 24 |
<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> |
| 25 |
+ <flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag> |
| 26 |
</use> |
| 27 |
</pkgmetadata> |
| 28 |
|
| 29 |
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild |
| 30 |
index c302e46e17..5fb3502a49 100644 |
| 31 |
--- a/app-office/skrooge/skrooge-9999.ebuild |
| 32 |
+++ b/app-office/skrooge/skrooge-9999.ebuild |
| 33 |
@@ -1,4 +1,4 @@ |
| 34 |
-# Copyright 1999-2018 Gentoo Foundation |
| 35 |
+# Copyright 1999-2018 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=6 |
| 39 |
@@ -14,7 +14,7 @@ HOMEPAGE="https://skrooge.org/" |
| 40 |
|
| 41 |
LICENSE="GPL-2" |
| 42 |
KEYWORDS="" |
| 43 |
-IUSE="activities designer kde ofx" |
| 44 |
+IUSE="activities designer kde ofx webkit" |
| 45 |
|
| 46 |
COMMON_DEPEND=" |
| 47 |
$(add_frameworks_dep karchive) |
| 48 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 49 |
$(add_qt_dep qtscript) |
| 50 |
$(add_qt_dep qtsql) |
| 51 |
$(add_qt_dep qtsvg) |
| 52 |
- $(add_qt_dep qtwebkit) |
| 53 |
$(add_qt_dep qtwidgets) |
| 54 |
$(add_qt_dep qtxml) |
| 55 |
app-crypt/qca:2[qt5(+)] |
| 56 |
@@ -54,6 +53,8 @@ COMMON_DEPEND=" |
| 57 |
activities? ( $(add_frameworks_dep kactivities) ) |
| 58 |
kde? ( $(add_frameworks_dep krunner) ) |
| 59 |
ofx? ( dev-libs/libofx ) |
| 60 |
+ webkit? ( $(add_qt_dep qtwebkit) ) |
| 61 |
+ !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) |
| 62 |
" |
| 63 |
DEPEND="${COMMON_DEPEND} |
| 64 |
$(add_frameworks_dep kguiaddons) |
| 65 |
@@ -69,6 +70,7 @@ DEPEND="${COMMON_DEPEND} |
| 66 |
" |
| 67 |
RDEPEND="${COMMON_DEPEND} |
| 68 |
!app-office/skrooge:4 |
| 69 |
+ $(add_qt_dep qtquickcontrols) |
| 70 |
" |
| 71 |
|
| 72 |
REQUIRED_USE="test? ( designer )" |
| 73 |
@@ -83,6 +85,7 @@ src_configure() { |
| 74 |
$(cmake-utils_use_find_package activities KF5Activities) |
| 75 |
$(cmake-utils_use_find_package kde KF5Runner) |
| 76 |
$(cmake-utils_use_find_package ofx LibOfx) |
| 77 |
+ -DSKG_WEBENGINE=$(usex !webkit) |
| 78 |
) |
| 79 |
|
| 80 |
kde5_src_configure |
Archives