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 | 8441e44b8338b5b4721d2c709674126e1a5aa094 (patch) | |
| tree | bf3398c755243cf82a94920fcdfcff3145b4aeb1 /net-im/jabberd | |
| parent | Install HTML docs recursively. Allow to add extra flags to package configurat... (diff) | |
| download | gentoo-2-8441e44b8338b5b4721d2c709674126e1a5aa094.tar.gz gentoo-2-8441e44b8338b5b4721d2c709674126e1a5aa094.tar.bz2 gentoo-2-8441e44b8338b5b4721d2c709674126e1a5aa094.zip | |
Remove the die when both postgres and mysql are in USE.
(Portage version: 2.1.2_pre2-r2)
Diffstat (limited to 'net-im/jabberd')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-1.4.4-r3.ebuild | 7 |
2 files changed, 6 insertions, 7 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/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"' |