gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 83 deletions

diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index ba8c1707f96a..e5c1377699c3 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,6 +1,3 @@
-AUX ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch 987 BLAKE2B afb662023b5a754ff702fad6b6a651c934aa10aad66c4c382fb031d26abe40ddfd61265a8c7939ae6ff68d2c49ba996bdf5020a9b3640f6fee500f63817ccd33 SHA512 1f780d3b301353e82629a56dd78ba9556b3051d091e56eeb290c605797dacf22a2cacc81d6b8e320d51ef9234582f75e29dd1436c8e1b48c8b3c792d936a11f8
-DIST ktp-call-ui-19.08.3.tar.xz 97260 BLAKE2B 9b1f6d5c81fe29c702c63841a7566c0dd670b6347b82ecc015f16ca327ef83304a1606440abf43f499a33cb004d43e7ff1f10867b8238795bbf9756c3e6fe433 SHA512 ea3b4050b163ac1c782fd69797889275a195e277b413de3681ba584afe20bff32e0c882c3370c7efd8989daf180c1444e9233b1b14914e3bc9d054e0c1140717
-DIST ktp-call-ui-19.12.2.tar.xz 97324 BLAKE2B f30e424b21dce6e3422c1dd445a8c9485f49d0f2471139e88a95c740c84f4b8eaee89b9ad448a0b403145557371f6ef534427944b3383304b605d15789dbb40e SHA512 b6b413686d5772c39938cf8a430716b6d7de7b4dc5fdee15c0ed6419540402c662791547f08fa65ff5bad8916172d99d679ad0003e6bc040d3f40e5343f69599
-EBUILD ktp-call-ui-19.08.3.ebuild 1287 BLAKE2B c11a4d53a096e38cb4403d3d149a5f9caa2c42b554ae1646a3185c76f951564bb1a17b7fd63a17b89b9b4a80bae497a5a02220f38aa70085f3f97896763b5c5c SHA512 a231925787dc4741bd7eed0f17d4c4d6d14c897472154cb8d622c6ac35b8cada54a51976dcf83c6bc58c047ce92f25af1f0dacdc68719483142979d04412b852
-EBUILD ktp-call-ui-19.12.2.ebuild 1182 BLAKE2B 5fd49903dc2f3107782876fe8ec597750e8a79c154898d3a420d5b6cf8a06663f02ed4ca0775f5827395fcee4dded8218059c831b96a3112872c984b140db7ab SHA512 859ac3207198e11390be63a53d30838773565f7863b40e60311d645d3fd3ece4247b619a5ae4d4161119b6ae095387dae4590370927a582df869834caf1ce97a
+DIST ktp-call-ui-19.12.3.tar.xz 97088 BLAKE2B a7ac8c4c74cd45ee0e6de91cb92d3a73a0344bf038fbd541ec63b6562f69bec5b7ffb2c8ff1a557978287dcd8d18adf9b7bb1a000fa646716abea02853670412 SHA512 7223aa2d2f63461c6fb6e61460f7711fa86b72405110cc95ac180fe80ae92aed5d15205d0c133fc6e337427671789267cf9556f9f886f0f06cc9ccdf47c91c1d
+EBUILD ktp-call-ui-19.12.3.ebuild 1179 BLAKE2B fa865abd5e359e07a9e6a20da705d27f4132b93efc24207a07a0bbd68b1cb50a0e8f7ef384a4e80b13a4ee5f317b7dd9a380601fa8249b96deac6d23636b54a9 SHA512 aed3d9ddb21ab76475f8b2ab74dc8702b07beb602c617fe477eb2737c91358ee31e8271fa28dcd527f572f45b514e2322c8f1df472d9d4be2ef20c542b76d44b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch b/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch
deleted file mode 100644
index d2be3f480eed..000000000000
--- a/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 70564e30def5a877bd66e4758a72facf7ff1b09f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 18 Nov 2019 22:09:24 +0100
-Subject: Fix build with telepathy-qt 0.9.8
-
-Use the new TelepathyQt5::Farstream 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/D25372
----
- libqtf/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libqtf/CMakeLists.txt b/libqtf/CMakeLists.txt
-index 3025576..3b7b0fe 100644
---- a/libqtf/CMakeLists.txt
-+++ b/libqtf/CMakeLists.txt
-@@ -20,6 +20,10 @@ add_definitions(
- 
- add_library(qtf STATIC qtf.cpp)
- 
-+if (TARGET TelepathyQt5::Farstream) # telepathy-qt 0.9.8
-+    set (TELEPATHY_QT5_FARSTREAM_LIBRARIES TelepathyQt5::Farstream)
-+endif()
-+
- target_link_libraries(qtf
-     ${QTGSTREAMER_LIBRARIES}
-     ${TP_FARSTREAM_LDFLAGS}
--- 
-cgit v1.1
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild
deleted file mode 100644
index f115e0ae21d8..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild
+++ /dev/null
@@ -1,47 +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 audio/video conferencing ui"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	media-libs/qt-gstreamer[qt5(+)]
-	net-libs/farstream:0.2
-	net-libs/telepathy-farstream
-	net-libs/telepathy-qt[farstream,qt5(+)]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-telepathy-qt-0.9.8.patch" ) # bug 701096
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.12.2.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.3.ebuild
index 3f12daa8cd9d..76a1b492bb25 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.12.2.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="