[net-dns/avahi] Update from main portage tree

5 files changed, 51 insertions, 29 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 5f14e652..a0ae941e 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.173 2010/02/09 14:02:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.174 2010/05/19 19:14:47 arfrever Exp $
+
+  19 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  avahi-0.6.24-r2.ebuild, avahi-0.6.25.ebuild, avahi-0.6.25-r1.ebuild:
+  Use Python 2 (bug #315093).
 
 *avahi-0.6.25-r1 (09 Feb 2010)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 608c86c6..1c890340 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -5,8 +5,8 @@ AUX avahi-0.6.24-cmsg_space.patch 449 RMD160 9593ee893daf908e35f36a7396ae5d52a76
 AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957b5 SHA1 c9f8ef5d0047b591e6e88153731ae380d64a2431 SHA256 fb8e37d6071a990184a7ad3c20a7709554103fb2c4f02450c338b9fbcf358215
 DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
 DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
-EBUILD avahi-0.6.24-r2.ebuild 5291 RMD160 6025eb3ee902ac67fcd114461eaffe4c6fbf77c8 SHA1 f0e8f33d626f44a66f8d016cf66dfbff9c213c4b SHA256 39f244d90ab318750317289646445416a5a1e1b0f8fa733fbf827a1c01560761
-EBUILD avahi-0.6.25-r1.ebuild 4785 RMD160 c4fbcbebdb5b245f420c15242654d2a023adcfaf SHA1 770181b3b34a2678e7e4a29daaef700367b79005 SHA256 a17ad4abad9ec639583b5bfa86f875eccd965a3cf4cb3b9173b10e76ca52e46d
-EBUILD avahi-0.6.25.ebuild 5243 RMD160 f95574bfc1a13b8fb68b2a0eeca9eb252ab4375d SHA1 a9f5f139fa8706698021cd109ea80dc81cb539b3 SHA256 70022764b371c9fbc3bf8116a8f0f0817436deb1aa9e6bfaf61ada6859d0b930
-MISC ChangeLog 25974 RMD160 7419cd66251b64bc394ed264c2032c54c6c28c85 SHA1 3e6646ec447e7914ee8763e29f6365b145d151c1 SHA256 8e30677ba74c203d0e427c9a97fe55b685499a360428055ed7584a7b428af684
+EBUILD avahi-0.6.24-r2.ebuild 5400 RMD160 f955a49312b3d0b269e08358c1dce3a6ad00f037 SHA1 12f531483b56407b83be6ed2639d79f671c23226 SHA256 8ea2e741aea77123d87ba83f71cdebde92886e8716554916b87a9a79bd67d018
+EBUILD avahi-0.6.25-r1.ebuild 4866 RMD160 ad84c41cae3d7cae4031724eb7689f1f15b9ae30 SHA1 8b65604c02ad5d04968b607de8bf241868be727b SHA256 0bbe2db1ba8453db0f6eae360cc23fd269ce006a83600819284dce1aa3cee97b
+EBUILD avahi-0.6.25.ebuild 5352 RMD160 0fb9fe844fba482fbfc95caf8744b71539c55324 SHA1 353f53cbbf73ed27c5b85629fd2e09374f08a251 SHA256 854cb5b236f3109a227970a9aa99904c1f947680a8bef1345c3e98bdc89d0efa
+MISC ChangeLog 26148 RMD160 16a98ad232a0f11404722090fc9c82c3b92bbd10 SHA1 84db8b548895af9047e7ce863d690cc1e620d347 SHA256 8bbd2b087b249db25e6aaaf46107906ca6dacfaba4f1f8f92d62417257fce959
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
index cef07b54..2f62cb73 100644
--- a/net-dns/avahi/avahi-0.6.24-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.24-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.13 2010/01/03 15:23:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.14 2010/05/19 19:14:47 arfrever Exp $
 
 EAPI="1"
+PYTHON_DEPEND="python? 2"
 
 inherit eutils mono python multilib autotools flag-o-matic
 
@@ -44,7 +45,6 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
 	python? (
-		>=virtual/python-2.4
 		gtk? ( >=dev-python/pygtk-2 )
 	)
 	bookmarks? (
@@ -61,7 +61,12 @@ DEPEND="${RDEPEND}
 	)"
 
 pkg_setup() {
-	if use python && ! built_with_use dev-lang/python gdbm
+	if use python
+	then
+		python_set_active_version 2
+	fi
+
+	if use python && ! built_with_use "=dev-lang/python-2*" gdbm
 	then
 		die "For python support you need dev-lang/python compiled with gdbm support!"
 	fi
@@ -155,8 +160,7 @@ src_compile() {
 		$(use_enable qt3) \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 	emake || die "emake failed"
 
 	use doc && emake avahi.devhelp
@@ -189,13 +193,14 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup
+	if use python; then
+		python_mod_cleanup $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
+	fi
 }
 
 pkg_postinst() {
 	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+		python_mod_optimize $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
 	fi
 
 	if use autoipd
diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild
index 9bdc71ca..798a50ff 100644
--- a/net-dns/avahi/avahi-0.6.25-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.25-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.1 2010/02/09 14:02:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.2 2010/05/19 19:14:47 arfrever Exp $
 
-EAPI=2
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="gdbm"
+PYTHON_USE_WITH_OPT="python"
 
 inherit eutils mono python multilib autotools flag-o-matic
 
@@ -36,7 +39,6 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
 	python? (
-		>=dev-lang/python-2.4[gdbm]
 		gtk? ( >=dev-python/pygtk-2 )
 	)
 	bookmarks? (
@@ -53,6 +55,12 @@ DEPEND="${RDEPEND}
 	)"
 
 pkg_setup() {
+	if use python
+	then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
 	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
 	then
 		die "For *-compat or mono support you also need to enable the dbus USE flag!"
@@ -133,8 +141,7 @@ src_configure() {
 		$(use_enable qt3) \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 }
 
 src_compile() {
@@ -170,13 +177,14 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup
+	if use python; then
+		python_mod_cleanup avahi avahi_discover
+	fi
 }
 
 pkg_postinst() {
 	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+		python_mod_optimize avahi avahi_discover
 	fi
 
 	if use autoipd
diff --git a/net-dns/avahi/avahi-0.6.25.ebuild b/net-dns/avahi/avahi-0.6.25.ebuild
index 1596060a..256bcb63 100644
--- a/net-dns/avahi/avahi-0.6.25.ebuild
+++ b/net-dns/avahi/avahi-0.6.25.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.5 2010/01/03 15:23:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.6 2010/05/19 19:14:47 arfrever Exp $
 
 EAPI="1"
+PYTHON_DEPEND="python? 2"
 
 inherit eutils mono python multilib autotools flag-o-matic
 
@@ -44,7 +45,6 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
 	python? (
-		>=virtual/python-2.4
 		gtk? ( >=dev-python/pygtk-2 )
 	)
 	bookmarks? (
@@ -61,7 +61,12 @@ DEPEND="${RDEPEND}
 	)"
 
 pkg_setup() {
-	if use python && ! built_with_use dev-lang/python gdbm
+	if use python
+	then
+		python_set_active_version 2
+	fi
+
+	if use python && ! built_with_use "=dev-lang/python-2*" gdbm
 	then
 		die "For python support you need dev-lang/python compiled with gdbm support!"
 	fi
@@ -154,8 +159,7 @@ src_compile() {
 		$(use_enable qt3) \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 	emake || die "emake failed"
 
 	use doc && emake avahi.devhelp
@@ -188,13 +192,14 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup
+	if use python; then
+		python_mod_cleanup $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
+	fi
 }
 
 pkg_postinst() {
 	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+		python_mod_optimize $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
 	fi
 
 	if use autoipd