Enable the compat support without requiring the dbus USE flag.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 72 insertions, 13 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/Manifest b/net-dns/avahi/Manifest
index daae4613cf64..9cdfea512230 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,7 +1,38 @@
-MD5 65a2355e8863a1b54ceb0974720c202e ChangeLog 5762
-MD5 e0c9494e5776b44ee75863cac66c1d68 avahi-0.6.10.ebuild 2936
-MD5 90198cace9cebc6543157ac49c4580ea avahi-0.6.9.ebuild 2926
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 size 362
 MD5 317c28eba6516a18140aa8e2cb26d618 files/avahi-0.6.1-no-ipv6.patch 362
-MD5 81fd873834c9e72c591828a31b0d1ccc files/digest-avahi-0.6.10 64
-MD5 2290f3ed38ccc8b5f1b88b3da0020a3d files/digest-avahi-0.6.9 235
+RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 files/avahi-0.6.1-no-ipv6.patch 362
+SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 files/avahi-0.6.1-no-ipv6.patch 362
+DIST avahi-0.6.10.tar.gz 879819 RMD160 59274b5314476830614fe9cb2d90e59eec3aba0f SHA256 780d9d171681bb37c3067b50ddb85a8f741f2b3f0e435cfedf60bb32635243ac size 879819
+DIST avahi-0.6.9.tar.gz 873201 RMD160 aa24acf73020aea2162430a1486b010faf6f3a89 SHA256 06ff5a190963abd2aed92b7b8f5deb4a5beb709e5c3d61876aab3c20fa593ed7 size 873201
+EBUILD avahi-0.6.10.ebuild 3081 RMD160 015b21524ac890492954a412e8300c741036b842 SHA1 2f102778442961229a7133e1de9cf6776cf308cb SHA256 d2b13c3da44c6cb34c4e2112ae31d51a48bb5cb8bb357fb0cf4804a839b86946 size 3081
+MD5 92f232ea86606c1947dee6d9cf8482af avahi-0.6.10.ebuild 3081
+RMD160 015b21524ac890492954a412e8300c741036b842 avahi-0.6.10.ebuild 3081
+SHA256 d2b13c3da44c6cb34c4e2112ae31d51a48bb5cb8bb357fb0cf4804a839b86946 avahi-0.6.10.ebuild 3081
+EBUILD avahi-0.6.9.ebuild 3072 RMD160 d83be2b6e9dbf934908a2efd294ad01092adeae8 SHA1 6f2e4e27509d8046bcfacaba5b147e7292ba1cea SHA256 02dc2e6c02bdfd15c2a770ffd3145cc07ec04654faed0f27599543d0a692b61d size 3072
+MD5 fdc312b5a2095880052678d33e9ebb53 avahi-0.6.9.ebuild 3072
+RMD160 d83be2b6e9dbf934908a2efd294ad01092adeae8 avahi-0.6.9.ebuild 3072
+SHA256 02dc2e6c02bdfd15c2a770ffd3145cc07ec04654faed0f27599543d0a692b61d avahi-0.6.9.ebuild 3072
+MISC ChangeLog 5919 RMD160 187e2a2d6ea32087e8c8d07fce2ff865dda27483 SHA1 14db508b57f381a85b982a6e0ab77e4168fd381f SHA256 660f0ef69144e151feba6ecadb94231d3b9af850d9d323106ea44c0d72e22368 size 5919
+MD5 e9aeee5b71182d7fcef74c03e58292a0 ChangeLog 5919
+RMD160 187e2a2d6ea32087e8c8d07fce2ff865dda27483 ChangeLog 5919
+SHA256 660f0ef69144e151feba6ecadb94231d3b9af850d9d323106ea44c0d72e22368 ChangeLog 5919
+MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d size 223
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
+RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
+SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata.xml 223
+MD5 93c7e0a877e52d9e2bfb829b708bd258 files/digest-avahi-0.6.10 238
+RMD160 016c6edc45d51d40f7c45c5f015df2f336e97a68 files/digest-avahi-0.6.10 238
+SHA256 389bb608ff57eedf32409a5979eda80b0987f2fa25e13994abf20b63b39233e4 files/digest-avahi-0.6.10 238
+MD5 2290f3ed38ccc8b5f1b88b3da0020a3d files/digest-avahi-0.6.9 235
+RMD160 6620fe5917030d7de8d3a86b9f8fa36bb3bf0941 files/digest-avahi-0.6.9 235
+SHA256 fc5b5847c423142c20ab4c76cbab55db1c1acc0456b6b8794ead358f96575766 files/digest-avahi-0.6.9 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEZvy7I1lqEGTUzyQRAoY4AJ94pMfEpL18J18K1isQpGiavqsYYACg1wFI
+q+ecWrrihhVqsvJHTh4Af28=
+=37KA
+-----END PGP SIGNATURE-----
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