[gentoo-commits] proj/kde:master commit in: kde-plasma/drkonqi/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     326c72b07bc1b6c5d7e6b98160253b3e94d92436
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 13:25:22 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 14:04:22 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=326c72b0

kde-plasma/drkonqi: Add IUSE systemd and missing dependencies

Set ECM_TEST=forceoptional

Upstream commit f8cf3b1ecd62c32d12bc0d51cafa654e22a17cd9

Bug: https://bugs.gentoo.org/914138
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/drkonqi/drkonqi-5.27.49.9999.ebuild | 20 +++++++++++++++++---
 kde-plasma/drkonqi/drkonqi-9999.ebuild         | 20 +++++++++++++++++---
 kde-plasma/drkonqi/metadata.xml                |  3 +++
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/drkonqi/drkonqi-5.27.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.49.9999.ebuild
index f8d6cf6c0a..bf5f5b5765 100644
--- a/kde-plasma/drkonqi/drkonqi-5.27.49.9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.27.49.9999.ebuild
@@ -3,18 +3,19 @@
 
 EAPI=8
 
+ECM_TEST="forceoptional"
 KFMIN=5.106.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.9
 inherit ecm plasma.kde.org systemd
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.1-revert-add-sentry-support.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE=""
+IUSE="systemd"
 
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -36,9 +37,15 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	systemd? (
+		>=dev-qt/qtnetwork-${QTMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+		sys-apps/systemd:=
+	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
@@ -49,7 +56,14 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 
-PATCHES=( "${WORKDIR}/${PN}-5.27.1-revert-add-sentry-support.patch" ) # bug 871759
+PATCHES=( "${WORKDIR}/${PN}-5.27.8-revert-add-sentry-support.patch" ) # bug 871759
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package systemd Systemd)
+	)
+	ecm_src_configure
+}
 
 src_test() {
 	# needs network access, bug #698510

diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
index f8d6cf6c0a..bf5f5b5765 100644
--- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
@@ -3,18 +3,19 @@
 
 EAPI=8
 
+ECM_TEST="forceoptional"
 KFMIN=5.106.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.9
 inherit ecm plasma.kde.org systemd
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.1-revert-add-sentry-support.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE=""
+IUSE="systemd"
 
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -36,9 +37,15 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	systemd? (
+		>=dev-qt/qtnetwork-${QTMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+		sys-apps/systemd:=
+	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
@@ -49,7 +56,14 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 
-PATCHES=( "${WORKDIR}/${PN}-5.27.1-revert-add-sentry-support.patch" ) # bug 871759
+PATCHES=( "${WORKDIR}/${PN}-5.27.8-revert-add-sentry-support.patch" ) # bug 871759
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package systemd Systemd)
+	)
+	ecm_src_configure
+}
 
 src_test() {
 	# needs network access, bug #698510

diff --git a/kde-plasma/drkonqi/metadata.xml b/kde-plasma/drkonqi/metadata.xml
index d925f24397..be35b35a0d 100644
--- a/kde-plasma/drkonqi/metadata.xml
+++ b/kde-plasma/drkonqi/metadata.xml
@@ -5,6 +5,9 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="systemd">Enable Coredumpd integration</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>