Fix compilation with USE=xfce, bug #216746.

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

4 files changed, 43 insertions, 50 deletions

diff --git a/gnome-extra/avant-window-navigator-extras/ChangeLog b/gnome-extra/avant-window-navigator-extras/ChangeLog
index 5c00e639ac83..b0338df318a7 100644
--- a/gnome-extra/avant-window-navigator-extras/ChangeLog
+++ b/gnome-extra/avant-window-navigator-extras/ChangeLog
@@ -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:
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1-r1.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1-r1.ebuild
deleted file mode 100644
index f7bdaaa2135a..000000000000
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 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.1-r1.ebuild,v 1.1 2007/12/06 17:42:36 wltjr Exp $
-
-inherit gnome2
-
-MY_P="awn-extras-applets-${PV}"
-DESCRIPTION="Applets for the avant-window-navigator"
-HOMEPAGE="http://launchpad.net/awn-extras"
-SRC_URI="http://launchpad.net/awn-extras/${PV}/${PV}/+download/awn-extras-applets-${PV}.tar"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pyalsaaudio
-	gnome-base/gnome-menus
-	gnome-base/librsvg
-	gnome-base/libgtop
-	gnome-extra/avant-window-navigator
-	net-libs/libgmail
-	x11-libs/libsexy
-	x11-libs/libnotify"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	gnome2_src_install
-	mv "${D}/etc/gconf/schemas/notification-daemon.schemas" \
-		"${D}/etc/gconf/schemas/awn-notification-daemon.schemas"
-	mv "${D}/etc/gconf/schemas/awnsystemmonitor.schemas" \
-		"${D}/etc/gconf/schemas/awn-system-monitor.schemas"
-	mv "${D}/etc/gconf/schemas/filebrowser.schemas" \
-		"${D}/etc/gconf/schemas/awn-filebrowser.schemas"
-	mv "${D}/etc/gconf/schemas/switcher.schemas" \
-		"${D}/etc/gconf/schemas/awn-switcher.schemas"
-	mv "${D}/etc/gconf/schemas/trash.schemas" \
-		"${D}/etc/gconf/schemas/awn-trash.schemas"
-}
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild
index 1d941dee41c9..9ea7d6ef9d13 100644
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6-r1.ebuild
@@ -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 @@ SLOT="0"
 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 @@ DEPEND="dev-python/pyalsaaudio
 	gnome-extra/avant-window-navigator
 	x11-libs/libsexy
 	x11-libs/libnotify"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS Changelog NEWS README"
 
@@ -42,6 +42,9 @@ pkg_setup() {
 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_unpack() {
 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 @@ src_install() {
 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
 }
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.2.6-xfce-build.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.2.6-xfce-build.patch
new file mode 100644
index 000000000000..97d6d073b551
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.2.6-xfce-build.patch
@@ -0,0 +1,26 @@
+#
+# Fix build failures with USE="xfce"
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=216746
+#
+--- a/src/affinity/aff-results.c	2008-02-14 09:49:53.000000000 -0700
++++ b/src/affinity/aff-results.c	2008-05-15 18:14:09.000000000 -0600
+@@ -422,7 +422,7 @@
+ 		const char *name = gnome_vfs_mime_application_get_name (app);
+ 		const char *icon_name = gnome_vfs_mime_application_get_icon (app);
+ #elif defined(LIBAWN_USE_XFCE)
+-		ThunarVfsMimeApplication *app = (ThunarVfsApplication *)a->data;
++		ThunarVfsMimeApplication *app = (ThunarVfsMimeApplication *)a->data;
+ 		const char *name = thunar_vfs_mime_application_get_name (app);
+ 		const char *icon_name = thunar_vfs_mime_handler_lookup_icon_name (THUNAR_VFS_MIME_HANDLER (app), gtk_icon_theme_get_default ());
+ #else
+--- a/src/affinity/aff-start.c	2008-02-14 09:49:53.000000000 -0700
++++ b/src/affinity/aff-start.c	2008-05-15 18:14:09.000000000 -0600
+@@ -203,7 +203,7 @@
+ #ifdef LIBAWN_USE_GNOME
+ 	local_uri = gnome_vfs_get_local_path_from_uri (gtk_recent_info_get_uri (info));
+ #elif defined(LIBAWN_USE_XFCE)
+-	ThunarVfsPath *path = thunar_vfs_path_new (gtk_recent_info_get_uri (info));
++	ThunarVfsPath *path = thunar_vfs_path_new (gtk_recent_info_get_uri (info), NULL);
+ 	local_uri = thunar_vfs_path_dup_string (path);
+ 	thunar_vfs_path_unref (path);
+ #else