gentoo auto-resync : 21:03:2024 - 19:00:45

3 files changed, 3 insertions, 113 deletions

diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 3d9b76dc7ad6..49eeda2ef7ef 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,8 +1,7 @@
-AUX dolphin-plugins-git-24.02.0-deps.patch 2825 BLAKE2B 0370217537d5194e87b8d7977d09d6fe92f0c595e820e8a1355fc3c566a5a6b4650cf56780fc99ded8caf4815a677707e413de13259027a105c69e92b48c67bc SHA512 7ecffe39bd9fa052346d056d1ce13524fe6d7c70c073ebfe5da5fb1ac0255892a400f6fcd6e051ad605fd66afccfc38f609f7530ee9acbade8b2d286d8d8debd
 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.02.0.tar.xz 294220 BLAKE2B d2d2440ac4372218350f98a98b2aaeb1cdfd9fbfb2e9b8f05e5b0565dbe39948f488c837b9d63ec72162e3cbc0dc2badda592bec52e212ad49dee6fdf506c68c SHA512 0726c8b7988fa4252ad8b0b742f2e8611d9a6aadd020f45ccea93a4611c5b07493fa18f401ca86c31c42f1aafb9072556944d5dde9bd28930e6248fca65f19b2
+DIST dolphin-plugins-24.02.1.tar.xz 296296 BLAKE2B 804ec7e27752b642e1f9c212be7d721dab502b8b162e7a0ee00406f3a8754ce43767b9cb01e5ac5c94d94cf42e171e9e4b90bda01e4db6f6ddf6cb841ede21d5 SHA512 de69bf30ac3c8a6e15542c084b89882fdb9af31db0ffa7160c77bc7f1ad26d8011953b194de41938370ac4babf73ee3e167850d9bb0cd506f93817de937a4688
 EBUILD dolphin-plugins-git-23.04.3.ebuild 1469 BLAKE2B ae5ca81318fd2304f5a1d84cd967cbf50b25180bf1d043630f5dccb1d57ea8acc1cf4dffa03fd99bc1848be8c093f4af1097d8e7e19f22f10e3092cfdbf9525b SHA512 f7be7a6db5c5119991b7482004295285942d002ccb20944a2557762b27636d787c08fd8242fd39a46481be34424942867d33a926b91fde6820c885438213f545
 EBUILD dolphin-plugins-git-23.08.5.ebuild 1469 BLAKE2B dc2d7c092629c630d24d7c8bedf9050ac171ee6ed3b124b1abc36e6d94fb6a10b4d883c401ddcb6bf78415dc8708fc87ed30b1db99eb66201c9dfcc2c5676cc6 SHA512 4a5ac3635c2e4cdfe24159b321486b7b252c7e973fab1cbd4b96d90df26ab500e1fed632ce57a4ebe98192fdf21081fe2e5d9c56ceeac3685b272deda62f21a4
-EBUILD dolphin-plugins-git-24.02.0.ebuild 1559 BLAKE2B f8f07216ce131fd4ba64f7b4627c8944cef1f5e8e3bc16d29a720afc1c726a576e041e1f46002ce3c234fddf7e5e6100149a4c8fcb3221938b88ae9886eca394 SHA512 d566226714cf0d5961e451e6cfc7b145eda17b554cb00d6158ea6533c14a0c2579ce5ad499f71372177d0eec0fbe18c1a1f9988ffc834a79f48a9494292ff124
+EBUILD dolphin-plugins-git-24.02.1.ebuild 1487 BLAKE2B fa0e85f54878047031c6e068f28f011d9ab0e6b7058ca3f776c44e15242e694c9af7226a31b6d199b31ead71517607b9485eed3ea6b675efb34992274ffeba1b SHA512 c8029436f9addb31f959b3cc1a28ba3c23d27a94613e17debd0edd62787b9c419a74b3eb52efd6949ebc884b4d669efd6a3d175e15dd5baf8deb1c0d42e7664a
 MISC metadata.xml 381 BLAKE2B 592c1524bc05ad8664508ee6616fedd5eaf364e2222c6fe3fb9a27949f56792c4cee994309781593e257c94ea31d7240c9f4e6cf189bb34aa8fae9a3794df265 SHA512 ea4651fe50618e84baf551a34e078680e3b8427a2e7a1075b5ced940b67dd3758b137bba42a0e83ac34d74b65b5c6969225241db51338bf3afdeaa06600a38ed
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.1.ebuild
index e1fc494f6dc0..66f4d7ef967a 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.0.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.1.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="git"
 PVCUT=$(ver_cut 1-3)
