gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 133 deletions

diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 89d696fbb94b..9d61841dafac 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,6 +1,3 @@
-AUX ktp-common-internals-19.08.3-telepathy-0.9.8.patch 1898 BLAKE2B 72ac4337a881182b0f1d43469f68ec7b11a105f626da42acec134abd9b0e5ebb25a59db57d8656ca5c0e9fcebd88a0ad42549b3d1ec6a9ceaf474d0853ab83b3 SHA512 93c43f7eddc99c22f55308ea1cccf59f7fc5c1d9c57b72d2a8ff7ebdfa00ac3e6319bf33ecaeac8ef53a1f9685b5278f32c2b182184fd64919f97df0825f8563
-DIST ktp-common-internals-19.08.3.tar.xz 445792 BLAKE2B 36ba8abed61b1b45481b1a65d565d6f12e115a9db8bd14b2d8a4f276646387e1c18a27d26cda78bbb5885277de23884329b6d42798abb592e8c8bf555c156ba0 SHA512 255e8e16cf1b374a1106f66f4d69e660a9443d7b28d169730326fd4689a864bdd34bce9a33ff63ba175faf1bf65a1db1484e3dccc229eb3f0918c9fcad965e60
-DIST ktp-common-internals-19.12.2.tar.xz 446332 BLAKE2B 49b75818f2dc40573e56c1881fa1b395b52fa99d9ddf12d1ab71ae83060a382cf9edf648df6725d521c43bfb2eca0d8a5b121519edcd28bdf0dd8faedac989fc SHA512 77f0edb519f46038ac25c507313fe6d7ee823a9974ef783e634391306aa488ac13afb0c4c669c9a3efeb1927483088be6330b1cfaf45d8a249c1322e04cb5e1d
-EBUILD ktp-common-internals-19.08.3.ebuild 1811 BLAKE2B 68aaf67962dc17a6da7adfa1283e4560f5981eb3b2cf5c2a8056c4fa6cd698618e8554231f865b50b10da894c8bbb69b68863c520dcd60db289ee437b09a399b SHA512 0a216a48fce1ba596b3181408290c890cc89a912161f4afb976a053de01c62fe49169360283f1cbbbed0c4e8022c02ee4c6674f5289510bc158eeff9b1c29d36
-EBUILD ktp-common-internals-19.12.2.ebuild 1722 BLAKE2B 808ea451802f1bceef38069779b56672274fb3402c9b24f346716917b1503d48508e11c3d318139fe9e8ffed2a7536bed53a698a15c980783df2d695580c6586 SHA512 0c28dee23fcf661d9c9a6ade87d56ff0d06fc3e386dff6f19f2c771b080140c98588f3d6a007e4e1dc824f8348cd029acb6344b05ddff473503bcac875498664
+DIST ktp-common-internals-19.12.3.tar.xz 445328 BLAKE2B 402f74d796aa85fb15190a6edc234b4c8ca2951149fc2a28a8162e55ed0af6a118bb4c38f43134e9d051afed1ce5a982d44d313a9a31f8031943b4be402b32a6 SHA512 6ba5bf496af9c55c0727fdda331bd3c05260109f4cda6f09c5a66b7fa8ced6d78d6b78c92c039371e5c260d594141941c4801a27960abe73724d35905be5c655
+EBUILD ktp-common-internals-19.12.3.ebuild 1719 BLAKE2B 87e2e315a926cfbadd23c25faa29e2315c4d45ed09b5cae8119c162188a6fb8a0757d02b7e99bac401b2c94fa10ba6daa91ef10a81d777fae5dfdd586533b333 SHA512 c9b40c1c56995cba37ef91d758e0dbbf525f3d2999979ed853b8598ffe8c7c5566dbd39d80400618a8dee20461a65b39a265da6b61d93207e6d881c8e9adb0b1
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch b/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch
deleted file mode 100644
index 9cc3b301e0ab..000000000000
--- a/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f030b527c4d390ead78d2e56a1655444f97b5545 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 14 Nov 2019 20:34:21 +0100
-Subject: [PATCH] Fix build with telepathy-qt 0.9.8
-
-Explicitely add the necessary link targets which are no longer exported by telepathy-qt
-
-Differential Revision: https://phabricator.kde.org/D25269
----
- CMakeLists.txt         | 4 +++-
- KTp/CMakeLists.txt     | 2 ++
- KTp/OTR/CMakeLists.txt | 1 +
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 187400e..2650321 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,8 +20,10 @@ set (KTP_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_M
- set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
- 
- find_package (Qt5 REQUIRED CONFIG COMPONENTS
-+              DBus
-               Qml
--              Test)
-+              Test
-+              Xml)
- 
- find_package (KF5 5.11 REQUIRED COMPONENTS
-               CoreAddons
-diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
-index 85d578b..ffbce10 100644
---- a/KTp/CMakeLists.txt
-+++ b/KTp/CMakeLists.txt
-@@ -91,6 +91,8 @@ set_target_properties(KTpCommonInternals PROPERTIES
- 
- target_link_libraries (KTpCommonInternals
-                 PUBLIC
-+                    Qt5::DBus
-+                    Qt5::Xml
-                     KF5::Wallet #included from wallet-interface.h
-                     ${TELEPATHY_QT5_LIBRARIES}
-                 PRIVATE
-diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
-index 12e28de..0743e25 100644
---- a/KTp/OTR/CMakeLists.txt
-+++ b/KTp/OTR/CMakeLists.txt
-@@ -28,6 +28,7 @@ generate_export_header(KTpOTR)
- 
- target_link_libraries (KTpOTR
-                         PUBLIC
-+                            Qt5::DBus
-                             ${TELEPATHY_QT5_LIBRARIES}
-                         PRIVATE
-                             KF5::I18n
--- 
-2.24.0
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
deleted file mode 100644
index 2893eaeb8bda..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 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.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	>=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
-	>=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
-	>=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}
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-telepathy-0.9.8.patch" )
-
-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-19.12.2.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.3.ebuild
index 43d8042e3a5e..18c5c33be0c1 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.12.2.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.3.ebuild
@@ -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="