commit:     8808d3bd887dcc90f4dd1b307089c8e3c8f95331
Author:     Jan Smutny <js <AT> excello <DOT> cz>
AuthorDate: Wed Jan 31 18:44:18 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 18:03:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8808d3bd

mail-filter/maildrop: fix conflict with netqmail

When the "tools" USE flag is disabled, remove these files conflicting
with netqmail:
 * /usr/share/man/man5/maildir.5.bz2
 * /usr/share/man/man1/maildirwatch.1.bz2
 * /usr/share/man/man1/maildirmake.1.bz2
Additionally, remove the maildirwatch and maildirmake binaries, as
these shouldn't be installed when "tools" USE flag is disabled.

Signed-off-by: Jan Smutný <smutnja3 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35119
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../{maildrop-3.1.6-r1.ebuild => maildrop-3.1.6-r2.ebuild}       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mail-filter/maildrop/maildrop-3.1.6-r1.ebuild 
b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
similarity index 93%
rename from mail-filter/maildrop/maildrop-3.1.6-r1.ebuild
rename to mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
index bd2206b3e40d..0bdf1c83bc3e 100644
--- a/mail-filter/maildrop/maildrop-3.1.6-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.6-r2.ebuild
@@ -133,6 +133,15 @@ src_install() {
        dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
                libs/maildir/README*.txt libs/maildir/*.html
 
+       # bugs 61116, 639124
+       if ! use tools ; then
+               for tool in "maildirmake" "maildirwatch"; 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
 

Reply via email to