[gentoo-commits] gentoo-x86 commit in gnome-extra/avant-window-navigator-extras: ChangeLog avant-window-navigator-extras-0.2.6-r1.ebuild avant-window-navigator-extras-0.2.1-r1.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/avant-window-navigator-extras: ChangeLog avant-window-navigator-extras-0.2.6-r1.ebuild avant-window-navigator-extras-0.2.1-r1.ebuild

[Gilles Dartiguelongue (eva)]

eva         08/12/04 21:50:23

  Modified:             ChangeLog
                        avant-window-navigator-extras-0.2.6-r1.ebuild
  Removed:              avant-window-navigator-extras-0.2.1-r1.ebuild
  Log:
  Fix compilation with USE=xfce, bug #216746.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

Revision  Changes    Path
1.11                 gnome-extra/avant-window-navigator-extras/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	14 Jul 2008 16:28:13 -0000	1.10
+++ ChangeLog	4 Dec 2008 21:50:23 -0000	1.11
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/avant-window-navigator-extras
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.10 2008/07/14 16:28:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.11 2008/12/04 21:50:23 eva Exp $
+
+  04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/avant-window-navigator-extras-0.2.6-xfce-build.patch,
+  -avant-window-navigator-extras-0.2.1-r1.ebuild,
+  avant-window-navigator-extras-0.2.6-r1.ebuild:
+  Fix compilation with USE="xfce", bug #216746.
 
   14 Jul 2008; William L. Thomson Jr. <wltjr@gentoo.org>
   avant-window-navigator-extras-0.2.6-r1.ebuild:



1.7                  gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild?r1=1.6&r2=1.7

Index: avant-window-navigator-extras-0.2.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avant-window-navigator-extras-0.2.6-r1.ebuild	14 Jul 2008 16:28:13 -0000	1.6
+++ avant-window-navigator-extras-0.2.6-r1.ebuild	4 Dec 2008 21:50:23 -0000	1.7
@@ -1,6 +1,6 @@
 # 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-extras/avant-window-navigator-extras-0.2.6-r1.ebuild,v 1.6 2008/07/14 16:28:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild,v 1.7 2008/12/04 21:50:23 eva Exp $
 
 inherit autotools eutils gnome2 python
 
@@ -14,7 +14,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
-DEPEND="dev-python/pyalsaaudio
+RDEPEND="dev-python/pyalsaaudio
 	dev-python/feedparser
 	gnome? (
 		dev-python/gst-python
@@ -26,7 +26,7 @@
 	gnome-extra/avant-window-navigator
 	x11-libs/libsexy
 	x11-libs/libnotify"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS Changelog NEWS README"
 
@@ -42,6 +42,9 @@
 src_unpack() {
 	gnome2_src_unpack
 
+	# Fix compilation with USE="xfce", bug #216746
+	epatch "${FILESDIR}/${P}-xfce-build.patch"
+
 	# Apply a fix from awn bzr to make gconf truly conditional.
 	epatch "${FILESDIR}"/${PV}-r346-gconf-conditional.patch
 	eautoreconf
@@ -54,9 +57,8 @@
 src_compile() {
 	# Not disabling pymod-checks results in a sandbox access violation.
 	econf --disable-pymod-checks \
-			$(use_with gnome) \
-			$(use_with gnome gconf) \
-			|| die "econf failed"
+		$(use_with gnome) \
+		$(use_with gnome gconf)
 
 	# temp hack to remove problem per bug #214984
 	if ! use gnome && ! use xfce; then
@@ -94,11 +96,11 @@
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_version
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/awn/extras
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/awn/extras
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
 	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/awn/extras
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/awn/extras
 }