Make the pygtk support dependant on the gtk USE flag in addition to the python USE flag.

Package-Manager: portage-2.0.53_rc7

4 files changed, 25 insertions, 8 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c12d8f371467..3441c686d179 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.16 2005/11/04 07:33:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.17 2005/11/07 16:05:25 swegener Exp $
+
+  07 Nov 2005; Sven Wegener <swegener@gentoo.org> avahi-0.5.2.ebuild,
+  avahi-0.5.2-r1.ebuild:
+  Make the pygtk support dependant on the gtk USE flag in addition to the
+  python USE flag.
 
 *avahi-0.5.2-r1 (04 Nov 2005)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index b91133c21b1f..d715e5defc01 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,6 @@
-MD5 6bf51ec1566c4c44321aaefb0fe02780 ChangeLog 2308
-MD5 2cce560198aeeb6d34407d1273e3adc5 avahi-0.5.2-r1.ebuild 1780
-MD5 eb01ee765712e8df85c7d6eb915921d4 avahi-0.5.2.ebuild 1725
+MD5 48cfa105754358cd80a40c483e179ded ChangeLog 2497
+MD5 a7e4c57708a5420a5fd4430ee451616f avahi-0.5.2-r1.ebuild 1872
+MD5 6769920260e0cab143749c95970fd1dd avahi-0.5.2.ebuild 1817
 MD5 b06b1183ea48e210c1943f0913f63714 files/digest-avahi-0.5.2 63
 MD5 b06b1183ea48e210c1943f0913f63714 files/digest-avahi-0.5.2-r1 63
 MD5 e522a390cede4510e8dbd0446e695912 metadata.xml 297
diff --git a/net-dns/avahi/avahi-0.5.2-r1.ebuild b/net-dns/avahi/avahi-0.5.2-r1.ebuild
index a4ba37740066..3d6c9518ddf9 100644
--- a/net-dns/avahi/avahi-0.5.2-r1.ebuild
+++ b/net-dns/avahi/avahi-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2-r1.ebuild,v 1.1 2005/11/04 07:33:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2-r1.ebuild,v 1.2 2005/11/07 16:05:25 swegener Exp $
 
 inherit eutils qt3 mono
 
@@ -26,7 +26,7 @@ RDEPEND="dev-libs/libdaemon
 		>=sys-apps/dbus-0.30
 		python? (
 			>=virtual/python-2.4
-			>=dev-python/pygtk-2
+			gtk? ( >=dev-python/pygtk-2 )
 		)
 	)"
 DEPEND="${RDEPEND}
@@ -53,6 +53,11 @@ src_compile() {
 	if use python && use dbus
 	then
 		myconf="${myconf} --enable-python"
+
+		if use gtk
+		then
+			myconf="${myconf} --enable-pygtk"
+		fi
 	fi
 
 	if use mono && use doc
@@ -64,6 +69,7 @@ src_compile() {
 		--localstatedir=/var \
 		--with-distro=gentoo \
 		--disable-python \
+		--disable-pygtk \
 		--disable-qt4 \
 		--disable-xmltoman \
 		--disable-mono-docs \
diff --git a/net-dns/avahi/avahi-0.5.2.ebuild b/net-dns/avahi/avahi-0.5.2.ebuild
index 3334514689d1..f7db6162a72f 100644
--- a/net-dns/avahi/avahi-0.5.2.ebuild
+++ b/net-dns/avahi/avahi-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2.ebuild,v 1.2 2005/11/04 07:23:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2.ebuild,v 1.3 2005/11/07 16:05:25 swegener Exp $
 
 inherit eutils qt3 mono
 
@@ -26,7 +26,7 @@ RDEPEND="dev-libs/libdaemon
 		>=sys-apps/dbus-0.30
 		python? (
 			>=virtual/python-2.4
-			>=dev-python/pygtk-2
+			gtk? ( >=dev-python/pygtk-2 )
 		)
 	)"
 DEPEND="${RDEPEND}
@@ -53,12 +53,18 @@ src_compile() {
 	if use python && use dbus
 	then
 		myconf="${myconf} --enable-python"
+
+		if use gtk
+		then
+			myconf="${myconf} --enable-pygtk"
+		fi
 	fi
 
 	econf \
 		--localstatedir=/var \
 		--with-distro=gentoo \
 		--disable-python \
+		--disable-pygtk \
 		--disable-qt4 \
 		--disable-xmltoman \
 		--disable-mono-docs \