Version bump. Improved interoperability with OOo. Allow user-defined templates and various other fixes.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 90 insertions, 109 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 7282b1ac1498..9fcfeec0ca2e 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.209 2010/09/13 07:14:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.210 2010/10/04 21:03:13 eva Exp $
+
+*gnumeric-1.10.11 (04 Oct 2010)
+
+  04 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnumeric-1.8.4-r2.ebuild, +gnumeric-1.10.11.ebuild:
+  Version bump. Improved interoperability with OOo. Allow user-defined
+  templates and various other fixes.
 
   13 Sep 2010; Joseph Jezak <josejx@gentoo.org> gnumeric-1.10.6.ebuild:
   Marked ppc stable for bug #326503.
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index f577bf902ef7..b2265902621b 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -5,19 +5,19 @@ AUX gnumeric-1.8.4-CVE-2009-0318.patch 626 RMD160 ec133b7ec03d9ea2b14a9d2bcb2798
 AUX gnumeric-1.8.4-gtk216-abi-spinbuttons.patch 14242 RMD160 5fb5cff75cbaba6b6f8e3dd0ceb48454c16eea38 SHA1 d69b15735fc870d9dc8e246f4c0cb7ff7a89b799 SHA256 e29eadcb5e92c904001fd4af7d23916208e6563ed49da0028c4cf113fc0a9de5
 AUX gnumeric-1.8.4-gtk216-im-block.patch 8431 RMD160 d7d0ecf0104f7670bc8d9a7bcf36913150ed653a SHA1 ac6f2dc7d0a480dd6197597d1e16197635e081a5 SHA256 2029b766687c3d59ef5c9e6e8c8606451e15f1962a7257af30fd29bb27e4e59a
 DIST gnumeric-1.10.10.tar.bz2 18020517 RMD160 b894e7f0c82e97e47761af4edfbbd3e566193e6f SHA1 7f35f4575f97d7c63800c45544456f775d8e3a1e SHA256 fbc725d9d0233cc7d9cbd477f6a0a8e5621a246fcf84286fdba69ebaa30745c5
+DIST gnumeric-1.10.11.tar.bz2 18071911 RMD160 41970eed0f37cb36f56239d6429b4b5d3e6181a3 SHA1 3eea4638e93da7953f7d6bc8fec92e77f7846ea0 SHA256 5229da4fa61113fd7d42bb1727ea033f9325d9f49a1a6868091650acc4e25e75
 DIST gnumeric-1.10.6.tar.bz2 17787316 RMD160 15dbe348afcdd38c59fe9b0ea7ceae2426d79e14 SHA1 c885c1fd7033bd355245cd3d2820e73d668d1861 SHA256 7e1b6ad04ba9bf1b2015c6b88cf3c2b46ec69b67312a44284f049a2ff8aeed6d
 DIST gnumeric-1.10.7.tar.bz2 17798806 RMD160 3ffa7fd7f1faf097bed8668a2f52ce921372dfa3 SHA1 ab6a97d009c50f2a92c66471123db27f8045346a SHA256 4438408f02932a234ddfd7bdbc45cc3f6b037874bbd0fa100ad777000301ebab
-DIST gnumeric-1.8.4.tar.bz2 14087780 RMD160 461ea59b2ce30d2ce7dd5bca2cea2c50b955dc57 SHA1 2d765b0d06509e0695c4d3ec96b94f8acba88735 SHA256 a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
 EBUILD gnumeric-1.10.10.ebuild 1674 RMD160 fbcc16bb7226eacb0a0e5efaaa6de60f663c23df SHA1 4f70a198bd41a85d5af02c1c680891027ee06f16 SHA256 7840455a3c1429ff846b9c2427950bcdac45cde787b206651884fd2f31807b7b
+EBUILD gnumeric-1.10.11.ebuild 1690 RMD160 a887125b07349be23b0f8606ef3b40d0ad2671b6 SHA1 065aae6cf44f1eb3bb766e6d9a5d3dd12df1a6e2 SHA256 21da658b9939894c97fdb1a03c7b411636d5fa592e3f26cd5d600117b13d99b2
 EBUILD gnumeric-1.10.6.ebuild 1668 RMD160 e52bd50877f4dc64d6ee43ff9a94bf1743408c25 SHA1 47ff4d40e9a4e59dccb5b0a14f5bad43393a7212 SHA256 895bf97b023e18a60e7f1229f3e451ecc8d3bd6b65aeec21f298b9768b2a576e
 EBUILD gnumeric-1.10.7.ebuild 1672 RMD160 1c6cd7c1fba94fe0bb9cc566a9921e80fe5cd8e5 SHA1 60def0c922051fc27026461e445654b10ce46419 SHA256 03bc91f2d41802840cf64e3e65369255c4823c9001a410d5f8decd435c7f5749
