Version bump. New version depends on >=x11-libs/goffice-0.2.0. Make gnumeric-1.6.{1,2} depend on old goffice versions.

(Portage version: 2.1_pre4-r1)

6 files changed, 137 insertions, 19 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 6ac023cd09df..e5b5837d4e84 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.123 2006/02/21 22:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.124 2006/02/23 17:31:55 chutzpah Exp $
+
+*gnumeric-1.6.2 (23 Feb 2006)
+
+  23 Feb 2006; Patrick McLean <chutzpah@gentoo.org> gnumeric-1.6.0.ebuild,
+  gnumeric-1.6.1.ebuild, +gnumeric-1.6.2.ebuild:
+  Version bump. New version depends on >=x11-libs/goffice-0.2.0. Make
+  gnumeric-1.6.{1,2} depend on old goffice versions.
 
   21 Feb 2006; Aron Griffis <agriffis@gentoo.org> gnumeric-1.6.1.ebuild:
   Mark 1.6.1 ~ia64. #110767
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a70f38ce6d83..561ce8d9da73 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,23 +1,45 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a9486528564247383f2c024a8618f45 ChangeLog 16367
+MD5 4addd3dfa47094be4a2ed31d4256284e ChangeLog 16646
+RMD160 943d153bbdb086aedd8810dc233ae425b4dd07ae ChangeLog 16646
+SHA256 cd939c552417d9b577ee60e0ed93238f91a9afdfff5d31a85fc8aa3d59f538df ChangeLog 16646
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r2 69
+RMD160 8543ee5364dd3bccad82b3b484db108f19ab8660 files/digest-gnumeric-1.4.3-r2 69
+SHA256 c7e1273e349efd4c4969700709d9534830456c951bd0930c194ba860b45e2b69 files/digest-gnumeric-1.4.3-r2 69
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r3 69
+RMD160 8543ee5364dd3bccad82b3b484db108f19ab8660 files/digest-gnumeric-1.4.3-r3 69
+SHA256 c7e1273e349efd4c4969700709d9534830456c951bd0930c194ba860b45e2b69 files/digest-gnumeric-1.4.3-r3 69
 MD5 b76afee2920aebc8fd632925765c3c70 files/digest-gnumeric-1.6.0 69
+RMD160 e3db0aac1ba266a2ffbdd946a0c84e55adfec2a3 files/digest-gnumeric-1.6.0 69
+SHA256 e911148e09501de70ada5848f69354aad02254a4d12a0f3b45aee0ba5bf843a0 files/digest-gnumeric-1.6.0 69
 MD5 7c673051dd023c2fd0bc25dcf86af734 files/digest-gnumeric-1.6.1 69
+RMD160 44cea3ae0c4dbe5cdc08cb29736321bf41b73470 files/digest-gnumeric-1.6.1 69
+SHA256 100d4334c773541e19c7ff0c76853d13182d355569ea4561bcc33afa7c804da8 files/digest-gnumeric-1.6.1 69
+MD5 16cb5659e6f64b0d5666e9bbdd03fc0c files/digest-gnumeric-1.6.2 253
+RMD160 8bf88722117a84cbffb54ea615bd770e301dc1d8 files/digest-gnumeric-1.6.2 253
+SHA256 83e6173bc7e95ace8c9a7e149e6785bfa48539fb9fe7d0df4ecf7c6e64bec88f files/digest-gnumeric-1.6.2 253
 MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
+RMD160 44c6da58163315878b8e370c36868ab76bdb36c4 files/gnumeric-1.4.3-makejobs.patch 1591
+SHA256 bfab96b70da6f20957979feebfe48dc93b7a75c663d37cefd627c6912811cc69 files/gnumeric-1.4.3-makejobs.patch 1591
 MD5 3fab812a68d5849434ba8d7ee3ef2887 files/gnumeric-1.4.3-new_gsf_api.patch 3308
