gentoo resync : 18.11.2019

3 files changed, 41 insertions, 36 deletions

diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 8dac4774af07..b7dd60c2f9f1 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-19.04.3.tar.xz 801804 BLAKE2B a0d8321fa9ea2d96196ec3872f9a68306f679b39020fe21fa58ce5b0eba9b76a6bffbf523e92295e463060bd8cc0013f7c0f2001e7434691bcf3ad56214e891d SHA512 53bb71bb67435d480d539355f7ba0a81968dede3e0d7a338564bde97e7c5103e4154380301b0cee92433644ccc81566b0508e5c6400f80e4312a95594de1e893
-DIST kompare-19.08.2.tar.xz 801976 BLAKE2B f99847b2a9ac4420116b9fe22f604981b7d5ed6e9c53f3251e31f07a944fa5d4d50c6f6e6ae32a0ab76af9630d7a3012c2bdd25995a6c4047a13c6e4763dcbbe SHA512 4967040ee0788e4add8b0a10cda76d8e67c289674840286652d7aa62ad0d0456c2e487a05f065423749eea013ec8960c9e308501c9256bb2f3371e3da242947b
+DIST kompare-19.08.3.tar.xz 801168 BLAKE2B a300ccff3e41cd8fa9be9318c201fec82f9cc075bd75f4ff689f6a343d117151fb59015651ffeba26f6b92bb1a4ac335726f21cc8f9c4d4b885d3fec57c4f4e9 SHA512 9a4f78792f300bd20207c1743c07e4a4fa62d05549caf34388b02232395bfbb98eaf31099bdc9326a527d926550ef973426934aba1e1816b3ba78ce1ebb11f25
 EBUILD kompare-19.04.3.ebuild 919 BLAKE2B bfd1655e3836cddfd6305f721e542f162f8ef48403fbff0f6548ae6d169b54aaa2e130c159c232414e3f6eabf8fc3de19ecf2261b81f8a147d9db10dc64ba605 SHA512 b00ad2af3eb924dfe44bdaa1ce053fe479347b087ce26d914eb3916ffb50d6197e6d251ec19f832dbc94debef16db359f99d9192b6f4768b80bbe35ed85862c6
-EBUILD kompare-19.08.2.ebuild 922 BLAKE2B 8376252c2167bc57e594a96bf55ea557d33f9e8732df8c62965c05b02e94aa4a489eda5f8a38910379dc3f52c54b30f4445652cdb6c93f6f440300bc8a347ed9 SHA512 eac21e0ccde999ee22b57c69fefee9fee57913adc98135b71948dc9e2180f1fc650bda8e9f4fd52a07cb2045779017528ea050fed5f1f3c73f8008c59ec8d523
+EBUILD kompare-19.08.3.ebuild 1120 BLAKE2B 91630c247620b43393a093416ad6773bd6994e7ffcddf4e466bb9b028087b29b104bad36fdf71622fb42d9776c443b1a74f129923e5f0dc6556a46ccc1a8be2d SHA512 7cb39ac3122f12190beb8f62a7bcbc904e0da8ccdc7f6d592a75148a4de8b29b982593c2aceda1f18a375057412670d9b5a900cab2425cfcb858579e8cbcec4c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-19.08.2.ebuild b/kde-apps/kompare/kompare-19.08.2.ebuild
deleted file mode 100644
index 70464071af8e..000000000000
--- a/kde-apps/kompare/kompare-19.08.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://kde.org/applications/development/kompare"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(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 kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kompare/kompare-19.08.3.ebuild b/kde-apps/kompare/kompare-19.08.3.ebuild
new file mode 100644
index 000000000000..49c0893f2c10
--- /dev/null
+++ b/kde-apps/kompare/kompare-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A program to view the differences between files"
+HOMEPAGE="https://kde.org/applications/development/kompare"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkomparediff2-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"