gentoo auto-resync : 07:10:2024 - 04:26:50

9 files changed, 20 insertions, 44 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 049605f541ff..20e454d95ab0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 5de93df01687..85804f2e353d 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,4 +1,4 @@
 DIST eom-1.28.0.tar.xz 2046292 BLAKE2B dec9915ddd63758f6a36eef094e13cdfddc6bb6d333369ff240cb4afa745b814a807fd69d0ed949924fff0337073a6467ec6f5b8037bb9b1e356e029ad2e06f6 SHA512 e500915f9e4b5aa8774645e0bf6735d7592fb9c33d6cca7a94011814ac414816d5ead8dae26a875f054249ca880f306f998c0150c9800df8143dd25a270c239f
-EBUILD eom-1.28.0-r2.ebuild 1795 BLAKE2B 4cda887de306e4a0416fbfd93983e4af5a5c107b3af30004c639e28270f0e4dd25e3aaf6282bf8530293bbeadd085553865c02096256e472bed54c00ead9c5ca SHA512 a0c1e7e66ceafc24d631565fa21cba6f181e771a1ca1ec014d7d53679ed70dd04085e3b629a50c32b6cdb9ae442ba71cc3ddc0f3377848f6d3bf5ae499fcd3ce
-EBUILD eom-1.28.0.ebuild 1675 BLAKE2B 3ae045eacd65637c2d0a6386157743202e868f0bbeb7a6ba6d903525c5f4e8e1281a8a6982aece1b96b30502c9d00c715b0dc95e3ca24fb7ed7cbeb870f76683 SHA512 bbcc5b7bb3cd75d6dce98d277c8438489f652f7214e23ef1e62093dd2d58e9bd293cf5f2133018b0a0b626a75dfd7935831b8dc8f513133fcb43f6f0e7293141
+EBUILD eom-1.28.0-r2.ebuild 1803 BLAKE2B 7b625840106bc511bd2888891ffc4a3c5dc1ace907ce185c6c561df26fcfcc559835ccd6e1c67fab7579753d4192e536f4bc2dc5d13e4e5392ec8a82a92188cc SHA512 74580e7ef9718d5c638eaa011fc0c9028054eb7e1db2275cfbfb4bf2c098f57aad075b57fa02753ff2cd3b9475e82f5390cfe8cb3b50b061569efbf94ca9db33
+EBUILD eom-1.28.0.ebuild 1683 BLAKE2B c2bb4b17747f8310da1cd7c65d4c7f15e0797a63d14ae59e5667403202cb2f4df85236e964df6efdd1803f0ab24562b7ae6517d0e29c5421df1ec76b832a57f7 SHA512 5843240e5460387f531a3aa4099405b98e10ced6d00e30fdf5a0de7f8d5c4335893bcc853ee95181727b30104f41b67ad78e13627fea733203b18c80be960377
 MISC metadata.xml 617 BLAKE2B beb6f065da7476b012d7b972d02ab4a7af91b4d105fa281bd2264c08903d6f84ee735b187fb569c37f0b0223f750e66d3a2b18e0f4e0d100f77048ec318e2aaa SHA512 9f74f1f8062baa57d1ff7253c75fcc9b157e2bbfb82e3da61364334aa258305f0d0ce5e06ba48fad4e3e2243623c97671a3f807b836445300b5cf9c3b51c391d
