gentoo auto-resync : 10:09:2024 - 12:30:41

7 files changed, 34 insertions, 161 deletions

diff --git a/kde-misc/kio-stash/Manifest b/kde-misc/kio-stash/Manifest
index 53144d66ee16..b468dec05543 100644
--- a/kde-misc/kio-stash/Manifest
+++ b/kde-misc/kio-stash/Manifest
@@ -1,6 +1,3 @@
-AUX kio-stash-1.0-kioslave-no-desktop-app.patch 1407 BLAKE2B 5ad6fce0758832de2f2a765f747afe141a730d135f244eb4b58cfe5c0c0e0314f90dc9abb086091f19e39b8e4ae8539fd186e55e56703a08bbfdf0639c47e96a SHA512 f65426d9b201d9db7ba4907ee7276f9cc4e766116d418bdfc0a8f69266754cb9f655900cebf0086e54bbfde696d82e8e75729cb9ee1b2e216871c47ddef787d3
-AUX kio-stash-1.0-no-kf5config.patch 1172 BLAKE2B 99c6f09278e649b375ff8dd4f42790aa25e88d3c7e8faa703111f585d315977eee2172f5baa12206d6ecd0d3acef93b56b8907cf6bb1328d22c07a701bf99574 SHA512 f50ca12e08a04fff8c4066875007237a97189a83de97d62b3f133b3ab79bb90cdc9c7bbc4160281800df16cb7fdce35083b5559f18698238c0b719894e0b13d9
-AUX kio-stash-1.0-unused-includes.patch 862 BLAKE2B 7941b52d9aad3f4cda148961221aa8e33f691d7cf6a4994f652b5b645c7c7dbcdddfd061db08b204ef0ebba7c7b6e1545657405f2e53441e0fcc56dda26df28e SHA512 2c69b665650304a098cf2d6bc3c2c13c90402e4691aa8ebb6e4085b9f06ced09512578d21ac1a95f88813c54363b6eb97feb2e6101cf3149b97d849533ca8c24
-DIST kio-stash-1.0.tar.xz 25308 BLAKE2B 36329831bacd9cd271a52f7018ef4a46894a9ef65190d3372584cc489998197057e7d3ec64017446963ea024e9c50afb5fd5dc8c2d01c27cde7bc83844419cc5 SHA512 ca345a2cd2d8df72ad1f8de366ba290a21f0f3a98ac098d0393d66ec43334258e1e7222a19f89de9a53f152fe4c63aab1221dc045efee94385299fc63e65a931
-EBUILD kio-stash-1.0-r1.ebuild 848 BLAKE2B b0b2e9bcdc0dfa401959754835c6d7aa5021ff0c0826090ea1b82f1f58b00787b0cc477a1717f44fb1c2d791c703351bb523112cf6783196872726e0729be369 SHA512 e74f3b629161a2e1402fc57eacae4ff3b7458cffce1219b9d482560978b6d25ac2074153a27ad6cbef00430e4e21d6fcdd812f1d5a97f506d846263d4a476679
-MISC metadata.xml 381 BLAKE2B 648d0a7fbd085d71536069276553c11e62fb98b1dc056827c6a8de0b72fe545ec9181fce08621f51c655b31db21124c524179e9dbe7726505cb04df3e6823647 SHA512 b5f9f54b3f623d7f144b0512e96f80b5e5713e5510cb0b93eae0ae078745febe210e6603ef65e49b71b5f2e7431bf61e44afc99cf2ccb092989cad7a6d018af2
+DIST kio-stash-1.0_p20240906-2a8b8801.tar.gz 66081 BLAKE2B 8920e4cfa3c9f0ecab894d03d14ef200fc6ca11579fb3018dd9613dfa6ab765743c7024867133703f77b942622bdc815d15ee8e88271ee9017ab4ee8bf996e91 SHA512 cdf19182f705b7a70a1e74a65fc08f27f2b554bf8d2a0fb050b6426ad0d1ec16b0ee0d8f55b70d841e85bc0a406d8ef2fea0394afd956feb713fe3af6ef01b31
+EBUILD kio-stash-1.0_p20240906.ebuild 753 BLAKE2B ce52c31604be10712afd3b1058a8f8ef6748978ffaf7609f325857ff144813db65a68b30076156191cf810ee3030104941fb5217a4a5dde56053475377bff3a6 SHA512 251f706df593193a62c82b57360b457c2682496e77ece5333dd5f0198fa15d104a2a927ee13055929531a66779667ee487f2c5843235ad11fb5f789be2336b31
+MISC metadata.xml 412 BLAKE2B 1c9c8214d11909813272fc64410a23d2219a8b11e20c15cd942ead326ac9c7a1ebb9e7cc627f46ca8e8aec6d70b36d7ae435c50fb583460428a9486b16d523c9 SHA512 2762c76c3e8a50e175929ab76bef152d37ca481220e7e583f0930f284b9aad8b3b5948d013b865a2ce0b29a0d88de0557d833ec10b5d69e61a2551a21bd4b48d
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch b/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch
deleted file mode 100644
index 35b656fb6b73..000000000000
--- a/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f977b43a47ebf6d26ee0bd6d35e0ac576bbbbf8a Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Fri, 9 Mar 2018 17:48:15 +0100
-Subject: kio slaves aren't desktop applications & drop incorrect provides
-
-Summary:
-https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#sect-Metadata-GenericComponent
-https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html
-
-also it seems a filestash binary isn't actually installed, so drop the
-provides entry for that
-
-Reviewers: shortstheory, bgupta, apol
-
-Reviewed By: apol
-
-Differential Revision: https://phabricator.kde.org/D11187
----
- src/org.kde.filestash.appdata.xml | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/org.kde.filestash.appdata.xml b/src/org.kde.filestash.appdata.xml
-index d532186..2df1a70 100644
---- a/src/org.kde.filestash.appdata.xml
-+++ b/src/org.kde.filestash.appdata.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<component type="desktop">
-+<component>
-   <id>org.kde.filestash.desktop</id>
-   <metadata_license>CC0-1.0</metadata_license>
-   <project_license>GPL-2.0</project_license>
-@@ -89,8 +89,5 @@
-       <image>https://cdn.kde.org/screenshots/kio-stash/kio-stash.png</image>
-     </screenshot>
-   </screenshots>
--  <provides>
--    <binary>filestash</binary>
--  </provides>
-   <project_group>KDE</project_group>
- </component>
--- 
-cgit v1.1
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-no-kf5config.patch b/kde-misc/kio-stash/files/kio-stash-1.0-no-kf5config.patch
deleted file mode 100644
index 1e434bb625ea..000000000000
--- a/kde-misc/kio-stash/files/kio-stash-1.0-no-kf5config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 624a1f38b9604def78c34e26ac31e1fd21c6673b
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Mon Jul 3 20:36:41 2017 +0200
-
-    Drop unused KF5Config dependency
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cbd710..1552df6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS
- )
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--    Config
-     KIO
-     DBusAddons
-     I18n
-diff --git a/src/ioslave/CMakeLists.txt b/src/ioslave/CMakeLists.txt
-index 462fef9..23922f8 100644
---- a/src/ioslave/CMakeLists.txt
-+++ b/src/ioslave/CMakeLists.txt
-@@ -6,8 +6,6 @@ target_link_libraries (kio_filestash
-     Qt5::DBus
-     KF5::KIOCore
-     KF5::I18n
--    KF5::ConfigCore
--    KF5::ConfigGui
- )
- 
- set_target_properties(kio_filestash PROPERTIES OUTPUT_NAME "filestash")
-diff --git a/src/ioslave/ioslave.cpp b/src/ioslave/ioslave.cpp
-index b280f11..8928efb 100644
---- a/src/ioslave/ioslave.cpp
-+++ b/src/ioslave/ioslave.cpp
-@@ -34,7 +34,6 @@
- 
- #include <KProtocolManager>
- #include <KLocalizedString>
--#include <KConfigGroup>
- #include <KFileItem>
- #include <KIO/Job>
- 
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch b/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch
deleted file mode 100644
index 93c786d7ad12..000000000000
--- a/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c49db3ddb772ae7eb5bf6fc291e5e42391c930f8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 28 Nov 2020 17:28:00 +0100
-Subject: [PATCH] Remove unused includes
-
----
- src/iodaemon/stashnotifier.cpp | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/iodaemon/stashnotifier.cpp b/src/iodaemon/stashnotifier.cpp
-index 4cfbafc..b427836 100644
---- a/src/iodaemon/stashnotifier.cpp
-+++ b/src/iodaemon/stashnotifier.cpp
-@@ -20,16 +20,8 @@
- #include "stashnotifier.h"
- #include "stash_adaptor.h"
- 
--#include <QDir>
--#include <QFile>
--#include <QFileInfo>
--#include <QMetaType>
--#include <QDBusMetaType>
--
- #include <KDirWatch>
- #include <KPluginFactory>
--#include <KPluginLoader>
--#include <kdirnotify.h>
- 
- K_PLUGIN_FACTORY_WITH_JSON(StashNotifierFactory, "stashnotifier.json", registerPlugin<StashNotifier>();)
- 
--- 
-GitLab
-
diff --git a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
deleted file mode 100644
index ba9e9501f735..000000000000
--- a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KIO worker and daemon to stash discontinuous file selections"
-HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://invent.kde.org/utilities/kio-stash"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-kf5config.patch
-	"${FILESDIR}"/${P}-kioslave-no-desktop-app.patch
-	"${FILESDIR}"/${P}-unused-includes.patch
-)
diff --git a/kde-misc/kio-stash/kio-stash-1.0_p20240906.ebuild b/kde-misc/kio-stash/kio-stash-1.0_p20240906.ebuild
new file mode 100644
index 000000000000..eeff0a865354
--- /dev/null
+++ b/kde-misc/kio-stash/kio-stash-1.0_p20240906.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=2a8b88014643538a2fd8aad9e39f362d1fc91bf3
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="KIO worker and daemon to stash discontinuous file selections"
+HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://invent.kde.org/utilities/kio-stash"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/kio-stash/metadata.xml b/kde-misc/kio-stash/metadata.xml
index 21702b0130f5..a0105f5769b3 100644
--- a/kde-misc/kio-stash/metadata.xml
+++ b/kde-misc/kio-stash/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=kio-stash</bugs-to>
 		<remote-id type="kde-invent">utilities/kio-stash</remote-id>
 	</upstream>
 </pkgmetadata>