new version

5 files changed, 207 insertions, 10 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 8677ecd2274d..73c0ae67f494 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.79 2005/02/01 14:46:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.80 2005/02/14 23:18:20 foser Exp $
 
   01 Feb 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.1.ebuild:
   Added ~ppc64 to KEYWORDS
@@ -8,6 +8,13 @@
   26 Jan 2005; Guy Martin <gmsoft@gentoo.org> gnumeric-1.4.1.ebuild:
   Stable on hppa.
 
+*gnumeric-1.4.2 (14 Feb 2005)
+
+  14 Feb 2005; foser <foser@gentoo.org> gnumeric-1.4.2.ebuild :
+  New release, fixup help location symlink
+  Add jobs cap (#78828)
+  Add sheet object patch (#80565), thnx to Jean Bréfort
+
   17 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.4.1.ebuild:
   Stable on sparc
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 822a6bfa7d24..50177b301339 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,17 +1,20 @@
-MD5 5da1f7edb020026c1f6878d61bddbec6 ChangeLog 11100
-MD5 1efce9ecf63cd654d80e288c8c06a87d gnumeric-1.0.13-r1.ebuild 2821
 MD5 cda5089d74320c2a5f83e52b885a07a9 gnumeric-1.2.12.ebuild 1964
-MD5 bd25ef9a98943383c6b33581cd89432d gnumeric-1.2.13.ebuild 1964
 MD5 545256ef2a15c35cbc38b6b927eddfb1 gnumeric-1.2.6.ebuild 1998
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 075b31bb2a0e86331a726779dde267d9 gnumeric-1.4.2.ebuild 2536
+MD5 bd25ef9a98943383c6b33581cd89432d gnumeric-1.2.13.ebuild 1964
 MD5 45445c7223d8e9a97a5f9f924964721a gnumeric-1.4.1.ebuild 2283
-MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
+MD5 05edf5204a4f2404df5da2e0ea92c0f3 ChangeLog 11318
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1efce9ecf63cd654d80e288c8c06a87d gnumeric-1.0.13-r1.ebuild 2821
+MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532
 MD5 48c7f38d541d59ac1a888121072bc6df files/digest-gnumeric-1.2.12 70
 MD5 34982e496dcc5110bba611652645d400 files/digest-gnumeric-1.2.13 70
+MD5 15d1e767e35f08fc2a897857ee07d5f4 files/gnumeric-1.4.1-bugfix.patch 506
+MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563
 MD5 2513c8977def1ef6ce7489be0d52afed files/digest-gnumeric-1.2.6 69
+MD5 cc051e76b561e1c53302f80df04885f5 files/digest-gnumeric-1.4.1 69
+MD5 f7eb652589a8e0103264b9d828cf4046 files/digest-gnumeric-1.4.2 69
+MD5 b1c7dc9c30396b4fad208b985e9ade9d files/gnumeric-1.4.2-sheet_object_scroll.patch 3295
+MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
 MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493
-MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563
 MD5 4ea524a5bc0155e6fb624670d57075f7 files/gnumeric-1.2.0-gcc2_fix.patch 693
-MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532
-MD5 cc051e76b561e1c53302f80df04885f5 files/digest-gnumeric-1.4.1 69
-MD5 15d1e767e35f08fc2a897857ee07d5f4 files/gnumeric-1.4.1-bugfix.patch 506
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.2 b/app-office/gnumeric/files/digest-gnumeric-1.4.2
new file mode 100644
index 000000000000..21719b18ac66
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.4.2
@@ -0,0 +1 @@
+MD5 095167b8f123b3cf4bf76111a9a2cd1e gnumeric-1.4.2.tar.bz2 16914595
diff --git a/app-office/gnumeric/files/gnumeric-1.4.2-sheet_object_scroll.patch b/app-office/gnumeric/files/gnumeric-1.4.2-sheet_object_scroll.patch
new file mode 100644
index 000000000000..d0f5bb005020
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.4.2-sheet_object_scroll.patch
@@ -0,0 +1,74 @@
+===================================================================
+RCS file: /cvs/gnome/gnumeric/src/sheet-object-widget.c,v
+retrieving revision 1.141
+retrieving revision 1.142
+diff -u -r1.141 -r1.142
+--- sheet-object-widget.c	2005/01/05 05:22:55	1.141
++++ sheet-object-widget.c	2005/02/06 17:57:39	1.142
+@@ -769,11 +769,11 @@
+ 
+ 		swa->being_updated = TRUE;
+ 		sheet_cell_set_value (cell, value_new_int (swa->adjustment->value));
+-		swa->being_updated = FALSE;
+ 
+ 		sheet_set_dirty (ref.sheet, TRUE);
+ 		workbook_recalc (ref.sheet->workbook);
+ 		sheet_update (ref.sheet);
++		swa->being_updated = FALSE;
+ 	}
+ }
+ 
+@@ -782,7 +782,7 @@
+ {
+ 	g_return_if_fail (swa != NULL);
+ 
+-	swa->adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0., 0., 100., 1., 10., 1.));
++	swa->adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0., 0., 100., 1., 10., 0.));
+ 	g_object_ref (swa->adjustment);
+ 	gtk_object_sink (GTK_OBJECT (swa->adjustment));
+ 
+@@ -908,7 +908,7 @@
+ 	state->swa->adjustment->lower = gtk_spin_button_get_value_as_int (
+ 		GTK_SPIN_BUTTON (state->min));
+ 	state->swa->adjustment->upper = gtk_spin_button_get_value_as_int (
+-		GTK_SPIN_BUTTON (state->max)) + 1;
++		GTK_SPIN_BUTTON (state->max));
+ 	state->swa->adjustment->step_increment = gtk_spin_button_get_value_as_int (
+ 		GTK_SPIN_BUTTON (state->inc));
+ 	state->swa->adjustment->page_increment = gtk_spin_button_get_value_as_int (
+@@ -1035,7 +1035,7 @@
+ {
+ 	SheetWidgetAdjustment const *swa = SHEET_WIDGET_ADJUSTMENT (so);
+ 	gsf_xml_out_add_float (output, "Min",   swa->adjustment->lower, 2);
+-	gsf_xml_out_add_float (output, "Max",   swa->adjustment->upper-1., 2); /* allow scrolling to max */
++	gsf_xml_out_add_float (output, "Max",   swa->adjustment->upper, 2); /* allow scrolling to max */
+ 	gsf_xml_out_add_float (output, "Inc",   swa->adjustment->step_increment, 2);
+ 	gsf_xml_out_add_float (output, "Page",  swa->adjustment->page_increment, 2);
+ 	gsf_xml_out_add_float (output, "Value", swa->adjustment->value, 2);
+@@ -1050,7 +1050,7 @@
+ 	SheetWidgetAdjustment *swa = SHEET_WIDGET_ADJUSTMENT (so);
+ 
+ 	xml_node_set_double (tree, "Min", swa->adjustment->lower, 2);
+-	xml_node_set_double (tree, "Max", swa->adjustment->upper-1., 2); /* allow scrolling to max */
++	xml_node_set_double (tree, "Max", swa->adjustment->upper, 2); /* allow scrolling to max */
+ 	xml_node_set_double (tree, "Inc", swa->adjustment->step_increment, 2);
+ 	xml_node_set_double (tree, "Page", swa->adjustment->page_increment, 2);
+ 	xml_node_set_double  (tree, "Value", swa->adjustment->value, 2);
+@@ -1072,7 +1072,7 @@
+ 	if (xml_node_get_double (tree, "Min", &tmp))
+ 		swa->adjustment->lower = tmp;
+ 	if (xml_node_get_double (tree, "Max", &tmp))
+-		swa->adjustment->upper = tmp + 1.;  /* allow scrolling to max */
++		swa->adjustment->upper = tmp;  /* allow scrolling to max */
+ 	if (xml_node_get_double (tree, "Inc", &tmp))
+ 		swa->adjustment->step_increment = tmp;
+ 	if (xml_node_get_double (tree, "Page", &tmp))
+@@ -1092,7 +1092,7 @@
+ 	g_return_if_fail (swa != NULL);
+ 	swa->adjustment->value = value;
+ 	swa->adjustment->lower = min;
+-	swa->adjustment->upper = max + 1.; /* allow scrolling to max */
++	swa->adjustment->upper = max; /* allow scrolling to max */
+ 	swa->adjustment->step_increment = inc;
+ 	swa->adjustment->page_increment = page;
+ 	if (link != NULL)
diff --git a/app-office/gnumeric/gnumeric-1.4.2.ebuild b/app-office/gnumeric/gnumeric-1.4.2.ebuild
new file mode 100644
index 000000000000..40ae53346f38
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.4.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.2.ebuild,v 1.1 2005/02/14 23:18:20 foser Exp $
+
+inherit virtualx gnome2 eutils flag-o-matic
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+
+#IUSE="libgda gnomedb python bonobo"
+IUSE="libgda python gnome"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=gnome-extra/libgsf-1.10
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.4
+
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnomeprint-2.6
+	>=gnome-base/libgnomeprintui-2.6
+	>=media-libs/libart_lgpl-2.3.11
+
+	gnome? ( >=x11-libs/gtk+-2.4
+		>=gnome-base/libglade-2.4
+		>=gnome-base/libgnomecanvas-2
+		>=gnome-base/libgnomeprint-2.6
+		>=gnome-base/libgnomeprintui-2.6
+		>=media-libs/libart_lgpl-2.3.11
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libbonoboui-2.2
+		dev-util/pkgconfig )
+	python? ( >=dev-lang/python-2
+		>=dev-python/pygtk-2 )
+	libgda? ( >=gnome-extra/libgda-1.0.1 )
+	dev-util/pkgconfig" # see #67107
+#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	dev-util/pkgconfig
+	app-text/scrollkeeper"
+
+pkg_setup() {
+
+	if use gnome; then
+		if ! pkg-config --exists libgsf-gnome-1; then
+			einfo "libgsf needs to be compiled with gnome in USE"
+			einfo "for this version of gnumeric to work. Rebuild"
+			einfo "libgsf first like this :"
+			einfo "USE=gnome emerge libgsf -vp"
+			die "libgsf was built without gnome support..."
+		fi
+	fi
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+	gnome2_omf_fix
+
+	cd ${S}/src
+	# fix #80565 object problem
+	epatch ${FILESDIR}/${P}-sheet_object_scroll.patch
+
+}
+
+src_compile() {
+
+	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
+	replace-flags "-Os" "-O2"
+
+	econf \
+		`use_with python` \
+		`use_with libgda gda` \
+		`use_with gnome` \
+		|| die
+# building nogui is still too problematic
+#		`use_with gtk` \
+	# `use_with gnomedb gda`
+
+	# the build process has to be able to connect to X
+	Xemake || die
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# make gnumeric find it's help
+	dosym \
+		/usr/share/gnome/help/gnumeric \
+		/usr/share/${PN}/${PV}/doc
+
+}
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
+
+USE_DESTDIR="1"
+
+# fix possible compile problem (#78828)
+MAKEOPTS="${MAKEOPTS} -j1"