gentoo resync : 18.11.2019

3 files changed, 45 insertions, 41 deletions

diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 77994ab72798..526dc6a53f29 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-19.04.3.tar.xz 94500 BLAKE2B b1b19471e284778b47cacb6fa5e0debd3d78a420deb070cfabc026e6793ed2430ec9e894ad1f78856b8a31a50587d55709ef872b9ed4a82c6afca6b81fc088de SHA512 b9a0d7fc1f22162ebe4af1f90f66f03c4e2e52e365472acd09477d3f287ac25fa9b32cb4a2beb3a4fe89ee4df19bab027a07559009c0287be7ec0f30ef08917d
-DIST ktp-kded-module-19.08.2.tar.xz 97028 BLAKE2B 007c88dff00b7295f01e77c6e5146e8ee9755e2334c5a6e1116361ffc03febc26e02a7c337f86079629bb408f31570183b9e16cb75a20e2be7d2bc2bdc72778b SHA512 213589c7e879d45deaa4277b4485049dbe9940c387e190c5c0395dd0e752fad2a4d8a1a2527c66adccc0c5317d34180b10f0612e178b1df3d84b8dae124a6b12
+DIST ktp-kded-module-19.08.3.tar.xz 97024 BLAKE2B 32b85c663e65a3bbccec44953e6f7b452a834cb2fb0777edff16fdc7f88fc1e7554672108d946433c132246fc11ec46011262bb4d5e043d1c6323cb92d0bb96e SHA512 362c06f501bae142d227ece722cd9217afd1cbd3485c0e90bb3991e5520bb3cfea75d483c0503bfd2920d8941341da4689267d8075621b3181ee1f20d8d468d2
 EBUILD ktp-kded-module-19.04.3.ebuild 980 BLAKE2B 6d3a53c9e700a9992c6108d5e9248bed137abeaf1268de385b93c9d12e354381225682486611823d90606e1dd580168776711c6873e8ed9cf6e8fc9b3c2e7c05 SHA512 fa09e3948f1345664afb39163433925f5a8c46844d82015dd94a9370e1790bb1e1c7e32575144dde7574ed5e42f219df752731092338be00592dda7dc2693780
-EBUILD ktp-kded-module-19.08.2.ebuild 983 BLAKE2B 8386d7baf0a5d9271f851b44a1776d993bf431c6574ea53dbaa15b58ada80f796a88d0afe74c512a0030d4c94595d68791f942dcce04733df52ded3ec65cfb32 SHA512 a9393c6e95f14da9e6716b6cbc26ecaf1dc2a260afda122cd11b72a12243a1ef0bb004c09bd864c03a1e9551424fbd503013bb0202a085f5db343bfaacbb9340
+EBUILD ktp-kded-module-19.08.3.ebuild 1148 BLAKE2B 769ec4f29f244b55ab4b9caf6f10c42794570c56ed8f4867a4f12dbfce254f5ce65d7c163c558f98fe830199e872aacabbdd3540f4daee532420be20b69f4771 SHA512 9e4dbb3784ab0e52f60ce3e35375354dbe9f7d1b748f78aa5bafcc03679b390bf43adef4d04537a4e9f00682f21375bbe2c00ae83a7d464b599f80de496f14e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.2.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.2.ebuild
deleted file mode 100644
index 1ea2ae25d29a..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.2.ebuild
+++ /dev/null
@@ -1,39 +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 workspace integration"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kwidgetsaddons)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep signon-kwallet-extension)
-"
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild
new file mode 100644
index 000000000000..c1a0cfa2b301
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild
@@ -0,0 +1,43 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-apps/ktp-common-internals-${PVCUT}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/signon-kwallet-extension-${PVCUT}:5
+"