Version bump and clean up old 0.6 slot revisions.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

5 files changed, 33 insertions, 130 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index f73f3d2b4f93..8d7cec42b50f 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.63 2010/01/15 21:35:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.64 2010/03/03 22:00:36 eva Exp $
+
+*goffice-0.8.0 (03 Mar 2010)
+
+  03 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/goffice-0.6.1-die-gtk-doc.patch, -goffice-0.6.4.ebuild,
+  -goffice-0.6.5.ebuild, -files/goffice-0.6-doc-slot.patch,
+  +goffice-0.8.0.ebuild:
+  Version bump and clean up old 0.6 slot revisions.
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org> goffice-0.4.3.ebuild,
   goffice-0.6.6.ebuild:
diff --git a/x11-libs/goffice/files/goffice-0.6-doc-slot.patch b/x11-libs/goffice/files/goffice-0.6-doc-slot.patch
deleted file mode 100644
index b8b3ac896047..000000000000
--- a/x11-libs/goffice/files/goffice-0.6-doc-slot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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/files/goffice-0.6.1-die-gtk-doc.patch b/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch
deleted file mode 100644
index 0b22bad85af4..000000000000
--- a/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.4.ebuild b/x11-libs/goffice/goffice-0.6.4.ebuild
deleted file mode 100644
index b8bd0d681eb8..000000000000
--- a/x11-libs/goffice/goffice-0.6.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 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.10 2009/04/20 21:55:13 eva Exp $
-
-EAPI=2
-
-inherit autotools 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[gnome?]
-	>=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[svg]
-	gnome? (
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )"
-# libpcre raised for unicode USE flag
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_with gnome)"
-	filter-flags -ffast-math
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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
-
-	eautomake
-}
diff --git a/x11-libs/goffice/goffice-0.6.5.ebuild b/x11-libs/goffice/goffice-0.8.0.ebuild
index b134307bf5c8..1934da1dcfaa 100644
--- a/x11-libs/goffice/goffice-0.6.5.ebuild
+++ b/x11-libs/goffice/goffice-0.8.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.5.ebuild,v 1.4 2009/04/13 01:06:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.0.ebuild,v 1.1 2010/03/03 22:00:36 eva Exp $
 
-EAPI=2
+EAPI="2"
+GCONF_DEBUG="no"
 
 inherit eutils gnome2 flag-o-matic
 
@@ -10,25 +11,23 @@ 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 ~x86-fbsd"
+SLOT="0.8"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 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[gnome?]
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND=">=dev-libs/glib-2.16
+	>=gnome-extra/libgsf-1.14.9[gnome?]
 	>=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[svg]
-	gnome? (
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )"
-
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/gtk+-2.16
+	gnome? ( >=gnome-base/gconf-2 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.18
 	>=dev-util/intltool-0.35
@@ -37,6 +36,14 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_with gnome)"
+	G2CONF="${G2CONF}
+		--without-lasem
+		--with-gtk
+		$(use_with gnome gconf)"
 	filter-flags -ffast-math
 }
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die
+}