Merged addtional changes from ebuild in bug #146298, thanks to Sebastian Rijkers for the contributions.

(Portage version: 2.1.4.1)

2 files changed, 50 insertions, 17 deletions

diff --git a/gnome-extra/avant-window-navigator/ChangeLog b/gnome-extra/avant-window-navigator/ChangeLog
index 7fed0ba45e8e..60639a6c116e 100644
--- a/gnome-extra/avant-window-navigator/ChangeLog
+++ b/gnome-extra/avant-window-navigator/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2008/03/25 20:17:27 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.5 2008/03/26 00:26:03 wltjr Exp $
+
+*avant-window-navigator-0.2.6-r1 (26 Mar 2008)
+
+  26 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -avant-window-navigator-0.2.6.ebuild,
+  +avant-window-navigator-0.2.6-r1.ebuild:
+  Merged addtional changes from ebuild in bug #146298, thanks to Sebastian
+  Rijkers for the contributions.
 
 *avant-window-navigator-0.2.6 (25 Mar 2008)
 
diff --git a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6.ebuild b/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild
index 8b3b3c01150d..8b8d3a254be6 100644
--- a/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6.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.ebuild,v 1.1 2008/03/25 20:17:27 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/avant-window-navigator-0.2.6-r1.ebuild,v 1.1 2008/03/26 00:26:03 wltjr Exp $
 
-inherit gnome2 autotools
+inherit autotools gnome2 python
 
 DESCRIPTION="Fully customisable dock-like window navigator."
 HOMEPAGE="http://launchpad.net/awn"
@@ -12,51 +12,76 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # vala is not in tree yet
-#IUSE="gconf gnome vala xfce"
-IUSE="gconf gnome xfce"
+#IUSE="doc gnome vala xfce"
+IUSE="doc gnome xfce"
 
 # Replace gnome-vfs with gvfs when unmasked
 #		gnome-base/gvfs
 
-DEPEND="
-	dev-util/gtk-doc
-	x11-libs/gtk+
-	x11-libs/libwnck
-	gconf? ( gnome-base/gconf )
+DEPEND="dev-python/pygtk
+	dev-python/pycairo
+	dev-python/pyxdg
+	doc? ( dev-util/gtk-doc )
 	gnome? (
+		gnome-base/gconf
 		gnome-base/gnome-desktop
 		gnome-base/gnome-vfs
 		gnome-base/libgnome
 	)
+	gnome-base/libglade
+	!gnome? ( !xfce? ( >=dev-libs/glib-2.15.0 ) )
+	dev-libs/dbus-glib
 	xfce? ( xfce-base/thunar )
-	!gnome? ( !xfce? ( >=dev-libs/glib-2.15.0 ) )"
+	x11-libs/gtk+
+	x11-libs/libwnck"
 
-RDEPEND="${DEPEND}
-	dev-python/pyxdg"
 # vala is not in tree yet
 #	vala? ( dev-lang/vala )"
 
+RDEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	gtkdocize || die "gtkdocsize failed"
 	eautoreconf || die "eautoreconf failed"
 	intltoolize --copy --force || die "intltoolize failed"
+
+	# Disable pyc compiling.
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
 }
 
 src_compile() {
 	local myconf
 
-	# These are alternatives so it won't work with use_with
 	if use gnome; then myconf="--with-desktop=gnome"
 	elif use xfce; then myconf="--with-desktop=xfce4"
 	else myconf="--with-desktop=agnostic"
 	fi
 
-	econf ${myconf} \
-		$(use_enable gconf) \
-		$(use_enable vala) \
+	econf $(use_enable gnome gconf ) \
+		$(use_enable doc gtk-doc) \
+		--disable-vala \
+		${myconf} \
 		|| die "econf failed"
 
+#		$(use_enable vala) \
+
 	emake || die "emake failed"
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/awn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/awn
+}