diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2008-03-15 18:00:40 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2008-03-15 18:00:40 +0000 |
| commit | 49b29592c5c57fb90477d980e1097dadd35d7ffd (patch) | |
| tree | 8d5ebfd84d989369b3adcff552654ee00d596257 /net-mail | |
| parent | old (diff) | |
| download | historical-49b29592c5c57fb90477d980e1097dadd35d7ffd.tar.gz historical-49b29592c5c57fb90477d980e1097dadd35d7ffd.tar.bz2 historical-49b29592c5c57fb90477d980e1097dadd35d7ffd.zip | |
Fix manpage collision with leafnode, only install nntp related binaries and man-pages when the nntp use-flag is activated. #212379, reported by Joachim Breuer
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/Manifest | 4 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 3c1455d345df..786e0cac9f6a 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/cyrus-imapd # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.122 2008/03/13 21:08:43 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.123 2008/03/15 18:00:40 dertobi123 Exp $ + + 15 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> + cyrus-imapd-2.3.11.ebuild: + Fix manpage collision with leafnode, only install nntp related binaries + and man-pages when the nntp use-flag is activated. #212379, reported by + Joachim Breuer 13 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> cyrus-imapd-2.3.9-r1.ebuild, cyrus-imapd-2.3.11.ebuild: diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index d1504a8aaf5e..c36365725c23 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -13,7 +13,7 @@ DIST cyrus-imapd-2.3.11-uoa.tbz2 18045 RMD160 8f35b2399b47669d99fd301be1e14aaaab DIST cyrus-imapd-2.3.11.tar.gz 2275173 RMD160 34727e08cc25f3cb6e0ea0195b96de942de10f48 SHA1 6218f0dc4f1792e786677362b8b3965e4593122e SHA256 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842 DIST cyrus-imapd-2.3.9-uoa.tbz2 17935 RMD160 1e46f17972552ed94496d1dfee8671332844775b SHA1 1fc400239cf2410f531570c37d19ad964c606a14 SHA256 3ca66f3ec992416276daca9e43dd159797d2838ff9efd118139495a86e070f5d DIST cyrus-imapd-2.3.9.tar.gz 2272004 RMD160 c9aae3476108c0face06dfe304a136015370b166 SHA1 b95e1de87ff2c7a42d4bec87c839fe439452a79c SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437 -EBUILD cyrus-imapd-2.3.11.ebuild 7835 RMD160 a8efd2042f86153220e6537a24c31ebe2404ae89 SHA1 f03f14c4725d969abcb2415d35252a8ddcf0d41f SHA256 7b649e9c56643cbd73f84af8a93662dc1b90e92ca5ecbb6514ea874ad0232dde +EBUILD cyrus-imapd-2.3.11.ebuild 7984 RMD160 f106c95889aba796d7903458190e808b33489a92 SHA1 141e737a8701c776bda904995cd05c7550efd2a4 SHA256 1e0116b0214b3b877cd189f0ca150955ebc886ea6b442b8830b40a4998d3de6e EBUILD cyrus-imapd-2.3.9-r1.ebuild 7876 RMD160 aa7e9db191441e8816601ebcd94471daa3488ef6 SHA1 87d2b78b151c9d0c16adf8079269353bb286114c SHA256 0b9220d07ed978a653902b533c4db489e565e03db06ec275fcf6c6e9bd162539 -MISC ChangeLog 23725 RMD160 ad3d769b117831b961827de072f24fbd29ee98d5 SHA1 57c63aa9a2a17424013c579ed32e415aca66948f SHA256 6c28776df29c99f84385b73b9bfda3c8d2ea6852c319efc30a09cfa1e46b73d5 +MISC ChangeLog 23976 RMD160 ef1009bac2385f1d5afdbeb9ffe23e443ca84ccc SHA1 4d54440dfb47f2df1b17b592a3674f183de16445 SHA256 f4fa869e93641e5ba88e323939bb3b5ed1de76db7cb10d8fa2c8ae04d02740e8 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild index 220fd61824ad..4f2e27b6f3d5 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.3.11.ebuild,v 1.3 2008/03/13 21:08:43 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild,v 1.4 2008/03/15 18:00:40 dertobi123 Exp $ inherit autotools eutils ssl-cert fixheadtails pam @@ -29,7 +29,8 @@ RDEPEND=">=sys-libs/db-3.2 snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - drac? ( >=mail-client/drac-1.12-r1 )" + drac? ( >=mail-client/drac-1.12-r1 ) + nntp? ( !net-nntp/leafnode )" DEPEND="$RDEPEND sys-devel/libtool @@ -186,6 +187,11 @@ src_install() { # Link master to cyrusmaster (postfix has a master too) dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster + if ! use nntp ; then + rm man/fetchnews.8 man/syncnews.8 man/nntpd.8 man/nntptest.1 + rm "${D}"/usr/bin/nntptest + fi + doman man/*.[0-8] dodoc COPYRIGHT README* dohtml doc/*.html doc/murder.png |