gentoo resync : 05.02.2020

4 files changed, 6 insertions, 38 deletions

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 2627b6769981..07d511a6d759 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,9 +1,7 @@
 DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
-DIST qtimageformats-everywhere-src-5.12.5.tar.xz 1795824 BLAKE2B 3b5d3a4be8933d1af7d0fb6feb1cd37318cbc69840cc82de50fb81f63156251f768347bf5ae31b6f255dc9e02a53d64ab98aef8a27749331071482d729ac811d SHA512 9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0
 DIST qtimageformats-everywhere-src-5.13.2.tar.xz 1803796 BLAKE2B 771b883f8b415a7eb7562beaacf28cc6acfd7ce7828e4bdb4c7fe12bc283bbdb79742e15152b0baf0fd8cb0d46bfe88577bace6b13162396f1211aaf79c0e727 SHA512 e76d7efaeab81c4eaf0f41dad150ae6b36ef2246993d344e4611ed865d62a8ac93cca5f62a2c94a97bf16333344490b5a51ca8de1c7eeb460c9ae321f759f4e6
-DIST qtimageformats-everywhere-src-5.14.0.tar.xz 1809880 BLAKE2B 0aca299ebfeb7e70bb7815a204628b874ed2f06f1aae48c2a223e6604f7e20bc809753833573c86905df1a65327a5e0bb50ae3f7a93d6dde9441ef9f5c2ad10b SHA512 e674c461b5880a2df17f06726c647dc89837c7746dbd0278a6de8f6291e92ef63ae2ccb3a3288951196e03156ae112e4d8d55ae692a8b6a608c7441fb624d28b
-EBUILD qtimageformats-5.12.3.ebuild 535 BLAKE2B 6127b3746d0b8dfa12f3fd7fd5fb5fc65984a539b9110449462829131cd5f63f3d2428c7d754126564b0a92743a895cfc9aecff39cb741adf7e46ef9781ce689 SHA512 2f3807091be97592ff6a3228389fbe9877d9791a76990d1ed637af1f0caf62ed2b12a4c71cfb277b90f25ae4193573d9a51994fd61b5dcb9a1249a93243865c6
-EBUILD qtimageformats-5.12.5.ebuild 671 BLAKE2B 22c17b191eba835b0f78747589a032f0930f55dfa83bc127393381ad2b65b6da463748f70e10d04be3b604b3da8b2a3ee385eb8a116a7cf2204bb6dd1d237f6e SHA512 4b59e93f6741cbe7898b349c300ddf73d4dff850f65a0613d95546f006077ed7a82a06ea37d774eeef1ff0883c523e439ff0e3dc1a6cfe285ced7f8f52994fe8
+DIST qtimageformats-everywhere-src-5.14.1.tar.xz 1810072 BLAKE2B 4c5f30fbdf013bfc224401a53b93210b8c44fcff08c99660b606dca85f2dfcf872476d56bc3375dbb9e18154dcaa422542538f12978077811f4cdd400d4f8fdc SHA512 843c8288a79506d4f2ac9e318f9478d689045bd0de1c2d9a529b060bd44dc7823561baef290bc54ed6cc756027f1dcdb8f706a2bd122ec9aec18848e5d316555
+EBUILD qtimageformats-5.12.3.ebuild 504 BLAKE2B 1a0aac3d636c7f5fea3bfa6a3dc67be550f8e4333eb8d6890b525fc305538cb842e179e49bb0cba8b3572cbf6300d206812cd70a21067eaa836d28d822e9b529 SHA512 584a417e89ee548ff9631170843ffac7cb955537200ea254e4a3bbd305aa847aee0e41555d487545a2c66bbdc044a03003f067ff0e64e07abe02679263d070d3
 EBUILD qtimageformats-5.13.2.ebuild 671 BLAKE2B 22c17b191eba835b0f78747589a032f0930f55dfa83bc127393381ad2b65b6da463748f70e10d04be3b604b3da8b2a3ee385eb8a116a7cf2204bb6dd1d237f6e SHA512 4b59e93f6741cbe7898b349c300ddf73d4dff850f65a0613d95546f006077ed7a82a06ea37d774eeef1ff0883c523e439ff0e3dc1a6cfe285ced7f8f52994fe8
-EBUILD qtimageformats-5.14.0.ebuild 674 BLAKE2B 5771237aefd18c9302d6c89494ae211a28c389f06b6b2c22796395350b9cbe8de3fab260a4db4c55b1918e855a4afb1a647d5da4c2c9aaecf54733a9ca8dd4d3 SHA512 f0dbc5327a9df26d90d7151a974ae18e3d709964fad26bf73576d9e0779575633b30081332a9b55bace930f5c68ea217237c9ca7aebf7acf9d7f7d2efdc74d43
+EBUILD qtimageformats-5.14.1.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index a244180237eb..1778fd4aa6e3 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.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=6
@@ -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 x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.5.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.5.ebuild
deleted file mode 100644
index bee26a5b8224..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.12.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 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 ~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
-}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.0.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
index a7eace7d6d78..64b53f6914c5 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.14.0.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.14.1.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