From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1537174-garchives=archives.gentoo.org@lists.gentoo.org> 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 BE8B415800A for <garchives@archives.gentoo.org>; Thu, 13 Jul 2023 10:00:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 052F1E08AA; Thu, 13 Jul 2023 10:00:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E0A63E08AA for <gentoo-commits@lists.gentoo.org>; Thu, 13 Jul 2023 10:00:24 +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 F0E8D340BBE for <gentoo-commits@lists.gentoo.org>; Thu, 13 Jul 2023 10:00:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38B10A99 for <gentoo-commits@lists.gentoo.org>; Thu, 13 Jul 2023 10:00:22 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1689242393.ad9d1847d42a26ba04085e3d61cde8e8a4cb8a8e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/diffoscope/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/diffoscope/diffoscope-238-r1.ebuild dev-util/diffoscope/diffoscope-238-r2.ebuild dev-util/diffoscope/diffoscope-242-r1.ebuild dev-util/diffoscope/diffoscope-242-r2.ebuild dev-util/diffoscope/diffoscope-243-r1.ebuild dev-util/diffoscope/diffoscope-243.ebuild X-VCS-Directories: dev-util/diffoscope/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ad9d1847d42a26ba04085e3d61cde8e8a4cb8a8e X-VCS-Branch: master Date: Thu, 13 Jul 2023 10:00:22 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6af34b95-fb6c-48c3-bf24-63597b70926c X-Archives-Hash: eda3cc66c901261a6e82351a5c8f6bc2 commit: ad9d1847d42a26ba04085e3d61cde8e8a4cb8a8e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jul 13 09:59:53 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 13 09:59:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9d1847 dev-util/diffoscope: needs <libarchive-c-5 Bug: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344 Signed-off-by: Sam James <sam <AT> gentoo.org> .../diffoscope/{diffoscope-238-r1.ebuild => diffoscope-238-r2.ebuild} | 3 ++- .../diffoscope/{diffoscope-242-r1.ebuild => diffoscope-242-r2.ebuild} | 3 ++- .../diffoscope/{diffoscope-243.ebuild => diffoscope-243-r1.ebuild} | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-util/diffoscope/diffoscope-238-r1.ebuild b/dev-util/diffoscope/diffoscope-238-r2.ebuild similarity index 96% rename from dev-util/diffoscope/diffoscope-238-r1.ebuild rename to dev-util/diffoscope/diffoscope-238-r2.ebuild index 32c15ca1f544..908ed3aa6de0 100644 --- a/dev-util/diffoscope/diffoscope-238-r1.ebuild +++ b/dev-util/diffoscope/diffoscope-238-r2.ebuild @@ -20,9 +20,10 @@ mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd" RESTRICT="!test? ( test )" +# <libarchive-c-5: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344 RDEPEND=" dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/libarchive-c[${PYTHON_USEDEP}] + <dev-python/libarchive-c-5[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/tlsh[${PYTHON_USEDEP}] acl? ( sys-apps/acl ) diff --git a/dev-util/diffoscope/diffoscope-242-r1.ebuild b/dev-util/diffoscope/diffoscope-242-r2.ebuild similarity index 96% rename from dev-util/diffoscope/diffoscope-242-r1.ebuild rename to dev-util/diffoscope/diffoscope-242-r2.ebuild index 32c15ca1f544..908ed3aa6de0 100644 --- a/dev-util/diffoscope/diffoscope-242-r1.ebuild +++ b/dev-util/diffoscope/diffoscope-242-r2.ebuild @@ -20,9 +20,10 @@ mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd" RESTRICT="!test? ( test )" +# <libarchive-c-5: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344 RDEPEND=" dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/libarchive-c[${PYTHON_USEDEP}] + <dev-python/libarchive-c-5[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/tlsh[${PYTHON_USEDEP}] acl? ( sys-apps/acl ) diff --git a/dev-util/diffoscope/diffoscope-243.ebuild b/dev-util/diffoscope/diffoscope-243-r1.ebuild similarity index 96% rename from dev-util/diffoscope/diffoscope-243.ebuild rename to dev-util/diffoscope/diffoscope-243-r1.ebuild index 8863851fae4f..73d67fbab13b 100644 --- a/dev-util/diffoscope/diffoscope-243.ebuild +++ b/dev-util/diffoscope/diffoscope-243-r1.ebuild @@ -20,9 +20,10 @@ mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd" RESTRICT="!test? ( test )" +# <libarchive-c-5: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/344 RDEPEND=" dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/libarchive-c[${PYTHON_USEDEP}] + <dev-python/libarchive-c-5[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/tlsh[${PYTHON_USEDEP}] acl? ( sys-apps/acl )