gentoo resync : 15.01.2020

3 files changed, 111 insertions, 4 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index f31efa9a306b..0744061ed9b6 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,4 +1,6 @@
 AUX skrooge-2.20.0-missing-header.patch 870 BLAKE2B 8aafc1b0fbc8ddb4f94c1bbfdbf077ae0b2da6ea52e314e51461e503c3e99a5183c5d4e6569bfd76d7639f76b2aad5448944cb5bb33a6afd2fd2c7163eb27776 SHA512 81f6e9b0938430de6c71c708cd0072fac3cf5236f8adea2f6451bbb6676abff854e2f4d751fd09c95f9fc05657d56733a0e30f7423664a1341d981fbb731c87a
 DIST skrooge-2.20.0.tar.xz 21787404 BLAKE2B b289bbec8d6e369298a142360cc07c6d522d44969c55c68de70df4a9ad574e2a07e9b349091bb8b902408afc709552692557363ef9e7ca2a4375abc41236cd3f SHA512 5b4a9b5b17e24e222a99024bfed03d126df117d4b0af5b5828248ecb08df72dc595225290f811c9a5d45b552f465d361f19f95c4c1ef492bb39db38aa68fa96c
-EBUILD skrooge-2.20.0.ebuild 2539 BLAKE2B 3781fd1f606c89c29129275914949facc0205c79dfcb5cbd1b7599a69109864290d3a4e456989e5e9f172f8b0a7b2aa168c1fb25a6173aed01ab10c6840d2015 SHA512 eaa45c5bef18ecfdc685980a4c88dcf0a990e9b4f2d4388d56306564de5a741b9f4952ae9c057136c4c02cc6d306f3ca14df66058829e2b3d3147ddcc06f8268
+DIST skrooge-2.21.1.tar.xz 21487048 BLAKE2B 64eeb2e14a18e57f8fd89985e28e3b2736e4ece2ffc5132478531ba19a6f7ad821a5198570f01fd6bb3ad79410ba69bc7b0cdf8c5a85243bff3a879ad2458a2d SHA512 7d87576b38bd0dea1718babd818115b56cdae9183ca6b7b7631bcf749f2ed2b6a49989275fa5603906e08457bcaaf66404b4a76e31c6b84653f40e5b249d31c5
+EBUILD skrooge-2.20.0.ebuild 2521 BLAKE2B 817d6e7d910b223e9d7770f48f14bcd64c16d2743f491e1eb50636655a6c402c0bbd60cc444181bcf427c34c0ff773f7ae15b903e15e760aaec218d22819f1c2 SHA512 128289c9d23c7c2c16d3fb9868f480ecaced88287bce423d5d80ed67d047e94cb238b141ddfa6a66e840c7199247160d34227414148bceeda3b3b901ccc5d43f
+EBUILD skrooge-2.21.1.ebuild 2758 BLAKE2B cde482f80e91d2a1bf3dc776e900c2139e9f18b4b6f5373608b2fb0c12b9443a6fa7ff4db9b5d24aec8e9affa6e874b5e9d30263b5f6b37aa87cfb52dd891760 SHA512 271b4c094ae7af313adfaee7a98cb0c90c36ff84a849d72c507a4efae768056fcdb842365c8235633e057e430f96ec8688ec8c9e823460feaa6c63d5367836db
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.20.0.ebuild b/app-office/skrooge/skrooge-2.20.0.ebuild
index 8ec5d4ff9162..7d87ce4cec46 100644
--- a/app-office/skrooge/skrooge-2.20.0.ebuild
+++ b/app-office/skrooge/skrooge-2.20.0.ebuild
@@ -84,9 +84,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)
 		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package ofx LibOfx)
 		-DSKG_WEBENGINE=$(usex !webkit)
 	)
 
diff --git a/app-office/skrooge/skrooge-2.21.1.ebuild b/app-office/skrooge/skrooge-2.21.1.ebuild
new file mode 100644
index 000000000000..913f2d0c35a5
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.21.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities designer kde ofx webkit"
+
+REQUIRED_USE="test? ( designer )"
+
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5=
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	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
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=$(usex test)
+		-DSKG_DESIGNER=$(usex designer)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package ofx LibOfx)
+		-DSKG_WEBENGINE=$(usex !webkit)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	ecm_src_test
+}