Use Python 2 (bug #315093).

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 47 insertions, 25 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 5f14e6520a64..a0ae941e1597 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/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
index 8542478836b9..586aed8fba99 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
 
@@ -43,7 +44,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? (
@@ -60,7 +60,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() {
 		--disable-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
diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild
index 99c76a5e6b18..b015abe8ced9 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
 
@@ -35,7 +38,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? (
@@ -52,6 +54,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!"
@@ -132,8 +140,7 @@ src_configure() {
 		--disable-qt3 \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 }
 
 src_compile() {
@@ -169,13 +176,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 cac6c381b30e..92d55563a341 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
 
@@ -43,7 +44,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? (
@@ -60,7 +60,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
@@ -153,8 +158,7 @@ src_compile() {
 		--disable-qt3 \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 	emake || die "emake failed"
 
 	use doc && emake avahi.devhelp
@@ -187,13 +191,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