gentoo resync : 15.12.2019

4 files changed, 53 insertions, 48 deletions

diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 254fc3c51a02..9c690794e012 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
-DIST grantlee-editor-19.04.3.tar.xz 110936 BLAKE2B 3109ee01668c86aa38eef7e487e204e7b3d418f8c48866ce2e624fa577a42f21c58d41a1384d7aaaf2ec89f81b8d5cae492d9b49dbbbed833b9ebc2808b1137d SHA512 bf17160ab384c1b316f6f4da51c789235d1a4490bce7a38aeb6840fe67afef83381b6d099e4222cbe55a7d365c612ef6be0c6ec6c24d2e6a5d1ea04d15a4e5ba
 DIST grantlee-editor-19.08.3.tar.xz 111720 BLAKE2B c12d25138bddd4f80e8a2865854650c6ee856c3f9afd1627bdf3e68e426684985c4f08c5db0a73b1435b4205f4b93e3362c4069f607b698ee21c9c344175d005 SHA512 1be20ad47b04e702eb93aea60c0871d410ecca404c2649fde17f0b0cad423a2845afbd665f065c03ed93136f039cd22bb0327a96a71c7b434b84b050270a7acf
-EBUILD grantlee-editor-19.04.3.ebuild 1169 BLAKE2B 48235b8331652c4bac96887fe673d86d844218f451424af90b1aae363778b74c289cafbee12f09b86ef1c540be0e4e9f8997a9b667a156e6a9bb3f9495895693 SHA512 79b99607e5ce892d61aa39b4adf364205724485f2357f7378afa6f459770b75fac447372d5ad0810050da52ef3b9937c09a5aba822fedfe122b0444bef627749
-EBUILD grantlee-editor-19.08.3.ebuild 1360 BLAKE2B 8a45a979ba6b5a3e3cfff8dc17121c24124db2788fb212269a60b076009e8f5df8868af0dccf28644d9360f7aa818135d613000bd9dfda246f44a5970f6cfbff SHA512 a9dfe540ba180580288de0915557185da991a49c85b9b173c780fa1846b25b7e0e36aaf086dc265256a7f48b0700d5fcff53366e11cc3d2c998493ebf61eced8
+DIST grantlee-editor-19.12.0.tar.xz 111380 BLAKE2B 5f4e4b1f7b38d897add9f7ad281e400ad22558b39f7885324e581096e6c6b5c7898c4775f0389e0f9aa39e01bae5b4ccd5cb3ec6125a6ec2ed0e4a2445e98970 SHA512 f08cda5c6237c547ea17bc152713e93ec30654642819eb57d04baa35065ef223ad08c0bb7d1aefeeab20ef21a6dbb7f06e7403ba86dd3d9487fd9bf950e5aba4
+EBUILD grantlee-editor-19.08.3.ebuild 1357 BLAKE2B f070f9dce2f1c785293b9ce2bad4573684e001a7818050be8cca28b6e426c82a09fda7df13c60fbcc2eb1a9e4fdf7cc622967ddf05058b77a0d3f9b9f33c2002 SHA512 caa8e2b7d842e6df08d4593d72404a4e71f9316b638f52df74a7b97c3a9a215d4e9315f4e20ffaff7bd751f810aa0d6b5433aba1bef1227053b27bfd41a049f2
+EBUILD grantlee-editor-19.12.0.ebuild 1361 BLAKE2B f63f688b8d10ab2ffeb1416d471d4868d70683c354555bd9d681bb654fcb0e454c3923f7c35a7599649ce45265d0422518892f353a6e996a0f5f4140ea72ee28 SHA512 bc748f38254d8082a8aa95355ffd6febd77e10447732f36f6b1b0daa36b493246b538ec34c41e5ac2ba581947f62d3c4efbb8df7f79a043959be59d022b42a5a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.04.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.04.3.ebuild
deleted file mode 100644
index a4b5d30076c9..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +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="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
index c8cf5c0a806c..5c172ee49933 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.12.0.ebuild
new file mode 100644
index 000000000000..fd4c5ec0966b
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.12.0.ebuild
@@ -0,0 +1,49 @@
+# 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="Utilities and tools to manage themes in KDE PIM applications"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"