-EBUILD gnumeric-1.8.4-r2.ebuild 2349 RMD160 a1d994c37a6ebb3fdfa6d9bdb41371977d2f94a5 SHA1 912296e0379eabcfb8bfe029ae4fed3ad17f9379 SHA256 9a07cd751fc1030ec510892ab3b14ea698143e9bf6e186bd864585d9efda9457
-MISC ChangeLog 28623 RMD160 01b29ef64290e4e6ae7a98f8e9e4a105fbecaed3 SHA1 a0b5f6858aaffc13a1e10cff184e5ab314bf80c6 SHA256 b88a93d01d52ef1786705e196b53ffed6dcd3f586c398ffe98dc4b592d42ff17
+MISC ChangeLog 28871 RMD160 dcf4715120ad473352b34627881f58bdb3c4549a SHA1 70fdf2fda86b460125097800ecf06a15a5c4e551 SHA256 2108963fc58b41afc53fe1f5f38bf577e8c73c67a7a8c4be749dcce112978f35
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyOH48ACgkQcsIHjyDViGQF2ACfSMsooJuECD4b171g77evZOya
-L6AAnjV0l5rcrWoGh2EEf6ezVtfxG1Fm
-=0Dhq
+iEYEARECAAYFAkyqQRwACgkQ1fmVwcYIWAa1wQCfXyNZ5H+0WWR4Ac6ykc/gGVPU
+kJgAoJ6qixlBN7CM6AS3NhvFed1H9G24
+=Q1/f
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/gnumeric-1.10.11.ebuild b/app-office/gnumeric/gnumeric-1.10.11.ebuild
new file mode 100644
index 000000000000..1fdf12603da4
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.10.11.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.11.ebuild,v 1.1 2010/10/04 21:03:13 eva Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit gnome2 flag-o-matic python
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="gnome perl python"
+# libgda
+
+# lots of missing files, wait for next release
+# also fails tests due to 80-bit long story
+RESTRICT="test"
+
+RDEPEND="sys-libs/zlib
+	app-arch/bzip2
+	>=dev-libs/glib-2.12
+	>=gnome-extra/libgsf-1.14.19[gnome?]
+	>=x11-libs/goffice-0.8.10:0.8
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.12
+
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/cairo[svg]
+	>=gnome-base/libglade-2.3.6
+
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libbonoboui-2.2 )
+	perl? ( dev-lang/perl )
+	python? ( >=dev-python/pygtk-2 )
+"
+#	libgda? (
+#		>=gnome-extra/libgda-4.1.1:4.0
+#		>=gnome-extra/libgnomedb-3.99.6:4.0 )
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.25
+	>=dev-util/pkgconfig-0.18
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-ssindex
+		--disable-static
+		--without-gda
+		--with-zlib
+		$(use_with perl)
+		$(use_with python)
+		$(use_with gnome)"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Remove useless .la files
+	find "${ED}" -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+}
diff --git a/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild b/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild
deleted file mode 100644
index 437564979dc0..000000000000
--- a/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild,v 1.9 2010/07/20 16:32:43 jer Exp $
-
-EAPI="2"
-
-inherit gnome2 flag-o-matic python autotools
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="gnome perl python"
-# bonobo guile libgda mono (experimental)
-
-# lots of missing files, wait for next release
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	app-arch/bzip2
-	>=dev-libs/glib-2.6
-	>=gnome-extra/libgsf-1.14.6[gnome?]
-	>=x11-libs/goffice-0.6.3:0.6
-	>=dev-libs/libxml2-2.4.12
-	>=x11-libs/pango-1.8.1
-
-	>=x11-libs/gtk+-2.16
-	x11-libs/cairo[svg]
-	>=gnome-base/libglade-2.3.6
-	>=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 )
-	perl? ( dev-lang/perl )
-	python? (
-		>=dev-lang/python-2
-		>=dev-python/pygtk-2 )"
-	# libgda? (
-	#	>=gnome-extra/libgda-3.1.1
-	#	>=gnome-extra/libgnomedb-3.0.1 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.18
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-ssindex
-		--disable-static
-		--without-gda
-		--without-guile
-		--without-mono
-		--with-zlib
-		$(use_with perl)
-		$(use_with python)
-		$(use_with gnome)"
-
-	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
-	replace-flags "-Os" "-O2"
-}
-
-src_prepare() {
-	# Fix for CVE-2009-0318, bug #257012
-	epatch "${FILESDIR}/${P}-CVE-2009-0318.patch"
-
-	# Fix gtk+ 2.16 ABI changs wrt spinbuttons
-	epatch "${FILESDIR}/${P}-gtk216-abi-spinbuttons.patch"
-
-	# Fix gtk+-2.16 semantic changes, bug #278502
-	epatch "${FILESDIR}/${P}-gtk216-im-block.patch"
-
-	# Fix #275352 (the sed expression didn't work !)
-	intltoolize --automake --copy --force || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	find "${D}" -name "*.la" -delete
-
-	# make gnumeric find its help
-	dosym \
-		/usr/share/gnome/help/gnumeric \
-		/usr/share/${PN}/${PV}/doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-}