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, 18 Sep 2021 03:01:26
Message-Id: 1631934066.ffd9b95998f734a79fbe20c01224019672951929.sam@gentoo
1 commit: ffd9b95998f734a79fbe20c01224019672951929
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 03:01:06 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 18 03:01:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd9b959
7
8 dev-util/diffoscope: drop 181, 182, 183
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/diffoscope/Manifest | 3 -
13 dev-util/diffoscope/diffoscope-181.ebuild | 112 ------------------------------
14 dev-util/diffoscope/diffoscope-182.ebuild | 112 ------------------------------
15 dev-util/diffoscope/diffoscope-183.ebuild | 112 ------------------------------
16 4 files changed, 339 deletions(-)
17
18 diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
19 index f36084b5954..1af836698e9 100644
20 --- a/dev-util/diffoscope/Manifest
21 +++ b/dev-util/diffoscope/Manifest
22 @@ -1,6 +1,3 @@
23 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
24 DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4
25 -DIST diffoscope-181.tar.gz 1602420 BLAKE2B ae5f40b7a687c6425444df816b0583e50a0c86a4c31b44034a365c18e448765587a093794d3aab930b979706655a661a3cd8b398e34604c7f3e556a9f918406d SHA512 de4132b936ce6c79e333ab5c835f4dfe30951fc91b70848f9ecc91cb5323b81a47fa25a6cec562cfd3d059d96809bd85dbe1b37971fffdc15303ac504514759a
26 -DIST diffoscope-182.tar.gz 1602751 BLAKE2B 0039dd91d5f6653cd2addb0193d9070e53fd785ace64ca11a2ffe80078ff07a43deba6ee4c16f29d9152d18130fc793a48086fba48ce0d60861f0bf71d1c375e SHA512 86333b443c18e6ec809742707d7242deb4977a20e2d864a873519120fb0fe0504a3198cc0f2ff66d6101182bdfd998a96a260a75da710c3ef43a1220c7126897
27 -DIST diffoscope-183.tar.gz 1603189 BLAKE2B ccfacfe7fb2dc8259328360378cb88976124ec793a1aebf7e8512da4d2b4869e89a4941c2e8adfc49dbe6a2c26afc3444de63b5a598f2c9fbc455f74adca6b37 SHA512 868c3cd13e49505a18487d9084c4e560665cd3253091f68c454fccc0e560fe189c875628a1a1064d2cb988afe66a44de2863c55a9e19459de032923572673e38
28 DIST diffoscope-184.tar.gz 2684969 BLAKE2B 8b7fd3e4e85f372f2c45cd1f9ed82d5c6c2771044535063398e23b94a069c73d4fbc89fe0fa7393ea188a107cd4912d189a3566cc0701b1f3253761480b40080 SHA512 ae4f1e929ada57706b8ed28b03be264fb65e6b1692da9e212bf60ac40a56fb5f488bb5dd162d3436e832ba245edd0a7383f794ce38541cb4295d10f2cc1de50e
29
30 diff --git a/dev-util/diffoscope/diffoscope-181.ebuild b/dev-util/diffoscope/diffoscope-181.ebuild
31 deleted file mode 100644
32 index 086eecc9529..00000000000
33 --- a/dev-util/diffoscope/diffoscope-181.ebuild
34 +++ /dev/null
35 @@ -1,112 +0,0 @@
36 -# Copyright 2021 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=8
40 -
41 -PYTHON_COMPAT=( python3_{8,9,10} )
42 -PYTHON_REQ_USE="ncurses"
43 -
44 -inherit distutils-r1
45 -
46 -DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
47 -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
48 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
49 -
50 -LICENSE="GPL-3+"
51 -SLOT="0"
52 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
53 -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
54 -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
55 -mono opendocument pascal pdf postscript R rpm sqlite squashfs
56 -ssh tar test tcpdump zip zlib zstd"
57 -
58 -RESTRICT="!test? ( test )"
59 -
60 -# pull in optional tools for tests:
61 -# img2txt: bug #797688
62 -# docx2txt: bug #797688
63 -DEPEND="
64 - dev-python/setuptools[${PYTHON_USEDEP}]
65 - test? (
66 - app-text/docx2txt
67 - media-libs/libcaca
68 - )
69 -"
70 -RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
71 - dev-python/libarchive-c[${PYTHON_USEDEP}]
72 - dev-python/distro[${PYTHON_USEDEP}]
73 - acl? ( sys-apps/acl )
74 - binutils? ( sys-devel/binutils )
75 - bzip2? ( app-arch/bzip2 )
76 - libcaca? ( media-libs/libcaca )
77 - colord? ( x11-misc/colord )
78 - cpio? ( app-arch/cpio )
79 - diff? ( sys-apps/diffutils )
80 - docx? ( app-text/docx2txt )
81 - dtc? ( sys-apps/dtc )
82 - e2fsprogs? ( sys-fs/e2fsprogs )
83 - file? ( sys-apps/file )
84 - find? ( sys-apps/findutils )
85 - gettext? ( sys-devel/gettext )
86 - gif? ( media-libs/giflib )
87 - gpg? ( app-crypt/gnupg )
88 - haskell? ( dev-lang/ghc )
89 - hdf5? ( sci-libs/hdf5 )
90 - hex? ( app-editors/vim-core )
91 - imagemagick? ( media-gfx/imagemagick )
92 - iso? ( app-cdr/cdrtools )
93 - java? ( virtual/jdk )
94 - llvm? ( sys-devel/llvm )
95 - lzma? ( app-arch/xz-utils )
96 - mono? ( dev-lang/mono )
97 - opendocument? ( app-text/odt2txt )
98 - pascal? ( dev-lang/fpc )
99 - pdf? (
100 - app-text/pdftk
101 - app-text/poppler
102 - dev-python/PyPDF2[${PYTHON_USEDEP}]
103 - )
104 - postscript? ( app-text/ghostscript-gpl )
105 - R? ( dev-lang/R )
106 - rpm? ( app-arch/rpm )
107 - sqlite? ( dev-db/sqlite:3 )
108 - squashfs? ( sys-fs/squashfs-tools )
109 - ssh? ( net-misc/openssh )
110 - tar? ( app-arch/tar )
111 - tcpdump? ( net-analyzer/tcpdump )
112 - zip? ( app-arch/unzip )
113 - zlib? ( app-arch/gzip )
114 - zstd? ( app-arch/zstd )
115 -"
116 -# Presence if filemagic's magic.py breaks imports
117 -# of dev-python/python-magic: https://bugs.gentoo.org/716482
118 -RDEPEND+=" !dev-python/filemagic"
119 -
120 -distutils_enable_tests pytest
121 -
122 -python_test() {
123 - local exclude=(
124 - # test seems to use different tarball
125 - tests/test_presenters.py::test_text_proper_indentation
126 -
127 - # needs triage
128 - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
129 -
130 - # needs triage
131 - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
132 -
133 - # img2txt based failures, bug #797688
134 - tests/comparators/test_ico_image.py::test_diff
135 - tests/comparators/test_ico_image.py::test_diff_meta
136 - tests/comparators/test_ico_image.py::test_diff_meta2
137 - tests/comparators/test_ico_image.py::test_has_visuals
138 - tests/comparators/test_jpeg_image.py::test_diff
139 - tests/comparators/test_jpeg_image.py::test_compare_non_existing
140 - tests/comparators/test_jpeg_image.py::test_diff_meta
141 - tests/comparators/test_jpeg_image.py::test_has_visuals
142 -
143 - # docx2txt based falures, bug #797688
144 - tests/comparators/test_docx.py::test_diff
145 - )
146 - epytest ${exclude[@]/#/--deselect }
147 -}
148
149 diff --git a/dev-util/diffoscope/diffoscope-182.ebuild b/dev-util/diffoscope/diffoscope-182.ebuild
150 deleted file mode 100644
151 index 086eecc9529..00000000000
152 --- a/dev-util/diffoscope/diffoscope-182.ebuild
153 +++ /dev/null
154 @@ -1,112 +0,0 @@
155 -# Copyright 2021 Gentoo Authors
156 -# Distributed under the terms of the GNU General Public License v2
157 -
158 -EAPI=8
159 -
160 -PYTHON_COMPAT=( python3_{8,9,10} )
161 -PYTHON_REQ_USE="ncurses"
162 -
163 -inherit distutils-r1
164 -
165 -DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
166 -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
167 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
168 -
169 -LICENSE="GPL-3+"
170 -SLOT="0"
171 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
172 -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
173 -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
174 -mono opendocument pascal pdf postscript R rpm sqlite squashfs
175 -ssh tar test tcpdump zip zlib zstd"
176 -
177 -RESTRICT="!test? ( test )"
178 -
179 -# pull in optional tools for tests:
180 -# img2txt: bug #797688
181 -# docx2txt: bug #797688
182 -DEPEND="
183 - dev-python/setuptools[${PYTHON_USEDEP}]
184 - test? (
185 - app-text/docx2txt
186 - media-libs/libcaca
187 - )
188 -"
189 -RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
190 - dev-python/libarchive-c[${PYTHON_USEDEP}]
191 - dev-python/distro[${PYTHON_USEDEP}]
192 - acl? ( sys-apps/acl )
193 - binutils? ( sys-devel/binutils )
194 - bzip2? ( app-arch/bzip2 )
195 - libcaca? ( media-libs/libcaca )
196 - colord? ( x11-misc/colord )
197 - cpio? ( app-arch/cpio )
198 - diff? ( sys-apps/diffutils )
199 - docx? ( app-text/docx2txt )
200 - dtc? ( sys-apps/dtc )
201 - e2fsprogs? ( sys-fs/e2fsprogs )
202 - file? ( sys-apps/file )
203 - find? ( sys-apps/findutils )
204 - gettext? ( sys-devel/gettext )
205 - gif? ( media-libs/giflib )
206 - gpg? ( app-crypt/gnupg )
207 - haskell? ( dev-lang/ghc )
208 - hdf5? ( sci-libs/hdf5 )
209 - hex? ( app-editors/vim-core )
210 - imagemagick? ( media-gfx/imagemagick )
211 - iso? ( app-cdr/cdrtools )
212 - java? ( virtual/jdk )
213 - llvm? ( sys-devel/llvm )
214 - lzma? ( app-arch/xz-utils )
215 - mono? ( dev-lang/mono )
216 - opendocument? ( app-text/odt2txt )
217 - pascal? ( dev-lang/fpc )
218 - pdf? (
219 - app-text/pdftk
220 - app-text/poppler
221 - dev-python/PyPDF2[${PYTHON_USEDEP}]
222 - )
223 - postscript? ( app-text/ghostscript-gpl )
224 - R? ( dev-lang/R )
225 - rpm? ( app-arch/rpm )
226 - sqlite? ( dev-db/sqlite:3 )
227 - squashfs? ( sys-fs/squashfs-tools )
228 - ssh? ( net-misc/openssh )
229 - tar? ( app-arch/tar )
230 - tcpdump? ( net-analyzer/tcpdump )
231 - zip? ( app-arch/unzip )
232 - zlib? ( app-arch/gzip )
233 - zstd? ( app-arch/zstd )
234 -"
235 -# Presence if filemagic's magic.py breaks imports
236 -# of dev-python/python-magic: https://bugs.gentoo.org/716482
237 -RDEPEND+=" !dev-python/filemagic"
238 -
239 -distutils_enable_tests pytest
240 -
241 -python_test() {
242 - local exclude=(
243 - # test seems to use different tarball
244 - tests/test_presenters.py::test_text_proper_indentation
245 -
246 - # needs triage
247 - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
248 -
249 - # needs triage
250 - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
251 -
252 - # img2txt based failures, bug #797688
253 - tests/comparators/test_ico_image.py::test_diff
254 - tests/comparators/test_ico_image.py::test_diff_meta
255 - tests/comparators/test_ico_image.py::test_diff_meta2
256 - tests/comparators/test_ico_image.py::test_has_visuals
257 - tests/comparators/test_jpeg_image.py::test_diff
258 - tests/comparators/test_jpeg_image.py::test_compare_non_existing
259 - tests/comparators/test_jpeg_image.py::test_diff_meta
260 - tests/comparators/test_jpeg_image.py::test_has_visuals
261 -
262 - # docx2txt based falures, bug #797688
263 - tests/comparators/test_docx.py::test_diff
264 - )
265 - epytest ${exclude[@]/#/--deselect }
266 -}
267
268 diff --git a/dev-util/diffoscope/diffoscope-183.ebuild b/dev-util/diffoscope/diffoscope-183.ebuild
269 deleted file mode 100644
270 index 086eecc9529..00000000000
271 --- a/dev-util/diffoscope/diffoscope-183.ebuild
272 +++ /dev/null
273 @@ -1,112 +0,0 @@
274 -# Copyright 2021 Gentoo Authors
275 -# Distributed under the terms of the GNU General Public License v2
276 -
277 -EAPI=8
278 -
279 -PYTHON_COMPAT=( python3_{8,9,10} )
280 -PYTHON_REQ_USE="ncurses"
281 -
282 -inherit distutils-r1
283 -
284 -DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
285 -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
286 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
287 -
288 -LICENSE="GPL-3+"
289 -SLOT="0"
290 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
291 -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
292 -find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
293 -mono opendocument pascal pdf postscript R rpm sqlite squashfs
294 -ssh tar test tcpdump zip zlib zstd"
295 -
296 -RESTRICT="!test? ( test )"
297 -
298 -# pull in optional tools for tests:
299 -# img2txt: bug #797688
300 -# docx2txt: bug #797688
301 -DEPEND="
302 - dev-python/setuptools[${PYTHON_USEDEP}]
303 - test? (
304 - app-text/docx2txt
305 - media-libs/libcaca
306 - )
307 -"
308 -RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
309 - dev-python/libarchive-c[${PYTHON_USEDEP}]
310 - dev-python/distro[${PYTHON_USEDEP}]
311 - acl? ( sys-apps/acl )
312 - binutils? ( sys-devel/binutils )
313 - bzip2? ( app-arch/bzip2 )
314 - libcaca? ( media-libs/libcaca )
315 - colord? ( x11-misc/colord )
316 - cpio? ( app-arch/cpio )
317 - diff? ( sys-apps/diffutils )
318 - docx? ( app-text/docx2txt )
319 - dtc? ( sys-apps/dtc )
320 - e2fsprogs? ( sys-fs/e2fsprogs )
321 - file? ( sys-apps/file )
322 - find? ( sys-apps/findutils )
323 - gettext? ( sys-devel/gettext )
324 - gif? ( media-libs/giflib )
325 - gpg? ( app-crypt/gnupg )
326 - haskell? ( dev-lang/ghc )
327 - hdf5? ( sci-libs/hdf5 )
328 - hex? ( app-editors/vim-core )
329 - imagemagick? ( media-gfx/imagemagick )
330 - iso? ( app-cdr/cdrtools )
331 - java? ( virtual/jdk )
332 - llvm? ( sys-devel/llvm )
333 - lzma? ( app-arch/xz-utils )
334 - mono? ( dev-lang/mono )
335 - opendocument? ( app-text/odt2txt )
336 - pascal? ( dev-lang/fpc )
337 - pdf? (
338 - app-text/pdftk
339 - app-text/poppler
340 - dev-python/PyPDF2[${PYTHON_USEDEP}]
341 - )
342 - postscript? ( app-text/ghostscript-gpl )
343 - R? ( dev-lang/R )
344 - rpm? ( app-arch/rpm )
345 - sqlite? ( dev-db/sqlite:3 )
346 - squashfs? ( sys-fs/squashfs-tools )
347 - ssh? ( net-misc/openssh )
348 - tar? ( app-arch/tar )
349 - tcpdump? ( net-analyzer/tcpdump )
350 - zip? ( app-arch/unzip )
351 - zlib? ( app-arch/gzip )
352 - zstd? ( app-arch/zstd )
353 -"
354 -# Presence if filemagic's magic.py breaks imports
355 -# of dev-python/python-magic: https://bugs.gentoo.org/716482
356 -RDEPEND+=" !dev-python/filemagic"
357 -
358 -distutils_enable_tests pytest
359 -
360 -python_test() {
361 - local exclude=(
362 - # test seems to use different tarball
363 - tests/test_presenters.py::test_text_proper_indentation
364 -
365 - # needs triage
366 - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
367 -
368 - # needs triage
369 - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
370 -
371 - # img2txt based failures, bug #797688
372 - tests/comparators/test_ico_image.py::test_diff
373 - tests/comparators/test_ico_image.py::test_diff_meta
374 - tests/comparators/test_ico_image.py::test_diff_meta2
375 - tests/comparators/test_ico_image.py::test_has_visuals
376 - tests/comparators/test_jpeg_image.py::test_diff
377 - tests/comparators/test_jpeg_image.py::test_compare_non_existing
378 - tests/comparators/test_jpeg_image.py::test_diff_meta
379 - tests/comparators/test_jpeg_image.py::test_has_visuals
380 -
381 - # docx2txt based falures, bug #797688
382 - tests/comparators/test_docx.py::test_diff
383 - )
384 - epytest ${exclude[@]/#/--deselect }
385 -}