x11-libs/goffice: Version Bump, #476488; Add backport patch to fix build problems of sci-chemistry/gnome-chemistry-utils

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 108 insertions, 1 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index 7c923f8f964b..03ab76ae0659 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.124 2013/06/26 17:05:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.125 2013/07/18 07:51:12 jlec Exp $
+
+*goffice-0.10.4 (18 Jul 2013)
+
+  18 Jul 2013; Justin Lecher <jlec@gentoo.org> +goffice-0.10.4.ebuild,
+  +files/goffice-0.10.4-component.h-backport.patch:
+  Version Bump, #476488; Add backport patch to fix build problems of
+  sci-chemistry/gnome-chemistry-utils
 
 *goffice-0.10.3 (26 Jun 2013)
 
diff --git a/x11-libs/goffice/files/goffice-0.10.4-component.h-backport.patch b/x11-libs/goffice/files/goffice-0.10.4-component.h-backport.patch
new file mode 100644
index 000000000000..1cf4afcac5a1
--- /dev/null
+++ b/x11-libs/goffice/files/goffice-0.10.4-component.h-backport.patch
@@ -0,0 +1,42 @@
+From f418a6cb29aa19165f9c4dad84858cd479d89d84 Mon Sep 17 00:00:00 2001
+From: Jean Brefort <jean.brefort@normalesup.org>
+Date: Thu, 11 Jul 2013 09:57:11 +0200
+Subject: [PATCH] Fixed goffice-component.h
+
+---
+ ChangeLog                             | 5 +++++
+ goffice/component/goffice-component.h | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 5548a65..2c45407 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2013-07-11  Jean Brefort  <jean.brefort@normalesup.org>
++
++	* goffice/component/goffice-component.h: move includes outside of 
++	G_BEGIN_DECLS/G_END_DECLS.
++
+ 2013-07-10  Morten Welinder <terra@gnome.org>
+ 
+ 	* configure.ac: Post-release bump.
+diff --git a/goffice/component/goffice-component.h b/goffice/component/goffice-component.h
+index 3ad931d..ac5a976 100644
+--- a/goffice/component/goffice-component.h
++++ b/goffice/component/goffice-component.h
+@@ -30,9 +30,10 @@ typedef struct _GOComponent GOComponent;
+ typedef struct _GOComponentType GOComponentType;
+ typedef struct _GOComponentMimeDialog GOComponentMimeDialog;
+ 
++G_END_DECLS
++
+ #include <goffice/component/go-component.h>
+ #include <goffice/component/go-component-factory.h>
+ #include <goffice/component/go-component-mime-dialog.h>
+-G_END_DECLS
+ 
+ #endif	/* GOFFICE_COMPONENT_H */
+-- 
+1.8.3.2
+
diff --git a/x11-libs/goffice/goffice-0.10.4.ebuild b/x11-libs/goffice/goffice-0.10.4.ebuild
new file mode 100644
index 000000000000..623d186a41d5
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.4.ebuild,v 1.1 2013/07/18 07:51:12 jlec Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="http://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.28:2
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.9:=
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24:=
+	>=x11-libs/cairo-1.10:=[svg]
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.2:3
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+# eautoreconf requires:
+# gnome-base/gnome-common
+
+src_prepare() {
+	# https://savannah.nongnu.org/bugs/?39302
+	epatch "${FILESDIR}"/${P}-component.h-backport.patch
+	gnome2_src_prepare
+}
+
+src_configure() {
+	filter-flags -ffast-math
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}