gentoo resync : 18.11.2019

3 files changed, 98 insertions, 94 deletions

diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index dd577fd95091..0783300dafe8 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-19.04.3.tar.xz 2223788 BLAKE2B 2090eb113fb29d7d6ed82045b54b4092e9509440c9f08134104261b9316e08784c23c3bfc98b65eb0d23f3dd64843a3788683cbb02adb9af48ae2007365bba41 SHA512 0aad7bec431c181f50c2e86b52cd6bfac969243a4f418adf8362a5b686ca0fc433f4520d7c1eb995fd655b717048831712d9bf38cb42f598f9d2d5847e55e269
-DIST korganizer-19.08.2.tar.xz 2225808 BLAKE2B f255cc2d30f624a37025f6521e54bfaa7d2146851ad2583155351cfb89487f308a5011d3ed8074ae1482679619ed29864a02da39cb8e9058b8bc2a6cbf3aa4f1 SHA512 7b73444ef6b7d094a0d4bacdf642abca6ddcb74161e8ba8f4665d13739f8b4b080b8033bd7a18062556ae616b8c3214f84285ac202f4a17627580646ede86eee
+DIST korganizer-19.08.3.tar.xz 2222956 BLAKE2B 04b723d856e87dc710e1a27cbd4f8f7790c8a587d7051fdfcc838ebf798d2576312268ad39090c2afa6c5ad764955229ea9b224eadd9cf93c0cde85d1ebdbab7 SHA512 f51b2c569d68a1450cf1f57ec168e33015ebb45d4ff8f5e936523e154c72ad349af2d9d6e7e6269486557d6fe27ca7e24da0591c603fed13eb93e6443bdf4f62
 EBUILD korganizer-19.04.3.ebuild 2492 BLAKE2B 9ec99a774509eae73a2c2e79bec181cbd17d0bb93cfb2910838c526a1cb79c40530c4a98788d593b4d0acbd21617d2b565ef17c73d352a7406c624e77325f209 SHA512 b1a68a3b998e8ab4a5e79285fc1de6a42fe389f60ff2252aa88ea994ac00fad8d6520b1a355f225374937de04b134aac99ad96d3e39ef846e5eb97d78aefec20
-EBUILD korganizer-19.08.2.ebuild 2507 BLAKE2B 464353af58f2a01708818b7282a07ac7c71e7a305d26458ee1b9e8ecc17e25f042c4960b1e27294957d6df29fef9b30fa727d7b91522bbba865ed8aa39e5c5ad SHA512 3b786b1ae842c66a5c4fbc278903e1d3c0ac473ed932be1634461ce6477b6ac4b564706262109d001886e44ddc59ab9a53db093aa3db24961c2b5f51ca05cc7a
+EBUILD korganizer-19.08.3.ebuild 2813 BLAKE2B 321e49549a607f1f56fa3244e671b3762cebf2ebf798f725f1f4f62ade50edfc481e8dee03978d3a3369c3f3d52121b96719dea67bbc9458373b5975810e37fa SHA512 a13fef4191a56120ad94ca65708682d1ca89d7b113538e819c86f2108fed788288bb28dd3bedd35f36ee615b5936e477cf408feac3d8f52194f7dd766548d55d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-19.08.2.ebuild b/kde-apps/korganizer/korganizer-19.08.2.ebuild
deleted file mode 100644
index 027eb9faa002..000000000000
--- a/kde-apps/korganizer/korganizer-19.08.2.ebuild
+++ /dev/null
@@ -1,92 +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="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://kde.org/applications/office/korganizer/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X"
-
-BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep designer)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-19.08.3.ebuild b/kde-apps/korganizer/korganizer-19.08.3.ebuild
new file mode 100644
index 000000000000..7eabd1e6f519
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-19.08.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://kde.org/applications/office/korganizer/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${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/kholidays-${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/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kldap-${PVCUT}:5
+	>=dev-qt/designer-${QTMIN}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}