gentoo resync : 12.05.2022

3 files changed, 2 insertions, 70 deletions

diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 202b46658d03..324defe76ccb 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,7 +1,5 @@
-DIST kfilemetadata-5.90.0.tar.xz 429856 BLAKE2B eaf0ddc5f73224b5ca2cda87592ecc688bffaf764c791bcdb7292e2c4457e8b7aaa8efa174deaec88622f0ca5c69ec1405cd0ae69ce59b150758b04d2e94b546 SHA512 94b0dd8f6f82369623ac9d6d18e6ca3928bcb67806acf876ff86c694083e8ddb750ee838b9a27bd8550f2361667e42511a889c58891af7a1fd86add5b3922d0a
 DIST kfilemetadata-5.92.0.tar.xz 430260 BLAKE2B d18d8a537cea3ccddb93a04f09cb63f6bd603a446d0e79c397b1dd34f6cb33661b89a62e9687579eab28567bdf92c0ef3baf252a16a0df350c01d0869895c6e4 SHA512 62eea78ae945344badd780223a929829dde759bcf515191f7cc0ab9c0cffc6510f599cf9b7a73cce3fcbeb0bb6476df9b97fdfc1744f27439d7f743b7879e12e
 DIST kfilemetadata-5.93.0.tar.xz 435732 BLAKE2B 042e6d2f66bb0fee2ae52537d3cf49a8b3ecfc17809f7df93579f7bc27b1c80fa938ed5181a6b60e7dbe081dd617426d0e13856ae5a3a0c66f41ff3e9a436118 SHA512 724469a0fd0bb42802c4005aea876ad1d9c6f9a114a489b20399830f43f3b6dd46ad535892941c0cd92cbf1e736921971bcd79266a9e6df7b09075d193879087
-EBUILD kfilemetadata-5.90.0.ebuild 1562 BLAKE2B c273126b15ee3f9295bf40a0580a1fe8eb11b778ce431b39390c8fa9c54d74774b9773286835819fb663da5d101deccf9a79f3eaedd3f3703cf863ab46ea376c SHA512 75b1da7336b2157ad9d904bc233a70aa4157aacc75674ed8450c332e538c355dea1be2b7d59a7dd7b6739abac340ce862a5bdc78364a05a97124749162b97b3c
-EBUILD kfilemetadata-5.92.0.ebuild 1660 BLAKE2B f8b27d7439d8f2c2e1bb3fa9c49501a3bd7baf253b795ea7cb11611daef391e573d1eb448b8d887e9423db9f123872f646b8a89a7fb8b41da91b47c502eb5c80 SHA512 d15182e038980d98a1d72d9c69932daa573cddafd38becc86d6f0e485a690fc9bd8256d1ec8aee9c74f87a2ee0a1737f5be3e384e0450f611b0f15ea0278c9a8
+EBUILD kfilemetadata-5.92.0.ebuild 1657 BLAKE2B d6a4f9185f7baf5dc20c28a8aa69af76d6820ab8adc8f8d6a4e8461a82a06ec4660c512863d10521e08e4d0275240cf42c1c30d1de78651ccc0b7a0d40d0e36c SHA512 147686d03bd2e5d1a0c86499ae8dbaba6e1aeab3476cebffe76071129744d1980702f2414b886972092a55be768f0262f1f0d09fc0a58aa97382b630091fdaed
 EBUILD kfilemetadata-5.93.0.ebuild 1660 BLAKE2B f8b27d7439d8f2c2e1bb3fa9c49501a3bd7baf253b795ea7cb11611daef391e573d1eb448b8d887e9423db9f123872f646b8a89a7fb8b41da91b47c502eb5c80 SHA512 d15182e038980d98a1d72d9c69932daa573cddafd38becc86d6f0e485a690fc9bd8256d1ec8aee9c74f87a2ee0a1737f5be3e384e0450f611b0f15ea0278c9a8
 MISC metadata.xml 724 BLAKE2B 26662ad6f30efc50657e17c79e056226389f31df126011c446dd5bc8a38449d5eb1ca4cede8ce97d4a5420b65ba0234e9d3428d34273ef9f58eda73960307a2c SHA512 5df051944e48dcd008517ad078ba39593de7ae1188eb9b1bccd429728d87240dc5b9c341b4ce706f5774f414c0c0fdd00a550a95475f427c6e1b28dde4d509ff
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.90.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.90.0.ebuild
deleted file mode 100644
index fe0122c308dc..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.90.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="epub exif ffmpeg office pdf taglib"
-
-RESTRICT="test"
-
-BDEPEND="
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*: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 )
-"
-
-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() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
-		optfeature "Microsoft Excel file indexing" dev-libs/libxls
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
index bd23a08176fe..0922efac1cf8 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org optfeature python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="epub exif ffmpeg mobi office pdf taglib"
 
 RESTRICT="test"