diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-10-04 17:51:46 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-10-04 17:51:46 +0000 |
| commit | 5124a3b7f8b6e8f42f30069b8e739e86466f6f78 (patch) | |
| tree | b975adb08323a4033cd4f3d4c87323f63f740ca0 /net-im | |
| parent | Install HTML docs recursively. Allow to add extra flags to package configurat... (diff) | |
| download | historical-5124a3b7f8b6e8f42f30069b8e739e86466f6f78.tar.gz historical-5124a3b7f8b6e8f42f30069b8e739e86466f6f78.tar.bz2 historical-5124a3b7f8b6e8f42f30069b8e739e86466f6f78.zip | |
Remove the die when both postgres and mysql are in USE.
Package-Manager: portage-2.1.2_pre2-r2
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/jabberd/Manifest | 22 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-1.4.4-r3.ebuild | 7 |
3 files changed, 17 insertions, 18 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 7413083346d3..c6ec78868bb5 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/jabberd # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.76 2006/10/03 12:44:28 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.77 2006/10/04 17:51:46 nelchael Exp $ + + 04 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> + jabberd-1.4.4-r3.ebuild: + Remove the die when both postgres and mysql are in USE. 03 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> +files/jabberd-1.4.4-crypt.patch, -jabberd-1.4.3-r4.ebuild, diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest index 806ad7c64a39..c1a2c71cf769 100644 --- a/net-im/jabberd/Manifest +++ b/net-im/jabberd/Manifest @@ -108,10 +108,10 @@ EBUILD jabberd-1.4.3-r5.ebuild 5661 RMD160 1f0e632653b498fa1cac8b01d40c0f32f5b4d MD5 941c18dda002316db4ff04ca00ff9d7e jabberd-1.4.3-r5.ebuild 5661 RMD160 1f0e632653b498fa1cac8b01d40c0f32f5b4d929 jabberd-1.4.3-r5.ebuild 5661 SHA256 0e01b4f86329b4f2252ab07a11e89130add94e7d33c20828e0ba970e0fb32ae4 jabberd-1.4.3-r5.ebuild 5661 -EBUILD jabberd-1.4.4-r3.ebuild 3323 RMD160 8c30a21b67195ceedb47df41851dd3ae8b922d19 SHA1 02701d3889c7d874073ecc8d19a864d65a4f4050 SHA256 528113e57b44197055fb28eb5b133bb676c4bb41248f8884d6ec69d3819219c3 -MD5 cc3d442a793c3fc7e9f0e838d8048a97 jabberd-1.4.4-r3.ebuild 3323 -RMD160 8c30a21b67195ceedb47df41851dd3ae8b922d19 jabberd-1.4.4-r3.ebuild 3323 -SHA256 528113e57b44197055fb28eb5b133bb676c4bb41248f8884d6ec69d3819219c3 jabberd-1.4.4-r3.ebuild 3323 +EBUILD jabberd-1.4.4-r3.ebuild 3199 RMD160 9d6fb7f263d2ec56e5134faf593deb7ab656b817 SHA1 7b9b6617233d0aefb7eb7e8b29013c478ba66890 SHA256 3fe6136518958e23e1ff8fd6384ed9f0e112fb1ed4aadb5ad6da2923da9c279e +MD5 edeb18c1c4022f1684f0c2f123affd80 jabberd-1.4.4-r3.ebuild 3199 +RMD160 9d6fb7f263d2ec56e5134faf593deb7ab656b817 jabberd-1.4.4-r3.ebuild 3199 +SHA256 3fe6136518958e23e1ff8fd6384ed9f0e112fb1ed4aadb5ad6da2923da9c279e jabberd-1.4.4-r3.ebuild 3199 EBUILD jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d SHA1 8c5cad380f1c00395dc4ad7d5b3aa4f0e80f4703 SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480 MD5 fb4eb4f8f7c47229416f97a92b0d99d1 jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d jabberd-2.0.10.ebuild 3494 @@ -124,10 +124,10 @@ EBUILD jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b MD5 4cfba42324bea977951cd322a4299d77 jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b jabberd-2.0.9.ebuild 3622 SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe jabberd-2.0.9.ebuild 3622 -MISC ChangeLog 12509 RMD160 3904dd263eddbb5088f6231f58da4389c7b9f6d7 SHA1 fa255df7d10d386426571bce3c3eadfc51217e27 SHA256 79b56f52329f434ae387af7e09bf5dd8700a513ad93fd74c5eb6703a672e9dde -MD5 eec7b2efb1144d41e6ba641f9c160d54 ChangeLog 12509 -RMD160 3904dd263eddbb5088f6231f58da4389c7b9f6d7 ChangeLog 12509 -SHA256 79b56f52329f434ae387af7e09bf5dd8700a513ad93fd74c5eb6703a672e9dde ChangeLog 12509 +MISC ChangeLog 12648 RMD160 6ef30f4733760c440481301752dd233b6c29b104 SHA1 59e8e5833ab27cc2f9368e1e1612645dff33c22a SHA256 0bb0af6b227a0da98aaf3297d5f23bc3f877dfb9dd5914313a16cb0e5b077797 +MD5 ce99d57a9bd8a1973fdb40f5979899ad ChangeLog 12648 +RMD160 6ef30f4733760c440481301752dd233b6c29b104 ChangeLog 12648 +SHA256 0bb0af6b227a0da98aaf3297d5f23bc3f877dfb9dd5914313a16cb0e5b077797 ChangeLog 12648 MISC metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 SHA1 74ce3349255a107d4ec18bc3e9639a50b8e7cdbe SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690 MD5 e07ef3d6fc255eee85b6dd3480c8f819 metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 metadata.xml 453 @@ -150,7 +150,7 @@ SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFIls/go/w9rxVVVERAk2SAJoDEjBvRydO3nBOmIj2SzRy8kztwwCfR2ul -OtMQjfiHuMNIpRMQcZa68oY= -=tIEF +iD8DBQFFI/THgo/w9rxVVVERAkLQAJ40sX8XprN4t3Jtz94bQ2QozOAFUgCfQOLU +kHcrhO7NxWjNgc6ldymkK6w= +=xdqd -----END PGP SIGNATURE----- diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild index d65bf6dbfb8e..2e81d8f0c662 100644 --- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild +++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.5 2006/10/03 12:44:28 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.6 2006/10/04 17:51:46 nelchael Exp $ inherit eutils @@ -26,11 +26,6 @@ DEPEND=">=net-im/jabber-base-0.01 pkg_setup() { - if use postgres && use mysql; then - eerror "Please select mysql or postgres" - die "Please select mysql or postgres" - fi - if use ipv6; then ewarn "Without full ipv6 support, jabberd will show the error:" ewarn ' "mio unable to listen"' |