fixed deps

5 files changed, 9 insertions, 97 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 310b475ae39b..3cd1d2f938a7 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,7 +1,9 @@
 # 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.18 2002/12/09 22:48:43 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.19 2002/12/11 18:01:11 foser Exp $
 
+  10 Dec 2002; foser <foser@gentoo.org> gnumeric-1.1.6.ebuild gnumeric-1.1.8.ebuild :
+  Fixed deps (bug #11634)
 
 *gnumeric-1.1.8 (02 Sep 2002)
 
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.1.5 b/app-office/gnumeric/files/digest-gnumeric-1.1.5
deleted file mode 100644
index 2f766ce6f86d..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 622c1a3188dcaef82e0088924ab17255 gnumeric-1.1.5.tar.bz2 6424714
diff --git a/app-office/gnumeric/gnumeric-1.1.5.ebuild b/app-office/gnumeric/gnumeric-1.1.5.ebuild
deleted file mode 100644
index 3d9cab2f1a90..000000000000
--- a/app-office/gnumeric/gnumeric-1.1.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2002 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.5.ebuild,v 1.6 2002/10/05 05:39:09 drobbins Exp $
-
-IUSE="nls libgda gb evo python guile perl"
-
-#provide Xmake and Xemake
-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="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-#Eye Of Gnome (media-gfx/eog) is for image support.
-RDEPEND="=x11-libs/gtk+-2.0*
-	=dev-libs/glib-2.0*
-	>=gnome-base/libgnome-1.105.0
-	>=gnome-base/libgnomeui-1.106.0
-	>=gnome-base/libbonobo-1.106.0
-	>=gnome-base/libbonoboui-1.106.0
-	>=gnome-base/libgnomeprint-1.106.0
-	>=gnome-base/libgnomeprintui-1.106.0
-	>=gnome-extra/gal2-0.0.3
-	>=gnome-base/libglade-1.99.10
-	dev-libs/libxml2
-	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 )"
-
-DEPEND="${RDEPEND}
-	 nls? ( sys-devel/gettext
-	 >=dev-util/intltool-0.11 )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix the relink bug, and invalid paths in .ls files.
-	libtoolize --copy --force
-}
-
-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 && yconf="${myconf} --with-python" || myconf="${myconf} --without-python"
-
-  	./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() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-  	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
-}
-
-pkg_postinst() {
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	echo ">>> updating GConf2 (modemlights)"
-	for SCHEMA in gnumeric-dialogs.schemas gnumeric-general.schemas ; do
-		echo $SCHEMA
-	    /usr/bin/gconftool-2  --makefile-install-rule \
-			/etc/gconf/schemas/${SCHEMA}
-	done
-}
diff --git a/app-office/gnumeric/gnumeric-1.1.6.ebuild b/app-office/gnumeric/gnumeric-1.1.6.ebuild
index 23af2d482652..f7601fdfe06e 100644
--- a/app-office/gnumeric/gnumeric-1.1.6.ebuild
+++ b/app-office/gnumeric/gnumeric-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.6.ebuild,v 1.6 2002/11/30 22:58:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.6.ebuild,v 1.7 2002/12/11 18:01:11 foser Exp $
 
 #provide Xmake and Xemake
 inherit virtualx
@@ -15,8 +15,8 @@ KEYWORDS="x86"
 IUSE="nls libgda gb evo python guile perl"
 
 #Eye Of Gnome (media-gfx/eog) is for image support.
-RDEPEND="=x11-libs/gtk+-2.0*
-	=dev-libs/glib-2.0*
+RDEPEND=">=x11-libs/gtk+-2
+	>=dev-libs/glib-2
 	>=gnome-base/libgnome-2.0.1
 	>=gnome-base/libgnomeui-2.0.1
 	>=gnome-base/libbonobo-2.0.0
diff --git a/app-office/gnumeric/gnumeric-1.1.8.ebuild b/app-office/gnumeric/gnumeric-1.1.8.ebuild
index 052f85700e0c..7656e9fdfa90 100644
--- a/app-office/gnumeric/gnumeric-1.1.8.ebuild
+++ b/app-office/gnumeric/gnumeric-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.8.ebuild,v 1.4 2002/11/30 23:25:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.1.8.ebuild,v 1.5 2002/12/11 18:01:11 foser Exp $
 
 #provide Xmake and Xemake
 inherit virtualx libtool
@@ -15,8 +15,8 @@ KEYWORDS="x86"
 IUSE="nls libgda gb evo python guile perl"
 
 #Eye Of Gnome (media-gfx/eog) is for image support.
-RDEPEND="=x11-libs/gtk+-2.0*
-	=dev-libs/glib-2.0*
+RDEPEND=">=x11-libs/gtk+-2
+	>=dev-libs/glib-2
 	>=gnome-base/libgnome-2.0.1
 	>=gnome-base/libgnomeui-2.0.1
 	>=gnome-base/libbonobo-2.0.0