gentoo resync : 15.12.2019

4 files changed, 43 insertions, 38 deletions

diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 3b0ec9550f4e..89a2d3ff1c3d 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
-DIST grantleetheme-19.04.3.tar.xz 51656 BLAKE2B 009b0e8cde1e61e8aaf171dadaffe5f184a83bdd6412b24240088d6cc63d96e5d869d97f55734a46c3a95c0218433960348706f34710c28fbbfc6b86736e1670 SHA512 41b1dc8ca6b05f11facbcec479f12c43dd9db6c6e5e74594b41866f6628ec159685988cc42bed1fd0e2dee6082c0e962f5482e78f627671f44302f8ca9dd5c89
 DIST grantleetheme-19.08.3.tar.xz 52260 BLAKE2B 7da5238e4ee23ff663c283625bfb3628789cf5b3cd01ff6a15a2811f5bdecdc739c23c58dcad792235dfeeb6ad526efe0c301f077d576560919ba03142813671 SHA512 1e84df335d938963fe1a9c62a0a8909613e63d6fe3279cc7bf149afdcac552078af8c4e0125768556cc216eeb6876f6f1a1c9f8e862aac5da1ec1c55bc3040cf
-EBUILD grantleetheme-19.04.3.ebuild 738 BLAKE2B bee83a6ac7bd048ba2c074b88191484e1dd7ddb4b236aa707ff5b4ec6f456cf2f074aa5fa0ca626dc0dbb7b9989a2cd62de11b956ebff5ca6476a67429ce85dd SHA512 5e45485b2e0477becfb0d508bbf078a7f4ac11f9dc981b43e0ca38fa0ef1e7ba9ecb2e45e5d29d6d4aec36e39b8500d76cf73a3bd129f9d38ac95d1849100485
-EBUILD grantleetheme-19.08.3.ebuild 843 BLAKE2B 387bbf2482aa5a427fac316928f9bfbf2a2aa1c94d702437fa0c142291fb7bb3887e57c5002bf32de4eb56d6b659b6f6ec09138ae71e04be3a94c833f24c12fa SHA512 823e9c06dca431da9ace3f62fc8a69b4111e4f704150158bf513588122d9845083e9d70acb2693fdaca851af7ace7ef19ee1b2ff80b1de0f68a8892fe8153501
+DIST grantleetheme-19.12.0.tar.xz 55136 BLAKE2B 1a0df4588986b706d551bc8fe2af4bb94bc034b3f9ca44c722028c3d9795e2f5b6397c5ef76217dee040c4048ca663b44c4579eddc9a96c5024345cda6283483 SHA512 903296cc937a847ba3c798a327e7714c392d8641737fb9e726d47ad669e0362a3cd12ef125e3639030ff04577f49bc1594dd07e774f2cdc27730e7cabd755099
+EBUILD grantleetheme-19.08.3.ebuild 840 BLAKE2B 3e1cea4dad7e71e82cc248427df7c6e5ceed5c3baeefd78fcdf1fd747167421f42214847a0339dbf1d6e4642fff69a963114b458e96ddd842599bba33e286400 SHA512 1b180ce90b3abea1b154084df9b6fc5510cd33022527835fca1fd6c651e7dec9d0d92effac4ec29bd452411c234d5feb5a32d095b85da4f76887db78e3d4f029
+EBUILD grantleetheme-19.12.0.ebuild 884 BLAKE2B 73e417a12bdf3353f44eb910c46500d3402c745cb2774fd0bd7bcbb22a2e028040f5ff8388230ad1d50a4529f9e4d44b18bbc2f521c768decb60afd29a585be5 SHA512 0588135215c6507aa0ee0a30e192dc569074c7971028049a5a839ea65329e6b3b26f4d5bc85faef9a3830191c5a258c16cafc361efb278228e8f0ad676952a4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-19.04.3.ebuild b/kde-apps/grantleetheme/grantleetheme-19.04.3.ebuild
deleted file mode 100644
index 116b4e707da9..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-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_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
index 47f33a7cc5ba..06d1d962bcb8 100644
--- a/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for Grantlee plugins"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.0.ebuild b/kde-apps/grantleetheme/grantleetheme-19.12.0.ebuild
new file mode 100644
index 000000000000..ac92bc6872e2
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-19.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for Grantlee plugins"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+# fails if package not already installed
+RESTRICT+=" test"