gentoo auto-resync : 19:09:2023 - 17:09:22

4 files changed, 94 insertions, 7 deletions

diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index f357b925d74b..a9f1e4143912 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,8 @@
+AUX drkonqi-5.27.8-cmake.patch 1910 BLAKE2B 5bd3a3e83fa7b316d7fb1727bd0381375167732c2611eb66ccb1f41ac30fb80905b9de222491c9191ddad608d4c21a96837821b28cc72c8b8751423fd3b54431 SHA512 ff84f2cdbf957335f03289a14c5f207de498b13de906ead16fe09c39f41571b1614ec812313b2969e80405fccf8da46cdfaf8a83e5873b0b7d6a734d39c049b2
 DIST drkonqi-5.27.1-revert-add-sentry-support.patch.xz 11852 BLAKE2B 79cf8fd5bc07209ed85fd343593157d23f7ed0ca0e64c1d3deef2a11124781de8c5ae3f70e5a472aa0e4385412501b318b8052e07e13966cf96b8c6222163ca1 SHA512 fd4e02cc1f317fb49539794c0645f73805b4e71d414c4a6904a2da7a6b850c5778ed25c3341217ef3d820d8288bba78518045726d150a0ad6e756e4c59768c32
 DIST drkonqi-5.27.7.tar.xz 861680 BLAKE2B a687c037a9002bc9920cfa477bc81f962b376c3d898e4c6c1611f90e6758e40fc759dcb40626da7627515817448e27f69ef7206de589d8d72112962ade8bff19 SHA512 7e600d6fff3af44d2d47cfdaec6edb99849e24f677b495cb28b55cd5d3d7803966dead8cfff11d94930f141dcaf5ea5022c64dfeba1fe03a316f7b2fe0e9e3ed
+DIST drkonqi-5.27.8-revert-add-sentry-support.patch.xz 11996 BLAKE2B 17bf8c3e5c9a5bad200d22fa59b84a97caeca2c164d8b92a1dea665df7e73111401e82c1bacf5ab24c40fb21767c6dea38b38afd288d32190e1c72e453a38558 SHA512 50e448f311bde34c7e77a229aa7816899b7eb743b522d41bd31cc2b18741939a028fe42e267ba440560535fcb33890e3360e20d157a2e5959d2943ce8960491d
 DIST drkonqi-5.27.8.tar.xz 861576 BLAKE2B f60f1b87d2adfebe37e533aa8dd4667f41e8e8f5742d3b0215230a532a2325fbc127aff48cd6265961b3016050b3d192eafaadfd551203845739c95bef666b04 SHA512 f65f290f2980eca9819753b8bdbc49033d6c91d54e5443419641c9ad306f1cc6612d5eeafad9fbb78416d324cc48b31ae7d411aef4a264d93cc6d5baf8e8ef0a
 EBUILD drkonqi-5.27.7.ebuild 1970 BLAKE2B 1def1ef230961a34d482c659b7a5e554f6d1ab4d34cc6088f0f48a39636be4951a4a2f96ac008e87e7d1c4513fb8b8a57f012ed2fd2573f803f0fbd01e84b278 SHA512 1b2891a9b1226c04750f6746c973ec4f18da185817dcb8c01074c77d2ae04ce4e3fddc594ddedab0fac11b904600d1dc89e17b2aa9e7e262add35e416f7fe911
-EBUILD drkonqi-5.27.8.ebuild 1973 BLAKE2B 135db3dfb4722cf91e4d333df1f76b0af37108d57955e9b4efe4a372031401023e5b0477b0104b35551df265d6fb2db930249ee914b2bd1179bd49c70179a95c SHA512 d78ff14a52bd42451ecc36e59b1bdd589a36a553938e91f576a802ec4dd6c33e2d858bdb26c42f95d170505c0990cf1b9439918f77dd021f5f70edc28caeb3c2
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD drkonqi-5.27.8-r1.ebuild 2242 BLAKE2B 1f14610baa2073d6113e24582121074692028b31fb7c4de4933377a24de0f8e136c6ed5a221f1ba054301bd9d41753bfbd20aeea9cd128454f906e39f42be30f SHA512 5c78d2cdebdb2af26306f6087513f8fefeb7a0eece315da60337e6c3ce494a4bbd56c2dc7650f7347eee8cbe5de9f48a005c8fbf74ff3d390faab4ae604d6437
+MISC metadata.xml 392 BLAKE2B 38015ee1b8729b620a05eef60cc8d0005b384dcb707241fdb4c25ce8cb7f297b7cca0816529e159eef71d8da57c98ff77d998b21d9ecaa9d1c971c79ee0ba0ad SHA512 f68e3938fa6e3b15145287cbf9ddb99a7ca2bfb76e173fb3d1b067c76c993cf9a277a0d11ac0adaa143727088a6c9d076c5b057a9ea95f49f85e25ccf6d5423b
diff --git a/kde-plasma/drkonqi/drkonqi-5.27.8.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.8-r1.ebuild
index 3f99f7cda9fa..3becce8ceff4 100644
--- a/kde-plasma/drkonqi/drkonqi-5.27.8.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.27.8-r1.ebuild
@@ -3,25 +3,25 @@
 
 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="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE=""
+IUSE="systemd"
 
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -32,13 +32,18 @@ COMMON_DEPEND="
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=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 +54,17 @@ 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
+	"${FILESDIR}/${P}-cmake.patch" # bug 914138
+)
+
+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/files/drkonqi-5.27.8-cmake.patch b/kde-plasma/drkonqi/files/drkonqi-5.27.8-cmake.patch
new file mode 100644
index 000000000000..9fc7b41035b3
--- /dev/null
+++ b/kde-plasma/drkonqi/files/drkonqi-5.27.8-cmake.patch
@@ -0,0 +1,67 @@
+From 1bb60d3eda5bc68e12b340bbbd4b4c4d296da603 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 19 Sep 2023 15:46:55 +0200
+Subject: [PATCH 1/2] Drop unused KCompletion dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     | 1 -
+ src/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index faa4260e..09ee0fab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,6 @@ find_package(
+         JobWidgets
+         KIO
+         Crash
+-        Completion
+         WidgetsAddons
+         Wallet
+         Notifications
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 112d97f7..fd0b9571 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -91,7 +91,6 @@ target_link_libraries(
+     KF5::KIOCore
+     KF5::KIOGui
+     KF5::Crash
+-    KF5::Completion
+     KF5::WindowSystem
+     Qt::DBus
+     Qt::Concurrent
+-- 
+2.42.0
+
+
+From e2b9f7f3b1227d5cc4612d890c199a4864f217df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 19 Sep 2023 16:00:59 +0200
+Subject: [PATCH 2/2] Don't build tests if not requested
+
+This is copied from src/tests/CMakeLists.txt
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt b/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt
+index cd1d3b6c..2d44ae76 100644
+--- a/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt
++++ b/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt
+@@ -1,3 +1,8 @@
++if(NOT BUILD_TESTING)
++    # Skip everything. Particularly trying to look for integration test deps.
++    return()
++endif()
++
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+ 
+ include(ECMAddTests)
+-- 
+2.42.0
+
diff --git a/kde-plasma/drkonqi/metadata.xml b/kde-plasma/drkonqi/metadata.xml
index d925f2439758..be35b35a0d33 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>