New version, and a slightly updated patch, removing the first hunk which was obsolete.

5 files changed, 69 insertions, 2 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index 4144e72a0c51..d9084820e9a2 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.33 2004/08/22 17:46:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.34 2004/09/13 16:29:42 obz Exp $
+
+*zenity-2.6.3 (14 Sep 2004)
+
+  14 Sep 2004; Mike Gardiner <obz@gentoo.org> +files/zenity-2.6.3-utf8_fix.patch,
+  +zenity-2.6.3.ebuild:
+  New version, and a slightly updated patch, removing the first hunk which was
+  obsolete. Looking towards a last GNOME 2.6 update.
 
   22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> zenity-2.6.2.ebuild:
   Stable on alpha.
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index fea0bebc2496..d8ae74740821 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,11 +1,14 @@
 MD5 c55f99c6c945c620128b66c24618f35d zenity-1.6.ebuild 924
 MD5 4cef76fa0916de2e71deebf3bc2c79c1 zenity-1.8.ebuild 872
+MD5 1823f114251219caa5e1a551e36e2f34 zenity-2.6.3.ebuild 907
 MD5 5eb47aea57471959dcefbf4086e1a28f zenity-2.6.0.ebuild 862
-MD5 92a7d8259fd9644b48a18814f74c9405 ChangeLog 3496
+MD5 43bb111f4a269b4de32e745bbdba7257 ChangeLog 3761
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 464dea8f6b6ec2e5013e7688e56a054a zenity-2.6.2.ebuild 863
 MD5 11d6827a445afb68eb58138ba36167b6 files/zenity-1.8-utf8_fix.patch 716
 MD5 89ba639461ca9877c61bfa6081598823 files/digest-zenity-1.6 63
 MD5 ef2defe06ca23b8e19247b646df39600 files/digest-zenity-1.8 63
+MD5 0308ff19f6b68370739997806d23f4ac files/zenity-2.6.3-utf8_fix.patch 569
 MD5 f08c33f7bc51d593798edbb8423c0378 files/digest-zenity-2.6.0 65
 MD5 8eec88827b7869265ff7ccf4f537af39 files/digest-zenity-2.6.2 65
+MD5 44e87d13530f4bc8ab52c7588cb8a91d files/digest-zenity-2.6.3 65
diff --git a/gnome-extra/zenity/files/digest-zenity-2.6.3 b/gnome-extra/zenity/files/digest-zenity-2.6.3
new file mode 100644
index 000000000000..61b4723ee93b
--- /dev/null
+++ b/gnome-extra/zenity/files/digest-zenity-2.6.3
@@ -0,0 +1 @@
+MD5 ce6678c406e9a834e4da04ca00338931 zenity-2.6.3.tar.bz2 650351
diff --git a/gnome-extra/zenity/files/zenity-2.6.3-utf8_fix.patch b/gnome-extra/zenity/files/zenity-2.6.3-utf8_fix.patch
new file mode 100644
index 000000000000..a0eabcd4ece2
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-2.6.3-utf8_fix.patch
@@ -0,0 +1,19 @@
+diff -NurB zenity-1.8-orig/src/main.c zenity-1.8/src/main.c
+--- zenity-1.8-orig/src/main.c	2004-03-22 20:51:08.000000000 -0500
++++ zenity-1.8/src/main.c	2004-03-22 20:52:01.000000000 -0500
+@@ -1024,7 +1023,6 @@
+ #endif
+ 
+   bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
+-  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+   textdomain(GETTEXT_PACKAGE);
+ 
+   zenity_init_parsing_options ();
+@@ -1048,6 +1046,7 @@
+     zenity_free_parsing_options (); 
+     exit (-1); 
+   }
++  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+   gtk_init (&argc, &argv);
+ 
+   /* 
diff --git a/gnome-extra/zenity/zenity-2.6.3.ebuild b/gnome-extra/zenity/zenity-2.6.3.ebuild
new file mode 100644
index 000000000000..073f3c47bd4d
--- /dev/null
+++ b/gnome-extra/zenity/zenity-2.6.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.6.3.ebuild,v 1.1 2004/09/13 16:29:42 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="commandline dialog tool for gnome"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.3.1
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	dev-libs/popt"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	app-text/scrollkeeper
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Don't set the UTF-8 codeset before parsing command line arguments.
+	# Closes bug #45204.
+	# Slightly altered for 2.6.3, removed the obsolete first hunk
+	epatch ${FILESDIR}/${P}-utf8_fix.patch
+
+}
+