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 8B2F6158451 for ; Sat, 13 Jan 2024 19:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6753DE2A5C; Sat, 13 Jan 2024 19:25:19 +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 4A7DEE2A5C for ; Sat, 13 Jan 2024 19:25:19 +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 3631F3431BA for ; Sat, 13 Jan 2024 19:25:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A37313A0 for ; Sat, 13 Jan 2024 19:25:16 +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: <1705173886.6904cc0dea2b31d89401d5be7913e832571f30c9.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 net-mail/courier-imap/courier-imap-5.2.6.ebuild X-VCS-Directories: net-mail/courier-imap/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 6904cc0dea2b31d89401d5be7913e832571f30c9 X-VCS-Branch: master Date: Sat, 13 Jan 2024 19:25:16 +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: 5731eed1-5f08-421f-8b9b-f52fb9e6ac7f X-Archives-Hash: c49e593ef5d9e96b58a33085c719ab2b commit: 6904cc0dea2b31d89401d5be7913e832571f30c9 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Jan 13 19:24:15 2024 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jan 13 19:24:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6904cc0d net-mail/courier-imap: fix conflict with maildrop Bug: https://bugs.gentoo.org/921401 Signed-off-by: Alfredo Tupone gentoo.org> .../{courier-imap-5.2.6.ebuild => courier-imap-5.2.6-r1.ebuild} | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-mail/courier-imap/courier-imap-5.2.6.ebuild b/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild similarity index 97% rename from net-mail/courier-imap/courier-imap-5.2.6.ebuild rename to net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild index e166a72b840a..093e230c2f6d 100644 --- a/net-mail/courier-imap/courier-imap-5.2.6.ebuild +++ b/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,6 +31,7 @@ CDEPEND=" DEPEND="${CDEPEND} dev-lang/perl sys-process/procps + net-mail/courier-common " RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-courier ) @@ -38,7 +39,6 @@ RDEPEND="${CDEPEND} RDEPEND="${RDEPEND} !net-mail/cyrus-imapd - !net-mail/courier-common !net-mail/courier-makedat " @@ -112,6 +112,10 @@ src_install() { || die "failed to rename ${name} to courier-${name}" done + # Moved to courier-common + rm "${D}"/usr/share/man/man1/maildirkw.1 || die + rm "${D}"/usr/share/man/man8/deliverquota.8 || die + # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of # 'Maildir', and to use /usr/sbin/courier-foo names. for service in {imapd,pop3d}{,-ssl} ; do