Enable the compat support without requiring the dbus USE flag.

(Portage version: 2.1_pre10-r5)

4 files changed, 36 insertions, 8 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c0922564b789..3ea6c7a94f8d 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.40 2006/05/12 19:01:49 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.41 2006/05/14 09:46:36 swegener Exp $
+
+  14 May 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.9.ebuild,
+  avahi-0.6.10.ebuild:
+  Enable the compat support without requiring the dbus USE flag.
 
   12 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.10.ebuild:
   Added ~hppa, bug #131737
diff --git a/net-dns/avahi/avahi-0.6.10.ebuild b/net-dns/avahi/avahi-0.6.10.ebuild
index 8e86735a6c73..66c5e81b447b 100644
--- a/net-dns/avahi/avahi-0.6.10.ebuild
+++ b/net-dns/avahi/avahi-0.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.10.ebuild,v 1.2 2006/05/12 19:01:49 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.10.ebuild,v 1.3 2006/05/14 09:46:36 swegener Exp $
 
 inherit eutils qt3 mono python
 
@@ -10,7 +10,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt"
 
 # We have USE flags depending on each other, which leads to this logic. We
@@ -31,8 +31,14 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 	)
 	dbus? (
 		>=sys-apps/dbus-0.30
-		howl-compat? ( !net-misc/howl )
-		mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	)
+	howl-compat? (
+		!net-misc/howl
+		>=sys-apps/dbus-0.30
+	)
+	mdnsresponder-compat? (
+		!net-misc/mDNSResponder
+		>=sys-apps/dbus-0.30
 	)
 	python? (
 		>=virtual/python-2.4
@@ -87,6 +93,11 @@ src_compile() {
 		use doc && myconf="${myconf} --enable-monodoc"
 	fi
 
+	if use howl-compat || use mdnsresponder-compat?
+	then
+		myconf="${myconf} --enable-dbus"
+	fi
+
 	if use bookmarks
 	then
 		myconf="${myconf} --enable-python --enable-dbus --enable-python-dbus"
diff --git a/net-dns/avahi/avahi-0.6.9.ebuild b/net-dns/avahi/avahi-0.6.9.ebuild
index 1cfd9255bf20..f8ceb9921df3 100644
--- a/net-dns/avahi/avahi-0.6.9.ebuild
+++ b/net-dns/avahi/avahi-0.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.9.ebuild,v 1.7 2006/05/04 01:01:52 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.9.ebuild,v 1.8 2006/05/14 09:46:36 swegener Exp $
 
 inherit eutils qt3 mono python
 
@@ -31,8 +31,14 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 	)
 	dbus? (
 		>=sys-apps/dbus-0.30
-		howl-compat? ( !net-misc/howl )
-		mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	)
+	howl-compat? (
+		!net-misc/howl
+		>=sys-apps/dbus-0.30
+	)
+	mdnsresponder-compat? (
+		!net-misc/mDNSResponder
+		>=sys-apps/dbus-0.30
 	)
 	python? (
 		>=virtual/python-2.4
@@ -87,6 +93,11 @@ src_compile() {
 		use doc && myconf="${myconf} --enable-monodoc"
 	fi
 
+	if use howl-compat || use mdnsresponder-compat?
+	then
+		myconf="${myconf} --enable-dbus"
+	fi
+
 	if use bookmarks
 	then
 		myconf="${myconf} --enable-python --enable-dbus --enable-python-dbus"
diff --git a/net-dns/avahi/files/digest-avahi-0.6.10 b/net-dns/avahi/files/digest-avahi-0.6.10
index 4808b2e93631..b671b29b961f 100644
--- a/net-dns/avahi/files/digest-avahi-0.6.10
+++ b/net-dns/avahi/files/digest-avahi-0.6.10
@@ -1 +1,3 @@
 MD5 cfb9e05c138dff4c430a35eee6229e8a avahi-0.6.10.tar.gz 879819
+RMD160 59274b5314476830614fe9cb2d90e59eec3aba0f avahi-0.6.10.tar.gz 879819
+SHA256 780d9d171681bb37c3067b50ddb85a8f741f2b3f0e435cfedf60bb32635243ac avahi-0.6.10.tar.gz 879819