bump to 0.6.5.

(Portage version: 2.2_rc8/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 9 insertions, 101 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index 09b5e2b9b82b..710223675955 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.51 2008/07/15 18:42:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.52 2008/09/03 21:56:12 eva Exp $
+
+*goffice-0.6.5 (03 Sep 2008)
+
+  03 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> -goffice-0.6.2.ebuild,
+  -goffice-0.6.3.ebuild, +goffice-0.6.5.ebuild:
+  bump to 0.6.5.
 
   15 Jul 2008; Jeroen Roovers <jer@gentoo.org> goffice-0.6.4.ebuild:
   Stable for HPPA (bug #230071).
diff --git a/x11-libs/goffice/goffice-0.6.2.ebuild b/x11-libs/goffice/goffice-0.6.2.ebuild
deleted file mode 100644
index ec1459359438..000000000000
--- a/x11-libs/goffice/goffice-0.6.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.6 2008/04/21 19:16:50 maekke 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
-}
diff --git a/x11-libs/goffice/goffice-0.6.3.ebuild b/x11-libs/goffice/goffice-0.6.5.ebuild
index ea27fc355dd5..c90648525ffe 100644
--- a/x11-libs/goffice/goffice-0.6.3.ebuild
+++ b/x11-libs/goffice/goffice-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2008/05/07 22:35:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.5.ebuild,v 1.1 2008/09/03 21:56:12 eva Exp $
 
 inherit eutils gnome2 flag-o-matic
 
@@ -13,7 +13,7 @@ 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
+# cairo support broken and -gtk broken
 
 RDEPEND=">=dev-libs/glib-2.14
 	>=gnome-extra/libgsf-1.13.3
@@ -26,7 +26,6 @@ RDEPEND=">=dev-libs/glib-2.14
 	gnome? (
 		>=gnome-base/gconf-2
 		>=gnome-base/libgnomeui-2 )"
-# libpcre raised to unicode USE flag
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.18
@@ -57,20 +56,6 @@ pkg_setup() {
 	[ -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