gentoo resync : 15.12.2019

4 files changed, 45 insertions, 43 deletions

diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index aa2f1b84083b..5d6bfb3f35b0 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
-DIST kpeople-5.60.0.tar.xz 60448 BLAKE2B ad4b0dda817f808a6037b6075d706c3bced828044be460c23c2828a6b3c25e5c8e170b2cc284645dde456cfa2692db3460faa0e319bf8e287c1b6d6ffa1ed1be SHA512 0a20eb1ea39aadab78be52b6ed53d41e1ac0d53f34c74eb87d9fb0c2fdad62a4b64dc20c66de49506e07768bea9838924b20f0989a6e390382b47b531db81ea4
 DIST kpeople-5.64.0.tar.xz 62040 BLAKE2B 77e4b0606c47cc954c5b6672de8df5ecc3d22d3f42ee18f2747e789e879d08b33fc30c3656548a8d712b02ef94a19f49a611a28b1acaeff48a987e2605c34a78 SHA512 d6f23d2d2b0d2d8a3acfcc74beca8848ecf64e013f0cb906f5a4d347b4220d7a3258e856e64441a06e4d5443b958d464832142ffd305f46a99b192001fd7527c
-EBUILD kpeople-5.60.0.ebuild 786 BLAKE2B b114efcf6ef708918482c944adddffd28593f09f19edcd8cd0db49a823ad2b4054dcb1c03a65c5c01fd672d8d652340ef9eb86613c07d6b752ed42036afdc439 SHA512 9be56a5bbe903d54eb65fe713eb856973f20e4d66d7594eaee8f28d03aa9ede896a761c848cf14ed18ad402650151891cd0a3a5df657f41613f4324cb5ad3a72
-EBUILD kpeople-5.64.0.ebuild 895 BLAKE2B ae9489c0b3fe3f2bd4efcf94fc4beaa15b5695ec90974bf175b0614a92720c997038edc35d01ccfef8830312f134ec8706956b365fa1ccfdfecba79b14a97500 SHA512 a5e9933e2557f6554cf21f265cc45098883ef4be6b5efd2fc74e82c2560b9ed3f0430dfcf62304457c327f95e45d4e41194308fb711546aa549d35bca24ff3d9
+DIST kpeople-5.65.0.tar.xz 62276 BLAKE2B 90fb4cbcdc65120b783bedb0f3ad3abf1dda6256a56e67a8f45c9af05d8b3af4e6909c371ece610a1e1cb4920c15e8b962db5ee1767eee9e454cc6cc088c1996 SHA512 013a02fe885b726490560892828f811c2d0134cafc5a8390ad061afebb9eecdb7a41913036729acfae45cd3b98b45b788734f095efa86bca0b71e78497dda3a6
+EBUILD kpeople-5.64.0.ebuild 892 BLAKE2B e6cc414d9162f1e69c1b845bd7ea03ffef5218ebde20d9a864be728d9c8caceed56d4e6bab6bc7eda31df615f83975c96ccaab855260e68e52a4eb35b1f74897 SHA512 a724536af0e9aa816a1e10c688c034fcc82cce4ec0c0513d2709a797745aa37bf5bcc0fef45b75ff30632cefa584b6c46d3932d60be9ef9c0a9f135fe8140328
+EBUILD kpeople-5.65.0.ebuild 895 BLAKE2B ae9489c0b3fe3f2bd4efcf94fc4beaa15b5695ec90974bf175b0614a92720c997038edc35d01ccfef8830312f134ec8706956b365fa1ccfdfecba79b14a97500 SHA512 a5e9933e2557f6554cf21f265cc45098883ef4be6b5efd2fc74e82c2560b9ed3f0430dfcf62304457c327f95e45d4e41194308fb711546aa549d35bca24ff3d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.60.0.ebuild b/kde-frameworks/kpeople/kpeople-5.60.0.ebuild
deleted file mode 100644
index 08ab1f5ee8ab..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.60.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://cgit.kde.org/kpeople.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# personsmodeltest segfaults, bug 668192
-	local myctestargs=(
-		-j1
-		-E "(persondatatest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-5.64.0.ebuild b/kde-frameworks/kpeople/kpeople-5.64.0.ebuild
index 6255740419a7..e3450d12e7bc 100644
--- a/kde-frameworks/kpeople/kpeople-5.64.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.64.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://cgit.kde.org/kpeople.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kpeople/kpeople-5.65.0.ebuild b/kde-frameworks/kpeople/kpeople-5.65.0.ebuild
new file mode 100644
index 000000000000..6255740419a7
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.65.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://cgit.kde.org/kpeople.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kitemviews-${PVCUT}:5
+	>=kde-frameworks/kservice-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}: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
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	ecm_src_test
+}