gentoo resync : 15.12.2019

4 files changed, 44 insertions, 38 deletions

diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index b7dd60c2f9f1..72abf6673aba 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.3.tar.xz 801168 BLAKE2B a300ccff3e41cd8fa9be9318c201fec82f9cc075bd75f4ff689f6a343d117151fb59015651ffeba26f6b92bb1a4ac335726f21cc8f9c4d4b885d3fec57c4f4e9 SHA512 9a4f78792f300bd20207c1743c07e4a4fa62d05549caf34388b02232395bfbb98eaf31099bdc9326a527d926550ef973426934aba1e1816b3ba78ce1ebb11f25
-EBUILD kompare-19.04.3.ebuild 919 BLAKE2B bfd1655e3836cddfd6305f721e542f162f8ef48403fbff0f6548ae6d169b54aaa2e130c159c232414e3f6eabf8fc3de19ecf2261b81f8a147d9db10dc64ba605 SHA512 b00ad2af3eb924dfe44bdaa1ce053fe479347b087ce26d914eb3916ffb50d6197e6d251ec19f832dbc94debef16db359f99d9192b6f4768b80bbe35ed85862c6
-EBUILD kompare-19.08.3.ebuild 1120 BLAKE2B 91630c247620b43393a093416ad6773bd6994e7ffcddf4e466bb9b028087b29b104bad36fdf71622fb42d9776c443b1a74f129923e5f0dc6556a46ccc1a8be2d SHA512 7cb39ac3122f12190beb8f62a7bcbc904e0da8ccdc7f6d592a75148a4de8b29b982593c2aceda1f18a375057412670d9b5a900cab2425cfcb858579e8cbcec4c
+DIST kompare-19.12.0.tar.xz 801436 BLAKE2B e8a0062bd45bbb749276b407fcedb1706ccf8ef9ee86497bf2a5662629212e50e9037e7e2a7cf7244c5ee924ce98211d75a0cb61215d6931f45ee26d9f84961d SHA512 7416434746f422730e0790441e596adc04b64dc7a1938222cd503c320cce87eba1a9f3576c27058dd88c0cbbf71341c278aa46953377b070c01c7faf3aaf629c
+EBUILD kompare-19.08.3.ebuild 1117 BLAKE2B 8761e5408de423833aff3e879f47088e7691e056beb9331c62df7ea13f229404e8da980b81f9991db5afdeb5f315eec20474063c0f82745a96f643a222da3b48 SHA512 5c471c78c765daf2af10373813931220702e636a10da5f8e090cc04c2811a021e9bea1863496518a1e09983ff50998a1480edae9ba399424fd0e626e2a90c54f
+EBUILD kompare-19.12.0.ebuild 1129 BLAKE2B 5bc3dfa458e5647d91a40c19575b41d4bd11dd3dc3d810968054ea2d6a3b2abd2cd07d6966069c5f013ecf49a4b93f82ea4316211bf40f3da9eb59ec18c68055 SHA512 f7c451ed915d8ad92e8b8cd04788ce2a581eb554614eddc3b37ecb729eca489b50f470b6aebe4048cf9f65d9ccf0d6b48f577738c9416ab253503765d8d08b82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-19.04.3.ebuild b/kde-apps/kompare/kompare-19.04.3.ebuild
deleted file mode 100644
index 9a2a69a407e0..000000000000
--- a/kde-apps/kompare/kompare-19.04.3.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
index 49c0893f2c10..ec1b1c2e02fa 100644
--- a/kde-apps/kompare/kompare-19.08.3.ebuild
+++ b/kde-apps/kompare/kompare-19.08.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kompare/kompare-19.12.0.ebuild b/kde-apps/kompare/kompare-19.12.0.ebuild
new file mode 100644
index 000000000000..b2255b2fdc63
--- /dev/null
+++ b/kde-apps/kompare/kompare-19.12.0.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A program to view the differences between files"
+HOMEPAGE="https://kde.org/applications/development/org.kde.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}"