diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/Manifest.gz | bin | 70550 -> 70551 bytes | |||
| -rw-r--r-- | dev-util/diffoscope/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/diffoscope/diffoscope-253-r1.ebuild (renamed from dev-util/diffoscope/diffoscope-253.ebuild) | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex 2183314c3de1..c2813fddb10b 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index 19f0c3d070f3..ae755966658b 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -7,5 +7,5 @@ EBUILD diffoscope-247.ebuild 4035 BLAKE2B 95aac565c6f708ea5738484b9e1e272eff126c EBUILD diffoscope-250.ebuild 4036 BLAKE2B b997b6c76b2783d696d5f57c36a4d33733033ab5f9d8b3a6387adf1dd23e2df6fa773d61e91fa56dac6225bb2c9ead0c69d26fa540bd6bca2dc1337ce16d5383 SHA512 4f2f5617dc12c7ad7c6fc7d24fd6aafba15f75a21a2e55a0abc2b5aa8eadf6f03e5875c519dfb676200704fb3dda0e2b4039888a844ceba91923d1b15e26bc69 EBUILD diffoscope-251.ebuild 4036 BLAKE2B b997b6c76b2783d696d5f57c36a4d33733033ab5f9d8b3a6387adf1dd23e2df6fa773d61e91fa56dac6225bb2c9ead0c69d26fa540bd6bca2dc1337ce16d5383 SHA512 4f2f5617dc12c7ad7c6fc7d24fd6aafba15f75a21a2e55a0abc2b5aa8eadf6f03e5875c519dfb676200704fb3dda0e2b4039888a844ceba91923d1b15e26bc69 EBUILD diffoscope-252.ebuild 4036 BLAKE2B b997b6c76b2783d696d5f57c36a4d33733033ab5f9d8b3a6387adf1dd23e2df6fa773d61e91fa56dac6225bb2c9ead0c69d26fa540bd6bca2dc1337ce16d5383 SHA512 4f2f5617dc12c7ad7c6fc7d24fd6aafba15f75a21a2e55a0abc2b5aa8eadf6f03e5875c519dfb676200704fb3dda0e2b4039888a844ceba91923d1b15e26bc69 -EBUILD diffoscope-253.ebuild 3749 BLAKE2B a3f3107ee86e350e386451bb6f58c32c1b5efdd3f3262788dcf42a3a8d70066c3fbb573bb6bcc1368f2787a2bb19262d92a20c7893078cb9981721d960c4bf60 SHA512 653904f1bf3dc4a0b4f397033184062d65e9d15264ea9f0194843db9a6c89d81b452c6705c083f7214f138c04983e1004dc7b510306873ce721f17f4ce3f34d9 +EBUILD diffoscope-253-r1.ebuild 3674 BLAKE2B 7916dd7a87101fc97ce207e5558656795492ed53860614e60800c354a2da209229d8bd3f471ac1d8f176a43ce80a1383d0ac4ed149b78a9375ac8da4882add42 SHA512 1692dfcd7f03834a086f4a5656fd1ca1c1435d68ef5e2a9967f4b5bf06ae9fdc1d4009c95e36ab297df3374a7c82f6f16795c939a01b1d420aee66f8002008eb MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5 diff --git a/dev-util/diffoscope/diffoscope-253.ebuild b/dev-util/diffoscope/diffoscope-253-r1.ebuild index d3eab7ae5279..5db2f28b4041 100644 --- a/dev-util/diffoscope/diffoscope-253.ebuild +++ b/dev-util/diffoscope/diffoscope-253-r1.ebuild @@ -24,7 +24,10 @@ ssh tar test tcpdump zip zlib zstd" RESTRICT="!test? ( test )" RDEPEND=" - dev-python/python-magic[${PYTHON_USEDEP}] + || ( + dev-python/python-magic[${PYTHON_USEDEP}] + sys-apps/file[python,${PYTHON_USEDEP}] + ) dev-python/libarchive-c[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/tlsh[${PYTHON_USEDEP}] @@ -71,9 +74,6 @@ RDEPEND=" zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) " -# Presence of filemagic's magic.py breaks imports -# of dev-python/python-magic: bug #716482 -RDEPEND+=" !dev-python/filemagic" # pull in optional tools for tests: # img2txt: bug #797688 |