Version bump, closes bug 142764. Maintainer has changed also.

(Portage version: 2.1.2_rc4)

6 files changed, 152 insertions, 3 deletions

diff --git a/dev-util/gazpacho/ChangeLog b/dev-util/gazpacho/ChangeLog
index 7f7305da55e9..70dad0c5e0d2 100644
--- a/dev-util/gazpacho/ChangeLog
+++ b/dev-util/gazpacho/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/gazpacho
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gazpacho/ChangeLog,v 1.5 2006/07/06 17:18:28 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gazpacho/ChangeLog,v 1.6 2006/12/29 12:39:17 ikelos Exp $
+
+*gazpacho-0.7.0 (29 Dec 2006)
+
+  29 Dec 2006; Mike Auty <ikelos@gentoo.org>
+  +files/gazpacho-0.7.0-default-action-group.patch,
+  +files/gazpacho-0.7.0-setup-fixes.patch, metadata.xml,
+  +gazpacho-0.7.0.ebuild:
+  Version bump, closes bug 142764.  Maintainer has changed also.
 
 *gazpacho-0.6.2-r1 (06 Jul 2006)
 
diff --git a/dev-util/gazpacho/files/digest-gazpacho-0.7.0 b/dev-util/gazpacho/files/digest-gazpacho-0.7.0
new file mode 100644
index 000000000000..d48a861bc59e
--- /dev/null
+++ b/dev-util/gazpacho/files/digest-gazpacho-0.7.0
@@ -0,0 +1,3 @@
+MD5 a1455143bb143c8904fd08d99f3eccc0 gazpacho-0.7.0.tar.bz2 418906
+RMD160 eb482ddcc4d7f3142470c12d524e2ef07a360078 gazpacho-0.7.0.tar.bz2 418906
+SHA256 704567842a01c8e713c9531ee68c3db2d1e44e4d765f6c9ccb50fee7c809158f gazpacho-0.7.0.tar.bz2 418906
diff --git a/dev-util/gazpacho/files/gazpacho-0.7.0-default-action-group.patch b/dev-util/gazpacho/files/gazpacho-0.7.0-default-action-group.patch
new file mode 100644
index 000000000000..9cc47c2d09cd
--- /dev/null
+++ b/dev-util/gazpacho/files/gazpacho-0.7.0-default-action-group.patch
@@ -0,0 +1,70 @@
+Index: gazpacho/widgets/base/menueditor/widgets.py
+===================================================================
+--- gazpacho/widgets/base/menueditor/widgets.py	(revisión: 2563)
++++ gazpacho/widgets/base/menueditor/widgets.py	(copia de trabajo)
+@@ -114,7 +114,7 @@
+     def load(self, xml_node):
+         """Inverse to_xml method: creates a menushell from a xml node"""
+         uim = self.gadget.project.uim
+-        default_action_group = uim.get_action_group('default')
++        default_action_group = uim.get_action_group('DefaultActions')
+         for node in xml_node.childNodes:
+             if node.nodeType != node.ELEMENT_NODE:
+                 continue
+@@ -2407,7 +2407,7 @@
+         """Creates a menuitem and a submenu for it"""
+         project = self.gadget.project
+         uim = project.uim
+-        default_action_group = uim.get_action_group('default')
++        default_action_group = uim.get_action_group('DefaultActions')
+         if default_action_group:
+             item = MenuItem(_('New Menu'), self.gadget, default_action_group)
+             submenu = Menu(self.gadget)
+@@ -2442,7 +2442,7 @@
+         """Creates a menuitem"""
+         project = self.gadget.project
+         uim = project.uim
+-        default_action_group = uim.get_action_group('default')
++        default_action_group = uim.get_action_group('DefaultActions')
+         if default_action_group:
+             item = MenuItem(_('New Action'), self.gadget, default_action_group)
+             item.show_all()
+Index: gazpacho/widgets/base/bars.py
+===================================================================
+--- gazpacho/widgets/base/bars.py	(revisión: 2563)
++++ gazpacho/widgets/base/bars.py	(copia de trabajo)
+@@ -58,8 +58,8 @@
+ 
+         # create default action group if it doesn't exist
+         project = context.get_project()
+-        if project.uim.get_action_group('default') is None:
+-            project.add_action_group(GActionGroup('default'))
++        if project.uim.get_action_group('DefaultActions') is None:
++            project.add_action_group(GActionGroup('DefaultActions'))
+ 
+         project.uim.add_ui(gadget, ui_string)
+         new_widget = project.uim.get_widget(gadget)
+@@ -145,8 +145,8 @@
+     def post_create(self, context, menuBar, interactive):
+         # create default action group if it doesn't exist
+         project = context.get_project()
+-        if project.uim.get_action_group('default') is None:
+-            project.add_action_group(GActionGroup('default'))
++        if project.uim.get_action_group('DefaultActions') is None:
++            project.add_action_group(GActionGroup('DefaultActions'))
+ 
+         # Add the basic UI definition
+         gadget = Gadget.from_widget(menuBar)
+Index: examples/uimanager.glade
+===================================================================
+--- examples/uimanager.glade	(revisión: 2563)
++++ examples/uimanager.glade	(copia de trabajo)
+@@ -2,7 +2,7 @@
+ <glade-interface>
+     <widget class="GtkUIManager" id="uimanager">
+         <child>
+-            <widget class="GtkActionGroup" id="default">
++            <widget class="GtkActionGroup" id="DefaultActions">
+                 <child>
+                     <widget class="GtkAction" id="Quit">
+                         <property name="name">Quit</property>
diff --git a/dev-util/gazpacho/files/gazpacho-0.7.0-setup-fixes.patch b/dev-util/gazpacho/files/gazpacho-0.7.0-setup-fixes.patch
new file mode 100644
index 000000000000..0d94d46a0e47
--- /dev/null
+++ b/dev-util/gazpacho/files/gazpacho-0.7.0-setup-fixes.patch
@@ -0,0 +1,24 @@
+diff -uNr gazpacho-0.7.0.orig/setup.py gazpacho-0.7.0/setup.py
+--- gazpacho-0.7.0.orig/setup.py	2006-12-29 12:25:02.000000000 +0000
++++ gazpacho-0.7.0/setup.py	2006-12-29 12:26:12.000000000 +0000
+@@ -8,9 +8,9 @@
+ 
+ templates = []
+ data_files = [
+-    ('share/doc/gazpacho', ('AUTHORS', 'ChangeLog', 'CONTRIBUTORS',
++    ('share/doc/EBUILD_PF_HERE', ('AUTHORS', 'ChangeLog', 'CONTRIBUTORS',
+                             'COPYING', 'README', 'NEWS')),
+-    ('share/doc/gazpacho/examples', listfiles('examples', '*')),
++    ('share/doc/EBUILD_PF_HERE/examples', listfiles('examples', '*')),
+     ('$datadir/catalogs', listfiles('catalogs', 'base.xml')),
+     ('$datadir/pixmaps', listfiles('pixmaps', '*.png')),
+     ('$datadir/pixmaps', listfiles('pixmaps', '*.ico')),
+@@ -34,7 +34,7 @@
+ 
+ resources = dict(locale='$prefix/share/locale')
+ global_resources = dict(
+-    doc='$prefix/share/doc/gazpacho',
++    doc='$prefix/share/doc/EBUILD_PF_HERE',
+     pixmap='$datadir/pixmaps',
+     glade='$datadir/glade',
+     resource='$datadir/resources',
diff --git a/dev-util/gazpacho/gazpacho-0.7.0.ebuild b/dev-util/gazpacho/gazpacho-0.7.0.ebuild
new file mode 100644
index 000000000000..00a0be2803fc
--- /dev/null
+++ b/dev-util/gazpacho/gazpacho-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gazpacho/gazpacho-0.7.0.ebuild,v 1.1 2006/12/29 12:39:17 ikelos Exp $
+
+inherit distutils gnome.org eutils
+
+DESCRIPTION="Gazpacho is a glade-like gtk interface designer."
+HOMEPAGE="http://gazpacho.sicem.biz/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# Masked amd64 and ppc whilst there's no kiwi available for that package
+KEYWORDS="-amd64 -ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.3
+	>=dev-python/pygtk-2.4
+	>=gnome-base/libglade-2.4.2
+	>=dev-python/kiwi-1.9.11"
+
+DOCS="AUTHORS NEWS"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-setup-fixes.patch"
+	epatch "${FILESDIR}/${P}-default-action-group.patch"
+
+	# In an attempt to make the above patch reusable across gazpacho
+	# versions it patched in EBUILD_PF_HERE markers
+	# instead of hardcoding version numbers in the patch.
+	sed -i -e "s/EBUILD_PF_HERE/${PF}/" setup.py
+}
+
+src_install() {
+	distutils_src_install
+	docinto internals
+	dodoc doc/*
+	insinto /usr/share/doc/${PF}
+	# these are needed in un-gzipped form or the "about" box crashes
+	doins AUTHORS CONTRIBUTORS COPYING
+	rm "${D}"/usr/share/doc/${PF}/{AUTHORS,CONTRIBUTORS}.gz
+}
diff --git a/dev-util/gazpacho/metadata.xml b/dev-util/gazpacho/metadata.xml
index 2ff1591632e8..33b58aacaaaf 100644
--- a/dev-util/gazpacho/metadata.xml
+++ b/dev-util/gazpacho/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>pythonhead@gentoo.org</email>
-		<name>Rob Cakebread</name>
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
 	</maintainer>
 	<longdescription>gazpacho is a glade clone which aims to be fully compatible with .glade files. It uses a unique layout for its GUI using one window instead of several.</longdescription>
 </pkgmetadata>