commit:     94dd6c8a03bdd60926112d1fb74672ea87940b76
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 08:28:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 08:28:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94dd6c8a

dev-util/diffoscope: add 242

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffoscope/Manifest              |   1 +
 dev-util/diffoscope/diffoscope-242.ebuild | 120 ++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 98a6a606f1df..2d45f981a344 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,4 @@
 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

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

Reply via email to