New version of gnumeric. Cleaned up ebuild, remove libgda support(requires dev version), and update deps. Removing other archs until goffice has the proper keywords. Closes bug #108969

Package-Manager: portage-2.0.53_rc6

4 files changed, 97 insertions, 17 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 610068522774..3d030fc40d08 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.114 2005/10/05 20:04:46 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.115 2005/10/29 06:11:26 joem Exp $
+
+*gnumeric-1.6.0 (29 Oct 2005)
+
+  29 Oct 2005; Joe McCann <joem@gentoo.org> +gnumeric-1.6.0.ebuild:
+  New version of gnumeric. Cleaned up ebuild, remove libgda support(requires
+  dev version), and update deps. Removing other archs until goffice has the
+  proper keywords. Closes bug #108969
 
 *gnumeric-1.4.3-r3 (05 Oct 2005)
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 43a484ba92b1..f6d9da27edcb 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2644f43aa2b70a69568b5fe657d03f03 gnumeric-1.4.3-r3.ebuild 2597
-MD5 05cab453a958d1d24692202747791548 gnumeric-1.4.3-r2.ebuild 2572
-MD5 2360a2262452b3e05991a0d7823f3973 ChangeLog 15154
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
-MD5 3fab812a68d5849434ba8d7ee3ef2887 files/gnumeric-1.4.3-new_gsf_api.patch 3308
+MD5 7521b5a44cf0863a0851f85c8ff3820e ChangeLog 15445
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r2 69
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r3 69
+MD5 b76afee2920aebc8fd632925765c3c70 files/digest-gnumeric-1.6.0 69
+MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
+MD5 3fab812a68d5849434ba8d7ee3ef2887 files/gnumeric-1.4.3-new_gsf_api.patch 3308
 MD5 00512bbcd353d056c02b62335dfd87d1 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRDIEomPajV0RnrERAk5iAJ43EOJtTVGTaSektKxAVqi/x10V8gCfT8YE
-zy1O5yUtXvLXIaBD9gZMRVE=
-=syTO
------END PGP SIGNATURE-----
+MD5 05cab453a958d1d24692202747791548 gnumeric-1.4.3-r2.ebuild 2572
+MD5 2644f43aa2b70a69568b5fe657d03f03 gnumeric-1.4.3-r3.ebuild 2597
+MD5 be65dbe8b7162bf5644cabdafbb50223 gnumeric-1.6.0.ebuild 1948
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.6.0 b/app-office/gnumeric/files/digest-gnumeric-1.6.0
new file mode 100644
index 000000000000..5f1152118890
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.6.0
@@ -0,0 +1 @@
+MD5 153c3a247cbe582f7be40fc9fdd903a6 gnumeric-1.6.0.tar.bz2 12524922
diff --git a/app-office/gnumeric/gnumeric-1.6.0.ebuild b/app-office/gnumeric/gnumeric-1.6.0.ebuild
new file mode 100644
index 000000000000..6af74a1d1084
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.6.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 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.1 2005/10/29 06:11:26 joem 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="~x86"
+
+IUSE="gnome python static"
+# bonobo gnomedb libgda
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=gnome-extra/libgsf-1.13.2
+	>=x11-libs/goffice-0.1.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.0.1 )
+#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.9
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	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
+	cd ${S}/doc/C
+	gnome2_omf_fix Makefile.in
+}
+
+G2CONF="${G2CONF} $(use_with python) $(use_with gnome) $(use_enable static) --enable-ssindex"
+
+src_install() {
+
+	gnome2_src_install
+
+	# make gnumeric find it's help
+	dosym \
+		/usr/share/gnome/help/gnumeric \
+		/usr/share/${PN}/${PV}/doc
+
+}