dep fix, mark 1.4.3 x86, cleanup

Package-Manager: portage-2.0.51.19

17 files changed, 12 insertions, 478 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 95b858b264c2..097fee910a32 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,9 @@
 # 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.90 2005/05/20 11:57:50 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.91 2005/06/03 12:21:21 foser Exp $
+
+  03 Jun 2005; foser <foser@gentoo.org> gnumeric-1.4.{2,3}.ebuild :
+  Fix libgsf dep to =1.10 , it won't work with newer or older versions (#94890)
 
   20 May 2005; Fernando J. Pereda <ferdy@gentoo.org> gnumeric-1.4.2.ebuild:
   alpha stable
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index ec02e395b32c..17794cdd4b93 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,31 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cda5089d74320c2a5f83e52b885a07a9 gnumeric-1.2.12.ebuild 1964
-MD5 545256ef2a15c35cbc38b6b927eddfb1 gnumeric-1.2.6.ebuild 1998
-MD5 41068f9dc9c523a2ed3eb6d407985a7b gnumeric-1.4.2.ebuild 2535
-MD5 4d1189a281192657b175968d73bd7a87 gnumeric-1.4.1.ebuild 2282
-MD5 1a618a3f23d1a302bb73abea1b4a5eb7 ChangeLog 12364
+MD5 4efb73ab43f974bc41253cede90fa6ad gnumeric-1.4.2.ebuild 2536
+MD5 3d5f6490f04343bd0bf6218277423315 ChangeLog 12513
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 c00958b75cdd0d2ec2b3d80f6e932327 gnumeric-1.4.3.ebuild 2517
-MD5 1efce9ecf63cd654d80e288c8c06a87d gnumeric-1.0.13-r1.ebuild 2821
-MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532
+MD5 b519b3a915ccd3136f5b57da48e1bb0a gnumeric-1.4.3.ebuild 2514
 MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
