Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/
Date: Sat, 31 Jul 2021 04:06:10
Message-Id: 1627703650.f992d7bef362ca5718a39664644c6efc1d0db67a.sam@gentoo
1 commit: f992d7bef362ca5718a39664644c6efc1d0db67a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 31 03:30:25 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 31 03:54:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f992d7be
7
8 dev-util/diffoscope: add 179
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/diffoscope/Manifest | 1 +
13 dev-util/diffoscope/diffoscope-179.ebuild | 113 ++++++++++++++++++++++++++++++
14 2 files changed, 114 insertions(+)
15
16 diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
17 index 00f2659e4e7..833b2088227 100644
18 --- a/dev-util/diffoscope/Manifest
19 +++ b/dev-util/diffoscope/Manifest
20 @@ -1,2 +1,3 @@
21 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
22 DIST diffoscope-178.tar.gz 1600094 BLAKE2B b40e45748be56e49736a826decfb3a8c3ebd91983755719f2665733ceb6ec4e860265c33b5a3c15bc501abe4efdbecbdf177431bbbc79f1ad758c7deef83e1ae SHA512 706c95f5c04cfe081fed7e3e5ed73579949c948b15eaf0f984fc7d406b74007859f7946c44e4ca13e1210b105ed65ea68fd1f03452a50f161ed27f996f4f2540
23 +DIST diffoscope-179.tar.gz 1600145 BLAKE2B 64b7db8ad53980b80b3c563797736032a235d82b57dfb31496cfbd19978734759919482855ac7dadb62573f950294f02987fd9525b00886e56060450df390915 SHA512 7c3a73097bda2fd55414e52f557707afd08728c73305b55dc9482aff092a65c9bef33913c5e715ff6257aec6cc67095abfec3e8e23f002d43bf9e77e0d565154
24
25 diff --git a/dev-util/diffoscope/diffoscope-179.ebuild b/dev-util/diffoscope/diffoscope-179.ebuild
26 new file mode 100644
27 index 00000000000..ee2bed80f61
28 --- /dev/null
29 +++ b/dev-util/diffoscope/diffoscope-179.ebuild
30 @@ -0,0 +1,113 @@
31 +# Copyright 2021 Gentoo Authors
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI=8
35 +
36 +PYTHON_COMPAT=( python3_{8,9,10} )
37 +PYTHON_REQ_USE="ncurses"
38 +DISTUTILS_USE_SETUPTOOLS=rdepend
39 +
40 +inherit distutils-r1
41 +
42 +DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
43 +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
44 +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
45 +
46 +LICENSE="GPL-3+"
47 +SLOT="0"
48 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
49 +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
50 +find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
51 +mono opendocument pascal pdf postscript R rpm sqlite squashfs
52 +ssh tar test tcpdump zip zlib zstd"
53 +
54 +RESTRICT="!test? ( test )"
55 +
56 +# pull in optional tools for tests:
57 +# img2txt: bug #797688
58 +# docx2txt: bug #797688
59 +DEPEND="
60 + dev-python/setuptools[${PYTHON_USEDEP}]
61 + test? (
62 + app-text/docx2txt
63 + media-libs/libcaca
64 + )
65 +"
66 +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
67 + dev-python/libarchive-c[${PYTHON_USEDEP}]
68 + dev-python/distro[${PYTHON_USEDEP}]
69 + acl? ( sys-apps/acl )
70 + binutils? ( sys-devel/binutils )
71 + bzip2? ( app-arch/bzip2 )
72 + libcaca? ( media-libs/libcaca )
73 + colord? ( x11-misc/colord )
74 + cpio? ( app-arch/cpio )
75 + diff? ( sys-apps/diffutils )
76 + docx? ( app-text/docx2txt )
77 + dtc? ( sys-apps/dtc )
78 + e2fsprogs? ( sys-fs/e2fsprogs )
79 + file? ( sys-apps/file )
80 + find? ( sys-apps/findutils )
81 + gettext? ( sys-devel/gettext )
82 + gif? ( media-libs/giflib )
83 + gpg? ( app-crypt/gnupg )
84 + haskell? ( dev-lang/ghc )
85 + hdf5? ( sci-libs/hdf5 )
86 + hex? ( app-editors/vim-core )
87 + imagemagick? ( media-gfx/imagemagick )
88 + iso? ( app-cdr/cdrtools )
89 + java? ( virtual/jdk )
90 + llvm? ( sys-devel/llvm )
91 + lzma? ( app-arch/xz-utils )
92 + mono? ( dev-lang/mono )
93 + opendocument? ( app-text/odt2txt )
94 + pascal? ( dev-lang/fpc )
95 + pdf? (
96 + app-text/pdftk
97 + app-text/poppler
98 + dev-python/PyPDF2[${PYTHON_USEDEP}]
99 + )
100 + postscript? ( app-text/ghostscript-gpl )
101 + R? ( dev-lang/R )
102 + rpm? ( app-arch/rpm )
103 + sqlite? ( dev-db/sqlite:3 )
104 + squashfs? ( sys-fs/squashfs-tools )
105 + ssh? ( net-misc/openssh )
106 + tar? ( app-arch/tar )
107 + tcpdump? ( net-analyzer/tcpdump )
108 + zip? ( app-arch/unzip )
109 + zlib? ( app-arch/gzip )
110 + zstd? ( app-arch/zstd )
111 +"
112 +# Presence if filemagic's magic.py breaks imports
113 +# of dev-python/python-magic: https://bugs.gentoo.org/716482
114 +RDEPEND+=" !dev-python/filemagic"
115 +
116 +distutils_enable_tests pytest
117 +
118 +python_test() {
119 + local exclude=(
120 + # test seems to use different tarball
121 + tests/test_presenters.py::test_text_proper_indentation
122 +
123 + # needs triage
124 + tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
125 +
126 + # needs triage
127 + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
128 +
129 + # img2txt based failures, bug #797688
130 + tests/comparators/test_ico_image.py::test_diff
131 + tests/comparators/test_ico_image.py::test_diff_meta
132 + tests/comparators/test_ico_image.py::test_diff_meta2
133 + tests/comparators/test_ico_image.py::test_has_visuals
134 + tests/comparators/test_jpeg_image.py::test_diff
135 + tests/comparators/test_jpeg_image.py::test_compare_non_existing
136 + tests/comparators/test_jpeg_image.py::test_diff_meta
137 + tests/comparators/test_jpeg_image.py::test_has_visuals
138 +
139 + # docx2txt based falures, bug #797688
140 + tests/comparators/test_docx.py::test_diff
141 + )
142 + epytest ${exclude[@]/#/--deselect }
143 +}