bump to 0.6.4. Fix a bug and a typo.

Package-Manager: portage-2.1.5_rc10

3 files changed, 89 insertions, 5 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index ca74f3989a44..dc38246e4117 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.41 2008/05/07 22:35:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.42 2008/05/15 22:46:29 eva Exp $
+
+*goffice-0.6.4 (15 May 2008)
+
+  15 May 2008; Gilles Dartiguelongue <eva@gentoo.org> +goffice-0.6.4.ebuild:
+  bump to 0.6.4. Fix a bug and a typo.
 
 *goffice-0.6.3 (08 May 2008)
 
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 39b9e8497893..f96cfa6ce389 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -7,16 +7,18 @@ DIST goffice-0.2.1.tar.bz2 1415715 RMD160 c4623aa40f0abca223b59bb51b6638058844ac
 DIST goffice-0.4.3.tar.bz2 1767305 RMD160 d79696c53f34f33ab9546db49046ce4b6ec4478b SHA1 56386b7554ec8e0d2fac47251344ab7edaa7fea4 SHA256 1687a01596888093b23a2c835e8c0c62af79d572fa3dfbf79b22625d056debba
 DIST goffice-0.6.2.tar.bz2 1929905 RMD160 d24399f8986c383e915e495913696e1d3c2f71b3 SHA1 dfdf7ba48597f72e7802d36258013362d2ba8999 SHA256 b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd
 DIST goffice-0.6.3.tar.bz2 1937434 RMD160 8f2665bceefd9858487863fda44fbb971161acc4 SHA1 206e84ccf243a04d7556e96e225bcdd9a3cc8c59 SHA256 a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
+DIST goffice-0.6.4.tar.bz2 1877115 RMD160 da19eca531945a79b12dfe6414db8899bac0ce25 SHA1 b6ce7576396fc69a1a44c9fea4b2b2f159948101 SHA256 ab8caeea86b7fa0c9f59e40f6dd39454ec766d6dc1488ade607c8b87e292872e
 EBUILD goffice-0.2.1.ebuild 1551 RMD160 cade71502b36d292c06e87a5613d648f7cbafb9b SHA1 54eab3ce820d23efb63b1fdc3549b0c1e95819b5 SHA256 ab44b56a516ee1716d370a0fd6c6b9a789da6e573c27a282973ccfceae23c7bb
 EBUILD goffice-0.4.3.ebuild 2831 RMD160 9578b7ed9c4b6a528a0cd50f7ba8d275abc70185 SHA1 196c1ece58df5b5d1f5dccb37b6a18fe7c44f815 SHA256 78149e0704edfc47e13e9a220d6532ad500ff04e3576808574a4345f2422dc91
 EBUILD goffice-0.6.2.ebuild 2537 RMD160 3fefdf02a564f2ed1791dc2b93d536380e4eb901 SHA1 2695d494fc44dfa5e4c4fbc6e1cd50c5edcc9666 SHA256 0ba54e3d84789964b6c16859d8d09da27fa2103be9d60a9d1940b0e59c86c125
 EBUILD goffice-0.6.3.ebuild 2265 RMD160 27564cb94363ab0a78dce987a5a47941da4d3557 SHA1 7acb990a3a21aa67fa00299d7e5605e6ed2a661c SHA256 928691b402616f4e201e192e4a0f2805e21ad1a3186e8c7198e26d960fd0881c
-MISC ChangeLog 5585 RMD160 ee2d0e333bef30dab856a0a5863e5cdfbf26cf3f SHA1 e490ff7e0f6a41742d2a54303ed18290d1adc8fb SHA256 bedbe6853d01c32a640b579cdb58bdf6ba2990ae1197e66ea9b7ff9a67973fa1
+EBUILD goffice-0.6.4.ebuild 2265 RMD160 b8eda7157a3e84f5e5eeff927c8b73f7d3986db0 SHA1 4bb7fe99edb168af1ea66543c62cf9293a478ef2 SHA256 40f90f9d390ed293d080af610f697f4b2151ebcd6a2b17ed893ba2c5170f35f4
+MISC ChangeLog 5732 RMD160 04d3f0a612f12cd4c8bbd56d1b7b555ac4717374 SHA1 b70adc87aa27b233034447427e78c9357a28572d SHA256 879683b56172f59c002935d556f63555f7469c86be5ac09e4d5780a9c44a17c6
 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgiStEACgkQ1fmVwcYIWAbdIgCgz76SrNztJRtslQCB4YhIr2XZ
-9roAoNRhGAH595OgpHG7Zdb1oIYukgJH
-=mfma
+iEYEARECAAYFAkgsvUwACgkQ1fmVwcYIWAYfiACfXGVBQH36aC9chVDWWLwM8A7F
+G3IAoOiICFvWLdJksKPxev08auTzFPeX
+=3HW8
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/goffice/goffice-0.6.4.ebuild b/x11-libs/goffice/goffice-0.6.4.ebuild
new file mode 100644
index 000000000000..b3149e388a75
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.6.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.4.ebuild,v 1.1 2008/05/15 22:46:29 eva Exp $
+
+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.6"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome"
+
+# Raising glib dep to 2.14 to drop pcre dependency
+#cairo support broken and -gtk broken
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=gnome-extra/libgsf-1.13.3
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.8.1
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2.3.6
+	>=media-libs/libart_lgpl-2.3.11
+	>=x11-libs/cairo-1.2
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnomeui-2 )"
+# libpcre raised to unicode USE flag
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.18
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_with gnome)"
+
+	local diemessage=""
+
+	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
+		eerror "Please rebuild gnome-extra/libgsf with gnome support enabled"
+		eerror "echo \"gnome-extra/libgsf gnome\" >> /etc/portage/package.use"
+		eerror "or add  \"gnome\" to your USE string in /etc/make.conf"
+		diemessage="No Gnome support found in libgsf."
+	fi
+
+	if ! built_with_use x11-libs/cairo svg ; then
+		eerror "Please rebuild x11-libs/cairo with svg support enabled"
+		eerror "echo \"x11-libs/cairo svg\" >> /etc/portage/package.use"
+		eerror "emerge -1 x11-libs/cairo"
+		diemessage="${diemessage} No SVG support found in cairo."
+	fi
+
+	[ -n "${diemessage}" ] && die ${diemessage}
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix doc slotting
+	epatch "${FILESDIR}/${PN}-0.6-doc-slot.patch"
+
+	mv "${S}"/docs/reference/html/goffice{,-0.6}.devhelp
+	mv "${S}"/docs/reference/html/goffice{,-0.6}.devhelp2
+	mv "${S}"/docs/reference/goffice{,-0.6}-docs.sgml
+	mv "${S}"/docs/reference/goffice{,-0.6}-overrides.txt
+	mv "${S}"/docs/reference/goffice{,-0.6}-sections.txt
+	mv "${S}"/docs/reference/goffice{,-0.6}.types
+}
+
+src_compile() {
+	filter-flags -ffast-math
+	gnome2_src_compile
+}