6 files changed, 20 insertions, 176 deletions
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index ebe08b094e61..eed07f7ef3c3 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,8 +1,5 @@
-AUX dolphin-plugins-subversion-23.08.5-fix-lto.patch 2039 BLAKE2B de667f70126baeabaf3da3e79ca7b9c64f152929f9a3446d840c02e52dcd7897e00b5337c48d528a3f9bc7aa11a78334af7cee6990ad1e6abc29621d3275ad34 SHA512 47754d821c21d7dff854ecabd45640265e54a3cd59dfc3fe48107dd8f24c704218e179762c0eaaaa4de536683e20b8d1638dec04bbb9b4a7f0433c6e62a57e1f
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
-DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
-EBUILD dolphin-plugins-subversion-23.04.3.ebuild 1429 BLAKE2B 4a40444ea3df609c8c4096160bac819da9be4e41cba5c57c3f82282b55b1719167ead46780ce13a3efad92910cb7edb806813bdc05af0dbac0f8e7adc9484220 SHA512 46fe30dd8557497f67514287079d15eb3de6e4c90b412e143d41a5907a7c0d3298b2eb2076a3c2362cab0069194c01d05e7fb22fa4a3d98fbdb10a4074d6977b
-EBUILD dolphin-plugins-subversion-23.08.5-r1.ebuild 1488 BLAKE2B daf45e78417adcc68b65589ea298f0df74460a7b09d50a24063f5da599bfc4c6697491555983f463d29826b7dbf424c1ee284b72e29f7c6014f7db769568a19d SHA512 4189f2fc0c9a725a9cead2234d950672c1ae7052980ed836c2ecd0420a4655b20def82d175e6388f5e289611dd63a20076a9639fb792fe3d78d8e10c67c21bd8
-EBUILD dolphin-plugins-subversion-24.05.2.ebuild 1475 BLAKE2B 8c98feda4bbcacb038ce0c0b7a2463e045091d49b7c71bb057c4f9bb3801b18a19777177023cde6769411dcc7b2dd4c4101d2135ecfd1f384d45bc815a7a0333 SHA512 1c470e8b731b8c267a348b0ce84540f55ae3eba47d5ce6423b7d96f59afe0cde82e1acd05ae9f92684205ec7d9c63398372d52315709ee1d20663b58b87b335d
-MISC metadata.xml 381 BLAKE2B 592c1524bc05ad8664508ee6616fedd5eaf364e2222c6fe3fb9a27949f56792c4cee994309781593e257c94ea31d7240c9f4e6cf189bb34aa8fae9a3794df265 SHA512 ea4651fe50618e84baf551a34e078680e3b8427a2e7a1075b5ced940b67dd3758b137bba42a0e83ac34d74b65b5c6969225241db51338bf3afdeaa06600a38ed
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
+EBUILD dolphin-plugins-subversion-24.05.2.ebuild 1368 BLAKE2B 73ac475dbfa07cda4782e65fce2e0b0164ecbce2969d3062451f30fd39aeab989c1bba5acf832b2030f70d27025880e7df561f69f26150eb3cd32d1fe80df438 SHA512 391b5abfaf7a9cb8ab1694b9dfed95ebc7efd2cbd0a025c1f1bef17ceb70c0a5c4a1be67e9c277b9f8b6c6c15fb53f36ab37d5455780e4d570d3966f994a69c7
+EBUILD dolphin-plugins-subversion-24.08.0.ebuild 1291 BLAKE2B f2421c4a03f25b9a724471e6c0e7eba857f2d699b986e9e21caed1ec0cca9e8414b1f3bfa3e15c060eec5bcf8b3e3f9921cc38c47021a979f2d21fe4fe26a564 SHA512 e934c2716eda75bec1ee4a4549f688e51273b0d14804c0cfd21a692fed3ab3b612f29c1e1770fdb03dab520c7ed896527ccb3d7d0ee82aa716cd9b9ebeaf4360
+MISC metadata.xml 410 BLAKE2B 19c3aebce470d75ce9a551aa1100eec6faaf74fa06e74159d859ec31732a3a80170ecfbfe08edd931f9be9a00473ed6485bc2e23a65f7fe18339103cdc909f49 SHA512 752a847319ebf8d110347da3e6949f0ca6847c18453bf2b9a465a8415c79f37b4aefb03cc7fcf6874039c38ff4ee375715892a616c2766e1fd689c18c8b05c10
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild
deleted file mode 100644
index 95de4fbf28b5..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/subversion
-	>=kde-apps/kompare-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild
index ed07877b47dd..2c556fdf8c95 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -57,8 +57,3 @@ src_configure() {
 	)
 	ecm_src_configure
 }
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.0.ebuild
index 3fac90631b76..f6fabf71df6f 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.0.ebuild
@@ -3,48 +3,46 @@
 
 EAPI=8
 
-ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="svn"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=6.5.0
+QTMIN=6.7.2
 inherit ecm gear.kde.org
 
 DESCRIPTION="Dolphin plugin for Subversion integration"
 HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 "
 RDEPEND="${DEPEND}
 	dev-vcs/subversion
+	>=kde-apps/dolphin-plugins-common-${PV}
 	>=kde-apps/kompare-${PVCUT}:*
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-lto.patch" ) # bug 926233
-
 src_prepare() {
 	ecm_src_prepare
+	ecm_punt_po_install
+	# qtconcurrent only required by git
+	ecm_punt_qt_module Concurrent
 	# solid, qtdbus only required by mountiso
 	ecm_punt_qt_module DBus
 	ecm_punt_kf_module Solid
 	# kxmlgui, qtnetwork only required by dropbox
 	ecm_punt_qt_module Network
 	ecm_punt_kf_module XmlGui
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
 }
 
 src_configure() {
@@ -58,8 +56,3 @@ src_configure() {
 	)
 	ecm_src_configure
 }
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch b/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch
deleted file mode 100644
index e2157f00fd34..000000000000
--- a/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 772a4d712abcf1c6c86f25bd306785815132d886 Mon Sep 17 00:00:00 2001
-From: Nikolai Krasheninnikov <nkrasheninnikov@yandex.ru>
-Date: Tue, 2 Apr 2024 09:07:53 +0000
-Subject: [PATCH] svn: Fix gcc-13 One Definition Rule compilation error with
- LTO enabled
-
-columns_t enum defined multiple times in different translation units. Although this
-should not be an error, we move the definition to a separate unnamed namespace.
-
-BUG: 482524
----
- svn/svncommitdialog.cpp | 10 +++++-----
- svn/svnlogdialog.cpp    | 14 +++++++-------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/svn/svncommitdialog.cpp b/svn/svncommitdialog.cpp
-index 41152434..f9a44265 100644
---- a/svn/svncommitdialog.cpp
-+++ b/svn/svncommitdialog.cpp
-@@ -54,6 +54,11 @@ QStringList makeContext(const QStringList &list, const QHash<QString, KVersionCo
-     return ret;
- }
- 
-+enum columns_t {
-+    columnPath,
-+    columnStatus
-+};
-+
- }
- 
- struct svnCommitEntryInfo_t {
-@@ -67,11 +72,6 @@ struct svnCommitEntryInfo_t {
- };
- Q_DECLARE_METATYPE(svnCommitEntryInfo_t);
- 
--enum columns_t {
--    columnPath,
--    columnStatus
--};
--
- SvnCommitDialog::SvnCommitDialog(const QHash<QString, KVersionControlPlugin::ItemVersion> *versionInfo, const QStringList& context, QWidget *parent) :
-     QDialog(parent),
-     m_versionInfoHash(versionInfo),
-diff --git a/svn/svnlogdialog.cpp b/svn/svnlogdialog.cpp
-index 21abadaa..685f7ec5 100644
---- a/svn/svnlogdialog.cpp
-+++ b/svn/svnlogdialog.cpp
-@@ -49,6 +49,13 @@ bool resetAndRevertFileToRevision(const QString &filePath, ulong revision)
-     return true;
- }
- 
-+enum columns_t {
-+    columnRevision,
-+    columnAuthor,
-+    columnDate,
-+    columnMessage
-+};
-+
- }
- 
- struct svnLogEntryInfo_t {
-@@ -64,13 +71,6 @@ struct svnLogEntryInfo_t {
- };
- Q_DECLARE_METATYPE(svnLogEntryInfo_t);
- 
--enum columns_t {
--    columnRevision,
--    columnAuthor,
--    columnDate,
--    columnMessage
--};
--
- SvnLogDialog::SvnLogDialog(const QString& contextDir, QWidget *parent) :
-     QDialog(parent),
-     m_contextDir(contextDir),
--- 
-GitLab
-
diff --git a/kde-apps/dolphin-plugins-subversion/metadata.xml b/kde-apps/dolphin-plugins-subversion/metadata.xml
index 858b75c358bc..24e0d59c569a 100644
--- a/kde-apps/dolphin-plugins-subversion/metadata.xml
+++ b/kde-apps/dolphin-plugins-subversion/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=dolphin</bugs-to>
 		<remote-id type="kde-invent">sdk/dolphin-plugins</remote-id>
 	</upstream>
 </pkgmetadata>