gentoo resync : 18.11.2019

3 files changed, 74 insertions, 71 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index f973989072c0..7cf35fb214d2 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-19.04.3.tar.xz 10476616 BLAKE2B bf853931d7c4cb352156ce415f0e53f75c7baefb9083fab4f16d908d0b1aa3e4b85f65e0aac8b9a22bc0731080521cf072c7d5eab8bcc9f9130edb189419143b SHA512 ae1c9df358a7eda251b63d2c7b16b230b62e005eb470923d00667402614ae0b199aa1c563f89200379f9f3f746c36104a14a84538508ddcd2d3cea4db820d91b
-DIST messagelib-19.08.2.tar.xz 10393260 BLAKE2B adc592ce2817225ee0a692b36b34296bc9ac17a935607d16b3bca9072bc84d1d42f33aec112774fecab1a0d93c343099b7fcd9123758e9329e4f3bc10d46fb48 SHA512 87003ba1f6181c553be8a77ca0bcc9f62c7691c79eb6fde0ff2690520a305b2137c51a0d0b762deb9ecc35005253afd4dcfbf1f73fb4a62dc0b10201704441f0
+DIST messagelib-19.08.3.tar.xz 10401352 BLAKE2B 1aefa35536c65b63a7a8e80f04c603a7d79ed79817b216341e561070de54887c445d00a0bcd214ac2d4381a2f43a9522ac9cbe443ad9da412ab4bf7721739554 SHA512 defcd4534b1e61a6e115aa2106e92c8bd0d3405d7ff3e2f4a0616d4cd418cee513367215da57585a66f47d2208c888ed7fdef8f9bf70758f787551d009f746aa
 EBUILD messagelib-19.04.3.ebuild 1903 BLAKE2B 10326783f1df4d08e2b3c19feda4fba0302b8077be0aaae4696bf8bc871f349e1ff2727e0f24df3e85651414a50a679b3c9932d4092c9d67f7bc4c9bd7f6718b SHA512 1d7d5264fc6e258f0dee9439fe9707086bd556a1755a936c178b27f983a918a6cb08332e8995b3e92ed7f4cb57ff3d2ec7d002ab72da10fa170ad81d6b480a62
-EBUILD messagelib-19.08.2.ebuild 1917 BLAKE2B 99681c6cd419f252f050e685fa2cca5e90f2db213a208be3894010c5b456e1a3b29753b3aba1c6b05d699986bd216e9d84487acdd56d140b84d32a24aae95699 SHA512 a1928fd0ebd856520b7f24d385088cfcdade6ee80111c2cbc59a8dbaa1c1c73e4373cb1a9cfb0ec4339b759f3f8530c0258096e8a65ce9b20d2b0fee55f81e0c
+EBUILD messagelib-19.08.3.ebuild 2167 BLAKE2B 7b78ca3b189805e8c0a9e5e1621e4f8e0728ccdfc3876773f26e4e3d36e605ccc46fad0b8f67edd316d5a6ca6c46d1657cef711f7d32d934a0efcf993eaa7c65 SHA512 a982b0587b6ae9bb43ddcdfd21a0539445f7e2d24f6248ab18dbe37262bfcf5300222aa5660bf6ae0905a1d774c3b6c4be73fdb40da60456324382d4d860f90d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-19.08.2.ebuild b/kde-apps/messagelib/messagelib-19.08.2.ebuild
deleted file mode 100644
index f50b98e3de69..000000000000
--- a/kde-apps/messagelib/messagelib-19.08.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcalendarcore)
-	$(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 kdbusaddons)
-	$(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 knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-19.08.3.ebuild b/kde-apps/messagelib/messagelib-19.08.3.ebuild
new file mode 100644
index 000000000000..0f21bc7f336c
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-19.08.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${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/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/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
+
+# bug 579630
+RESTRICT+=" test"