Version bump wrt #254582, thanks to Gary Richards.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 84 insertions, 2 deletions

diff --git a/x11-misc/gtkdialog/ChangeLog b/x11-misc/gtkdialog/ChangeLog
index 7adbecd3ffae..9af69cdcbff7 100644
--- a/x11-misc/gtkdialog/ChangeLog
+++ b/x11-misc/gtkdialog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gtkdialog
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gtkdialog/ChangeLog,v 1.17 2008/03/23 01:07:58 coldwind Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gtkdialog/ChangeLog,v 1.18 2009/06/01 06:53:05 ssuominen Exp $
+
+*gtkdialog-0.7.20 (01 Jun 2009)
+
+  01 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +gtkdialog-0.7.20.ebuild, +files/gtkdialog-0.7.20-name_conflict.patch:
+  Version bump wrt #254582, thanks to Gary Richards.
 
   23 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
   gtkdialog-0.59.8.ebuild:
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.7.20-name_conflict.patch b/x11-misc/gtkdialog/files/gtkdialog-0.7.20-name_conflict.patch
new file mode 100644
index 000000000000..8a2b585a5fa7
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.7.20-name_conflict.patch
@@ -0,0 +1,42 @@
+--- gtkdialog-0.7.20/src/glade_support.c	2007-03-16 14:25:49.000000000 +0000
++++ gtkdialog-0.7.20/src/glade_support.c.new	2009-05-17 19:11:59.993997605 +0100
+@@ -37,10 +37,10 @@
+  *                                                                       *
+  *                                                                       *
+  *************************************************************************/
+-typedef struct signal {
++typedef struct _signal {
+ 	gchar     *name;
+ 	GCallback callback;
+-} signal;
++} _signal;
+ 
+ /*
+ ** Signal handler callbascks.
+@@ -206,7 +206,7 @@
+ static gboolean
+ find_and_connect_handler(
+ 		GtkWidget *widget,
+-		signal *signals,
++		_signal *signals,
+ 		const gchar *signal_name,
+ 		const gchar *handler_name)
+ {
+@@ -288,7 +288,7 @@
+ 		gpointer user_data)
+ {
+ 	gint n;
+-	signal entry_signals[] = {
++	_signal entry_signals[] = {
+ 		{ "activate",           (GCallback)on_any_entry_almost_any },
+ 		{ "backspace",          (GCallback)on_any_entry_almost_any },
+ 		{ "copy-clipboard",     (GCallback)on_any_entry_almost_any },
+@@ -319,7 +319,7 @@
+ 		gpointer user_data)
+ {
+ 	variable *var;
+-	signal widget_signals[] = {
++	_signal widget_signals[] = {
+ 		{ "accel-closures-changed",    (GCallback)on_any_widget_almost_any },
+ 		{ "composited-changed",        (GCallback)on_any_widget_almost_any },
+ 		{ "grab-focus",                (GCallback)on_any_widget_almost_any },
diff --git a/x11-misc/gtkdialog/gtkdialog-0.7.20.ebuild b/x11-misc/gtkdialog/gtkdialog-0.7.20.ebuild
new file mode 100644
index 000000000000..b1e10735b3af
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.7.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gtkdialog/gtkdialog-0.7.20.ebuild,v 1.1 2009/06/01 06:53:05 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="GUI-creation utility that can be used with an arbitrary interpreter"
+HOMEPAGE="http://linux.pte.hu/~pipas/gtkdialog"
+SRC_URI="ftp://linux.pte.hu/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libglade"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-name_conflict.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog TODO
+}