gentoo resync : 15.12.2019

4 files changed, 49 insertions, 46 deletions

diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 963e483371b2..2560dd07cc27 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
-DIST kpimtextedit-19.04.3.tar.xz 152648 BLAKE2B d9f4d9bbc41468f2acbc43562552c1b5884f05d55a6ce9d53e366e93829870799ebee281c6143cbfba8c9ea85432ba74d07345634ceecfedad4c315c6286bec8 SHA512 b8a48b6b6e45ad3ae9d2b0ea7966884cb28850a295b761db430a84da47b52a26e32dd58b1ea5302948812b5169a96ac31281be04753712b144554cfca4bcdeb1
 DIST kpimtextedit-19.08.3.tar.xz 155000 BLAKE2B 6612226d0c16dff7f0705fec3e0167bfaf6a397cf8bf9c4f11b355a347448190366f5786259f07c086eb73698ac4fce77c9c52e242ad1f529082e09aa29af698 SHA512 a85894133f454e540b3199fefea5db310bc5f4e607979a573c26c9f6e24accbf293fad28b0446f5103c779a37fd2e56578b457f25fcc34790f0ad43ac85ed57c
-EBUILD kpimtextedit-19.04.3.ebuild 991 BLAKE2B d04d4144a2b5d57849ffbb19e324d7ab900d2a17e4711ea5f010440d741d490e1d53c699805bb714c3e3fa2620fdcd4f389bfa54d28d88534593b873d10f655e SHA512 c6c3b83c58518f7ade74185b2537ebe8590f0b1ef222c46a2e8815b0f9a30e057aabeb16c4d107ecf339ab5337d7077ad44449880f98c1ca57901fb83daf7037
-EBUILD kpimtextedit-19.08.3.ebuild 1138 BLAKE2B d960ea2d1289af466868dffff4cd99502af723a66da4645b12e092bd7b25fc6085675482d7b6a91245b0382899ae08f9b00a99742d137ac57d9b4b20ed622b5a SHA512 34fe6ffbe5cc2d69de80db43dc1b394828fd8ba39f47f07fcc8056ffd6a08f75c80f0241ef81508cfbc124c3cbd24939a0c1414be06f88281a1b997f718ecea4
+DIST kpimtextedit-19.12.0.tar.xz 167364 BLAKE2B ed5f4b923527986a65cf1a8149d83208a6d9aed16a8f23e06b3a3257cab856a9c0395d3901368683b910a68897f15b4d19e091e725a9ed5b8bb5fc1cecd14142 SHA512 ddb7ef413ddb17b14b4c44f67304689dca9afbf2aa2002e2267930c5fe7d5eab2b0bef99ca2fea26f6d8c638bbae7b21bc7399dace318a1adba202501470cafd
+EBUILD kpimtextedit-19.08.3.ebuild 1135 BLAKE2B 9c8ea5036ab45fd9684c664ba5ae41fe461981699261a3f6ecbd47ac4fa3a7f31ce76234adc6838cbb6c0010ce7cf6942bbc0c62d263cb67b8cdfb98b0ec35c9 SHA512 cb1ec242a9e0dcf67f046184d3ece1314d5d1ea714f968e3304c08ffa53f076977c3ed821f78b885fdb1995928af336d719749948517cc7a1e42645feb914094
+EBUILD kpimtextedit-19.12.0.ebuild 1099 BLAKE2B d3d67f4f95fca8088f6339ed9f5ecf842721349a1a910128c936b4abb9b07dae5f2f29fbfce09745c9b61de2d86b7a1fffa2df159c73b6aa56c58ce4d37b3d9c SHA512 715fd998d0761fdccaa51708c8c4894108e8fbd1b32689a35757225e12cad801536b92fe56930bab1a7917440de6e9e8f45305d6d26ece2ec4e8e3624af6b8bc
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.04.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.04.3.ebuild
deleted file mode 100644
index a0d348f1d827..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A textedit with PIM-specific features"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
index efe06fcecb00..7a1e415069f8 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="A textedit with PIM-specific features"
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.12.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.12.0.ebuild
new file mode 100644
index 000000000000..0c6d127d3496
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="A textedit with PIM-specific features"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${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/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"