diff --git a/media-gfx/eom/eom-1.28.0-r2.ebuild b/media-gfx/eom/eom-1.28.0-r2.ebuild
index f808aaf8de76..10c964ed3f26 100644
--- a/media-gfx/eom/eom-1.28.0-r2.ebuild
+++ b/media-gfx/eom/eom-1.28.0-r2.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=dev-libs/libpeas-1.8.0:0[gtk]
 	>=dev-libs/libxml2-2:2
 	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-desktop-$(ver_cut 1-2)
 	sys-libs/zlib
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
diff --git a/media-gfx/eom/eom-1.28.0.ebuild b/media-gfx/eom/eom-1.28.0.ebuild
index 931fc3ee8522..5e369e19dfda 100644
--- a/media-gfx/eom/eom-1.28.0.ebuild
+++ b/media-gfx/eom/eom-1.28.0.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=dev-libs/libpeas-1.8.0:0[gtk]
 	>=dev-libs/libxml2-2:2
 	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-desktop-$(ver_cut 1-2)
 	sys-libs/zlib
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 18b9fa070cd6..0b67736de69d 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -2,8 +2,9 @@ AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71
 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
 AUX exact-image-1.2.1-gcc6.patch 1874 BLAKE2B 46b1dbaad49a1588c1957f48fef6e9a3abd7859b715a71dfbc3ef85356c5c9ae7d6ef01c3455b6c08d4d2e07434ddf387fec80ba51ba5d11d0200e5b5f2d5e96 SHA512 14a3209ffb091ee53eb0c0f4c4a41333ddeb8953f36ccc64b5ef2c653efd4f60191b3ffce628eb20aacf2bbf9fb18f5be42298fb0d58d9813ba47d522d1dfcd1
+AUX exact-image-1.2.1-libjxl-9.patch 522 BLAKE2B 96f1967d0fb0cab93f3b55c9b185f9ba4c55ce00a51cbebaa97e082393795bc2d80a36d98f293b538eb818dcceff7caae7e2947b138c17cea54ffbc270954482 SHA512 a37916cf971bfc48038adeb347723cef230ba79c618398690a009631aea7af4ab908fce7efd9be09e803507454e5c340df204c03cd1079964e4467d19db04c77
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
 DIST exact-image-1.2.1.tar.bz2 320849 BLAKE2B 615884f2501b3e9ff00410d3569c8aa7d0131610f990591eb77a11cf6d7249342b4a2ece0f2dd62ea7a1cdd213ae1a98bf6da0817b74d8c8e78cbca5b8e67e33 SHA512 34af0575d8564dd5942f0e3ec5b6fe7fb234a96e621a737359406a2571ed8ac2c15ef2e7655a7d260b37b68138e071342583f47ad7ef0e3b3511e5ebc1a873a8
 EBUILD exact-image-1.0.2-r8.ebuild 2529 BLAKE2B ba0ee3fadcf7c780b20847064f993ce5c9fec51953488b92f3fe5677ac9f0e924ed809bf5a5d6877c9a5167ea29ccb70fdc0ee6e962387a69a31e73c926e4ff9 SHA512 b2a37c8a265078a5ee42434b467434c6347720eb95b6ac8f40c6838776ec8d7ad24ae407c64eae04a56ed04ae775e3f93e69b1cf047564d3d4b6bfa54a818a2e
-EBUILD exact-image-1.2.1-r1.ebuild 2242 BLAKE2B 642f483e0582edcb94001c310b5b1631b8488cbc7b6dae234811a8ae05dd3148d10ae14b404f07e0ef42b38a95bea117d5a6dfa09c3f71b8e2320a5ada4d7bba SHA512 8cbc0bba01326f80a4dc19d7aa29c39d08d7e6425f8ea7c1f3f7350c442c5390d879f3fefb6bfc5e6238a9f7623c651a459a85dd94750de260d52d7cc809ec8e
+EBUILD exact-image-1.2.1-r2.ebuild 2272 BLAKE2B fb48f269b8bb08f9a47ed1fe0c09fe6646ac6d8a2228336d9549b04ace9a14d24e991a4f6b96dc022107310497b3fc1afaa97e2098de40f48d5cca87ed1fc78e SHA512 a61b6e0c9696659aeda0eb2e57acffbb3c5639ad262f0c4fc520c1021ca57c297ec9fd05896d82faf5316fb53137c518f0f674b8cc6f903506b81a5a4704f630
 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14
diff --git a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild
index 7480e98e5c79..09f63e97b42e 100644
--- a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild
+++ b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
@@ -24,7 +24,7 @@ RDEPEND="
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
 	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( <media-libs/libjxl-0.9:= )
+	jpegxl? ( media-libs/libjxl:= )
 	lua? ( ${LUA_DEPS} )
 	openexr? ( media-libs/openexr:= )
 	perl? ( dev-lang/perl )
@@ -47,6 +47,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${PN}-1.0.2-g++.patch
+	"${FILESDIR}"/${P}-libjxl-9.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch
new file mode 100644
index 000000000000..520300b85146
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch
@@ -0,0 +1,11 @@
+--- a/codecs/jpegxl.cc	2024-10-06 17:58:07.684805110 +0200
++++ b/codecs/jpegxl.cc	2024-10-06 17:58:23.929604759 +0200
+@@ -186,7 +186,7 @@
+   }
+   
+   if (JXL_ENC_SUCCESS !=
+-      JxlEncoderAddImageFrame(JxlEncoderOptionsCreate(enc.get(), nullptr),
++      JxlEncoderAddImageFrame(JxlEncoderFrameSettingsCreate(enc.get(), nullptr),
+                               &pixel_format, image.getRawData(),
+                               image.stride() * image.h)) {
+     std::cerr << "JxlEncoderAddImageFrame failed" << std::endl;
diff --git a/media-gfx/libbgcode/Manifest b/media-gfx/libbgcode/Manifest
index 0048c214ef5c..3ee929f68df2 100644
--- a/media-gfx/libbgcode/Manifest
+++ b/media-gfx/libbgcode/Manifest
@@ -1,5 +1,3 @@
-DIST libbgcode-0.0.20240730.tar.gz 456671 BLAKE2B a15e903e42090eff3945f446f7d805ceabad533a2edcc9e4c82d99bac7aa42e9f10470f5ee41ed449799d9bc318c9097439a6534607a00d0bfeb2e2dea252b79 SHA512 b448d9ace946d85a4decc4a2cc05e1a41c64ba49968db1f818ba5974120f458159d5b639d5501a98daf4544a483366cd0e299c052f21577bb5ad763f7220d7e3
 DIST libbgcode-0.0.20240903.tar.gz 456751 BLAKE2B 93cd8eb83083581ba1ba735c6820dc0ead18d13ca0613387559d610f39c8011881bcc92ffec65fbcb40113b2b877050c15c7816d6db063698ce7ba5df7b35eda SHA512 86e9d85f0e52ebde853979e79639dc4424e26686fe55c45d78ca683cf32d8ec059976d43ffda9339a41892d30ebb267f8c360851889ad0a48ced874c27546f04
-EBUILD libbgcode-0.0.20240730.ebuild 769 BLAKE2B 59f6ad1854677761895653c2810d91560b0e82bd0ac423ec0f259c3dedea26d70ffb9163aa4a6bf107156716df813a4424397e49c99e5e464a430fcdfc9359de SHA512 d4e8eb634555dbd094da4b3992e10b3047e8c3d57026deb57933a9e85b2a31d43ded717d845f9a402a64c4d7b6f79efae9ebe16e70cbfce2b06a0747b3fda0ca
 EBUILD libbgcode-0.0.20240903.ebuild 769 BLAKE2B d7d12286daa36967556870cc79ea85fe390ed21fdb02a47232bb4da750796d271deb3f6c14bd94ae260c6e9cf8a392f06e067a209821151da23721fa51a22045 SHA512 28cd11cdc56b70aa4b5ee7d39672269ee81c00f828f265a295228684c6185e4fa874dd3c30a8af75e715c5c4824eab87612494a98c58bdfbc572648f1d08603a
 MISC metadata.xml 517 BLAKE2B f13be19479e8ade30b867081f8014821be2c5650b407890268e6cab65330bd4b8e3ab37e6cba531f029ebb0499d0cb7269ccb17b309b15105f6bb6aa94b5c42e SHA512 0d09893294fc40e9b52bbdf7f8f31e075c1e8839fd90c2b9656b70d30ab52f088527ab2d1ffec797ecb1e309ea7d40bb48d571eafd19eb3a2592aef4e7c918c0
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
deleted file mode 100644
index c53e99967c5c..000000000000
--- a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-LIBBGCODE_COMMIT=5347c3399ec933f590d1f96903a406647f287d8f
-
-DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter"
-HOMEPAGE="https://github.com/prusa3d/libbgcode"
-SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}"
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/heatshrink-0.4.1
-	>=sys-libs/zlib-1.0
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( =dev-cpp/catch-2*:0 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLibBGCode_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}