gentoo resync : 18.11.2019

3 files changed, 65 insertions, 61 deletions

diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 80f5432c2025..1060f112bc35 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-19.04.3.tar.xz 691900 BLAKE2B 78f542ec2fbc3e8defe2a182a0bc1ae28490f0806a7ae31d04ab526e842b840e27ba5632a2b50a64b8c6671ee63c31aafb0bf8a16db98bd864976e69da377f26 SHA512 66c6a180f27ab727be38184ac847aba3f0c6fce962b244d8d4dbc7296ffea02e85a3b0ad89213df5d9f97974e06d3331879f0e964726e7db417c8102668527dc
-DIST mailcommon-19.08.2.tar.xz 693916 BLAKE2B 53827e72768fb372ae59c501bb00e8c1e8ee5b71e5fad41709089cdfb38f5ee323ec6977d56c10e3951d99b6f454f43eb7595b2753692a25da00899f8c4f6a6a SHA512 1f7e7824a366658c8c17c3ada11d47d55132a50609b2d43f5872dc5321e25f2af83abaceed1fb62467dab096b6bd0fad7667c237febd3b6f7e3cd54eb866fe4a
+DIST mailcommon-19.08.3.tar.xz 693672 BLAKE2B 2be6b716903e83a8e9397a24d8f062b65180e39fef1b0d784804a9bb09a1760d66a2099c331da6456c3bac7654d91c238acc3275961fbd4234afdc11c8784470 SHA512 d1bf8aea689f0cb24dc2030c258795465b3a5e5c16bb49a2f35f62b999faf97cb40f0dd3d4e2bd2d6033e48438bc693fddcfa69d34ad799f4fb22d808f9b06ff
 EBUILD mailcommon-19.04.3.ebuild 1413 BLAKE2B 4c9e1df1cae6b2b7b5796b012c11662c1aff80fa378b6b49c0915461002d53074b727e6fe0c7041c05f9d948bf8cd2d4fe5a2338bb843b7c179252b1c857bdee SHA512 b61a6c17a116e6a8d6dfb7113d8f46d69e2491e21fe0258475ce85dc6ce4417136ce577d2dd23304d3db4516ce376afaedf4999ba1388ab05ffe0fecd880fee5
-EBUILD mailcommon-19.08.2.ebuild 1518 BLAKE2B cbd0cca8fb71605629f3a8af2c268812fb42a36df18e08f83b2e6e217f73132bf5043758d50abb69ce0576643ebf407c37d33684980da8bbc0dcece41fd8d2ab SHA512 eb453f6ae1ef4e2d09395d9d4211b8120a391f60379ffaeb9db95359915afcc4bcbeee452a5f1d626ba6e4fb482023efd906ce1f342c4613ce9516db71675a27
+EBUILD mailcommon-19.08.3.ebuild 1733 BLAKE2B 3eb9d54bc2db295f4165d80d000c45f219ea1fa43a43d6f2589a13721b8daef6963ef6daa6a3aeb85b27fa0485078c16070314f93468fe0b65817da816131a6f SHA512 184fa17627dbaaa77e8e3df4499fd57b6c4f5314083882c2048d33a136c63b124b16893a0030934d6dcf1568059d39348c53d18f7bba8153aecd79ef0e31fd54
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-19.08.2.ebuild b/kde-apps/mailcommon/mailcommon-19.08.2.ebuild
deleted file mode 100644
index 7670211af1ec..000000000000
--- a/kde-apps/mailcommon/mailcommon-19.08.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common mail library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtwidgets '' '' '5=')
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-19.08.3.ebuild b/kde-apps/mailcommon/mailcommon-19.08.3.ebuild
new file mode 100644
index 000000000000..508ef396813d
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-19.08.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Common mail library"
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+	dev-libs/libxslt
+"
+DEPEND="
+	>=kde-frameworks/karchive-${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/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/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${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/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=kde-apps/messagelib-${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=
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"