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

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 127 insertions, 7 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/Manifest b/x11-libs/goffice/Manifest
index b2a2a37a6f2c..615d24fdd718 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,23 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX goffice-0.10.4-component.h-backport.patch 1325 SHA256 ff414bc6120a7371182a817b1004482d42ceb50d4d645a970577669cce5855f2 SHA512 1bc27bf15d77749fb16343d0a7196eac98df78b8230cf07f817ea8162908c1a28874f795141b16c492db2e3c21cd5fd085d20f3e57c07de6fd5ba79fcd53e8b3 WHIRLPOOL de518a535b74e7f62320e19ad79ecd42ff62971b54d8ca1aa2285dc8c974f2d5a1a3c6c950edbe29fc479c0c83eea71662fedb8891e237746cf91d718886a90f
 AUX goffice-0.8.17-no-pcre.patch 6490 SHA256 dd22ff8ffdea5618ff7357b9a36d68522f0bd4a9236d40e578182f8a6c2049d5 SHA512 70af548433fed3f95b4b64cd7debf0cef0b8b7f7796c155be5d29a060ec2f3883d06703fc42e6dae40d4eb6933f45f2eef1c0d9f2088b5fc2e89ef580fc79b13 WHIRLPOOL ed84effb61cc08076245871e16172de1eceba0c063bf92351e95ba37e8f23e5094db7d7a67ba572d2bd5648877a5b86eb22beb7e260455f9ea0a84aa516267ea
 DIST goffice-0.10.0.tar.xz 2121692 SHA256 7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439 SHA512 5d3df468129baaf64fb275f16c433ae40c3d3d33ea49bd9b3f62b3977083863e19c36e65c8d5d1ef3536a792bfb8817d199830115220f8f9fbd40d67cd121863 WHIRLPOOL 4870d7618f01314e3776ebcc29356621cd99ac91e26bc8a8d5d0aab2c4c1a5b7e9721469bc3d7676496ac2e51a2f82b8d65053df923d49ed5e606a0bdf0588bb
 DIST goffice-0.10.1.tar.xz 2120484 SHA256 5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0 SHA512 057611dd0ce940e68962595ec157d142e3d96541e6ff9f880e1e277c58183001301dcaef7b7438ee1e9830497482cde69ce0ec3f6068af2a7327e6a3b6522e2c WHIRLPOOL ccbcdf1acbc0ebbc7f5be1e50c60f0d77cf9acd82b07ad91d710ea5785f9246fa95362b7d2ee550dea7da66815fb365fbec57573af75a1caef70f1b8db9875a6
 DIST goffice-0.10.2.tar.xz 2164976 SHA256 7d38769a7af655c0f0373738c786318734400d71b6bbc8d1ce6b6de99bb95674 SHA512 274444c6d18e668658d78289e114d3697cbe9cb3d9b677806fbe586e5b8b1053b955011eb16bf098d6adcedbdf5862c21c80cdb05e31ebc85b5472bcb7ff645a WHIRLPOOL f2fa925c40d104367f945e6e2d1fe3f29cdf68039ac47681045fc269e17212c6a0e5137fdbd0e2e32528160b84736ad94e727e5f888dbab43d454cf25a1427fb
 DIST goffice-0.10.3.tar.xz 2198856 SHA256 1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2 SHA512 74fb3ea950b72b52061fe5fdb0d7d2b65eb38128358be4d37c4a03361839f60cbe0989d31e0fe2300466b058cb5a83e4d28b4e75f83739a9dc46e2d4816046e1 WHIRLPOOL 16ca3ddb05f770cce52f38f597e62ba39684fffe34c31a217e04818233648c526427b9df8be4a4fceeab197b5749155b35046a735603b85c81e2e34129f327a5
