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, 29 Jan 2022 06:15:21
Message-Id: 1643436879.6d7dd08195ea880e32cae81db9fc0bbda1a85590.sam@gentoo
1 commit: 6d7dd08195ea880e32cae81db9fc0bbda1a85590
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 29 06:14:39 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 06:14:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7dd081
7
8 dev-util/diffoscope: drop 199, 200
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/diffoscope/Manifest | 2 -
13 dev-util/diffoscope/diffoscope-199.ebuild | 108 ------------------------------
14 dev-util/diffoscope/diffoscope-200.ebuild | 108 ------------------------------
15 3 files changed, 218 deletions(-)
16
17 diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
18 index 4c321f99a42f..02b085518f5f 100644
19 --- a/dev-util/diffoscope/Manifest
20 +++ b/dev-util/diffoscope/Manifest
21 @@ -1,5 +1,3 @@
22 DIST diffoscope-197.tar.gz 2705041 BLAKE2B 1d66462d3f1cdbba177d24d194ce14ae51274c6b60139e56724213a6b4fc0b41e6a71f9f2e250ecc7d6330186bf774470b2153801b375ffb63e8390c425e1073 SHA512 d8411ad166738b29caa28abbc10f21e0906b7b19bd5ab644db36c04b1f9c5af9f4cbdb31eb850da7249380a6774bde355f0e815f4d3cdd0df76570df9df7fd0a
23 -DIST diffoscope-199.tar.gz 2705444 BLAKE2B c17752a504cef75d1a9d6f1c0dfdb896abd1ce7dfd5a2494022d4a7b9e098822db80b52e3cd0d4367e28bcc9ad6316746d10cd82df2ac7c24c19d74b3ea0de5d SHA512 e4caa9d5d8d7f1671acecf2f6240cd587bbfd4087eb6e69021303ec3e7bfde15fbd409139b7658eeed64d75f05b3768f1a585640fcfee6bae63ff7d27227e4d0
24 -DIST diffoscope-200.tar.gz 2705536 BLAKE2B c931430a7e8159f135446709866106e4646b087c30d9d3cdf82810e8ac9273075af80d67f19858b71656d73c078478f96083c6d784a7e1bf8af5d620765cde78 SHA512 74317603e8416e2decea4d6fae9c16a5a931986a6fb8660c518e1363f99cbb523d69316be6b19f0a6168622780f4642bd901f376c3d38cfd1a600d9ac1ce1fbb
25 DIST diffoscope-201.tar.gz 2705733 BLAKE2B 97f74633bd990408af9ba33feb38243da22253b1f1c49a23d11cf6cc16197b3a4fdb371f01f310a2a5ee782ae89209c2f80b0956d48b0a5c5308dd6f50aba86f SHA512 a221d656a49b77f08eb884acc8bbabd1e4469ff2411d47532c0326743653b43e45a60e5fb39d841c1b835d896dbe9d08032f51f295f5399af878be18305acd52
26 DIST diffoscope-202.tar.gz 2706185 BLAKE2B 11d77445d9cd4a8b2bba5f8a31a3b9e08862937af3ce3aea993603026483758d1742254629fb7541c751ab1c5213dff892b102bc625ead78fc56ce01e25aefd8 SHA512 f42ea35a492ef62740188986b25f629d4a0d62d1ee1e6d284c4251577170720ca731a7f11f387f64b68f82817f47019b3aaf236d0bb19f4c0a65d4048c5a0266
27
28 diff --git a/dev-util/diffoscope/diffoscope-199.ebuild b/dev-util/diffoscope/diffoscope-199.ebuild
29 deleted file mode 100644
30 index ec72907f21dc..000000000000
31 --- a/dev-util/diffoscope/diffoscope-199.ebuild
32 +++ /dev/null
33 @@ -1,108 +0,0 @@
34 -# Copyright 2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -PYTHON_COMPAT=( python3_{8,9,10} )
40 -PYTHON_REQ_USE="ncurses"
41 -
42 -inherit distutils-r1
43 -
44 -DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
45 -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
46 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
47 -
48 -LICENSE="GPL-3+"
49 -SLOT="0"
50 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
51 -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
52 -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
53 -mono opendocument pascal pdf postscript R rpm sqlite squashfs
54 -ssh tar test tcpdump zip zlib zstd"
55 -
56 -RESTRICT="!test? ( test )"
57 -
58 -# pull in optional tools for tests:
59 -# img2txt: bug #797688
60 -# docx2txt: bug #797688
61 -BDEPEND="test? (
62 - app-text/docx2txt
63 - media-libs/libcaca
64 - virtual/imagemagick-tools[jpeg]
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 -EPYTEST_DESELECT=(
117 - # Test seems to use different tarball
118 - tests/test_presenters.py::test_text_proper_indentation
119 -
120 - # Needs triage
121 - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
122 - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
123 -
124 - # img2txt based failures, bug #797688
125 - tests/comparators/test_ico_image.py::test_diff
126 - tests/comparators/test_ico_image.py::test_diff_meta
127 - tests/comparators/test_ico_image.py::test_diff_meta2
128 - tests/comparators/test_ico_image.py::test_has_visuals
129 - tests/comparators/test_jpeg_image.py::test_diff
130 - tests/comparators/test_jpeg_image.py::test_compare_non_existing
131 - tests/comparators/test_jpeg_image.py::test_diff_meta
132 - tests/comparators/test_jpeg_image.py::test_has_visuals
133 -
134 - # docx2txt based falures, bug #797688
135 - tests/comparators/test_docx.py::test_diff
136 -
137 - # Formatting
138 - tests/test_source.py::test_code_is_black_clean
139 -)
140 -
141 -distutils_enable_tests pytest
142
143 diff --git a/dev-util/diffoscope/diffoscope-200.ebuild b/dev-util/diffoscope/diffoscope-200.ebuild
144 deleted file mode 100644
145 index ec72907f21dc..000000000000
146 --- a/dev-util/diffoscope/diffoscope-200.ebuild
147 +++ /dev/null
148 @@ -1,108 +0,0 @@
149 -# Copyright 2022 Gentoo Authors
150 -# Distributed under the terms of the GNU General Public License v2
151 -
152 -EAPI=8
153 -
154 -PYTHON_COMPAT=( python3_{8,9,10} )
155 -PYTHON_REQ_USE="ncurses"
156 -
157 -inherit distutils-r1
158 -
159 -DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
160 -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
161 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
162 -
163 -LICENSE="GPL-3+"
164 -SLOT="0"
165 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
166 -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
167 -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
168 -mono opendocument pascal pdf postscript R rpm sqlite squashfs
169 -ssh tar test tcpdump zip zlib zstd"
170 -
171 -RESTRICT="!test? ( test )"
172 -
173 -# pull in optional tools for tests:
174 -# img2txt: bug #797688
175 -# docx2txt: bug #797688
176 -BDEPEND="test? (
177 - app-text/docx2txt
178 - media-libs/libcaca
179 - virtual/imagemagick-tools[jpeg]
180 - )"
181 -RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
182 - dev-python/libarchive-c[${PYTHON_USEDEP}]
183 - dev-python/distro[${PYTHON_USEDEP}]
184 - acl? ( sys-apps/acl )
185 - binutils? ( sys-devel/binutils )
186 - bzip2? ( app-arch/bzip2 )
187 - libcaca? ( media-libs/libcaca )
188 - colord? ( x11-misc/colord )
189 - cpio? ( app-arch/cpio )
190 - diff? ( sys-apps/diffutils )
191 - docx? ( app-text/docx2txt )
192 - dtc? ( sys-apps/dtc )
193 - e2fsprogs? ( sys-fs/e2fsprogs )
194 - file? ( sys-apps/file )
195 - find? ( sys-apps/findutils )
196 - gettext? ( sys-devel/gettext )
197 - gif? ( media-libs/giflib )
198 - gpg? ( app-crypt/gnupg )
199 - haskell? ( dev-lang/ghc )
200 - hdf5? ( sci-libs/hdf5 )
201 - hex? ( app-editors/vim-core )
202 - imagemagick? ( media-gfx/imagemagick )
203 - iso? ( app-cdr/cdrtools )
204 - java? ( virtual/jdk )
205 - llvm? ( sys-devel/llvm )
206 - lzma? ( app-arch/xz-utils )
207 - mono? ( dev-lang/mono )
208 - opendocument? ( app-text/odt2txt )
209 - pascal? ( dev-lang/fpc )
210 - pdf? (
211 - app-text/pdftk
212 - app-text/poppler
213 - dev-python/PyPDF2[${PYTHON_USEDEP}]
214 - )
215 - postscript? ( app-text/ghostscript-gpl )
216 - R? ( dev-lang/R )
217 - rpm? ( app-arch/rpm )
218 - sqlite? ( dev-db/sqlite:3 )
219 - squashfs? ( sys-fs/squashfs-tools )
220 - ssh? ( net-misc/openssh )
221 - tar? ( app-arch/tar )
222 - tcpdump? ( net-analyzer/tcpdump )
223 - zip? ( app-arch/unzip )
224 - zlib? ( app-arch/gzip )
225 - zstd? ( app-arch/zstd )
226 -"
227 -# Presence if filemagic's magic.py breaks imports
228 -# of dev-python/python-magic: https://bugs.gentoo.org/716482
229 -RDEPEND+=" !dev-python/filemagic"
230 -
231 -EPYTEST_DESELECT=(
232 - # Test seems to use different tarball
233 - tests/test_presenters.py::test_text_proper_indentation
234 -
235 - # Needs triage
236 - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
237 - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
238 -
239 - # img2txt based failures, bug #797688
240 - tests/comparators/test_ico_image.py::test_diff
241 - tests/comparators/test_ico_image.py::test_diff_meta
242 - tests/comparators/test_ico_image.py::test_diff_meta2
243 - tests/comparators/test_ico_image.py::test_has_visuals
244 - tests/comparators/test_jpeg_image.py::test_diff
245 - tests/comparators/test_jpeg_image.py::test_compare_non_existing
246 - tests/comparators/test_jpeg_image.py::test_diff_meta
247 - tests/comparators/test_jpeg_image.py::test_has_visuals
248 -
249 - # docx2txt based falures, bug #797688
250 - tests/comparators/test_docx.py::test_diff
251 -
252 - # Formatting
253 - tests/test_source.py::test_code_is_black_clean
254 -)
255 -
256 -distutils_enable_tests pytest