Tweak the configure logic.

Package-Manager: portage-2.1_pre7-r5

3 files changed, 53 insertions, 18 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index be326e8200ca..be6f28bd1fd8 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,9 @@
 # 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.35 2006/04/12 20:28:29 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.36 2006/04/18 20:01:41 swegener Exp $
+
+  18 Apr 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.9.ebuild:
+  Tweak the configure logic.
 
   12 Apr 2006; Thomas Cort <tcort@gentoo.org> avahi-0.6.9.ebuild:
   Added ~alpha keyword.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index a4f2c6b0795a..1563c33bf72c 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,5 +1,25 @@
-MD5 916e93bfc5d67bd4422461736632718c ChangeLog 5251
-MD5 fd18eb6055d4bf1008945211c10e4c53 avahi-0.6.9.ebuild 2596
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9f54f24c7ec24ad519f16237857393ee ChangeLog 5354
+RMD160 05feb4adca9e1781dbc80b2f4b18ad7adb4a65b1 ChangeLog 5354
+SHA256 5e3973f837acb371f8535e794ffe0b3cba58cfc8ffb1d61758c82a1b55e79f25 ChangeLog 5354
+MD5 6e77bc9faf55444a041cdb6a5bb77ead avahi-0.6.9.ebuild 2921
+RMD160 a08152bebe2674309316c1ccda52039b736101ad avahi-0.6.9.ebuild 2921
+SHA256 5bf1f3c680020f80c0a882baef8c8cb7c26f12bf35dafd8526fa5771764e66e6 avahi-0.6.9.ebuild 2921
 MD5 317c28eba6516a18140aa8e2cb26d618 files/avahi-0.6.1-no-ipv6.patch 362
+RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 files/avahi-0.6.1-no-ipv6.patch 362
+SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 files/avahi-0.6.1-no-ipv6.patch 362
 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
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
+RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
+SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFERUW3I1lqEGTUzyQRAsAnAKC+m0NEW9lq1s6MJWzuP2TFpjo9lACfSBVq
+uXcFUGFfQJQvw1n20WhDpy0=
+=JWtz
+-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.9.ebuild b/net-dns/avahi/avahi-0.6.9.ebuild
index 0c0afd53b00c..a1bf2ae1977d 100644
--- a/net-dns/avahi/avahi-0.6.9.ebuild
+++ b/net-dns/avahi/avahi-0.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4 2006/04/12 20:28:29 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.9.ebuild,v 1.5 2006/04/18 20:01:41 swegener Exp $
 
 inherit eutils qt3 mono python
 
@@ -13,6 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~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
+# prefer an activated USE flag and override the dependent USE flags.
+
 RDEPEND=">=dev-libs/libdaemon-0.5
 	dev-libs/expat
 	>=dev-libs/glib-2
@@ -22,24 +25,26 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 		>=x11-libs/gtk+-2
 		>=gnome-base/libglade-2
 	)
-	mono? ( >=dev-lang/mono-1.1.10 )
+	mono? (
+		>=dev-lang/mono-1.1.10
+		>=sys-apps/dbus-0.30
+	)
 	dbus? (
 		>=sys-apps/dbus-0.30
+		howl-compat? ( !net-misc/howl )
+		mdnsresponder-compat? ( !net-misc/mDNSResponder )
 	)
 	python? (
 		>=virtual/python-2.4
-		dbus? (
-			bookmarks? (
-				dev-python/twisted
-				dev-python/twisted-web
-			)
-		)
 		gtk? ( >=dev-python/pygtk-2 )
 	)
-	dbus? (
-		howl-compat? ( !net-misc/howl )
-		mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	)"
+	bookmarks? (
+		>=virtual/python-2.4
+		>=sys-apps/dbus-0.30
+		dev-python/twisted
+		dev-python/twisted-web
+	)
+	"
 DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen
@@ -75,9 +80,16 @@ src_compile() {
 		use gtk && myconf="${myconf} --enable-pygtk"
 	fi
 
-	if use mono && use doc
+	if use mono
+	then
+		myconf="${myconf} --enable-dbus"
+
+		use doc && myconf="${myconf} --enable-monodoc"
+	fi
+
+	if use bookmarks
 	then
-		myconf="${myconf} --enable-monodoc"
+		myconf="${myconf} --enable-python --enable-dbus --enable-python-dbus"
 	fi
 
 	econf \