gentoo resync : 09.07.2022

4 files changed, 2 insertions, 71 deletions

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 62e20efadaf8..0b21d3cdd7da 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,9 +1,4 @@
-DIST qtimageformats-5.15.4-gentoo-kde-1.tar.xz 1588 BLAKE2B f73941b56aad237eda0a4bd34979c8b32ec4c76511cb4f2850ba47fdf5a06bea180e155256f2e7bd5591d4fc0b84b5a2bffb8f326e75bb1c5d0a3ab7d874cd4a SHA512 f4a6dde562dea96f0c6db2e859f3e4566f842d887908eb389ace0aeb0c60b02a65b4c14030b05039322745d4140e979240ef2bd2dcf6c0284c44d6fa4e51686e
-DIST qtimageformats-5.15.4-gentoo-kde-2.tar.xz 2032 BLAKE2B 7953a793fa24815a2f602e9472a664eff159497ac4bd2e01c356a015b7d0b5d92d83606ddec5396b2bb2c893ee20f0f8c5d2c5820a522f1c0e20bd94deeed500 SHA512 e9b6886ac33f9bca09fdef4de2fc28fedcea9d168d8a8c0f708c20d4cf14bc58cc583edca85e1a04e596a2a4ebcb98520ad1fc196ce6113d446a184d8def285d
 DIST qtimageformats-5.15.5-gentoo-kde-2.tar.xz 2596 BLAKE2B c09bea5234b433d33f6307fbdf93f1ccd6b2b848dc34891afa17599028c2ec2d9b5dd3a1c3dcd0dd6ffff01bbbaaf350a6c17440e9083c05ea91ec3b31a02f7a SHA512 df30c604f167cda8e819af7461b11386701e3ea7357244d5525e1fa3c7a6391c21736acb1576b913b8965ff4e90ebf0b85f2e9bae419da0ac2bc8d9f5d423b18
-DIST qtimageformats-everywhere-opensource-src-5.15.4.tar.xz 1830288 BLAKE2B 7eebd51fe37d7fb33b78bb176a15cd943f0350307774f62c2a6635f5a603578819201402dd065f99dd01546c4d8d1e5e2fedaafa822656f7c5aa894a60dd17ca SHA512 388a9ceebdca6d32f606615af37233f2d8394856d067c9a80486b88ad5714eac90263cd6555a3efd9c1b5fdcc27431b7f99eed6fc02760b1a9974515bfe70274
 DIST qtimageformats-everywhere-opensource-src-5.15.5.tar.xz 1829872 BLAKE2B 7b240291e6076537daa9bc3b87f13f3285f19a4638de5b5db44a2b55275fbe843dc974226e999cd90e6bf902b43fbcd25f052619f291fa36807830a26c10cd52 SHA512 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd
-EBUILD qtimageformats-5.15.4-r1.ebuild 711 BLAKE2B 09d0ea02ad3ceffa9b09fdea4d682218fa8e8975a9858b408b7b37f141ad81250930385e83a2e1bcb29fdbd2cf83277751a0b50db0e2dbc2be3f2d78a7a5996d SHA512 8b5848b0d24e24f46ee39e3630c84550ef3b7df334f994fcf5e007af64e7399c12ad6ea8b5f07532d0776d05313f9dcdb724751b5f4147ca0daea5f30b2e54f5
-EBUILD qtimageformats-5.15.4.ebuild 710 BLAKE2B 32b729f69297b495f2c364d26073340aed0fa2c8546d7e37977e81e6fe90a3200bddbf7d6c2c9cc199351f56e11babef851e57c7829db4a7a08bdf2af1ec95c0 SHA512 daa59e75e21674c0467a21b6ce95c6678c6f010ea55987d95282456eee4046c2a36c1dd21c861d50f79a1e2747dbe999c1dad43ab54288e5685348edc23a8abd
-EBUILD qtimageformats-5.15.5-r1.ebuild 714 BLAKE2B 1ff165bdf11e87d98fc1ff4c65cecebe1b96c6d4d3c6a0919f5bfdf9fce24ab828c05292c7d262e0d0c7a592d916562edf83bfb9ebe12ef6e0b5d24c0a9814dc SHA512 18e33ffa32485d256191449450c65b5d580950082673f208e9f6135acf5fdc23a5640f6dedda69ddb0dfd86c733b4ea50cf04a2429f606fe56052ae873a29e34
+EBUILD qtimageformats-5.15.5-r1.ebuild 710 BLAKE2B bca14a1badda00a13e852dbe4e70168179a73ebcdf1e7a3799fb0da55fb0b4960460975090bcc46fd4e0e96c64595755cb38eccb0196d9f0c1c61bb70b96c4c0 SHA512 1ed641faed82574aeffec083593138b591d98fef813792695ea22a3fd9fad54488a3cf1efcc6fc52d022b66d153c683a4c4d19c32e5512b83faffd1a2fc73370
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild
deleted file mode 100644
index 308031f04fd3..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-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-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_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.15.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
deleted file mode 100644
index 225d841d11cf..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_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.15.5-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
index c6cee7fd360c..d3291db75635 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.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"