gentoo auto-resync : 20:07:2023 - 07:07:07

3 files changed, 3 insertions, 126 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 1dd3907946f8..955a47d08a4b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,9 +1,8 @@
 AUX diffoscope-243-libarchive-c-5.patch 1959 BLAKE2B 4dfe9dcad2d6f0aa04e642718471cc105cc0c55c360073561c3113f00f84e9ddd04745d041dc94e43531ef859a29fef81ea4670be2e97bc08bfbf89e423a876e SHA512 b719e0f53d037af4fca92d289048996ac73a017136b2961bfd9709b1c581db29ae58a5e7c0c1c656db5289fa8d3e08483305fabf85d55e7a7cd6cf4095a9cad3
 DIST diffoscope-242.tar.gz 3167814 BLAKE2B d6f63f94e312cd9bb48858dd82e50bcae065cd25f332a08940b22d36df75993cd43614ae44cbae3360c38ae30b7910a062ece294680b58b2a654ca3ead078795 SHA512 3d724a2349d2040d7072b81b8a77bae75aabe3f39c661c1d68a9f6e76b75048225262b8a9932c39e56429ec4937a398ca45e9f9abd23505aa511a7a8a81f3ab6
 DIST diffoscope-243.tar.bz2 3088032 BLAKE2B 32fa82fc2f6613c18c39971864d53b02bca4c66631afd0f794bb73eeb8672b1f6c0e88b3145e9acc6c759960cf6fc9efd88bcd56f97fc16df8bb43d0e8a19f52 SHA512 b543f096fbaac136a3a09feef301e5e01b9371a13c4f54f39b0c5c0dab85d6aff94dfcd3985684ea25882071049957a4d42f0c3aba51cb307feb907e769bef7b
-DIST diffoscope-243.tar.gz 3167842 BLAKE2B 01c8e1a53e78d6243d90b0fcb4ba73158e7a5d379f1602b607bf9c24445d9494124ccb676897c5a63bc7a830f8ea0788d82fc0f735384eddba177142359c8535 SHA512 7eaa688a016cacf5f5ccb9759fdc3fdbf8ee3218201ff9b4b950c4e2121f5acd67022b405852a2b4d02838aafd2a316d7579c407abaa0e7399bfd9513981f11f
+DIST diffoscope-244.tar.bz2 3089183 BLAKE2B ed2800cca72cb905e3fbd71f020fe5f22b7b241e29a69ee1b8b74204eb587e9a981eca397e41e5357fdfdacbe51dd97b66adfbe735de80af27179585fd6f43ae SHA512 81ef7ddb44d7b60d2fbd831133cac7cafaa9cec61285fac21002ed6e6805bd04cbf29c41238d6b2c4fe3cbd5c2c00775a3efc164d0288a0f6da790fec1f7236e
 EBUILD diffoscope-242-r2.ebuild 3666 BLAKE2B 5f7f5b7db5f02fb7ad637e0a4152881a30b2817d79b085872a08a376bb0fb22e7006e4c97fc0963e59b7323e3f44af5fd76ea388722d961548785149c93080c0 SHA512 c00320a868e58de03cc73520a89da428ce01ce3efe24ce1c5799bcc10a966050104f5e2342fcdd7b66fbfd7fb0e376da9386a12974dde71dcc06f7b8e342ba71
-EBUILD diffoscope-243-r1.ebuild 3668 BLAKE2B b364110669595752bec269acbfb9c066313d45b39d1a350e5d241e1964791a67e8d5f57e937685598f91455febd31adea31e61214ac6529e3ab1629c9c8bf406 SHA512 6584d541749e7cede00857367272c896aa00907dde2ffc82a9def6c8ad5878d7f31b8f12238936229adc51eae58011bd363069216f2ff113e8293615411194d4
-EBUILD diffoscope-243-r2.ebuild 3821 BLAKE2B 902ba572346ac9d84dbc157e0c0bb1ea124d2e441ef4ab2a7f7ebe7fd3d73a28aca60eed156ad0232a5b94f3e659542664142af8560a4d1931002c937a2c77ba SHA512 81ce81b5ee2bd60e64805cd82598ad44c71511e065031512d0d3362b5c77802ee950671f22b7699b28a1ae30fab0217b9e8a465f9b15f014b97b656605e10397
 EBUILD diffoscope-243-r3.ebuild 3784 BLAKE2B f300010638c551cec4d99b2ce76dccdd3b9298ae8086280d81f7aa069b75a4a58ed7de634d3583d53fdaca5119f6a56771d18c392422a2c8509b338e1c22c2da SHA512 8ba39b31eac59819b016bddb89fa8a3f560389848c3d0c6a68a9ffc3c2d0533ae725eea29aa580da491f25145bf9bee7e899aed7905450954fa1350d5de5d61f
+EBUILD diffoscope-244.ebuild 3730 BLAKE2B 5437c95077218ec5768567e88624775e134277ba511f8eddc19b919632dc878facead40ec13cca7d619580c889ceaba63f4c539160ea142b74847447a064aee4 SHA512 78b84c148297c600cc1055fd02a7c0fd30efb0a88611e65c1c152abc37c45f010e8504834398ef0be990becc83ab59bc09fa757a31a6e0fba45624341b6da977
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-243-r1.ebuild b/dev-util/diffoscope/diffoscope-243-r1.ebuild
deleted file mode 100644
index 73d67fbab13b..000000000000
--- a/dev-util/diffoscope/diffoscope-243-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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_{10..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 )"
-
-# <libarchive-c-5: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344
-RDEPEND="
-	dev-python/python-magic[${PYTHON_USEDEP}]
-	<dev-python/libarchive-c-5[${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? ( virtual/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
diff --git a/dev-util/diffoscope/diffoscope-243-r2.ebuild b/dev-util/diffoscope/diffoscope-244.ebuild
index 0e4cb3e4dc3a..3260662f9b1d 100644
--- a/dev-util/diffoscope/diffoscope-243-r2.ebuild
+++ b/dev-util/diffoscope/diffoscope-244.ebuild
@@ -23,10 +23,9 @@ mono opendocument pascal pdf postscript R rpm sqlite squashfs
 ssh tar test tcpdump zip zlib zstd"
 RESTRICT="!test? ( test )"
 
-# <libarchive-c-5: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344
 RDEPEND="
 	dev-python/python-magic[${PYTHON_USEDEP}]
-	<dev-python/libarchive-c-5[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/tlsh[${PYTHON_USEDEP}]
 	acl? ( sys-apps/acl )