bump to 0.6.1 without doc support until upstream fixes its requirements

(Portage version: 2.1.4_rc10)

4 files changed, 80 insertions, 1 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index f9547f3f2c0b..1da345fd8843 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.22 2007/12/10 23:11:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.23 2007/12/22 19:10:35 eva Exp $
+
+  22 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/goffice-0.6.1-die-gtk-doc.patch, +goffice-0.6.1.ebuild:
+  bump to 0.6.1, disable gtk-doc unconditionnaly until upstream fixes it gtk-doc
+  requirement
 
 *goffice-0.4.3 (09 Dec 2007)
 
diff --git a/x11-libs/goffice/files/digest-goffice-0.6.1 b/x11-libs/goffice/files/digest-goffice-0.6.1
new file mode 100644
index 000000000000..db8682879653
--- /dev/null
+++ b/x11-libs/goffice/files/digest-goffice-0.6.1
@@ -0,0 +1,3 @@
+MD5 faa72fc615f34b4da8c72d06420f5260 goffice-0.6.1.tar.bz2 1869159
+RMD160 ef90dd912fa84baece3e4f69c8dc94cafa4c09d1 goffice-0.6.1.tar.bz2 1869159
+SHA256 a8956a3a12f7d959c95f9213fcf29e54e1e0a3d2cb2326bd3f79e6446e877e82 goffice-0.6.1.tar.bz2 1869159
diff --git a/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch b/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch
new file mode 100644
index 000000000000..0b22bad85af4
--- /dev/null
+++ b/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch
@@ -0,0 +1,11 @@
+--- goffice-0.6.1/Makefile.in.old	2007-12-22 17:20:33.000000000 +0100
++++ goffice-0.6.1/Makefile.in	2007-12-22 17:21:23.000000000 +0100
+@@ -268,7 +268,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = goffice tests pixmaps plugins po docs tools
++SUBDIRS = goffice tests pixmaps plugins po tools
+ EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \
+ 	goffice.mk \
+ 	goffice-plugins.mk \
diff --git a/x11-libs/goffice/goffice-0.6.1.ebuild b/x11-libs/goffice/goffice-0.6.1.ebuild
new file mode 100644
index 000000000000..75afc94b3ab8
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v 1.1 2007/12/22 19:10:35 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="gnome"
+#doc support is broken without gtk-doc 1.9
+#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
+	>=gnome-base/libgnomeprint-2.8.2
+	>=media-libs/libart_lgpl-2.3.11
+	>=x11-libs/cairo-1.2
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnomeui-2 )
+	  dev-libs/libpcre"
+
+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)"
+
+	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
+		eerror "Please rebuild gnome-extra/libgsf with gnome support enabled"
+		eerror "USE=\"gnome\" emerge gnome-extra/libgsf"
+		eerror "or add  \"gnome\" to your USE string in /etc/make.conf"
+		die "No Gnome support found in libgsf"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# strip doc installation
+	# needs gtk-doc-1.9 otherwise
+	epatch "${FILESDIR}/${P}-die-gtk-doc.patch"
+}
+
+src_compile() {
+	filter-flags -ffast-math
+	gnome2_src_compile
+}