-MD5 48c7f38d541d59ac1a888121072bc6df files/digest-gnumeric-1.2.12 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 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3 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 4ea524a5bc0155e6fb624670d57075f7 files/gnumeric-1.2.0-gcc2_fix.patch 693
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjdDUViELBEf1JB0RAqoyAJ9Eft5xPYfO0vku4dAZwadahiJggACdEKOn
-cWhX6/JNzcSBWw7wc5xB3Ww=
-=dKND
------END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.13-r1 b/app-office/gnumeric/files/digest-gnumeric-1.0.13-r1
deleted file mode 100644
index 743341303f45..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f0e7b88538719cba9d9f5509ccbb491 gnumeric-1.0.13.tar.bz2 9853785
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.12 b/app-office/gnumeric/files/digest-gnumeric-1.2.12
deleted file mode 100644
index 37dd3c92ba20..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.2.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef9285d53c9eec2c1f20d10420c2bcf8 gnumeric-1.2.12.tar.bz2 14284997
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.6 b/app-office/gnumeric/files/digest-gnumeric-1.2.6
deleted file mode 100644
index 5964d3a70415..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fd27da8feda72d78c7fac13458ec741 gnumeric-1.2.6.tar.bz2 11119538
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.1 b/app-office/gnumeric/files/digest-gnumeric-1.4.1
deleted file mode 100644
index 81b6bfd794cd..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc60b5c342908e969b320ab833e6b151 gnumeric-1.4.1.tar.bz2 16827174
diff --git a/app-office/gnumeric/files/gnumeric-1.1.16-scrollkeeper.patch b/app-office/gnumeric/files/gnumeric-1.1.16-scrollkeeper.patch
deleted file mode 100644
index 2c87e7c65bbb..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.1.16-scrollkeeper.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnumeric-1.1.16/omf-install/Makefile.in	2003-01-28 05:40:05.000000000 +0000
-+++ gnumeric-1.1.16/omf-install/Makefile.in.new	2003-04-14 02:38:50.000000000 +0100
-@@ -271,7 +271,8 @@
- 	-for file in $(srcdir)/*.omf; do 			\
- 		$(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir); \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o \
-+$(DESTDIR)$(omf_dest_dir)
- 
- uninstall-local:
- 	-for file in $(srcdir)/*.omf; do 			\
diff --git a/app-office/gnumeric/files/gnumeric-1.2.0-fix_doc_destdir_install.patch b/app-office/gnumeric/files/gnumeric-1.2.0-fix_doc_destdir_install.patch
deleted file mode 100644
index e7debf36b501..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.2.0-fix_doc_destdir_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnumeric-1.2.0/doc/xmldocs.make	2003-09-13 12:50:24.000000000 -0700
-+++ gnumeric-1.2.0/doc/xmldocs.make	2003-09-16 23:10:52.000000000 -0700
-@@ -74,7 +74,7 @@
- 	done
- 	# libbonoboui and libgnomeui want help in different places add a sym
- 	# link to get an install that works for both (It may already exist)
--	-ln -s $(gnumeric_datadir)/share/gnome $(gnumeric_datadir)/gnome
-+	-ln -s $(gnumeric_datadir)/share/gnome $(DESTDIR)$(gnumeric_datadir)/gnome
- 	-if [ -e $(srcdir)/topic.dat ]; then \
- 		$(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \
- 	 fi
diff --git a/app-office/gnumeric/files/gnumeric-1.2.0-gcc2_fix.patch b/app-office/gnumeric/files/gnumeric-1.2.0-gcc2_fix.patch
deleted file mode 100644
index 3c991ddb9149..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.2.0-gcc2_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur gnumeric-1.2.0.orig/src/dialogs/dialog-sheet-order.c gnumeric-1.2.0/src/dialogs/dialog-sheet-order.c
---- gnumeric-1.2.0.orig/src/dialogs/dialog-sheet-order.c	2003-09-15 01:40:38.000000000 -0400
-+++ gnumeric-1.2.0/src/dialogs/dialog-sheet-order.c	2003-09-20 06:35:59.000000000 -0400
-@@ -106,6 +106,7 @@
- static gint
- location_of_iter (GtkTreeIter  *iter, GtkListStore *model)
- {
-+	gint loc;
- 	/* Note: in gtk 2.2 we could just do: */
- /* 	gchar* path = gtk_tree_model_get_string_from_iter */
- /* 		(GTK_TREE_MODEL (model), iter); */
-@@ -117,7 +118,7 @@
- 	gtk_tree_path_free (treepath);
- 	/* end of gtk 2.0 code */
- 
--	gint loc = atoi(path);
-+	loc = atoi(path);
- 	
- 	g_free (path);
- 
diff --git a/app-office/gnumeric/files/gnumeric-1.2.1-fix_doc_destdir_install.patch b/app-office/gnumeric/files/gnumeric-1.2.1-fix_doc_destdir_install.patch
deleted file mode 100644
index 4900200dbf45..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.2.1-fix_doc_destdir_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnumeric-1.2.1/doc/xmldocs.make	2003-09-17 22:37:46.000000000 +0200
-+++ gnumeric-1.2.1/doc/xmldocs.make.new	2003-10-09 15:56:03.000000000 +0200
-@@ -74,7 +74,7 @@
- 	done
- 	# libbonoboui and libgnomeui want help in different places add a sym
- 	# link to get an install that works for both (It may already exist)
--	-ln -s share/gnome $(gnumeric_datadir)/gnome
-+	-ln -s /usr/share/gnome $(DESTDIR)$(gnumeric_datadir)/gnome
- 	-if [ -e $(srcdir)/topic.dat ]; then \
- 		$(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \
- 	 fi
diff --git a/app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch b/app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch
deleted file mode 100644
index 9aa61406a4de..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnumeric-1.4.1/src/cut-n-paste-code/goffice/utils/go-file.c	2004-12-09 18:47:37.000000000 +0100
-+++ gnumeric-1.4.1/src/cut-n-paste-code/goffice/utils/go-file.c.patched	2004-12-12 22:35:44.309910984 +0100
-@@ -493,7 +493,7 @@
- 			for (i = 1 ; i < argc ; i++)
- 				if (NULL != (tmp = strstr (argv[i], "%1"))) {
- 					*tmp = '\0';
--					tmp = g_strconcat = (argv[i],
-+					tmp = g_strconcat (argv[i],
- 						(clean_url != NULL) ? (char const *)clean_url : url,
- 						tmp+2, NULL);
- 					g_free (argv[i]);
diff --git a/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild b/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
deleted file mode 100644
index 5876593b9ae7..000000000000
--- a/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.0.13-r1.ebuild,v 1.14 2005/01/01 15:33:56 eradicator Exp $
-
-inherit virtualx libtool gnome.org
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
-
-IUSE="libgda gb evo python bonobo guile perl"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="GPL-2"
-
-#Eye Of Gnome (media-gfx/eog) is for image support.
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/oaf-0.6.7
-	=gnome-base/orbit-0*
-	=gnome-base/libglade-0*
-	>=gnome-base/gnome-print-0.31
-	<gnome-extra/gal-1.99
-	>=dev-libs/libole2-0.2.4
-	>=media-gfx/eog-0.6
-	>=dev-libs/libxml-1.8.14
-	=media-libs/freetype-1.3*
-	bonobo? ( >=gnome-base/bonobo-1.0.17 )
-	perl?   ( >=dev-lang/perl-5.6 )
-	python? ( >=dev-lang/python-2.0 )
-	libgda? ( <gnome-extra/libgda-0.10.0
-	          >=gnome-base/bonobo-1.0.17 )
-	evo?    ( <mail-client/evolution-1.3 )
-	guile?  ( >=dev-util/guile-1.6 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.11"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/gnumeric-1.1.16-scrollkeeper.patch || die "scrollkeeper patch failed"
-}
-
-src_compile() {
-	# fix the relink bug, and invalid paths in .la files.
-	elibtoolize
-
-	local myconf=""
-	if use gb; then
-		myconf="${myconf} --with-gb"
-	else
-		myconf="${myconf} --without-gb"
-	fi
-	if use perl; then
-		myconf="${myconf} --with-perl"
-	else
-		myconf="${myconf} --without-perl"
-	fi
-	if use python; then
-		myconf="${myconf} --with-python"
-	else
-		myconf="${myconf} --without-python"
-	fi
-	if use libgda; then
-		myconf="${myconf} --with-gda --with-bonobo"
-	else
-		myconf="${myconf} --without-gda"
-	fi
-	if use evo; then
-		myconf="${myconf} --with-evolution"
-	fi
-	if use bonobo; then
-		myconf="${myconf} --with-bonobo"
-	elif ! use libgda; then
-		myconf="${myconf} --without-bonobo"
-	fi
-
-	use guile \
-		&& myconf="${myconf} --with-guile" \
-		|| myconf="${myconf} --without-guile"
-
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	#'gnumeric --dump-func-defs' needs to write to ${HOME}/.gnome/, or
-	#else the build fails.
-	addwrite "${HOME}/.gnome"
-
-	#the build process have to be able to connect to X
-	Xemake || Xmake || die
-}
-
-src_install() {
-	# keep scrollkeeper happy
-	dodir /var/lib/scrollkeeper
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
-		install || die
-
-	# regenerate these outside sandbox
-	rm -rf ${D}/var/lib/scrollkeeper
-
-	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
-}
-
-pkg_postinst() {
-	scrollkeeper-update
-
-	einfo "For plotting/graph support in gnumeric emerge guppi"
-}
diff --git a/app-office/gnumeric/gnumeric-1.2.12.ebuild b/app-office/gnumeric/gnumeric-1.2.12.ebuild
deleted file mode 100644
index 72d98d7de8b5..000000000000
--- a/app-office/gnumeric/gnumeric-1.2.12.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.2.12.ebuild,v 1.10 2005/01/01 15:33:56 eradicator Exp $
-
-#provide Xmake and Xemake
-inherit virtualx libtool 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"
-
-# evolution, perl, guile and gb support disabled currently (or to be removed)
-
-# FIXME : should rethink gda/gnomedb USE stuff
-
-#IUSE="libgda gnomedb python bonobo"
-IUSE="libgda python bonobo"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.4.2
-	>=gnome-base/libgnomeprintui-2.4.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-extra/libgsf-1.9
-	>=media-libs/libart_lgpl-2.3.11
-	python? ( >=dev-lang/python-2
-		>=dev-python/pygtk-2 )
-	libgda? ( >=gnome-extra/libgda-1.0.1 )
-	bonobo? ( >=gnome-base/libbonobo-2.2
-		>=gnome-base/libbonoboui-2.2 )"
-#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-util/pkgconfig"
-
-pkg_setup() {
-
-	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
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-}
-
-src_compile() {
-
-	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
-	filter-flags "-Os"
-
-	econf \
-		`use_with bonobo` \
-		`use_with python` \
-		`use_with libgda gda` \
-		|| die
-	# `use_with gnomedb gda`
-
-	# the build process has to be able to connect to X
-	Xemake || die
-
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
diff --git a/app-office/gnumeric/gnumeric-1.2.6.ebuild b/app-office/gnumeric/gnumeric-1.2.6.ebuild
deleted file mode 100644
index 32804be7bc0d..000000000000
--- a/app-office/gnumeric/gnumeric-1.2.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.2.6.ebuild,v 1.10 2005/01/01 15:33:56 eradicator Exp $
-
-#provide Xmake and Xemake
-inherit virtualx libtool gnome2 eutils flag-o-matic
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc hppa ~amd64 alpha ia64"
-
-# evolution, perl, guile and gb support disabled currently (or to be removed)
-
-# FIXME : should rethink gda/gnomedb USE stuff
-
-#IUSE="libgda gnomedb python bonobo"
-IUSE="libgda python bonobo"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.4.2
-	>=gnome-base/libgnomeprintui-2.4.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-extra/libgsf-1.8.2
-	>=media-libs/libart_lgpl-2.3.11
-	python? ( >=dev-lang/python-2
-		>=dev-python/pygtk-2 )
-	libgda? ( >=gnome-extra/libgda-1.0.1 )
-	bonobo? ( >=gnome-base/libbonobo-2.2
-		>=gnome-base/libbonoboui-2.2 )"
-#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.58"
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-	cd ${S}
-	# fix problems with libtool-0.28 generated stuff
-	intltoolize --force
-
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-	aclocal || die
-	autoconf || die
-	automake -a || die
-
-}
-
-src_compile() {
-
-	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
-	filter-flags "-Os"
-
-	econf \
-		`use_with bonobo` \
-		`use_with python` \
-		`use_with libgda gda` \
-		|| die
-	# `use_with gnomedb gda`
-
-	# the build process has to be able to connect to X
-	Xemake || die
-
-}
-
-src_install() {
-	gnome2_src_install
-	dosym /usr/share/${PN}/${PV}/share/gnome/help/gnumeric /usr/share/gnome/help/gnumeric/
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
diff --git a/app-office/gnumeric/gnumeric-1.4.1.ebuild b/app-office/gnumeric/gnumeric-1.4.1.ebuild
deleted file mode 100644
index 43e5b95da204..000000000000
--- a/app-office/gnumeric/gnumeric-1.4.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.1.ebuild,v 1.10 2005/04/06 18:11:08 corsair 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 ppc64"
-
-#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}
-	# simple code typo
-	epatch ${FILESDIR}/${P}-bugfix.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
-
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
diff --git a/app-office/gnumeric/gnumeric-1.4.2.ebuild b/app-office/gnumeric/gnumeric-1.4.2.ebuild
index 80e2d99eb624..271c1294975b 100644
--- a/app-office/gnumeric/gnumeric-1.4.2.ebuild
+++ b/app-office/gnumeric/gnumeric-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2005/05/20 11:57:50 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.2.ebuild,v 1.10 2005/06/03 12:21:21 foser Exp $
 
 inherit virtualx gnome2 eutils flag-o-matic
 
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="libgda python gnome"
 
 RDEPEND=">=dev-libs/glib-2.4
-	>=gnome-extra/libgsf-1.10
+	=gnome-extra/libgsf-1.10*
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.4
 
diff --git a/app-office/gnumeric/gnumeric-1.4.3.ebuild b/app-office/gnumeric/gnumeric-1.4.3.ebuild
index ba2bd4aa0b2c..ab2df5a5964b 100644
--- a/app-office/gnumeric/gnumeric-1.4.3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.2 2005/05/18 08:30:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3.ebuild,v 1.3 2005/06/03 12:21:21 foser Exp $
 
 inherit virtualx gnome2 eutils flag-o-matic
 
@@ -9,13 +9,13 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64 ~ppc64"
 
 #IUSE="libgda gnomedb python bonobo"
 IUSE="libgda python gnome"
 
 RDEPEND=">=dev-libs/glib-2.4
-	>=gnome-extra/libgsf-1.10
+	=gnome-extra/libgsf-1.10*
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.4