commit: 6904cc0dea2b31d89401d5be7913e832571f30c9 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Jan 13 19:24:15 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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
