1 |
commit: 4ab7884d4cb2e86a16045291c56ec3435e94b453 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 22:22:44 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 22:22:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab7884d |
7 |
|
8 |
dev-util/diffoscope: drop 214, 220 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-util/diffoscope/Manifest | 2 - |
13 |
dev-util/diffoscope/diffoscope-214.ebuild | 108 ----------------------------- |
14 |
dev-util/diffoscope/diffoscope-220.ebuild | 109 ------------------------------ |
15 |
3 files changed, 219 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest |
18 |
index 11c8d12cff19..85a6b8c52131 100644 |
19 |
--- a/dev-util/diffoscope/Manifest |
20 |
+++ b/dev-util/diffoscope/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST diffoscope-214.tar.gz 2710707 BLAKE2B 6acd7fa9c69ad831c6d362b805c2094b2f55d57fa87f69e9e153a99a71c90a67884796696df0d24d6b3c94c0b9a41736292d44208f4d8de4262eaa5f2eec6c90 SHA512 67a9b68ce5f7934747e30e41506d7e30f018673314b777ab86af89e3dd56212c442abe6e246741f7b842b5c58f14006442167cf9089823ba4ef1ba07e78eaaa7 |
23 |
DIST diffoscope-219.tar.gz 2711533 BLAKE2B 1b244a36ca2622244fb1f11f8fc895680bd1d77b544421e5e2c3662294fdf8e7efe3b67e370a83089c180f3c8563562847cc8b09bec85426e1b05f340575b724 SHA512 615b82cbd2b1a8bcdfae4274c051e4be52fb8ea90c5e56b041dd1d8c520c759d09cd4c080b31154257828316f7b4c0ac79cf0b1e09d762271ce01ffde353ee7a |
24 |
-DIST diffoscope-220.tar.gz 3145338 BLAKE2B ecc679184e7138180c354b6ad9b4ec33cc27f818228da7587f4be3f5704ed788426175692f56e52fc5889690b1b8ee75690ddbf14113ad7c5336b0ceee6f9ac2 SHA512 fd7a30f30b7f67ae92650afb42684f71de3bc9e34c93534830445a608f772290865e0d494492563641dc4721433705be3f642c0085846dfaced3fe4dce9c534b |
25 |
DIST diffoscope-221.tar.gz 3145331 BLAKE2B 76369a7719f9a256ca61cc097bc439c5ef267370b78b5e25c466f351fc262b6a9a18f2f82d88ae86fd382a11900c4350ff79c6217c53df42ad56706ee58fa42b SHA512 145390374378f699f7689af0e35897bc9d75cd805722f0db66e689135186eb43def17ec5aac4adf8f7e0045cbddec8a31dc5c8b68eb4e7b0d3bd1f0661f26416 |
26 |
|
27 |
diff --git a/dev-util/diffoscope/diffoscope-214.ebuild b/dev-util/diffoscope/diffoscope-214.ebuild |
28 |
deleted file mode 100644 |
29 |
index 924c2702c182..000000000000 |
30 |
--- a/dev-util/diffoscope/diffoscope-214.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,108 +0,0 @@ |
33 |
-# Copyright 2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=8 |
37 |
- |
38 |
-DISTUTILS_USE_PEP517=setuptools |
39 |
-PYTHON_COMPAT=( python3_{8..10} ) |
40 |
-PYTHON_REQ_USE="ncurses" |
41 |
-inherit distutils-r1 |
42 |
- |
43 |
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different" |
44 |
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" |
45 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-3+" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" |
50 |
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file |
51 |
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma |
52 |
-mono opendocument pascal pdf postscript R rpm sqlite squashfs |
53 |
-ssh tar test tcpdump zip zlib zstd" |
54 |
- |
55 |
-RESTRICT="!test? ( test )" |
56 |
- |
57 |
-# pull in optional tools for tests: |
58 |
-# img2txt: bug #797688 |
59 |
-# docx2txt: bug #797688 |
60 |
-BDEPEND="test? ( |
61 |
- app-text/docx2txt |
62 |
- media-libs/libcaca |
63 |
- virtual/imagemagick-tools[jpeg] |
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 |
-EPYTEST_DESELECT=( |
116 |
- # Test seems to use different tarball |
117 |
- tests/test_presenters.py::test_text_proper_indentation |
118 |
- |
119 |
- # Needs triage |
120 |
- tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found |
121 |
- tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode |
122 |
- |
123 |
- # img2txt based failures, bug #797688 |
124 |
- tests/comparators/test_ico_image.py::test_diff |
125 |
- tests/comparators/test_ico_image.py::test_diff_meta |
126 |
- tests/comparators/test_ico_image.py::test_diff_meta2 |
127 |
- tests/comparators/test_ico_image.py::test_has_visuals |
128 |
- tests/comparators/test_jpeg_image.py::test_diff |
129 |
- tests/comparators/test_jpeg_image.py::test_compare_non_existing |
130 |
- tests/comparators/test_jpeg_image.py::test_diff_meta |
131 |
- tests/comparators/test_jpeg_image.py::test_has_visuals |
132 |
- |
133 |
- # docx2txt based falures, bug #797688 |
134 |
- tests/comparators/test_docx.py::test_diff |
135 |
- |
136 |
- # Formatting |
137 |
- tests/test_source.py::test_code_is_black_clean |
138 |
-) |
139 |
- |
140 |
-distutils_enable_tests pytest |
141 |
|
142 |
diff --git a/dev-util/diffoscope/diffoscope-220.ebuild b/dev-util/diffoscope/diffoscope-220.ebuild |
143 |
deleted file mode 100644 |
144 |
index 177ba73b1c19..000000000000 |
145 |
--- a/dev-util/diffoscope/diffoscope-220.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,109 +0,0 @@ |
148 |
-# Copyright 2022 Gentoo Authors |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=8 |
152 |
- |
153 |
-DISTUTILS_USE_PEP517=setuptools |
154 |
-PYTHON_COMPAT=( python3_{8..10} ) |
155 |
-PYTHON_REQ_USE="ncurses" |
156 |
-inherit distutils-r1 |
157 |
- |
158 |
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different" |
159 |
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" |
160 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
161 |
- |
162 |
-LICENSE="GPL-3+" |
163 |
-SLOT="0" |
164 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
165 |
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file |
166 |
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma |
167 |
-mono opendocument pascal pdf postscript R rpm sqlite squashfs |
168 |
-ssh tar test tcpdump zip zlib zstd" |
169 |
- |
170 |
-RESTRICT="!test? ( test )" |
171 |
- |
172 |
-# pull in optional tools for tests: |
173 |
-# img2txt: bug #797688 |
174 |
-# docx2txt: bug #797688 |
175 |
-BDEPEND="test? ( |
176 |
- app-text/docx2txt |
177 |
- media-libs/libcaca |
178 |
- virtual/imagemagick-tools[jpeg] |
179 |
- )" |
180 |
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] |
181 |
- dev-python/libarchive-c[${PYTHON_USEDEP}] |
182 |
- dev-python/distro[${PYTHON_USEDEP}] |
183 |
- dev-python/tlsh[${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 |