mark 1.0.13 x86, add 1.1.19 and cleanup

10 files changed, 183 insertions, 175 deletions

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 1b99411d4f2e..81ae7bf8c88c 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,15 +1,12 @@
-MD5 1276e24b241da8b936d05fd4cc9cd354 gnumeric-1.0.13.ebuild 3262
+MD5 da2272cb811052a2fdc88257e6b4f22d gnumeric-1.0.13.ebuild 3259
 MD5 6d0a21df6af6225fa76ea7fa99964649 gnumeric-1.1.17.ebuild 1463
-MD5 e59ff44caacbf1277bcf03fbfc16bef9 gnumeric-1.1.19.ebuild 1429
+MD5 696b43a04c141eaea3543661cbaf70b7 gnumeric-1.1.19.ebuild 1429
 MD5 686883719d8d6d5ba6fbaead6ba8f4bb gnumeric-1.0.12.ebuild 3253
-MD5 e42f64604844ac07ee01528b21ade757 gnumeric-1.1.16.ebuild 2060
-MD5 5322872a7c206a4118411074fe08acec ChangeLog 5372
+MD5 66d767b132f083141d58f32c75dc8fa9 ChangeLog 5407
 MD5 e98f3966b2cdec5bd009d11a5b9e9634 gnumeric-1.0.8.ebuild 3310
-MD5 baec83f17af2dfdb3cf80fca5b41f38a gnumeric-1.1.16-r1.ebuild 2108
-MD5 c602c2d4ebaba2d67f4fb14ed6687716 gnumeric-1.0.13-r1.ebuild 3057
+MD5 d71307b5e8115b0e25ea9cfc3a22b929 gnumeric-1.0.13-r1.ebuild 3058
 MD5 d649b85924af69de4941cf0c624b16f3 files/digest-gnumeric-1.0.12 69
 MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13 69
-MD5 bbafb282a7d40a0947d7ab6b6f53d773 files/digest-gnumeric-1.1.16 70
 MD5 abc0fd9b785966aa41a2aff5a41f6c8a files/digest-gnumeric-1.1.17 70
 MD5 629a3f22adb6cf4415d44093d3653e8f files/digest-gnumeric-1.1.19 70
 MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.8-docbuild.patch 728
@@ -17,4 +14,3 @@ MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.7-docbuild.patch 728
 MD5 a88fe4d27bf9a2579f4f3db0ca6f355f files/digest-gnumeric-1.0.8 69
 MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
 MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493
