summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2011-05-22 20:09:24 +0000
committerEray Aslan <eras@gentoo.org>2011-05-22 20:09:24 +0000
commitb56796caeb6d44e608de85c1cd4ab4a7d97b673b (patch)
treee11fa996dfc5f3ad73dc6f26031f1386e8461689 /net-mail
parentBump to EAPI 4, to make sure the ebuild dies on all failures. (diff)
downloadgentoo-2-b56796caeb6d44e608de85c1cd4ab4a7d97b673b.tar.gz
gentoo-2-b56796caeb6d44e608de85c1cd4ab4a7d97b673b.tar.bz2
gentoo-2-b56796caeb6d44e608de85c1cd4ab4a7d97b673b.zip
Don't install fetchnews man page when nntp USE flag is not set - bug #368245
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/cyrus-imapd/ChangeLog5
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild10
2 files changed, 11 insertions, 4 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 249ab5e30502..746795f1519b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-mail/cyrus-imapd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.168 2011/05/21 17:17:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.169 2011/05/22 20:09:24 eras Exp $
+
+ 22 May 2011; Eray Aslan <eras@gentoo.org> cyrus-imapd-2.4.8.ebuild:
+ Don't install fetchnews man page when nntp USE flag is not set - bug #368245
21 May 2011; Raúl Porcel <armin76@gentoo.org> cyrus-imapd-2.4.8.ebuild:
sparc stable wrt #365909
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild
index 6c55fa7714c9..e306025b1d51 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild,v 1.10 2011/05/21 17:17:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild,v 1.11 2011/05/22 20:09:24 eras Exp $
EAPI=4
@@ -117,9 +117,13 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "email install failed"
+ emake DESTDIR="${D}" install
+
+ # file collision - bug #368245
+ if ! use nntp ; then
+ rm "${D}"/usr/share/man/man8/fetchnews.8*
+ fi
- doman man/*.[0-8]
dodoc README*
dohtml doc/*.html doc/murder.png
docinto text