bump to 0.6.2 and fix documentation slotting issue

Package-Manager: portage-2.1.4.4

4 files changed, 145 insertions, 2 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/Manifest b/x11-libs/goffice/Manifest
index 7ae5c2e9132f..2cc39ad12e1a 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX goffice-0.6-doc-slot.patch 2150 RMD160 98557838036fa448db1f34c3cc61a645aa817c00 SHA1 dfee66bd2cde89e6db846fcd0a70ab8fd1bc4f9d SHA256 9a3209131a2aa9eeaf81a4dfde065e24a0b09cff355616c67be83d2b696306da
 AUX goffice-0.6.1-die-gtk-doc.patch 441 RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 SHA1 3c12861087bce53933004f77afe59e47c6a41fcf SHA256 4b0b6b3273d1ea7500a855311aab0906aa6ea6a326331e73b6dae96eb64f5748
 DIST goffice-0.2.1.tar.bz2 1415715 RMD160 c4623aa40f0abca223b59bb51b6638058844ac7e SHA1 91509a2e4c2acc42d83d733202e9cb13a2f388be SHA256 158258dcb85fd4f3e4ee5a61df49560f8b65d94682ef9322cbb20fb2d3e93034
 DIST goffice-0.4.3.tar.bz2 1767305 RMD160 d79696c53f34f33ab9546db49046ce4b6ec4478b SHA1 56386b7554ec8e0d2fac47251344ab7edaa7fea4 SHA256 1687a01596888093b23a2c835e8c0c62af79d572fa3dfbf79b22625d056debba
 DIST goffice-0.6.1.tar.bz2 1869159 RMD160 ef90dd912fa84baece3e4f69c8dc94cafa4c09d1 SHA1 bb7269e67c14b4ff5ca4a88c85582de02ed0c968 SHA256 a8956a3a12f7d959c95f9213fcf29e54e1e0a3d2cb2326bd3f79e6446e877e82
+DIST goffice-0.6.2.tar.bz2 1929905 RMD160 d24399f8986c383e915e495913696e1d3c2f71b3 SHA1 dfdf7ba48597f72e7802d36258013362d2ba8999 SHA256 b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd
 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.1.ebuild 2255 RMD160 5d9f8e4eb3232950f917f0e21c76b57bba8e63f3 SHA1 36b4341adaf79e42376d0423deabb2a3d7ace12d SHA256 068faca2f1cd9bd6145fa451946fa1e9f440dd05114317e57707c424c57605f9
-MISC ChangeLog 4668 RMD160 1cb150a86c15805d98bd6f31b2d33f0d5cb4d51b SHA1 e26712cd830f5bfbd987309340c23c6d325b83e9 SHA256 8067a7a7051676f220fafff240ad40e08ff3a042a5c57d0a75d5ac2acea070b2
+EBUILD goffice-0.6.2.ebuild 2542 RMD160 f90ef80cd8b8e2e29e8a9f03ef47d48fd23eb430 SHA1 7a97bb1f2043721aadddaf72b82ff28b1384b62a SHA256 8bdcae1956cffe9e7ee34ebb69e4e8512533c585e01204745db2d953b45a2864
+MISC ChangeLog 4866 RMD160 1806e4b3f03e238d0a04d6f53ed7102fa18e10fd SHA1 a4d158baf4c56faa8a3e5ba8fd289ea4be1d1bb6 SHA256 3e5eee8c91504bd2c2f53210aaff6f261ac0ce1112996138c00bf2e08454d31d
 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1b7Q1fmVwcYIWAYRAlvyAJ9QMATFM5vdMfRX1oQTSZ22sm66NwCgq2Q6
+EH3EALce46EWM6rEQiNQzOQ=
+=Zn9U
+-----END PGP SIGNATURE-----
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
+}