gentoo resync : 20.10.2021

3 files changed, 2 insertions, 34 deletions

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index fa2f5632459b..1ebe15e34ec5 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,3 @@
 DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
-DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e
-EBUILD qtimageformats-5.15.2-r10.ebuild 745 BLAKE2B 4eed2aec2b17fea3009fe4dc945178f642d58066819dc0291889200be87d68bb680938c959f8982ced16d445ba333e6fa4a2ff162d5ce4252e777af8210929ef SHA512 15b2a3d075ea013d2655c30421bfda58905f12cd1ce5a8fa54bea335af5159dc8cfec7961e939fffba13946df8185bc04b5a0a805b5ecadc3e7c1241d7de37cf
-EBUILD qtimageformats-5.15.2.ebuild 677 BLAKE2B c4c31cdf56a20dc88b7af4040528090da9cd7a5a15b89756037e800c2029ccb869c6effd57afddf039a16e65ad3b2abd348fef90dea165be2078f8fa29fbf439 SHA512 2ad09118bcf970992efc7881429074fa4128af92ca8008cd14242bf09109a78712e5330ed03c494cfc2f8789e7997f57dc3cd09e8dbdb626c0213e4f27db4bef
+EBUILD qtimageformats-5.15.2-r10.ebuild 744 BLAKE2B aa7b49d667c1bc5c9ed3172d461d356d45d889e5aea131b46b10bf7b0c73be6556b0c6609b0df63ddd90040f0d9c2e763158334721b58cdd8fa8fe2fef8edc05 SHA512 71f01383629cdfe6c9181c7c018b7aa6b648529cf9f35cc04bdb18d5c65dcb2e712818b56d17f7fd879989a9ae24adf9abb8819761ca58f16dec08f57b86fa3c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
index 2abdd63fcca8..5d58b6ffc55b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
deleted file mode 100644
index dc39e71a9b7c..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}