cleanups, mark 1.0.12 x86

7 files changed, 25 insertions, 235 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 1acbcaee6dd4..6e87c398d2cd 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.26 2003/03/16 13:45:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.27 2003/03/31 22:40:12 foser Exp $
 
 *gnumeric-1.1.16 (16 Mar 2003)
 
+  31 Mar 2003; foser <foser@gentoo.org> gnumeric-1.1.16.ebuild :
+  Some minor cleanups
+
   16 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.1.16.ebuild:
   version bump. reinstated libgda dependency. now depends on gal-1.99 
   instead of gal2.
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.0.9 b/app-office/gnumeric/files/digest-gnumeric-1.0.9
deleted file mode 100644
index 5e8c95cb57bd..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f424f16f8f4853482153299ce0a81849 gnumeric-1.0.9.tar.bz2 10494730
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.1.15 b/app-office/gnumeric/files/digest-gnumeric-1.1.15
deleted file mode 100644
index f08642ab2d83..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.1.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d41d9beebefc64d28709f3c665d37603 gnumeric-1.1.15.tar.bz2 11012537
diff --git a/app-office/gnumeric/gnumeric-1.0.12.ebuild b/app-office/gnumeric/gnumeric-1.0.12.ebuild
index 7638965af384..39a2eea18292 100644
--- a/app-office/gnumeric/gnumeric-1.0.12.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.12.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.12.ebuild,v 1.5 2003/03/31 17:55:37 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.12.ebuild,v 1.6 2003/03/31 22:40:12 foser Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 IUSE="nls libgda gb evo python bonobo guile perl"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 #Eye Of Gnome (media-gfx/eog) is for image support.
diff --git a/app-office/gnumeric/gnumeric-1.0.9.ebuild b/app-office/gnumeric/gnumeric-1.0.9.ebuild
deleted file mode 100644
index 5c04d3c75f0d..000000000000
--- a/app-office/gnumeric/gnumeric-1.0.9.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.9.ebuild,v 1.7 2003/03/16 13:45:05 liquidx 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"
-KEYWORDS="x86"
-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.99 )
-	>=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?   ( >=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.1.15.ebuild b/app-office/gnumeric/gnumeric-1.1.15.ebuild
deleted file mode 100644
index 01d261585c7d..000000000000
--- a/app-office/gnumeric/gnumeric-1.1.15.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.15.ebuild,v 1.4 2003/03/11 21:11:44 seemant 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"
-IUSE="nls libgda gb evo python guile perl"
-
-#Eye Of Gnome (media-gfx/eog) is for image support.
-# TODO libgsf-gnome is provided by libgsf
-# check if this is always the case
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/bonobo-activation-1.0.2
-	>=gnome-base/libgnomeprint-1.116.0
-	>=gnome-base/libgnomeprintui-1.116.0
-	>=gnome-extra/gal2-0.0.6
-	>=gnome-extra/libgsf-1.6.0
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2.4.12
-	perl?   ( >=dev-lang/perl-5.6 )
-	python? ( >=dev-lang/python-2.0 )"
-
-# disabled during the port
-#	gb?     ( ~gnome-extra/gb-0.0.17 )
-#	evo?    ( >=net-mail/evolution-1.0.8 )
-
-# needs libgda-0.10, not in portage yet
-#	libgda? ( >=gnome-extra/libgda-0.2.91
-#	          >=gnome-base/bonobo-1.0.17 )
-
-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 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
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make DESTDIR=${D} install || die "install failed" 
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
diff --git a/app-office/gnumeric/gnumeric-1.1.16.ebuild b/app-office/gnumeric/gnumeric-1.1.16.ebuild
index 8170d38c3b4c..6a9da72343b4 100644
--- a/app-office/gnumeric/gnumeric-1.1.16.ebuild
+++ b/app-office/gnumeric/gnumeric-1.1.16.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.1.16.ebuild,v 1.2 2003/03/16 03:08:15 liquidx Exp $
+# $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
@@ -9,37 +9,37 @@ DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE="nls libgda gb evo python guile perl"
+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.
-# TODO libgsf-gnome is provided by libgsf
-# check if this is always the case
+
+# FIXME : isn't bonobo optional 
+
 RDEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/glib-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/bonobo-activation-1.0.2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	>=gnome-extra/gal-1.99
-	>=gnome-extra/libgsf-1.7.1
 	>=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 )"
+	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 )
 
-# needs libgda-0.10, not in portage yet
-#	libgda? ( >=gnome-extra/libgda-0.2.91
-#	          >=gnome-base/bonobo-1.0.17 )
-
 DEPEND="${RDEPEND}
 	 nls? ( sys-devel/gettext
 	 >=dev-util/intltool-0.11 )"
@@ -57,28 +57,23 @@ src_compile() {
 #		|| myconf="${myconf} --without-guile"
 
 	use libgda \
-    	&& myconf="${myconf} --with-gda" \
-        || myconf="${myconf} --without-gda"
-
+		&& 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}
+  	econf ${myconf} || die
 
 	#the build process have to be able to connect to X
 	Xemake || Xmake || die
 }
 
 src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make DESTDIR=${D} install || die "install failed" 
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+	DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
+	gnome2_src_install DESTDIR=${D}
 }
 
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"