gentoo resync : 15.12.2019

4 files changed, 54 insertions, 58 deletions

diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 22ab01a5a53e..bb9ccedd14de 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
-DIST pim-data-exporter-19.04.3.tar.xz 272860 BLAKE2B b1494f33d7a876bb4509283a1fffdb4cf96e72d41212d909b5125085decf5877b5a0006c818a00f4d92e639a52ccf45f4f55b6aee8ea8a6b240e475228c7622d SHA512 a51521f8be993bd6dfcfb21cd82b13e2be1b51c32f17111064fc28b674de9ee1a7165f1e631de1e8c02d7defd02f0c7ed30ce33f549c9ed2c55501d2e3d92c32
 DIST pim-data-exporter-19.08.3.tar.xz 203340 BLAKE2B eca663a60a51c1b5040a374a50da519a39dd01aa3abc87d1daaf27b3de630eff01900086acf82bd58a1a4e6b2b3b29b9559dbf568aa8cffb760ce93b9eea653a SHA512 551251dc0fd260212c0d774ea730d1b863c320595a356dd755dd8ed8bfbe16193cef7967a1114c7cb163ab4bb06e7646992d6ace15c305105dd7f79806348637
-EBUILD pim-data-exporter-19.04.3.ebuild 1362 BLAKE2B 4fca04c4cc64c1aacd9ed07e372b0974014eaff32d3208ea82d6440fd769abbc7d8fc5f940fc67c19e375e5317d8b998ff8d12a744c038e78fbe4746752b2d36 SHA512 1142d3c335d11ef8a081eada76844a0b9723abe6ccab3653b36db387ebc3e261b5f76f8112a67cc92673c72417e1fdf5da4e6b3f2ed67f4ceb8b02398af7ba98
-EBUILD pim-data-exporter-19.08.3.ebuild 1398 BLAKE2B cf9727e75f5daaab7db0b3fd9b05a5422dee01065f3cf46af83e0728f67ee727afcce25151b0c978618066130a6f78690fa74b9b6f60a78f54be7499b651e1c2 SHA512 14db0f43c5ceaea154250d68fbbb86f567c3336f9e7a36e56feacfdf29010ef85603d49869a82ee11bf5274dea8976ed12a02f369da9825074f297af6ac0196d
+DIST pim-data-exporter-19.12.0.tar.xz 205292 BLAKE2B 1355b59d8b659037320f791aeccfc3f6168a9ee4563fef1efe6ba170317db94ee48830160a2b659d6550d39e0d322fb4a099a0b0199b7bd482646af5e5977f62 SHA512 45f620fedb50090d70852968c5f3b58ab2e0076ca4db9ad4965b602b84653c15a47f4786b00c55bbbf621b596e8d3ad1ffbd3496b6e97ece405d69a5e184c901
+EBUILD pim-data-exporter-19.08.3.ebuild 1395 BLAKE2B 5b7605258c10ffa8658c8e32db4d8cc78a8ed5b2a0fa012bc4b3c6cdaf2a4a12a1948e95bb7dbc977cf6a3046f66a034b66cda1f2e62e54dd4e058d1fd78021b SHA512 f62b82f74bd8ea20c30f616b9c16c2e5cd646f91c108782575777f378e466d7ae1cd96a4df426c34021f37b07c3c441446fd7c4410e0ff15c2fe9298b5275b21
+EBUILD pim-data-exporter-19.12.0.ebuild 1399 BLAKE2B 7fd55f119668b56e52fb2a787261ab4c84c3ffbf97cf9a9ec1d58bace7b3c1b79ba133676b75cb354f9e515ec5bb03fc8e9c11cc86291879dfd02d509a2d9157 SHA512 619c71538ad8337945d261723e998ad14bfe5531caf72d1c0a6437dea830fdd34d260b7b013d0fdee1e634d691c7ab2f0e687ebaa360a1995ee2ecc12ebb7ebd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.04.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.04.3.ebuild
deleted file mode 100644
index f615dd775f7f..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-src_test() {
-	# selectiontypetreewidgettest is broken, bug #665690
-	local myctestargs=(
-		-E "(selectiontypetreewidgettest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild
index ba182658f891..1ef4e29299df 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Assistant to backup and archive PIM data and configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.0.ebuild
new file mode 100644
index 000000000000..46a7df3652d5
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"