gentoo auto-resync : 02:09:2024 - 12:28:17

4 files changed, 2 insertions, 143 deletions

diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index bca6a06c5bb1..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.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
 DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
-EBUILD dolphin-plugins-subversion-23.08.5-r1.ebuild 1378 BLAKE2B d16697dcdd1b2bd2771220aab1fba473d9d633004ba843394ea2662632c84f096c58aeab3a5e20d04db1b105b7de3d1e0df05d3a9b7d89d0f835d156cf6c1ef7 SHA512 77d89f36b06fac55c9e574a76a6ec734d1b3755086dd56f8717642ad0d46978bc192cd91e511910d348c74394b2b7206b85166bddf1243442558cf59d3e1f4a3
-EBUILD dolphin-plugins-subversion-24.05.2.ebuild 1369 BLAKE2B ab458384a4e967509d6ea89bb7e8eed1b8720b4353a3a70e613fadc9730e99755f53368e9b89ee279882d2271c4dccd8c2253c6d8d3b91001e3ac1aa5cf18d97 SHA512 39d311a903fe5d6f66c0d9a3b7d55b00c8500d31dd0dc758039db643f7566f8c8812fc1cfa208619069dc76e14edeba65443005cbed105cf7766e3a0592f1f71
+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.08.5-r1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild
deleted file mode 100644
index f245b1086aba..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 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}:*
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-lto.patch" ) # bug 926233
-
-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
-}
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 475802ec7b4e..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 ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
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
-