-MD5 bbafb282a7d40a0947d7ab6b6f53d773 files/digest-gnumeric-1.1.16-r1 70
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.13-r1 b/app-office/gnumeric/files/digest-gnumeric-1.0.13-r1
new file mode 100644
index 000000000000..743341303f45
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.0.13-r1
@@ -0,0 +1 @@
+MD5 7f0e7b88538719cba9d9f5509ccbb491 gnumeric-1.0.13.tar.bz2 9853785
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.1.16 b/app-office/gnumeric/files/digest-gnumeric-1.1.16
deleted file mode 100644
index 5575d3f75b7c..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6961bbceafa2a7b2355dbb2a43002919 gnumeric-1.1.16.tar.bz2 11109572
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.1.16-r1 b/app-office/gnumeric/files/digest-gnumeric-1.1.16-r1
deleted file mode 100644
index 5575d3f75b7c..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.1.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6961bbceafa2a7b2355dbb2a43002919 gnumeric-1.1.16.tar.bz2 11109572
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.1.19 b/app-office/gnumeric/files/digest-gnumeric-1.1.19
new file mode 100644
index 000000000000..5a1cde2330a6
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.1.19
@@ -0,0 +1 @@
+MD5 9477a2e9b4919fb4eb7048c2e3d7b4fb gnumeric-1.1.19.tar.bz2 12014105
diff --git a/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild b/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..919d7825ae53
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Maintainer: Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild,v 1.1 2003/06/08 19:31:10 foser 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.5.12-r1
+	=gnome-base/libglade-0*
+	>=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.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 )
+	gb?     ( ~gnome-extra/gb-0.0.17 )
+	libgda? ( <gnome-extra/libgda-0.10.0
+	          >=gnome-base/bonobo-1.0.17 )
+	evo?    ( <net-mail/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 [ -n "`use gb`" ]; then
+    		myconf="${myconf} --with-gb"
+  	else
+    		myconf="${myconf} --without-gb"
+  	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
+
+	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.0.13.ebuild b/app-office/gnumeric/gnumeric-1.0.13.ebuild
index 122298337c46..1b0bd0a619ef 100644
--- a/app-office/gnumeric/gnumeric-1.0.13.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13.ebuild,v 1.2 2003/04/22 15:32:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13.ebuild,v 1.3 2003/06/08 19:31:10 foser Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 IUSE="libgda gb evo python bonobo guile perl"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 #Eye Of Gnome (media-gfx/eog) is for image support.
diff --git a/app-office/gnumeric/gnumeric-1.1.16-r1.ebuild b/app-office/gnumeric/gnumeric-1.1.16-r1.ebuild
deleted file mode 100644
index 12820ea5d833..000000000000
--- a/app-office/gnumeric/gnumeric-1.1.16-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.16-r1.ebuild,v 1.2 2003/05/04 19:04:04 liquidx Exp $
-
-#provide Xmake and Xemake
-inherit virtualx libtool gnome2 eutils
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-# guile, gb and evo not supported atm, read down
-#IUSE="nls libgda gb evo python guile perl"
-IUSE="nls libgda python perl"
-
-#Eye Of Gnome (media-gfx/eog) is for image support.
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-extra/gal-1.99
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-extra/libgsf-1.7.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/bonobo-activation-1.0.2
-	perl?   ( >=dev-lang/perl-5.6 )
-	python? ( >=dev-lang/python-2.0 )
-	libgda? ( >=gnome-extra/libgda-0.11.0 )"
-
-# disabled during the port
-#	gb?     ( ~gnome-extra/gb-0.0.17 )
-#	evo?    ( >=net-mail/evolution-1.0.8 )
-
-DEPEND="${RDEPEND}
-	 nls? ( sys-devel/gettext
-	 >=dev-util/intltool-0.11 )"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-}
-
-src_compile() {
-	local myconf
-	
-	# enable bonobo support
-	myconf="${myconf} --with-bonobo"
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-#	use gb \
-#		&& myconf="${myconf} --with-gb" \
-#		|| myconf="${myconf} --without-gb"
-
-#	use guile \
-#		&& myconf="${myconf} --with-guile" \
-#		|| myconf="${myconf} --without-guile"
-
-	use libgda \
-		&& myconf="${myconf} --with-gda" \
-		|| myconf="${myconf} --without-gda"
-	use perl \
-		&& myconf="${myconf} --with-perl" \
-		|| myconf="${myconf} --without-perl"
-  	use python \
-		&& myconf="${myconf} --with-python" \
-		|| myconf="${myconf} --without-python"
-
-  	econf ${myconf}
-
-	#the build process have to be able to connect to X
-	Xemake || Xmake || die
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
-USE_DESTDIR="1"
-
diff --git a/app-office/gnumeric/gnumeric-1.1.16.ebuild b/app-office/gnumeric/gnumeric-1.1.16.ebuild
deleted file mode 100644
index 6a9da72343b4..000000000000
--- a/app-office/gnumeric/gnumeric-1.1.16.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.16.ebuild,v 1.3 2003/03/31 22:40:12 foser Exp $
-
-#provide Xmake and Xemake
-inherit virtualx libtool gnome2
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-# guile, gb and evo not supported atm, read down
-#IUSE="nls libgda gb evo python guile perl"
-IUSE="nls libgda python perl bonobo"
-
-#Eye Of Gnome (media-gfx/eog) is for image support.
-
-# FIXME : isn't bonobo optional 
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-extra/gal-1.99
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-extra/libgsf-1.7.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/bonobo-activation-1.0.2
-	perl?   ( >=dev-lang/perl-5.6 )
-	python? ( >=dev-lang/python-2.0 )
-	libgda? ( >=gnome-extra/libgda-0.11.0 )"
-
-# disabled during the port
-#	gb?     ( ~gnome-extra/gb-0.0.17 )
-#	evo?    ( >=net-mail/evolution-1.0.8 )
-
-DEPEND="${RDEPEND}
-	 nls? ( sys-devel/gettext
-	 >=dev-util/intltool-0.11 )"
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-
-#	use gb \
-#		&& myconf="${myconf} --with-gb" \
-#		|| myconf="${myconf} --without-gb"
-
-#	use guile \
-#		&& myconf="${myconf} --with-guile" \
-#		|| myconf="${myconf} --without-guile"
-
-	use libgda \
-		&& myconf="${myconf} --with-gda" \
-		|| myconf="${myconf} --without-gda"
-	use perl \
-		&& myconf="${myconf} --with-perl" \
-		|| myconf="${myconf} --without-perl"
-  	use python \
-		&& myconf="${myconf} --with-python" \
-		|| myconf="${myconf} --without-python"
-
-  	econf ${myconf} || die
-
-	#the build process have to be able to connect to X
-	Xemake || Xmake || die
-}
-
-src_install() {
-	DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
-	gnome2_src_install DESTDIR=${D}
-}
-
diff --git a/app-office/gnumeric/gnumeric-1.1.19.ebuild b/app-office/gnumeric/gnumeric-1.1.19.ebuild
new file mode 100644
index 000000000000..1d5f4d420bc7
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.1.19.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.19.ebuild,v 1.1 2003/06/08 19:31:10 foser Exp $
+
+#provide Xmake and Xemake
+inherit virtualx libtool gnome2 eutils debug
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+# evolution, perl, guile and gb support disabled currently (or to be removed)
+
+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.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libglade-2
+	>=gnome-extra/gal-1.99
+	>=dev-libs/libxml2-2.4.12
+	>=gnome-extra/libgsf-1.8.1
+	>=media-libs/libart_lgpl-2.3.11
+	python? ( >=dev-lang/python-2.0 
+		>=dev-python/pygtk-1.99.10 )
+	libgda? ( >=gnome-extra/libgda-0.10 )
+	bonobo? ( >=gnome-base/libbonobo-2
+		>=gnome-base/libbonoboui-2
+		>=gnome-base/bonobo-activation-1.0.2 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	gnome2_omf_fix
+}
+
+src_compile() {
+  	econf `use_with bonobo` `use_with python` `use_with libgda gda`
+
+	#the build process have to be able to connect to X
+	Xemake || die
+}
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
+
+USE_DESTDIR="1"
+