bump to gnumeric-1.8.0, remove old patches, fix quoting of 1.6.3

(Portage version: 2.1.4_rc11)

11 files changed, 185 insertions, 558 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index c3d82a5d1392..ca1003946c8a 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.144 2007/10/19 14:12:42 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.145 2007/12/31 01:15:19 eva Exp $
+
+*gnumeric-1.8.0 (31 Dec 2007)
+
+  31 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnumeric-1.4.3-libgsf-1.patch,
+  -files/gnumeric-1.4.3-makejobs.patch,
+  -files/gnumeric-1.4.3-new_gsf_api.patch,
+  -files/gnumeric-1.4.3-pcre_int_overflow.patch,
+  -files/gnumeric-1.4.3-remove-deprecated.patch,
+  +files/gnumeric-1.8.0-omf.patch, metadata.xml, +gnumeric-1.8.0.ebuild:
+  bump to 1.8.0 and cleanup old patches
 
   19 Oct 2007; <jeff@gentoo.org> gnumeric-1.6.3.ebuild:
   Changed goffice dependency as per bug #191555. Big Thanks(tm) to rbridge.
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.8.0 b/app-office/gnumeric/files/digest-gnumeric-1.8.0
new file mode 100644
index 000000000000..49a13163bfed
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.8.0
@@ -0,0 +1,3 @@
+MD5 5a3a4687203edd4a079d37ff8e1546fe gnumeric-1.8.0.tar.bz2 14080868
+RMD160 bcf01028ffe5d9c003e00b9a2da1abfdf2b525f4 gnumeric-1.8.0.tar.bz2 14080868
+SHA256 356dc3207991fad7a6f36c4ca5b4fffc0c05e76f129d773489a470c18d3db4cf gnumeric-1.8.0.tar.bz2 14080868
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch b/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch
deleted file mode 100644
index 3092d2d29620..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Submitted By:            Hugo Villeneuve
-Date:                    2005-09-19
-Initial Package Version: 1.4.3
-Upstream Status:         Unknown
-Origin:                  http://mail-index.netbsd.org/tech-pkg/2005/09/05/0001.html
-Description:             Updated to new GSF_CLASS_FULL signature
-
-$LastChangedBy: randy $
-$Date: 2006/07/14 16:46:23 $
-
-
-diff -Naur gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c
---- gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c	2004-09-24 16:35:15.000000000 -0400
-+++ gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c	2005-09-19 00:44:06.889772528 -0400
-@@ -313,8 +313,8 @@
- }
- 
- GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba,
--		wbcc_class_init, wbcc_init, 
--		WORKBOOK_CONTROL_TYPE, 0,
-+		NULL, NULL,wbcc_class_init, NULL,
-+		wbcc_init, WORKBOOK_CONTROL_TYPE, 0,
- 		GSF_INTERFACE (wbcc_gnm_cmd_context_init,
- 			       GNM_CMD_CONTEXT_TYPE))
- 
-diff -Naur gnumeric-1.4.3-orig/src/command-context-stderr.c gnumeric-1.4.3-patched/src/command-context-stderr.c
---- gnumeric-1.4.3-orig/src/command-context-stderr.c	2004-06-13 14:48:34.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/command-context-stderr.c	2005-09-19 00:44:06.891772224 -0400
-@@ -107,6 +107,6 @@
- }
- 
- GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
--		NULL, ccs_init,
--		G_TYPE_OBJECT, 0,
-+		NULL, NULL, NULL, NULL,
-+		ccs_init, G_TYPE_OBJECT, 0,
- 		GSF_INTERFACE (ccs_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
-diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c
---- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c	2005-02-09 16:54:29.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c	2005-09-19 00:44:06.896771464 -0400
-@@ -1678,8 +1678,8 @@
- }
- 
- GSF_CLASS_FULL (GogAxis, gog_axis,
--		gog_axis_class_init, gog_axis_init,
--		GOG_STYLED_OBJECT_TYPE, 0,
-+		NULL, NULL, gog_axis_class_init, NULL,
-+		gog_axis_init, GOG_STYLED_OBJECT_TYPE, 0,
- 		GSF_INTERFACE (gog_axis_dataset_init, GOG_DATASET_TYPE))
- 
- 
-diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
---- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c	2004-12-02 08:57:26.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c	2005-09-19 00:44:06.899771008 -0400
-@@ -488,8 +488,8 @@
- }
- 
- GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
--		gog_error_bar_class_init, gog_error_bar_init,
--		G_TYPE_OBJECT, 0,
-+		NULL, NULL, gog_error_bar_class_init, NULL,
-+		gog_error_bar_init, G_TYPE_OBJECT, 0,
- 		GSF_INTERFACE (gog_error_bar_persist_init, GOG_PERSIST_TYPE))
- 
- 
-diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c
---- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c	2004-10-25 16:36:05.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c	2005-09-19 00:44:06.901770704 -0400
-@@ -176,8 +176,8 @@
- }
- 
- GSF_CLASS_FULL (GogLabel, gog_label,
--		gog_label_class_init, NULL,
--		GOG_OUTLINED_OBJECT_TYPE, 0,
-+		NULL, NULL, gog_label_class_init, NULL,
-+		NULL, GOG_STYLED_OBJECT_TYPE, 0,
- 		GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
- 
- /************************************************************************/
-diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c
---- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c	2005-01-05 13:05:53.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c	2005-09-19 00:44:06.904770248 -0400
-@@ -589,8 +589,8 @@
- }
- 
- GSF_CLASS_FULL (GogSeries, gog_series,
--		gog_series_class_init, gog_series_init,
--		GOG_STYLED_OBJECT_TYPE, 0,
-+		NULL, NULL, gog_series_class_init, NULL,
-+		gog_series_init, GOG_STYLED_OBJECT_TYPE, 0,
- 		GSF_INTERFACE (gog_series_dataset_init, GOG_DATASET_TYPE))
- 
- /**
-diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c
---- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c	2004-11-19 10:49:12.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c	2005-09-19 00:44:06.908769640 -0400
-@@ -1687,8 +1687,8 @@
- }
- 
- GSF_CLASS_FULL (GogStyle, gog_style,
--		gog_style_class_init, gog_style_init,
--		G_TYPE_OBJECT, 0,
-+		NULL, NULL, gog_style_class_init, NULL,
-+		gog_style_init, G_TYPE_OBJECT, 0,
- 		GSF_INTERFACE (gog_style_persist_init, GOG_PERSIST_TYPE))
- 
- gboolean
-diff -Naur gnumeric-1.4.3-orig/src/gnm-so-filled.c gnumeric-1.4.3-patched/src/gnm-so-filled.c
---- gnumeric-1.4.3-orig/src/gnm-so-filled.c	2004-10-16 22:36:05.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/gnm-so-filled.c	2005-09-19 00:44:06.911769184 -0400
-@@ -113,7 +113,7 @@
- typedef FooCanvasGroup		FilledFooView;
- typedef FooCanvasGroupClass	FilledFooViewClass;
- static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view,
--	NULL, NULL,
-+	NULL, NULL, NULL, NULL, NULL,
- 	FOO_TYPE_CANVAS_GROUP, 0,
- 	GSF_INTERFACE (so_filled_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- #endif /* WITH_GTK */
-@@ -632,7 +632,7 @@
- typedef FooCanvasPolygon	PolygonFooView;
- typedef FooCanvasPolygonClass	PolygonFooViewClass;
- static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view,
--	NULL, NULL,
-+	NULL, NULL, NULL, NULL, NULL,
- 	FOO_TYPE_CANVAS_POLYGON, 0,
- 	GSF_INTERFACE (so_polygon_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- #endif /* WITH_GTK */
-diff -Naur gnumeric-1.4.3-orig/src/gnm-so-line.c gnumeric-1.4.3-patched/src/gnm-so-line.c
---- gnumeric-1.4.3-orig/src/gnm-so-line.c	2004-11-30 13:37:07.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/gnm-so-line.c	2005-09-19 00:44:06.913768880 -0400
-@@ -111,7 +111,7 @@
- typedef FooCanvasLine		LineFooView;
- typedef FooCanvasLineClass	LineFooViewClass;
- static GSF_CLASS_FULL (LineFooView, so_line_foo_view,
--	NULL, NULL,
-+	NULL, NULL,NULL, NULL,NULL,
- 	FOO_TYPE_CANVAS_LINE, 0,
- 	GSF_INTERFACE (so_line_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- #endif /* WITH_GTK */
-diff -Naur gnumeric-1.4.3-orig/src/io-context-gtk.c gnumeric-1.4.3-patched/src/io-context-gtk.c
---- gnumeric-1.4.3-orig/src/io-context-gtk.c	2004-10-29 23:51:35.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/io-context-gtk.c	2005-09-19 00:44:06.915768576 -0400
-@@ -367,8 +367,8 @@
- }
- 
- GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
--		icg_class_init, icg_init,
--		TYPE_IO_CONTEXT, 0,
-+		NULL, NULL, icg_class_init, NULL,
-+		icg_init, TYPE_IO_CONTEXT, 0,
- 		GSF_INTERFACE (icg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
- 
- void
-diff -Naur gnumeric-1.4.3-orig/src/io-context.c gnumeric-1.4.3-patched/src/io-context.c
---- gnumeric-1.4.3-orig/src/io-context.c	2004-07-19 20:37:13.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/io-context.c	2005-09-19 00:44:06.917768272 -0400
-@@ -117,8 +117,8 @@
- }
- 
- GSF_CLASS_FULL (IOContext, io_context,
--		io_context_class_init, io_context_init,
--		G_TYPE_OBJECT, 0,
-+		NULL,NULL,io_context_class_init,NULL,
-+		io_context_init,G_TYPE_OBJECT, 0,
- 		GSF_INTERFACE (io_context_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
- 
- IOContext *
-diff -Naur gnumeric-1.4.3-orig/src/sheet-filter.c gnumeric-1.4.3-patched/src/sheet-filter.c
---- gnumeric-1.4.3-orig/src/sheet-filter.c	2004-10-16 22:36:05.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/sheet-filter.c	2005-09-19 00:44:06.920767816 -0400
-@@ -563,7 +563,7 @@
- typedef FooCanvasWidget		FilterFooView;
- typedef FooCanvasWidgetClass	FilterFooViewClass;
- static GSF_CLASS_FULL (FilterFooView, filter_foo_view,
--	NULL, NULL,
-+	NULL, NULL, NULL, NULL, NULL,
- 	FOO_TYPE_CANVAS_WIDGET, 0,
- 	GSF_INTERFACE (filter_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- 
-diff -Naur gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c
---- gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c	2005-01-14 00:48:29.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c	2005-09-19 00:44:06.922767512 -0400
-@@ -123,7 +123,7 @@
- typedef FooCanvasPolygon	CommentFooView;
- typedef FooCanvasPolygonClass	CommentFooViewClass;
- static GSF_CLASS_FULL (CommentFooView, comment_foo_view,
--	NULL, NULL,
-+	NULL, NULL,NULL,NULL,NULL,
- 	FOO_TYPE_CANVAS_POLYGON, 0,
- 	GSF_INTERFACE (comment_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- 
-diff -Naur gnumeric-1.4.3-orig/src/sheet-object-graph.c gnumeric-1.4.3-patched/src/sheet-object-graph.c
---- gnumeric-1.4.3-orig/src/sheet-object-graph.c	2004-10-29 00:13:13.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/sheet-object-graph.c	2005-09-19 00:44:06.925767056 -0400
-@@ -94,7 +94,7 @@
- typedef GogControlFooCanvas		SOGraphFooView;
- typedef GogControlFooCanvasClass	SOGraphFooViewClass;
- static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
--	NULL, NULL,
-+	NULL, NULL, NULL, NULL, NULL,
- 	GOG_CONTROL_FOOCANVAS_TYPE, 0,
- 	GSF_INTERFACE (so_graph_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- 
-diff -Naur gnumeric-1.4.3-orig/src/sheet-object-image.c gnumeric-1.4.3-patched/src/sheet-object-image.c
---- gnumeric-1.4.3-orig/src/sheet-object-image.c	2004-12-17 23:48:37.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/sheet-object-image.c	2005-09-19 00:44:06.929766448 -0400
-@@ -90,7 +90,7 @@
- typedef FooCanvasPixbuf		SOImageFooView;
- typedef FooCanvasPixbufClass	SOImageFooViewClass;
- static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view,
--	NULL, NULL,
-+	NULL, NULL, NULL, NULL, NULL,
- 	FOO_TYPE_CANVAS_PIXBUF, 0,
- 	GSF_INTERFACE (so_image_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- 
-diff -Naur gnumeric-1.4.3-orig/src/sheet-object-widget.c gnumeric-1.4.3-patched/src/sheet-object-widget.c
---- gnumeric-1.4.3-orig/src/sheet-object-widget.c	2005-02-09 16:54:29.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/sheet-object-widget.c	2005-09-19 00:44:06.933765840 -0400
-@@ -99,7 +99,7 @@
- typedef FooCanvasWidget		SOWidgetFooView;
- typedef FooCanvasWidgetClass	SOWidgetFooViewClass;
- static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view,
--	NULL, NULL,
-+        NULL, NULL, NULL, NULL, NULL,
- 	FOO_TYPE_CANVAS_WIDGET, 0,
- 	GSF_INTERFACE (so_widget_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
- 
-diff -Naur gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c
---- gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c	2004-09-07 15:28:41.000000000 -0400
-+++ gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c	2005-09-19 00:44:06.937765232 -0400
-@@ -503,8 +503,8 @@
- }
- 
- GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry,
--		gee_class_init, gee_init,
--		GTK_TYPE_HBOX, 0,
-+		NULL, NULL, gee_class_init, NULL,
-+		gee_init, GTK_TYPE_HBOX, 0,
- 		GSF_INTERFACE (gee_cell_editable_init, GTK_TYPE_CELL_EDITABLE))
- 
- /**
-diff -Naur gnumeric-1.4.3-orig/src/workbook-control-gui.c gnumeric-1.4.3-patched/src/workbook-control-gui.c
---- gnumeric-1.4.3-orig/src/workbook-control-gui.c	2005-03-12 19:05:45.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/workbook-control-gui.c	2005-09-19 00:44:06.943764320 -0400
-@@ -2545,8 +2545,8 @@
- }
- 
- GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui,
--		workbook_control_gui_class_init, workbook_control_gui_init,
--		WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
-+		NULL,NULL,workbook_control_gui_class_init,NULL,
-+		workbook_control_gui_init,WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
- 		GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_DATA_ALLOCATOR_TYPE);
- 		GSF_INTERFACE (wbcg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
- 
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch b/app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch
deleted file mode 100644
index 552e57adffa8..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnumeric/plugins/corba/Makefile.am,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- Makefile.am	24 Sep 2004 01:33:18 -0000	1.5
-+++ Makefile.am	22 Feb 2005 17:07:22 -0000	1.6
-@@ -7,23 +7,26 @@
- xmldir = $(gnumeric_plugin_corbadir)
- gnumeric_plugin_corba_LTLIBRARIES = corba.la
- corba_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
--corba_la_SOURCES = $(GNUMERIC_GENERATED)	\
-+corba_la_SOURCES =				\
- 	corba-application.c 			\
- 	corba-workbook.c 			\
- 	corba-workbook.h 			\
- 	corba-sheet.c 				\
- 	corba-sheet.h
- 
--GNUMERIC_GENERATED = 		\
-+nodist_corba_la_SOURCES =		\
- 	GNOME_Gnumeric-common.c		\
- 	GNOME_Gnumeric-skels.c		\
- 	GNOME_Gnumeric-stubs.c		\
- 	GNOME_Gnumeric.h
- 
--stamp_Gnumeric_idl : $(srcdir)/GNOME_Gnumeric.idl 
-+# A hint is needed to build the header first:
-+BUILT_SOURCES = GNOME_Gnumeric.h
-+
-+stamp_Gnumeric_idl: $(srcdir)/GNOME_Gnumeric.idl 
- 	$(ORBIT_IDL) -I$(srcdir) $< && touch $@
- 
--$(GNUMERIC_GENERATED): stamp_Gnumeric_idl
-+$(nodist_corba_la_SOURCES): stamp_Gnumeric_idl
- 
- idldir   = $(gnumeric_datadir)/idl
- idl_DATA = GNOME_Gnumeric.idl 
-@@ -33,11 +36,5 @@
- 
- @INTLTOOL_XML_RULE@
- 
--# Do not use built sources BUILT_SOURCES
--# it attempts to build the source even if it is not used.
--DISTCLEANFILES	= $(GNUMERIC_GENERATED) stamp_Gnumeric_idl $(xml_DATA)
-+CLEANFILES	= $(nodist_corba_la_SOURCES) stamp_Gnumeric_idl $(xml_DATA)
- EXTRA_DIST	= $(idl_DATA) $(xml_in_files)
--
--dist-hook :
--	cd $(distdir) && rm -f $(DISTCLEANFILES)
--
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-new_gsf_api.patch b/app-office/gnumeric/files/gnumeric-1.4.3-new_gsf_api.patch
deleted file mode 100644
index 96cf096905df..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.4.3-new_gsf_api.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gnumeric/plugins/excel/boot.c,v
-retrieving revision 1.122
-retrieving revision 1.122.2.1
-diff -u -r1.122 -r1.122.2.1
---- boot.c	2005/01/17 04:37:25	1.122
-+++ boot.c	2005/07/04 20:00:58	1.122.2.1
-@@ -117,22 +117,19 @@
- }
- 
- static void
--excel_read_metadata (Workbook  *wb, GsfInfile *ole, char const *name,
-+excel_read_metadata (GsfDocMetaData *meta_data, GsfInfile *ole, char const *name,
- 		     IOContext *context)
- {
--	GError   *err = NULL;
- 	GsfInput *stream = gsf_infile_child_by_name (ole, name);
- 
- 	if (stream != NULL) {
--		gsf_msole_metadata_read (stream, &err);
-+		GError *err = gsf_msole_metadata_read (stream, meta_data);
- 		if (err != NULL) {
- 			gnm_io_warning (context, err->message);
- 			g_error_free (err);
- 		}
--		gsf_input_seek (stream, 0, G_SEEK_SET);
--		g_object_set_data_full (G_OBJECT (wb), name,
--			gsf_structured_blob_read (stream), g_object_unref);
--		g_object_unref (G_OBJECT (stream));
-+
-+		g_object_unref (stream);
- 	}
- }
- 
-@@ -154,6 +151,7 @@
- 	GsfInfile *ole = gsf_infile_msole_new (input, &err);
- 	Workbook  *wb = wb_view_workbook (wbv);
- 	gboolean   is_double_stream_file, is_97;
-+	GsfDocMetaData *meta_data;
- 
- 	if (ole == NULL) {
- 		guint8 const *data;
-@@ -188,8 +186,11 @@
- 	excel_read_workbook (context, wbv, stream, &is_double_stream_file);
- 	g_object_unref (G_OBJECT (stream));
- 
--	excel_read_metadata (wb, ole, "\05SummaryInformation", context);
--	excel_read_metadata (wb, ole, "\05DocumentSummaryInformation", context);
-+	meta_data = gsf_doc_meta_data_new ();
-+	excel_read_metadata (meta_data, ole, "\05DocumentSummaryInformation", context);
-+	excel_read_metadata (meta_data, ole, "\05SummaryInformation", context);
-+	g_object_set_data_full (G_OBJECT (wb), "GsfDocMetaData",
-+		meta_data, g_object_unref);
- 
- 	/* See if there are any macros to keep around */
- 	stream = gsf_infile_child_by_name (ole, "\01CompObj");
-@@ -228,6 +229,7 @@
- 	GsfOutfile *outfile;
- 	ExcelWriteState *ewb = NULL;
- 	GsfStructuredBlob *blob;
-+	GsfDocMetaData *meta_data;
- 
- 	io_progress_message (context, _("Preparing to save..."));
- 	io_progress_range_push (context, 0.0, 0.1);
-@@ -250,25 +252,20 @@
- 	excel_write_state_free (ewb);
- 	io_progress_range_pop (context);
- 
--	blob = g_object_get_data (G_OBJECT (wb), "\05DocumentSummaryInformation");
--	if (blob == NULL) {
-+	meta_data = g_object_get_data (G_OBJECT (wb), "GsfDocMetaData");
-+	if (meta_data != NULL) {
- 		content = gsf_outfile_new_child (outfile,
- 			"\05DocumentSummaryInformation", FALSE);
--		gsf_msole_metadata_write (content, TRUE, NULL);
-+		gsf_msole_metadata_write (content, meta_data, TRUE);
- 		gsf_output_close (content);
- 		g_object_unref (G_OBJECT (content));
--	} else
--		gsf_structured_blob_write (blob, outfile);
- 
--	blob = g_object_get_data (G_OBJECT (wb), "\05SummaryInformation");
--	if (blob == NULL) {
- 		content = gsf_outfile_new_child (outfile,
- 			"\05SummaryInformation", FALSE);
--		gsf_msole_metadata_write (content, FALSE, NULL);
-+		gsf_msole_metadata_write (content, meta_data, FALSE);
- 		gsf_output_close (content);
- 		g_object_unref (G_OBJECT (content));
--	} else
--		gsf_structured_blob_write (blob, outfile);
-+	}
- 
- 	/* restore the macros we loaded */
- 	blob = g_object_get_data (G_OBJECT (wb), "MS_EXCEL_COMPOBJ");
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-pcre_int_overflow.patch b/app-office/gnumeric/files/gnumeric-1.4.3-pcre_int_overflow.patch
deleted file mode 100644
index a6b4f2874555..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.4.3-pcre_int_overflow.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -NurdB gnumeric-1.4.3/src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c
---- gnumeric-1.4.3/src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c	2004-10-29 13:13:19.000000000 -0500
-+++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c	2005-09-01 01:22:28.000000000 -0500
-@@ -1062,7 +1062,18 @@
- int min = 0;
- int max = -1;
- 
-+/* Read the minimum value and do a paranoid check: a negative value indicates
-+an integer overflow. */
-+
- while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
-+if (min < 0 || min > 65535)
-+  {
-+  *errorptr = ERR5;
-+  return p;
-+  }
-+
-+/* Read the maximum value if there is one, and again do a paranoid on its size.
-+Also, max must not be less than min. */
- 
- if (*p == '}') max = min; else
-   {
-@@ -1070,6 +1081,11 @@
-     {
-     max = 0;
-     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
-+    if (max < 0 || max > 65535)
-+      {
-+      *errorptr = ERR5;
-+      return p;
-+      }
-     if (max < min)
-       {
-       *errorptr = ERR4;
-@@ -1078,16 +1094,10 @@
-     }
-   }
- 
--/* Do paranoid checks, then fill in the required variables, and pass back the
--pointer to the terminating '}'. */
-+/* Fill in the required variables, and pass back the pointer to the terminating '}'. */
- 
--if (min > 65535 || max > 65535)
--  *errorptr = ERR5;
--else
--  {
--  *minp = min;
--  *maxp = max;
--  }
-+*minp = min;
-+*maxp = max;
- return p;
- }
- 
-@@ -4128,6 +4138,7 @@
- BOOL class_utf8;
- #endif
- BOOL inescq = FALSE;
-+BOOL capturing;
- unsigned int brastackptr = 0;
- size_t size;
- uschar *code;
-@@ -4543,6 +4554,7 @@
-     case '(':
-     branch_newextra = 0;
-     bracket_length = 1 + LINK_SIZE;
-+    capturing = FALSE;
- 
-     /* Handle special forms of bracket, which all start (? */
- 
-@@ -4630,6 +4642,9 @@
- 
-         case 'P':
-         ptr += 3;
-+
-+        /* Handle the definition of a named subpattern */
-+
-         if (*ptr == '<')
-           {
-           const uschar *p;    /* Don't amalgamate; some compilers */
-@@ -4642,9 +4657,12 @@
-             }
-           name_count++;
-           if (ptr - p > max_name_size) max_name_size = (ptr - p);
-+          capturing = TRUE;   /* Named parentheses are always capturing */
-           break;
-           }
- 
-+        /* Handle back references and recursive calls to named subpatterns */
-+
-         if (*ptr == '=' || *ptr == '>')
-           {
-           while ((compile_block.ctypes[*(++ptr)] & ctype_word) != 0);
-@@ -4819,18 +4837,24 @@
-           continue;
-           }
- 
--        /* If options were terminated by ':' control comes here. Fall through
--        to handle the group below. */
-+        /* If options were terminated by ':' control comes here. This is a
-+        non-capturing group with an options change. There is nothing more that
-+        needs to be done because "capturing" is already set FALSE by default;
-+        we can just fall through. */
-+
-         }
-       }
- 
--    /* Extracting brackets must be counted so we can process escapes in a
--    Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to
--    need an additional 3 bytes of store per extracting bracket. However, if
--    PCRE_NO_AUTO)CAPTURE is set, unadorned brackets become non-capturing, so we
--    must leave the count alone (it will aways be zero). */
-+    /* Ordinary parentheses, not followed by '?', are capturing unless
-+    PCRE_NO_AUTO_CAPTURE is set. */
- 
--    else if ((options & PCRE_NO_AUTO_CAPTURE) == 0)
-+    else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0;
-+
-+    /* Capturing brackets must be counted so we can process escapes in a
-+    Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to need
-+    an additional 3 bytes of memory per capturing bracket. */
-+
-+    if (capturing)
-       {
-       bracount++;
-       if (bracount > EXTRACT_BASIC_MAX) bracket_length += 3;
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch b/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch
deleted file mode 100644
index a465628656b4..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gnumeric-1.4.3/configure.in	2005-01-26 09:56:45.000000000 -0500
-+++ gnumeric-1.4.3.new/configure.in	2006-07-14 11:57:47.000000000 -0400
-@@ -192,22 +192,6 @@
- GNUMERIC_PLUGIN_LDFLAGS="-avoid-version $GNUMERIC_PLUGIN_LDFLAGS"
- AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
- 
--dnl disable for in stable release, re-enable for development series
--CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
--CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
--if test "x$gnumeric_with_gtk" = "xtrue"; then
--	CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED"
--	CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED"
--	CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE"
--	CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
--	CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED"
--fi
--if test "x$gnumeric_with_gnome" = "xtrue"; then
--	CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
--	CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
--	CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
--fi
--
- dnl ==============================================
- dnl GNOME Specific extensions
- with_corba=false
diff --git a/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch b/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch
new file mode 100644
index 000000000000..e47b55e09ced
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch
@@ -0,0 +1,76 @@
+diff -Nua doc/C/gnumeric-C.omf doc/C/gnumeric-C.omf
+--- doc/C/gnumeric-C.omf	1970-01-01 01:00:00.000000000 +0100
++++ doc/C/gnumeric-C.omf	2007-12-30 23:05:42.000000000 +0100
+@@ -0,0 +1,72 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
++<omf>
++  <resource>
++    <creator>
++      miguel@gnome.org (Miguel de Icaza)
++    </creator>
++    <maintainer>
++      jody@gnome.org (Jody Goldberg)
++    </maintainer>
++    <contributor>
++      acuster@gmail.com (Adrian Custer)
++    </contributor>
++    <contributor>
++      mrproper@ximian.com (Kevin Breit)
++    </contributor>
++    <contributor>
++      aguelzow@taliesin.ca (Andreas Guelzow)
++    </contributor>
++    <contributor>
++      aaron@ximian.com (Aaron Weber)
++    </contributor>
++    <contributor>
++      tommydal@ihug.com.au (Thomas Canty)
++    </contributor>
++    <contributor>
++      kirillov@math.sunysb.edu (Alexander Kirillov)
++    </contributor>
++    <contributor>
++      k_wayne@linuxpower.org (Wayne Schuller)
++    </contributor>
++    <contributor>
++      jiivonen@hutcs.cs.hut.fi (Jukka-Pekka Iivonen)
++    </contributor>
++    <contributor>
++      adrian@gimp.or (Adrian Likins)
++    </contributor>
++
++    <title>
++      The Gnumeric Manual, version 1.8.
++    </title>
++
++    <date>
++      2007-12-20
++    </date>
++
++    <version identifier="1.7" date="2007-10-27" 
++      description="Updated for 1.8"/>
++    <version identifier="1.3" date="2004-12-09" 
++      description="Updated for 1.4"/>
++
++    <subject category="GNOME|Applications|Office"/>
++
++    <description>
++      This is the user's manual for Gnumeric, a GNOME spreadsheet.
++    </description>
++
++    <type>
++      User's Guide
++    </type>
++
++    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN"/>
++    <identifier url="gnumeric.xml"/>
++    <language code="C"/>
++    <relation seriesid="c5e3db84-64c3-11d6-85a3-a3e50590e6d1"/>
++    <rights type="GNU FDL" license.version="1.1"
++      license="http://www.gnu.org/licenses/fdl.html" 
++      holder="Miguel de Icaza, Jody Goldberg, Thomas Canty, 
++      Jukka-Pekka Iivonen, Andreas J. Guelzow, Wayne Schuller, 
++      Adrian Custer, Kevin Breit, Aaron Weber, Alexander Kirillov"/>
++  </resource>
++</omf>
diff --git a/app-office/gnumeric/gnumeric-1.6.3.ebuild b/app-office/gnumeric/gnumeric-1.6.3.ebuild
index 05ece9ae8b16..d879a26096af 100644
--- a/app-office/gnumeric/gnumeric-1.6.3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.3.ebuild,v 1.11 2007/10/19 14:12:42 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.3.ebuild,v 1.12 2007/12/31 01:15:19 eva Exp $
 
 inherit eutils flag-o-matic gnome2
 
@@ -69,7 +69,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack "${A}"
-	gnome2_omf_fix ${S}/doc/C/Makefile.in
+	gnome2_omf_fix "${S}/doc/C/Makefile.in"
 }
 
 src_install() {
diff --git a/app-office/gnumeric/gnumeric-1.8.0.ebuild b/app-office/gnumeric/gnumeric-1.8.0.ebuild
new file mode 100644
index 000000000000..dbf7ecfee1f1
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.8.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.0.ebuild,v 1.1 2007/12/31 01:15:19 eva Exp $
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gnome perl python"
+# bonobo libgda
+
+RDEPEND="sys-libs/zlib
+	app-arch/bzip2
+	>=dev-libs/glib-2.6
+	>=gnome-extra/libgsf-1.14.6
+	>=x11-libs/goffice-0.5.5
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.8.1
+
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2.3.6
+	>=gnome-base/libgnomeprint-2.8.2
+	>=gnome-base/libgnomeprintui-2.8.2
+	>=media-libs/libart_lgpl-2.3.11
+
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libbonoboui-2.2 )
+	perl? ( dev-lang/perl )
+	python? (
+		>=dev-lang/python-2
+		>=dev-python/pygtk-2 )"
+	# libgda? (
+	#	>=gnome-extra/libgda-3.1.1
+	#	>=gnome-extra/libgnomedb-3.0.1 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.18
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-ssindex
+		--enable-static
+		$(use_with perl)
+		$(use_with python)
+		$(use_with gnome)"
+
+	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
+		eerror "libgsf needs to be compiled with gnome in USE"
+		eerror "for this version of gnumeric to work. Rebuild"
+		eerror "libgsf first like this :"
+		eerror "USE=gnome emerge libgsf -vp"
+		die "libgsf was built without gnome support..."
+	fi
+
+	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
+	replace-flags "-Os" "-O2"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix documentation
+	epatch "${FILESDIR}/${P}-omf.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# make gnumeric find its help
+	dosym \
+		/usr/share/gnome/help/gnumeric \
+		/usr/share/${PN}/${PV}/doc
+}
diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index 20d13ee7e217..282c96f5c795 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-office</herd>
+<herd>gnome-office</herd>
+<use>
+	<flag name='gnome'>Allow Gnumeric to use GNOME specific extensions.</flag>
+	<flag name='python'>Enable python plugin loader.</flag>
+	<flag name='perl'>Enable perl plugin loader.</flag>
+</use>
 </pkgmetadata>