gentoo resync : 18.11.2019

3 files changed, 42 insertions, 38 deletions

diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index e0b4e4ba09b1..b3005bd1adc7 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.2.tar.xz 372572 BLAKE2B 7ae9eeb6aea8ff32e80b312b242eb5e14488785a1532da142fe94691cf4ac12b3397071fed21c0141cb658e3e401e9a8fdd8438723363df4047c2b12f192b19a SHA512 966e1239c11f77c162d5698708e96e8172bc99bc195df0ceff9b5867b7fd9f452091cc4d39286b8bf2febf9a75ee119d3f5282090d6bf8b02783ff8d0ed75424
+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.2.ebuild 831 BLAKE2B 547eed9a4d0308cc193a7c02fd4025b5cea68f2fd4083a64cbadcc883460e448806ed5c164fb92754e3adb3dee0d29ebf5ddfec36c067852985c34d86ad2aa6c SHA512 8239d97f971b05132a163d7906d348087ad7a79b2d0d93878c2b610a42ec076e3171458071d14f18ba17192cf5689ef889ebcfc6425291f2b48604c4e30df3da
+EBUILD kcalc-19.08.3.ebuild 981 BLAKE2B 36a0ab624228834f26021b086ce2628000409cf029df7c7d6e7b2b84e41fe957dbef342d4415f93bef6801f674609dfbaf25101ffa469f23c120d2caf1c23498 SHA512 df3837fdcaf0093a18190344fae80f076f8a76a16cfc915b231818f14a865b5c2cbf8b4c5476e571a4ad210605d3d3630b1e19752d5c104c803cfe392eb5cd0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-19.08.2.ebuild b/kde-apps/kcalc/kcalc-19.08.2.ebuild
deleted file mode 100644
index f8010661132f..000000000000
--- a/kde-apps/kcalc/kcalc-19.08.2.ebuild
+++ /dev/null
@@ -1,36 +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=
-	dev-libs/mpfr:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalc/kcalc-19.08.3.ebuild b/kde-apps/kcalc/kcalc-19.08.3.ebuild
new file mode 100644
index 000000000000..fd84b5b0a8b6
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-19.08.3.ebuild
@@ -0,0 +1,40 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://kde.org/applications/utilities/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}"