diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2024-01-13 20:23:00 +0100 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2024-01-13 20:24:43 +0100 |
| commit | f6ff74f4f8124849b42823818300603f7bdf6aeb (patch) | |
| tree | 62ee9b65b0fd4041f83ac0473a8f87a915b8d55f /mail-filter | |
| parent | package.mask: Unmask net-proxy/tayga (diff) | |
| download | gentoo-f6ff74f4f8124849b42823818300603f7bdf6aeb.tar.gz gentoo-f6ff74f4f8124849b42823818300603f7bdf6aeb.tar.bz2 gentoo-f6ff74f4f8124849b42823818300603f7bdf6aeb.zip | |
mail-filter/maildrop: fix conflict with courier-imap
Closes: https://bugs.gentoo.org/921401
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/maildrop/maildrop-3.1.6-r1.ebuild (renamed from mail-filter/maildrop/maildrop-3.1.6.ebuild) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mail-filter/maildrop/maildrop-3.1.6.ebuild b/mail-filter/maildrop/maildrop-3.1.6-r1.ebuild index 2d42ec234f61..3f3ae815bab4 100644 --- a/mail-filter/maildrop/maildrop-3.1.6.ebuild +++ b/mail-filter/maildrop/maildrop-3.1.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 @@ -32,13 +32,13 @@ CDEPEND="!mail-mta/courier berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] ) tools? ( !mail-mta/netqmail - !net-mail/courier-imap + !<net-mail/courier-imap-5.2.6 + net-mail/courier-common )" DEPEND="${CDEPEND}" RDEPEND="${CDEPEND} dev-lang/perl - dovecot? ( net-mail/dovecot ) - !net-mail/courier-common" + dovecot? ( net-mail/dovecot )" BDEPEND="virtual/pkgconfig" REQUIRED_USE=" @@ -115,6 +115,15 @@ src_install() { fperms 4755 /usr/bin/maildrop fi + # 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/bin/makedatprog || die + rm "${D}"/usr/share/man/man1/maildirkw.1 || die + rm "${D}"/usr/share/man/man1/makedat.1 || die + rm "${D}"/usr/share/man/man8/deliverquota.8 || die + dodoc AUTHORS ChangeLog INSTALL NEWS README \ README.postfix README.dovecotauth UPGRADE \ maildroptips.txt @@ -122,15 +131,6 @@ src_install() { dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \ libs/maildir/README*.txt libs/maildir/*.html - # bugs 61116, 374009, and 639124 - if ! use tools ; then - for tool in maildirmake maildirkw deliverquota; do - rm "${D}/usr/bin/${tool}" || die - rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die - done - rm "${D}/usr/share/man/man5/maildir.5" || die - fi - insinto /etc doins "${FILESDIR}"/maildroprc |