+RMD160 f673966bd7f7f57209912097777e9a3f6bab87d6 files/gnumeric-1.4.3-new_gsf_api.patch 3308
+SHA256 abd92fbfa21825ab237d60cc35f4aee46e653f4bb4377362da35f6d00f253cb4 files/gnumeric-1.4.3-new_gsf_api.patch 3308
 MD5 00512bbcd353d056c02b62335dfd87d1 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
+RMD160 b9573faa2702c2feb5e763ec46c6fdf61cbaf71d files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
+SHA256 30841c17ba64ae9d8a6830d300ab7d275cb7fbae8537e66bdcfd90f762ba8f37 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
 MD5 05cab453a958d1d24692202747791548 gnumeric-1.4.3-r2.ebuild 2572
+RMD160 c80837b92d15171408440f64ba1b8c0e33f50b95 gnumeric-1.4.3-r2.ebuild 2572
+SHA256 1aaf28d4e13cccb0446ee2457b94d8ee733bdc97e21e2d8203ecbc0ff9470add gnumeric-1.4.3-r2.ebuild 2572
 MD5 2644f43aa2b70a69568b5fe657d03f03 gnumeric-1.4.3-r3.ebuild 2597
-MD5 e31ee656aaf8a2f6c6660d39150c358d gnumeric-1.6.0.ebuild 1981
-MD5 eceb39dcc3a6b535dcda700e3b0aa526 gnumeric-1.6.1.ebuild 2004
+RMD160 42430c68be7cc93d0ba3700eeb1ce911defa2799 gnumeric-1.4.3-r3.ebuild 2597
+SHA256 3b18c5c88424b615b5f58d6644656f26b6526df00da538d33edf5bc2a78f3605 gnumeric-1.4.3-r3.ebuild 2597
+MD5 f0522c29b5fef93c6b7af188320e8be9 gnumeric-1.6.0.ebuild 1979
+RMD160 3361423ea0c7cb423c1e885bbfd83d3f752a7f7f gnumeric-1.6.0.ebuild 1979
+SHA256 2e59e55b098ca22f46098c0ef7951e12d4209cca6aefebbec9ecba60916e7137 gnumeric-1.6.0.ebuild 1979
+MD5 ec5717c6788283cf3efb2cadc5dc1004 gnumeric-1.6.1.ebuild 2003
+RMD160 815a3cbb7ed8288f9cb983256e6ec007419b28f9 gnumeric-1.6.1.ebuild 2003
+SHA256 2031ce79740612b4c1c6dc233b2956d21b488618cdb7f33120550352089bc829 gnumeric-1.6.1.ebuild 2003
+MD5 8eca3dd40f0136484107bbcea0d1ea1c gnumeric-1.6.2.ebuild 1994
+RMD160 59b418a67210dfe7ddc9a93eaf6af561bc8d2223 gnumeric-1.6.2.ebuild 1994
+SHA256 c3c9d6b9ea199fc592412438d0acd3d6dfd33190fbad6c84387d734a48bbb1ad gnumeric-1.6.2.ebuild 1994
 MD5 add4556f7fbed381a299100d2457069f metadata.xml 167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD+5m3JrHF4yAQTrARAuOsAKCb4eGzpnvD1GT3d4VzCNrc5QhyDwCglmye
