gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 10 deletions

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index ccfd0713cf84..1da11dba935e 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,7 @@
-DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
 DIST qtimageformats-everywhere-src-5.13.2.tar.xz 1803796 BLAKE2B 771b883f8b415a7eb7562beaacf28cc6acfd7ce7828e4bdb4c7fe12bc283bbdb79742e15152b0baf0fd8cb0d46bfe88577bace6b13162396f1211aaf79c0e727 SHA512 e76d7efaeab81c4eaf0f41dad150ae6b36ef2246993d344e4611ed865d62a8ac93cca5f62a2c94a97bf16333344490b5a51ca8de1c7eeb460c9ae321f759f4e6
 DIST qtimageformats-everywhere-src-5.14.1.tar.xz 1810072 BLAKE2B 4c5f30fbdf013bfc224401a53b93210b8c44fcff08c99660b606dca85f2dfcf872476d56bc3375dbb9e18154dcaa422542538f12978077811f4cdd400d4f8fdc SHA512 843c8288a79506d4f2ac9e318f9478d689045bd0de1c2d9a529b060bd44dc7823561baef290bc54ed6cc756027f1dcdb8f706a2bd122ec9aec18848e5d316555
-EBUILD qtimageformats-5.12.3.ebuild 499 BLAKE2B be2e8fb3482d1a91226d735eae2e6a10de1b7756e286ace646793330f6b0d2027723ea4845e2bd89280684ef9c6470cec1ac7df6646476a70137eebe6d5ee72e SHA512 89ad80b8cb5865be7e9d4135f696ec6626ca5f482ef56d5f6a370fa963f4f3e0b503e43181e4461c609630e41a80798090792ee3df2803f9020d67649decdb6c
-EBUILD qtimageformats-5.13.2.ebuild 671 BLAKE2B 22c17b191eba835b0f78747589a032f0930f55dfa83bc127393381ad2b65b6da463748f70e10d04be3b604b3da8b2a3ee385eb8a116a7cf2204bb6dd1d237f6e SHA512 4b59e93f6741cbe7898b349c300ddf73d4dff850f65a0613d95546f006077ed7a82a06ea37d774eeef1ff0883c523e439ff0e3dc1a6cfe285ced7f8f52994fe8
-EBUILD qtimageformats-5.14.1.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
+DIST qtimageformats-everywhere-src-5.14.2.tar.xz 1805208 BLAKE2B 115939d859478ccb2190c68ea3e93484537d372f62fc03f42931e69c5b7e0f1f84b376659986c3a36082e05930cafd076579c9786f9f4669ebecbb4254ee8d35 SHA512 e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6
+EBUILD qtimageformats-5.13.2.ebuild 635 BLAKE2B e740ec57c19eaaa891d635817eb6334158814029cbe48bd41373d155ab21a1b8674115ff92d52ec07769139bc7c6b270208291518bd14c97ca1193d9b52baa11 SHA512 f9dd9ca51ef0be811ac36300718bac656f3aefc3448393e668969a76f2f84726d15ab820b30bde492cc36e3f5cf48174d1fd7b985d389a400fe496151724673e
+EBUILD qtimageformats-5.14.1.ebuild 670 BLAKE2B 7e0781d822eb83ae28239f7a9c5176f709cea7dc948addd0e05fa2e5e10799f7ef20e8f22683fbfcaaefeb21e7738fc237cdf438b871fc0a925bd36e3f5b4e60 SHA512 d75bcf577b4a7fefb28023ff2459cd7ca15939f948a420ada145aa723b9c2a78eecbfe3089a5808d949426985969e34ec5ee0e8eda0abc77a96b8844cb3f5ba2
+EBUILD qtimageformats-5.14.2.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
index bee26a5b8224..5527a38493cf 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,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 ~sparc ~x86"
+	KEYWORDS="~arm"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
index 64b53f6914c5..e839a0613b3b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
@@ -7,7 +7,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 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
index 8ec5c809c7a2..64b53f6914c5 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="mng"
@@ -22,6 +22,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	qt_use_compile_test mng libmng
+	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
 }