gentoo resync : 13.06.2020

3 files changed, 2 insertions, 72 deletions

diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 685be75c9a39..59d1ec09136b 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,3 @@
-DIST kfilemetadata-5.67.0.tar.xz 422184 BLAKE2B b1c66f91f48dabe25a6283a9af3a21164bb05e0d94fe9e463b7306c26b10347dc5835a707f3d9890759023a8f643dc03f6f572dcb1d14ff89c2baa55d49d0e82 SHA512 f15836611b86b93a055b62d4c7f08e35ee7d5d6fe07a7330dce5c251beea72e972c7ad3d4aec251f86d67704aeefed6037b3546a528f6c0653ac6185e86b604b
 DIST kfilemetadata-5.70.0.tar.xz 422812 BLAKE2B f55aab0be0009d0d190c6625ec2ce3a8ec297c62570ecb2724e2ddd4c5fb69397ffd3b2e822cf6301e8af18375de0f29015e61c93618b220c0fda86d1d293791 SHA512 51576765c334e885ef55bc6373821583f8ad1fe81cd6e7aaaa21c4ede9cae27fd162e5bbb29dd553e1cbc045a3396dd8d48d66171ce7dc82d4976d9c698df706
-EBUILD kfilemetadata-5.67.0.ebuild 1678 BLAKE2B a6bf9f96aa395d782cbf5e31afa11efa2e43c7b649521704ae9981dc43fce851fcd3fc8428f57fc8c567975d5b184fb33f235eb3027d1495d42c65feb21b1889 SHA512 85b56f94ccf82b0d3de2ae41c1ae7f4b30e23196d641aaf171d21a738d43aa4d824c28fe9f0a402b39bea78c3e1fc8b49d09a1ea44744b1c83b507510f8e55c8
-EBUILD kfilemetadata-5.70.0.ebuild 1681 BLAKE2B 56626bfe6f8eef795351d9fb4300b97dc5351be707fcfb05875b3aa463db283b1311b881a2d9ff8a58dafb40d7de2967866da5cce6111b19173a93b4cff86bec SHA512 fd6f7f26b5fc356734d7292f764eb5302ed0bc7d1926e484ba1c327073f86e9a2afd7c17d7971e5d65e2d2c59c2af65f942b9cd6fcdd9d7778130d0b0bd695a2
+EBUILD kfilemetadata-5.70.0.ebuild 1678 BLAKE2B 9d0b71011ddda7bdf037983a716b2470a3ede46dbbd001a5bdccec73a92414f460555670ef6a5b985c6d68f626c51d02be5f1d41d5e128678bd68a3b591b352a SHA512 31c3bad28f9796fcb2fdebe1b72d090cf9c073b8408ccf5c54f1bc67ec9426bf4fd7023cee94c21a89d2c9d09cffeb28667f618c67edccd6f8163639f2fca9c9
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.67.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.67.0.ebuild
deleted file mode 100644
index 8fa92d12dddd..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.67.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
-
-BDEPEND="
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	=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? ( media-video/ffmpeg:0= )
-	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(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)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
-	local myctestargs=( -E "(usermetadatawritertest)" )
-	ecm_src_test
-}
-
-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:"
-		elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
-		elog "dev-libs/libxls - indexing of Microsoft Excel files"
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.70.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.70.0.ebuild
index 32940649d6ff..f05bd25306a6 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.70.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.70.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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
 
 BDEPEND="