summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/bismuth/Manifest2
-rw-r--r--kde-misc/bismuth/bismuth-3.1.4.ebuild68
-rw-r--r--kde-misc/bismuth/metadata.xml14
-rw-r--r--kde-misc/colord-kde/Manifest3
-rw-r--r--kde-misc/colord-kde/colord-kde-22.11.90.ebuild (renamed from kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild)36
-rw-r--r--kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch38
-rw-r--r--kde-misc/gmail-feed/Manifest1
-rw-r--r--kde-misc/gmail-feed/gmail-feed-1.2.ebuild30
-rw-r--r--kde-misc/gmail-feed/metadata.xml (renamed from kde-misc/ultimate-gmail-feed/metadata.xml)0
-rw-r--r--kde-misc/kdeconnect/Manifest2
-rw-r--r--kde-misc/kdeconnect/kdeconnect-22.08.3.ebuild (renamed from kde-misc/kdeconnect/kdeconnect-22.04.3.ebuild)17
-rw-r--r--kde-misc/kdeconnect/metadata.xml1
-rw-r--r--kde-misc/kdirstat/Manifest2
-rw-r--r--kde-misc/kdirstat/kdirstat-3.4.2.ebuild (renamed from kde-misc/kdirstat/kdirstat-3.2.1.ebuild)14
-rw-r--r--kde-misc/kio-fuse/Manifest2
-rw-r--r--kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild (renamed from kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild)22
-rw-r--r--kde-misc/kio-gdrive/Manifest2
-rw-r--r--kde-misc/kio-gdrive/kio-gdrive-22.08.3.ebuild (renamed from kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild)4
-rw-r--r--kde-misc/kmarkdownwebview/Manifest1
-rw-r--r--kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild36
-rw-r--r--kde-misc/kmarkdownwebview/metadata.xml11
-rw-r--r--kde-misc/krename/Manifest2
-rw-r--r--kde-misc/krename/krename-5.0.2.ebuild (renamed from kde-misc/krename/krename-5.0.1-r1.ebuild)12
-rw-r--r--kde-misc/krusader/Manifest1
-rw-r--r--kde-misc/krusader/krusader-2.8.0.ebuild74
-rw-r--r--kde-misc/krusader/metadata.xml1
-rw-r--r--kde-misc/kshutdown/kshutdown-5.2.ebuild20
-rw-r--r--kde-misc/markdownpart/Manifest2
-rw-r--r--kde-misc/markdownpart/markdownpart-22.08.3.ebuild (renamed from kde-misc/markdownpart/markdownpart-22.04.3.ebuild)6
-rw-r--r--kde-misc/plasma-applet-weather-widget/Manifest1
-rw-r--r--kde-misc/plasma-applet-weather-widget/metadata.xml11
-rw-r--r--kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild30
-rw-r--r--kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch31
-rw-r--r--kde-misc/plasma-pass/plasma-pass-1.2.0-r1.ebuild (renamed from kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild)14
-rw-r--r--kde-misc/skanlite/Manifest2
-rw-r--r--kde-misc/skanlite/skanlite-22.08.3.ebuild (renamed from kde-misc/skanlite/skanlite-22.04.3.ebuild)4
-rw-r--r--kde-misc/tellico/Manifest1
-rw-r--r--kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch25
-rw-r--r--kde-misc/tellico/tellico-3.4.4-r1.ebuild92
-rw-r--r--kde-misc/tellico/tellico-3.4.5.ebuild (renamed from kde-misc/tellico/tellico-3.4.4.ebuild)8
-rw-r--r--kde-misc/ultimate-gmail-feed/Manifest1
-rw-r--r--kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild30
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch41
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch143
-rw-r--r--kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild (renamed from kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild)2
-rw-r--r--kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild59
-rw-r--r--kde-misc/zanshin/Manifest2
-rw-r--r--kde-misc/zanshin/zanshin-22.08.3.ebuild (renamed from kde-misc/zanshin/zanshin-22.04.3.ebuild)4
48 files changed, 618 insertions, 307 deletions
diff --git a/kde-misc/bismuth/Manifest b/kde-misc/bismuth/Manifest
new file mode 100644
index 00000000000..21f6edcb961
--- /dev/null
+++ b/kde-misc/bismuth/Manifest
@@ -0,0 +1,2 @@
+DIST bismuth-3.1.4-binary-release.tar.gz 131470 BLAKE2B 435ec224ed589300f48bfd0f25aec75cb955ca7b6948ec48cdf0f8b53b92d262366e4159fb02862fde5bf676a99bfce38b521bcb670285fde7bb7dbda3e596d3 SHA512 90693137fa9527ed7aca9c0cad18d849491a166d3f6e6d4545f3c325a062589a196e1bfc36569f94551ba8a112e3f0be9a9d14dcb6cad0c8bc4e49bdd61f6488
+DIST bismuth-3.1.4.tar.gz 5456820 BLAKE2B 397f1f2ab89b92a2d0e9aa37f0cb42282f40b581de499860617ab2333a56e503bd8b76c4e6c909ec16df5ed56eb38019d559333c670898ab3f79fc1ab24310ad SHA512 3318f010dc9bf217536cccf2b9a683637172fae90409c2fbae4152a6b613d1a850cd7c7a03880e46f812aaa3a8d66bb829ba70f028a6a320db7844e254d73cc3
diff --git a/kde-misc/bismuth/bismuth-3.1.4.ebuild b/kde-misc/bismuth/bismuth-3.1.4.ebuild
new file mode 100644
index 00000000000..d723f4a4350
--- /dev/null
+++ b/kde-misc/bismuth/bismuth-3.1.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Tiling window management script for Kwin"
+HOMEPAGE="https://github.com/Bismuth-Forge/bismuth"
+SRC_URI="
+ https://github.com/Bismuth-Forge/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/Bismuth-Forge/bismuth/releases/download/v${PV}/binary-release.tar.gz -> ${P}-binary-release.tar.gz
+"
+
+LICENSE="CC-BY-4.0 LGPL-3+ MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+QTMIN=5.15.0
+KFMIN=5.78.0
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qttest-${QTMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-plasma/kwin-5.24.0:5
+"
+
+RDEPEND="${DEPEND}"
+
+RESTRICT=test # npm + js + hell + network
+
+src_prepare() {
+ # we are not building npm hell or tests
+ cmake_comment_add_subdirectory tests
+ cmake_run_in src cmake_comment_add_subdirectory kwinscript
+ cmake_src_prepare
+}
+
+src_configuire() {
+ # cmake calls git describe --tags --abbrev=0
+ # let's just echo expected output, e.g. v1.2.3
+ git() { echo "v${PV}" ; }
+ export -f git || die
+
+ local mycmakeargs=(
+ -DBUILD_TESTING=OFF
+ -DUSE_NPM=OFF
+ -DUSE_TSC=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/kwin/scripts
+ doins -r ../share/kwin/scripts/"${PN}"
+}
diff --git a/kde-misc/bismuth/metadata.xml b/kde-misc/bismuth/metadata.xml
new file mode 100644
index 00000000000..d148c7d5dcf
--- /dev/null
+++ b/kde-misc/bismuth/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/Bismuth-Forge/bismuth/issues</bugs-to>
+ <changelog>https://github.com/Bismuth-Forge/bismuth/blob/master/CHANGELOG.md</changelog>
+ <doc>https://github.com/Bismuth-Forge/bismuth/tree/master/docs</doc>
+ <remote-id type="github">Bismuth-Forge/bismuth</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index 77f8d566962..2861f242e02 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,2 +1 @@
-DIST colord-kde-0.5.0-patches.tar.xz 9500 BLAKE2B e8f4b2f07b7e17eeaddf1cba94945b47a5485213941d7cce3fb9bd0f67bcef37467541e154dfda8babac22fd46778809e84691cc4bebc2e149888a3927e73da7 SHA512 0f153413bd55c294eef1bbb8ae0af60972cdd68df4fe41c1a6fade34c4fa37d7195766561a9570a712b87c055cb9bbc54a5c2bf725c7776066f8fa91c00563e5
-DIST colord-kde-0.5.0.tar.xz 97572 BLAKE2B 7cb5434c25e576c98e2ffbf428bf81d37605fd489199bacc2c040d443021f1f1055b3640f2698b622b021e34f4c517e168a45cd2c1006fdc2c24590789b482e3 SHA512 f285931f0f97462fcf173f64aaf2f32752bddb0b724d2055055ce5beb7dbe89ccebc62cb8c2ce455a8d68beb737fd55bf89be8e4dc7eaa37f09878b757370f07
+DIST colord-kde-22.11.90.tar.xz 110724 BLAKE2B 6a60c566b2782a519fdfffc5871a81f54b16f91351feb5a66ef50ffe6869fe5b611a3bff42b6f2e80bf44556d7e2603353ad6263664f96cc3de22163d662b577 SHA512 04f717f0621ac1b907e8ef270c3ffab0fc9eb5cf50204e83e3c04e1eed7e5b8e41f0c4d2ab1e6868a0ae442f4a94dbcac5ad2366d810e828073d16cec119974d
diff --git a/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild b/kde-misc/colord-kde/colord-kde-22.11.90.ebuild
index 81ce4ef44c0..da1281f177c 100644
--- a/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
+++ b/kde-misc/colord-kde/colord-kde-22.11.90.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
+KDE_ORG_CATEGORY=graphics
+KFMIN=5.99.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
DESCRIPTION="Provides interfaces and session daemon to colord"
HOMEPAGE="https://invent.kde.org/graphics/colord-kde"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,9 +28,11 @@ COMMON_DEPEND="
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
media-libs/lcms:2
- x11-libs/libxcb
- x11-libs/libX11
- x11-libs/libXrandr
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
"
DEPEND="${COMMON_DEPEND}
>=kde-frameworks/kwindowsystem-${KFMIN}:5
@@ -42,10 +42,12 @@ RDEPEND="${COMMON_DEPEND}
x11-misc/colord
"
-PATCHES=(
- "${WORKDIR}/${P}-patches"
- "${FILESDIR}/${P}-icon.patch"
-)
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+ ecm_src_configure
+}
pkg_postinst() {
ecm_pkg_postinst
diff --git a/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch b/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch
deleted file mode 100644
index bcc8ba2586c..00000000000
--- a/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7ea14bbaf6b0e923496cb5e50dfcd5068c7858c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Feber?= <bfeber@protonmail.com>
-Date: Sun, 30 Jun 2019 17:50:38 +0200
-Subject: [colord-kde] Use more appropriate icon, because the activities icon
- got changed
-
-Summary:
-Use a more appopriate icon, because the activities icon got changed in D22155.
-{F6948366}
-
-Test Plan: Open the Color Corrections KCM.
-
-Reviewers: #plasma, #vdg, ndavis
-
-Reviewed By: #vdg, ndavis
-
-Subscribers: #vdg, #plasma
-
-Differential Revision: https://phabricator.kde.org/D22171
----
- colord-kcm/ColordKCM.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/colord-kcm/ColordKCM.cpp b/colord-kcm/ColordKCM.cpp
-index f14b4a9..fffbf54 100644
---- a/colord-kcm/ColordKCM.cpp
-+++ b/colord-kcm/ColordKCM.cpp
-@@ -158,7 +158,7 @@ ColordKCM::ColordKCM(QWidget *parent, const QVariantList &args) :
- connect(watcher, &QDBusServiceWatcher::serviceOwnerChanged,
- ui->profile, &Description::serviceOwnerChanged);
-
-- ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("preferences-activities")));
-+ ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("computer")));
- ui->profilesTb->setIcon(QIcon::fromTheme(QStringLiteral("application-vnd.iccprofile")));
-
- auto signalMapper = new QSignalMapper(this);
---
-cgit v1.1
diff --git a/kde-misc/gmail-feed/Manifest b/kde-misc/gmail-feed/Manifest
new file mode 100644
index 00000000000..ad7e6e89593
--- /dev/null
+++ b/kde-misc/gmail-feed/Manifest
@@ -0,0 +1 @@
+DIST gmail-feed-1.2.tar.gz 27001 BLAKE2B 486cca569b31d116182476ad2ba7668df5e68d8408dd1f1f50a5c478751b67dd5ec3e768817397619f1f64718d3a418a23180ecce8d17c7154015efdb2060a3a SHA512 f560d9cbce88b0a18152dada9f3ef22f219f47665eb2aa513b0ac8e5292a265476c0510994afcfd80f43ee84f6a1beda03bb8700dfa58d977b777d4fa859ce1c
diff --git a/kde-misc/gmail-feed/gmail-feed-1.2.ebuild b/kde-misc/gmail-feed/gmail-feed-1.2.ebuild
new file mode 100644
index 00000000000..87cba402eb2
--- /dev/null
+++ b/kde-misc/gmail-feed/gmail-feed-1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm
+
+DESCRIPTION="Plasma 5 applet providing a list of unread emails from your Gmail inbox"
+HOMEPAGE="https://store.kde.org/p/998911/ https://github.com/anthon38/gmailfeed"
+SRC_URI="https://github.com/anthon38/${PN/-/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN/-/}-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-qt/qtdeclarative:5
+ dev-qt/qtnetwork:5
+ kde-apps/kaccounts-integration:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/knotifications:5
+ kde-frameworks/plasma:5
+ net-libs/accounts-qt
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtxmlpatterns:5[qml]
+"
+# kde-apps/kaccounts-providers:5
diff --git a/kde-misc/ultimate-gmail-feed/metadata.xml b/kde-misc/gmail-feed/metadata.xml
index 152bdb7ff65..152bdb7ff65 100644
--- a/kde-misc/ultimate-gmail-feed/metadata.xml
+++ b/kde-misc/gmail-feed/metadata.xml
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 65ee97f34b4..47fcdcfd8f6 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1 +1 @@
-DIST kdeconnect-kde-22.04.3.tar.xz 613864 BLAKE2B 1606892938cf184533cb3f40b558f7153fd18fd017d6a3cf7b93c84e33eccc9b10841417e0b9365c6a4262e0a35520a76b41c76e91e2a59c79574f061a7f524e SHA512 b09577ee6e5cc9fb73a3691ddaf55a7e7e33dc599db9abeffeb1fa812867c96290af7d445a39da6b2309a84c21d777ecccdf4f0f3c02e3723d9793f8e4775a36
+DIST kdeconnect-kde-22.08.3.tar.xz 625488 BLAKE2B 464f63c41799895b4467463247be3d35d1eabfc3a42da7c2ae7729890288d73d9bc17752c9a260493d290933ce945e662d322355af0e0b9dcefa39101e3cce9b SHA512 94df4dd19fce1cedeec3682b8b7d5eec7cd26fc6ffce75460d9a425fdd36d8bdc705467c4d3adb86512a5d40801b325e7d92e76d13f6a58415a170873a0d40a0
diff --git a/kde-misc/kdeconnect/kdeconnect-22.04.3.ebuild b/kde-misc/kdeconnect/kdeconnect-22.08.3.ebuild
index 1bc564f048a..631f78e3232 100644
--- a/kde-misc/kdeconnect/kdeconnect-22.04.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-22.08.3.ebuild
@@ -7,22 +7,22 @@ ECM_HANDBOOK="optional"
ECM_TEST="true"
KDE_ORG_NAME="${PN}-kde"
KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.92.0
-QTMIN=5.15.4
+KFMIN=5.96.0
+QTMIN=5.15.5
inherit ecm gear.kde.org
DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/"
+HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bluetooth pulseaudio wayland X"
+IUSE="bluetooth pulseaudio X"
RESTRICT="test"
DEPEND="
- >=app-crypt/qca-2.3.0:2[ssl]
+ >=app-crypt/qca-2.3.0:2[qt5(+),ssl]
>=dev-libs/wayland-1.15.0
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -30,6 +30,7 @@ DEPEND="
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -57,7 +58,6 @@ DEPEND="
x11-libs/libXtst
)
pulseaudio? ( media-libs/pulseaudio-qt:= )
- wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
"
RDEPEND="${DEPEND}
dev-libs/kpeoplevcard
@@ -66,6 +66,10 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kdeclarative-${KFMIN}:5
net-fs/sshfs
"
+BDEPEND="
+ dev-libs/plasma-wayland-protocols
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+"
PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" )
@@ -73,7 +77,6 @@ src_configure() {
local mycmakeargs=(
-DBLUETOOTH_ENABLED=$(usex bluetooth)
$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
- $(cmake_use_find_package wayland KF5Wayland)
$(cmake_use_find_package X LibFakeKey)
)
ecm_src_configure
diff --git a/kde-misc/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml
index 65474bc9219..e2d036edeea 100644
--- a/kde-misc/kdeconnect/metadata.xml
+++ b/kde-misc/kdeconnect/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="cpe">cpe:/a:kde:kdeconnect</remote-id>
</upstream>
<use>
<flag name="pulseaudio">Enable system volume control plugin using <pkg>media-sound/pulseaudio</pkg></flag>
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index a896fa505c8..befe8a53246 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1 +1 @@
-DIST kdirstat-3.2.1.tar.gz 249498 BLAKE2B 9c80f0460a2a8b31fe1effd2159fc3ddbfd311038ebded7973e6c4f836b7de8a1510891686d3e8efb4c4e102582697c5e57e7363b5582bb84364d7a2c1c64dc6 SHA512 db0dc98257914b7cd006c9523b83bd3e2fc1f2f1b1f842b01e6eaab4c8ec9299ee6fc97badeffda89a00385eeb0fd693921dfbafc090bb29d4e7d8cde01ea102
+DIST k4dirstat-3.4.2.tar.gz 411899 BLAKE2B 356844373c35def5421c234ae5b07bd11402f56309c30fc68a64766be634fec5f6d04a8931babe21efad6fc36ec992e8ebb08a29dc11a58b2b08f1072b3a8f18 SHA512 d29c9b18b4bc8e94af1f4b494418284a05b95a1b17dbb23614823b0e3e7cd2b470b8330d3f52c584c0c257d2c0dfd4d06914a3eb90a51f7b679437bccc695477
diff --git a/kde-misc/kdirstat/kdirstat-3.2.1.ebuild b/kde-misc/kdirstat/kdirstat-3.4.2.ebuild
index c1215a4195b..e409b1d498b 100644
--- a/kde-misc/kdirstat/kdirstat-3.2.1.ebuild
+++ b/kde-misc/kdirstat/kdirstat-3.4.2.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+MY_P="k4dirstat-${PV}"
ECM_HANDBOOK="forceoptional"
inherit ecm
DESCRIPTION="GUI equivalent to the du command based on KDE Frameworks"
HOMEPAGE="https://github.com/jeromerobert/k4dirstat"
-SRC_URI="https://github.com/jeromerobert/k4dirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jeromerobert/k4dirstat/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="5"
KEYWORDS="amd64 ~arm64 x86"
IUSE=""
-BDEPEND="
- sys-devel/gettext
-"
DEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
@@ -33,8 +32,7 @@ DEPEND="
sys-libs/zlib
"
RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/k4dirstat-${PV}"
+BDEPEND="sys-devel/gettext"
src_configure() {
local mycmakeargs=(
diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest
index 7584bcac2bc..712e345622a 100644
--- a/kde-misc/kio-fuse/Manifest
+++ b/kde-misc/kio-fuse/Manifest
@@ -1 +1 @@
-DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd
+DIST kio-fuse-5.0.1_p20220906-fbd09a33.tar.gz 56438 BLAKE2B 45655e9308614f0094b18a6f9c6f52013a60ba00243a3871b182cf76d2f91eb5fddc401985eea39a7af26abc8045958894501969ad21dbdf9969f131005718cb SHA512 a6f4222c4f020b2bfd6c38b303881f4810f857aad9b611d2e6abe448d945d881e85d4f1ebd0d2cb7ca6dc3b11cbad6331dd00fcc6ec1109ad1fbea7f20490fdc
diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
index e6d595d05d9..e376c211e2c 100644
--- a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
@@ -1,26 +1,23 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org linux-info
+KDE_ORG_COMMIT="fbd09a339f9880fe8d018001d4d2561593f90530"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org linux-info tmpfiles
DESCRIPTION="FUSE interface for KIO"
HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
LICENSE="GPL-3+"
SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
-RESTRICT+=" test" # depend on fuse kernel module
+RESTRICT="test" # depend on fuse kernel module
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -39,3 +36,8 @@ pkg_setup() {
ecm_pkg_setup
}
+
+pkg_postinst() {
+ tmpfiles_process "${PN}-tmpfiles.conf"
+ ecm_pkg_postinst
+}
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index ee9ef3e0b73..829353acb0d 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1 +1 @@
-DIST kio-gdrive-22.04.3.tar.xz 72040 BLAKE2B 3f4938dfca8a472c80e998a05498ac1e02bc1d0a2653dabcca3f72f65e41dc05ae8bdff7308a7428c000c23da14ce25a323b720e2e6a426585b6b37091189a91 SHA512 f1416622043604fdb25c06159ac88b4fead5dfd3723b8dd679db45aa52e7929fc3d55df3de34f92b4dededec787270b3aa6ca8799701466671cfbfe0a224dedd
+DIST kio-gdrive-22.08.3.tar.xz 73508 BLAKE2B 8954b4618577e67f331354503bf6598b5be9c7a1d919ba445cea959e6e3b8d7e329d33af1b3e41c07a2c713c9b93fba5bb88c95dfb3a058fe594cb152ba169a1 SHA512 808dcc3036174471098ab37f104322cfa51db33172b131da3bfbd28c73d841953f4812583d1d973fb410ee863337c1f86471933fa571a382b48d50049cefce07
diff --git a/kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-22.08.3.ebuild
index 1d1a811c619..917b485e537 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-22.08.3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
KDE_ORG_CATEGORY="network"
-KFMIN=5.92.0
-QTMIN=5.15.4
+KFMIN=5.96.0
+QTMIN=5.15.5
inherit ecm gear.kde.org
DESCRIPTION="KIO worker for Google Drive service"
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
deleted file mode 100644
index 9f34f95521d..00000000000
--- a/kde-misc/kmarkdownwebview/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kmarkdownwebview-0.5.6.tar.xz 68992 BLAKE2B cf2dd0718c6517b7ff3cebd032410b695a4ec40e6c51c93ac3f8f85cd3ffdb9a23c1922ac7f7e097412f0ea76891ea067ca2633d036dba8e45ff3fd6cc468f9b SHA512 51c99da9cb2fd0868bf0bc18e89efad75d70758343cf2b4d05e4eec00d328cc041ee9c8b90c402dc137afab5266e9dfb8877832064305de5a836c4aa94af4e4e
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
deleted file mode 100644
index 113eeb3ce74..00000000000
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="KPart for rendering Markdown content"
-HOMEPAGE="https://apps.kde.org/en/kmarkdownwebviewpart"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
- dev-qt/qtgui:5
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- kde-frameworks/kconfigwidgets:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kparts:5
- kde-frameworks/kxmlgui:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QTWEBKIT=OFF
- )
- ecm_src_configure
-}
diff --git a/kde-misc/kmarkdownwebview/metadata.xml b/kde-misc/kmarkdownwebview/metadata.xml
deleted file mode 100644
index d925f243975..00000000000
--- a/kde-misc/kmarkdownwebview/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
- </upstream>
-</pkgmetadata>
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index fa1e4a8e80d..e7d89374b2c 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1 +1 @@
-DIST krename-5.0.1.tar.xz 321556 BLAKE2B 38835e4f7ce97b4991419ac7676268701c0977feb32457c9dc5ddcea92f576012320eac06aadbe426a5e176aae6270606688afd377af4c9ea32d66bd75a74fdd SHA512 1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379
+DIST krename-5.0.2.tar.xz 337908 BLAKE2B 2fb7a96ca3f3f3b193d0924dd1131a7442b32149c1f62387734c47680077b6f77e3cf32b940b85d6f688d24f24af08ac39a8ccc86f10f5ec1d65b53fc9631108 SHA512 c065d6de90c43e5297db2773d8569279535b007d3b00b99a252329e78c90dc949678ecd2f2ecaa74e72394fa0e848b8774f6f387d4a7f367b367b1dd38405545
diff --git a/kde-misc/krename/krename-5.0.1-r1.ebuild b/kde-misc/krename/krename-5.0.2.ebuild
index 05dfc961804..632cc5cb2f2 100644
--- a/kde-misc/krename/krename-5.0.1-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.82.0
+QTMIN=5.15.5
inherit ecm kde.org
DESCRIPTION="Powerful batch file renamer"
@@ -20,7 +20,6 @@ LICENSE="GPL-2"
SLOT="5"
IUSE="exif pdf taglib truetype"
-BDEPEND="sys-devel/gettext"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -44,8 +43,9 @@ DEPEND="
truetype? ( media-libs/freetype:2 )
"
RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
-PATCHES=( "${FILESDIR}/${P}-no-kjs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.0.1-no-kjs.patch" )
src_configure() {
local mycmakeargs=(
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index cb913c4ca11..523b3b419ca 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1 +1,2 @@
DIST krusader-2.7.2.tar.xz 2912396 BLAKE2B d2675dbde007f002e7dd3730b806e30443ae9e6923d7255ea6c5582370aeb5783822ca0893fc01985fccca209cd0e88e8ada2234d18011d3f90a7e74bffe84ae SHA512 8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b
+DIST krusader-2.8.0.tar.xz 3029352 BLAKE2B 08f8def0f2a2904cb80820b80005289d596d1cc2777fa122777fafe47f11ebfc0f5742b64d26be5ff9f3f393437d533c3ce91eb1442d1e90d9768ca4f40e71b7 SHA512 40a8736e91756153c649defaaef956f4d65664b4a86e64f861f34744980cdebb2da8d31f596fdc53ea911a7b7ea1a4f1875b8e564976770558bf64e77ff25583
diff --git a/kde-misc/krusader/krusader-2.8.0.ebuild b/kde-misc/krusader/krusader-2.8.0.ebuild
new file mode 100644
index 00000000000..ec1421d9e40
--- /dev/null
+++ b/kde-misc/krusader/krusader-2.8.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org optfeature
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+fi
+
+DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
+HOMEPAGE="https://krusader.org/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ sys-apps/acl
+ sys-libs/zlib
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ kde-apps/kio-extras:5
+"
+
+src_prepare() {
+ ecm_src_prepare
+ use handbook || cmake_comment_add_subdirectory doc/handbook
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}"
+ optfeature "PDF/PS and RAW image thumbnails" "kde-apps/thumbnailers:${SLOT}"
+ optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}"
+ optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}"
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml
index d925f243975..d41cf0fbf8b 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="cpe">cpe:/a:krusader:krusader</remote-id>
</upstream>
</pkgmetadata>
diff --git a/kde-misc/kshutdown/kshutdown-5.2.ebuild b/kde-misc/kshutdown/kshutdown-5.2.ebuild
index e5b8c2af525..4d29bf9df8b 100644
--- a/kde-misc/kshutdown/kshutdown-5.2.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake kde.org xdg
+inherit cmake xdg
DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
HOMEPAGE="https://kshutdown.sourceforge.io"
@@ -14,11 +14,6 @@ SLOT="5"
KEYWORDS="amd64 ~arm64 x86"
IUSE="+kde"
-BDEPEND="
- app-arch/unzip
- sys-devel/gettext
- kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
DEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -45,10 +40,11 @@ RDEPEND="${DEPEND}
kde-frameworks/oxygen-icons:*
)
"
-
-src_prepare() {
- cmake_src_prepare
-}
+BDEPEND="
+ app-arch/unzip
+ sys-devel/gettext
+ kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
src_configure() {
local mycmakeargs=(
diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
index aea3508ecf6..3e0eacfd894 100644
--- a/kde-misc/markdownpart/Manifest
+++ b/kde-misc/markdownpart/Manifest
@@ -1 +1 @@
-DIST markdownpart-22.04.3.tar.xz 29100 BLAKE2B 0877a11e6ccc8f89de222f91e1c50fd52ff9c622ece2801bf61df7b6b872a5e6b48ea2a28097896734c564ca6e66aa1d4d336fd5118fcda733bef0fff61fa4ac SHA512 b2d4782bd05dd5a0dd49d63c92cab6a638b2bc3917a357b55f8c3fc5102a8e65ec09b6e0b06eb770a3e49d82f16df56240ceba622bae509757e489f73ecf0abd
+DIST markdownpart-22.08.3.tar.xz 30196 BLAKE2B b145932dc2a0bdc3c60f1b9b376c6fe03d930679316e35f69374c695c2e4da0caa50d1edac7a9673d9f03db52bebf9641c26ee665ea8647c9fee9b92de2be212 SHA512 a070c46ef84f951cf555b3b8ef9f6bdf9cba8fd2e5bf2f6a817df57e138ca74a9887fbc993b2553bd27cceef1d3159facb160e93924904409beb2e501d583db2
diff --git a/kde-misc/markdownpart/markdownpart-22.04.3.ebuild b/kde-misc/markdownpart/markdownpart-22.08.3.ebuild
index 373faece099..e07107f5b2b 100644
--- a/kde-misc/markdownpart/markdownpart-22.04.3.ebuild
+++ b/kde-misc/markdownpart/markdownpart-22.08.3.ebuild
@@ -4,8 +4,8 @@
EAPI=8
KDE_ORG_CATEGORY=utilities
-KFMIN=5.92.0
-QTMIN=5.15.4
+KFMIN=5.96.0
+QTMIN=5.15.5
inherit ecm gear.kde.org
DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/markdownpart/"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-misc/plasma-applet-weather-widget/Manifest b/kde-misc/plasma-applet-weather-widget/Manifest
deleted file mode 100644
index 2755fc313d7..00000000000
--- a/kde-misc/plasma-applet-weather-widget/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST plasma-applet-weather-widget-1.6.10.tar.gz 107848 BLAKE2B a434a7c6c26effa5daee37ae1d03e26793543112404b9e607346ac2f34405bcc068a201b9c371606d60cd129fda45e2dbb6d7cadf038365e1b2a5cdfc1813b1a SHA512 5db4c2e426b9b8296b70ec4edf5fc2dbc5e8056f66327569008a77b05201896ed23039aae063807726376e203d637053884bfeeac78c59c519b7fc5685797331
diff --git a/kde-misc/plasma-applet-weather-widget/metadata.xml b/kde-misc/plasma-applet-weather-widget/metadata.xml
deleted file mode 100644
index 43c861a8409..00000000000
--- a/kde-misc/plasma-applet-weather-widget/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">kotelnik/plasma-applet-weather-widget</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild
deleted file mode 100644
index 0c2ac70e2ce..00000000000
--- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm
-
-if [[ ${PV} = *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-DESCRIPTION="Plasma 5 applet for weather forecasts"
-HOMEPAGE="https://store.kde.org/p/998917/
-https://github.com/kotelnik/plasma-applet-weather-widget"
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
- >=kde-frameworks/plasma-5.60.0:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch
new file mode 100644
index 00000000000..5131f7dd54b
--- /dev/null
+++ b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch
@@ -0,0 +1,31 @@
+From 5f62fcc30e7d6c8248dfb6a263ee4a49e7c19e3b Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 17 Feb 2021 21:02:08 +0100
+Subject: [PATCH] cmake: install plasma-pass.categories in newer location
+
+Install plasma-pass.categories in the proper location for it, in case
+ECM >= 5.59.0 is used.
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0bed60..c32b637 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,11 @@ add_subdirectory(plugin)
+ if (BUILD_TESTING)
+ add_subdirectory(tests)
+ endif()
+-install( FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
++if(ECM_VERSION VERSION_GREATER_EQUAL 5.59)
++ install(FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
++else()
++ install(FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_CONFDIR})
++endif()
+
+ if(ECM_VERSION VERSION_GREATER_EQUAL 5.79)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+--
+GitLab
+
diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.0-r1.ebuild
index b62a307e42d..e66dbf2a266 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-KFMIN=5.74.0
-QTMIN=5.15.2
+KFMIN=5.82.0
+QTMIN=5.15.5
inherit ecm kde.org
DESCRIPTION="Plasma applet to access password from pass"
@@ -32,8 +32,12 @@ DEPEND="
sys-auth/oath-toolkit
"
RDEPEND="${DEPEND}
+ app-crypt/gnupg
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}"/${P}-no-werror.patch ) # bug 785832
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-loggingcategories-dir.patch
+ "${FILESDIR}"/${P}-no-werror.patch # bug 785832
+)
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 1ee4baac25b..a428cdcfad1 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1 +1 @@
-DIST skanlite-22.04.3.tar.xz 2441472 BLAKE2B fc9797cfa35c3920f65c98c76498e544d84e58a45a322aded0f65b9ffb130dc156a04af8ed85d81068a5d3c78ed071095598ae90d66d6666bb726129106dddf0 SHA512 6b7dd4417374305a707a6c8a4b9eb1a6a4d5c754dd859a26cedc82452833c68acb8d2ef1f44f1983a331b0b35ab2ebf52277d62f5730d90abc763ea14379c41e
+DIST skanlite-22.08.3.tar.xz 2441780 BLAKE2B eb2e546469ef3a145379b4cbcadd69bc6a6bfc4f86af37d8b0aa300df71eb829a0fd3b356bb3381cafc6ed479314e84b46a1d621f139510bb956942a61e5c7c4 SHA512 abe6e0e56cf9de921a5f925287035812519f2acf223d15cc725a965cbb55b3e66a14ed31571f5160b57c509b060a8f7e216b5d16f61dad1b5338317ef7ae9485
diff --git a/kde-misc/skanlite/skanlite-22.04.3.ebuild b/kde-misc/skanlite/skanlite-22.08.3.ebuild
index c2e2cd398d5..dc4032699c5 100644
--- a/kde-misc/skanlite/skanlite-22.04.3.ebuild
+++ b/kde-misc/skanlite/skanlite-22.08.3.ebuild
@@ -7,8 +7,8 @@ ECM_HANDBOOK="optional"
ECM_TEST="true"
KDE_ORG_CATEGORY="graphics"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
+KFMIN=5.96.0
+QTMIN=5.15.5
inherit ecm gear.kde.org
DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 1eaf159c108..7ffe537bab1 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
DIST tellico-3.4.4.tar.xz 6600432 BLAKE2B 4bac2df68284c9beb9ddbdbcf5824ac22d4a56066c371d7eaea962b81307f96d7ceba1fd446a4f640867a314c357c13d16a2e167356701241007e5a682ecb60b SHA512 6c9f16217ce5ff2d944d3eea3a5f5641b9717cd7d85835fd8b9559e90f6e920046085e8c9e14734d2ffa0a96ee6b8b241e0ccf1739aa2469af7e1bb88667f1d4
+DIST tellico-3.4.5.tar.xz 6602152 BLAKE2B cd308a500abaf9b85514e2a20b58bf576ccb3cffaf7d660111dabdeeb500a643aca469d4208163874fe842902b8664956f4d693575c2b1b7562068fdf4994a2d SHA512 1b8d52da856a3860147dd0c8c69ea99339f99b411555b87ff328f2519385072c544fe97f680363d6bb2cad5056313c4ad07d1c5e0b6021a092dbe93c233709c4
diff --git a/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch b/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch
new file mode 100644
index 00000000000..6cbb9aef239
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch
@@ -0,0 +1,25 @@
+From 32aef89113a1939b20766bf0e09cce7287b56f40 Mon Sep 17 00:00:00 2001
+From: Jonathan Esk-Riddell <jr@jriddell.org>
+Date: Fri, 21 Oct 2022 12:03:40 +0100
+Subject: [PATCH] fix version check which breaks on KF5 5.100
+
+---
+ src/newstuff/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/newstuff/CMakeLists.txt b/src/newstuff/CMakeLists.txt
+index b51914fd..c0ebfa54 100644
+--- a/src/newstuff/CMakeLists.txt
++++ b/src/newstuff/CMakeLists.txt
+@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(newstuff
+ )
+
+ IF( KF5NewStuff_FOUND )
+- if(${ECM_VERSION} STRGREATER "5.57.0")
++ if(${ECM_VERSION} VERSION_GREATER "5.57.0")
+ INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+ else()
+ INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+--
+GitLab
+
diff --git a/kde-misc/tellico/tellico-3.4.4-r1.ebuild b/kde-misc/tellico/tellico-3.4.4-r1.ebuild
new file mode 100644
index 00000000000..94c6dab3f55
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.4.4-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="https://tellico-project.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm64 x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+# tests need network access
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-qt/qtcharts:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ kde-frameworks/karchive:5
+ kde-frameworks/kcodecs:5
+ kde-frameworks/kcompletion:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kcrash:5
+ kde-frameworks/kguiaddons:5
+ kde-frameworks/kiconthemes:5
+ kde-frameworks/kitemmodels:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kjobwidgets:5
+ kde-frameworks/kio:5
+ kde-frameworks/knewstuff:5
+ kde-frameworks/kparts:5
+ kde-frameworks/kservice:5
+ kde-frameworks/ktextwidgets:5
+ kde-frameworks/kwallet:5
+ kde-frameworks/kwidgetsaddons:5
+ kde-frameworks/kwindowsystem:5
+ kde-frameworks/kxmlgui:5
+ kde-frameworks/solid:5
+ kde-frameworks/sonnet:5
+ bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 )
+ cddb? ( kde-apps/libkcddb:5 )
+ discid? ( dev-libs/libcdio:= )
+ pdf? ( app-text/poppler[qt5] )
+ scanner? ( kde-apps/libksane:5 )
+ semantic-desktop? ( kde-frameworks/kfilemetadata:5 )
+ taglib? ( >=media-libs/taglib-1.5 )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xmp? ( >=media-libs/exempi-2:= )
+ yaz? ( >=dev-libs/yaz-2:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-fix-kf-5.100-version-check.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+ -DENABLE_BTPARSE=$(usex bibtex)
+ $(cmake_use_find_package cddb KF5Cddb)
+ $(cmake_use_find_package discid CDIO)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+ $(cmake_use_find_package taglib Taglib)
+ -DENABLE_WEBCAM=$(usex v4l)
+ $(cmake_use_find_package xmp Exempi)
+ $(cmake_use_find_package yaz Yaz)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-misc/tellico/tellico-3.4.4.ebuild b/kde-misc/tellico/tellico-3.4.5.ebuild
index 5ae2ebe8657..b5f1ff3d0ee 100644
--- a/kde-misc/tellico/tellico-3.4.4.ebuild
+++ b/kde-misc/tellico/tellico-3.4.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://tellico-project.org/"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
+ KEYWORDS="~amd64 ~arm64 x86"
fi
LICENSE="|| ( GPL-2 GPL-3 )"
@@ -65,13 +65,11 @@ RDEPEND="
semantic-desktop? ( kde-frameworks/kfilemetadata:5 )
taglib? ( >=media-libs/taglib-1.5 )
v4l? ( >=media-libs/libv4l-0.8.3 )
- xmp? ( >=media-libs/exempi-2 )
+ xmp? ( >=media-libs/exempi-2:= )
yaz? ( >=dev-libs/yaz-2:0= )
"
DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
-"
+BDEPEND="sys-devel/gettext"
src_configure() {
local mycmakeargs=(
diff --git a/kde-misc/ultimate-gmail-feed/Manifest b/kde-misc/ultimate-gmail-feed/Manifest
deleted file mode 100644
index 262853c2d06..00000000000
--- a/kde-misc/ultimate-gmail-feed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ultimate-gmail-feed-2.1.tar.gz 26416 BLAKE2B eb6da2c2968a8fda9a758daf77c55f2cc28cb939bb542c757e99f839c4b252339ce3ef936fac13b16e046a60617ba2f0fbdc6aca41ce723ad0c04d68ed1c712b SHA512 dcf8ebd76c8d02d8c359153b3bd06cc25608111c6fa832160858d77bf7a996dc75ba17d59fbfcacbea311a3ceee642ff36fe0f2bf78bf1b6dd108ed4408a079e
diff --git a/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild b/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
deleted file mode 100644
index 62796ae711e..00000000000
--- a/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="plasmoid-${PN}"
-inherit ecm
-
-DESCRIPTION="Plasma 5 widget showing your Gmail feed"
-HOMEPAGE="https://www.pling.com/p/1248550/
-https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed"
-SRC_URI="https://github.com/Intika-KDE-Plasmoids/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DEPEND="
- dev-qt/qtdeclarative:5
- dev-qt/qtnetwork:5
- kde-frameworks/knotifications:5
- kde-frameworks/plasma:5
-"
-RDEPEND="${DEPEND}
- dev-qt/qtquickcontrols:5
- dev-qt/qtxmlpatterns:5[qml]
-"
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
new file mode 100644
index 00000000000..9434b008256
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
@@ -0,0 +1,41 @@
+From 32c78782b3061bab2a3b1457133faf77b6d9ed2a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 14 Nov 2022 02:57:07 +0100
+Subject: [PATCH] Fix incorrect xsetwacom call
+
+When param is e.g. 'Button 1' the 'Button' and '1' need to be passed as separate arguments
+
+BUG: 454947
+---
+ src/kded/xsetwacomadaptor.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
+index 934fa8b..fc1bcac 100644
+--- a/src/kded/xsetwacomadaptor.cpp
++++ b/src/kded/xsetwacomadaptor.cpp
+@@ -245,10 +245,18 @@ bool XsetwacomAdaptor::setRotation(const QString& value)
+ bool XsetwacomAdaptor::setParameter(const QString &device, const QString &param, const QString &value) const
+ {
+ QProcess setConf;
+- if (!value.isEmpty()) {
+- setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
++
++ // https://bugs.kde.org/show_bug.cgi?id=454947
++ static const QRegularExpression buttonWithNumber(QStringLiteral("^Button \\d+$"));
++ if (param.contains(buttonWithNumber)) {
++ const QStringList splitted = param.split(QLatin1Char(' '));
++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << splitted[0] << splitted[1] << value);
+ } else {
+- setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
++ if (!value.isEmpty()) {
++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
++ } else {
++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
++ }
+ }
+
+ if (!setConf.waitForStarted() || !setConf.waitForFinished()) {
+--
+GitLab
+
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
new file mode 100644
index 00000000000..e86f97cfaef
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
@@ -0,0 +1,143 @@
+From 9c2f133ee400562ca9813e329f6e2bdae24a5ac5 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 4 Aug 2022 22:43:07 +0200
+Subject: [PATCH] Port from QRegExp to QRegularExpression
+
+---
+ src/common/buttonshortcut.cpp | 33 ++++++++++++++++++++-------------
+ src/kded/xsetwacomadaptor.cpp | 17 +++++++++++------
+ 2 files changed, 31 insertions(+), 19 deletions(-)
+
+diff --git a/src/common/buttonshortcut.cpp b/src/common/buttonshortcut.cpp
+index e11784f..32bf842 100644
+--- a/src/common/buttonshortcut.cpp
++++ b/src/common/buttonshortcut.cpp
+@@ -19,7 +19,7 @@
+
+ #include "buttonshortcut.h"
+
+-#include <QRegExp>
++#include <QRegularExpression>
+ #include <QKeySequence>
+
+ #include <KLocalizedString>
+@@ -266,8 +266,8 @@ bool ButtonShortcut::set(const QString& sequence)
+ return true;
+ }
+
+- QRegExp modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), Qt::CaseInsensitive);
+- QRegExp buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), Qt::CaseInsensitive);
++ static const QRegularExpression modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), QRegularExpression::CaseInsensitiveOption);
++ static const QRegularExpression buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), QRegularExpression::CaseInsensitiveOption);
+
+ if (seq.contains(buttonRx)) {
+ // this is a button
+@@ -388,7 +388,8 @@ void ButtonShortcut::convertToNormalizedKeySequence(QString& sequence, bool from
+ {
+ normalizeKeySequence(sequence);
+
+- QStringList keyList = sequence.split (QRegExp (QLatin1String ("\\s+")), Qt::SkipEmptyParts);
++ static const QRegularExpression rx(QStringLiteral("\\s+"));
++ QStringList keyList = sequence.split (rx, Qt::SkipEmptyParts);
+ bool isFirstKey = true;
+
+ sequence.clear();
+@@ -460,28 +461,33 @@ void ButtonShortcut::normalizeKeySequence(QString& sequence) const
+ {
+ // When setting a shortcut like "ctrl+x", xsetwacom will convert it to "key +ctrl +x -x"
+ // therefore we just truncate the string on the first "-key" we find.
+- QRegExp minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
+- int pos = 0;
++ static const QRegularExpression minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
+
+- if ((pos = minusKeyRx.indexIn(sequence, 0)) != -1) {
+- sequence = sequence.left(pos);
++ const QRegularExpressionMatch minusKeyRxMatch = minusKeyRx.match(sequence);
++
++ if (minusKeyRxMatch.hasMatch()) {
++ sequence = sequence.left(minusKeyRxMatch.capturedStart());
+ }
+
+ // cleanup leading "key " identifier from xsetwacom sequences
+- sequence.remove(QRegExp (QLatin1String ("^\\s*key\\s+"), Qt::CaseInsensitive));
++ static const QRegularExpression leadingKey(QStringLiteral("^\\s*key\\s+"), QRegularExpression::CaseInsensitiveOption);
++ sequence.remove(leadingKey);
+
+ // Remove all '+' prefixes from keys.
+ // This will convert shortcuts like "+ctrl +alt" to "ctrl alt", but not
+ // shortcuts like "ctrl +" which is required to keep compatibility to older
+ // (buggy) configuration files.
+- sequence.replace(QRegExp (QLatin1String ("(^|\\s)\\+(\\S)")), QLatin1String ("\\1\\2"));
++ static const QRegularExpression plusPrefixes(QStringLiteral("(^|\\s)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
++ sequence.replace(plusPrefixes, QLatin1String ("\\1\\2"));
+
+ // Cleanup plus signs between keys.
+ // This will convert shortcuts like "ctrl+alt+shift" or "Ctrl++" to "ctrl alt shift" or "Ctrl +".
+- sequence.replace (QRegExp (QLatin1String ("(\\S)\\+(\\S)")), QLatin1String ("\\1 \\2"));
++ static const QRegularExpression cleanupPlus(QStringLiteral("(\\S)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
++ sequence.replace (cleanupPlus, QLatin1String ("\\1 \\2"));
+
+ // replace multiple whitespaces with one
+- sequence.replace (QRegExp (QLatin1String ("\\s{2,}")), QLatin1String (" "));
++ static const QRegularExpression whitespaces(QStringLiteral("\\s{2,}"), QRegularExpression::CaseInsensitiveOption);
++ sequence.replace (whitespaces, QLatin1String (" "));
+
+ // trim the string
+ sequence = sequence.trimmed();
+@@ -500,7 +506,8 @@ void ButtonShortcut::prettifyKey(QString& key) const
+ bool ButtonShortcut::setButtonSequence(const QString& buttonSequence)
+ {
+ QString buttonNumber = buttonSequence;
+- buttonNumber.remove(QRegExp (QLatin1String ("^\\s*button\\s+"), Qt::CaseInsensitive));
++ static const QRegularExpression rx(QStringLiteral("^\\s*button\\s+"), QRegularExpression::CaseInsensitiveOption);
++ buttonNumber.remove(rx);
+
+ bool ok = false;
+ int button = buttonNumber.toInt(&ok);
+diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
+index a39f307..934fa8b 100644
+--- a/src/kded/xsetwacomadaptor.cpp
++++ b/src/kded/xsetwacomadaptor.cpp
+@@ -27,7 +27,7 @@
+ #include "tabletarea.h"
+
+ #include <QProcess>
+-#include <QRegExp>
++#include <QRegularExpression>
+
+ using namespace Wacom;
+
+@@ -142,10 +142,13 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
+ QString modifiedParam = param.key();
+
+ // convert tablet button number to hardware button number
+- QRegExp rx(QLatin1String("^Button\\s*([0-9]+)$"), Qt::CaseInsensitive);
++ static const QRegularExpression rx(QLatin1String("^Button\\s*([0-9]+)$"), QRegularExpression::CaseInsensitiveOption);
++
++ const QRegularExpressionMatch match = rx.match(modifiedParam);
++
++ if (match.hasMatch()) {
++ QString hwButtonNumber = match.captured(1);
+
+- if (rx.indexIn(modifiedParam, 0) != -1) {
+- QString hwButtonNumber = rx.cap(1);
+ QString kernelButtonNumber;
+
+ if (!d->buttonMap.isEmpty()) {
+@@ -167,9 +170,11 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
+
+ void XsetwacomAdaptor::convertButtonShortcut (const XsetwacomProperty& property, QString& value) const
+ {
+- QRegExp rx (QLatin1String("^Button\\s*[0-9]+$"), Qt::CaseInsensitive);
++ static const QRegularExpression rx(QLatin1String("^Button\\s*[0-9]+$"), QRegularExpression::CaseInsensitiveOption);
++
++ const QRegularExpressionMatch match = rx.match(property.key());
+
+- if (rx.indexIn(property.key(), 0) != -1) {
++ if (match.hasMatch()) {
+ ButtonShortcut buttonshortcut(value);
+ value = buttonshortcut.toString();
+ }
+--
+GitLab
+
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild
index 733a1d4001c..61cad0cb403 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild
@@ -58,6 +58,8 @@ PATCHES=(
"${WORKDIR}/${P}-fix-QProcess-invocation.patch"
"${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556
"${WORKDIR}/${P}-only-show-on-X11.patch"
+ "${FILESDIR}/${P}-port-to-QRegularExpression.patch" # pre-requisite for below:
+ "${FILESDIR}/${P}-fix-incorrect-xsetwacom-call.patch" # bug 850652, KDE-bug 454947
)
src_test() {
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
deleted file mode 100644
index 2c3d6a622b7..00000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="System settings module for Wacom tablets"
-HOMEPAGE="https://apps.kde.org/wacomtablet/
-https://userbase.kde.org/Wacomtablet"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >=dev-libs/libwacom-0.30:=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=x11-drivers/xf86-input-wacom-0.20.0
- x11-libs/libXi
- x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libX11
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=( "${WORKDIR}/${P}-qt-5.15.patch" )
-
-src_test() {
- # test needs DBus, bug 675548
- local myctestargs=(
- -E "(Test.KDED.DBusTabletService)"
- )
-
- ecm_src_test
-}
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index eac4fd4ec63..993c56fd8db 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1 +1 @@
-DIST zanshin-22.04.3.tar.xz 353548 BLAKE2B 921b28181d668a6a968c7be693121f3a37034813e1b820daaf6519db1becff81138fec4846786d77d931574b5177f5ef72674f66531c5397210fe4a8a5966571 SHA512 b85609490bdcb599ca4206cf7b017e48cfbc704f1e5c11250e530ec254e56794ac1d55870bd0656a8e97019fce71de5fec270a34efa5d9a96895a022bffb9c30
+DIST zanshin-22.08.3.tar.xz 355200 BLAKE2B ca607d76686eeb3e3983a76fd06e4c3237d753c9866a03c08fd4c5947348caa80c93f79ee56f075ea0f3c1dc2dcbeb22f4b174a191e20b34e4cbe2d86691223b SHA512 afc1c481e4b751786247a3e8bcc4c08a986581c3e91f8d74e541e3023a8b83bf4287538d03792e4e7981ec3c32f3a07b4f50b9800c36d970f1a478383169c3da
diff --git a/kde-misc/zanshin/zanshin-22.04.3.ebuild b/kde-misc/zanshin/zanshin-22.08.3.ebuild
index 632d03665d1..213c4ab0299 100644
--- a/kde-misc/zanshin/zanshin-22.04.3.ebuild
+++ b/kde-misc/zanshin/zanshin-22.08.3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
ECM_TEST="forceoptional"
KDE_ORG_CATEGORY="pim"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
+KFMIN=5.96.0
+QTMIN=5.15.5
VIRTUALX_REQUIRED="test"
inherit ecm gear.kde.org