bump to 0.6.1 without doc support until upstream fixes its requirements

Package-Manager: portage-2.1.4_rc10

5 files changed, 106 insertions, 5 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/Manifest b/x11-libs/goffice/Manifest
index e3adb2a29ddf..cc45ee22c15a 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX goffice-0.6.1-die-gtk-doc.patch 441 RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 SHA1 3c12861087bce53933004f77afe59e47c6a41fcf SHA256 4b0b6b3273d1ea7500a855311aab0906aa6ea6a326331e73b6dae96eb64f5748
+MD5 9ab75e16517dd724efabe5b546e1cf4c files/goffice-0.6.1-die-gtk-doc.patch 441
+RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 files/goffice-0.6.1-die-gtk-doc.patch 441
+SHA256 4b0b6b3273d1ea7500a855311aab0906aa6ea6a326331e73b6dae96eb64f5748 files/goffice-0.6.1-die-gtk-doc.patch 441
 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
 EBUILD goffice-0.2.1.ebuild 1551 RMD160 cade71502b36d292c06e87a5613d648f7cbafb9b SHA1 54eab3ce820d23efb63b1fdc3549b0c1e95819b5 SHA256 ab44b56a516ee1716d370a0fd6c6b9a789da6e573c27a282973ccfceae23c7bb
 MD5 4a8c880bb3c6218d98ef22a4732610df goffice-0.2.1.ebuild 1551
 RMD160 cade71502b36d292c06e87a5613d648f7cbafb9b goffice-0.2.1.ebuild 1551
@@ -8,10 +16,14 @@ EBUILD goffice-0.4.3.ebuild 2160 RMD160 314b11abbb57bcdccf7cc0e03f0b7c7ecd0cb3b0
 MD5 a66a8590bbb4baa3b218d112d2ede74a goffice-0.4.3.ebuild 2160
 RMD160 314b11abbb57bcdccf7cc0e03f0b7c7ecd0cb3b0 goffice-0.4.3.ebuild 2160
 SHA256 a04fd4d88ddef6458c6b931fe2d12bd34ac8c8d211fbe13e8586ed0f47cd5f93 goffice-0.4.3.ebuild 2160
-MISC ChangeLog 3090 RMD160 9ca99d92e3af932f9a9a28daef17065014d61d44 SHA1 b1b52d361285f7f78cb63c4c9351022d088f16b2 SHA256 28f6cac41e82ef6238dc5c1d976e3e8d8ee8486abe2dd053b6482b4c3dac4c6a
-MD5 405afb8af7021b17c5b092468fb60724 ChangeLog 3090
-RMD160 9ca99d92e3af932f9a9a28daef17065014d61d44 ChangeLog 3090
-SHA256 28f6cac41e82ef6238dc5c1d976e3e8d8ee8486abe2dd053b6482b4c3dac4c6a ChangeLog 3090
+EBUILD goffice-0.6.1.ebuild 1611 RMD160 3a4cbedded44af76eed6e9404166d2af92b3b23f SHA1 c632a902b372bd0d3d0563a6c25b0ed6ba1bf579 SHA256 91eae6d804d35a7da36e19fa86503f54f7e0b26de86f4ab4bbe722a48b91a32d
+MD5 4107565a7d19ed20591cc9e860ced698 goffice-0.6.1.ebuild 1611
+RMD160 3a4cbedded44af76eed6e9404166d2af92b3b23f goffice-0.6.1.ebuild 1611
+SHA256 91eae6d804d35a7da36e19fa86503f54f7e0b26de86f4ab4bbe722a48b91a32d goffice-0.6.1.ebuild 1611
+MISC ChangeLog 3305 RMD160 14f1be9e9c08a9eb9edb03e25444af200a8e07b7 SHA1 af0652ffbb865d118102562f6a8022e1534f44d5 SHA256 b2ec7a8116f61241d90ec99d8a9b2347994003acda3db24ccae5420b53c381fb
+MD5 a2a92aaf79e8ee5e01abeadb0e087838 ChangeLog 3305
+RMD160 14f1be9e9c08a9eb9edb03e25444af200a8e07b7 ChangeLog 3305
+SHA256 b2ec7a8116f61241d90ec99d8a9b2347994003acda3db24ccae5420b53c381fb ChangeLog 3305
 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962
 MD5 7ab60162fa2a8efcd8dfa8c42366b1dc metadata.xml 355
 RMD160 c615373a952d378745eededbb389702d3d40d65a metadata.xml 355
@@ -22,3 +34,13 @@ SHA256 96bd9f5ebd87782033970d58a4c631ebc3d80d03fd9ecdee670cd2e37f33bcbd files/di
 MD5 981c94268ccb0b63d30d9af3b707d65d files/digest-goffice-0.4.3 247
 RMD160 f6c7f41264dbb1fb3979413e72a59602db91c789 files/digest-goffice-0.4.3 247
 SHA256 261ebd809f98d0a4b5756337e20ab8f9cf9d80eec32ad992365a2449c3a80ca0 files/digest-goffice-0.4.3 247
+MD5 dc18f3085af121fee96199319a0c7cf1 files/digest-goffice-0.6.1 247
+RMD160 be30329ec617619e4003487cb1650c0defd8533a files/digest-goffice-0.6.1 247
+SHA256 c3c86cbfed1b7385f817c6a3680de3fc00883a3e84b7e6c3aada802733e20262 files/digest-goffice-0.6.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHbWEG1fmVwcYIWAYRAr5FAKDI3GZyMVN5zniFJKcg+ol8N6zjEACfUw35
+qNdGDcSuqBIkmehm0T/nhO4=
+=UVW0
+-----END PGP SIGNATURE-----
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
+}