From: Piotr Jaroszyński Date: Sun, 3 Dec 2006 10:39:03 +0000 (+0000) Subject: Fix dep: dbus wrt bug #154521. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e07d622e6b162908eadc835533d6a0a0b29461a7;p=gentoo.git Fix dep: dbus wrt bug #154521. Package-Manager: portage-2.1.2_rc2-r3 --- diff --git a/net-im/tapioca-xmpp/ChangeLog b/net-im/tapioca-xmpp/ChangeLog index 16e193fa23f2..0297c7a43059 100644 --- a/net-im/tapioca-xmpp/ChangeLog +++ b/net-im/tapioca-xmpp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/tapioca-xmpp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/tapioca-xmpp/ChangeLog,v 1.5 2006/10/08 18:04:30 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/tapioca-xmpp/ChangeLog,v 1.6 2006/12/03 10:39:03 peper Exp $ + + 03 Dec 2006; Piotr Jaroszyński + tapioca-xmpp-0.3.9.ebuild: + Fix dep: dbus wrt bug #154521. 08 Oct 2006; Simon Stelling tapioca-xmpp-0.3.9.ebuild: added ~amd64 diff --git a/net-im/tapioca-xmpp/tapioca-xmpp-0.3.9.ebuild b/net-im/tapioca-xmpp/tapioca-xmpp-0.3.9.ebuild index fa44607a7010..72dbeef7552e 100644 --- a/net-im/tapioca-xmpp/tapioca-xmpp-0.3.9.ebuild +++ b/net-im/tapioca-xmpp/tapioca-xmpp-0.3.9.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/tapioca-xmpp/tapioca-xmpp-0.3.9.ebuild,v 1.4 2006/10/08 18:04:30 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/tapioca-xmpp/tapioca-xmpp-0.3.9.ebuild,v 1.5 2006/12/03 10:39:03 peper Exp $ DESCRIPTION="Tapioca XMPP protocol" HOMEPAGE="http://tapioca-voip.sf.net" @@ -9,10 +9,13 @@ SLOT="0" LICENSE="LGPL-2" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="net-im/tapiocad +DEPEND="net-im/tapiocad net-libs/libjingle >=dev-libs/glib-2 - sys-apps/dbus" + || ( >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.34 ) )" + +RDEPEND="${DEPEND}" src_install() { make DESTDIR=${D} install || die "make install failed" diff --git a/net-im/tapiocad/ChangeLog b/net-im/tapiocad/ChangeLog index 56521bc0f34c..3298706f3830 100644 --- a/net-im/tapiocad/ChangeLog +++ b/net-im/tapiocad/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/tapiocad # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocad/ChangeLog,v 1.3 2006/10/08 18:04:22 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocad/ChangeLog,v 1.4 2006/12/03 10:35:24 peper Exp $ + + 03 Dec 2006; Piotr Jaroszyński tapiocad-0.3.9.ebuild: + Fix dep: dbus wrt bug #154521. 08 Oct 2006; Simon Stelling tapiocad-0.3.9.ebuild: added ~amd64 diff --git a/net-im/tapiocad/tapiocad-0.3.9.ebuild b/net-im/tapiocad/tapiocad-0.3.9.ebuild index f4a9221e30ed..1b1f482aeac0 100644 --- a/net-im/tapiocad/tapiocad-0.3.9.ebuild +++ b/net-im/tapiocad/tapiocad-0.3.9.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/tapiocad/tapiocad-0.3.9.ebuild,v 1.2 2006/10/08 18:04:22 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocad/tapiocad-0.3.9.ebuild,v 1.3 2006/12/03 10:35:24 peper Exp $ DESCRIPTION="Tapioca framework for VOIP and IM" HOMEPAGE="http://tapioca-voip.sf.net" @@ -11,7 +11,8 @@ KEYWORDS="~amd64 ~x86" IUSE="" S="${WORKDIR}/tapioca-${PV}" RDEPEND=">=dev-libs/glib-2 - sys-apps/dbus" + || ( >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.34 ) )" src_install() { make DESTDIR=${D} install || die "make install failed"