| 1 |
commit: 157ab0e4ed3fbbab2a4b54be6a606f690650bcd9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 17 17:29:18 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 17 17:43:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=157ab0e4 |
| 7 |
|
| 8 |
app-office/skrooge: Drop IUSE=webkit |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 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 | 13 ++++++------- |
| 15 |
2 files changed, 6 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml |
| 18 |
index 5156b3be98..6afd808cbb 100644 |
| 19 |
--- a/app-office/skrooge/metadata.xml |
| 20 |
+++ b/app-office/skrooge/metadata.xml |
| 21 |
@@ -8,6 +8,5 @@ |
| 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 3ed8aceba6..285accb3fe 100644 |
| 31 |
--- a/app-office/skrooge/skrooge-9999.ebuild |
| 32 |
+++ b/app-office/skrooge/skrooge-9999.ebuild |
| 33 |
@@ -20,7 +20,7 @@ fi |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="5" |
| 37 |
-IUSE="activities designer kde ofx webkit" |
| 38 |
+IUSE="activities designer kde ofx" |
| 39 |
|
| 40 |
REQUIRED_USE="test? ( designer )" |
| 41 |
|
| 42 |
@@ -41,6 +41,7 @@ COMMON_DEPEND=" |
| 43 |
>=dev-qt/qtscript-${QTMIN}:5 |
| 44 |
>=dev-qt/qtsql-${QTMIN}:5= |
| 45 |
>=dev-qt/qtsvg-${QTMIN}:5 |
| 46 |
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets] |
| 47 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
| 48 |
>=dev-qt/qtxml-${QTMIN}:5 |
| 49 |
>=kde-frameworks/karchive-${KFMIN}:5 |
| 50 |
@@ -65,16 +66,14 @@ COMMON_DEPEND=" |
| 51 |
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) |
| 52 |
kde? ( >=kde-frameworks/krunner-${KFMIN}:5 ) |
| 53 |
ofx? ( dev-libs/libofx ) |
| 54 |
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) |
| 55 |
- !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) |
| 56 |
" |
| 57 |
DEPEND="${COMMON_DEPEND} |
| 58 |
>=kde-frameworks/kguiaddons-${KFMIN}:5 |
| 59 |
>=kde-frameworks/kjobwidgets-${KFMIN}:5 |
| 60 |
>=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 61 |
designer? ( |
| 62 |
- >=kde-frameworks/kdesignerplugin-${KFMIN}:5 |
| 63 |
>=dev-qt/designer-${QTMIN}:5 |
| 64 |
+ >=kde-frameworks/kdesignerplugin-${KFMIN}:5 |
| 65 |
) |
| 66 |
" |
| 67 |
RDEPEND="${COMMON_DEPEND} |
| 68 |
@@ -86,12 +85,12 @@ RESTRICT+=" test" |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
local mycmakeargs=( |
| 72 |
- -DSKG_BUILD_TEST=$(usex test) |
| 73 |
- -DSKG_DESIGNER=$(usex designer) |
| 74 |
+ -DSKG_WEBENGINE=ON |
| 75 |
$(cmake_use_find_package activities KF5Activities) |
| 76 |
+ -DSKG_DESIGNER=$(usex designer) |
| 77 |
$(cmake_use_find_package kde KF5Runner) |
| 78 |
$(cmake_use_find_package ofx LibOfx) |
| 79 |
- -DSKG_WEBENGINE=$(usex !webkit) |
| 80 |
+ -DSKG_BUILD_TEST=$(usex test) |
| 81 |
) |
| 82 |
|
| 83 |
ecm_src_configure |
Archives