gentoo auto-resync : 20:01:2025 - 06:42:03

9 files changed, 151 insertions, 8 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index efadcb25287f..03b6fee4fbac 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f0cb7845e1aa..2d243f7e57d1 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-279.tar.bz2 3146297 BLAKE2B 7dc1c2a8362db6c012be04aa2562a04079707502d6f61e4ee0093fe46042ad122fe73d1faaf81e6b565d369ba3ec83f6056c4ef62a6fe4649ed376d0404b2864 SHA512 564e731847cbc68a6d8612f543d9d40575c4e9240acc7ec405310878c9288566a5c6dd4aa87e2517db5ef1abcc4ab6e29d3002ee5cce281200d9381de103243b
 DIST diffoscope-284.tar.bz2 3149578 BLAKE2B 4969e394a32d076101d59c0ca730d4e3515e1f3c60031705aed7c043ea031442829435e20de9723117ab73a08b6eef81d97eb8f92f225eb7d9c702bc0060c1ca SHA512 c3a6e02340873e71a4b75412848d9878f3e63c4db14f1ed128744feff2240d688336bcd83b121dcfa8c12e332cb00fdfe0ae347cd5a88e4ec29b3591263e3f65
+DIST diffoscope-285.tar.bz2 3151919 BLAKE2B ad7c20368f8d3747b8b092d8761d6596809e39ee6ba09115e15f3b6c32da7e3cc590eed5628fb07cfc1fcf2f3b56ee7a4c3fd920c413e7f9e7a0522dfc6c721c SHA512 4b2eb41ddfee687408377185fb0ff5e88d6956c09a4dfceceb7c136596a3b00192be949c141f16f47e90f58da2f9ee1f51cd020f688e1bd6048462f357f14a03
 EBUILD diffoscope-279.ebuild 3937 BLAKE2B 04755859f8f8d4ce7998653c6d2a2e1479f8dc8eac1ff2e005cf0726d9536ed5738413b0628f4b1ff705451c9f9b9913cf15e33f19aa9956aa58deddf80b9142 SHA512 13ae14693b16f30953e5df685e24ca6aff0fb29b5c43b62758c19a84fd9ea37ee7c1e3e1a6d4c1a08d228b864dd1a966409392bca2ebaeeb1848630431d2fe96
 EBUILD diffoscope-284.ebuild 3937 BLAKE2B 38da064a3715a2c13b3a674416dc4ef91b39024e81ee13e01ff1ef788a988a5c946ec363df8d6b62cf11609a830c592e68c84a04f0f7d2fe9822e37c9d4be28d SHA512 97537df18723a72b2e91390bf7f4406b38b864ac695795597874686f360307841ea570a3d60ca11c94c0efe0fe13ec888699fe46d7fee21e639ef0674b4ce9c2
+EBUILD diffoscope-285.ebuild 3938 BLAKE2B 1fe168439f96d6c496b2ebcc7352b6d35a7d4f9348e86639e93825a15d7aaa1564f89ce67d58ec31848d64f19d8f48266b5b57c20f121d0a0f3bc2e8fab0a820 SHA512 a580e39916e09c66bb9d243347654cb69850d2feaf64e7144254b07be4a614bfec562e952bed52cec7d81fbf7f8406e9d72f5ab2d99f888655c8ed6552336e2e
 MISC metadata.xml 2086 BLAKE2B 75fdcf3b9bb7b9dd6222f07a04a96b2166c9a819ca5c6358daf4451bf73951b443596e05548ebdc163338eafbc75574e47635b3920ee8125690a310bf5185cf2 SHA512 552933e0c0e9cf23a8f3435a2587c6738f26e5153d773a745159ab1623ad5f39ef5d2647368918b9fdb25d61aab6a02a860c0f815740c1b70c973aa0a48a11ce
