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