gentoo resync : 15.12.2019

4 files changed, 60 insertions, 56 deletions

diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 7553016a07e8..49a42f83dcbd 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
-DIST kleopatra-19.04.3.tar.xz 1922504 BLAKE2B 660eb2c65942a3bb823fd1b245f035a519d0a078158ba599401bc5c5fbbfc560d082b2032ffcb4f59dbb32b5e7d62f67da983dd2e5cc4003f663cfbf9484d0f0 SHA512 cf55cb118f7f966e02f635f0a2412eb497e557f729aa1dbdb86839a49fd733f117119ca493b590a1e3ebc36de17c2a9467eef16d6377ffe27e7c3acb63094e4a
 DIST kleopatra-19.08.3.tar.xz 1928668 BLAKE2B d32556a3b259b8c4e1a25414f11babf0b33ed3c6bd56405771fe23b207084c12a8dfd9a54877cb2cf36e31608b2a163a42021d7d86002a8858405998a6c7eb98 SHA512 546f00e2e8d1bedc62bd5e809ef4b888e40b83b7af315f7d74b40e3579bb23f5b91e69f7d819333dbd3c261a7ea10498f29c06e9bd30b091a0b4f58906f6b63c
-EBUILD kleopatra-19.04.3.ebuild 1322 BLAKE2B 217c7dbeb80ce2f7973e81603085caf488efbb2787bcb78e387f16136c19ded66c3b383c13cbe88add361fad94414a3bb2580708334b9de919d5f68a53fb6c0f SHA512 9b3cc98e4277f56cb647757737fd50a9d53cb7b091d7b3553e20f57417b2b1f21505345bdf22d39e5c01b4295ce7b99378656499f5bbc7e95261c7108551a680
-EBUILD kleopatra-19.08.3.ebuild 1509 BLAKE2B 47cdfda087ffc186a3455d231dac62f16285b58ebcfe9f2c871b3a0a7b712788cbf9a93f91d87e8dd1305770c350c99fcf420fe45a9826a6e160edadeb940963 SHA512 b63a7a5245e21e98c256b1bf81c0731e2a235f7810ac89faffad2aab95146e369fab1dc124f67714e35768df9de57bff63d8e2b5526b33aa5e70362ee5f7b9e3
+DIST kleopatra-19.12.0.tar.xz 1941060 BLAKE2B b47a90a12d857d75f05fb2f6d55b9c57a738bc974bd3efbb43613d5a8440780e2f225a3f0b63ca9aeddebd4225f8dfa95f888590e18d2a4e2df1b4b4866eb052 SHA512 4f5710a5fd15ec8205156f45efba824da3a8c4dfa075f55367eff42a8ccb1e07ed519bbc8af2cc1df1ea058b67318cc40171134cfa4db3dd338a067c33af6035
+EBUILD kleopatra-19.08.3.ebuild 1506 BLAKE2B f03d328a984db916e76dd888de4dfc3a605d97094dca2127cd124b29b08fc60f3063e79aa96dcc11678b538a71797e3b420c791bd2a2874adbd32f9aaae2b496 SHA512 19ca6f1163389bfbc9d921cfb44e49ab5db5a1552ec9df47fe2034ac3df891b0956a3648d0a25abfc83bfb7a98b700d624d1d3d32597870053d97dae7f713227
+EBUILD kleopatra-19.12.0.ebuild 1517 BLAKE2B 33475feedeeb16eed96901f65ae09981988f5555a61790f3e811383e319adec53dfd73e3a641eb63e75a5959058f4a174de8d246770536bc2a8c86fb4b5b3921 SHA512 43b0fa092a025a3d84938d8b5abb1d014931203e609c99515ca0f4e5420ad24a479a6aa8f107e08de6cbcb827b9511fc91de794d2eefda5b06984e7cca03d4d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-19.04.3.ebuild b/kde-apps/kleopatra/kleopatra-19.04.3.ebuild
deleted file mode 100644
index a6d22a9c4a39..000000000000
--- a/kde-apps/kleopatra/kleopatra-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://kde.org/applications/utilities/kleopatra"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 kitemmodels)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-19.08.3.ebuild b/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
index d8bed4a5b60b..2673a8dde126 100644
--- a/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/utilities/kleopatra"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kleopatra/kleopatra-19.12.0.ebuild b/kde-apps/kleopatra/kleopatra-19.12.0.ebuild
new file mode 100644
index 000000000000..8359e096022e
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-19.12.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kleopatra"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${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/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+# tests completely broken, bug #641720
+RESTRICT+=" test"