Version bump with bugfixes and including a gsettings backend. As it's still considered experimental, this version still uses gconf as previous version. Remove old.

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 35 insertions, 67 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index d8d2f6064223..d091cd3216f3 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.90 2011/03/22 19:57:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.91 2011/03/26 21:02:52 pacho Exp $
+
+*goffice-0.8.14 (26 Mar 2011)
+
+  26 Mar 2011; Pacho Ramos <pacho@gentoo.org> -goffice-0.8.6.ebuild,
+  -goffice-0.8.12.ebuild, +goffice-0.8.14.ebuild:
+  Version bump with bugfixes and including a gsettings backend. As it's still
+  considered experimental, this version still uses gconf as previous version.
+  Remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> goffice-0.8.13.ebuild:
   Marking goffice-0.8.13 ppc stable for bug 353436
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index f8a31a2a965c..03ec3907e951 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,12 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST goffice-0.4.3.tar.bz2 1767305 RMD160 d79696c53f34f33ab9546db49046ce4b6ec4478b SHA1 56386b7554ec8e0d2fac47251344ab7edaa7fea4 SHA256 1687a01596888093b23a2c835e8c0c62af79d572fa3dfbf79b22625d056debba
 DIST goffice-0.6.6.tar.bz2 1998355 RMD160 672bce0f1485f373417ec84a580a1d8551ea86d2 SHA1 ac3b768198ee13264ddd26bc7b039d9788c14ad7 SHA256 0767a29fd85ffa5fafe10a8aa6763812d5d404368a5c62fdd2ad9a7766859f86
-DIST goffice-0.8.12.tar.bz2 2236258 RMD160 205d28e27e1ef3255c9e4c2158e0d073b395dd08 SHA1 216c2327b5d0ea5b0587ceb0266baa7f6ae38ed3 SHA256 c165f8b7aaab709295c8225b30f49fe75655149b982fd045d8c23bb7772eb22a
 DIST goffice-0.8.13.tar.bz2 2240577 RMD160 677162e41122cd08571dafddbc7824d14d67a24d SHA1 e1fc0d8e93aaece1f4794f9344c93d547ffba411 SHA256 e28c562c209e4439caa055efc79a23fd30cf50a3b8c13e6646b6720e9bd6b0fc
-DIST goffice-0.8.6.tar.bz2 2305881 RMD160 59b35fe793526d4b548439cfb12497d8f0c044df SHA1 d42f4e4e36bcf68f6a06431b00f439f8efe4e785 SHA256 05464eeb2d08ad3a0e2e0ea2d79baa2cd17ff56f615f534466395663a79ecb4d
+DIST goffice-0.8.14.tar.bz2 2242769 RMD160 6a37780c98c53fce9e78d3234f9e2c04a45669e7 SHA1 d2f739bd21c23973675446a9678d051fae5aab0a SHA256 6f86a5361ef49c60a4a87c0d5913b001f67782c2cc3eaa13c6557087bee976de
 EBUILD goffice-0.4.3.ebuild 1974 RMD160 dfcbcc3c7462049fe83154d2ac971ec52d00f8ee SHA1 ccdd5b522794a1ee3ec7d8b85d9b0c8b69d3cdaf SHA256 fba88b59d30bf263160d12023275fe09e9826cab2cdcf9883b073fd8ceb390ce
 EBUILD goffice-0.6.6.ebuild 1162 RMD160 22c1fb8f98cf2799acda0960965f1d3ce47cf60e SHA1 568b30d0a783be0328c4dfa390a7cecccb831fee SHA256 52f6f6fe25b52e3aed7dce466996a0907ac9982236f7f4069beacaf2bc82ddfc
-EBUILD goffice-0.8.12.ebuild 1198 RMD160 35597cc7410d0242799e91cf5e88e3375a567710 SHA1 39fb28a001ab19e40f5c9b34f2d02ec71f4205d1 SHA256 e0a6af1981b1a2d58d3c008821c363af9996cbfa866727e252b7edb7bfd7a547
 EBUILD goffice-0.8.13.ebuild 1192 RMD160 a129e7a0eb993a0c270f5656f405fcf268cdc828 SHA1 b1eb10f7398fa317c4dcb13aa125788fb1805444 SHA256 12bed635e22677ea8666392ea0019a8ab3eb10cb94cd1f5742df4e1eab6fd3a6
