add check for svg support in cairo, bug #232765.

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64)

3 files changed, 21 insertions, 88 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 62b8aa5f31b8..abc248cca37e 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.173 2008/07/15 18:42:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.174 2008/08/03 20:01:37 eva Exp $
+
+  03 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnumeric-1.8.2.ebuild, gnumeric-1.8.3.ebuild:
+  add check for svg support in cairo, bug #232765.
 
   15 Jul 2008; Jeroen Roovers <jer@gentoo.org> gnumeric-1.8.3.ebuild:
   Stable for HPPA (bug #230031).
diff --git a/app-office/gnumeric/gnumeric-1.8.2.ebuild b/app-office/gnumeric/gnumeric-1.8.2.ebuild
deleted file mode 100644
index b13da186c238..000000000000
--- a/app-office/gnumeric/gnumeric-1.8.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.2.ebuild,v 1.6 2008/04/21 19:19:48 maekke Exp $
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE="gnome perl python"
-# bonobo guile libgda mono (experimental)
-
-# lots of missing files, wait for next release
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	app-arch/bzip2
-	>=dev-libs/glib-2.6
-	>=gnome-extra/libgsf-1.14.6
-	>=x11-libs/goffice-0.5.5
-	>=dev-libs/libxml2-2.4.12
-	>=x11-libs/pango-1.8.1
-
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libglade-2.3.6
-	>=media-libs/libart_lgpl-2.3.11
-
-	gnome? (
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/libbonobo-2.2
-		>=gnome-base/libbonoboui-2.2 )
-	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 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.18
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-ssindex
-		--enable-static
-		--without-gda
-		--without-guile
-		--without-mono
-		$(use_with perl)
-		$(use_with python)
-		$(use_with gnome)"
-
-	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
-		eerror "libgsf needs to be compiled with gnome in USE"
-		eerror "for this version of gnumeric to work. Rebuild"
-		eerror "libgsf first like this :"
-		eerror "USE=gnome emerge libgsf -vp"
-		die "libgsf was built without gnome support..."
-	fi
-
-	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
-	replace-flags "-Os" "-O2"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# make gnumeric find its help
-	dosym \
-		/usr/share/gnome/help/gnumeric \
-		/usr/share/${PN}/${PV}/doc
-}
diff --git a/app-office/gnumeric/gnumeric-1.8.3.ebuild b/app-office/gnumeric/gnumeric-1.8.3.ebuild
index 61c21bc8bbaa..fbf4871258c5 100644
--- a/app-office/gnumeric/gnumeric-1.8.3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.3.ebuild,v 1.7 2008/07/15 18:42:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.3.ebuild,v 1.8 2008/08/03 20:01:37 eva Exp $
 
 inherit gnome2 flag-o-matic
 
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
+	local will_die=false
+
 	G2CONF="${G2CONF}
 		--enable-ssindex
 		--enable-static
@@ -61,12 +63,22 @@ pkg_setup() {
 		$(use_with python)
 		$(use_with gnome)"
 
+	if ! built_with_use x11-libs/cairo svg; then
+		eerror "x11-libs/cairo needs to be built with svg support"
+		eerror "please rebuild x11-libs/cairo with svg support"
+		will_die=true
+	fi
+
 	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
-		eerror "libgsf needs to be compiled with gnome in USE"
+		eerror "gnome-extra/libgsf needs to be compiled with gnome support"
 		eerror "for this version of gnumeric to work. Rebuild"
-		eerror "libgsf first like this :"
+		eerror "gnome-extra/libgsf first like this :"
 		eerror "USE=gnome emerge libgsf -vp"
-		die "libgsf was built without gnome support..."
+		will_die=true
+	fi
+
+	if ${will_die} ; then
+		die "Please rebuild the packages with the use flags above."
 	fi
 
 	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)