-KFMIN=6.0
+KFMIN=6.0.0
 QTMIN=6.6.2
 inherit ecm gear.kde.org
 
@@ -34,8 +34,6 @@ RDEPEND="${DEPEND}
 	dev-vcs/git
 "
 
-PATCHES=( "${FILESDIR}/${P}-deps.patch" ) # bug 925728, pending upstream
-
 src_prepare() {
 	ecm_src_prepare
 	# solid, qtdbus only required by mountiso
diff --git a/kde-apps/dolphin-plugins-git/files/dolphin-plugins-git-24.02.0-deps.patch b/kde-apps/dolphin-plugins-git/files/dolphin-plugins-git-24.02.0-deps.patch
deleted file mode 100644
index c6fcc519f223..000000000000
--- a/kde-apps/dolphin-plugins-git/files/dolphin-plugins-git-24.02.0-deps.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 048df8b825286fdd5d9e5289c7e2942a038f8e1d Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Wed, 17 Jan 2024 00:20:13 +0000
-Subject: [PATCH 1/4] Top level CMakeLists.txt needs ConfigGui
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c188a8c3..c2902144 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
-     I18n
-     KIO
-     TextWidgets
-+    Config
-     CoreAddons
-     Solid
- )
--- 
-GitLab
-
-
-From 2c1ddcf7b888e4c12650ffc533187315ead564b7 Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Thu, 4 Jan 2024 12:51:00 +0000
-Subject: [PATCH 2/4] Git plugin needs ConfigGui not XmlGui
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
----
- git/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/git/CMakeLists.txt b/git/CMakeLists.txt
-index 55713f53..550c4a43 100644
---- a/git/CMakeLists.txt
-+++ b/git/CMakeLists.txt
-@@ -28,8 +28,8 @@ target_link_libraries(fileviewgitplugin PRIVATE
-     Qt6::Core
-     Qt6::Core5Compat
-     Qt6::Widgets
-+    KF6::ConfigGui
-     KF6::I18n
--    KF6::XmlGui
-     KF6::KIOCore
-     KF6::KIOFileWidgets
-     KF6::TextWidgets
--- 
-GitLab
-
-
-From fe7367a6aca3d45a3c1468de326ddcca87ef530d Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Wed, 17 Jan 2024 00:21:13 +0000
-Subject: [PATCH 3/4] Subversion plugin needs ConfigGui not XmlGui
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
----
- svn/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svn/CMakeLists.txt b/svn/CMakeLists.txt
-index 470de1ad..13b40868 100644
---- a/svn/CMakeLists.txt
-+++ b/svn/CMakeLists.txt
-@@ -34,8 +34,8 @@ kconfig_add_kcfg_files(fileviewsvnplugin
- target_link_libraries(fileviewsvnplugin
-     Qt6::Core
-     Qt6::Widgets
-+    KF6::ConfigGui
-     KF6::I18n
--    KF6::XmlGui
-     KF6::KIOCore
-     KF6::KIOWidgets
-     DolphinVcs
--- 
-GitLab
-
-
-From 6345cdc2f3ed90624d09e6485218ab68bd468c0b Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Wed, 17 Jan 2024 00:38:45 +0000
-Subject: [PATCH 4/4] kde-ci.yml needs frameworks/kconfig
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
----
- .kde-ci.yml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/.kde-ci.yml b/.kde-ci.yml
-index d35a5569..6b5b1367 100644
---- a/.kde-ci.yml
-+++ b/.kde-ci.yml
-@@ -5,6 +5,7 @@ Dependencies:
- - 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'macOS/Qt6']
-   'require':
-     'frameworks/extra-cmake-modules': '@latest-kf6'
-+    'frameworks/kconfig': '@latest-kf6'
-     'frameworks/kcoreaddons': '@latest-kf6'
-     'frameworks/ki18n': '@latest-kf6'
-     'frameworks/kxmlgui': '@latest-kf6'
--- 
-GitLab
-