diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2005-09-11 22:10:30 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2005-09-11 22:10:30 +0000 |
| commit | 78ca08b05a156aa581b253ae8c643e0658ae539b (patch) | |
| tree | 2411ea3d15bf2dfd4e746533c74a4e646c44aa39 /mail-mta | |
| parent | fix deps (diff) | |
| download | gentoo-2-78ca08b05a156aa581b253ae8c643e0658ae539b.tar.gz gentoo-2-78ca08b05a156aa581b253ae8c643e0658ae539b.tar.bz2 gentoo-2-78ca08b05a156aa581b253ae8c643e0658ae539b.zip | |
Fixed bug 105454
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r16.ebuild | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index 97b68d43e78a..d935a8eec84c 100644 --- 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/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild index 832a17ec5fe0..8b1958512441 100644 --- 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() { |