gentoo resync : 15.12.2019

4 files changed, 68 insertions, 64 deletions

diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index f5003f3787f0..fe1555fe3381 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,6 +1,6 @@
 AUX libksieve-19.08.3-qt-5.14.patch 1332 BLAKE2B 128c2abb3814624c38e929ce028611e8bb8c9f5755e5d7396be1c9700cb83b6735d0d993beb5b1a61ebca818534243c89da04f02e9e2edc9a398c793e554c3c9 SHA512 f4d6da6434a50de22062ee64f6fd321a641459ac7a802a157aa7a7c09f570017bf276956d91bdd921404212232f416de3cb09fec73cc6d7934360d8ded4e5b5a
-DIST libksieve-19.04.3.tar.xz 549356 BLAKE2B 364a12f0fce7a8d24b27cf7a732d39248e53fd171cfeb6651aaa1208a5587b6c1dae081d725092103e00951f00ebb0fe705a2d337710421019121db7e02f1857 SHA512 8afa6825eb0a413a6c2e26be9680b02df8126ba1cc8ec26c14b6e4f5900f5e4f07672f0d5ea9c39e4206ec0feba8b47117375a6ebb97f0f1dfb6e922d0e8c10f
 DIST libksieve-19.08.3.tar.xz 549664 BLAKE2B 53c6ce9dd0a30fc8be01003a6610b20ae624e5c481d931cd8a09fa083ba681ee3fc79cfb9d185b12315e69f972e055ae82cd9c829058822f11c6d990b544564c SHA512 f5aee4894b95d48868b08941198ec9370a3855178c2f48330b36473fa2584a43fd7943a9d91f0781a92e79de126d6e78349c8d97b28b96cd2a006126cee3131b
-EBUILD libksieve-19.04.3.ebuild 1459 BLAKE2B de50886b458669ab737a35bb77d710a8dc6143e4f3bdc20e49a0f612305898814ae5558747ac0779c3523a3f01741d359c0464ee7891011c69ff85d94ec4a741 SHA512 5de4c66d029b96dee81b85f78d30f33f84d968d1e3023831746357c3b93e3f2c088947318034475d3b9d537c359440f9b963bab1bfc2d3a3283d8be7fffcabcf
-EBUILD libksieve-19.08.3.ebuild 1765 BLAKE2B 65bfca3bda12a617d049c6db0d730be776a73e20f191580b21b6143c2a1911024816b443bdcc09267d8f1266e6412c6cd527dbcfbf4120b74b5bbe5795396b74 SHA512 37c2c857939ea50f71bd3c83eae155dfe755e2e31f85d0552a3308fa9c0721d77c793dc15c381d0a415d8b7b3e7d2c8c14bfcfdbcf05287d9174928ee7a4785f
+DIST libksieve-19.12.0.tar.xz 553512 BLAKE2B 25a415e1e00790645704c3872fb9149ed5cc89b1de96c4440ead6c7e16068a8efd3888345b997ccc821284888f001ce9061245702d946f5a1749a935e43827b2 SHA512 b5153dc011cb1d9595d1db195c8cf8ba97f3129c2cbf483c3de99bf77f9ca59d5c94fe706099122f0d1521be628fdd44a7c131665b5a36d149b8ce9dfc0081a1
+EBUILD libksieve-19.08.3.ebuild 1762 BLAKE2B 7b1cec8c0bb844cd992c185d90d1c09b462a58bc7dcc07d8d2e11b398c24518303b82e313ab5186994f948ceb7394ed4cbe7f4b08b27eebcca6928cd37ba0e0c SHA512 5546224c35191bd38c84d3f3982f5e282aa99b26cb1cc3519f763e3ca352aadab14121bb8f537faa151d8e818ee547128e063539867d97532804a8752b9b5118
+EBUILD libksieve-19.12.0.ebuild 1636 BLAKE2B b8cd3bbeb89be2a2a6d107945826d97a51a81e35151c26a7e38c07bda3e3f49453fc23b2a65823d56352f85610e41ec48c8687066ad958ec96967f14816b00e4 SHA512 2c863f4bb27c821de463c25fc1b827d1a309dc0ee78259420cd97d2f648a5370ace3e7c3a780eaaa9c01af1b384d3e1538f0bc0ece08d15b16a20f16813767a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-19.04.3.ebuild b/kde-apps/libksieve/libksieve-19.04.3.ebuild
deleted file mode 100644
index 0ebd59a9804d..000000000000
--- a/kde-apps/libksieve/libksieve-19.04.3.ebuild
+++ /dev/null
@@ -1,60 +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="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libksieve/libksieve-19.08.3.ebuild b/kde-apps/libksieve/libksieve-19.08.3.ebuild
index b702cee164be..4e2e59bf36db 100644
--- a/kde-apps/libksieve/libksieve-19.08.3.ebuild
+++ b/kde-apps/libksieve/libksieve-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-apps/libksieve/libksieve-19.12.0.ebuild b/kde-apps/libksieve/libksieve-19.12.0.ebuild
new file mode 100644
index 000000000000..cf1ad91d6f8c
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-19.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+COMMON_DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmime-${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/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}