gentoo resync : 15.12.2019

4 files changed, 45 insertions, 39 deletions

diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index b3005bd1adc7..901244fcca1a 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
-DIST kcalc-19.04.3.tar.xz 366516 BLAKE2B aa1d91982b671bbf7e3520200ff85dc3dd6c8172b81903bbe93a0f613eee75e8ca9758cfdfeb80473d67bc3564104f094944f2fb85f46f34a305e419612c16e0 SHA512 7751ac0ce76aaf99d237c39deb9d25c058c43edb1ef31f03a8d222477d3ae32e2bbae9ce6ac5251f4a981ba25309481af40cbddebfce5ad71d9aee9568bda5bb
 DIST kcalc-19.08.3.tar.xz 372080 BLAKE2B b0215734c8952dd6c787bce46fda5033758b8264b1b6f5bef78e71bfd7e6511b489f53b315c661c8dabd9da82389ea70982fe85a52e85cdf0175bacaff891b48 SHA512 e27eefd90f3b32db383305e1eecade41545dfe8f9dd9a6c5b4f48b2082a7323e5a7d812ee54b45cea28c76ba6e82104e1fd2d001060f1588b4b1d62241421e7f
-EBUILD kcalc-19.04.3.ebuild 810 BLAKE2B b19fe876a877a576d2f0bcc7e934c5406dba0ca32c8a4e7d95e9088f092feb977c1f1133c35d05d9ed9a7084780cbd957cd676466d4564e2fab17c47853b404f SHA512 7c475f7e4cbfe941376143f2cd2df6a812f8af5b45aa0fb38e037bf7573849a9fba168a279200a39906bd2b9c74e083a7606073de31c54d2050e8e1136da8506
-EBUILD kcalc-19.08.3.ebuild 981 BLAKE2B 36a0ab624228834f26021b086ce2628000409cf029df7c7d6e7b2b84e41fe957dbef342d4415f93bef6801f674609dfbaf25101ffa469f23c120d2caf1c23498 SHA512 df3837fdcaf0093a18190344fae80f076f8a76a16cfc915b231818f14a865b5c2cbf8b4c5476e571a4ad210605d3d3630b1e19752d5c104c803cfe392eb5cd0f
+DIST kcalc-19.12.0.tar.xz 375596 BLAKE2B 8824fad936185624533d0819e84cbf225826e1f228fb72f4c3b6897afba3d643affc76963f4c59db53be4d481e606fbb80bfb9daa8e5afcfd2ba3723ae9d29fe SHA512 148424327d86b691e16ac4cf2a9842ae1003d212ba399ba0dad8e0c33c91f89326cdf2b1646bcb3a3c9a4fe9bdab74205770d93ff620a14fe0f92836aeab54b0
+EBUILD kcalc-19.08.3.ebuild 978 BLAKE2B 3b8dceae5342111276037771246df4f6f5d9958a8eabd924b2e27f673b35f671e27de0dd4a4632da57746a45be0e2bd6f5f6e25a64ef78cd42e1bcc75a77568a SHA512 5b17fa27d2267876b2b7e3763db885ac39713194cca9c42f75fee08c4108d5bbba5575dd3770632599f27fb82a15c96e650b6735fd395faece4e8846ff38aa42
+EBUILD kcalc-19.12.0.ebuild 990 BLAKE2B b289e9a47c6be7a3df83aa328c6b2e5e9b33e1f543933f90c9e7501cabf0cfb28148e31c71c257282b533094ccc5b4d8c091d0c621884197c91f81f23b9cde85 SHA512 e61aee7f45ae980642c7abbef42cfff818a2582c412e3a852f2b41b43e45d861b8e610461446a9cbe567a039db866721c1d3ad0aa95c3fd57e1839b2c97095e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-19.04.3.ebuild b/kde-apps/kcalc/kcalc-19.04.3.ebuild
deleted file mode 100644
index 871ca105acb5..000000000000
--- a/kde-apps/kcalc/kcalc-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +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"
-inherit kde5
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://kde.org/applications/utilities/kcalc
-https://utils.kde.org/projects/kcalc/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/gmp:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalc/kcalc-19.08.3.ebuild b/kde-apps/kcalc/kcalc-19.08.3.ebuild
index fd84b5b0a8b6..6e62c723e089 100644
--- a/kde-apps/kcalc/kcalc-19.08.3.ebuild
+++ b/kde-apps/kcalc/kcalc-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/utilities/kcalc
 https://utils.kde.org/projects/kcalc/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kcalc/kcalc-19.12.0.ebuild b/kde-apps/kcalc/kcalc-19.12.0.ebuild
new file mode 100644
index 000000000000..d69b1bd78377
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kcalc
+https://utils.kde.org/projects/kcalc/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+"
+RDEPEND="${DEPEND}"