gentoo resync : 15.01.2020

4 files changed, 70 insertions, 59 deletions

diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 1260053bc6db..86cae68fb7c3 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
-DIST drkonqi-5.16.5.tar.xz 743220 BLAKE2B d878bcde06693b309be7ed9b8f6a9de952f41c00701fe4a4b84df7a557e8b0e996a9f37402c1d8f10363822220deccf71416412895336abee4acc77fef6c5610 SHA512 4d42e69301e4af88c292d6072055384ebf79b91240504c23f393abba9f7def5b15da9f252efa76232535ce6bdfe77238131c88b98f89afdc38a7a107e7dc8c40
 DIST drkonqi-5.17.4.tar.xz 740416 BLAKE2B d5440f1c753f32a8b14670b5ec67d246973f86273240ff912ced4a978812eb5362029e4e0e68e6ae24aad9bb21520b9a8a5cfe84ae244bdeecbbe4ad92a930d9 SHA512 27eda23213dccd4f46f344cc423ec47eb3f414acaf13a669bc2732ce685dfe2ece0b741bfc33fecb02cf546bd8c883b849da3d6b808a3d27db9201374040e62d
-EBUILD drkonqi-5.16.5.ebuild 1339 BLAKE2B dcbcce6cbf6b138ffe393635fc24d883dfff5372bdc8e7498f51a151d5f29ac3c0f2b8712cc72d128ed07c4e741aa190f280ccc32575710934a6dd2629218465 SHA512 bf96866bde31e85e6f74da029b35980c549cf3fda7d7fa9c32b0896f71bd0fec3aa32288bebe97470b8411c37f27c17bd4b6059db6bda7f8c81c78bda042358d
-EBUILD drkonqi-5.17.4.ebuild 1588 BLAKE2B 241991e52b02ab8470f6593b7ad6451313ab3e3db10a64d135d3edde5a69eb4a78f6ed415746c444cd615df6d574b5eab6a9ed76967eb351e5c86ce1a3da23cc SHA512 0602ed919a7b814b00ac62c09e45b5f11819da746238f5d349d0eadb1cc973f7d1e4ff1be80cdc47e6b94c36605a632582e3fc1daa6d5879a46db355784977bb
+DIST drkonqi-5.17.5.tar.xz 740416 BLAKE2B 01b22252e5d9c3d88fb960387f681f38480dddaa79ec319074aefdb95867fd9a71efb1ef2bf9278de15e876265db4aca5f530de1968ea849be60c64e68a4346d SHA512 73ba55c8f5223580c2638c3ad5d12be86703a02639ed5a34b077205f1cbc927efb13cb88ee84ea23e58b8d5bc87b368bbcfb702fb0e8f76722dca39981b30ff0
+EBUILD drkonqi-5.17.4.ebuild 1585 BLAKE2B fac1f09cd75763559fa33312674563ad676f4be643a47ae62f8a3df903efd25cdad99332f074431f900fa8f27da6f7ab6a8be67cbc73607c8f89821be2d33c03 SHA512 c6dcb9c06f954a3ee7b19ccee340d0a81dc867dcf32d7867be25dc7cedb84054d9be5226c2be43ab4368df7b24e46ee7d4133acc381c631c398f18d3b63d5039
+EBUILD drkonqi-5.17.5.ebuild 1588 BLAKE2B 152bf9cc35bb5d792b14cd9a0adf71a0a893f2e6a775888c4c26631141e0698eacba14278c260b70388dd32ce9392644dfcefdd0593cc4eb9e995d63f07ad769 SHA512 0100095913727cb5ed5bac8c97def845e5d68c6792029936927f17b6329d049a9d5801e1acee85a335b846e52366415574d686ebc3bd6c4664df8c69dc3dac1d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild
deleted file mode 100644
index 310e0085fc93..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
index 7ce8e1352926..38cf5f71bef5 100644
--- a/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
new file mode 100644
index 000000000000..1fbd5da27c9b
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}