gentoo auto-resync : 14:07:2024 - 12:27:13

10 files changed, 8 insertions, 342 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7cc4583cfec2..9f0296d45bb6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index a732c3be3907..56d66e9a5f75 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,19 +1,13 @@
 AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf692821028e16f97272f751176ef22126151e8edf18e2c7d9da88d9bc8334cd4737d36037a5a04eb7360a41fde39605db62942c52e62c SHA512 4f8cd6f2a70077b8e52b084a4c76f5a029e3e13e578d28bb2d9d3470ae89fa6867d541bacd079bd55b76eb17a1c2f3d845715fc0d4c9e2a199618d8a6871d1a1
 AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d
 AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466
-DIST libjxl-0.10.2.tar.gz 1912303 BLAKE2B 9677d0d35d877ce269c9958accfbb5ee55d446dc0e8fa64df9323c1db3993613752803aae63a48c18eeb72ae91c2a044a1fab0a83ddf28fdf8395ddb67a72414 SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e
 DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4
-DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
 DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef
-DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f
 DIST libjxl-0.9.3.tar.gz 1873236 BLAKE2B eb3811ef4fc64bb5df2e06b6b86cbc1b5dbe6eb9728e5ad5a8b791be57359eb63442722cdf629b006be518bf575409b93758d7ec0376a596de4405fb7686b7f2 SHA512 8aace2d8c0ece9db64a1620a10581ddc5a450543db64d44f864eaa5d3b8b3f0466c501fed5d58abdbf6eb5f90af25f6370c33718847bd070e851a02b560f541e
 DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
 DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384
-EBUILD libjxl-0.10.2-r1.ebuild 2940 BLAKE2B 49f3c0f3f32d56c976afc6fe35d983a561493c33e95fd706f414599a7abf99af46f79d1484230cfd05106114338b2a4ee5511aa23232a03e6a7463420165b805 SHA512 f41aac4c7594e972464ce6f5e646f618f013603a56d1ecd937515d56942b46161f765276f90c6ee4dd8194fcd2a0c8fe9b9711ab5de952e62b6e5fbb12cd7d6a
-EBUILD libjxl-0.10.3.ebuild 2945 BLAKE2B 00773bbe7fe462c425558fc9456f5871ab70a9083a52746e5fd8f0a0bf939654d4528213a85aa0cff31ee9722891b2306e14b962c58953ed65ceaa4585c778e2 SHA512 1b3470cb66f1bad55f76c4bb1b24f01a85973be5199e9cddba758e40714dce21b90a28eaeb5693c9906784448492e049ab337ddb6f07e5cb8651d57b9b52fe86
-EBUILD libjxl-0.8.2-r2.ebuild 2566 BLAKE2B 98867a0d0f9d5dc63a0bd82bbe0d38d3b9503439177d28943166eec16cdd593318c5eaa8c3f3d05c8fc55f4e2f63e6a309ad4a728232a703cfebc868e9141aa0 SHA512 5966e0eab345b00e50f20d2d94d6ff6b21dbc5bffbf4504a65e161d658763252ad76d556b21926ee7caf9255adbb9182bcdab0fe7a9bf77506bc988b0df85b9c
-EBUILD libjxl-0.8.3.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff
-EBUILD libjxl-0.9.2-r1.ebuild 3002 BLAKE2B a0aeb136c356fae12bf8ee5d21f9ff63c23c8768bc6bcb66741d4213e1e8da823d44909c9d5093809b41807de009dcfa9e3d9b65745d92d7d97a49afa5660522 SHA512 bb1ae9fa5dc74cacb8a04e99dadb92ba8a5e96909c47e1a1a9414ffd044e4a29075a60d65a921abcfb2d98d29009bdd701679446405fc574d824beceacbe8de7
-EBUILD libjxl-0.9.3.ebuild 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a
+EBUILD libjxl-0.10.3.ebuild 2940 BLAKE2B 49f3c0f3f32d56c976afc6fe35d983a561493c33e95fd706f414599a7abf99af46f79d1484230cfd05106114338b2a4ee5511aa23232a03e6a7463420165b805 SHA512 f41aac4c7594e972464ce6f5e646f618f013603a56d1ecd937515d56942b46161f765276f90c6ee4dd8194fcd2a0c8fe9b9711ab5de952e62b6e5fbb12cd7d6a
+EBUILD libjxl-0.8.3.ebuild 2566 BLAKE2B 98867a0d0f9d5dc63a0bd82bbe0d38d3b9503439177d28943166eec16cdd593318c5eaa8c3f3d05c8fc55f4e2f63e6a309ad4a728232a703cfebc868e9141aa0 SHA512 5966e0eab345b00e50f20d2d94d6ff6b21dbc5bffbf4504a65e161d658763252ad76d556b21926ee7caf9255adbb9182bcdab0fe7a9bf77506bc988b0df85b9c
+EBUILD libjxl-0.9.3.ebuild 3002 BLAKE2B a0aeb136c356fae12bf8ee5d21f9ff63c23c8768bc6bcb66741d4213e1e8da823d44909c9d5093809b41807de009dcfa9e3d9b65745d92d7d97a49afa5660522 SHA512 bb1ae9fa5dc74cacb8a04e99dadb92ba8a5e96909c47e1a1a9414ffd044e4a29075a60d65a921abcfb2d98d29009bdd701679446405fc574d824beceacbe8de7
 EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339
 MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296
