new version

6 files changed, 43 insertions, 113 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 5e7ff2b07893..ff7da26d4817 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.4 2002/02/19 21:07:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.5 2002/03/17 22:21:43 azarah Exp $
+
+*gnumeric-1.0.5 (11 March 2002)
 
   19 Feb 2002; M.Schlemmer <azarah@gentoo.org> gnumeric-1.0.4-r1.ebuild :
 
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.3 b/app-office/gnumeric/files/digest-gnumeric-1.0.3
deleted file mode 100644
index d2498bd83705..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9020af9d717afd6dbed0e9d5768d96a0 gnumeric-1.0.3.tar.bz2 9008249
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.4 b/app-office/gnumeric/files/digest-gnumeric-1.0.4
deleted file mode 100644
index c0fcc1fd67e8..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 358667153706bd93a6dd7cf20e3d6bb4 gnumeric-1.0.4.tar.bz2 9021992
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.5 b/app-office/gnumeric/files/digest-gnumeric-1.0.5
new file mode 100644
index 000000000000..ee07515fad93
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.0.5
@@ -0,0 +1 @@
+MD5 ecce21517b0045e3dd34c2bee70b6577 gnumeric-1.0.5.tar.bz2 10043517
diff --git a/app-office/gnumeric/gnumeric-1.0.4.ebuild b/app-office/gnumeric/gnumeric-1.0.4.ebuild
deleted file mode 100644
index cb47de6b3cb2..000000000000
--- a/app-office/gnumeric/gnumeric-1.0.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.4.ebuild,v 1.1 2002/02/02 18:52:57 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-
-RDEPEND=">=x11-libs/gtk+-1.2.10-r3
-	 >=gnome-base/gnome-libs-1.4.1.2-r1
-	 >=gnome-base/oaf-0.6.7
-	 >=gnome-base/ORBit-0.5.12-r1
-	 >=gnome-base/libglade-0.17
-	 >=gnome-base/gnome-print-0.31
-         >=gnome-extra/gal-0.18
-         >=dev-libs/libxml-1.8.16
-	 >=dev-libs/libole2-0.2.4
-	 >=gnome-base/bonobo-1.0.17
-	 ~media-libs/freetype-1.3.1
-         perl?	 ( >=sys-devel/perl-5 )
-	 python? ( >=dev-lang/python-2.0 )
-         gb?	 ( >=gnome-extra/gb-0.0.20-r1 )
-	 guile?	 ( >=dev-util/guile-1.5 )
-         libgda? ( >=gnome-extra/libgda-0.2.91 )
-	 evo?	 ( >=net-mail/evolution-0.13 )"
-
-DEPEND="${RDEPEND}
-        >=dev-util/intltool-0.11
-        nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	local myconf
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-  	if [ "`use gb`" ]; then
-    		#does not work atm
-    		myconf="${myconf} --without-gb"
-  	else
-    		myconf="${myconf} --without-gb"
-  	fi
-	if [ "`use guile`" ]; then
-		myconf="${myconf} --with-guile"
-	else
-		myconf="${myconf} --without-guile"
-	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"
-  	else
-    		myconf="${myconf} --without-gda"
-  	fi
-	if [ "`use evo`" ]; then
-		myconf="${myconf} --with-evolution"
-	fi
-
-	CFLAGS="$CFLAGS `gdk-pixbuf-config --cflags`"
-
-  	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --with-bonobo					\
-		    ${myconf} || die
-
-	emake || make || die
-}
-
-src_install() {
-
-  	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     install || die
-
-  	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
-}
-
diff --git a/app-office/gnumeric/gnumeric-1.0.3.ebuild b/app-office/gnumeric/gnumeric-1.0.5.ebuild
index dc617e0bca32..0897a9a3b79d 100644
--- a/app-office/gnumeric/gnumeric-1.0.3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.5.ebuild
@@ -1,37 +1,51 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.3.ebuild,v 1.1 2002/01/27 15:44:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.5.ebuild,v 1.1 2002/03/17 22:21:44 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
-# We actually need guile-1.5
+#Eye Of Gnome (media-gfx/eog) is for image support.
 RDEPEND=">=x11-libs/gtk+-1.2.10-r3
 	 >=gnome-base/gnome-libs-1.4.1.2-r1
 	 >=gnome-base/oaf-0.6.7
 	 >=gnome-base/ORBit-0.5.12-r1
 	 >=gnome-base/libglade-0.17
 	 >=gnome-base/gnome-print-0.31
-         >=gnome-extra/gal-0.18
-         >=dev-libs/libxml-1.8.16
+	 >=gnome-extra/gal-0.18
+	 >=dev-libs/libxml-1.8.16
 	 >=dev-libs/libole2-0.2.4
 	 >=gnome-base/bonobo-1.0.17
+	 >=media-gfx/eog-0.6
 	 ~media-libs/freetype-1.3.1
-         perl?	 ( >=sys-devel/perl-5 )
+	 perl?   ( >=sys-devel/perl-5.6 )
 	 python? ( >=dev-lang/python-2.0 )
-         gb?	 ( >=gnome-extra/gb-0.0.20-r1 )
-	 guile?	 ( >=dev-util/guile-1.5 )
-         libgda? ( >=gnome-extra/libgda-0.2.91 )
-	 evo?	 ( >=net-mail/evolution-0.13 )"
+	 gb?     ( ~gnome-extra/gb-0.0.17 )
+	 libgda? ( >=gnome-extra/libgda-0.2.91 )
+	 evo?    ( >=net-mail/evolution-0.13 )"
+	 
+#will only work once everybody have decided that they should support
+#the latest versions of programs, or if we live in a perfect world,
+#and subsequent versions do not break compadibility.
+#	 guile?  ( >=dev-util/guile-1.5 )"
 
 DEPEND="${RDEPEND}
-        >=dev-util/intltool-0.11
-        nls? ( sys-devel/gettext )"
+	 >=dev-util/intltool-0.11
+	 nls? ( sys-devel/gettext )"
 
 
+src_unpack() {
+	unpack ${A}
+
+	#patch 'gnumeric-doc.make' to look for files in the correct place.
+	cd ${S}/doc
+	patch -p0 <${FILESDIR}/${P}-docbuild.patch || die
+	cd ${S}
+}
+
 src_compile() {
 
 	local myconf
@@ -39,13 +53,13 @@ src_compile() {
 		myconf="--disable-nls"
 	fi
   	if [ "`use gb`" ]; then
-    		#does not work atm
-    		myconf="${myconf} --without-gb"
+    		myconf="${myconf} --with-gb"
   	else
     		myconf="${myconf} --without-gb"
   	fi
+	#broken as we cannot use guile-1.5 (break gnucash)
 	if [ "`use guile`" ]; then
-		myconf="${myconf} --with-guile"
+		myconf="${myconf} --without-guile"
 	else
 		myconf="${myconf} --without-guile"
 	fi
@@ -70,19 +84,23 @@ src_compile() {
 
 	CFLAGS="$CFLAGS `gdk-pixbuf-config --cflags`"
 
-  	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --with-bonobo					\
-		    ${myconf} || die
+  	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-bonobo \
+		${myconf} || die
+
+	#'gnumeric --dump-func-defs' needs to write to ${HOME}/.gnome/, or
+	#else the build fails.
+	addwrite "${HOME}/.gnome"
 
 	emake || make || die
 }
 
 src_install() {
 
-  	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
+  	make prefix=${D}/usr \
+	     sysconfdir=${D}/etc \
 	     install || die
 
   	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO