gentoo auto-resync : 20:03:2024 - 19:00:10

4 files changed, 3 insertions, 191 deletions

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index ff385909ac31..2d8190f3b256 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -2,19 +2,15 @@ AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf69282102
 AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d
 AUX libjxl-0.9.1-backport-pr3138.patch 1775 BLAKE2B 3bc8ec83f1104fabec0966dffd85719ed6eea5c89a10d7ffc490aaf767815dbfd7c6543a0058664b16a8d52cafb53b3137414403dbb5db844a0ae9366fe4b6bd SHA512 0a9262008daa2d118c4eab85102de8f05b265f3a3a8f45088f28ef844fd7c93740a69aa6a1d93bc5d1808c3158527d8b9b8c4543256c1a2988e8a03bff19486a
 AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466
-DIST libjxl-0.10.1.tar.gz 1911155 BLAKE2B f7f1cc7c6bf34c1608cd28f36f5c2c42f17ba10824e18300e84824c908cb5fc7e0e0157a7bfe6b8aac7197a4abcca0806404251e1ed6ae38f15ff8e449f0980e SHA512 54dc043dbed4e4bda1a591a07549f31fde17b67c5d754b1676616f3d8ffb82debafa3ed69041fd6523c907550543b11a3788d5cd3f1ca18e3ee2888760795ae3
 DIST libjxl-0.10.2.tar.gz 1912303 BLAKE2B 9677d0d35d877ce269c9958accfbb5ee55d446dc0e8fa64df9323c1db3993613752803aae63a48c18eeb72ae91c2a044a1fab0a83ddf28fdf8395ddb67a72414 SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e
-DIST libjxl-0.8.1.tar.gz 1611905 BLAKE2B 75d7b4987c211e747520688a700744a0996483546b5929e8b765a66fc603b4d6edea8556bb427b8c7440ef447161fc38ef5ea390775f185df577da920711a009 SHA512 8011f2181cb627c2b516c7e1b8ecec78a201f357f3be6e568f7814a6a9c42d5979f4bb4ed040a67d68f6649d1f5c564f3cb2fac7e52702f755749084d903a737
 DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
 DIST libjxl-0.9.1.tar.gz 1872279 BLAKE2B 723a098c07d61e7d1f4a7fda04d8be60594cf5a21307242e6d06deca64f8a2343078248d280fc8eb3fc9bb2277f7ffc6cc547b57a605a7aa95a0b21095450ccf SHA512 a3169dac40b297617075a49cc5cdfa25e793a34b5dfe95db9c2560bdc967743882f0014d1d0fd508b8d2ea02cb3766d2f295af7a2cf9def8f5370f97b24aa16f
 DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f
 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.1.ebuild 2758 BLAKE2B 66335ca59cc71eacd27bf5e029b741820cd443966ffbcd94043be5a973f3076e7153b8778416ea4e27544ba2a12e67322bc515e93b2c10ba989259beaf36641b SHA512 bcaab793183d517ace2c6b720b87bfcc950765883994ed3b71582d773b7972785a83628998e0285cfe866000e2c8fa23f4cce2ba3bdee989217f70164c1bb987
 EBUILD libjxl-0.10.2.ebuild 2758 BLAKE2B 66335ca59cc71eacd27bf5e029b741820cd443966ffbcd94043be5a973f3076e7153b8778416ea4e27544ba2a12e67322bc515e93b2c10ba989259beaf36641b SHA512 bcaab793183d517ace2c6b720b87bfcc950765883994ed3b71582d773b7972785a83628998e0285cfe866000e2c8fa23f4cce2ba3bdee989217f70164c1bb987
-EBUILD libjxl-0.8.1.ebuild 1760 BLAKE2B ba530cf5b66d83f525426810fec1431644baae2d7c0754ec36d0a1c22bdda9c1694fb5c1d7fd299df7aab2f066e78b9e787b9d88c31f7fe37558b40c91b0a12a SHA512 2b7d97efba14eb06cd91863bd6274abc1cdc46ccd4b86f1c0df1dc9013d6828ab9d2128030f5f83ba64488936baffa2c87289c7c50d3b5f7c4bc6a473152e22a
 EBUILD libjxl-0.8.2-r1.ebuild 2370 BLAKE2B d5f0f655767280985420ed7e338748ddbc55589003c9427aa086295d12a91c9fb907c982ed88849471a76991879f0352c1fef2b682a1b64a3b03e43e9d93a018 SHA512 97750abe5bde3c0ad3a785f65250930f3312458c0b0b23bf00163c2ffed7cbdb148d43bbd8a768d283380fdf1794eece03a2b1adab97d4d9fb53e31b65dec614
