gentoo resync : 15.12.2019

4 files changed, 14 insertions, 55 deletions

diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index bc254c293dfd..4544e4e288c4 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,6 +1,5 @@
-AUX kpackage-5.60.0-qt-5.12.4-missing-header.patch 967 BLAKE2B 1e0067a7c6403762e401689b97a801890268380046df566ec2dad0697d843068ca489bbeb060d14f113057ade5c88c0dd910b8c0c450842f8b9d06a8bbd17eac SHA512 4fcecd790ca63973ae8a82f96ebf01fac818ec8fe56e6279f1a45b46c2bfd4ad2ebaf0433c48999cf9c7b37c8351807c2cada108c4dea888f6895de29142eb08
-DIST kpackage-5.60.0.tar.xz 132548 BLAKE2B 9c2dc512080305a4dfc3e20a060088eabe0474c66b58755d46dda74aeb5f8330b1c537ac0f3b2779dbf14166cf9c49831db8458886e683463ad8632d05429703 SHA512 afa110d5c4016311b808231aaa2715b5046daf8c7e0088bfaaf50949df252132f468ef96684b55289e37953f1d8891b0b33457aa54096249d4fa41163dab2477
 DIST kpackage-5.64.0.tar.xz 137852 BLAKE2B 5dadcae766775562e84e7ad167f23d69a65acf7ab71351981b66a20d2ca3046bc02a5d1e671415ebd05abb23bd7ad076d2de98c07f4153a52d802eb7c06bc5ba SHA512 9715a6922e1063d6b0cb6b79f1258ed37c881a05c28771aa5b5abc2899a9545c5a8f264eb4bb74f41d8ff34282fe840ce2a9bd0e60bc8e9b2216efcc0d549028
-EBUILD kpackage-5.60.0.ebuild 725 BLAKE2B 6f480ee5b6b378ff339150d6e0de402307aa469589a5c0f218f979ef1a299b11f224d587142789025a8b57761f58c2542dba08b3dc8144ccc31258f903615453 SHA512 0ffda078b53b5307559e521b6452f939fd61b3e1026244256a8713d348bfb21604b27fb23420b5c9714354c87611d98678112b03e88a06eaee1182d28a164043
-EBUILD kpackage-5.64.0.ebuild 715 BLAKE2B 19629b5f3dabb67bb5b050c2ace104faa91c23a761c20c9b9ef28acba6b1218a6a6100da19390884c57a164dc18cc5893796bd59a4f0bbdc9531b5acc138b550 SHA512 9131f41774f92a940a58493dde48b84ee1e3f679bd77aecc5bacd202e4f694463acbfcbbadc08d7425ed76ed50e7e247d8d98575ecb0232abe2fc55e0b5f3fe9
+DIST kpackage-5.65.0.tar.xz 137640 BLAKE2B 2852247d9a0fa060921259036e81bed2117e244516ab2888ab6743931c0964b146543f939cb3d7e8f5837e65a79e9b71375277d09a5e316076d88a59040ca046 SHA512 789fa54ddc4a117fb1d233f7810fdf5c85a6aa5e41c46766ae8d93f60322c441611927a5e163cc8fa6f36780ad06cdbb82d82db80ab6eca4720a45536164101f
+EBUILD kpackage-5.64.0.ebuild 712 BLAKE2B 8796c1eae14c5ba444687d4012034f550a4bf8abe600891c548bcd0345ceaa83b674188af2e38f920bffa3d5fde7913e01e18e75f6086a9f5306ee097864e09e SHA512 73a6ce31228c1c713813302fff332ed5b4490c8ece0bb974f2a2eb70c62b1aa3dd806d3074d54f00d0eb6c64126a2780fbf4c9fc71786dcc8d2d0238faba9850
+EBUILD kpackage-5.65.0.ebuild 709 BLAKE2B b6bbfb76842866c48b01cc872130085f85cb2fe46df0597dffe535ee9684190ba015d98d23b141faaf64d25b6dc3a955e776d345136beee6bb08b13ef8b88aae SHA512 fe5726eddd25db229f1e40730c9f235155b8bdb0b89431e12ea8935794df67d8fc670a75396f167113d880b7996adb94241641c08d238bd6358d5b7c88e8b21d
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/files/kpackage-5.60.0-qt-5.12.4-missing-header.patch b/kde-frameworks/kpackage/files/kpackage-5.60.0-qt-5.12.4-missing-header.patch
deleted file mode 100644
index 793d387cf1d8..000000000000
--- a/kde-frameworks/kpackage/files/kpackage-5.60.0-qt-5.12.4-missing-header.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 886f7f4004e55f4eb3d61c15ec10d64878fc1dbd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Fri, 12 Jul 2019 12:19:25 +0200
-Subject: Fix build due to missing QVector include
-
-Summary:
-I get 'implicit instantiation of undefined template 'QVector<QString>'
-when building against Qt 5.12.4 without this change.
-
-Test Plan: Builds against Qt 5.12.4
-
-Reviewers: dfaure, davidedmundson
-
-Reviewed By: davidedmundson
-
-Subscribers: kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D22414
----
- src/kpackage/private/versionparser.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/kpackage/private/versionparser.cpp b/src/kpackage/private/versionparser.cpp
-index 71dcd08..2411d2a 100644
---- a/src/kpackage/private/versionparser.cpp
-+++ b/src/kpackage/private/versionparser.cpp
-@@ -21,6 +21,8 @@
- 
- #include "package.h"
- 
-+#include <QVector>
-+
- 
- namespace KPackage
- {
--- 
-cgit v1.1
diff --git a/kde-frameworks/kpackage/kpackage-5.64.0.ebuild b/kde-frameworks/kpackage/kpackage-5.64.0.ebuild
index 770336e92fe1..bc535752d8cb 100644
--- a/kde-frameworks/kpackage/kpackage-5.64.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.64.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to install and load packages of non binary content"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="man"
 
 BDEPEND="
diff --git a/kde-frameworks/kpackage/kpackage-5.60.0.ebuild b/kde-frameworks/kpackage/kpackage-5.65.0.ebuild
index 0da3b829e88d..c81b7f3f0df8 100644
--- a/kde-frameworks/kpackage/kpackage-5.60.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.65.0.ebuild
@@ -3,35 +3,34 @@
 
 EAPI=7
 
-inherit kde5
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
 
 DESCRIPTION="Framework to install and load packages of non binary content"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="man"
 
 BDEPEND="
-	man? ( $(add_frameworks_dep kdoctools) )
+	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
 "
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
+	>=kde-frameworks/karchive-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.12.4-missing-header.patch" )
-
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake_use_find_package man KF5DocTools)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
 	#bug 650214
 	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
-	kde5_src_test
+	ecm_src_test
 }