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