[gentoo-commits] proj/gnome:master commit in: gnome-extra/zenity/files/, gnome-extra/zenity/

[Nirbheek Chauhan]

commit:     24bfc97d869b73fc8852be153d18496582bdaee8
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 17:17:20 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 17:30:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=24bfc97d

gnome-extra/zenity: fix build with USE=-libnotify, and no libnotify installed

* Fixes bug 369577

---
 .../files/zenity-3.0.0-libnotify-ifdef.patch       |   30 ++++++++++++++++++++
 gnome-extra/zenity/zenity-3.0.0.ebuild             |   10 ++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch b/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch
new file mode 100644
index 0000000..1599677
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch
@@ -0,0 +1,30 @@
+From 3388135658e8a8f56da7fd01015490c2c97958ee Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@g.o>
+Date: Thu, 2 Jun 2011 22:42:33 +0530
+Subject: [PATCH] Fix bug 651723, don't look for libnotify.h if not requested
+
+---
+ src/notification.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/notification.c b/src/notification.c
+index 41d64e2..3f4c454 100644
+--- a/src/notification.c
++++ b/src/notification.c
+@@ -29,12 +29,12 @@
+ #include <gtk/gtk.h>
+ #include <time.h>
+ #include <string.h>
++#ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ 
+ #include "zenity.h"
+ #include "util.h"
+ 
+-#ifdef HAVE_LIBNOTIFY
+ static char *icon_file;
+ 
+ static void
+-- 
+1.7.3.4
+

diff --git a/gnome-extra/zenity/zenity-3.0.0.ebuild b/gnome-extra/zenity/zenity-3.0.0.ebuild
index f219e19..80eedab 100644
--- a/gnome-extra/zenity/zenity-3.0.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.0.0.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.32.1.ebuild,v 1.1 2010/11/29 18:40:56 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
 HOMEPAGE="http://live.gnome.org/Zenity"
@@ -34,10 +34,14 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		$(use_enable libnotify)
-		PERL=$(type -p false)"
+		PERL=$(type -P false)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libnotify-ifdef.patch"
+	gnome2_src_prepare
+}
 
 src_install() {
 	gnome2_src_install