gentoo resync : 24.12.2018

4 files changed, 4 insertions, 35 deletions

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index a6d0494c5291..25ac4ba9efcd 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,5 @@
 DIST qtimageformats-everywhere-src-5.11.1.tar.xz 2191408 BLAKE2B 7a01c6c607cdb02471c289b71151d8fcba2047778c6d499a54dd66d125a7dac29b944b2b722aa8bf8667f453e92edba20adf10cfe6c580af7ac42c41aebd3a8c SHA512 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d
-DIST qtimageformats-everywhere-src-5.11.2.tar.xz 2183956 BLAKE2B 02686bc92e179de591c4424abaaa2152018182ff13aa4523034e2eab6f704bd3168183b99c915e14e4cc2d1abc42f1d3f6b7fd426ab357fe91d9085a6f563fcf SHA512 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1
-DIST qtimageformats-opensource-src-5.9.6.tar.xz 2107828 BLAKE2B bbea8e01d7c7e4510c35a6322f72c9b531daa844745e5ea007bdc516f60bf72de48a5aa18e7209b6b25da189362b4db8be5fa3d4e8addc90f407a3879b7cc69d SHA512 c6470c1486ae9b0bc3c846c1de6ffa294810aca20ca90d9d5f40a257a7e339ff58aeafd5f76324e6939d71889044eebc48b8b001f2027dbabd15f7eeb8d8bdf8
-EBUILD qtimageformats-5.11.1.ebuild 605 BLAKE2B ab9b770c6a38630aa450bb016886fd4f61c6a0b1a043f97afba9bbc341d7a8b12c631fce61117af8c801de8b9fa5d2a4ff5ef659bc47bafd78e199bf024042a7 SHA512 baf928651a702b5cf204ddd537120096bd033590fee768b1826908f0da5eb9b7d107be760c708ef9549eb27797eae52140425d5f2f05ff3e6dca4410d4a0361d
-EBUILD qtimageformats-5.11.2.ebuild 607 BLAKE2B 0f80de2b7fdc1a3fb490527b757c3bae55d7dd93eee05d0e5875610367d5464fffc12c07dd1a6731dca0d6ad5f1da1127cac36ecbbea118f0bdff24196d02a41 SHA512 0765f575f36491d783607a7ab44a4692c645aa9e85e2864a5418eda74d16a74ca9ce39fa7df4e6b0977e3f024c815979e7edb15e7b1612bc90095b11e07a2962
-EBUILD qtimageformats-5.9.6.ebuild 607 BLAKE2B 46d3b734f62887f3adf36b6fce4f4422b0ad54ef2c134c7a75f3c751a0c47a776a3b967c0c28aa7c3cba8281b17bf2da38fd33c7acd53649905f24dc39b77b7c SHA512 b359b141e85ec32038ba234aa536feb50fff3e39b0738b9021eea2c8b2f7815314b48d89deaa39108feff02c088f7436bf9fc29e71369a5807c59b13560521bc
+DIST qtimageformats-everywhere-src-5.11.3.tar.xz 2197304 BLAKE2B 9041260c26b2ec5085a10c05a76dcab59941ae3d18475b93286028b9a4bbafc923795f6f0ec7a0e6b45cf95c21a37fbc76d0868cdbb6ed8891360310cce868b4 SHA512 5e2b83c2a7cc337ca0cc80e348ee41cfead3429245ec0aa18bdef945c85aa878ba684f5d410bca04d0183e0f6032a78b976ba89346043c0a49816c306d0235f7
+EBUILD qtimageformats-5.11.1.ebuild 604 BLAKE2B cbf2b5c20d8e504e2385902fc915e7beb77c82c042235bcb0c20f72e3dce463acc89e02611c6730ba3a86568f95c4adf446b932256ab128747e3a1001e583de5 SHA512 855a327ac234fe3b1eb359ada6062ef48e7f6f8f635ce6d5ced9086f283b10d54e9465e3666279d9c213953a6b022ef9e70fb26e5660548181aca736d061e605
+EBUILD qtimageformats-5.11.3.ebuild 607 BLAKE2B 0f80de2b7fdc1a3fb490527b757c3bae55d7dd93eee05d0e5875610367d5464fffc12c07dd1a6731dca0d6ad5f1da1127cac36ecbbea118f0bdff24196d02a41 SHA512 0765f575f36491d783607a7ab44a4692c645aa9e85e2864a5418eda74d16a74ca9ce39fa7df4e6b0977e3f024c815979e7edb15e7b1612bc90095b11e07a2962
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
index b0b7684b9fab..c1e1d336a28b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.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 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
index 89acfc3bcfa8..89acfc3bcfa8 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild
deleted file mode 100644
index 0314aac9742f..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE="jpeg2k mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	jpeg2k? ( media-libs/jasper:= )
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	qt_use_compile_test jpeg2k jasper
-	qt_use_compile_test mng libmng
-	qt5-build_src_configure
-}