gentoo resync : 15.12.2019

4 files changed, 72 insertions, 68 deletions

diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 6a26675a6359..0af7dbfbae4d 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,6 +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.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.3.ebuild 1838 BLAKE2B a4df77b1264e3d5f20c7579739d7340f7dc7a8dc28b833bc0983153d7e3611ddfb8dba85d05681e871033aa047d1e6ae79d702a73a6e89b559b16ff751a44d2a SHA512 2d0e5934a7f7770b205d97497b8c341d4ac992d1ba2ecda7e22098a6f9d31aa4e8ca1b0f9617919ab0ae2e1300a2ed95dba5a0fca40d397cb20bfb45eb4cbd67
+DIST ktp-common-internals-19.12.0.tar.xz 444260 BLAKE2B 9c4029fed97b570dcdd541e38d91854ae1355bbefa644d69165ded9972e1843981beeaa43bf3eabd812db5c142b4c9434aae7b982dea2e574570606b83f12791 SHA512 15c78c91f650d37c5d8547da7b8c0dda71e16cdc24cb80ec0d832b5bb9037d24a2be1181275a6df8d4fa10d7e5379ec88da2add0d2b0a0318f87292f36c98050
+EBUILD ktp-common-internals-19.08.3.ebuild 1835 BLAKE2B e65b986b1f383e1b9b4aebd2fa7e4b36b884bf947545f2d5f3f6e12102c4bed13b44dc325f42030688f05e7d5e73b459620fcbe5aab81da2767612b9d8efeef1 SHA512 ea0ff23168c6291d68560adba6f933789d630284737ef2b5bf5fdf578c238c6dadcf96943713c81b73cd9e730165257c016a5e46fea7eb50bbf59da18af4efb6
+EBUILD ktp-common-internals-19.12.0.ebuild 1722 BLAKE2B 408054bc98d73769e50e866f57deeafc78bffc8e5e5da498eb27253d7ea24d536fb3082a41cdc508a490599ae7c9ba7866c93e6dc85f5d4d5b1e48e620612132 SHA512 24a5cc79d2b2bccec2dae677abd072f9d89c8d37972bf05334bd753e4e857e51e5fc0bde4140d8b7d9b1c7a21c68de83fadb76d7c6b2785aa50094f0fb59eb4c
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.04.3.ebuild
deleted file mode 100644
index 96cda4d82b15..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.04.3.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
index 2df7d44da82d..868710153aa8 100644
--- 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
@@ -14,7 +14,7 @@ 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="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.12.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.0.ebuild
new file mode 100644
index 000000000000..e14496131479
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.0.ebuild
@@ -0,0 +1,68 @@
+# 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.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="https://community.kde.org/KTp"
+
+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
+"
+
+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
+}