-EBUILD libjxl-0.9.1-r1.ebuild 2836 BLAKE2B 421f5b673550a0357db42b102d5ebff8dee66d83af915ef5c1d61ddc68c4355f5053d5ed32371a479dce19ed73c1790fa76eac0c3896d7b508f58f8100e76bbe SHA512 6151e6485249725e09bca421a9077f3d44528c87cca9db211acc609b8086009ce58b79bea3b0c62cd5bf496ae19d71ee6adffbb427238c1bc79a4e17c1511f12
+EBUILD libjxl-0.9.1-r1.ebuild 2834 BLAKE2B 2eaf1c131904ea251f68bde0975a8c98e84f5569790dca26a781b8bd2b785c018095c520cff15477d2a2c1863e18b50c3be2c48ab62a26ff089335b9d371851c SHA512 63782f2f5cd39ac6f7dc13c58eecef74044fe16589ca60179196f49964eb3f46beff29e53719db597a54444aa4e4e9c88ecb87ef2864d011875f77b57304a28e
 EBUILD libjxl-0.9.2.ebuild 2819 BLAKE2B 28e2fad57d223836d28c11c404a2cf22611458c0d93f3a92e06f98a03b8c226289a68da518d83398b8ee818a84210b3e24c9c148289173ca0b4b1666b9e358fe SHA512 8c84c7c7e138a7ed28d5cc965b65d8218c16f47d769d7b608b880a21bbf1dbdcaff7dfb1d9a4dfdb2692579d4ebaa9b79c34fd1fe1a9fa27dac7ec7bf29a8575
 EBUILD libjxl-9999.ebuild 2443 BLAKE2B 97af04661d52c6c2a1f4cddde89a90ef8c673efeb18c906bdf32fc66900c7c201a0119bf13a2ce65e663985108e6fc41526bcbbd723a2091cbdc6f512a072edc SHA512 60a0324c66c794e06c51b6a7bfe2095681ab5c1caea6de0c4f2a1de15e9781d608151038337874624b219419d3568fcd1f768a9e11d9d5650935f0a02d3e4223
 MISC metadata.xml 864 BLAKE2B 04139ce686fbc36068182d03fc23f0a0d49262f8c6b21a690705411330c3b5ec4f969d0ed27fc712fc184736bb20e9bfa3a6fe2fe6d5db98527334151dc0a8d6 SHA512 73e89d636908712608a41f8c4b7f29fc9d551030cebcd83e8db722869aaff0bc96c1ad6c05c5dbe3a2b2b29b8c639c95d02a8d4ed7094a9200af7f008c9b20de
diff --git a/media-libs/libjxl/libjxl-0.10.1.ebuild b/media-libs/libjxl/libjxl-0.10.1.ebuild
deleted file mode 100644
index 67dbdcfaaaf5..000000000000
--- a/media-libs/libjxl/libjxl-0.10.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+gdk-pixbuf openexr test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
-	media-libs/giflib:=[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	gdk-pixbuf? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-	)
-	openexr? ( media-libs/openexr:= )
-"
-RDEPEND="
-	${DEPEND}
-	>=x11-misc/shared-mime-info-2.2
-"
-DEPEND+="
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
-"
-
-multilib_src_configure() {
-	filter-lto
-
-	local mycmakeargs=(
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-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.8.1.ebuild b/media-libs/libjxl/libjxl-0.8.1.ebuild
deleted file mode 100644
index 76418c4960ba..000000000000
--- a/media-libs/libjxl/libjxl-0.8.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="openexr"
-
-DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
-	media-libs/giflib:=[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	>=x11-misc/shared-mime-info-2.2
-	openexr? ( media-libs/openexr:= )
-"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-DJPEGXL_ENABLE_SKCMS=OFF
-		-DJPEGXL_ENABLE_VIEWERS=OFF
-		-DJPEGXL_ENABLE_PLUGINS=OFF
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=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)
-		)
-	else
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_OPENEXR=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.9.1-r1.ebuild b/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
index 521e8e5b5653..5bcd6ac6d8fa 100644
--- a/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
@@ -102,9 +102,9 @@ multilib_src_install() {
 }
 
 pkg_postinst() {
-	use gdk-pixbuf && multilib_foreach_impl gnome2_gdk_pixbuf_update
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
 }
 
 pkg_postrm() {
-	use gdk-pixbuf && multilib_foreach_impl gnome2_gdk_pixbuf_update
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
 }