diff --git a/dev-util/diffoscope/diffoscope-285.ebuild b/dev-util/diffoscope/diffoscope-285.ebuild
new file mode 100644
index 000000000000..6f5fc7ca5b80
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-285.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+# We could use pypi, but upstream provide distribution tarballs, so let's use those.
+# TODO: verify-sig
+SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/python-tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-alternatives/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( llvm-core/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/pypdf[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( virtual/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-arch/p7zip
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	#tests/comparators/test_macho.py::test_llvm_diff
+	#tests/comparators/test_elf.py::test_libmix_differences
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	case $(tc-get-ptr-size) in
+		4)
+			EPYTEST_IGNORE+=(
+				# Needs fixing in Perl itself (bug #934443)
+				tests/comparators/test_epub.py
+				tests/comparators/test_zip.py
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils-r1_src_test
+}
diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest
index 575fe678dfe4..abb47751979c 100644
--- a/dev-util/flatpak-builder/Manifest
+++ b/dev-util/flatpak-builder/Manifest
@@ -1,4 +1,4 @@
 AUX flatpak-builder-1.2.2-musl.patch 1977 BLAKE2B d6e9374fcd7249c206714beb1f14f856d41576ea04cf4e27779dfc95dbef7def2f27e5183518d930ef34bf111ba4264188bef6e78169227e0f8a59d479ffc842 SHA512 a63f6df29d0045e13796a7c7b033bad1941411f84018b05479e3ffa14bada0826e891fd8e83b9e3df741c27d8954893bb85070be69e92ff3de48904746886100
-DIST flatpak-builder-1.3.3.tar.xz 522332 BLAKE2B 6b870ecdd92a7fb0eca85162a49a48f5bae83ba8a86a5e6663743e3a957240b2059e24ae7f15a9621aa784bb6d394620d58e9e9e3c1c1f5bcdac89b610e8cf3c SHA512 7b46382e559184ae57cffa082a0617013e59428b65ad064e741e357bf165029da91c8d527be6fc7349812edf8dd1e92f42480e6b0f3f6639e3cd88ccfb2bf3e7
-EBUILD flatpak-builder-1.3.3.ebuild 883 BLAKE2B 16057990b847c2ad5d5f167716c9ca2504dd15ba5addcfb5cb219c541926f54ae55f8352712f9eb40668229c9f93bd0e1ff87945dfbcad358001f9cb13cad064 SHA512 7419ee307fbfff0e934def31eb4094180001ef16322ae397d9bfef749b1cc509d536f16fcc06ebfcc7d41c788e72bc53c7d54ba1c43f15f0aae60aed3a4f6a87
+DIST flatpak-builder-1.4.4.tar.xz 530300 BLAKE2B ffc956cb60ddc085c478a3da78a2d0eb5f13e7add9d4246a316cb37a405a02e21e547ee3dd13a78a0cd1d90789ef6c0eeefdc7c2735c6c7147451997a2f38c70 SHA512 7ccc6c9cf464f1637063d2f7ca32464c81c148b50f5479a49c80fc364781ba82ab2e57135e4902f9e00dad25ac70000658c20c7e8c0a10a519eb1d3a86dad35a
+EBUILD flatpak-builder-1.4.4.ebuild 915 BLAKE2B ad60380961c163457bdd31952601b0916e77ccd0902ff014581d2a28cb1b84445b5f5afae38fa0d35dac7260fac5d2984a9a62f59f4465d4660a896775b6d78f SHA512 c103a2d99634868beafd4e5497b7bb604089252ed0b31f0500b54cd898181d6fb5f2ba3eee553b6a71eb7ab755eb7a0387185c3e9e761bd34251884b295c8a8f
 MISC metadata.xml 404 BLAKE2B 6dbef666c9bbd3347d28811890ab5b9ab1ebdf60895dc2d8146a88374a0c348706656e9758a92eaeb47bfa86f833313d669530460a1ee6ca7f81da1db542fb95 SHA512 bfb8bc1b79690c44e7e8171035e326bccc96e1df26d7fe12515e26290ef68b64f6eef1e86ab24530ea6b2c9cfc3240f1587b0d7c21686fdecf9ee8e53144b42b
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild
index 21434455c033..63c98370e206 100644
--- a/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild
+++ b/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,6 +21,7 @@ RDEPEND="
 	dev-libs/json-glib:=
 	net-misc/curl:=
 	yaml? ( dev-libs/libyaml:= )
+	dev-libs/appstream[compose(-)]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 5f505e660e92..cc3fdd32ee7f 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -487,5 +487,5 @@ DIST zip-2.1.6.crate 107876 BLAKE2B 2e1f3f5dd3ec3911361e0b32227a0622fc40e12a84d1
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 EBUILD maturin-1.7.4-r1.ebuild 12458 BLAKE2B 594759cd0026cc4e25b491729ef4b2b043f9ed8427bcee3ac308026319bac3537311a22168920d484a4b76314b94b61f14589c42dea0b9f86ca936efb90156c0 SHA512 32a83cde5975e60e1b873e73358936252e4f6b878553a2ececad5bb594ff49ceafb65f186f133238b78bf2fb812dfef11810550214275593a7f9c432c9e6090b
 EBUILD maturin-1.7.8.ebuild 12849 BLAKE2B 4f0427f2bf635264bb4bb682ba12d6d4e0e36ef0760dc210c88506d7ffb423ef9609fd2c5940479859300fcadc6bf616a7514f10aabad637544fbe536bc2412d SHA512 7bdeac94d354f1ba390eec81137f04f816e683a16b17ad22a8b2d14d20f9aef5949fc6da458c07baf93220600cc0b6328cbaa91e1f8e8213b53356e1f5ab0a07
-EBUILD maturin-1.8.1.ebuild 4611 BLAKE2B c91239c4c9458db15bd836cbbe4ed09da7d936d660171f820a77639d754367f7b084eed446b227c65d8e7c50859e6780dbdc77001b4292b96982416e35970d2c SHA512 1a4b8028b379dd8c3e4e0626199fdfba6787cd5c935421d31499ad1e4ce257cd3cd78a0e1d657629652a940c7a3e30b06447dbf1ba141c585c57e47d2a255b8c
+EBUILD maturin-1.8.1.ebuild 4609 BLAKE2B e2177e3709a92c661a2c90c273b047ad60d1abe90f548e98cc1fdc96b2c0a4731a2c717ae36898597c63b8eddb6cd9d69877bdd32d4ca6a257c59a188d8746d3 SHA512 82ef0cee43f5cb56db57cc9bf64b3dcc61c578791758173b319f202b90b3625976f5a9d0ade8528de9dde08f11ffde5d13ab7bf3610598542bb9eab7d7fc4775
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.8.1.ebuild b/dev-util/maturin/maturin-1.8.1.ebuild
index 270a05dccacb..f9a362883ee6 100644
--- a/dev-util/maturin/maturin-1.8.1.ebuild
+++ b/dev-util/maturin/maturin-1.8.1.ebuild
@@ -24,7 +24,7 @@ LICENSE+="
 	MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016
 " # crates
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index df7125b05429..bad96d1f2e58 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -3,6 +3,6 @@ DIST promu-0.15.0.tar.gz 33465 BLAKE2B 83fae1e8cf663fe9aaedbdf66d86f3d4d7db0b145
 DIST promu-0.17.0-deps.tar.xz 223468 BLAKE2B a6a77d265ae8ac158bfd96ff1f1ecf81b3481b31238a3edb5f8d4228508e334e5c6d8de03a42bf282dfd4832e1b717e5e9f442acfd9e01a4aa50495cfce27b91 SHA512 5bcfb24931f94f8ddf695ca7450d34987428ed090c1cf51025870a673d702adf07d29bd66c9e7118f615b480adcb3c35baa4d09b2e4089cc53447c6cbb54e455
 DIST promu-0.17.0.tar.gz 32994 BLAKE2B d7741d5d461af328ed60513a1ceefa827f42cadda7f51356840669ecd04563b9756cde8d29019b87531c11bd48bbc121f241d47fb9b1ee61823b0bb40fc4abb2 SHA512 8265fd0e9f37624dc1e6abdef87475b5116a7e7af260fc83bc3cda98409af78d4db9d409cd404e251cbf81c124e6a6cd5ab70eef6845ec33048da4937eac01dd
 EBUILD promu-0.15.0.ebuild 1100 BLAKE2B ed6b2f18a0da4625571705c49e3113d84b2bce9550677a9dfa20a515db58b0dcd9e83e18505de08443772da2e3fb104a7b157a35f46d4380042f27dbb329cd9c SHA512 452f2a21cef11a8796d532b642a040038d4949a7ddb0a44aa8a6bce967956b4da33027b1a3ad57a67f60b11c918540005abe9a6bcc584d598888b81e3103bd5e
-EBUILD promu-0.17.0.ebuild 1092 BLAKE2B 9c6b0531d20caef174f4427e01b9e1fdfd6ebfa8411d5456698cf82a26523343745c639670f1e5075d758fee2108d44caa1cda408b207c435cd80712335d6dda SHA512 d2be3dc063bfa2e7cc17adfd621985b20808c1c4b0fdc06aa9dded80dd4678b0ec1dd97941212a774c7ef99476023856eafcf34e9c2846ecbc871253f6d76104
+EBUILD promu-0.17.0.ebuild 1090 BLAKE2B 4d0bff8a4d103d897ad344de41459cff28211a51cd464c24edccb129601024104906f9252028f167e588f1ed5eed4c471f9deac3406b24f562fb5c9a221e4756 SHA512 c679e9c755528984e8cc06647746589bce41be0da6e07a2ef2ebae3f0588b514bc0f56f792cb9e9c1ddf6a1d1bdfa9ff5a950d5d413c4381c7e03ff3de944ff7
 EBUILD promu-9999.ebuild 1092 BLAKE2B 9c6b0531d20caef174f4427e01b9e1fdfd6ebfa8411d5456698cf82a26523343745c639670f1e5075d758fee2108d44caa1cda408b207c435cd80712335d6dda SHA512 d2be3dc063bfa2e7cc17adfd621985b20808c1c4b0fdc06aa9dded80dd4678b0ec1dd97941212a774c7ef99476023856eafcf34e9c2846ecbc871253f6d76104
 MISC metadata.xml 714 BLAKE2B e184975b8c6688cf1834a7e1272e04a97629cf744e4153f8d1b8e729eb636cbd6f62f122c84f46fb5b0ba2b0d1c5bd18dde06f94ee3d6bb75ab116904a51b434 SHA512 f5f4ac21fa934f5e5782d5d5eb0e2fa7ed9e7ea999201997c40393a832cbec98d65cca06a4784b20c0ddff3cd63bb915ff5120b365419f23f1e90dc78cce09a0
diff --git a/dev-util/promu/promu-0.17.0.ebuild b/dev-util/promu/promu-0.17.0.ebuild
index ccf9cff91854..96326724ef5a 100644
--- a/dev-util/promu/promu-0.17.0.ebuild
+++ b/dev-util/promu/promu-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~riscv ~x86"
 fi
 LICENSE="Apache-2.0"
 LICENSE+=" BSD BSD-2 MIT"