bump to 0.6.2 and fix documentation slotting issue

(Portage version: 2.1.4.4)

3 files changed, 131 insertions, 1 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index 2eb1de504d47..1346987870f6 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.34 2008/01/16 22:48:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.35 2008/03/10 23:05:43 eva Exp $
+
+*goffice-0.6.2 (10 Mar 2008)
+
+  10 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/goffice-0.6-doc-slot.patch, +goffice-0.6.2.ebuild:
+  bump to 0.6.2 and fix documentation slotting issue
 
   16 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> goffice-0.6.1.ebuild:
   remove libgnomeprint{,ui} dependencies (bug #206095)
diff --git a/x11-libs/goffice/files/goffice-0.6-doc-slot.patch b/x11-libs/goffice/files/goffice-0.6-doc-slot.patch
new file mode 100644
index 000000000000..b8b3ac896047
--- /dev/null
+++ b/x11-libs/goffice/files/goffice-0.6-doc-slot.patch
@@ -0,0 +1,41 @@
+--- goffice-0.6.2/docs/reference/html/goffice.devhelp	2008-03-10 23:28:55.000000000 +0100
++++ goffice-0.6.2/docs/reference/html/goffice.devhelp	2008-03-10 23:29:29.000000000 +0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8" standalone="no"?>
+ <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+-<book xmlns="http://www.devhelp.net/book" title="Goffice Reference Manual" link="index.html" author="" name="goffice">
++<book xmlns="http://www.devhelp.net/book" title="Goffice Reference Manual" link="index.html" author="" name="goffice-0.6">
+   <chapters>
+     <sub name="Graphs" link="pt01.html">
+       <sub name="Objects" link="ch01.html">
+--- goffice-0.6.2/docs/reference/html/goffice.devhelp2	2008-03-10 23:29:02.000000000 +0100
++++ goffice-0.6.2/docs/reference/html/goffice.devhelp2	2008-03-10 23:29:42.000000000 +0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8" standalone="no"?>
+ <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+-<book xmlns="http://www.devhelp.net/book" title="Goffice Reference Manual" link="index.html" author="" name="goffice" version="2">
++<book xmlns="http://www.devhelp.net/book" title="Goffice Reference Manual" link="index.html" author="" name="goffice-0.6" version="2">
+   <chapters>
+     <sub name="Graphs" link="pt01.html">
+       <sub name="Objects" link="ch01.html">
+--- goffice-0.6.2/docs/reference/Makefile.am	2008-03-10 23:33:48.000000000 +0100
++++ goffice-0.6.2/docs/reference/Makefile.am	2008-03-10 23:34:30.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-DOC_MODULE=goffice
++DOC_MODULE=goffice-0.6
+ 
+ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+ 
+--- goffice-0.6.2/docs/reference/Makefile.in	2008-03-10 23:33:55.000000000 +0100
++++ goffice-0.6.2/docs/reference/Makefile.in	2008-03-10 23:34:10.000000000 +0100
+@@ -234,7 +234,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-DOC_MODULE = goffice
++DOC_MODULE = goffice-0.6
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ DOC_SOURCE_DIR = ../../goffice
+ SCANGOBJ_OPTIONS = --nogtkinit --type-init-func="g_type_init ()"
diff --git a/x11-libs/goffice/goffice-0.6.2.ebuild b/x11-libs/goffice/goffice-0.6.2.ebuild
new file mode 100644
index 000000000000..94edca94215e
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.6.2.ebuild
@@ -0,0 +1,83 @@
+# 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.2.ebuild,v 1.1 2008/03/10 23:05:43 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"
+#cairo support broken and -gtk broken
+
+RDEPEND=">=dev-libs/glib-2.8.0
+	>=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 )
+	>=dev-libs/libpcre-7"
+# 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
+
+	if ! built_with_use dev-libs/libpcre unicode; then
+		eerror "Please rebuild dev-libs/libpcre with unicode support enabled"
+		eerror "echo \"dev-libs/libpcre unicode\" >> /etc/portage/package.use"
+		eerror "emerge -1 dev-libs/libpcre"
+		diemessage="${diemessage} No unicode support found in libpcre."
+	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
+}