Fixed bug 105454

Package-Manager: portage-2.0.51.22-r2

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 97b68d43e78ad4934606550eddc7d2650b862c09..d935a8eec84c139737486139a568c3817da4e6fa 100644 (file)
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.60 2005/09/11 21:56:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.61 2005/09/11 22:10:30 hansmi Exp $
 
   11 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild:
-  Fixed bug 105450, cleaned ebuild a bit.
+  Fixed bug 105450 and bug 105454, cleaned ebuild a bit.
 
   14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> files/conf-smtpd-r16,
   qmail-1.03-r16.ebuild:

diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 24049d3dccfabc9701686b3c45884c2f06f092e1..2d0bf543d56d56ae19a8178075b597c9a3d4c0aa 100644 (file)
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,6 +1,6 @@
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 4d5830e3c5bc33423ccea8e90b3abdb5 ChangeLog 31888
-MD5 139f88c139d8247637f79a13897ba5a1 qmail-1.03-r16.ebuild 21430
+MD5 165a36d8d6d5dfce3256cf481b36ed70 ChangeLog 31903
+MD5 4fe29614468ab66f292ad4cba72039da qmail-1.03-r16.ebuild 21688
 MD5 85378e7d3c494be73cefbf7e9863365d qmail-1.03-r15.ebuild 18807
 MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137

diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 832a17ec5fe07feadb590f11d495c45ff0ec5ecb..8b195851244162f64b104b1c8d509c24b732e69d 100644 (file)
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.37 2005/09/11 21:56:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.38 2005/09/11 22:10:30 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -301,6 +301,14 @@ src_unpack() {
 
 src_compile() {
        emake it man || die
+
+       # Collision with ucspi-tcp (bug 105454)
+       # Note for collisions: qmail generates *.0 files from the man pages, but
+       # those aren't used in this ebuild, so we can ignore them.
+       rm -f tcp-environ.5
+
+       # Collision with mutt (bug 105454)
+       mv mbox.5 qmail-mbox.5
 }
 
 src_install() {