new release, mark 1.2.1 stable x86 'n cleanup old build

7 files changed, 76 insertions, 149 deletions

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 5ec537140966..8d2c5ad99098 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,14 +1,11 @@
-MD5 aa1a384c133595368a4ebed0f323ec87 gnumeric-1.2.1.ebuild 1672
+MD5 9811ff4ba9b104fe06a63cc886137574 gnumeric-1.2.1.ebuild 1671
 MD5 c7a9fbab5dc4b46a7a063a1404c87ade gnumeric-1.2.0.ebuild 1748
-MD5 aa1a384c133595368a4ebed0f323ec87 gnumeric-1.2.2.ebuild 1672
-MD5 5e45319855fc737ebce19039bce91c50 ChangeLog 6898
+MD5 1eff23e82804057d0ce4283347769dba gnumeric-1.2.2.ebuild 1672
+MD5 bfd24d37c7217026c668eaa00fbd00c2 ChangeLog 7044
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4e547e96fe616945703cbe0f19240c2f gnumeric-1.0.8.ebuild 3249
 MD5 5c9854c592e07c330b27b050b9aa088a gnumeric-1.0.13-r1.ebuild 2995
 MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532
-MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.8-docbuild.patch 728
 MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563
-MD5 a88fe4d27bf9a2579f4f3db0ca6f355f files/digest-gnumeric-1.0.8 69
 MD5 9e7ac50a8f6681cf92cdacfbbaa3a4ee files/digest-gnumeric-1.2.0 69
 MD5 f66fd82407a57e7a8a6b7f91ab22ead7 files/digest-gnumeric-1.2.1 69
 MD5 e6e85c25e0f6c2ba3b3c5af4597f706e files/digest-gnumeric-1.2.2 69
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.8 b/app-office/gnumeric/files/digest-gnumeric-1.0.8
deleted file mode 100644
index 87ea7eadb27b..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 179dd7df88f91b0a6da6c5ad909c479e gnumeric-1.0.8.tar.bz2 10504577
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.2 b/app-office/gnumeric/files/digest-gnumeric-1.2.2
new file mode 100644
index 000000000000..7018ccea946a
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.2.2
@@ -0,0 +1 @@
+MD5 e6deff35d98794938cb7a3132bb55518 gnumeric-1.2.2.tar.bz2 10967922
diff --git a/app-office/gnumeric/files/gnumeric-1.0.8-docbuild.patch b/app-office/gnumeric/files/gnumeric-1.0.8-docbuild.patch
deleted file mode 100644
index d13c4176b72c..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.0.8-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/gnumeric-1.0.8.ebuild b/app-office/gnumeric/gnumeric-1.0.8.ebuild
deleted file mode 100644
index 42e7caaed2aa..000000000000
--- a/app-office/gnumeric/gnumeric-1.0.8.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.8.ebuild,v 1.15 2003/10/15 01:26:10 weeve Exp $
-
-IUSE="nls libgda gb evo python bonobo guile perl"
-
-#provide Xmake and Xemake
-
-inherit virtualx libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-
-#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.99 )
-	>=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*
-	=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-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.
-	elibtoolize
-
-	local myconf=""
-	if [ -z "`use nls`" ] ; then
-		myconf="${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.2.1.ebuild b/app-office/gnumeric/gnumeric-1.2.1.ebuild
index 2bd43720adad..e29408031cb1 100644
--- a/app-office/gnumeric/gnumeric-1.2.1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.1 2003/10/10 13:37:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.1.ebuild,v 1.2 2003/11/27 17:55:57 foser Exp $
 
 #provide Xmake and Xemake
 inherit virtualx libtool gnome2 eutils debug
@@ -9,7 +9,7 @@ DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 # evolution, perl, guile and gb support disabled currently (or to be removed)
 
diff --git a/app-office/gnumeric/gnumeric-1.2.2.ebuild b/app-office/gnumeric/gnumeric-1.2.2.ebuild
new file mode 100644
index 000000000000..f7ca1ec75168
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.2.2.ebuild
@@ -0,0 +1,70 @@
+# 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.2.2.ebuild,v 1.1 2003/11/27 17:55:57 foser 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 ~sparc"
+
+# evolution, perl, guile and gb support disabled currently (or to be removed)
+
+# FIXME : should rethink gda/gnomedb USE stuff
+
+IUSE="libgda gnomedb 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.27.2
+	dev-util/pkgconfig"
+
+src_unpack() {
+
+	unpack ${A}
+	gnome2_omf_fix
+
+	cd ${S}
+	# fixes a sandbox issue - foser <foser@gentoo.org>
+	epatch ${FILESDIR}/${PN}-1.2.1-fix_doc_destdir_install.patch
+
+}
+
+src_compile() {
+
+	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"
+
+USE_DESTDIR="1"
+