Use Python 2 (bug #313453).

Package-Manager: portage-2.2.0_alpha30_p2/cvs/Linux x86_64

3 files changed, 41 insertions, 16 deletions

diff --git a/gnome-extra/avant-window-navigator/ChangeLog b/gnome-extra/avant-window-navigator/ChangeLog
index 05049aceab29..631f563ba5bb 100644
--- a/gnome-extra/avant-window-navigator/ChangeLog
+++ b/gnome-extra/avant-window-navigator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/avant-window-navigator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.27 2011/03/21 22:31:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.28 2011/04/25 20:43:46 arfrever Exp $
+
+  25 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  avant-window-navigator-0.3.2.1.ebuild:
+  Use Python 2 (bug #313453).
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   avant-window-navigator-0.3.2.1.ebuild:
diff --git a/gnome-extra/avant-window-navigator/Manifest b/gnome-extra/avant-window-navigator/Manifest
index 5e2c54fd3915..bd67f7f55311 100644
--- a/gnome-extra/avant-window-navigator/Manifest
+++ b/gnome-extra/avant-window-navigator/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST avant-window-navigator-0.3.2.1.tar.gz 997716 RMD160 04f0c8180ab4b589700b9aa6bbd821b7b24ab11f SHA1 3b663ebdd8ecca1c953343e8664e713746128242 SHA256 f10d728afcdf35c3f7e6cff57f478114f14d5db4b1c9bdc2dc2e582bcaedc21a
-EBUILD avant-window-navigator-0.3.2.1.ebuild 2004 RMD160 cab1d9f76c177843872151d6c52d3ee6ec4923dc SHA1 b982c695026b09e8c38259d95e3507f6fc90e46d SHA256 4cf0692c29690f58e745cdf7cdb90cbe039937862a4f5da2c592c7e06530e9aa
-MISC ChangeLog 5237 RMD160 65dd86ca2f37709a537add32cd52ae7e51449b31 SHA1 b1f5eb2b8a1804f3786a73bb48097d7a9a088682 SHA256 6d700768c686b136b3e179232928fb1fdb67adaf04aec3a280b4964a028580d1
+EBUILD avant-window-navigator-0.3.2.1.ebuild 1982 RMD160 56e3c80c652630d0159b900c60beb7cd6bab9f84 SHA1 8d3d5f6a2ca45a3f7ee7997567ef4319a8454f37 SHA256 5d89c7c897b88d84d011e260cadab1c5ec69190c9e39a64aa0045980a706fc35
+MISC ChangeLog 5382 RMD160 ac539c700fa1f27350b56d1bd1f2260eb2b70744 SHA1 7b50d469404676c4131d60907dc7196db0275c45 SHA256 3d8791f01b371c6eb84bd10f809c85b30d62403bd9fb27b1caf678dbae7788f2
 MISC metadata.xml 572 RMD160 5033f3a5664a41f39e50264d818d6e831a2b8cdc SHA1 62215673a80e2e85192bae452380d2e4580a1ecd SHA256 fedb966683b569cb9062ced6a96008f4ec5669baed668009a990b4bb4b784efa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNtd0QAAoJENgZr6v6gHY0rmMQAIVDUuvtXzQ2i+gkSh3vxkiD
+HNSDJD6Pit6C8BjNAHLZS5ZqE99EsuUs14BM3/4pUoXDgICadOAPyEYzi7Ssn9Wf
+gPVMFwCv44q7elZobHB+dc4yqufoyO9nMpRCOoXmx2zjGpaVkiQuJwfI5tMdEVpR
+PIor8/L4itBO31YKJugOlW+MIwFXBVCGekPuAlh6riTQHRh6pz2MQykcWdO4MW2e
+qmcXvr4FbZ1QPojDF5U1zeJDlDkzrejpPsgvbyw3gIdHLZmfXX8AfJkgoF//B36F
+3ZbZ5v/Q5SCBIzqW64vMZxCF7RvRYQie6Hnyw39TthFB7vF/ZmD5EYrU1IZ3lfGE
+nmHXwm3SI8J2swI5yifwefLayZpYH39c85zXWLRnHzhUINEb884G/nGOO1azBM58
+YCzhVtErhaLKqc+rHQFMO14Z2dQC2xL3b7K5+DIW2dhhEN1P4wLipARdo3+8Ygv4
+WAViqbAmpOGHI0cOaeIrVduJ+LJiBWKXt+k8fevZQlMzoNv6gtVsc0T2HBGb04YT
+/AtVZevwdl3JggTQmAx4JsOuTC/fKz9BqZpRJN5Crr2q0+YJz3NSnOhritS1Pm9B
+fhQTPMgbs7Bzsdyk3deoOl/5qsxJM7OroxQyR/9502AWRi58KepLfjcGVRtSi03G
+sUOwKVCX384kUXpT3711
+=yAe6
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/avant-window-navigator/avant-window-navigator-0.3.2.1.ebuild b/gnome-extra/avant-window-navigator/avant-window-navigator-0.3.2.1.ebuild
index 14bf20f7acfc..0f3cbfc57d41 100644
--- a/gnome-extra/avant-window-navigator/avant-window-navigator-0.3.2.1.ebuild
+++ b/gnome-extra/avant-window-navigator/avant-window-navigator-0.3.2.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.3.2.1.ebuild,v 1.8 2011/03/21 22:31:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.3.2.1.ebuild,v 1.9 2011/04/25 20:43:46 arfrever Exp $
 
-EAPI=1
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
 
 inherit gnome2 python
 
@@ -17,10 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc gnome thunar vala"
 
 RDEPEND="
-	|| (
-		=dev-lang/python-2*
-		dev-python/elementtree
-	)
 	dev-libs/dbus-glib
 	>=dev-libs/glib-2.16.0
 	dev-python/pycairo
@@ -46,15 +44,20 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-src_unpack() {
-	gnome2_src_unpack
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
 
 	# Disable pyc compiling.
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	if use gnome; then myconf="--with-desktop=gnome"
@@ -70,8 +73,6 @@ src_compile() {
 		VALAC=$(type -P valac-0.10) \
 		VALA_GEN_INTROSPECT=$(type -O vapigen-0.10) \
 		${myconf}
-
-	emake || die "emake failed"
 }
 
 pkg_postinst() {
@@ -80,10 +81,10 @@ pkg_postinst() {
 	ewarn
 	ewarn "AWN will be of no use if you do not have a compositing manager."
 
-	python_mod_optimize $(python_get_sitedir)/awn
+	python_mod_optimize awn
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup $(python_get_sitedir)/awn
+	python_mod_cleanup awn
 }