Version bump and fix dbus dep wrt bug #154521.

(Portage version: 2.1.2_rc2)

4 files changed, 60 insertions, 3 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 442318dc4c6a..60eeb66fa0cf 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.7 2006/11/13 14:04:13 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.8 2006/11/22 14:23:37 peper Exp $
+
+*telepathy-gabble-0.4.6 (22 Nov 2006)
+
+  22 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  -telepathy-gabble-0.4.4.ebuild, telepathy-gabble-0.4.5.ebuild,
+  +telepathy-gabble-0.4.6.ebuild:
+  Version bump and fix dbus dep wrt bug #154521.
 
   13 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
   telepathy-gabble-0.4.5.ebuild:
diff --git a/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.4.6 b/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.4.6
new file mode 100644
index 000000000000..79ae65f7326d
--- /dev/null
+++ b/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.4.6
@@ -0,0 +1,3 @@
+MD5 3ee97eef127ff00e9d2ac4d18e4c4d05 telepathy-gabble-0.4.6.tar.gz 544286
+RMD160 9411427bef26eee48626db2b4665f30061415dc3 telepathy-gabble-0.4.6.tar.gz 544286
+SHA256 708ed1dc8a6c87308b74e18b7ac8d84051cc643c67d5d93557ce716b31c92621 telepathy-gabble-0.4.6.tar.gz 544286
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.4.5.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.4.5.ebuild
index 2068e3e24cdf..0e37984428d3 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.4.5.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.4.5.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-voip/telepathy-gabble/telepathy-gabble-0.4.5.ebuild,v 1.2 2006/11/13 14:04:13 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.4.5.ebuild,v 1.3 2006/11/22 14:23:37 peper Exp $
 
 DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -12,7 +12,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug loudmouth"
 
 DEPEND=">=dev-libs/glib-2.4
-	>=sys-apps/dbus-0.61
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )
 	loudmouth? ( >=net-libs/loudmouth-1.1.1 )"
 RDEPEND="${DEPEND}"
 
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.4.6.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.4.6.ebuild
new file mode 100644
index 000000000000..3205c5123672
--- /dev/null
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.4.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.4.6.ebuild,v 1.1 2006/11/22 14:23:37 peper Exp $
+
+DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug loudmouth"
+
+DEPEND=">=dev-libs/glib-2.4
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) )
+	loudmouth? ( >=net-libs/loudmouth-1.1.1 )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable debug backtrace) \
+		$(use_enable debug handle-leak-debug) \
+		$(use_enable loudmouth) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_test() {
+	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	if ! dbus-launch emake -j1 check; then
+		hasq test $FEATURES && die "Make check failed. See above for details."
+		hasq test $FEATURES || eerror "Make check failed.  See above for details."
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc AUTHORS README ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	elog "You don't need to start telepathy-gabble manualy any more."
+	elog "dbus will take care of that."
+}