gentoo resync : 18.11.2019

2 files changed, 32 insertions, 29 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 857f32f5f981..dfe86bcc2862 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,7 @@
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
 AUX akonadi-19.04.3-qmysql-fix.patch 1642 BLAKE2B 5ca247ec787d6f4182fdb13e8990909548473adfc2ef95a1bdfa29f85c76a6747f1c9135f5220e290c64397cc0d2c3c6b7c060f76d89147394b2d7d71b7cba13 SHA512 6678df405c290989667a2d58317517378c365862650f851a1ae3d919e3370dbe216f42db52c0cb5f7b7faaad252ae08aa55f6c8aa0570927546af73892056e1d
 DIST akonadi-19.04.3.tar.xz 1574868 BLAKE2B f520f5e8f8fc6480b6e44d6f91c561317b2d3460072c5473baccdf149c0e9eca5587cfeefaeacee0e504349624418a0ba5de7042866c0f5806de0b677f8f38a1 SHA512 62d7367ef87cd6fd7e26ae87dcc15df427f3b647618334a5ae67e722ca16dc2c7882152bd6172ab6a0982979f45271f6d65cc15b18f86e8a0ebf144b1bbe576a
-DIST akonadi-19.08.2.tar.xz 1578452 BLAKE2B 87946dd8847064c353ab57d926ff767a292d20d44e50e7abc8defe5c1ccf3c82f5cc429176714c0c2f5c77ddb8a63a1da0b7c9367a55bd493e44d13f0173968a SHA512 80dc550a7502bde7edaf59c7fd765992569204ae5b56b9026e29c1b6103240b379ebe72c1b9804336d679aa0db3a3c2231140516d492d760497bdd59cff9b354
+DIST akonadi-19.08.3.tar.xz 1579468 BLAKE2B c7df5162768a00d395d598a098a25aa789c2e9694958cef47a014a744b4e7322471b3855963fb1ec63708608a59c29f5cdbf7049848d8a44ad7e88366316c18f SHA512 612cf8860476c32462dfa565c392a94f7fdb60953dc3afe7ea87ffdd9e78ec5f01e44aaf2ba0c6b018fa0f4cc75d1c56da1211daa13eb9589f270c2761da1e6e
 EBUILD akonadi-19.04.3-r1.ebuild 3526 BLAKE2B 7f30ab98cee979d02dff8b402084894d4b2da241466e41639488a872acbdf8232ca958ce7dcd4d675ecb634b0567813f9554448d6f7ad9cb3c6a9ffaf53095bd SHA512 3f55230c10f5513130a6044108b41819cdfa820a652dd7f675d6ce5ccb21ef7211514c09a51ed95e59fbfc0a3a86f04b8a7b44a6249dec458815d41b2f65cf95
-EBUILD akonadi-19.08.2.ebuild 3491 BLAKE2B 99c3f70e574d0c1bffdf76d8ac3e29ed58fe718247a00f1954ba703de0b33338879ab6e753181966e250411e47992a0d5ddbe2d5f307041154c1c0787f52abc4 SHA512 711d7271a471026a552bc9e6612c6841c5183e71aff278bc2815f34d4c6ca12a540d2d734624627027138ad38c6145b6266d262fac4721126c371cd4023dc204
+EBUILD akonadi-19.08.3.ebuild 3646 BLAKE2B 0dfe9f6d15fbda8515f7950e83f6094658de32bc498eea187c4b78f2f72e1603f6ab8d7dd0a1f62ca2df6fe2271cb9dd3b4d7db5ad5843a22b87f7821bd4c820 SHA512 837e21b1def7e896ba032e0e737c0e5e3cc49590d8a29dbc578fe52226f2b3d71195422637ddca41922251ef3df8e0182782fc575ccb52543c41fc51a9dff7ee
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-19.08.2.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
index 60a1a49252df..29ed0f40384d 100644
--- a/kde-apps/akonadi/akonadi-19.08.2.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.3.ebuild
@@ -4,14 +4,17 @@
 EAPI=7
 
 KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
@@ -19,28 +22,28 @@ IUSE="+mysql postgres sqlite tools xml"
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	sqlite? (
-		$(add_qt_dep qtsql 'sqlite' '' '5=')
+		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
 		dev-db/sqlite:3
 	)
 	xml? ( dev-libs/libxml2 )
@@ -88,7 +91,7 @@ pkg_setup() {
 		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
 	fi
 
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -98,7 +101,7 @@ src_configure() {
 		$(cmake-utils_use_find_package xml LibXml2)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
@@ -110,11 +113,11 @@ EOF
 	insinto /usr/share/config/akonadi
 	doins "${T}"/akonadiserverrc
 
-	kde5_src_install
+	ecm_src_install
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
 	elog "Available drivers are:"
 	use mysql && elog "  QMYSQL"