From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1576149-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 AB205158013
	for <garchives@archives.gentoo.org>; Sun,  3 Dec 2023 08:02:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EC1AA2BC01A;
	Sun,  3 Dec 2023 08:02:44 +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 CF9272BC01A
	for <gentoo-commits@lists.gentoo.org>; Sun,  3 Dec 2023 08:02:44 +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 D222A335D64
	for <gentoo-commits@lists.gentoo.org>; Sun,  3 Dec 2023 08:02:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 37BB3A66
	for <gentoo-commits@lists.gentoo.org>; Sun,  3 Dec 2023 08:02:42 +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: <1701590532.33701a3a34c89639c79e3d3f719358a1a01bc57d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/portage/portage-3.0.56-r1.ebuild sys-apps/portage/portage-3.0.56.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 33701a3a34c89639c79e3d3f719358a1a01bc57d
X-VCS-Branch: master
Date: Sun,  3 Dec 2023 08:02:42 +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: 993755a3-670e-431d-b7af-33d4c6b0cb14
X-Archives-Hash: 1ce109f90c916457dfaab588dcb56538

commit:     33701a3a34c89639c79e3d3f719358a1a01bc57d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 07:59:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 08:02:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33701a3a

sys-apps/portage: don't allow broken meson for build

=dev-util/meson-1.3.0 could lead to a miscompiled Portage with IPC disabled.

Bug: https://bugs.gentoo.org/919072
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/portage/{portage-3.0.56.ebuild => portage-3.0.56-r1.ebuild} | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/portage/portage-3.0.56.ebuild b/sys-apps/portage/portage-3.0.56-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.56.ebuild
rename to sys-apps/portage/portage-3.0.56-r1.ebuild
index f261a5eae11a..dafc3d985c50 100644
--- a/sys-apps/portage/portage-3.0.56.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -36,6 +36,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	${PYTHON_DEPS}
 	>=dev-util/meson-1.2.1-r1
+	|| (
+		>=dev-util/meson-1.3.0-r1
+		<dev-util/meson-1.3.0
+	)
 	$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	' python3_12)