gentoo resync : 20.03.2022

4 files changed, 5 insertions, 79 deletions

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index d0d594639dea..41f74ae6c34f 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,8 +1,7 @@
 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.1.tar.xz 4254944 BLAKE2B 180317e871900420a4c1cad20cac1633b3fe08e7b9541d36d9ca13d6beb3401f86a8c2385b26aa680458a30807cb325c30395085c1e673203395afc2d945a031 SHA512 a0df7526baba9c614e61dc9dd06d4a812f8a179ad072c81831b6efe15d3e04d85ce7cdf04769fa27cf22e7cf096692b01d8703372a7176f8f76d135ee0796a59
-EBUILD konversation-21.08.3-r1.ebuild 1964 BLAKE2B 6873efd7631a0fcc17e17539e9803db379573db104d4725429afc27ded24ac4d8f5f371a4c39ec87a817c584babe0a8eb29abf3f442888b9c4bad377a9d4ff0c SHA512 0044ac7742b5e390114fcc0ef893c69b706c0f55b337f53f973996823a0e7a11a13e9b2d0db70e9d032dbc64a5ab6437ef1ccad9804972a719621c752f1c81d6
-EBUILD konversation-21.08.3.ebuild 1896 BLAKE2B ee27ea48e0283e151f1d222aa0784771de8962a982a392e453a3b9680078f9c4f09d9a97295aab7b95318ec44e9fbf1cfae4b069d54d39a8dbcbebf5c7f3cdc9 SHA512 a5cb105e4f60c489b1b25425d4853d5b4f1ae4353897b2c77e37e86e27efdbe040e9b0bc1b0b215c8f0764412c19d664d06bf05f3f9db57edbf6a18b94f74967
-EBUILD konversation-21.12.1.ebuild 1899 BLAKE2B 469a70fd836c6ddb43ac5194fb1fed838b7fed4c0322e132a8c896ee3d20377de4b33ec07c6fb26809184f7b5724141f2d85a524a4ec2553093c45e205c55672 SHA512 7239e9cc05f2bfa2e3d97203eca567d8fcd66863137c7d46def24f73867b418bea340a38b200f99f6f968384a4e040658c86849311a2aa765834c9fb5756e613
+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 1899 BLAKE2B 469a70fd836c6ddb43ac5194fb1fed838b7fed4c0322e132a8c896ee3d20377de4b33ec07c6fb26809184f7b5724141f2d85a524a4ec2553093c45e205c55672 SHA512 7239e9cc05f2bfa2e3d97203eca567d8fcd66863137c7d46def24f73867b418bea340a38b200f99f6f968384a4e040658c86849311a2aa765834c9fb5756e613
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/konversation-21.08.3-r1.ebuild b/net-irc/konversation/konversation-21.08.3-r1.ebuild
index 05c1d29432e7..d91f00f2b520 100644
--- a/net-irc/konversation/konversation-21.08.3-r1.ebuild
+++ b/net-irc/konversation/konversation-21.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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.ebuild b/net-irc/konversation/konversation-21.08.3.ebuild
deleted file mode 100644
index da59d8454405..000000000000
--- a/net-irc/konversation/konversation-21.08.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_GEAR="true"
-KFMIN=5.84.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
-
-LICENSE="GPL-2"
-SLOT="5"
-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/qtnetwork-${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/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${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
-	>=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] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-21.12.1.ebuild b/net-irc/konversation/konversation-21.12.3.ebuild
index ecaddf574605..ecaddf574605 100644
--- a/net-irc/konversation/konversation-21.12.1.ebuild
+++ b/net-irc/konversation/konversation-21.12.3.ebuild