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

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64

4 files changed, 33 insertions, 92 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/Manifest b/app-office/gnumeric/Manifest
index 4131e4b0515c..0948b7e23220 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,6 +1,14 @@
-DIST gnumeric-1.8.2.tar.bz2 14075967 RMD160 fae0899a2369c4c1565a51d30ae2ad32df1ed3fb SHA1 1708da12f206fea1dda5c5341dfdd3eb2d1913dd SHA256 8418ed3a2e8dad923a6626d22eaffe796aab9cbcf827a17ab95bf99956e22a6d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnumeric-1.8.3.tar.bz2 14087309 RMD160 4cd03c3dd1bfcfc72bed1902caef4ae2cae412f9 SHA1 5a6585549bd705bf1d0e590981c3ef38173f8c08 SHA256 173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
-EBUILD gnumeric-1.8.2.ebuild 2025 RMD160 560fb371078b88fbd79680e28b023a833229be84 SHA1 afa036e993a730229e0cdb12e75d1083cfdbbda9 SHA256 dc9b4c489dc8cbc18b1bfcd47a2d1024333c1fab615935b681e07618ea6f7228
-EBUILD gnumeric-1.8.3.ebuild 2022 RMD160 378e24517ff3c49d7e403471a4252f2cdceac1b8 SHA1 46f2f814def4ddf0ef09bef839e04d755370e03f SHA256 2ee3d432272053e6a4424c343b5bb921d3ac858a9b2fc5461f0d5c5994b392b6
-MISC ChangeLog 23242 RMD160 0ecc7b582857c852ffe4f8b3543b01f6d42369c2 SHA1 ac2fa1056177a50bbb351f6ce443d0fa4dfb086e SHA256 d690f099c77521ce3e8ca84f0ab4ed4c57af56deb47563d79ed22b3ac727ec82
+EBUILD gnumeric-1.8.3.ebuild 2312 RMD160 cd9ea76db73adaff7e466c25a515f919ddb5dc59 SHA1 c27863f5784e791b4ea07e817495ea3c34ebcec5 SHA256 bc9a931470725b6d74b368cf5f42b855335f86cbbb92e8d9b554fbdd3ac898fb
+MISC ChangeLog 23397 RMD160 ea3d8dc4e542d57ba5585de8ea0ddb288b955a8f SHA1 edaa521b78d18f2e7cf0e3eae15094a4079af0d6 SHA256 66159429528b0d5679ae1e256f0867971b5ab4941a9591f6ccdb6556e58ddd11
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEUEARECAAYFAkiWDqoACgkQ1fmVwcYIWAb1zwCYpnXhzG9wyR1NFkjJ8SqA2Ijr
+vgCg62UR5dkoEkGC4Ir8W16F97Qtm80=
+=fSOU
+-----END PGP SIGNATURE-----
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)