diff --git a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild
deleted file mode 100644
index ed0c6b72ce32..000000000000
--- a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib gnome2-utils
-
-# This changes frequently.  Please check the testdata submodule when bumping.
-TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc"
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl/"
-SRC_URI="
-	https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	test? (
-		https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
-			-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
-IUSE="+gdk-pixbuf gif jpeg openexr +png test"
-REQUIRED_USE="test? ( png )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	gdk-pixbuf? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-	)
-	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	>=x11-misc/shared-mime-info-2.2
-"
-DEPEND+="
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-
-		-DJPEGXL_ENABLE_SKCMS=OFF
-		-DJPEGXL_ENABLE_VIEWERS=OFF
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
-		-DJPEGXL_FORCE_SYSTEM_HWY=ON
-		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-		-DJPEGXL_ENABLE_DOXYGEN=OFF
-		-DJPEGXL_ENABLE_MANPAGES=OFF
-		-DJPEGXL_ENABLE_JNI=OFF
-		-DJPEGXL_ENABLE_JPEGLI=OFF
-		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
-		-DJPEGXL_ENABLE_TCMALLOC=OFF
-		-DJPEGXL_ENABLE_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-			-DJPEGXL_ENABLE_PLUGINS=ON
-			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
-			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
-			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_OPENEXR=OFF
-			-DJPEGXL_ENABLE_PLUGINS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	find "${ED}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libjxl/libjxl-0.10.3.ebuild b/media-libs/libjxl/libjxl-0.10.3.ebuild
index 3430ddbc8d00..ed0c6b72ce32 100644
--- a/media-libs/libjxl/libjxl-0.10.3.ebuild
+++ b/media-libs/libjxl/libjxl-0.10.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="+gdk-pixbuf gif jpeg openexr +png test"
 REQUIRED_USE="test? ( png )"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild
deleted file mode 100644
index ea3c8f0cc52c..000000000000
--- a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-# This changes frequently.  Please check the testdata submodule when bumping.
-TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759"
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
-		-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
-IUSE="gif jpeg openexr +png test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	>=x11-misc/shared-mime-info-2.2
-"
-DEPEND+="
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch"
-	"${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-
-		-DJPEGXL_ENABLE_SKCMS=OFF
-		-DJPEGXL_ENABLE_VIEWERS=OFF
-		-DJPEGXL_ENABLE_PLUGINS=OFF
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
-		-DJPEGXL_FORCE_SYSTEM_HWY=ON
-		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-		-DJPEGXL_ENABLE_DOXYGEN=OFF
-		-DJPEGXL_ENABLE_MANPAGES=OFF
-		-DJPEGXL_ENABLE_JNI=OFF
-		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
-		-DJPEGXL_ENABLE_TCMALLOC=OFF
-		-DJPEGXL_ENABLE_EXAMPLES=OFF
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-			-DBUILD_TESTING=$(usex test ON OFF)
-		)
-		use test &&
-			mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" )
-	else
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_OPENEXR=OFF
-			-DBUILD_TESTING=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/media-libs/libjxl/libjxl-0.8.3.ebuild b/media-libs/libjxl/libjxl-0.8.3.ebuild
index ff3f34b606fb..ea3c8f0cc52c 100644
--- a/media-libs/libjxl/libjxl-0.8.3.ebuild
+++ b/media-libs/libjxl/libjxl-0.8.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="gif jpeg openexr +png test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild
deleted file mode 100644
index 3d567834e99f..000000000000
--- a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib gnome2-utils
-
-# This changes frequently.  Please check the testdata submodule when bumping.
-TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc"
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl/"
-SRC_URI="
-	https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	test? (
-		https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
-			-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
-IUSE="+gdk-pixbuf gif jpeg openexr +png test"
-REQUIRED_USE="test? ( png )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	gdk-pixbuf? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-	)
-	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	>=x11-misc/shared-mime-info-2.2
-"
-DEPEND+="
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-
-		-DJPEGXL_ENABLE_SKCMS=OFF
-		-DJPEGXL_ENABLE_VIEWERS=OFF
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
-		-DJPEGXL_FORCE_SYSTEM_HWY=ON
-		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-		-DJPEGXL_ENABLE_DOXYGEN=OFF
-		-DJPEGXL_ENABLE_MANPAGES=OFF
-		-DJPEGXL_ENABLE_JNI=OFF
-		-DJPEGXL_ENABLE_JPEGLI=OFF
-		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
-		-DJPEGXL_ENABLE_TCMALLOC=OFF
-		-DJPEGXL_ENABLE_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-			-DJPEGXL_ENABLE_PLUGINS=ON
-			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
-			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
-			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_OPENEXR=OFF
-			-DJPEGXL_ENABLE_PLUGINS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	find "${ED}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libjxl/libjxl-0.9.3.ebuild b/media-libs/libjxl/libjxl-0.9.3.ebuild
index 00adab4f5232..3d567834e99f 100644
--- a/media-libs/libjxl/libjxl-0.9.3.ebuild
+++ b/media-libs/libjxl/libjxl-0.9.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="+gdk-pixbuf gif jpeg openexr +png test"
 REQUIRED_USE="test? ( png )"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 5757fd405210..dc2b63e8dbfd 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,5 @@
 DIST libsidplayfp-2.7.1.tar.gz 806267 BLAKE2B 7bc484fb80b42dce8bdf679db58d118d30bb90ddaad059ab2c7d981220d5faa281e608d43ed47e8fa64080f671e5c9b7bb5950d91c90a735c97dc6f70b651d65 SHA512 3f7ebca088922a4ecd3f84351f1ac0cbc1d6c04f672434bd72c9d5a60b0c1cc19adffe86167da809d0352e2cd104a9ecec42aad10a69156d5c3c58f6b9caca31
 DIST libsidplayfp-2.8.0.tar.gz 805758 BLAKE2B bb9aac09c4325cbdfa0c258cd6a7ba0de8fa372a778bccc1aa4135d6b69cc6ce5a848fc04429bcce573b91546a44960741755d0aa1e3dfe25a26795d2c2cbba0 SHA512 2744d0def52c505273de64301848dd570a5f1c267299b6bf0a7914a148a05b7449b490ac98a69ca45bffe826b1ef043cdd6aa9bd878a9eff88b6459d52132237
 EBUILD libsidplayfp-2.7.1.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794
-EBUILD libsidplayfp-2.8.0.ebuild 687 BLAKE2B 89257d5934cd9327850f3719e4fa316f15b3d124c722a7b026689e099a12faa3eca8ecbd8bba245043ea15603ea223aea103986df2fa495982e09a11347c23bc SHA512 faa54ae1b2098e9f988edda7fa3dcaebfe9dd1af6d44e26dbcccf228e06bc980d14a387f4c1d361c6dea462c921f789fc214a9c86f00650c747f1f382d4b7538
+EBUILD libsidplayfp-2.8.0.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.8.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.8.0.ebuild
index bc7c3460f07e..4eefc5282af5 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.8.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {