diff options
| author |   Eray Aslan <eras@gentoo.org> | 2011-05-22 20:09:24 +0000 |
|---|---|---|
| committer | Eray Aslan <eras@gentoo.org> | 2011-05-22 20:09:24 +0000 |
| commit | 761a13b86bdcc2e597b32d74eed8dc0eca362de3 (patch) | |
| tree | 9f4224d4878352c2e2caa4fc405f91ff4f205397 /net-mail/cyrus-imapd | |
| parent | Bump to EAPI 4, to make sure the ebuild dies on all failures. (diff) | |
| download | historical-761a13b86bdcc2e597b32d74eed8dc0eca362de3.tar.gz historical-761a13b86bdcc2e597b32d74eed8dc0eca362de3.tar.bz2 historical-761a13b86bdcc2e597b32d74eed8dc0eca362de3.zip | |
Don't install fetchnews man page when nntp USE flag is not set - bug #368245
Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
Diffstat (limited to 'net-mail/cyrus-imapd')
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 5 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/Manifest | 24 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.4.8.ebuild | 10 |
3 files changed, 28 insertions, 11 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/Manifest b/net-mail/cyrus-imapd/Manifest index f10d8cd5d4df..b397414259ae 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e AUX cyrus-imapd-2.3.14-add-db47-support.patch 805 RMD160 18acd706ecdb14e8dc8713e1b66140fa13c65927 SHA1 e0008e89c924edb0f66587f2a312a06385a9a335 SHA256 09b275e21999355fea14ee173c9360658c02854b492c532b4bc58d301c387132 @@ -25,13 +25,23 @@ DIST cyrus-imapd-2.4.8.tar.gz 2424151 RMD160 72f9afbf7893b3449a1a76b7050ea6d7c9b EBUILD cyrus-imapd-2.3.14-r3.ebuild 8295 RMD160 d370399881df00fd5a182df7328a4eab227c8f4b SHA1 cc9dc0b1eaeb4f0d8414914fe7f179d294edf004 SHA256 e88eece5aff42e7827fe9cdf0b6339eaa7cf40e47c3a73700662b9aaa22a3f8d EBUILD cyrus-imapd-2.3.15.ebuild 7702 RMD160 f8f56930cad990a4ecbbea7b79f82b393521be38 SHA1 597539c848afcbf06e34f10bf24ff86a19400c10 SHA256 c4136ec37fbe3f951cb7c5b031488cb477704b4b64148112681ce2f2befc71ea EBUILD cyrus-imapd-2.3.16.ebuild 7747 RMD160 b1922bbfdeafcca8b46773c36170961f31c6e206 SHA1 d32ffce6a382ae8145792e22901c4d5253c02d4d SHA256 91dcfd87bb794423c8961df785a72cd0defe579a744e63297d6f2fadb7ddbe3b -EBUILD cyrus-imapd-2.4.8.ebuild 4487 RMD160 be3f333f7d932fbd2edc898cefc3cec4732d8ee5 SHA1 1864675703e0e6c232a5248a591765f8e3074ad1 SHA256 bda760177b66b22e7598bc7ff5fe29f6f9503b8308b45f0de1d7c3bc48996752 -MISC ChangeLog 31931 RMD160 9fd8bbe3b62bdae97efed334b84af44f4f07bdbc SHA1 31fe218dc9414859ddd4aa2831c04bc03be5774d SHA256 628adc319bee609d264a7c8a5bdec74904bd2a137343e5673b1b4873e1134185 +EBUILD cyrus-imapd-2.4.8.ebuild 4538 RMD160 2b84bf32c54d931fa18c23ab127280be5be1247c SHA1 417e6a183d7dc196cbbd6b695419701cfd15a03b SHA256 069cc59fc0ae40815b7b6614acac50679d8aafdf4b1af7388f1a824adff5e904 +MISC ChangeLog 32078 RMD160 b215c15f6379b7c3298a64a6be80cf2326cd4d73 SHA1 bc77a41e517336f16db430fe71e7024b70c1b23a SHA256 4a249ee3d4e8f6aa7feb41b7342e5df39d3d2e8a0e32f57e2c622d33275a9fa2 MISC metadata.xml 450 RMD160 43d7242bfdfcd5c328805bf7912fd07b20999ddc SHA1 53cb62e89c804226d5392cdeef9c45a8bdeaf99c SHA256 b8a9c9faf2353b9f33814cf9f12fa6183ab18449699d58104260109cef3c8470 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3X88cACgkQuQc30/atMkDMuQCgiUZCSWS5ud2+BtZIKaLu69fz -tlMAoLV1GzKLSnU5Iu9mBGvn136+sTOu -=rIY9 +iQIcBAEBCAAGBQJN2W2FAAoJEHfx8XVYajsfnk0QAIjIrXNTtGH8fu/2wKRi8dh0 +Uw5/lP9uUZdMO02ZoyLwB4zihbf87Tv9aYGzKJPP4CwvCobPeAXg4fXVXRkeSv42 +r0WVJJE1jQVSETO2esOvACn1plpW992EFSL0mb/By9oVlmUNHs+BlVO3s+DdU2Mu +RHVd5x+OCnnLlpp/j4aK+qhOEwHxUjdeX4uaJZLoWrs3DRGEQcFX81V6EIn8SW9n +Pa6Tnkb9QNItxWqfOCPaFb+z0OTmJY8dNc8zJlNobgbnv9iiCuSEAB4B4v56m9zv +InpzA3w6wYLUsxfCDVNg8eiGYObuZ563kNRIUO8RG6DF+Sj+6nWdCtCNsJiMXnQT +O1AbzvQOMT3oORgm/DsAYOI6aSDFocmhKKdsLlJuGdR5taoJQywBsGras1enrKjU +YPKzpYJXNU87zkqS57BfQoDKhQyo1S8XBFdKLCHfyYY6XB7FQXT64RFlhhoA3UOF +aJnHfFl1MLGmW/z18z3fUjXgxrIy1bM6hDhjMnGNZJJ8o3KkrKJ+HfastrhyktQl +B0D1uFXLornBlHuq8IX19NpxVD4d3woj6qp+djedPIQcbO5rccMnWWlvRKrWR39F +fWmpV/GaaxB6oQDuozCAtQDicvAUgAO790nxyH38XB5mffZFMo3lcvEnqLVnb4NN +iw36xQqPZZLoHhZfFNWi +=p9SR -----END PGP SIGNATURE----- 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 |