gentoo resync : 15.12.2019

5 files changed, 87 insertions, 50 deletions

diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index a6eb4283af84..a2d5724c5d0c 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,6 @@
-DIST ktp-call-ui-19.04.3.tar.xz 95968 BLAKE2B d27f47217af83c18c3feeb507a63e96cb6743f49eee968ae02739894e74feba3f0e916ee5a1cbfc2144f96914863331b08248e024be1d7c3bd146f9718b0b840 SHA512 cd31a06c5c36de20564aba7a083642eff0c6bfc33de115a893220e410164d81e6e6b6d3679022a05e6eff7918a4e92caba85a9f3d10ba844704fe67230c8a5d0
+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
-EBUILD ktp-call-ui-19.04.3.ebuild 1061 BLAKE2B e3a2da9556e0872e2b30643a17cce21fb13136beb63a19a1c1c327eb4f8c1b2caaae0af90d17439f8d7c24dc64ebc336a996dcb45139340625d2f39ec11ecadb SHA512 133c2f6c650f1d05098533ef0baff71639731044a71924f215e03517317661244d7774af350e3b985734d16c16f243b8e2d300bcbe045f8a0094794d71e75f74
-EBUILD ktp-call-ui-19.08.3.ebuild 1220 BLAKE2B d73b2f437ba73be534d664bd09fc8c310007ddb9b7d54cede857a42ee7eb255fde324b7cec18b56f4c485924835a59552844ccbff3a1d8d7e593ac4e08475f70 SHA512 44e0a9a39513c1f69153059f432821780140b424f2bc4dfc13f2d1fee829873fd3e8a2cb9aaa77ec73a41aa09b9f7d217d3c0b19c3b0bd48621465d9d0386fb5
+DIST ktp-call-ui-19.12.0.tar.xz 97320 BLAKE2B bb867d77dbe65c7073dbb7fc2795f7f6e1740995c768afc1c6786203dc1c4778dff39dd4e67d4d46c64ef9eb35c3f3986d6e9ce136630a5ab5bc7779607ce73b SHA512 2d449b7221d8abd7e8cb2062eabcc14deddc3f626661ba1e621d6dbd67ade8f34451e06382a8a7ffef6a8e58045490812d041e692df9d2bef6010d8692e8fb4f
+EBUILD ktp-call-ui-19.08.3.ebuild 1287 BLAKE2B c11a4d53a096e38cb4403d3d149a5f9caa2c42b554ae1646a3185c76f951564bb1a17b7fd63a17b89b9b4a80bae497a5a02220f38aa70085f3f97896763b5c5c SHA512 a231925787dc4741bd7eed0f17d4c4d6d14c897472154cb8d622c6ac35b8cada54a51976dcf83c6bc58c047ce92f25af1f0dacdc68719483142979d04412b852
+EBUILD ktp-call-ui-19.12.0.ebuild 1182 BLAKE2B 9985c40ba63d2342d269f532420058ef0dbc1424bbbed96e9f5f353b9a03fa92d3a203868b88f96926d2fd3e4e4d07a5c5e67403f2db93b42a1be5b604d15ed0 SHA512 032e083862febb19eaa00ed25a69298845ecb44df4b3f516770ec33599916bff1e0262bf116f3c6fbdaee40258f500498b05b21d4cc969d9a5d5613f4a38dfd2
 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
new file mode 100644
index 000000000000..d2be3f480eed
--- /dev/null
+++ b/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch
@@ -0,0 +1,30 @@
+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.04.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.04.3.ebuild
deleted file mode 100644
index 06684d94e6df..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy audio/video conferencing ui"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	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}
-	$(add_frameworks_dep kcmutils)
-"
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
index eda2799c8721..f115e0ae21d8 100644
--- 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
@@ -13,10 +13,15 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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
@@ -28,11 +33,6 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
 	media-libs/phonon[qt5(+)]
 	media-libs/qt-gstreamer[qt5(+)]
 	net-libs/farstream:0.2
@@ -43,3 +43,5 @@ RDEPEND="
 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.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.0.ebuild
new file mode 100644
index 000000000000..fbf38c2c2323
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# 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.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy audio/video conferencing UI"
+HOMEPAGE="https://community.kde.org/KTp"
+
+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
+"