new version

12 files changed, 22 insertions, 242 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 766435db2baf..926739b4b48f 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,8 +1,12 @@
 # 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.12 2002/06/14 01:53:44 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.13 2002/06/30 18:33:39 azarah Exp $
 
 
+*gnumeric-1.0.8 (30 Jun 2002)
+  30 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Bump version.  Also fix all the SLOT's.
+
 gnumeric-1.1.5 (13 Jun 2002)
   13 Jun 2002 ; Spider <spider@gentoo.org> gnumeric-1.1.5.ebuild ChangeLog :
   fix gnomeprint deps
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.4-r1 b/app-office/gnumeric/files/digest-gnumeric-1.0.4-r1
deleted file mode 100644
index c0fcc1fd67e8..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.4-r1
+++ /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-r2 b/app-office/gnumeric/files/digest-gnumeric-1.0.5-r2
deleted file mode 100644
index ee07515fad93..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecce21517b0045e3dd34c2bee70b6577 gnumeric-1.0.5.tar.bz2 10043517
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.6 b/app-office/gnumeric/files/digest-gnumeric-1.0.6
deleted file mode 100644
index 93dcd0aa0e81..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cb69f19409d0b7cf533c308bf86574b gnumeric-1.0.6.tar.bz2 9065082
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.8 b/app-office/gnumeric/files/digest-gnumeric-1.0.8
new file mode 100644
index 000000000000..87ea7eadb27b
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.0.8
@@ -0,0 +1 @@
+MD5 179dd7df88f91b0a6da6c5ad909c479e gnumeric-1.0.8.tar.bz2 10504577
diff --git a/app-office/gnumeric/files/gnumeric-1.0.6-docbuild.patch b/app-office/gnumeric/files/gnumeric-1.0.6-docbuild.patch
deleted file mode 100644
index d13c4176b72c..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.0.6-docbuild.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnumeric-doc.make.orig	Sun Mar 10 04:13:46 2002
-+++ gnumeric-doc.make	Sun Mar 17 22:42:58 2002
-@@ -18,8 +18,8 @@
- 
- include $(gnumeric_docdir)/sgmldocs.make
- 
--$(srcdir)/functions.sgml: $(srcdir)/func-list.sgml $(srcdir)/func-header.sgml $(srcdir)/func-footer.sgml
--	cd $(srcdir) && cat func-header.sgml func-list.sgml func-footer.sgml > $@
-+$(srcdir)/functions.sgml: $(srcdir)/func-list.sgml $(srcdir)/../C/func-header.sgml $(srcdir)/../C/func-footer.sgml
-+	cd $(srcdir) && cat $(srcdir)/../C/func-header.sgml func-list.sgml $(srcdir)/../C/func-footer.sgml > $@
- 
- $(srcdir)/func-list.sgml: $(srcdir)/func.defs $(gnumeric_docdir)/make-func-list.pl
- 	cd $(srcdir) && perl $(gnumeric_docdir)/make-func-list.pl func.defs > $@
diff --git a/app-office/gnumeric/files/gnumeric-1.0.5-docbuild.patch b/app-office/gnumeric/files/gnumeric-1.0.8-docbuild.patch
index d13c4176b72c..d13c4176b72c 100644
--- a/app-office/gnumeric/files/gnumeric-1.0.5-docbuild.patch
+++ b/app-office/gnumeric/files/gnumeric-1.0.8-docbuild.patch
diff --git a/app-office/gnumeric/gnumeric-1.0.4-r1.ebuild b/app-office/gnumeric/gnumeric-1.0.4-r1.ebuild
deleted file mode 100644
index 7db9803e0bc3..000000000000
--- a/app-office/gnumeric/gnumeric-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,90 +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-r1.ebuild,v 1.3 2002/05/23 06:50:10 seemant 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"
-
-#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.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-gfx/eog-0.6
-	 ~media-libs/freetype-1.3.1
-	 perl?	 ( >=sys-devel/perl-5 )
-	 python? ( >=dev-lang/python-2.0 )
-	 gb?	 ( ~gnome-extra/gb-0.0.17 )
-	 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
-    		myconf="${myconf} --with-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.6.ebuild b/app-office/gnumeric/gnumeric-1.0.6.ebuild
deleted file mode 100644
index 05566331137d..000000000000
--- a/app-office/gnumeric/gnumeric-1.0.6.ebuild
+++ /dev/null
@@ -1,121 +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.6.ebuild,v 1.3 2002/05/23 06:50:10 seemant Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx
-
-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"
-
-#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.5.12-r1
-	>=gnome-base/libglade-0.17
-	>=gnome-base/gnome-print-0.31
-	>=gnome-extra/gal-0.18
-	>=dev-libs/libole2-0.2.4
-	>=media-gfx/eog-0.6
-	=dev-libs/libxml-1.8*
-	=media-libs/freetype-1.3*
-	bonobo? ( >=gnome-base/bonobo-1.0.17 )
-	perl?   ( >=sys-devel/perl-5.6 )
-	python? ( >=dev-lang/python-2.0 )
-	gb?     ( ~gnome-extra/gb-0.0.17 )
-	libgda? ( >=gnome-extra/libgda-0.2.91
-	          >=gnome-base/bonobo-1.0.17 )
-	evo?    ( >=net-mail/evolution-0.13 )"
-	 
-#will only work once everybody has decided that they should support
-#the latest versions of programs, or if we live in a perfect world,
-#and subsequent versions do not break compatibility.
-#	 guile?  ( >=dev-util/guile-1.5 )"
-
-DEPEND="${RDEPEND}
-	 nls? ( sys-devel/gettext
-	 >=dev-util/intltool-0.11 )"
-
-
-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() {
-
-	# fix the relink bug, and invalid paths in .ls files.
-	libtoolize --copy --force
-
-	local myconf
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-  	if [ -n "`use gb`" ]; then
-    		myconf="${myconf} --with-gb"
-  	else
-    		myconf="${myconf} --without-gb"
-  	fi
-	#broken as we cannot use guile-1.5 (break gnucash)
-	if [ -n "`use guile`" ]; then
-		myconf="${myconf} --without-guile"
-	else
-		myconf="${myconf} --without-guile"
-	fi
-  	if [ -n "`use perl`" ]; then
-    		myconf="${myconf} --with-perl"
-  	else
-    		myconf="${myconf} --without-perl"
-  	fi
-  	if [ -n "`use python`" ]; then
-    		myconf="${myconf} --with-python"
-  	else
-    		myconf="${myconf} --without-python"
-  	fi
-  	if [ -n "`use libgda`" ]; then
-    		myconf="${myconf} --with-gda --with-bonobo"
-  	else
-    		myconf="${myconf} --without-gda"
-  	fi
-	if [ -n "`use evo`" ]; then
-		myconf="${myconf} --with-evolution"
-	fi
-	if [ -n "`use bonobo`" ]; then
-		myconf="${myconf} --with-bonobo"
-	elif [ -z "`use libgda`" ]; then
-		myconf="${myconf} --without-bonobo"
-	fi
-
-	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() {
-
-  	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.5-r2.ebuild b/app-office/gnumeric/gnumeric-1.0.8.ebuild
index 7f409cb03b00..b902fd74aa79 100644
--- a/app-office/gnumeric/gnumeric-1.0.5-r2.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.8.ebuild
@@ -1,23 +1,26 @@
 # 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.5-r2.ebuild,v 1.4 2002/05/23 06:50:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.8.ebuild,v 1.1 2002/06/30 18:33:39 azarah Exp $
 
 #provide Xmake and Xemake
 
-inherit virtualx
+inherit virtualx libtool
 
 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"
+SLOT="0"
+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.5.12-r1
-	>=gnome-base/libglade-0.17
+	( >=gnome-base/libglade-0.17
+	  <gnome-base/libglade-0.99 )
 	>=gnome-base/gnome-print-0.31
 	>=gnome-extra/gal-0.18
 	>=dev-libs/libole2-0.2.4
@@ -46,19 +49,19 @@ 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}
+#	cd ${S}/doc
+#	patch -p0 <${FILESDIR}/${P}-docbuild.patch || die
+#	cd ${S}
 }
 
 src_compile() {
 
 	# fix the relink bug, and invalid paths in .ls files.
-	libtoolize --copy --force
+	elibtoolize
 
-	local myconf
+	local myconf=""
 	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
+		myconf="${myconf} --disable-nls"
 	fi
   	if [ -n "`use gb`" ]; then
     		myconf="${myconf} --with-gb"
diff --git a/app-office/gnumeric/gnumeric-1.1.3-r1.ebuild b/app-office/gnumeric/gnumeric-1.1.3-r1.ebuild
index 1cf922bd2c84..f850740af4d7 100644
--- a/app-office/gnumeric/gnumeric-1.1.3-r1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.3-r1.ebuild,v 1.1 2002/05/23 00:11:06 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.3-r1.ebuild,v 1.2 2002/06/30 18:33:39 azarah Exp $
 
 #provide Xmake and Xemake
 . /usr/portage/eclass/inherit.eclass
@@ -10,7 +10,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-SLOT="1.2"
+SLOT="0"
 LICENSE="GPL-2"
 
 
diff --git a/app-office/gnumeric/gnumeric-1.1.5.ebuild b/app-office/gnumeric/gnumeric-1.1.5.ebuild
index 5e9bb60337ec..f580ccad1e0d 100644
--- a/app-office/gnumeric/gnumeric-1.1.5.ebuild
+++ b/app-office/gnumeric/gnumeric-1.1.5.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.5.ebuild,v 1.2 2002/06/14 01:53:44 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.5.ebuild,v 1.3 2002/06/30 18:33:39 azarah Exp $
 
 #provide Xmake and Xemake
-. /usr/portage/eclass/inherit.eclass
 inherit virtualx
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-SLOT="1.2"
+SLOT="0"
 LICENSE="GPL-2"