gentoo resync : 15.12.2019

4 files changed, 58 insertions, 51 deletions

diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 9aacbe93bdcd..f11b18e2ba85 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
-DIST khelpcenter-19.04.3.tar.xz 3851316 BLAKE2B dbdb96e3f0306f8d3019386c005fac6ca88ca072b4f3eb2ae80469dd5ae739cf99dc1a37cee48697f9f7cc7217db53e2fab3a5e97e8304de2df27a5a0cbc990d SHA512 33534097fa8c318a24fd34c173ae7ac9f739363fd4e0a148582984b8ae36e481dd5065d1306f570fead503c7b85ca03d4890d7bbcf102c50b6614d4536775c09
 DIST khelpcenter-19.08.3.tar.xz 3846196 BLAKE2B e7907395c74047e2f0426b72e65bb3d82fdde551363640eb281f281ed11e59d5cf8781c4c9b139084cb1896c9747dc52c8a38cf8b125e4ee8c4677aebce2196e SHA512 8d495eb4d6387bfb7f567c4b9f1cef3d48d1ef5317692a702c8c5e983c2feb209b1bab981d40064b4a0ab31063ec5fde24f77223e052f5650dc42b199dd2fdaa
-EBUILD khelpcenter-19.04.3.ebuild 1159 BLAKE2B f0deac6f1871a6aca5a33fa0a3745db95d2a57dd7ac5eb316c12c5d6d0cb9808414384b10a9814bc951305614e790cc242977a71a845c78aa04d900209cbfd34 SHA512 158a9911268c56571f0eeff10dc1d3a14ee5f936487e7c10b249f7b38fc9b378b93a336eb4c814e5c1e52a8bbd9af7edb68d8deb0eaa2bd2ccd504653dde77b9
-EBUILD khelpcenter-19.08.3.ebuild 1402 BLAKE2B 6ccc247451a56cdd8b86d78a67965cd1d292ef4c7de46dce4cfa0ab00ac650948cd319aac68bb71b9ac518b0190ef03df2df05b8ec2b58b3d6c1971e3a81cbc5 SHA512 85ad2cd4f5880d8d810fde9598a2e0f3ce7132c601aec4ba3c94595872cbe403ffd74bca962cde4013116434c078fc3abb7b31fd924c2886afcb29a4930f47f4
+DIST khelpcenter-19.12.0.tar.xz 3849120 BLAKE2B 51ec0917cf02e86d9dd7f6247ff4208055f87c7b9e249b1729a82e14bc27399412881d4b629f01ea1ca7b9a2d2821d18991020c3e43559c28d31a1cc92470e00 SHA512 608cb9f54412471cb1521083224eb5c499a788f5814232624915cfa1261fb2d3b4b0fa3b8fe585c72eda8f04beae4e07c6954a6edaaf19709a10e2c35631b4c7
+EBUILD khelpcenter-19.08.3.ebuild 1399 BLAKE2B e696b43c2065baebcfbc670f364968dcc54e660298d34f8f31821e36e0e735fff0fc3d13ea9f878b5993f9a4b75ef8e00564720103a431e6b7b4f342899869e0 SHA512 427cc6a04fe5f70592f6ae23cb388ba3d62c8c106533c43e13e4051c4b9c7e078dad6e86ccb8b1551c2bb078600cbf76f0d6c31177599f2c8410a02f7aa6cde5
+EBUILD khelpcenter-19.12.0.ebuild 1504 BLAKE2B 9430ee15dd18d1a4839850badf8933cb0728d8f0d69cb0fb75884ec1014cc5ba7d2b32b163cee267b3610c917f20f1d0043efc02c1b26ae2f06db3c19b3ef784 SHA512 50e3cde701160b1d839d2a4893bf7e2f44b6491d6469fd72b4b49c76a7ff4a2e740f361e366d7854d0c4e3eaed6d747f1f88d499e10a7385dcadff8714fe747f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-19.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-19.04.3.ebuild
deleted file mode 100644
index 5dc755f57bf4..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-19.04.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_prepare() {
-	kde5_src_prepare
-	sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
-}
diff --git a/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild b/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
index 8dc9a868310c..fea21d28c5ca 100644
--- a/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-19.12.0.ebuild b/kde-apps/khelpcenter/khelpcenter-19.12.0.ebuild
new file mode 100644
index 000000000000..7a4a7f6c1ca6
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-19.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Application to read documentation for KDE Plasma, Applications, Utilities"
+HOMEPAGE="https://kde.org/applications/system/org.kde.Help
+https://userbase.kde.org/KHelpCenter"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdoctools-${KFMIN}:5
+	>=kde-frameworks/khtml-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/grantlee:5
+	dev-libs/libxml2
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
+}