diff options
| author |   Eli Schwartz <eschwartz93@gmail.com> | 2023-11-24 10:58:02 -0500 |
|---|---|---|
| committer |   Arthur Zamarin <arthurzam@gentoo.org> | 2023-12-25 21:29:48 +0200 |
| commit | e8f6fb0c78bfcae57adb958997dd5f2d8b04a660 (patch) | |
| tree | a0d182cd0cee5bd860c8dfb9190d7a54c7037556 /dev-util | |
| parent | net-libs/grpc: add 1.60.0 (diff) | |
| download | gentoo-e8f6fb0c78bfcae57adb958997dd5f2d8b04a660.tar.gz gentoo-e8f6fb0c78bfcae57adb958997dd5f2d8b04a660.tar.bz2 gentoo-e8f6fb0c78bfcae57adb958997dd5f2d8b04a660.zip | |
dev-util/diffoscope: allow either "magic" impl for python
Since diffoscope 167 (commit 74c0d3f40efb49cfd78d3592bc87c76211e20570)
it has supported runtime detection of whether file-magic or python-magic
is installed as `import magic`, and supports either one.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34378
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/diffoscope/diffoscope-253-r1.ebuild (renamed from dev-util/diffoscope/diffoscope-253.ebuild) | 8 |
1 files changed, 4 insertions, 4 deletions
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 |