gentoo resync : 18.11.2019

3 files changed, 48 insertions, 175 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 234c35e5a597..86a840ae9efc 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,8 +1,6 @@
 AUX kmymoney-5.0.5-missing-header.patch 755 BLAKE2B 156557b8e264bf56b5a5c8e2d05e4fc3646d660776ceef66089af19c24e8a6f866e398a97d71073b80e4305e7ba8450a76ac492f180155010f62f0e1e0370b32 SHA512 02d589e7b2c90495835cc020f42377c93a1a478ea00a7a7a59b407a097d96306664536fc99fa4bfea359b8accb47ae0c08f63d28feca0c6fa0bbfd44addb7893
 DIST kmymoney-5.0.5.tar.xz 11706112 BLAKE2B 7c0e51ad2404a88affd7b99c8ca59b813b646a7d995b5d7f6db311c8813f2966d14b34271f3d9de73d07c763fb191e9f4c0737e64feb35a62cd719856c20bab1 SHA512 ba8033b974b93d47cd2a732a352025715845d3dff016a49babb6b724d5e9b726f84f5e2a1f1f42765a6ff35a00d3d995397f2831981d48cb8468d1407030584c
-DIST kmymoney-5.0.6.tar.xz 11713976 BLAKE2B bfc4aacff79f0c92145257e7398271385f80d9ac7460b35f691c1e45dc115ebe91418a98a1a5e6a6c0cdc376beff7b92c8f7d7a29af3d2529503e7db4dc4b77a SHA512 237918b0844d5d9129d086f403090acf21be6e2ba1f41d575ff9de514a9ddcb7bd616da1377ecc34c4436e12481e425615ab640e7549c783d9010b22c0460480
 DIST kmymoney-5.0.7.tar.xz 11667088 BLAKE2B 4d523bb9ea5d41dc6aa6e52b0b982384c6e6ad3cf6981e961f137320a36fc395136b81dfd3b8c8085375c46dc9affaa5b746f9250cce72a6c8ad6af669e5109c SHA512 af0663bc7ac3fe59a8c7db09942bbb8a182ea5f7ee3bdc05e7ed449c7172040de2282997db95fcce823f7d3d8f6f2b43229b5e4ba3b349eb8ea3b2756636f6ed
 EBUILD kmymoney-5.0.5.ebuild 3278 BLAKE2B 91e564fbfa0323bee326b1adad12c1c903161feb65707d3d001d6679f9eb51a1d21757578bcbffc247de0682a20d3b9d7706f8ac3567e4d8eb2947cb7dc7ee92 SHA512 755df5db3e7d4623498df44c9d0acf5ba4edea706d7d1e087d3ebf4422d011c254d9f711401323ba162c316ea557c1c45d21df189abcc3934fa26085e0adf56a
-EBUILD kmymoney-5.0.6-r1.ebuild 3273 BLAKE2B 6946e4f2272d9c5f7e184a3393a0d8489e0563a3c6c4fc277f7d3d76452eff805c5e978346afd0ff749e5395ce30aed40194258700a60656368b9f8b0af9fbe3 SHA512 b42fc4eb35cffd2c55f91474f76cb93987ccfc22b8306df0ce15ac79ac7f72a35d406e2d39744ae4f8a889fd8b15484fc6c9c3f7dfc2703e4588bc186c89e4e4
-EBUILD kmymoney-5.0.7.ebuild 3289 BLAKE2B 6869270fc7488729f843805324cb05c1f8355d06a1b3f037754e998d09d78dd475e3babd4dde9c7d25a792ddcebcb500088a072ee2d46c0068b4cc7674a5515d SHA512 bad389cecd8d69c00466da15070103ab11363dc9d80a4283029849cab6fb98c2befcd31f925aeca204e59088d59fa00ee077472cfd7f1483c2297c57f6c30dbb
+EBUILD kmymoney-5.0.7.ebuild 3470 BLAKE2B 2d2dd0551a5b2ef4d2b0971971f981ef38682a763da37076a7b65801dff96316da3efbed9b1f8e7a9efcdb6152ac789e7359e047bba762a3f2c4665bf880382a SHA512 90d117ced190dfd009b93d4bb00257b24ed417db43cb6f43f6b28115a0e2f709b2e5b3c24a11ebbf1819ba80db1352bdde745013fe0a6bb9dbc952b6dc687592
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild
deleted file mode 100644
index 5d59ded0b0fa..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-libs/gmp:0=
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
-	addressbook? (
-		|| (
-			$(add_frameworks_dep kcontacts)
-			$(add_kdeapps_dep kcontacts)
-		)
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.8.2
-		>=sys-libs/gwenhywfar-4.20.2[qt5]
-	)
-	holidays? ( $(add_frameworks_dep kholidays) )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		$(add_frameworks_dep kdewebkit)
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	weboob? (
-		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
-		www-client/weboob[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	use weboob && python_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package addressbook KF5Akonadi)
-		$(cmake-utils_use_find_package addressbook KF5Contacts)
-		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob PythonLibs)
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	kde5_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.7.ebuild b/app-office/kmymoney/kmymoney-5.0.7.ebuild
index 326c361fbcd0..d152f89f7ec3 100644
--- a/app-office/kmymoney/kmymoney-5.0.7.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.7.ebuild
@@ -5,83 +5,84 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
+inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Personal finance manager based on KDE Frameworks"
 HOMEPAGE="https://kmymoney.org"
+
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-# 	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
+SLOT="5"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	>=app-crypt/gpgme-1.7.1-r1[cxx]
 	>=app-office/libalkimia-7.0.0:=
 	dev-libs/gmp:0=
 	dev-libs/kdiagram:5
 	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${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/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${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
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	addressbook? (
-		|| (
-			$(add_frameworks_dep kcontacts)
-			$(add_kdeapps_dep kcontacts)
-		)
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kidentitymanagement)
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
 	)
 	calendar? ( dev-libs/libical:= )
 	hbci? (
 		>=net-libs/aqbanking-5.99.40_beta
 		>=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5]
 	)
-	holidays? ( $(add_frameworks_dep kholidays) )
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	ofx? ( dev-libs/libofx )
 	webkit? (
-		$(add_frameworks_dep kdewebkit)
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 	)
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 	weboob? (
 		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
+		>=dev-qt/qtconcurrent-${QTMIN}:5
 		www-client/weboob[${PYTHON_USEDEP}]
 	)
 "
@@ -95,7 +96,7 @@ RDEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	use weboob && python_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -113,7 +114,7 @@ src_configure() {
 		-DENABLE_WEBOOB=$(usex weboob)
 		$(cmake-utils_use_find_package weboob PythonLibs)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
@@ -122,5 +123,5 @@ src_test() {
 		-E "(reports-chart-test|qsqlcipher-test)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }