gentoo resync : 25.11.2020

3 files changed, 11 insertions, 20 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index de64c8ab2be1..38c1f199995b 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,3 @@
 DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
-EBUILD skrooge-2.23.0.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
-MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
+EBUILD skrooge-2.23.0-r1.ebuild 2554 BLAKE2B d12e835335e7055926b9504fa2f56fb47852e6c5adc28003e98cdc30a43dab36a0e8923bcb6a3dcd6e6ce7465480df6e4bc8263cd8171968a0fe99b187f6f7b3 SHA512 964146d58dfac917526962b0e3112d5cd159450fdffafe17e767606e12d28e01bc2b5293f5ff9bb1c9cafcde9c39d06be4707f03f40780408772fbb0a2aa5a73
+MISC metadata.xml 324 BLAKE2B ffd83d73c861eb5aa5281a859162ba693bd9ac642f7475b28419aa92c512e6caeef1fcecf56faade8b9c6573f9b09c9023dbc7f1a153f59aeea9e4c7dfa30571 SHA512 a5af84ff6c29117ec87f605e4d565a133656a05a9669a6fb2190f6c8706c4cee56c40df024c0160d391ca5e74be7a3d45244a86039cd403b0f60bc0334977a7c
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 5156b3be98f4..1836abd9c97a 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -7,7 +7,5 @@
 	</maintainer>
 	<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-r1.ebuild
index 49a210b9ac01..30a3fc6d61f1 100644
--- a/app-office/skrooge/skrooge-2.23.0.ebuild
+++ b/app-office/skrooge/skrooge-2.23.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -20,16 +20,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities designer kde ofx webkit"
-
-REQUIRED_USE="test? ( designer )"
+IUSE="activities kde ofx"
 
 BDEPEND="
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
+	>=app-crypt/qca-2.3.0:2
 	dev-db/sqlcipher
 	dev-libs/grantlee:5
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -41,6 +39,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,33 +64,27 @@ 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
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 "
 
-# hangs + installs files
+# hangs + installs files (also requires KF5DesignerPlugin)
 RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
+		-DSKG_WEBENGINE=ON
+		-DSKG_DESIGNER=OFF
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package kde KF5Runner)
 		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_WEBENGINE=$(usex !webkit)
+		-DSKG_BUILD_TEST=$(usex test)
 	)
 
 	ecm_src_configure