gentoo resync : 02.08.2019

4 files changed, 2 insertions, 121 deletions

diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index cc65a279d1fd..33acd71fec2b 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,6 +1,3 @@
-AUX kfilemetadata-5.57.0-non-speex-files-crash.patch 1648 BLAKE2B f6a43d3d4b4503075eb0196ca85a6f7622cfb294473f492a044e48b4bcb96a135e939122855563946cbdafe954b8c203400abd50f687da97f4ead6a8220b1006 SHA512 8f29fcc30343697787f6baae65a6cd12fd9cce89aa0ebc50b8ef157662d8336bc2dc7d2956cc3ca2364da7eef8c9beacfa63adecb66d4aca41526d58f7200b47
-DIST kfilemetadata-5.57.0.tar.xz 410556 BLAKE2B 988f822829c294f2c1dd6f88d8a395f8cb07709a46b79754cf782bc426faa89688cc78159fb0172499be53f1c4526df722166297dfc687388a36290c31732c3c SHA512 a513a9e850758647e098177eeea793a2672644de531293b37d57ee216fd3048c124dbea99c5b469ce110fc538169fe72fcfd1b72a1296360d1f111d14bcf2b8e
 DIST kfilemetadata-5.60.0.tar.xz 415240 BLAKE2B ce65cf1c9743a2077c1548e47e64f8e1a11daf071c99b3ebb4568639d68a7d5aca70f00fc93fff3003e9491143098c3e91667008b6976f66aab5ed333466fac2 SHA512 e9ed29e3c1f0d03ec99ca3da1b7128c3ec75db7165ccf8d722457817e7feae94056ec210e43872830034e583fc38844d30a63abf2ca7078e1daa98fe6ea00f3a
-EBUILD kfilemetadata-5.57.0-r1.ebuild 1755 BLAKE2B 9277b5f4deb68d0005f319a84fd31c94ab70f9f84a1df6d65a0e60a519dbcf63833ae021e5298d8d7f114fbd68cd328b1e25b22cd6dcedda0e01566425429a71 SHA512 490dda36f35ef809c65fed62bf5cf59ad9f4fc7e656bda613c7421aeabbe25c33e39fd82368ef0cccbbbc4fc709424302e7c1671ab2549294cec3ce188915f00
-EBUILD kfilemetadata-5.60.0.ebuild 1698 BLAKE2B 0a0c32ebbc12f92c79da36b635485ef4c02f8de55a7107236ebb7633160427004406721ff63ae064d17ee18aad3d45f5b7a6fb45a95e4a63c2738e5a10fb568e SHA512 d53d4560d8e9d10a3384ae67ad53ef050aee0930c6b82ed0b83d7bd5ddd8a30286983b26f318d1e846da7da07717b0f66f402708955ee03a92e06dff56680c19
+EBUILD kfilemetadata-5.60.0.ebuild 1695 BLAKE2B 2fe48a317a76d901c2ce02eda4e0bf73602b8c6cd7eb91e8c8006d263643953304b2cc98b44d829436744599add14119e0abc18f8e3f0a9532013b08ce5aaec7 SHA512 50fffbc8e047a398be5dda876eaa8b0e4f07b99dba55f28603cc9a78f3402a439e68d8b1dcb45cf607aecd5476a57634fd7e264ff85822d26abef7228a1e8569
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.57.0-non-speex-files-crash.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.57.0-non-speex-files-crash.patch
deleted file mode 100644
index 5664cf024b22..000000000000
--- a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.57.0-non-speex-files-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 61b1916c3e87c3b8f4fc3d1f1d19bf427b9247da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Tue, 30 Apr 2019 03:51:14 +0200
-Subject: [TagLibExtractor] Fix crash on invalid Speex files
-
-Summary:
-TagLib::Ogg::Speex::File::isValid() returns true even for invalid files,
-but tag() only returns a valid XiphComment when the file is valid.
-
-Other TagLib::Ogg::* classes properly clear the valid flag when
-encountering files.
-
-See https://github.com/taglib/taglib/issues/902
-
-BUG: 403902
-
-Reviewers: #baloo, #frameworks, ngraham, astippich
-
-Reviewed By: #baloo, ngraham, astippich
-
-Subscribers: kde-frameworks-devel
-
-Tags: #frameworks, #baloo
-
-Differential Revision: https://phabricator.kde.org/D20913
----
- src/extractors/taglibextractor.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/extractors/taglibextractor.cpp b/src/extractors/taglibextractor.cpp
-index 1954cac..e355907 100644
---- a/src/extractors/taglibextractor.cpp
-+++ b/src/extractors/taglibextractor.cpp
-@@ -476,7 +476,9 @@ void TagLibExtractor::extract(ExtractionResult* result)
-         }
-     } else if (mimeType == QLatin1String("audio/speex") || mimeType == QLatin1String("audio/x-speex+ogg")) {
-         TagLib::Ogg::Speex::File file(&stream, true);
--        if (file.isValid()) {
-+        // Workaround for buggy taglib:
-+        // isValid() returns true for invalid files, but XiphComment* tag() returns a nullptr
-+        if (file.isValid() && file.tag()) {
-             extractAudioProperties(&file, result);
-             readGenericProperties(file.properties(), result);
-         }
--- 
-cgit v1.1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
deleted file mode 100644
index e5cdc0411f51..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit kde5 python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-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)
-	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) )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-"
-
-PATCHES=( "${FILESDIR}/${P}-non-speex-files-crash.patch" )
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	kde5_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)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
-	local myctestargs=( -E "(usermetadatawritertest)" )
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_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.60.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.60.0.ebuild
index 5a6fb7dd57ca..f583b8370364 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.60.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.60.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit kde5 python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
 
 BDEPEND="