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 7651415817D for ; Fri, 14 Jun 2024 12:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E8BDE2A39; Fri, 14 Jun 2024 12:57:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 734D2E2A39 for ; Fri, 14 Jun 2024 12:57:08 +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 BB9A133BDE1 for ; Fri, 14 Jun 2024 12:57:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 208701C84 for ; Fri, 14 Jun 2024 12:57:06 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1718369768.3958622e8b111e07cafb2ee3c3204a420a9eea2d.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/package.mask X-VCS-Directories: profiles/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 3958622e8b111e07cafb2ee3c3204a420a9eea2d X-VCS-Branch: master Date: Fri, 14 Jun 2024 12:57: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: 494d851b-019b-41d0-b975-ab6a081b6927 X-Archives-Hash: 62c3e96fae6223b1f0be4fbb7039dac5 commit: 3958622e8b111e07cafb2ee3c3204a420a9eea2d Author: Maciej Barć gentoo org> AuthorDate: Fri Jun 14 12:56:08 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Fri Jun 14 12:56:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3958622e profiles/package.mask: last-rite dev-scheme/termite Bug: https://bugs.gentoo.org/832334 Signed-off-by: Maciej Barć gentoo.org> profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 7ad4796c8477..7db626ae0ca9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,12 @@ #--- END OF EXAMPLES --- +# Maciej Barć (2024-06-14) +# EAPI=6, now shipped in official gambit and so it fails to merge from file +# collision. Bug: #832334 +# Removal on 2024-07-14. +dev-scheme/termite + # Arthur Zamarin (2024-06-14) # EAPI=6, no reverse dependencies, maintainer-needed, installation # blocked by iproute2.