From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C487158015 for ; Mon, 25 Dec 2023 19:30:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6CD22BC019; Mon, 25 Dec 2023 19:30:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B5872BC019 for ; Mon, 25 Dec 2023 19:30:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BB25335DE9 for ; Mon, 25 Dec 2023 19:30:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1ABC979 for ; Mon, 25 Dec 2023 19:30:06 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1703532588.e8f6fb0c78bfcae57adb958997dd5f2d8b04a660.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/diffoscope/diffoscope-253-r1.ebuild dev-util/diffoscope/diffoscope-253.ebuild X-VCS-Directories: dev-util/diffoscope/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: e8f6fb0c78bfcae57adb958997dd5f2d8b04a660 X-VCS-Branch: master Date: Mon, 25 Dec 2023 19:30:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec26d362-d1d4-48c2-bad8-872f822378a9 X-Archives-Hash: daa5b551c274dc9d756ecb98a280749b commit: e8f6fb0c78bfcae57adb958997dd5f2d8b04a660 Author: Eli Schwartz gmail com> AuthorDate: Fri Nov 24 15:58:02 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 25 19:29:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f6fb0c 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34378 Signed-off-by: Arthur Zamarin gentoo.org> .../{diffoscope-253.ebuild => diffoscope-253-r1.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/diffoscope/diffoscope-253.ebuild b/dev-util/diffoscope/diffoscope-253-r1.ebuild similarity index 95% rename from dev-util/diffoscope/diffoscope-253.ebuild rename to 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