touchup the python/dbus/gtk logic

Package-Manager: portage-2.0.53_rc7

3 files changed, 44 insertions, 41 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index d715e5defc01..20a7153f01f8 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,6 @@
 MD5 48cfa105754358cd80a40c483e179ded ChangeLog 2497
-MD5 a7e4c57708a5420a5fd4430ee451616f avahi-0.5.2-r1.ebuild 1872
-MD5 6769920260e0cab143749c95970fd1dd avahi-0.5.2.ebuild 1817
+MD5 9fa2619500653f5b9e040657544d1e5e avahi-0.5.2-r1.ebuild 2076
+MD5 caaff3c113236f4152c8cbbd0774c70d avahi-0.5.2.ebuild 1958
 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 3d6c9518ddf9..a5ac76e547de 100644
--- a/net-dns/avahi/avahi-0.5.2-r1.ebuild
+++ b/net-dns/avahi/avahi-0.5.2-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2005/11/07 16:05:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2-r1.ebuild,v 1.3 2005/11/10 11:07:30 swegener Exp $
 
-inherit eutils qt3 mono
+inherit eutils qt3 mono python
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://www.freedesktop.org/Software/Avahi"
@@ -22,12 +22,10 @@ RDEPEND="dev-libs/libdaemon
 		>=dev-libs/glib-2
 	)
 	mono? ( >=dev-lang/mono-1.1.3 )
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			>=virtual/python-2.4
-			gtk? ( >=dev-python/pygtk-2 )
-		)
+	dbus? ( >=sys-apps/dbus-0.30 )
+	python? (
+		>=virtual/python-2.4
+		gtk? ( >=dev-python/pygtk-2 )
 	)"
 DEPEND="${RDEPEND}
 	doc? (
@@ -38,7 +36,7 @@ DEPEND="${RDEPEND}
 export PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
 
 pkg_setup() {
-	if ! built_with_use dev-lang/python gdbm
+	if use python && ! built_with_use dev-lang/python gdbm
 	then
 		die "Need dev-lang/python compiled with gdbm support!"
 	fi
@@ -50,14 +48,10 @@ pkg_setup() {
 src_compile() {
 	local myconf=""
 
-	if use python && use dbus
+	if use python
 	then
-		myconf="${myconf} --enable-python"
-
-		if use gtk
-		then
-			myconf="${myconf} --enable-pygtk"
-		fi
+		use dbus && myconf="${myconf} --enable-python-dbus"
+		use gtk && myconf="${myconf} --enable-pygtk"
 	fi
 
 	if use mono && use doc
@@ -68,14 +62,15 @@ src_compile() {
 	econf \
 		--localstatedir=/var \
 		--with-distro=gentoo \
-		--disable-python \
-		--disable-pygtk \
 		--disable-qt4 \
+		--disable-python-dbus \
+		--disable-pygtk \
 		--disable-xmltoman \
 		--disable-mono-docs \
 		$(use_enable doc doxygen-doc) \
 		$(use_enable mono) \
 		$(use_enable dbus) \
+		$(use_enable python) \
 		$(use_enable gtk) \
 		$(use_enable qt qt3) \
 		$(use_enable gtk glib) \
@@ -89,3 +84,11 @@ src_install() {
 
 	dodoc docs/{AUTHORS,README,TODO}
 }
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
diff --git a/net-dns/avahi/avahi-0.5.2.ebuild b/net-dns/avahi/avahi-0.5.2.ebuild
index f7db6162a72f..b37d408be93d 100644
--- a/net-dns/avahi/avahi-0.5.2.ebuild
+++ b/net-dns/avahi/avahi-0.5.2.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2005/11/07 16:05:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2.ebuild,v 1.4 2005/11/10 11:07:30 swegener Exp $
 
-inherit eutils qt3 mono
+inherit eutils qt3 mono python
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://www.freedesktop.org/Software/Avahi"
@@ -22,23 +22,18 @@ RDEPEND="dev-libs/libdaemon
 		>=dev-libs/glib-2
 	)
 	mono? ( >=dev-lang/mono-1.1.3 )
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			>=virtual/python-2.4
-			gtk? ( >=dev-python/pygtk-2 )
-		)
+	dbus? ( >=sys-apps/dbus-0.30 )
+	python? (
+		>=virtual/python-2.4
+		gtk? ( >=dev-python/pygtk-2 )
 	)"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-# Future things:
-# doc? ( mono? ( >=dev-util/monodoc-1.18 ) )
-
 export PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
 
 pkg_setup() {
-	if ! built_with_use dev-lang/python gdbm
+	if use python && ! built_with_use dev-lang/python gdbm
 	then
 		die "Need dev-lang/python compiled with gdbm support!"
 	fi
@@ -50,27 +45,24 @@ pkg_setup() {
 src_compile() {
 	local myconf=""
 
-	if use python && use dbus
+	if use python
 	then
-		myconf="${myconf} --enable-python"
-
-		if use gtk
-		then
-			myconf="${myconf} --enable-pygtk"
-		fi
+		use dbus && myconf="${myconf} --enable-python-dbus"
+		use gtk && myconf="${myconf} --enable-pygtk"
 	fi
 
 	econf \
 		--localstatedir=/var \
 		--with-distro=gentoo \
-		--disable-python \
-		--disable-pygtk \
 		--disable-qt4 \
+		--disable-python-dbus \
+		--disable-pygtk \
 		--disable-xmltoman \
 		--disable-mono-docs \
 		$(use_enable doc doxygen-doc) \
 		$(use_enable mono) \
 		$(use_enable dbus) \
+		$(use_enable python) \
 		$(use_enable gtk) \
 		$(use_enable qt qt3) \
 		$(use_enable gtk glib) \
@@ -84,3 +76,11 @@ src_install() {
 
 	dodoc docs/{AUTHORS,README,TODO}
 }
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+}