commit: 98a81e3acea8fd4860da1b5bc260cbdbeeba34f8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 12 03:26:53 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 12 03:26:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a81e3a
dev-util/diffoscope: add 309
Not that anything changed.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/diffoscope/Manifest | 1 +
dev-util/diffoscope/diffoscope-309.ebuild | 143 ++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 1a484714117c..b9338f78b65a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,4 @@
DIST diffoscope-303.tar.bz2 3153646 BLAKE2B
0761db56b0289cef64d8247139ea1ed3e70775aceda0e69c21c36fef62d649f8ffdf3fbf6eefeb3917052861b202598e1832e01969ed861758c53827b9faaa47
SHA512
725775417f58ab8f47960c7edb73c4f1d4c730afd8ca5a4ff9636e37640d2e6ec089a4e482d83a0232e42c2d4264c52d921781b8104b8c20157669e65eea78f9
DIST diffoscope-306.tar.bz2 3154052 BLAKE2B
eda650b7c9a253792e30f132f9b9b54eb0bb56be569cfc22c09e4858bdd5f0f466d6148bb92311eef7af4fd02054a0714914380c0c530fb133e240c3876c5107
SHA512
d29c7aef084d075a2a4a9f8aa738dfb230b277609804341fb3245310a43bedb2e4f0e2cd6b9d9470716fe2de7e4e7a1463ec7b98aac802d069fef91d0c32bfc8
DIST diffoscope-308.tar.bz2 3153203 BLAKE2B
f680d6baf8d3172c87b4b1f68757a20a32d98f46ad5f1f26b97f47dd9d71d1ab73fed9beb3ea2e801f08b0c18333e616fdf69304431cb3ad6d3139244b0c1ec5
SHA512
05d9c4cdee081a48f7c2acef444401ccbbbe6b37874eb9182a660a267e9d4b92f3bf45fde66a02037b1cffb0ddd297b36a5768fab3ce7c231e81f4b6231cc292
+DIST diffoscope-309.tar.bz2 3153219 BLAKE2B
fc5089e914d1a1a1eb8507a7b696a0d4331c3c7e11c31e5ad19a3128310d817ae1612670a5b4e6636b65b6e221c4f097d5d4f878941d725dbe33639c1e751eb1
SHA512
ef254966348fb9e78cbb1926160b27bf61e5ddc501a4ac174914b0101b246b0574012b0b23e8ca9ca0a58c2a51eff7bf97a5fa343eae9763bf5b72f6729a8062
diff --git a/dev-util/diffoscope/diffoscope-309.ebuild
b/dev-util/diffoscope/diffoscope-309.ebuild
new file mode 100644
index 000000000000..fe95eb4abf68
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-309.ebuild
@@ -0,0 +1,143 @@
+# 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_{12..14} )
+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/7zip-24.09[symlink(+)]
+ 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
+}