+DIST goffice-0.10.4.tar.xz 2202540 SHA256 30cb91693abff241e1b14b741ac23bc588f428b4524b12e3fecd1ea3f0bc67ba SHA512 fcfe34c8e2bd9c35e1b50fe504b6c9a52bfc6256969e21fabd9a8ca0a49e6d76e88d107959964b082dcaa9b90b8db642912082e2faf9bb1dd93ac70804afb4ee WHIRLPOOL 805dbaf488d1cdb80bf1cca4c995cb9dc50ceb753b6a59f1e013d68d5af9a1e243bb5a67ff4bda63b0c2a2c3604abf36517017b469c661cce51e42729d9cedc3
 DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
 EBUILD goffice-0.10.0.ebuild 1333 SHA256 3babbc240f9239b10d72193da566dee19033a97b1ead96e5ac407fd6e15e4031 SHA512 12bd94d2ebcde73b9136f038339d8277998f2471fad75737b0c13a4797172ba49f8f38f9a6a393e59730f4d2baae180c8c602c6e5718f0d16469a7d69ec05671 WHIRLPOOL e7570437aac2d0f6ffcea29b4c1059e770a003d50d1cf580f1f1ee4502fad88726b651eb14464b50d03372a25b288efeb9095b5cb95d3a222657db65a8609b61
 EBUILD goffice-0.10.1.ebuild 1334 SHA256 ba55e572ef08559551f3b0999bc229e14d990217202ad49857d3e08e95e62d87 SHA512 57ccd8972ed021e83b915d7f0d1e4379c9174f82c9bece6ca2b75d4dc702df54d4a47677737b5f61cdfeafe6521ba2063dc450c731a6a40fd7da3615ebd5534e WHIRLPOOL 6fc2ff4b9a85da89b125b9296cc8c447d8d421f91c2c51b04881f9e731ef1d0e670fb288144cc94b7611bd805aca2cde032facfda5aa61827fb13726c43d9830
 EBUILD goffice-0.10.2.ebuild 1336 SHA256 57dab6d32ba1d63667d0d36d83092e1e3e72031a0ce65bf3ca01c3cc74b62178 SHA512 ea72f193b4a0bfd2e5cc96e834a5f0b6366bfe9546b3dc535b82114442dd1bfb66b06fdbb86526f23f3e8ea606d492c07ca5d1e558228b49e4ce5d5e40693a91 WHIRLPOOL e2f9af4f8a1b4da64841eea0e2784dde13f65c81a9ef472dc802aa69119e2dd0f2846810866092563cd4601aacf1a828087e0ba950e0f84f42c48f2608a1d0fd
 EBUILD goffice-0.10.3.ebuild 1336 SHA256 cb0d3915667e5549e28ea6269c7e451789c76234432dda2a838dba63172a4a11 SHA512 ce11b4a2fd26733f12d95f6e07ea1fcb7c48a50c6ae8756cd887cf960facd92fd9c3f9de7f3e5302b1d28ea89ce471d72f34647a06be21b8bd1a86b00ea15d00 WHIRLPOOL daa23210b6ebe1d84bfb29794f05c053db8e0016baeffc96347a1ca8527da59b0dd135c131efe567459c733b74c2bd2bfb901588e6f76a38fc57afd38bf6fc44
+EBUILD goffice-0.10.4.ebuild 1471 SHA256 c197f04aca5a9475f1bfe44bb53819e115da6ea78efe57cc760eb6620580aaef SHA512 df15e63d6c806679350aa6ce6748f7e7a2e349ed0b98c3f46285c9e228d04836cd3e81cc3573c8b8347c676ff779184e4f64247eea4672329d26c615968579b9 WHIRLPOOL d82725609ee1e78aafadb9f296277ad989126a68fabd4d1f84af47e69a04f77172250944c81592b7e9b231cf58fc7a415b4cf244023f376d3ea4f52c3527637e
 EBUILD goffice-0.8.17-r1.ebuild 1543 SHA256 6372c9e33b5053ba009c0a1b1f1c083f3c2987574f81c09592470e3357f25495 SHA512 87d5f9c4b491ee692607fa4f39376cca0b1f4889d0394d86e24aa4ebff7ec4e0bdae448e8d20a6901d54388d975ce95f809026e9888e4b0b9c2d74c77f5a1328 WHIRLPOOL bc66d60bb8216ee2f07a314fe7ee24464ea904e260a9e23b0bc7f1d8dee2394430fdd04e2e4c33054e73f513fc2167923666ba6be5d2c232efefae0fb22750e9
