gentoo auto-resync : 28:03:2023 - 09:49:10

4 files changed, 2 insertions, 73 deletions

diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index c420fd8b1abe..6a811be6f38c 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,10 +1,6 @@
-DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051e4bdd6e2cb62f59dfc386d3d888071bab74fe818b7daec46baf9f9cd7d8bfad3e179c2d2c811e983008a7451255cf450f733988f3bb8 SHA512 68da3c1ee6f33dfdadd6e1ec7bca6a7c0f16671ebed232a4c12aac4d4fe2e61295901082362efd0b4e69c5576b35370a92063630da251bd71ff7d275825400d9
 DIST qtimageformats-5.15.8-gentoo-kde-2.tar.xz 6964 BLAKE2B 934e35ef39ba3e41d87842d5883cfef1e21f36fa3abbe20851cef33c4b652eab74b4dc704b926aaaecf6927183a36167c0879593511bf143749e51cea82feee9 SHA512 a5d1e3ef2706e4d28f0f72199f422c3c41b11836bbafee6800cfb498e242c3587c8d076ca1770e5b88e1b18590ef0a3e0bb98328aa87524c6f4c7ac385b995bb
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
-DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
 DIST qtimageformats-everywhere-src-6.4.3.tar.xz 1962440 BLAKE2B c03c82d8a2ec1608e61ba5ca09078fabe055e700ab8d9462f48c62b9e8e3ee6dc0b90edee2400a418bca96dd8037cce0e64a14701c4dc788f5400a56093f257d SHA512 8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36
-EBUILD qtimageformats-5.15.8-r1.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
-EBUILD qtimageformats-5.15.8-r2.ebuild 699 BLAKE2B 96d447d7e97fa06c728a01a9c8d0a283c346716cf4a42161f0f8bdff3c1707fd2afd43a85bbc57ebd893122ed05cc71c3af6e5f170d65b3ec1160d6d699048f9 SHA512 5f33f1cda063f6f8f357bb92210f7a1667b723f83c81a630fb8d524de7761e45d0bed815fbb5c0d29b82b5b868cba3b64eacff415f6ccf309eff45a6bcac3aa6
-EBUILD qtimageformats-6.4.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
+EBUILD qtimageformats-5.15.8-r2.ebuild 698 BLAKE2B ef59b51820973e03dfb7869cb4a09d97dcbeac42d53ce9f675b1a70ff1958f836c2bdf579a206317cca726ccabc85c958dc480cef0405d336aebac227aa38bf9 SHA512 83faf26415c4083fdac0b9418f00aacdbff4e747a5b1af90ff0c02e42f3e1b33a992262f760c9afbc0a2dfd07b99f3d18858231d8f2257b23d49d01b78ded07c
 EBUILD qtimageformats-6.4.3.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
deleted file mode 100644
index c546fdded876..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	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.8-r2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
index 2f7d3fe90cfb..a77bab547c05 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=2
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtimageformats/qtimageformats-6.4.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.4.2.ebuild
deleted file mode 100644
index ffa831e51aa5..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-6.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtbase-${PV}*[gui]
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_jasper=OFF
-		$(qt_feature mng)
-		-DQT_FEATURE_tiff=ON
-		-DQT_FEATURE_webp=ON
-		-DQT_FEATURE_system_tiff=ON
-		-DQT_FEATURE_system_webp=ON
-	)
-
-	qt6-build_src_configure
-}