-zwXwQCSUKP7MI9vOsr3Fq3U=
-=7Bj8
------END PGP SIGNATURE-----
+RMD160 3b9bd7883121c8868b966914627e4f714f0334f5 metadata.xml 167
+SHA256 d1dbd0cf93ea6330c8c2fe1f02775bf64b3019bc51f7351606e3fa61a2d63a83 metadata.xml 167
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.6.2 b/app-office/gnumeric/files/digest-gnumeric-1.6.2
new file mode 100644
index 000000000000..6e158876e55d
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.6.2
@@ -0,0 +1,3 @@
+MD5 ca6ecf464279297a4f3d41e7f35ebb39 gnumeric-1.6.2.tar.bz2 12539827
+RMD160 e9273b1305a0bf2b4d5c701a9c8c3cf599805617 gnumeric-1.6.2.tar.bz2 12539827
+SHA256 e21474813318afeb44a59b7903cd7fa1021e822f6db476dcd88f184b07f83b96 gnumeric-1.6.2.tar.bz2 12539827
diff --git a/app-office/gnumeric/gnumeric-1.6.0.ebuild b/app-office/gnumeric/gnumeric-1.6.0.ebuild
index 946a83885a23..0b6db5455301 100644
--- a/app-office/gnumeric/gnumeric-1.6.0.ebuild
+++ b/app-office/gnumeric/gnumeric-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.0.ebuild,v 1.7 2005/11/01 16:20:57 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.0.ebuild,v 1.8 2006/02/23 17:31:55 chutzpah Exp $
 
 inherit eutils flag-o-matic gnome2
 
@@ -17,7 +17,7 @@ IUSE="gnome python static"
 RDEPEND="sys-libs/zlib
 	>=dev-libs/glib-2.6
 	>=gnome-extra/libgsf-1.13.2
-	>=x11-libs/goffice-0.1.0
+	=x11-libs/goffice-0.1*
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.8.1
 
diff --git a/app-office/gnumeric/gnumeric-1.6.1.ebuild b/app-office/gnumeric/gnumeric-1.6.1.ebuild
index 587aed6bf5c5..b78063da7f2c 100644
--- a/app-office/gnumeric/gnumeric-1.6.1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.1.ebuild,v 1.2 2006/02/21 22:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.1.ebuild,v 1.3 2006/02/23 17:31:55 chutzpah Exp $
 
 inherit eutils flag-o-matic gnome2
 
@@ -18,7 +18,7 @@ RDEPEND="sys-libs/zlib
 	app-arch/bzip2
 	>=dev-libs/glib-2.6
 	>=gnome-extra/libgsf-1.13.2
-	>=x11-libs/goffice-0.1.2
+	~x11-libs/goffice-0.1.2
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.8.1
 
diff --git a/app-office/gnumeric/gnumeric-1.6.2.ebuild b/app-office/gnumeric/gnumeric-1.6.2.ebuild
new file mode 100644
index 000000000000..cc5a9478d0ad
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.2.ebuild,v 1.1 2006/02/23 17:31:55 chutzpah Exp $
+
+inherit eutils flag-o-matic gnome2
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gnome python static"
+# bonobo libgda
+
+RDEPEND="sys-libs/zlib
+	app-arch/bzip2
+	>=dev-libs/glib-2.6
+	>=gnome-extra/libgsf-1.13.2
+	>=x11-libs/goffice-0.2.0
+	>=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
+	>=gnome-base/libgnomeprintui-2.8.2
+	>=media-libs/libart_lgpl-2.3.11
+
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libbonoboui-2.2 )
+	python? (
+		>=dev-lang/python-2
+		>=dev-python/pygtk-2 )"
+	# libgda? (
+	#	>=gnome-extra/libgda-1.3
+	#	>=gnome-extra/libgnomedb-1.3 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.9
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="--enable-ssindex \
+		$(use_with python) \
+		$(use_with gnome)  \
+		$(use_enable static)"
+
+	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
+		einfo "libgsf needs to be compiled with gnome in USE"
+		einfo "for this version of gnumeric to work. Rebuild"
+		einfo "libgsf first like this :"
+		einfo "USE=gnome emerge libgsf -vp"
+		die "libgsf was built without gnome support..."
+	fi
+
+	#gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
+	replace-flags "-Os" "-O2"
+}
+
+src_unpack() {
+	unpack "${A}"
+	gnome2_omf_fix ${S}/doc/C/Makefile.in
+}
+
+
+src_install() {
+
+	gnome2_src_install
+
+	# make gnumeric find its help
+	dosym \
+		/usr/share/gnome/help/gnumeric \
+		/usr/share/${PN}/${PV}/doc
+
+}