-EBUILD goffice-0.8.6.ebuild 1385 RMD160 999216beaa3d88c7cd899cb6b32a212d2c2b2884 SHA1 002dba4958f402f1b4dabedd120d80c9185e8d59 SHA256 6efaba1a8fa52155dafb549ac1c0698c15edac58dc4cc6b5bc883c89a8e1b677
-MISC ChangeLog 12279 RMD160 b1b0c4a96be5beab7d117ddfde7c1084ae1c3b69 SHA1 469c635081f929a9581a9ec5ef2ba03f5d219c64 SHA256 469b02928fe5f9d108a2a8bede9f031820d6b209e468a9b89cfde3141883082d
+EBUILD goffice-0.8.14.ebuild 1344 RMD160 742b4a197e136f2490cc4b05b5f7ebdfa1d70047 SHA1 507c337cf73bf21dc9a2c319c127dc336fa413b4 SHA256 abef49ed664758d548551e0aa2c22c025e33a4ba17e3eb26c55a0a89fce99fbd
+MISC ChangeLog 12599 RMD160 4b2ca04233d6541c026551d5ee4e46dbe6dda0d0 SHA1 1931bfb47065590bf418f368a9e44fe7af79ea8e SHA256 f87c0a3298935c619aa3f56d8e4aaf8ed9a50b1c10c93f0d788cae036de46706
 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2OVIEACgkQCaWpQKGI+9Q9CgCffMKNfA7ZSHGByBs2/7RwyDfr
+xnoAnj/RQvCXG7fy6dXC2Ju6WrASpdPX
+=3YdX
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/goffice/goffice-0.8.12.ebuild b/x11-libs/goffice/goffice-0.8.14.ebuild
index 2d381b2c35e2..50c50a97221b 100644
--- a/x11-libs/goffice/goffice-0.8.12.ebuild
+++ b/x11-libs/goffice/goffice-0.8.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.12.ebuild,v 1.3 2011/01/13 19:59:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.14.ebuild,v 1.1 2011/03/26 21:02:52 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -19,13 +19,13 @@ IUSE="doc gnome"
 # FIXME: add lasem to tree
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=gnome-extra/libgsf-1.14.9
-	>=dev-libs/libxml2-2.4.12
+	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.8.1
 	>=x11-libs/cairo-1.2[svg]
 	x11-libs/libXext
 	x11-libs/libXrender
 	>=x11-libs/gtk+-2.16:2
-	gnome? ( >=gnome-base/gconf-2 )
+	gnome? ( >=gnome-base/gconf-2:2 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.18
@@ -34,10 +34,18 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+	# Gsettings is still experimental
+	if use gnome; then
+		G2CONF="${G2CONF} --with-config-backend=gconf"
+	else
+		G2CONF="${G2CONF} --with-config-backend=keyfile"
+	fi
+
 	G2CONF="${G2CONF}
 		--without-lasem
-		--with-gtk
-		$(use_with gnome gconf)"
+		--with-gtk"
+
 	filter-flags -ffast-math
 }
 
diff --git a/x11-libs/goffice/goffice-0.8.6.ebuild b/x11-libs/goffice/goffice-0.8.6.ebuild
deleted file mode 100644
index 315a6b1008fe..000000000000
--- a/x11-libs/goffice/goffice-0.8.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.6.ebuild,v 1.8 2011/03/16 09:10:51 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 flag-o-matic
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="http://freshmeat.net/projects/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.8"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc gnome"
-
-# Build fails with -gtk
-# FIXME: add lasem to tree
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=gnome-extra/libgsf-1.14.9[gnome?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.8.1
-	>=x11-libs/cairo-1.2[svg]
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/gtk+-2.16:2
-	gnome? ( >=gnome-base/gconf-2:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--without-lasem
-		--with-gtk
-		$(use_with gnome gconf)"
-	filter-flags -ffast-math
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die
-}