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 53517158451 for ; Sun, 14 Jan 2024 16:03:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 569A3E29CA; Sun, 14 Jan 2024 16:03:28 +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 24850E29CA for ; Sun, 14 Jan 2024 16:03:28 +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 5131334312A for ; Sun, 14 Jan 2024 16:03:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9506611A0 for ; Sun, 14 Jan 2024 16:03:25 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1705248178.4134306316457ab16a35f6c6d4529f50e717ce42.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/courier-imap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild X-VCS-Directories: net-mail/courier-imap/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 4134306316457ab16a35f6c6d4529f50e717ce42 X-VCS-Branch: master Date: Sun, 14 Jan 2024 16:03:25 +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: 2b4bce9a-2930-49c3-a6f7-fdbc8b038dd2 X-Archives-Hash: daad65286e050038019700c8ffb0a066 commit: 4134306316457ab16a35f6c6d4529f50e717ce42 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Jan 14 16:02:20 2024 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jan 14 16:02:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41343063 net-mail/courier-imap: fix courier-common conflicts Closes: https://bugs.gentoo.org/922100 Signed-off-by: Alfredo Tupone gentoo.org> net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild b/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild index 093e230c2f6d..bc7be0f52217 100644 --- a/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild +++ b/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild @@ -113,6 +113,9 @@ src_install() { done # Moved to courier-common + rm "${D}"/usr/bin/deliverquota || die + rm "${D}"/usr/bin/maildirkw || die + rm "${D}"/usr/bin/makedat || die rm "${D}"/usr/share/man/man1/maildirkw.1 || die rm "${D}"/usr/share/man/man8/deliverquota.8 || die