gentoo resync : 15.12.2019

5 files changed, 108 insertions, 71 deletions

diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 45e91dbfb1ad..ef0d7f152504 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,6 @@
-DIST ktp-accounts-kcm-19.04.3.tar.xz 262348 BLAKE2B 2f8227ae00e36b079d0a536d7d5769e0f45d8d2101e09974e59e61e734f1158614b823629bd1963498465728c82f574817e9df0e9cde4c59ac809fa869f1a15c SHA512 4b800d81dc6a61830d2e2da6ee006be2266e1d6862812d6f21b3fc9f85f5ab2ed0f617b8f0889529cd869e836c4dab51c35ce88b3a1c93877ed50949a67ad48a
+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
-EBUILD ktp-accounts-kcm-19.04.3.ebuild 1573 BLAKE2B fa708f671d3e5f790936a71ac58464e4daff913722ff6a19c0ff56d0142d588a942332a4be9259c1f621df06ffbb30c86148c7418d1304105d519bd0b8ed1949 SHA512 792c3f5f0dbd4d46e6755b79979fd5dc8aadcd9d1e0b61be687865fd6934524c360a606ba1636b0e329a088ceb1f21853a27a30be644cb33f1533da37c30a2d8
-EBUILD ktp-accounts-kcm-19.08.3.ebuild 1739 BLAKE2B 143a0b1caeb6521c4562db7751e37760347a23e8ff52db0043e9133047c53b0c9412a6cb49c92c523284fbc1484c72c92fc665130e4e853cdff3fe089ba77d46 SHA512 a07ab9a1524c731906d836a672763a824e512df9edac9bd0457fc719d033a08a83c7d004eea5146a601bd78cfeaf81887ff0946c9f8b0cf261d0eac889f1e48e
+DIST ktp-accounts-kcm-19.12.0.tar.xz 263776 BLAKE2B b1227202774368332cc0356539f941022c149519a1e49bd81005d7ad4268513feadb09a3cf498902bc321ae56782596be9f3bc41297712d6a26d3f2f3f3a258d SHA512 2ce587b912772de4f62dcb0d925866cd79d8f7447e9ba396e2d73eb4c08af6873734bf7d712aa630b3ba027e0e154db03eafdde22932758ae180c04d7ade2694
+EBUILD ktp-accounts-kcm-19.08.3.ebuild 1793 BLAKE2B ab4f995066ef74f27300759fe3b8e8ebfc1039ccaebe5f00c5334501eb40ff42083a238d2b9673b770a8efc02d1fe48d75c0502121686c49ae98eedce0df4a86 SHA512 21e95d4e790a37739f179e942e0649a89569f0978cbb72d68deebcb5bb91a509983163cbdbf640468a9b8f705ee30535242918c965f33f573a0a201cf575be42
+EBUILD ktp-accounts-kcm-19.12.0.ebuild 1687 BLAKE2B 2266a26c7a13232f1b199771c137677f757065658a91ac4b1a8262ebd3bd5ef45bc124f67863d3c5ead0892718ad7fe9da80749b3cc9a8c791a105248d334c41 SHA512 1c877aa749dcc0c1351a132a8526542c91ff241a403095306f6d07c0168c50d4f5d14827a28f033f33ada522e9c374c6d298c8831b9fdac51fea5a05795f94ae
 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
new file mode 100644
index 000000000000..fac56a410cc4
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
@@ -0,0 +1,30 @@
+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.04.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.04.3.ebuild
deleted file mode 100644
index c36bfe264fb6..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.04.3.ebuild
+++ /dev/null
@@ -1,63 +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 account management kcm"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE="experimental"
-
-BDEPEND="
-	dev-util/intltool
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kio)
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kaccounts-providers)
-	net-im/telepathy-connection-managers
-"
-
-src_prepare() {
-	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \
-			die "couldn't enable experimental services"
-	fi
-	kde5_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
-	kde5_pkg_postinst
-}
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
index 4cf442172f67..d2114d3a641b 100644
--- 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
@@ -13,13 +13,17 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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
@@ -30,10 +34,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	net-libs/accounts-qt
 	net-libs/signond
 	net-libs/telepathy-qt[qt5(+)]
@@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
 	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/ || \
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.0.ebuild
new file mode 100644
index 000000000000..55d5742899db
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.0.ebuild
@@ -0,0 +1,67 @@
+# 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 account management kcm"
+HOMEPAGE="https://community.kde.org/KTp"
+
+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
+"
+
+src_prepare() {
+	if use experimental; then
+		mv data/kaccounts/disabled/*.in 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
+}