diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-06-02 20:03:48 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-06-02 20:03:48 +0000 |
| commit | 4f1929c0bb1301a93ce2bcb22d8c68b036239bfb (patch) | |
| tree | 29c78dd3906944329dd77fe9ff556ef3134dc006 /net-im | |
| parent | version bump (diff) | |
| download | gentoo-2-4f1929c0bb1301a93ce2bcb22d8c68b036239bfb.tar.gz gentoo-2-4f1929c0bb1301a93ce2bcb22d8c68b036239bfb.tar.bz2 gentoo-2-4f1929c0bb1301a93ce2bcb22d8c68b036239bfb.zip | |
Properly block kde-base/kdenetwork and net-libs/libjingle thanks to Daniel Webert <rockoo@gmail.com> in bug 135310
(Portage version: 2.1_rc3-r5)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/kopete/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/kopete/kopete-0.12.0.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog index 42422b1e59f6..1ca192e53950 100644 --- a/net-im/kopete/ChangeLog +++ b/net-im/kopete/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/kopete # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.59 2006/06/02 10:52:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.60 2006/06/02 20:03:48 genstef Exp $ + + 02 Jun 2006; Stefan Schweizer <genstef@gentoo.org> kopete-0.12.0.ebuild: + Properly block kde-base/kdenetwork and net-libs/libjingle thanks to Daniel + Webert <rockoo@gmail.com> in bug 135310 02 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-0.12.0.ebuild: Add ~ppc keyword (okay from lu_zero). diff --git a/net-im/kopete/kopete-0.12.0.ebuild b/net-im/kopete/kopete-0.12.0.ebuild index 6d3a22ca0187..42737788560c 100644 --- a/net-im/kopete/kopete-0.12.0.ebuild +++ b/net-im/kopete/kopete-0.12.0.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/kopete/kopete-0.12.0.ebuild,v 1.2 2006/06/02 10:52:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.0.ebuild,v 1.3 2006/06/02 20:03:48 genstef Exp $ inherit kde eutils @@ -40,7 +40,9 @@ BOTH_DEPEND="dev-libs/libxslt RDEPEND="${BOTH_DEPEND} ssl? ( app-crypt/qca-tls ) - !kde-base/kopete" + !kde-base/kopete + !kde-base/kdenetwork + !net-libs/libjingle" DEPEND="${BOTH_DEPEND} kernel_linux? ( virtual/os-headers ) |