gentoo auto-resync : 06:05:2023 - 11:33:44

5 files changed, 124 insertions, 2 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 20f2fe906683..e610821dd049 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
index cb615fbe3d83..a40fdc34dee6 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -2,5 +2,5 @@ AUX codespell-2.2.4-drop-coverage.patch 551 BLAKE2B 0873808ef9e57dbc9b8c75f58464
 DIST codespell-2.2.2.tar.gz 213652 BLAKE2B 2084f6041c6cf9888b661a1b7b8a73696b1dc6309b8d19adbb0dbdc091d87b487464b12c9800cfec893ed5d6ea71f214d0a4262099617b5fe7e60d8ca448973d SHA512 48be00aa32e55a66814193014e97fcb27ff323ea2db0622f68cd2d3ab31ab8be61f60a09ed91fe3425cbd63b2592bcc44ee9b58fe79e2d498bc27a83a4e93ddd
 DIST codespell-2.2.4.tar.gz 241664 BLAKE2B 5f40003fdb840b926615b6eed74df90055b2ee47c534321289c3ed895c47cd2672909b152a53640899cc21960c1b3aa80c41eb344d9e23cea8fd13e998c71af6 SHA512 efbc62a3dd49781565f6d901aa9b08fc1106adf2c516365dd8d3684846e23b23bfda1e65c6530edf0de9462ccafd9d835bd541a8f0e1de14163c723ce041052d
 EBUILD codespell-2.2.2.ebuild 810 BLAKE2B f7cdb88c1512133c756aa997ccb516b270056a4f696f8b550d53dab5270ca4e07eaeee6ea833a1929beb8cb35404a3efaffc28b4055bca87c829606d8bf38f86 SHA512 f4d4066f052c03a8aaa7bb5fb9cc410149c4cb3fb57e6f73359a8bc2e85771563078693d0cdcd5a7749f58e07a66432b28d38e9b6f19aede5ccbace0122e42d6
-EBUILD codespell-2.2.4.ebuild 646 BLAKE2B 2c84333217ed55a1a27011dd9cfbe04cbbfd0789ca091237a1c9b2091bcab6f0a8bf4efc255823ad94d88ecfc4fc96a60d373cd0eae3d72ce3ffc3cb7ffae314 SHA512 a038befcce2878b4f27ad72292ac7d0bf30196fd3af6190f366285006e481c56833f482f40522e0ddd7cd42b499a5dcacaab2633dcadb53e72f3f0bdacc69be1
+EBUILD codespell-2.2.4.ebuild 644 BLAKE2B 4b96f6497dec7822909c8d5b6c850fea521bfdfacdc4f204239e7cd1d8b5ea7425fcb1b40522cca421a6a60fa81ada43c4ee7e96d2f1932e7f3902724dd39da7 SHA512 c4ae2f2bb56f75179f9f2e8ede253eaa0402f3d8b610f4cd3b1d7cef6f04c7134a9f365b3c6f76028f4aa7d50229c6dca02034401ec8c69da9726e0ffd3050a0
 MISC metadata.xml 820 BLAKE2B b0584565c2ad113da730325836b4e847f38f9ec8c988f5a6537efa10f13a1a2d342cf1f9f6a872fe1e9d4ce915a45cb64ee302176507a774c1272a11328cd6ac SHA512 10c664900fdc603f206552aa90373d989bd822401ffba7c02c05f28fc77b9b0b697c822dc5a3c33b4be6f82f8f95e8c72afc87d5f0efb8dfc0a2c19c5b22eb51
diff --git a/dev-util/codespell/codespell-2.2.4.ebuild b/dev-util/codespell/codespell-2.2.4.ebuild
index 7b9bf108d36c..a55a4b89ece2 100644
--- a/dev-util/codespell/codespell-2.2.4.ebuild
+++ b/dev-util/codespell/codespell-2.2.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://pypi.org/project/codespell https://github.com/codespell-projec
 # Code licensed under GPL-2, dictionary licensed under CC-BY-SA-3.0
 LICENSE="GPL-2 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
 
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index a424738b98f0..656d7fcae3b9 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,9 @@
 DIST diffoscope-238.tar.gz 3287285 BLAKE2B d745c0b279ce6e29cbe9c6655c48d2fb4c8d230c5d4931048be83b4d97f6b45bff5424409b559988c2efba2dcbb80778c97e3f726174ae154c479ec24b557c34 SHA512 8600a3a29f7d4a80f0a0b37e6277e46e377c6f056cf111356f80723f0e4a309e9bae087643019fe1c46f99430b35389083e1156911fa8d3375993b550342b25f
 DIST diffoscope-240.tar.gz 3167743 BLAKE2B e6eb9f7499ea7d82d9a98de175f61c044051c987061d740599f490361099ecc568d8e557f9473404ca1002c4b91939b768dd7577ba45705e9880a3e17e3729ac SHA512 3d31e19762e9f5adfe12c16fc52bc0156f3036541de01cbc260c07ebbcab54eaa23b4b9f9c2afc3c791137f7e6cc375de06528f64e0771cbebd9e23f310a6e2b
 DIST diffoscope-241.tar.gz 3167718 BLAKE2B eb69f65a63e764db886c6057a19746a5ae7f4f5cd760c8a568412084dbf03da368a584d7d5b1f637e1d2e39b6fc430d077be526fd3199d5583e3f9026f897490 SHA512 82526a4bf3885b58fef74143bc75193fc9af2692def097835cc3c820e5055b22544872c0e1a8f13fb1434172cf1cc2b3664b2d2776590195b0580c5c0b3f4d57
+DIST diffoscope-242.tar.gz 3167814 BLAKE2B d6f63f94e312cd9bb48858dd82e50bcae065cd25f332a08940b22d36df75993cd43614ae44cbae3360c38ae30b7910a062ece294680b58b2a654ca3ead078795 SHA512 3d724a2349d2040d7072b81b8a77bae75aabe3f39c661c1d68a9f6e76b75048225262b8a9932c39e56429ec4937a398ca45e9f9abd23505aa511a7a8a81f3ab6
 EBUILD diffoscope-238.ebuild 3575 BLAKE2B 73da8bb1fefaf3b4386b7f85ca3579cdd19ce296eb67603eb5106b85be0d5eaa729c6e63c4b2a962787dca210f934d99383c10c2e50a6be74bf66851799d65b3 SHA512 6e04cd441cb9021b094061a7e217c27bf005d954dac711438e52411df676468847edda78800b63c32261b0dc45c119c36b2eac4864b57639cb029eef89447221
 EBUILD diffoscope-240.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
 EBUILD diffoscope-241.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
+EBUILD diffoscope-242.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-242.ebuild b/dev-util/diffoscope/diffoscope-242.ebuild
new file mode 100644
index 000000000000..d598e5340b57
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-242.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1 pypi
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~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}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-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-arch/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? ( sys-devel/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? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence of filemagic's magic.py breaks imports
+# of dev-python/python-magic: bug #716482
+RDEPEND+=" !dev-python/filemagic"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		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