gentoo resync : 18.11.2019

3 files changed, 50 insertions, 46 deletions

diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 0b564289143e..9cf0dfd9ea18 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-19.04.3.tar.xz 332632 BLAKE2B 928fc1ce338f90fa16378eddab3861aa49938f35d434259675362ca1a4461cfc7c4181f2c14f5b037be8f4e512ba917b3adb58440415c34c4a1c91259bab2c3c SHA512 b72b79c51d007669f637299a60dc246a363a9484f332983c348984e62e8e1dfd3f7808e6de9014efc09786f78a12bb705cf11193c32071aef7b916c7a4abc3e2
-DIST akonadi-calendar-19.08.2.tar.xz 332664 BLAKE2B d31dc5a814e0c08378f8da44adebd3ef0e5891eb7782b8eec915bc11c9f5cde5f1e753af742135a6fc88f41e768021a859c54c326a1e15ba8a8f8ba33b9138f4 SHA512 387b9c8cebce8f4480e18888f55c183021a9d84d356074b17e4b1def5e6f1a7bd8deae1a54441bad19c47fa16d40d476119ed621ab8414ff42e669584bb972be
+DIST akonadi-calendar-19.08.3.tar.xz 331796 BLAKE2B 0e43007a230c315919daf5203f5df71caead01b6c63e5a5ba01b1ac45726adcafcaed7e4a87a2900677baf81539630f4238792d62224d41a6fd86dd17f25bfb8 SHA512 e4c22cb43b7ec87f947ceb2746e159d75f6c370f16a9448c7d6ab46b30ce00f25624fc94f68e5a866651e49689248aa36de6f2d72cd3e15d5ef05eb82d6885ae
 EBUILD akonadi-calendar-19.04.3.ebuild 1158 BLAKE2B 5810b19759b28d1ccb55642dbb9b27d757176006ec15173515971f0c710bedd3f18b8d46d0400ba984bfffcf0d98b4013ffd4d382f1dc724a6348a82ef971330 SHA512 8accd7ad834b011f61f7ee16f87cb6baca1888c1016766adabac903fb62234450998b4bc850c398ca1de7ba9c7d7c8e57ef4869f4b4bfd4707e1b09152e60c31
-EBUILD akonadi-calendar-19.08.2.ebuild 1108 BLAKE2B 83de3d8253a8ac3f6847049901d62b6174156e16426131259a8e952af6c247db3ff0577957193990e335679ea31dbd4921333cb549180bd17cada3622eb2ddef SHA512 def1a3957e8bdb05815b1a621e1651c657293608fdaabc07775d37e38bf08b832578cb4d10b7b4cd6c3d2f6196f8010d2b8ae3d4612b16efd0af82c4433a25f8
+EBUILD akonadi-calendar-19.08.3.ebuild 1288 BLAKE2B b82bc49817feabe9a351243a630f40550f996c2ff97d21d7eae4c395f311dd2bc019dce0559c35adfea395033b53fc4c9ff926c24625fd5765701a7418e8fc5b SHA512 0795fa6eb76deae138c559023de19f7478ffae80f02748527e3ca03ce0b951472041ae1b46fd7edac15f2be32140ca115ff4d6bc515cbb8144470d0e16dbeb05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.2.ebuild
deleted file mode 100644
index 8f217b7e15b2..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
new file mode 100644
index 000000000000..488e99343f4c
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${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/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"