gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 105 deletions

diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 129b213411b2..d80ea2ce4551 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,6 +1,3 @@
-AUX ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch 1117 BLAKE2B 3f6d05d10df137aeaaf68890795458314ac43556df7f29493ab129a9046f97aee0775159db57fc7d9c42769f8eef9ce071803828137b75b16206e6d164584408 SHA512 c4509fcb1a3a5051c6175c101dde3e50630c95a922791f92dfefef5db089e3bcd9fb0f9aceacdc0d28558337aed850062b8e641c83cb8dc2acf9d78972a96255
-DIST ktp-accounts-kcm-19.08.3.tar.xz 265200 BLAKE2B 82599ec0c4f9135a2d45f3df1cd53d3018ccb5ef530733fa8fe640f1ab05d9db2f32d15a2292c416455953c58f2eeded94e8ff1400326b37d1c1dc3e28a41684 SHA512 6bccc23631256e91d4962004bdb96949ca79ba0e8f2068a92c763023a2ce71413f559a60c54f84dc5c23fb1facfe7ff08f6c74b68021e6dfbc30d19f3a8c3ba9
-DIST ktp-accounts-kcm-19.12.2.tar.xz 265388 BLAKE2B cc49d34e57e898982a13902009d65dfbf23b530aca038c518917b96bdb66ff38b300cff280a1d50f40fc3d49f3aae770b8aab810e87fe702e56b5ccce7797628 SHA512 9461a95f69e43a133744cd05b2cfbe63462f2bbc7dcc130eebafc74a0f6308e3bbdb1804cf6932554309fc1252d59e43c66bf6d73a3d38f7f19b6997c342bf94
-EBUILD ktp-accounts-kcm-19.08.3.ebuild 1793 BLAKE2B ab4f995066ef74f27300759fe3b8e8ebfc1039ccaebe5f00c5334501eb40ff42083a238d2b9673b770a8efc02d1fe48d75c0502121686c49ae98eedce0df4a86 SHA512 21e95d4e790a37739f179e942e0649a89569f0978cbb72d68deebcb5bb91a509983163cbdbf640468a9b8f705ee30535242918c965f33f573a0a201cf575be42
-EBUILD ktp-accounts-kcm-19.12.2.ebuild 1687 BLAKE2B 23d5f4bb692296816d1222c4aacb4c75f1ce081d2567b96efe3295c430391c5d2b3f5064e34ab1dd1229cd318f43999f2eaef324c2d9ea39528e16391aed2521 SHA512 c1b3d219132b8e41645a0b54596b3ad2ee63bab9736f08314ed4a3a24c3680730a50499c8f47dedce25fe549506fe22308e366327eb6ae89b334b23595483517
+DIST ktp-accounts-kcm-19.12.3.tar.xz 264576 BLAKE2B af1bd84b90f78d6f16824621aca7ad4b600e56e6f2ef02d70e84629761ecfb820a981811ac7bc7fd92ebb0cb44860a60304ab9c4433a69cee4fce3d0d002a4db SHA512 c7d5f80f379f2c2f7b91db17fc4d68afe2fd6744589cbbae2f8012f56ecac9b6ddcda28b01639770055e48c42e762c05d366b38c9e420a00fa08c9f1fd132ca7
+EBUILD ktp-accounts-kcm-19.12.3.ebuild 1684 BLAKE2B 12a3b74244eeae8bb47c0ef739f8d48a5b8c7d1055ef456ee06df85c65aa515d9841d63b044ebd4797c4821e484b0b13f325fdcb49c1c1af5c1e8de0e0658f7d SHA512 aaa38181aedd7454fe48948fcbd9dac267004bfa628468ca4261cfe69fcbb052f61ac7d5da30795cbc073e280428c04b57dfa6b431715a7f71fc257d480090b2
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch b/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
deleted file mode 100644
index fac56a410cc4..000000000000
--- a/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fbe5097f4a79f286607b859be9c68de371955117 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 18 Nov 2019 22:13:18 +0100
-Subject: Fix build with telepathy-qt 0.9.8
-
-Use the new TelepathyQt5::Core link target with 0.9.8, otherwise compilation fails with
-/usr/include/telepathy-qt5/TelepathyQt/_gen/types.h:15:10: fatal error: QDBusArgument: No such file or directory
-
-Differential Revision: https://phabricator.kde.org/D25370
----
- src/KCMTelepathyAccounts/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
-index 1fe7c09..18181f9 100644
---- a/src/KCMTelepathyAccounts/CMakeLists.txt
-+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
-@@ -69,6 +69,10 @@ add_library(ktpaccountskcminternal
-             ${libktpaccountskcminternal_SRCS}
- )
- 
-+if (TARGET TelepathyQt5::Core) # telepathy-qt 0.9.8
-+    set (TELEPATHY_QT5_LIBRARIES TelepathyQt5::Core)
-+endif()
-+
- target_link_libraries (ktpaccountskcminternal
-                        Qt5::Widgets
-                        Qt5::Core
--- 
-cgit v1.1
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
deleted file mode 100644
index d2114d3a641b..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="experimental"
-
-BDEPEND="
-	dev-util/intltool
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kaccounts-providers-${PVCUT}:5
-	net-im/telepathy-connection-managers
-"
-
-PATCHES=( "${FILESDIR}/${P}-telepathy-qt-0.9.8.patch" )
-
-src_prepare() {
-	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \
-			die "couldn't enable experimental services"
-	fi
-	ecm_src_prepare
-}
-
-pkg_postinst() {
-	if use experimental; then
-		ewarn "Experimental providers are enabled."
-		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
-		ewarn "Use at your own risk!"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.2.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.3.ebuild
index f19be29f7dab..aa0ba5935381 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.2.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="experimental"
 
 BDEPEND="