From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 54C83138206 for ; Sat, 31 Jul 2021 04:06:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D9BBE0885; Sat, 31 Jul 2021 04:06:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9825E0885 for ; Sat, 31 Jul 2021 04:06:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CF85343197 for ; Sat, 31 Jul 2021 04:06:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79445581 for ; Sat, 31 Jul 2021 04:06:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1627703650.f992d7bef362ca5718a39664644c6efc1d0db67a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/diffoscope/Manifest dev-util/diffoscope/diffoscope-179.ebuild X-VCS-Directories: dev-util/diffoscope/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f992d7bef362ca5718a39664644c6efc1d0db67a X-VCS-Branch: master Date: Sat, 31 Jul 2021 04:06:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a715c3b-e57c-42c4-9d96-ea02f617bd37 X-Archives-Hash: 69790d62d1258906b797b724f753bc92 commit: f992d7bef362ca5718a39664644c6efc1d0db67a Author: Sam James gentoo org> AuthorDate: Sat Jul 31 03:30:25 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 31 03:54:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f992d7be dev-util/diffoscope: add 179 Signed-off-by: Sam James gentoo.org> dev-util/diffoscope/Manifest | 1 + dev-util/diffoscope/diffoscope-179.ebuild | 113 ++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 00f2659e4e7..833b2088227 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,2 +1,3 @@ DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811 DIST diffoscope-178.tar.gz 1600094 BLAKE2B b40e45748be56e49736a826decfb3a8c3ebd91983755719f2665733ceb6ec4e860265c33b5a3c15bc501abe4efdbecbdf177431bbbc79f1ad758c7deef83e1ae SHA512 706c95f5c04cfe081fed7e3e5ed73579949c948b15eaf0f984fc7d406b74007859f7946c44e4ca13e1210b105ed65ea68fd1f03452a50f161ed27f996f4f2540 +DIST diffoscope-179.tar.gz 1600145 BLAKE2B 64b7db8ad53980b80b3c563797736032a235d82b57dfb31496cfbd19978734759919482855ac7dadb62573f950294f02987fd9525b00886e56060450df390915 SHA512 7c3a73097bda2fd55414e52f557707afd08728c73305b55dc9482aff092a65c9bef33913c5e715ff6257aec6cc67095abfec3e8e23f002d43bf9e77e0d565154 diff --git a/dev-util/diffoscope/diffoscope-179.ebuild b/dev-util/diffoscope/diffoscope-179.ebuild new file mode 100644 index 00000000000..ee2bed80f61 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-179.ebuild @@ -0,0 +1,113 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_REQ_USE="ncurses" +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +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 )" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + app-text/docx2txt + media-libs/libcaca + ) +" +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${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/PyPDF2[${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 if filemagic's magic.py breaks imports +# of dev-python/python-magic: https://bugs.gentoo.org/716482 +RDEPEND+=" !dev-python/filemagic" + +distutils_enable_tests pytest + +python_test() { + local exclude=( + # 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 + + # needs triage + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + + # 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 + ) + epytest ${exclude[@]/#/--deselect } +}