Bump to 3.0.0, from gnome overlay for GNOME 3

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 112 insertions, 2 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index 41aee65f1251..d2721829b014 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,12 @@
 # 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.203 2011/03/23 08:33:01 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.204 2011/08/19 10:54:09 nirbheek Exp $
+
+*zenity-3.0.0 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +zenity-3.0.0.ebuild,
+  +files/zenity-3.0.0-libnotify-ifdef.patch:
+  Bump to 3.0.0, from gnome overlay for GNOME 3
 
   23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -zenity-2.30.0.ebuild:
   Remove old
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index a8ccf59f9a89..febb7a464b16 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zenity-2.32.1-libnotify-0.7.patch 746 RMD160 cd2eed097c232a5c4c84da574a8a2aac2785ca9d SHA1 9212bdff8f0684128dcad89765a5d7ba179402c5 SHA256 98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431
+AUX zenity-3.0.0-libnotify-ifdef.patch 705 RMD160 b1b60984a9d44bb780088f7a6a46c6379c54d0a4 SHA1 a68ad9d78d22c5dbdfea901334a43329bf055733 SHA256 a17cc517b0bd2fe10ec98d858029b893eeb0d6a901f381193342a02ba657f83a
 DIST zenity-2.32.1.tar.bz2 3128666 RMD160 30b19230d9e1ed478cfd17d2a6942863bcda6763 SHA1 5e75e9200768ecf9eb7f1e6edac7a395ddb47947 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
+DIST zenity-3.0.0.tar.bz2 3165657 RMD160 ecc792a6c9d1e4ce36507697006fa3456c443243 SHA1 0ca6e7ee43862e42922b5866805ade522ce7faf7 SHA256 b1965b6704e80665c551261b9895a06322aba3f9776f8e5dd8141c7e8aca5131
 EBUILD zenity-2.32.1.ebuild 1303 RMD160 cee6626451c2db30cd1f85e1af2307ffc7968db2 SHA1 9e29fcc1a43961cb08d2bd5360ad02b4330085b0 SHA256 82f16eb55a7e34cf4235aa8a27b4157c10f1976b085d0b871cfe9c518c8e1802
-MISC ChangeLog 23381 RMD160 543185ab3aa5bee2f0908c04ce803e748493eed0 SHA1 83e324ed25d73257397e8343b14bbed6644643b0 SHA256 21311ccc1b0857f2d989fa62cfc1f46cafcbe063ade19f4db08e802a807ece42
+EBUILD zenity-3.0.0.ebuild 1304 RMD160 e53518c2fb996f0d155e526510c6a1423e0d519b SHA1 35a93c76fff0f804fb03571a73c3cdabc634d31b SHA256 4fd580bd5b52f712605d77dce06c8169d3ccd8e47e25dddc2936a5141e7d5f00
+MISC ChangeLog 23580 RMD160 c8ec865dda764fe9114fb00a087b2e8ffc8b19c8 SHA1 c5998d0ad397ad1a3094fd9dda924267f7635615 SHA256 7ac2991171f84c7c7ab5e782a317b98a4fa05d369964ac3cbda334f45d477202
 MISC metadata.xml 302 RMD160 bde33bbd14d8085f9c4a63abf344904951e87f2f SHA1 421c8f95533baed57a7b116cce8b6b7a8121a4ff SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOTkDfAAoJEO/kOhxWD91kp9sP/RTYsx8d58r4ORJoActfQ+Kf
+U9gi5qyK317AlaFIQhl0T+nSQzmeavMIBdg28Y1RTNabLwbhmKnwvmjiaI7peORM
+pjc2DwB1mCFcIapzshtYpFZdngRVgax7aZ7phCMZnxOphgAWdFzjBUzZQCz+8yJ3
+97tbithiCh5+8g6gKlHe4UqTwzxOI2mSLaaM6GPUldCsZWdbylNqCqsbjaZN8Q4E
+UuYvzqKShIGzQkaplUWdf+3KLbFe0/2YcO7Ip4WgipO7axu5bSLoolroBI59XalA
+BeT1mShBQPrQ2EJpnyNDclcHwcBjJs+fzeTn25nHIjgEjDrrH+OXPgbO6Oj0fGkH
+zf5BecVR/UB+znZdtqAekzLRXNCh3Zyo/KNzp0OgeCHjZv0nUaG6gqe4vosamJ4k
+3WelhHg0dtOmgb8tyuXaSLI0ThDMZcy+ODTHngQ9Wkj5wxCrnfVdc/7Yir6wMiZg
+A/c0Cq15Gnsqyy2UqCxtyx5G1zJvwSXUWe4BEn/0of/y+rbD0sU1nYg1n/0lGOOq
+SgN6TYWLpmaIGK+bLClCSvgfXRfvkxdnlSqI1eB5UNDN5ZiadN5ksoVh4gFRhaHg
+YJH1+1AypsjxErXlZxAOJmlRaxvWMiK1/eKtdpsStGDQTOY2cBwIPiEore7XiHv1
+Ei8eXVzS5Jvqn7v4QjH+
+=s4w6
+-----END PGP SIGNATURE-----
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 000000000000..1599677a5f1d
--- /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@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.0.0.ebuild
new file mode 100644
index 000000000000..16b1fa89091d
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.0.0.ebuild
@@ -0,0 +1,51 @@
+# 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 $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
+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"
+
+RDEPEND=">=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.8:2
+	libnotify? ( >=x11-libs/libnotify-0.6.1 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.14
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.10.1"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_enable libnotify)
+		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
+
+	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}