-MISC ChangeLog 16621 SHA256 f5bfb9ca4a800fcaf354c21c2937c4178000618418fbb1290835f6a11ad3682f SHA512 9c4ca615eb5631d6671232837a5b818edf6c0eaab779b31e764c2a4bbae8c56bb1ac58718162b5129c03ba23b41eb1af3f70748d783c91c27c386e56f6686421 WHIRLPOOL 46f58fd1379ace4db3bc427a978518991a2f54ae4e0d717d8fc314526565216f311295dc1fa99e66fcfe2efd5697c3d363e443a6a801f6780edfd3271a68a3e4
+MISC ChangeLog 16882 SHA256 c7d8e25d9d20c893b5bb12a8883193f31f832b2f05b136abfaac3df0a3027122 SHA512 cb5e2b74e6e73527512ec42ab3f69fcd4ea96c0e12d6b2443931ba7dfff53cfc7f5b999616c9391be8d173b20c8852fd7aeb75fd742118afc2a2fbfe3be5aa36 WHIRLPOOL 5e851b5bba920717833ab944da9748154d962514e417ab90918c7a12f9912c7e902c37974b69b167fb2ae77cafdc53a395c531f6dd63dee26ecfbc61e2ab69dd
 MISC metadata.xml 355 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962 SHA512 3d35480e156bde69be5c8b13e4fbc4ede877280dda5f6d0f28e3ca564e9c29919aa234b3a1986965714619b3daa286011d1af4d35dd7b3c696a6f85a4b88432a WHIRLPOOL 05578e14eb4c23bf265ad7456ac2f7c46fbb89672acbff9e4dbb25cc28cc9942caae9a2c63146a3850cda61bfb91036cc47b9ea985a3251a6e037112e44e4a5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHLH1kACgkQCaWpQKGI+9SCOQCePaXnxhGrWIGRIDjbG0Fzc1I0
-OoEAn37i23YmZ6mnDeidN4MAiwaR78CQ
-=3NaP
+iQIcBAEBCgAGBQJR555xAAoJELnU8jG9FVire8wQAIPrQff9glv3GX9cznLZYcz6
+CzsTtZEILTl5mSDUbwqgJX8y2PQQ5ZNkDUcyVPC3STk0F194m54ahDMqDg9JLnKi
+sQ2QJLUt7DYE62Z2hJoflMdU16oeewKAMyAgFNl7ViCqsONdrzYYMQs84DmZ1mO+
+QQnpi1zW7Bv28O9Eq9aBKq91Xyh6mJJsm6R/STOiOkpHl31ppGsxafWKWRrnYT0+
+RQaC0pv4WyAQRR5foUtzfLXSerhPNZHIu3ZrSzlpCC9cv25c+IWxe2SGWxcFiQC9
+yB7PDdi+JEf3FhUcDDU3+2oLz8HfT1JofxZlZHNchRHb9gjRpymqEExlj4OTZHJo
+Up4CHIG+sht6/mOOEulIn6Cwxlgjpn5b35Mk7ddGvxFDpd1BMlRWKf2HVDEdi9Ba
+nBaDhESU/26U9Gz4IYHuBUrqh1wlH/JYNjMNq+vStppBrrjn/E3FUTQJUIoDAa7p
+nZQnZdBtajDk+zzcxzpY7iOpNftaDo4sBwLsYEfuDmaLWSwoy5RdDrbWm8P3fWxB
+91pBL7Ti8rtYD5bBt6r4PQ9P7eqJtTfo/gKuVIyblRgCGmblLfPma+UVYUw8w21y
+K07TAGeFsdxfoo6MseZkiB5SIxGuKUEpnYf/GgzBKAOf6NLjxAJySKOjoQNZrmRW
+7Lvuq7C1ShLBcQwD2sNW
+=FO0e
 -----END PGP SIGNATURE-----
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)
+}