Version bump. Restrict gnumeric-1.8 to goffice:0.6 slot.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 30 insertions, 40 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 6250b53a7a21..79da919f3882 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.196 2010/01/17 23:29:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.197 2010/03/04 22:57:05 eva Exp $
+
+*gnumeric-1.10.0 (04 Mar 2010)
+
+  04 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnumeric-1.8.4-r1.ebuild, gnumeric-1.8.4-r2.ebuild,
+  +gnumeric-1.10.0.ebuild:
+  Version bump. Restrict gnumeric-1.8 to goffice:0.6 slot.
 
   17 Jan 2010; Jeroen Roovers <jer@gentoo.org> gnumeric-1.8.4-r2.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild b/app-office/gnumeric/gnumeric-1.10.0.ebuild
index d12dc48b1c86..9e6f7bded431 100644
--- a/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild,v 1.12 2009/06/28 19:09:20 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.0.ebuild,v 1.1 2010/03/04 22:57:05 eva Exp $
 
 EAPI="2"
 
@@ -11,26 +11,26 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="gnome perl python"
-# bonobo guile libgda mono (experimental)
+# libgda
 
 # lots of missing files, wait for next release
+# also fails tests due to 80-bit long story
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
 	app-arch/bzip2
-	>=dev-libs/glib-2.6
-	>=gnome-extra/libgsf-1.14.6[gnome?]
-	>=x11-libs/goffice-0.6.3
+	>=dev-libs/glib-2.12
+	>=gnome-extra/libgsf-1.14.15[gnome?]
+	>=x11-libs/goffice-0.8:0.8
 	>=dev-libs/libxml2-2.4.12
-	>=x11-libs/pango-1.8.1
+	>=x11-libs/pango-1.12
 
-	>=x11-libs/gtk+-2.10
+	>=x11-libs/gtk+-2.16
 	x11-libs/cairo[svg]
 	>=gnome-base/libglade-2.3.6
-	>=media-libs/libart_lgpl-2.3.11
 
 	gnome? (
 		>=gnome-base/gconf-2
@@ -41,51 +41,34 @@ RDEPEND="sys-libs/zlib
 	perl? ( dev-lang/perl )
 	python? (
 		>=dev-lang/python-2
-		>=dev-python/pygtk-2 )"
-	# libgda? (
-	#	>=gnome-extra/libgda-3.1.1
-	#	>=gnome-extra/libgnomedb-3.0.1 )
-
+		>=dev-python/pygtk-2 )
+"
+#	libgda? (
+#		>=gnome-extra/libgda-4.1.1:4.0
+#		>=gnome-extra/libgnomedb-3.99.6:4.0 )
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
+	>=dev-util/intltool-0.25
 	>=dev-util/pkgconfig-0.18
 	app-text/scrollkeeper"
 
 DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README"
 
 pkg_setup() {
-	local will_die=false
-
 	G2CONF="${G2CONF}
 		--enable-ssindex
-		--enable-static
+		--disable-static
 		--without-gda
-		--without-guile
-		--without-mono
+		--with-zlib
 		$(use_with perl)
 		$(use_with python)
 		$(use_with gnome)"
-
-	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
-	replace-flags "-Os" "-O2"
-}
-
-src_prepare() {
-	# Fix for CVE-2009-0318, bug #257012
-	epatch "${FILESDIR}/${P}-CVE-2009-0318.patch"
-
-	# Fix #275352 (the sed expression didn't work !)
-	intltoolize --automake --copy --force || die "intltoolize failed"
-	eautoreconf
 }
 
 src_install() {
 	gnome2_src_install
 
-	# make gnumeric find its help
-	dosym \
-		/usr/share/gnome/help/gnumeric \
-		/usr/share/${PN}/${PV}/doc
+	# Remove useless .la files
+	find "${D}" -name "*.la" -delete
 }
 
 pkg_postinst() {
diff --git a/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild b/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild
index 473a12ff6399..00b1131f2a95 100644
--- a/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild
+++ b/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild,v 1.7 2010/01/17 23:29:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild,v 1.8 2010/03/04 22:57:05 eva Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/zlib
 	app-arch/bzip2
 	>=dev-libs/glib-2.6
 	>=gnome-extra/libgsf-1.14.6[gnome?]
-	>=x11-libs/goffice-0.6.3
+	>=x11-libs/goffice-0.6.3:0.6
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.8.1