gentoo resync : 15.12.2019

3 files changed, 24 insertions, 21 deletions

diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 537de12823b3..5a5829599d32 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
-DIST kfilemetadata-5.60.0.tar.xz 415240 BLAKE2B ce65cf1c9743a2077c1548e47e64f8e1a11daf071c99b3ebb4568639d68a7d5aca70f00fc93fff3003e9491143098c3e91667008b6976f66aab5ed333466fac2 SHA512 e9ed29e3c1f0d03ec99ca3da1b7128c3ec75db7165ccf8d722457817e7feae94056ec210e43872830034e583fc38844d30a63abf2ca7078e1daa98fe6ea00f3a
 DIST kfilemetadata-5.64.0.tar.xz 420636 BLAKE2B 082615af35121ef341726af6ae963964b877bac6b854430541ae76f3c6f35b0bbd406c8d55a71895a9d88fa657d10948824a2efad2b3944e2ca97a212e8bc590 SHA512 3125cd4e316bb5dc07de87f14db07f53f7dbfc967f6f65cf78fa9e7aeaace78b3a487bd74226306a886f68ebc470e5d759d9f377523d9cc56d794982b627b2f6
-EBUILD kfilemetadata-5.60.0.ebuild 1695 BLAKE2B 2fe48a317a76d901c2ce02eda4e0bf73602b8c6cd7eb91e8c8006d263643953304b2cc98b44d829436744599add14119e0abc18f8e3f0a9532013b08ce5aaec7 SHA512 50fffbc8e047a398be5dda876eaa8b0e4f07b99dba55f28603cc9a78f3402a439e68d8b1dcb45cf607aecd5476a57634fd7e264ff85822d26abef7228a1e8569
-EBUILD kfilemetadata-5.64.0.ebuild 1769 BLAKE2B b3a562847eeba53987429d040c745be709f42c23ca4960a764fc725d57726aec52d07f8f20478c1b78f9329f7d7a7bfefd472f2d2665bc7226278be91b2dd210 SHA512 07224d7021f5cefd3951e9cdad2d4b51ba915b60fecf072d785e5e53154db68da0d438d4db3f676d5d653b30dd4c3d1175fec9d9814e6ce55799a1ada20f7bd6
+DIST kfilemetadata-5.65.0.tar.xz 421144 BLAKE2B b65eb2b943e0f9191d25cf08c70f84e26f853a091fb64cdf4507596b6f649e3ab007ccb96451ea675e7b3111bc9385754a051082c7b8713cbcadfca2817afaea SHA512 1160630c6117337f7aab3e7b74e56678b093abd72bf891f14ed75a63a36783f18e597d8a076a588fd471ff81c30cc68c0a32efe154882c6d24591380807e5571
+EBUILD kfilemetadata-5.64.0.ebuild 1766 BLAKE2B 66402e695124e435f3c4a7a36c30e56ac175026dfe8947da50c23fef0d78bc2a2b373a63401766d0c8a0fdf97a95b2689249bf9f220a4c9126a74efb2fa82ae5 SHA512 bba0b661e2cc27a15dd507c7789ea137ea905b3b856d0e1a3d89fc9509d50430ef493ccfe30311989a45ea8ac6e0e3941afc0c74bf3b58421bc13194ca139d0a
+EBUILD kfilemetadata-5.65.0.ebuild 1735 BLAKE2B 997d0df35aac52579dbfda501de4814af0c5322840ad1aa649f03bc601181e2e574045b712b3cfffcf5e3c174b2951d1a394d1aea20fe732a83845aae8655102 SHA512 58da65d93c8e403f786f0fc63dc5abfd54c5096b40fb3bd8874d347908509c95b835522eef66da0940f0aa1ad2cc68fe4e61b2c21514b0c17030863c97175004
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild
index dd5fdab75c34..2b31c81bfb90 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
 
 BDEPEND="
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.60.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.65.0.ebuild
index f583b8370364..43db4fbe99b5 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.60.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.65.0.ebuild
@@ -3,27 +3,30 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit kde5 python-any-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="amd64 ~arm arm64 x86"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
 
 BDEPEND="
 	test? ( ${PYTHON_DEPS} )
 "
 RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtxml)
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	epub? ( app-text/ebook-tools )
 	exif? ( media-gfx/exiv2:= )
 	ffmpeg? (
 		libav? ( >=media-video/libav-12.2:= )
 		!libav? ( media-video/ffmpeg:0= )
 	)
-	office? ( $(add_frameworks_dep karchive) )
+	office? ( >=kde-frameworks/karchive-${PVCUT}:5 )
 	pdf? ( app-text/poppler[qt5] )
 	taglib? ( media-libs/taglib )
 "
@@ -35,30 +38,30 @@ RESTRICT+=" test"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif LibExiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package office KF5Archive)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package office KF5Archive)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package taglib Taglib)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
 	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
 	local myctestargs=( -E "(usermetadatawritertest)" )
-	kde5_src_test
+	ecm_src_test
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
 		elog "To get additional features, optional runtime dependencies may be installed:"