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

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

[Alexandre Restovtsev]

commit:     40197d4fd4ada280066e83850e4f27c5a7a3441a
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 05:59:55 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 21 06:07:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=40197d4f

gnome-extra/zenity: 3.0.0 → 3.1.5

Bump to gnome-3.1.x version. Now optionally uses webkit to display html.
Add missing gdk-pixbuf, pango, and libX11 dependencies (found by scanelf
and confirmed by inspecting the source code).

---
 .../files/zenity-3.0.0-libnotify-ifdef.patch       |   30 --------------------
 .../{zenity-3.0.0.ebuild => zenity-3.1.5.ebuild}   |   21 ++++++-------
 2 files changed, 10 insertions(+), 41 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
deleted file mode 100644
index 1599677..0000000
--- a/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3388135658e8a8f56da7fd01015490c2c97958ee Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-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.1.5.ebuild
similarity index 79%
rename from gnome-extra/zenity/zenity-3.0.0.ebuild
rename to gnome-extra/zenity/zenity-3.1.5.ebuild
index 39a5fd6..bcd54eb 100644
--- a/gnome-extra/zenity/zenity-3.0.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.1.5.ebuild
@@ -4,10 +4,9 @@
 
 EAPI="4"
 GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
 HOMEPAGE="http://live.gnome.org/Zenity"
@@ -15,11 +14,15 @@ HOMEPAGE="http://live.gnome.org/Zenity"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="libnotify"
+IUSE="libnotify webkit"
 
-RDEPEND=">=x11-libs/gtk+-3.0.0:3
-	>=dev-libs/glib-2.8:2
-	libnotify? ( >=x11-libs/libnotify-0.6.1 )"
+RDEPEND=">=dev-libs/glib-2.8:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/libX11
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.6.1 )
+	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -35,15 +38,11 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		$(use_enable libnotify)
+		$(use_enable webkit webkitgtk)
 		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