Version bump wrt #254582, thanks to Gary Richards.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 88 insertions, 3 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/Manifest b/x11-misc/gtkdialog/Manifest
index e5c07d08574e..3ec5bd82c6ba 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,5 +1,8 @@
 AUX gtkdialog-0.59.8-amd64.patch 653 RMD160 3a3b944c370cda1a84c986f6a19d0ca36f04d951 SHA1 c5c61b10f42138e0ec9cf12fbad86770d9c1281f SHA256 b4f1869cc5559b917a8bbbbdb5d0a1fe7bebe7be0dffff574d2fdcfd9974d95d
+AUX gtkdialog-0.7.20-name_conflict.patch 1401 RMD160 297f62b0b66795755e1c52eeeeeef39cba76484c SHA1 bd0cfb6033448220375665712a1742766dcfcdde SHA256 8a14b50f1aa74bc96a01c961791750f4037226766f66cf4ded57833dd0a3d8f2
 DIST gtkdialog-0.59.8.tar.gz 239716 RMD160 c38c76e778bc8b3b5d61195d790bd02c7e386102 SHA1 5e67acb7d4a172229c9ff1cb19cb979c742cbfd4 SHA256 b5c6f5d0290abfa388f8fcab4e67ccf270f817e9198d43dbed2a316f5e7aa6b2
+DIST gtkdialog-0.7.20.tar.gz 280408 RMD160 f6cc8b44855a45115ac222ffed80e647cc3c3d01 SHA1 c4d328e2ba1372610d6e7cfde471efb1baf2d4a0 SHA256 dc2be3f49438bc8cd70d5e2a8ec43bec189e25ba8b43340e019358e73f419b5b
 EBUILD gtkdialog-0.59.8.ebuild 830 RMD160 c6987f90937676c5d2776aec7bedd2237a669177 SHA1 ab0bc830ed0d13a924ae63507f184be460909ff0 SHA256 e8d40ac32bdefc87f622bc5982dc0d563800efaf5a63112c62b4e35ec734aff3
-MISC ChangeLog 2314 RMD160 8b154f24654757caca17d0e2fbf86daf567ea9f3 SHA1 ec384a4e2051368a6422967c2ad86cf97ab4fdb8 SHA256 c5e81bb7918dbdf9518f84d7d17b44cd2ebfd4f10eb6dc2a5c3da22eea1b3e2f
+EBUILD gtkdialog-0.7.20.ebuild 819 RMD160 903034c5820c65ec6c5d6f29eeeb47074120f252 SHA1 c522fcdb29bf4172325b3f9b5dcf79c35e72ded9 SHA256 4e3fd82c541e6470323c133966d49df647c677ba6e4f7e6f854d0cc38e583002
+MISC ChangeLog 2529 RMD160 3070fa612d4c69bd43c3c001cc334d98c13f70ea SHA1 1c640fe4766882835ee945776380a99670accc41 SHA256 c83bb60a12f8e3c9ef83236dc91440d1028f1019fb3e318e62cc40613585a5eb
 MISC metadata.xml 685 RMD160 c6ae4b255c01ad711ef93908cb73edadfef07109 SHA1 04315ea072855ae256bf7f922a1fc58d93880b4b SHA256 e69e3cfb43a012eecbe432203d6142740760d312f08e0972b4cb938bed4ec72c
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
+}