Fix tests and fix elementtree dependency. bug #242340.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

3 files changed, 33 insertions, 9 deletions

diff --git a/gnome-extra/avant-window-navigator/ChangeLog b/gnome-extra/avant-window-navigator/ChangeLog
index bf32b414ddb4..223d1812fdee 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.12 2008/07/28 18:24:53 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.13 2008/10/19 11:18:27 eva Exp $
+
+  19 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  avant-window-navigator-0.2.6-r1.ebuild:
+  Fix tests and fix elementtree dependency. bug #242340.
 
   28 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org> metadata.xml:
   Add local USE flags to metadata.xml
diff --git a/gnome-extra/avant-window-navigator/Manifest b/gnome-extra/avant-window-navigator/Manifest
index bad6643229ac..16c779803dd6 100644
--- a/gnome-extra/avant-window-navigator/Manifest
+++ b/gnome-extra/avant-window-navigator/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST avant-window-navigator-0.2.1.tar 763942 RMD160 78a9b7675b0959e2ba0ebcf7e83e8013faa13989 SHA1 f3e42d543586a746f02b9bcd458d8813667f91d1 SHA256 7f611c692de9821e0244dfe5fa67864b734f4b0aeb5344231144b64da7bbcd98
 DIST avant-window-navigator-0.2.6.tar.gz 981211 RMD160 7cf28a8cd91c3e817db12a404a819adb8c575f77 SHA1 4bf7e8f7866833af0b400ce6c4cee27f95592bbf SHA256 4c1d709febdbf0aad4f014f3a426f9950feef61c0c5478d0e5a602cccb0ca125
 EBUILD avant-window-navigator-0.2.1-r1.ebuild 1000 RMD160 efbcdc72b046eab136d9d9f76ea46ea9c8481d3a SHA1 53661b4c28a1ad9c17bd5616c442d23e1609559d SHA256 9c8fb13842bb07f531d0579825779ab2bfb92b173ddf5cb943e738b3211edae3
-EBUILD avant-window-navigator-0.2.6-r1.ebuild 1883 RMD160 7b38b244e1391226a20abbb7716cb5e91d7eb071 SHA1 1f732e1f2016a12ec26fffed0c7408034b6b1257 SHA256 b62e2ab50102f1d3d8aa620c30ae59cc19a1ffa77d56b5be5b7f801082f4c726
-MISC ChangeLog 2483 RMD160 e8b99bb79579b1ced7fa81251ac31e4390f1b928 SHA1 ccaa0fa2b26c8c43fdc26ebf1391928d413a3293 SHA256 dfbdcd50cc863ce26a5f6b49bc4987cc69d9eaf8890e42b02872aaff5d0a4adc
+EBUILD avant-window-navigator-0.2.6-r1.ebuild 2316 RMD160 406ec7da0772d9ff3d170573302f4b1f654ed550 SHA1 68b97ab6d1641193966e1aa91a33a8ea5c3ccfbe SHA256 1f5c1ed5fd83fd284b765019a18d9b658a552bef0a50cde87c2038cb08d2c0a3
+MISC ChangeLog 2628 RMD160 42822cd1cb592fe5854e0c52f4512776b8b5115a SHA1 f5292fbb89d2b044aa17f086ef209f75c73fb37c SHA256 42508a1660f405bd4c91856b2b2f296d0144b6815553c6bd2aa03fbda403ae8a
 MISC metadata.xml 558 RMD160 1b688b64c9a1c3b1040590d34373916ef0923089 SHA1 408b38646c614e50dfc3f48e1856d98532bdc400 SHA256 c77bdcc8a3a31d5e1faf87031136df985e36be1cdd777063d25304c34699e252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj7F4kACgkQ1fmVwcYIWAY+fQCg7+WSUuth6wPoLNKRGEdJVD1O
+z+QAn0G1N/UR/9OVHjoBGLEr6onA69EE
+=G3Dy
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
index 4ef89d4f0292..d95419f43fcc 100644
--- a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
+++ b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.2.6-r1.ebuild,v 1.7 2008/05/29 17:03:11 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild,v 1.8 2008/10/19 11:18:27 eva Exp $
 
-inherit autotools gnome2 python
+inherit gnome2 python
 
 DESCRIPTION="Fully customisable dock-like window navigator."
 HOMEPAGE="http://launchpad.net/awn"
@@ -18,7 +18,10 @@ IUSE="doc gnome xfce"
 # Replace gnome-vfs with gvfs when unmasked
 #		gnome-base/gvfs
 
-RDEPEND="dev-python/elementtree
+RDEPEND="
+	|| (
+		>=dev-lang/python-2.5
+		dev-python/elementtree )
 	dev-python/pygtk
 	dev-python/pycairo
 	dev-python/pyxdg
@@ -50,6 +53,15 @@ src_unpack() {
 	# Disable pyc compiling.
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	echo "awn-manager/awnLauncherEditor.py" >> po/POTFILES.in
+	echo "awn-manager/launcher-editor.glade" >> po/POTFILES.in
+	echo "data/awn.schemas.in" >> po/POTFILES.in
+	echo "libawn/egg/eggdesktopfile.c" >> po/POTFILES.in
+	echo "awn-manager/awnLauncherEditor.py" >> po/POTFILES.in
+	echo "awn-manager/launcher-editor.glade" >> po/POTFILES.in
+	echo "data/awn.schemas.in" >> po/POTFILES.in
+	echo "libawn/egg/eggdesktopfile.c" >> po/POTFILES.in
 }
 
 src_compile() {
@@ -63,9 +75,7 @@ src_compile() {
 	econf $(use_enable gnome gconf ) \
 		$(use_enable doc gtk-doc) \
 		--disable-vala \
-		${myconf} \
-		|| die "econf failed"
-
+		${myconf}
 #		$(use_enable vala) \
 
 	emake || die "emake failed"