Bump to 3.2.0 from the gnome overlay, drop old. Notable changes: HTML rendering using webkit-gtk, better timeout support.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

4 files changed, 22 insertions, 43 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index d2721829b014..ec2523719033 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.204 2011/08/19 10:54:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.205 2011/11/05 05:03:48 tetromino Exp $
+
+*zenity-3.2.0 (05 Nov 2011)
+
+  05 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -zenity-3.0.0.ebuild, -files/zenity-3.0.0-libnotify-ifdef.patch,
+  +zenity-3.2.0.ebuild, metadata.xml:
+  Bump to 3.2.0 from the gnome overlay, drop old. Notable changes: HTML
+  rendering using webkit-gtk, better timeout support.
 
 *zenity-3.0.0 (19 Aug 2011)
 
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 1599677a5f1d..000000000000
--- 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/metadata.xml b/gnome-extra/zenity/metadata.xml
index a7293fcdc37c..8d48cbf5ba80 100644
--- a/gnome-extra/zenity/metadata.xml
+++ b/gnome-extra/zenity/metadata.xml
@@ -5,5 +5,7 @@
 	<use>
 		<flag name="compat">Installs gdialog for compatibility with older shell
 			scripts which uses <pkg>dev-lang/perl</pkg></flag>
+		<flag name="webkit">Enable HTML rendering using
+			<pkg>net-libs/webkit-gtk</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-3.0.0.ebuild b/gnome-extra/zenity/zenity-3.2.0.ebuild
index 16b1fa89091d..af1c12dc2a68 100644
--- a/gnome-extra/zenity/zenity-3.0.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.2.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.0.0.ebuild,v 1.1 2011/08/19 10:54:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.2.0.ebuild,v 1.1 2011/11/05 05:03:48 tetromino Exp $
 
 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