diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-09-27 22:47:25 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-09-27 22:47:25 +0000 |
| commit | 7eb5acbdca89e97129ecfef4619b3bbb17242a60 (patch) | |
| tree | 064807b85bfb1faba8d499cae1f4409048265d6f /net-im/jabberd | |
| parent | Call eant with JAVA_PKG_STRICT=true to fix bug #143246. (diff) | |
| download | gentoo-2-7eb5acbdca89e97129ecfef4619b3bbb17242a60.tar.gz gentoo-2-7eb5acbdca89e97129ecfef4619b3bbb17242a60.tar.bz2 gentoo-2-7eb5acbdca89e97129ecfef4619b3bbb17242a60.zip | |
Add block against net-im/aim-transport.
(Portage version: 2.1.2_pre1-r3)
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 | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 408f83822500..ee22a4cbb247 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.72 2006/09/27 22:31:36 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.73 2006/09/27 22:47:25 nelchael Exp $ + + 27 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> + jabberd-1.4.4-r3.ebuild: + Add block against net-im/aim-transport. *jabberd-1.4.4-r3 (27 Sep 2006) diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild index e6cfd63032aa..c0abfc0602f1 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.1 2006/09/27 22:31:36 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.2 2006/09/27 22:47:25 nelchael Exp $ inherit eutils @@ -20,6 +20,7 @@ DEPEND=">=net-im/jabber-base-0.01 mysql? ( dev-db/mysql ) postgres? ( dev-db/postgresql ) ssl? ( >=dev-libs/openssl-0.9.6i ) + !net-im/aim-transport !=net-im/jabberd-2*" # Block against jabberd-2* is needed - both packages install the same files - collisions! |