gentoo resync : 18.11.2019

4 files changed, 130 insertions, 66 deletions

diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 909dfa59ec35..6a26675a6359 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,6 @@
+AUX ktp-common-internals-19.08.3-telepathy-0.9.8.patch 1898 BLAKE2B 72ac4337a881182b0f1d43469f68ec7b11a105f626da42acec134abd9b0e5ebb25a59db57d8656ca5c0e9fcebd88a0ad42549b3d1ec6a9ceaf474d0853ab83b3 SHA512 93c43f7eddc99c22f55308ea1cccf59f7fc5c1d9c57b72d2a8ff7ebdfa00ac3e6319bf33ecaeac8ef53a1f9685b5278f32c2b182184fd64919f97df0825f8563
 DIST ktp-common-internals-19.04.3.tar.xz 442052 BLAKE2B 904e1abe4598599d443aa5fed946c943364e84fe9b85975b7af0c2f3cebae7658d193a6f91a7d34f8f61c73f4091d7a105408dada139193c9124868cee123c4e SHA512 9dea0bbb9c5cb7812e553b26ffd650c2ed3e1b05065d9f256b475d24199c74b1335edf12d4dd6949e5e59065546dd520f18b72f6b6b610873ee142045cd2d141
-DIST ktp-common-internals-19.08.2.tar.xz 443916 BLAKE2B e46ada7c7c065f0ba04952e28e20e08a91aa020bba46c1b040ff058430c699d1f26315b068207a13366f935df9d2d50035a6aabf9534079fecc0a35c6750208b SHA512 dda4b54497fe85067e0bf6f14b892cb0a718e4eb6a997628a07f6d26c3062d2b413766c70a014372bd5708c7b0d6c75da4749b694bcd8062aed01a43bf3b2b3b
+DIST ktp-common-internals-19.08.3.tar.xz 445792 BLAKE2B 36ba8abed61b1b45481b1a65d565d6f12e115a9db8bd14b2d8a4f276646387e1c18a27d26cda78bbb5885277de23884329b6d42798abb592e8c8bf555c156ba0 SHA512 255e8e16cf1b374a1106f66f4d69e660a9443d7b28d169730326fd4689a864bdd34bce9a33ff63ba175faf1bf65a1db1484e3dccc229eb3f0918c9fcad965e60
 EBUILD ktp-common-internals-19.04.3.ebuild 1578 BLAKE2B d80b7e6a9979aeb540d128510d3f3b11f06bdf7a77a65e95f1410bf9ab91947ef8f1d4a7ceacdf1ded56ff7a76b5faf31622ea3ce21b462cfe1bedcb709ca608 SHA512 42a2f09d48ec4472d99333a5c7c9c171c6c5677f75930ab37ba4741ccb84101cfe1ab052f5dc9d1f216d8687a46b36ac1acd9e106cb39f1b532abbb29dd6a37e
-EBUILD ktp-common-internals-19.08.2.ebuild 1581 BLAKE2B f0686fec49af3b0e7772855e7d44324b7175a0c2350f9988fd3a31078e1a90f6c60a1f6ee9a4b4a7025d5f81f30da1cda02bad50f19e306d82fcd0975594c596 SHA512 80a27ac6184a07b43fb4b08e3d7c12235d4e8a36ebb744e10fa84fb4925a1c8c58c94d95827d6457b9db8b70c81a3bf881dfc0f32665df0536135034bd2e9aa4
+EBUILD ktp-common-internals-19.08.3.ebuild 1838 BLAKE2B a4df77b1264e3d5f20c7579739d7340f7dc7a8dc28b833bc0983153d7e3611ddfb8dba85d05681e871033aa047d1e6ae79d702a73a6e89b559b16ff751a44d2a SHA512 2d0e5934a7f7770b205d97497b8c341d4ac992d1ba2ecda7e22098a6f9d31aa4e8ca1b0f9617919ab0ae2e1300a2ed95dba5a0fca40d397cb20bfb45eb4cbd67
 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
new file mode 100644
index 000000000000..9cc3b301e0ab
--- /dev/null
+++ b/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch
@@ -0,0 +1,57 @@
+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.2.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.2.ebuild
deleted file mode 100644
index 923585ea03a7..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=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? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
-	)
-
-	kde5_src_configure
-}
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
new file mode 100644
index 000000000000..2df7d44da82d
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
@@ -0,0 +1,70 @@
+# 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-utils_use_find_package sso KAccounts)
+		$(cmake-utils_use_find_package sso AccountsQt5)
+		$(cmake-utils_use_find_package otr Libgcrypt)
+		$(cmake-utils_use_find_package otr LibOTR)
+	)
+
+	ecm_src_configure
+}