Use Python 2 (bug #315093).

Package-Manager: portage-HEAD/cvs/Linux x86_64

5 files changed, 51 insertions, 39 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/Manifest b/net-dns/avahi/Manifest
index 2177b443eafb..1da3ef47a90d 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.24-CVE-2009-0758.patch 953 RMD160 7c1a2a2082c61d6feb05d985068122133b434b02 SHA1 429347d8b9f9022c5316ce1e5163a68fa7393b4f SHA256 e8a93a705ec07ca6a4c4c7634a97b9b2c5ee0712c9e80767c6bf7e3f4a5d6853
@@ -8,15 +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 5259 RMD160 426979132755c5871220cddd8050b052736b6dd1 SHA1 e3742c3cd02ed33071858559fc50dad93b9be768 SHA256 c075c8ba0fdf2198ed2bac6cbb19e9437e9580e52002b0eff6f85afa7bbf95ea
-EBUILD avahi-0.6.25-r1.ebuild 4753 RMD160 778b10e4d2a84bbaeedd10a8909b5815efbb7f69 SHA1 c7c60b71e32b017bc1ea2a5d2e19398e1e6c6d3c SHA256 5b74650f4a575d4d4143488f1b57558b9facd1e8460ea7c0dc116995a6acef0d
-EBUILD avahi-0.6.25.ebuild 5211 RMD160 187da4a87b3ece24796a404bcb865bacc35d709f SHA1 39b1e394a8d03ca69788d9b34f01f2006d342eb3 SHA256 1beff8e9aca0a64ded515d4cccfe77dca76156110301185fbb5f1cd653ace8bc
-MISC ChangeLog 25974 RMD160 7419cd66251b64bc394ed264c2032c54c6c28c85 SHA1 3e6646ec447e7914ee8763e29f6365b145d151c1 SHA256 8e30677ba74c203d0e427c9a97fe55b685499a360428055ed7584a7b428af684
+EBUILD avahi-0.6.24-r2.ebuild 5368 RMD160 ffeb883f4fb101cdb9e9ec59d64318f803b01ab8 SHA1 0180b1d944566ec426eb85ab4baa309435c2c4d4 SHA256 47ed3b27556a53fbbf862fb7eb50f96699a4df10d32d74e9e2ac0a0043f2edc8
+EBUILD avahi-0.6.25-r1.ebuild 4834 RMD160 6c6def09fbc2fb3088516ce951213f8dff2d2a46 SHA1 4a1c376080b404e36f0ed5bf9c11416d5d7d3fdf SHA256 d8b8e91774518d29d84fcff53167a030a35d305b2e172784ee3a41834173c80c
+EBUILD avahi-0.6.25.ebuild 5320 RMD160 c8dc95b5ed53685ae9f6c459dd99ec2309b890cf SHA1 31df3b118b824240ed76b5c36d79d90071650053 SHA256 612a5cac5ecbc42909f84ff3a10b41b090762ca467ed6cd238924e1ee7f84e42
+MISC ChangeLog 26148 RMD160 16a98ad232a0f11404722090fc9c82c3b92bbd10 SHA1 84db8b548895af9047e7ce863d690cc1e620d347 SHA256 8bbd2b087b249db25e6aaaf46107906ca6dacfaba4f1f8f92d62417257fce959
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktxaz4ACgkQAiZjviIA2XgfIwCeP3Za+fMAu5Vxg/Qq+6otdeYY
-EAcAoO9kfemk27VdO9DKFQi1hI//SGCY
-=QHcW
------END PGP SIGNATURE-----
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