gentoo resync : 15.12.2019

4 files changed, 63 insertions, 59 deletions

diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 8f1368ef86dd..b42a509920e8 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-text-ui-19.04.3.tar.xz 464932 BLAKE2B 1c4772c8bbd009690f0447358bc650635e9bd0f745fb3ce9418f945f950cf476af8dcdd888cc4f22ac0d9d848e0fbd58a63d259a3605f38b3a3e8424f94040d5 SHA512 ca880a475f0ec1a98701b1fdbb8916f3b97748aa6edf3cbce8b4c7c5f2ac4de714f3b4dca53a5e1cfa8970fac8603791fe011e357c94007481c1bbe56d5783ea
 DIST ktp-text-ui-19.08.3.tar.xz 469764 BLAKE2B 5bd1910f08ef54de06d212805d44ad7596c625023cdab944ad9c4aaa2ae499c3f8a4afb6bc63c8cdfe94e851f122945478a11d8b3c343a1c04c4cd8825f0f4e6 SHA512 a8dae8db2b19ffaa359d8fa6a19e91ca5db416a2d7158b9cf926a268497042397fbe1b2808cf36c2d8e20608b417fb0732d62f67335d0f6564bc546e88ccd733
-EBUILD ktp-text-ui-19.04.3.ebuild 1457 BLAKE2B f9ac9ab59b2310a7580bb4ab6c889da87c1c335e27f200ffecea255e7d8e03e6aea1e7b0f832e313062ee303043359d91a7dc1eeaeb8980089df484550df6b8d SHA512 f77ad24004b9c449f5d6f847e78f088327b5897158a5e7ea15e91badabddd943d348b2609fc9fa8c0676736ad1c8217774deaa6793f166caea59b2610398a0b7
-EBUILD ktp-text-ui-19.08.3.ebuild 1684 BLAKE2B a99ce25ba4d878e4f1e0ebe940953b6b018afe9f66b2c1f98712e9ba8b64ea20a312e286cf09c24488fd2984187cd8297b5bfeb3df0bb7a30bc003e1cc4b4494 SHA512 dd1d406b941270473995f17acb1f653a135cbeec6c129ad68820f274e6dac979c82ee1367b4ff1b2579fb1daa05947b7d41d8672b0869ac5b7de5e4dfeee96d7
+DIST ktp-text-ui-19.12.0.tar.xz 471572 BLAKE2B b3ad1ed67af921c78faa0c107ecc15bd20eebde6de174973eeace6985395ecc7332cd09b94d298684cec7136aa9bf0223380e0fbdba3c073d0c7c4e6da1b286f SHA512 8f4f3560100336bf3641103d8b20e39138d1809bf0480589d37b9006315d76f9a492180c2b83012f106e79696afd26948e467a2fb31fc340c1ac15e1894ab5ed
+EBUILD ktp-text-ui-19.08.3.ebuild 1681 BLAKE2B a3ec867dadc3c1445ecd6880cc69edc0ac88fe5442a5557a638d9eebda6fe789f51f5b7ef9dee1ee2519506a0204eac27bb240f8d1fa60b753698dce1bf565b0 SHA512 734bbd19941a04235b29a4b175bfc8a0adc62152de20ebc24a7f7b367150cd6a650556f75fa9085000828976ab9287248a3cca465c6dc2fa769548f75d86fc12
+EBUILD ktp-text-ui-19.12.0.ebuild 1640 BLAKE2B 7bbf1c95ab005b4381b85cec50193c1dc03b89b85f94698930d9e88e6340ea62110b864e00df6b430a5137cf0d2700cb31a8de62824e284630af5dcc90ede7c5 SHA512 517dba00f0680a15d5c921c88594ad2f219f9e025516d6a7c52c1123cc47d0f1a1c026ac7e5c8f101834d75056bbec30c3568427d5dfd3b58871d9d99bfb0a93
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.04.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.04.3.ebuild
deleted file mode 100644
index 825a4977a374..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.04.3.ebuild
+++ /dev/null
@@ -1,55 +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 text chat window"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="amd64 arm64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep ktp-common-internals otr)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	net-libs/telepathy-qt[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
index 3de2a22952c5..12436c5228f8 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.12.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.0.ebuild
new file mode 100644
index 000000000000..60e81a319cea
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.0.ebuild
@@ -0,0 +1,59 @@
+# 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 text chat window"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-apps/ktp-common-internals-${PVCUT}:5[otr]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	net-libs/telepathy-qt[qt5(+)]
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/ktp-contact-list-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}