gentoo resync : 12.05.2022

4 files changed, 8 insertions, 39 deletions

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 9ead3e573d7f..689476affcb9 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,7 +1,6 @@
-AUX konversation-21.08.3-fix-case-sensitive-tap-compl.patch 1018 BLAKE2B d068372d5d594e058b961db734536d6718844890776a9494d642ea3121e809669bf7e3b10774945bc2fea2aad6bac6887a49755762ce24ecb4cffe6583599cc4 SHA512 95d24174780f09fe4085bb7b759218a5027b0ee0764713c6bbb8cf78d85bb65e98a37fde630d58bd220c528a82f824f9ecb84cf1412c0073ae3710209a24307c
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
-DIST konversation-21.08.3.tar.xz 4251372 BLAKE2B e368cdba433b4dc00c51c4804323951aefd8034660b3ab84c418f000f45ff6ed5525a2baaabddd36a30ebcb6ee15aa39baa7a0d7fdbf703f8a64df8557f5e3cf SHA512 7cf3e8c0fb455c708f37b1112cd1cc6649770dfa0dc6106ebfe52bf152817f27a31ee1bfeb561a55a728bc270a384eade595b676a900763eeaa724b1bca086c0
 DIST konversation-21.12.3.tar.xz 4275132 BLAKE2B 31ad192a3167b6ea1d82eab36a4f69f1e34fcc679ccfde06b1d0317aa3abcdb31bb7a39dd29574a182105ac6eb0e084a1e3cbe1fbe871a0d216368d9a2a8dcbe SHA512 118975e8ed0b20ab0a85b03354a0265dc7c0e1b15fba92a91357df710b9801873ac5506181baec6f106e4dd8daa15555c2ae3e22c1ddd4c9a787947afe06e408
-EBUILD konversation-21.08.3-r1.ebuild 1963 BLAKE2B 5993fb405a9bb88d485fc4411a0f424f44a1cbd6e2a2bfad0c37cea46d6ff4764a20c439a7cfde61b59592fab0b8cdf83dc416ab9be7e97d3bfd2b9952495ac5 SHA512 6eb0e0a82b4f507e48d4c661e66fbe9062822d90c832786207147e805758b2315b1ab2165df26531c1b213ecb67256ceaa958dfd2289246dc7811b78386b60fa
-EBUILD konversation-21.12.3.ebuild 1897 BLAKE2B 0543d5e06c4dcc14cef9efd8d0d47cf1993bda4e9ebf48284005c00a6e3be846ace66e38660cb80e2803b3f07f8605f5cefe59e4ac197b5f198bbb286f7bfb83 SHA512 dcd900d61c6e3a7937bbc150f11a9849f3ec9c68208fe6affe3276ab582811b95f2ad3498720dd0f8acb643acf7d7f3b2088d67da7a83ceca614a38188021d85
+DIST konversation-22.04.0.tar.xz 4288088 BLAKE2B 5c733ec5438798fd8b759b9551d851d4931cfe375248a6b90ac10fb640e89f00d2696b0bf2982dde08282fee6e61d4702784f9886be21b0cb34d8f76b5dca254 SHA512 08cb23efd6511cd710e68356d4bd9898a3b7b7b86187190a9e2d0767ada67433dd8195d5bed4b38e87a8bcd10c47e56ccee1a760f25d011baa5debbff7ad69b3
+EBUILD konversation-21.12.3.ebuild 1896 BLAKE2B 19996ecd1cac774e660e46d8afc003be85f8ec4ea12911cd187bbd0b111024badccff165f930fe86c4d45d1323254cbec9560b991a78983b342efa8fac4fcb12 SHA512 925eca7e324f939ce11f06357c4951ed153aa34bcd650c3b8919326a2bc8f855e4600fdb3cc3f768fd8f10e93f1cb4aa36c1f5df2f5d78ef6d4356f491d71b5d
+EBUILD konversation-22.04.0.ebuild 1905 BLAKE2B 3c368e616a1227b05d18304e98d54cf09c73b7d69e6c000400fd4bd31a9fef6e0dbce282eaf655a61f7b61e38e6374bea03305b5198b2ef1e464d886d32ea60e SHA512 7b43aa15b1a83eaf841f8e5e5c35bd716fdd1e690d8c37c62d002cfcc3b115d1f037ddf941ce8f397ec9654a20c2b7540509147da8014efaee6eedfdec1770d0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch b/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
deleted file mode 100644
index 5a4fbdfd2498..000000000000
--- a/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 68d4efb0e9dbcf1fa22c7975d92164a2f991256b Mon Sep 17 00:00:00 2001
-From: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Sat, 18 Dec 2021 21:40:56 +0000
-Subject: [PATCH] Bugfix: Correct behaviour of "case sensitive" tab completion
- option
-
-Fixes regression from 5dfb6583.
-BUG:442109
----
- src/irc/channel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
-index 7acc86f1..9521c695 100644
---- a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -2822,7 +2822,7 @@ QString NickList::completeNick(const QString& pattern, bool& complete, QStringLi
- 
-     const QRegularExpression regexp(
-         prefix + QRegularExpression::escape(pattern),
--        caseSensitive ? QRegularExpression::CaseInsensitiveOption : QRegularExpression::NoPatternOption);
-+        caseSensitive ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption);
- 
-     for (Nick* nick : *this) {
-         newNick = nick->getChannelNick()->getNickname();
--- 
-GitLab
-
diff --git a/net-irc/konversation/konversation-21.12.3.ebuild b/net-irc/konversation/konversation-21.12.3.ebuild
index 352d507f62ff..d437567128e2 100644
--- a/net-irc/konversation/konversation-21.12.3.ebuild
+++ b/net-irc/konversation/konversation-21.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/konversation/konversation-21.08.3-r1.ebuild b/net-irc/konversation/konversation-22.04.0.ebuild
index d91f00f2b520..b931b1c022ef 100644
--- a/net-irc/konversation/konversation-21.08.3-r1.ebuild
+++ b/net-irc/konversation/konversation-22.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_GEAR="true"
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,13 +14,13 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+crypt"
 
-BDEPEND="sys-devel/gettext"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
@@ -48,15 +48,13 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
 	crypt? ( >=app-crypt/qca-2.3.0:2 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtsvg-${QTMIN}:5
 	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
 "
-
-PATCHES=( "${FILESDIR}/${P}-fix-case-sensitive-tap-compl.patch" )
+BDEPEND="sys-devel/gettext"
 
 src_configure() {
 	local mycmakeargs=(