commit: a5b446eb74f3513800472190f471d232229664bb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 17:29:18 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 16:09:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b446eb
app-office/skrooge: Drop IUSE=webkit
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/skrooge/metadata.xml | 1 -
app-office/skrooge/skrooge-2.23.0.ebuild | 13 ++++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 5156b3be98f..6afd808cbbb 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -8,6 +8,5 @@
<use>
<flag name="activities">Enable kactivities support</flag>
<flag name="designer">Build plugins for
<pkg>dev-qt/designer</pkg></flag>
- <flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg>
instead of <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
</pkgmetadata>
diff --git a/app-office/skrooge/skrooge-2.23.0.ebuild
b/app-office/skrooge/skrooge-2.23.0.ebuild
index 49a210b9ac0..d51ab0baca2 100644
--- a/app-office/skrooge/skrooge-2.23.0.ebuild
+++ b/app-office/skrooge/skrooge-2.23.0.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2"
SLOT="5"
-IUSE="activities designer kde ofx webkit"
+IUSE="activities designer kde ofx"
REQUIRED_USE="test? ( designer )"
@@ -41,6 +41,7 @@ COMMON_DEPEND="
>=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5=
>=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
@@ -65,16 +66,14 @@ COMMON_DEPEND="
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
ofx? ( dev-libs/libofx )
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
- !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
"
DEPEND="${COMMON_DEPEND}
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
designer? (
- >=kde-frameworks/kdesignerplugin-${KFMIN}:5
>=dev-qt/designer-${QTMIN}:5
+ >=kde-frameworks/kdesignerplugin-${KFMIN}:5
)
"
RDEPEND="${COMMON_DEPEND}
@@ -86,12 +85,12 @@ RESTRICT+=" test"
src_configure() {
local mycmakeargs=(
- -DSKG_BUILD_TEST=$(usex test)
- -DSKG_DESIGNER=$(usex designer)
+ -DSKG_WEBENGINE=ON
$(cmake_use_find_package activities KF5Activities)
+ -DSKG_DESIGNER=$(usex designer)
$(cmake_use_find_package kde KF5Runner)
$(cmake_use_find_package ofx LibOfx)
- -DSKG_WEBENGINE=$(usex !webkit)
+ -DSKG_BUILD_TEST=$(usex test)
)
ecm_src_configure
