gentoo resync : 25.11.2020

3 files changed, 5 insertions, 75 deletions

diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 0a27e0f0321f..500796116254 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,3 @@
-DIST ktp-common-internals-20.04.3.tar.xz 449392 BLAKE2B fa8e8603b09d56af9445a4b94e86714d58f0383de87ccfaf74cddefa5c9bac4e776f24c881991dba9e7fa703e7ca9d30a2b2f15d00749971bc069ad31f436130 SHA512 444380e2b704f470987a90e49f7305481532e688b082066dd501e88a29ab9844df7301fd942153060488d945db13c48399ab5b9512f0803616219dd57e562870
-DIST ktp-common-internals-20.08.1.tar.xz 449604 BLAKE2B f8ee6b9021dde559846c135177ae75edd6402a27c2389fbc6a55b15fcde2e856b9808c72342a203c67df592ea6ac64409b8f6a2aa32fd4bbe224b30eacacf842 SHA512 19be41e5604906b19140660b7bd8875e32ecc5fac51bec730f8cbad374ab8410cde3601dfe612efc9189e93e8e62a1b4472f35e93e7da5089f416dbb7ab5829b
-EBUILD ktp-common-internals-20.04.3.ebuild 1719 BLAKE2B 382b12c5a70c0a4acd20624a82b8865f05c9ffe014a859819d78987e6012934783754d1f330930b298483f18b05e7b074edad6f9f6821afab4620ef8a8a8e616 SHA512 4cb09545af5c5214748fcff94e388f771701a087ec0c6ce45522c22e05e842615c4ec23c6d0efab52ae03e00436242fef83b33c9502522373a10bcbff335cf25
-EBUILD ktp-common-internals-20.08.1.ebuild 1714 BLAKE2B 26aac54dcb72df121f4b62d4dc66098a21c0f8fd18de8dcb3f5d8416a09810bb19410b520dbb98cd9e43c89ba8dadade8768cf8a454003d30fdeb7712a907f89 SHA512 1c155dbf795aa478338139a9474d0c40c5bf141b8535fcc90f0844814956e63dd460e9ae5fae6a9e00db352693221d82278ff2b4827fac4501374ccb8a2349f8
+DIST ktp-common-internals-20.08.3.tar.xz 449648 BLAKE2B 575d1ab5ec25102f3256254fc3969de8b298f665aa54129198e7b11bbc7fc16a4e4ac47ce30329e61e6e263d1bac613f4f1df24e27cd8f28ac0efd4be2137758 SHA512 aa574c04b0d9aad8a736eb8263ff83596e11411fbe63eb11702df455bbe93ff5dded5148ad1733875a0d1e9c0b2519aa141a59a0006e674480e73338ecaaadbb
+EBUILD ktp-common-internals-20.08.3.ebuild 1711 BLAKE2B 7a1cc07f784775e74954bc98221d14ad536eff4a7ecca924277ff49be01002578bd58c70b70c369d6fbd271e16453199143f446927c9e55c919c8e8fd41ee156 SHA512 55f0c6069af1bf79602b147786eb0cd957132e11ec084b3634732701e7e0ec30e9f91bfc9594a143b2026fe54a83b0665530abf114f4bd01cef98f67f3d6afad
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-20.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-20.04.3.ebuild
deleted file mode 100644
index c8e1091bdc4c..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-20.04.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=net-libs/telepathy-logger-qt-17.08.0:5
-	>=net-libs/telepathy-qt-0.9.5[qt5(+)]
-	otr? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/libotr-4.0.0
-	)
-	sso? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package sso KAccounts)
-		$(cmake_use_find_package sso AccountsQt5)
-		$(cmake_use_find_package otr Libgcrypt)
-		$(cmake_use_find_package otr LibOTR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-20.08.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-20.08.3.ebuild
index 090029cf54b8..7fa1b99adfda 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-20.08.1.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-20.08.3.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy common library"
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="otr +sso"
 
 RDEPEND="